initial HEM->CORE consolidation work

Author: sebersole

hibernate-core/src/main/java/org/hibernate/Metamodel.java

@@ -0,0 +1,17 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate;
+
+import javax.persistence.metamodel.EntityType;
+import javax.persistence.metamodel.Metamodel;
+
+/**
+ * @author Steve Ebersole
+ */
+public interface Metamodel extends javax.persistence.metamodel.Metamodel {
+	EntityType getEntityTypeByName(String entityName);
+}

hibernate-core/src/main/java/org/hibernate/engine/spi/SharedSessionContractImplementor.java

@@ -0,0 +1,7 @@
+package org.hibernate.engine.spi;
+
+/**
+ * @author Steve Ebersole
+ */
+public interface SharedSessionContractImplementor {
+}

hibernate-core/src/main/java/org/hibernate/engine/transaction/spi/TransactionImplementor.java

@@ -0,0 +1,7 @@
+package org.hibernate.engine.transaction.spi;
+
+/**
+ * @author Steve Ebersole
+ */
+public interface TransactionImplementor {
+}

hibernate-core/src/main/java/org/hibernate/graph/spi/EntityGraphImplementor.java

@@ -0,0 +1,7 @@
+package org.hibernate.graph.spi;
+
+/**
+ * @author Steve Ebersole
+ */
+public interface EntityGraphImplementor {
+}

hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java

@@ -0,0 +1,7 @@
+package org.hibernate.internal;
+
+/**
+ * @author Steve Ebersole
+ */
+public class AbstractSharedSessionContract {
+}

hibernate-core/src/main/java/org/hibernate/internal/ContextualJdbcConnectionAccess.java

@@ -0,0 +1,63 @@
+package org.hibernate.internal;
+
+import java.io.Serializable;
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import org.hibernate.HibernateException;
+import org.hibernate.SessionEventListener;
+import org.hibernate.engine.jdbc.connections.spi.JdbcConnectionAccess;
+import org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider;
+
+/**
+ * @author Steve Ebersole
+ */
+class ContextualJdbcConnectionAccess implements JdbcConnectionAccess, Serializable {
+	private AbstractSessionImpl abstractSession;
+	private final SessionEventListener listener;
+	private final MultiTenantConnectionProvider connectionProvider;
+
+	ContextualJdbcConnectionAccess(
+			AbstractSessionImpl abstractSession,
+			SessionEventListener listener,
+			MultiTenantConnectionProvider connectionProvider) {
+		this.abstractSession = abstractSession;
+		this.listener = listener;
+		this.connectionProvider = connectionProvider;
+	}
+
+	@Override
+	public Connection obtainConnection() throws SQLException {
+		if ( abstractSession.tenantIdentifier == null ) {
+			throw new HibernateException( "Tenant identifier required!" );
+		}
+
+		try {
+			listener.jdbcConnectionAcquisitionStart();
+			return connectionProvider.getConnection( abstractSession.tenantIdentifier );
+		}
+		finally {
+			listener.jdbcConnectionAcquisitionEnd();
+		}
+	}
+
+	@Override
+	public void releaseConnection(Connection connection) throws SQLException {
+		if ( abstractSession.tenantIdentifier == null ) {
+			throw new HibernateException( "Tenant identifier required!" );
+		}
+
+		try {
+			listener.jdbcConnectionReleaseStart();
+			connectionProvider.releaseConnection( abstractSession.tenantIdentifier, connection );
+		}
+		finally {
+			listener.jdbcConnectionReleaseEnd();
+		}
+	}
+
+	@Override
+	public boolean supportsAggressiveRelease() {
+		return connectionProvider.supportsAggressiveRelease();
+	}
+}

hibernate-core/src/main/java/org/hibernate/internal/CoordinatingEntityNameResolver.java

@@ -0,0 +1,40 @@
+package org.hibernate.internal;
+
+import org.hibernate.EntityNameResolver;
+import org.hibernate.Interceptor;
+import org.hibernate.engine.spi.SessionFactoryImplementor;
+
+/**
+ * @author Steve Ebersole
+ */
+public class CoordinatingEntityNameResolver implements EntityNameResolver {
+	private final SessionFactoryImplementor sessionFactory;
+	private final Interceptor interceptor;
+
+	public CoordinatingEntityNameResolver(SessionFactoryImplementor sessionFactory, Interceptor interceptor) {
+		this.sessionFactory = sessionFactory;
+		this.interceptor = interceptor;
+	}
+
+	@Override
+	public String resolveEntityName(Object entity) {
+		String entityName = interceptor.getEntityName( entity );
+		if ( entityName != null ) {
+			return entityName;
+		}
+
+		for ( EntityNameResolver resolver : sessionFactory.iterateEntityNameResolvers() ) {
+			entityName = resolver.resolveEntityName( entity );
+			if ( entityName != null ) {
+				break;
+			}
+		}
+
+		if ( entityName != null ) {
+			return entityName;
+		}
+
+		// the old-time stand-by...
+		return entity.getClass().getName();
+	}
+}

hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/EntityManagerMessageLogger.java renamed to hibernate-core/src/main/java/org/hibernate/internal/EntityManagerMessageLogger.java

@@ -4,7 +4,7 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.jpa.internal;
+package org.hibernate.internal;
 
 import java.net.URISyntaxException;
 import java.net.URL;

hibernate-core/src/main/java/org/hibernate/internal/ExceptionMapperStandardImpl.java

@@ -0,0 +1,34 @@
+package org.hibernate.internal;
+
+import javax.transaction.SystemException;
+
+import org.hibernate.TransactionException;
+import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.resource.transaction.backend.jta.internal.synchronization.ExceptionMapper;
+
+/**
+ * @author Steve Ebersole
+ */
+public class ExceptionMapperStandardImpl implements ExceptionMapper {
+	public static final ExceptionMapper INSTANCE = new ExceptionMapperStandardImpl();
+
+	@Override
+	public RuntimeException mapStatusCheckFailure(
+			String message,
+			SystemException systemException,
+			SessionImplementor sessionImplementor) {
+		return new TransactionException(
+				"could not determine transaction status in beforeCompletion()",
+				systemException
+		);
+	}
+
+	@Override
+	public RuntimeException mapManagedFlushFailure(
+			String message,
+			RuntimeException failure,
+			SessionImplementor session) {
+		SessionImpl.log.unableToPerformManagedFlush( failure.getMessage() );
+		return failure;
+	}
+}

hibernate-entitymanager/src/main/java/org/hibernate/jpa/internal/HEMLogging.java renamed to hibernate-core/src/main/java/org/hibernate/internal/HEMLogging.java

@@ -4,7 +4,9 @@
  * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
  * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
  */
-package org.hibernate.jpa.internal;
+package org.hibernate.internal;
+
+import org.hibernate.internal.EntityManagerMessageLogger;
 
 import org.jboss.logging.Logger;