HHH-10664 - Prep 6.0 feature branch - merge hibernate-entitymanager into hibernate-core (stored procedure queries)

Author: sebersole

documentation/documentation.gradle

@@ -62,7 +62,6 @@ dependencies {
 	testCompile( 'org.apache.commons:commons-lang3:3.4' )
 
 	testCompile( project(':hibernate-core') )
-	testCompile( project(':hibernate-entitymanager') )
 	testCompile( project(':hibernate-ehcache') )
 	testCompile( project(':hibernate-spatial') )
 

documentation/src/test/java/org/hibernate/userguide/mapping/basic/BitSetUserType.java

@@ -9,7 +9,7 @@
 import java.util.Objects;
 
 import org.hibernate.HibernateException;
-import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.type.StringType;
 import org.hibernate.usertype.UserType;
 
@@ -49,7 +49,7 @@ public int hashCode(Object x)
 
     @Override
     public Object nullSafeGet(
-            ResultSet rs, String[] names, SessionImplementor session, Object owner)
+            ResultSet rs, String[] names, SharedSessionContractImplementor session, Object owner)
             throws HibernateException, SQLException {
         String columnName = names[0];
         String columnValue = (String) rs.getObject( columnName );
@@ -60,7 +60,7 @@ public Object nullSafeGet(
 
     @Override
     public void nullSafeSet(
-            PreparedStatement st, Object value, int index, SessionImplementor session)
+            PreparedStatement st, Object value, int index, SharedSessionContractImplementor session)
             throws HibernateException, SQLException {
         if ( value == null ) {
             log.debugv("Binding null to parameter {0} ",index);

documentation/src/test/java/org/hibernate/userguide/mapping/basic/MonetaryAmountUserType.java

@@ -16,7 +16,7 @@
 import java.util.Currency;
 
 import org.hibernate.HibernateException;
-import org.hibernate.engine.spi.SessionImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.type.StandardBasicTypes;
 import org.hibernate.type.Type;
 import org.hibernate.usertype.CompositeUserType;
@@ -67,7 +67,7 @@ public int hashCode(Object x) throws HibernateException {
 		return ( (MonetaryAmount) x ).getAmount().hashCode();
 	}
 
-	public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor session, Object owner)
+	public Object nullSafeGet(ResultSet rs, String[] names, SharedSessionContractImplementor session, Object owner)
 			throws HibernateException, SQLException {
 		BigDecimal amt = StandardBasicTypes.BIG_DECIMAL.nullSafeGet( rs, names[0], session);
 		Currency cur = StandardBasicTypes.CURRENCY.nullSafeGet( rs, names[1], session );
@@ -77,7 +77,7 @@ public Object nullSafeGet(ResultSet rs, String[] names, SessionImplementor sessi
 
 	public void nullSafeSet(
 			PreparedStatement st, Object value, int index,
-			SessionImplementor session
+			SharedSessionContractImplementor session
 	) throws HibernateException, SQLException {
 		MonetaryAmount ma = (MonetaryAmount) value;
 		BigDecimal amt = ma == null ? null : ma.getAmount();
@@ -95,17 +95,17 @@ public boolean isMutable() {
 		return true;
 	}
 
-	public Serializable disassemble(Object value, SessionImplementor session)
+	public Serializable disassemble(Object value, SharedSessionContractImplementor session)
 			throws HibernateException {
 		return (Serializable) deepCopy( value );
 	}
 
-	public Object assemble(Serializable cached, SessionImplementor session, Object owner)
+	public Object assemble(Serializable cached, SharedSessionContractImplementor session, Object owner)
 			throws HibernateException {
 		return deepCopy( cached );
 	}
 
-	public Object replace(Object original, Object target, SessionImplementor session, Object owner)
+	public Object replace(Object original, Object target, SharedSessionContractImplementor session, Object owner)
 			throws HibernateException {
 		return deepCopy( original ); //TODO: improve
 	}

documentation/src/test/java/org/hibernate/userguide/sql/SQLTest.java

@@ -7,7 +7,6 @@
 package org.hibernate.userguide.sql;
 
 import java.math.BigDecimal;
-import java.math.BigInteger;
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
@@ -17,7 +16,6 @@
 import org.hibernate.Criteria;
 import org.hibernate.Session;
 import org.hibernate.dialect.H2Dialect;
-import org.hibernate.dialect.MySQL5Dialect;
 import org.hibernate.dialect.Oracle8iDialect;
 import org.hibernate.dialect.PostgreSQL82Dialect;
 import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
@@ -42,6 +40,7 @@
 
 import org.jboss.logging.Logger;
 
+import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping;
 import static org.hibernate.userguide.util.TransactionUtil.doInJPA;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
@@ -485,20 +484,28 @@ public void test_sql_jpa_multi_entity_query_example() {
 		}
 	}
 
-	@Test(expected = NonUniqueDiscoveredSqlAliasException.class)
+	@Test
 	public void test_sql_hibernate_multi_entity_query_example() {
-		doInJPA( this::entityManagerFactory, entityManager -> {
-			Session session = entityManager.unwrap( Session.class );
-			//tag::sql-hibernate-multi-entity-query-example[]
-			List<Object> entities = session.createSQLQuery(
-				"SELECT * " +
-				"FROM person pr, partner pt " +
-				"WHERE pr.name = pt.name" )
-			.list();
-			//end::sql-hibernate-multi-entity-query-example[]
-			assertEquals(2, entities.size());
-		});
-		fail("Should throw NonUniqueDiscoveredSqlAliasException!");
+		try {
+			doInJPA( this::entityManagerFactory, entityManager -> {
+				Session session = entityManager.unwrap( Session.class );
+				//tag::sql-hibernate-multi-entity-query-example[]
+				List<Object> entities = session.createSQLQuery(
+						"SELECT * " +
+								"FROM person pr, partner pt " +
+								"WHERE pr.name = pt.name" )
+						.list();
+				//end::sql-hibernate-multi-entity-query-example[]
+				assertEquals( 2, entities.size() );
+			} );
+			fail( "Should throw NonUniqueDiscoveredSqlAliasException!" );
+		}
+		catch (NonUniqueDiscoveredSqlAliasException e) {
+			// expected
+		}
+		catch (PersistenceException e) {
+			assertTyping( NonUniqueDiscoveredSqlAliasException.class, e.getCause() );
+		}
 	}
 
 	@Test