sync some code in ReactiveSessionImpl with core SessionImpl

Author: gavinking

hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/ReactiveSession.java

@@ -86,7 +86,7 @@ public interface ReactiveSession extends ReactiveQueryProducer, ReactiveSharedSe
 
 	CompletionStage<Object> reactiveImmediateLoad(String entityName, Object id);
 
-	CompletionStage<Void> reactiveInitializeCollection(PersistentCollection collection, boolean writing);
+	CompletionStage<Void> reactiveInitializeCollection(PersistentCollection<?> collection, boolean writing);
 
 	CompletionStage<Void> reactiveRemoveOrphanBeforeUpdates(String entityName, Object child);
 

hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveSessionImpl.java

@@ -359,7 +359,7 @@ public <R> ReactiveQuery<R> createReactiveQuery(CriteriaQuery<R> criteriaQuery)
 				}
 			}
 
-			return new ReactiveQuerySqmImpl<R>( selectStatement, criteriaQuery.getResultType(), this );
+			return createCriteriaQuery( selectStatement, criteriaQuery.getResultType() );
 		}
 		catch (RuntimeException e) {
 			if ( getSessionFactory().getJpaMetamodel().getJpaCompliance().isJpaTransactionComplianceEnabled() ) {
@@ -369,6 +369,12 @@ public <R> ReactiveQuery<R> createReactiveQuery(CriteriaQuery<R> criteriaQuery)
 		}
 	}
 
+	private <T> ReactiveQueryImplementor<T> createCriteriaQuery(SqmStatement<T> criteria, Class<T> resultType) {
+		final ReactiveQuerySqmImpl<T> query = new ReactiveQuerySqmImpl<>( criteria, resultType, this );
+		applyQuerySettingsAndHints( query );
+		return query;
+	}
+
 	@Override
 	public <R> ReactiveQuery<R> createReactiveQuery(String queryString) {
 		return createReactiveQuery( queryString, null );
@@ -580,7 +586,7 @@ private static void checkMutationQuery(String hqlString, SqmStatement<?> sqmStat
 	public <R> ReactiveMutationQuery<R> createReactiveMutationQuery(CriteriaUpdate updateQuery) {
 		checkOpen();
 		try {
-			return new ReactiveQuerySqmImpl<>( (SqmUpdateStatement<R>) updateQuery, null, this );
+			return createCriteriaQuery( (SqmUpdateStatement<R>) updateQuery, null );
 		}
 		catch ( RuntimeException e ) {
 			throw getExceptionConverter().convert( e );
@@ -591,7 +597,7 @@ public <R> ReactiveMutationQuery<R> createReactiveMutationQuery(CriteriaUpdate u
 	public <R> ReactiveMutationQuery<R> createReactiveMutationQuery(CriteriaDelete deleteQuery) {
 		checkOpen();
 		try {
-			return new ReactiveQuerySqmImpl<>( (SqmDeleteStatement<R>) deleteQuery, null, this );
+			return createCriteriaQuery( (SqmDeleteStatement<R>) deleteQuery, null );
 		}
 		catch ( RuntimeException e ) {
 			throw getExceptionConverter().convert( e );
@@ -602,7 +608,7 @@ public <R> ReactiveMutationQuery<R> createReactiveMutationQuery(CriteriaDelete d
 	public <R> ReactiveMutationQuery<R> createReactiveMutationQuery(JpaCriteriaInsertSelect insertSelect) {
 		checkOpen();
 		try {
-			return new ReactiveQuerySqmImpl<>( (SqmInsertSelectStatement<R>) insertSelect, null, this );
+			return createCriteriaQuery( (SqmInsertSelectStatement<R>) insertSelect, null );
 		}
 		catch ( RuntimeException e ) {
 			throw getExceptionConverter().convert( e );
@@ -792,19 +798,19 @@ private NamedResultSetMappingMemento getResultSetMappingMemento(String resultSet
 	 */
 	@Deprecated
 	@Override
-	public void initializeCollection(PersistentCollection collection, boolean writing) {
+	public void initializeCollection(PersistentCollection<?> collection, boolean writing) {
 		throw LOG.collectionCannotBeInitializedlazyInitializationException( collectionRoleLogMessage( collection ) );
 	}
 
-	private static String collectionRoleLogMessage(PersistentCollection collection) {
+	private static String collectionRoleLogMessage(PersistentCollection<?> collection) {
 		if ( collection == null ) {
 			return "collection is null";
 		}
 		return collection.getRole();
 	}
 
 	@Override
-	public CompletionStage<Void> reactiveInitializeCollection(PersistentCollection collection, boolean writing) {
+	public CompletionStage<Void> reactiveInitializeCollection(PersistentCollection<?> collection, boolean writing) {
 		checkOpenOrWaitingForAutoClose();
 		pulseTransactionCoordinator();
 		InitializeCollectionEvent event = new InitializeCollectionEvent( collection, this );

hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveStatelessSessionImpl.java

@@ -870,15 +870,15 @@ private <R> ReactiveSelectionQuery<R> internalCreateSelectionQuery(String hqlStr
 	@Override
 	public <R> ReactiveSelectionQuery<R> createReactiveSelectionQuery(CriteriaQuery<R> criteria) {
 		SqmUtil.verifyIsSelectStatement( (SqmStatement<R>) criteria, null );
-		return new ReactiveSqmSelectionQueryImpl<R>( (SqmSelectStatement<R>) criteria, criteria.getResultType(), this );
+		return new ReactiveSqmSelectionQueryImpl<>( (SqmSelectStatement<R>) criteria, criteria.getResultType(), this );
 	}
 
 	@Override
 	public <R> ReactiveMutationQuery<R> createReactiveMutationQuery(String hqlString) {
 		final QueryImplementor<?> query = createQuery( hqlString );
 		final SqmStatement<R> sqmStatement = ( (SqmQueryImplementor<R>) query ).getSqmStatement();
 		checkMutationQuery( hqlString, sqmStatement );
-		return new ReactiveQuerySqmImpl<R>( sqmStatement, null, this );
+		return new ReactiveQuerySqmImpl<>( sqmStatement, null, this );
 	}
 
 	// Change visibility in ORM
@@ -892,7 +892,7 @@ private static void checkMutationQuery(String hqlString, SqmStatement<?> sqmStat
 	public <R> ReactiveMutationQuery<R> createReactiveMutationQuery(CriteriaUpdate updateQuery) {
 		checkOpen();
 		try {
-			return new ReactiveQuerySqmImpl<R>( (SqmUpdateStatement<R>) updateQuery, null, this );
+			return new ReactiveQuerySqmImpl<>( (SqmUpdateStatement<R>) updateQuery, null, this );
 		}
 		catch ( RuntimeException e ) {
 			throw getExceptionConverter().convert( e );
@@ -903,7 +903,7 @@ public <R> ReactiveMutationQuery<R> createReactiveMutationQuery(CriteriaUpdate u
 	public <R> ReactiveMutationQuery<R> createReactiveMutationQuery(CriteriaDelete deleteQuery) {
 		checkOpen();
 		try {
-			return new ReactiveQuerySqmImpl<R>( (SqmDeleteStatement<R>) deleteQuery, null, this );
+			return new ReactiveQuerySqmImpl<>( (SqmDeleteStatement<R>) deleteQuery, null, this );
 		}
 		catch ( RuntimeException e ) {
 			throw getExceptionConverter().convert( e );

hibernate-reactive-core/src/test/resources/log4j2.properties

@@ -8,7 +8,7 @@ logger.hibernate.level = info
 
 # Setting level to TRACE will show parameters values
 logger.sql-parameters-values.name = org.hibernate.type
-logger.sql-parameters-values.level = INFO
+logger.sql-parameters-values.level = info
 
 appender.console.name = console
 appender.console.type = Console