Fix compilation errors with latest ORM 6.2 snapshot

Author: DavideD

hibernate-reactive-core/src/main/java/org/hibernate/reactive/loader/ast/internal/DatabaseSnapshotExecutor.java

@@ -12,6 +12,7 @@
 import org.hibernate.LockOptions;
 import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
 import org.hibernate.engine.jdbc.spi.JdbcServices;
+import org.hibernate.engine.spi.LoadQueryInfluencers;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.internal.util.collections.ArrayHelper;
@@ -77,6 +78,7 @@ class DatabaseSnapshotExecutor {
 				LockOptions.NONE,
 				DatabaseSnapshotExecutor::visitEmptyFetchList,
 				true,
+				LoadQueryInfluencers.NONE,
 				sessionFactory
 		);
 
@@ -86,11 +88,10 @@ class DatabaseSnapshotExecutor {
 				true,
 				rootPath,
 				null,
+				null,
 				() -> rootQuerySpec::applyPredicate,
-				state,
-				sessionFactory
+				state
 		);
-
 		rootQuerySpec.getFromClause().addRoot( rootTableGroup );
 		state.getFromClauseAccess().registerTableGroup( rootPath, rootTableGroup );
 

hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/exec/internal/StandardReactiveSelectExecutor.java

@@ -35,7 +35,6 @@
 import org.hibernate.reactive.sql.results.spi.ReactiveListResultsConsumer;
 import org.hibernate.reactive.sql.results.spi.ReactiveResultsConsumer;
 import org.hibernate.reactive.sql.results.spi.ReactiveValuesMappingProducer;
-import org.hibernate.reactive.util.impl.CompletionStages;
 import org.hibernate.sql.exec.SqlExecLogger;
 import org.hibernate.sql.exec.internal.JdbcExecHelper;
 import org.hibernate.sql.exec.spi.ExecutionContext;
@@ -320,29 +319,37 @@ public CompletionStage<ReactiveValuesResultSet> resolveJdbcValuesSource(String q
 		if ( cachedResults == null ) {
 			if ( queryResultsCacheKey == null ) {
 				return mappingProducer
-						.reactiveResolve( resultSetAccess, factory )
+						.reactiveResolve( resultSetAccess, session.getLoadQueryInfluencers(), factory )
 						.thenApply( jdbcValuesMapping -> new ReactiveValuesResultSet( resultSetAccess, null, queryIdentifier, executionContext.getQueryOptions(), jdbcValuesMapping, null, executionContext ) );
 			}
 			else {
 				// If we need to put the values into the cache, we need to be able to capture the JdbcValuesMetadata
 				final CapturingJdbcValuesMetadata capturingMetadata = new CapturingJdbcValuesMetadata( resultSetAccess );
 				JdbcValuesMetadata metadataForCache = capturingMetadata.resolveMetadataForCache();
 				return mappingProducer
-						.reactiveResolve( resultSetAccess, factory )
+						.reactiveResolve( resultSetAccess, session.getLoadQueryInfluencers(), factory )
 						.thenApply( jdbcValuesMapping -> new ReactiveValuesResultSet( resultSetAccess, queryResultsCacheKey, queryIdentifier, executionContext.getQueryOptions(), jdbcValuesMapping, metadataForCache, executionContext ) );
 			}
 		}
 		else {
 			// If we need to put the values into the cache, we need to be able to capture the JdbcValuesMetadata
 			final CapturingJdbcValuesMetadata capturingMetadata = new CapturingJdbcValuesMetadata( resultSetAccess );
-			CompletionStage<JdbcValuesMapping> stage = CompletionStages.nullFuture();
+			final CompletionStage<JdbcValuesMapping> stage;
 			if ( cachedResults.isEmpty() || !( cachedResults.get( 0 ) instanceof JdbcValuesMetadata ) ) {
-				stage = stage.thenCompose(v -> mappingProducer.reactiveResolve(resultSetAccess, factory));
+				stage = mappingProducer.reactiveResolve( resultSetAccess, session.getLoadQueryInfluencers(), factory );
 			}
 			else {
-				stage = stage.thenCompose(v -> mappingProducer.reactiveResolve( (JdbcValuesMetadata) cachedResults.get( 0 ), factory ));
+				stage = mappingProducer.reactiveResolve( (JdbcValuesMetadata) cachedResults.get( 0 ), session.getLoadQueryInfluencers(), factory );
 			}
-			return stage.thenApply(jdbcValuesMapping -> new ReactiveValuesResultSet( resultSetAccess, queryResultsCacheKey, queryIdentifier, executionContext.getQueryOptions(), jdbcValuesMapping, capturingMetadata, executionContext));
+			return stage.thenApply( jdbcValuesMapping -> new ReactiveValuesResultSet(
+					resultSetAccess,
+					queryResultsCacheKey,
+					queryIdentifier,
+					executionContext.getQueryOptions(),
+					jdbcValuesMapping,
+					capturingMetadata,
+					executionContext
+			) );
 		}
 	}
 

hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/results/ReactiveResultSetMapping.java

@@ -13,6 +13,7 @@
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
+import org.hibernate.engine.spi.LoadQueryInfluencers;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.query.named.NamedResultSetMappingMemento;
 import org.hibernate.query.results.ResultBuilder;
@@ -39,7 +40,10 @@ public ReactiveResultSetMapping(ResultSetMapping resultSetMapping) {
 	}
 
 	@Override
-	public JdbcValuesMapping resolve(JdbcValuesMetadata jdbcResultsMetadata, SessionFactoryImplementor sessionFactory) {
+	public JdbcValuesMapping resolve(
+			JdbcValuesMetadata jdbcResultsMetadata,
+			LoadQueryInfluencers loadQueryInfluencers,
+			SessionFactoryImplementor sessionFactory) {
 		throw LOG.nonReactiveMethodCall( "reactiveResolve" );
 	}
 
@@ -48,10 +52,14 @@ public void addAffectedTableNames(Set<String> affectedTableNames, SessionFactory
 		delegate.addAffectedTableNames( affectedTableNames, sessionFactory );
 	}
 
-	public CompletionStage<JdbcValuesMapping> reactiveResolve(JdbcValuesMetadata jdbcResultsMetadata, SessionFactoryImplementor sessionFactory) {
+	@Override
+	public CompletionStage<JdbcValuesMapping> reactiveResolve(
+			JdbcValuesMetadata jdbcResultsMetadata,
+			LoadQueryInfluencers loadQueryInfluencers,
+			SessionFactoryImplementor sessionFactory) {
 		return ( (ReactiveResultSetAccess) jdbcResultsMetadata )
 				.getReactiveResultSet()
-				.thenApply( columnCount -> delegate.resolve(  jdbcResultsMetadata, sessionFactory ) );
+				.thenApply( columnCount -> delegate.resolve( jdbcResultsMetadata, loadQueryInfluencers, sessionFactory ) );
 	}
 
 	@Override

hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/results/internal/ReactiveStandardValuesMappingProducer.java

@@ -9,6 +9,7 @@
 import java.util.List;
 import java.util.concurrent.CompletionStage;
 
+import org.hibernate.engine.spi.LoadQueryInfluencers;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.reactive.logging.impl.Log;
 import org.hibernate.reactive.logging.impl.LoggerFactory;
@@ -32,13 +33,19 @@ public ReactiveStandardValuesMappingProducer(List<SqlSelection> sqlSelections, L
 	}
 
 	@Override
-	public JdbcValuesMapping resolve(JdbcValuesMetadata jdbcResultsMetadata, SessionFactoryImplementor sessionFactory) {
+	public JdbcValuesMapping resolve(
+			JdbcValuesMetadata jdbcResultsMetadata,
+			LoadQueryInfluencers loadQueryInfluencers,
+			SessionFactoryImplementor sessionFactory) {
 		// In this class the ValuesMapping has been already resolved, so it should be fine to implement this method
-		return super.resolve( jdbcResultsMetadata, sessionFactory );
+		return super.resolve( jdbcResultsMetadata, loadQueryInfluencers, sessionFactory );
 	}
 
 	@Override
-	public CompletionStage<JdbcValuesMapping> reactiveResolve(JdbcValuesMetadata jdbcResultsMetadata, SessionFactoryImplementor sessionFactory) {
-		return completedFuture( super.resolve( jdbcResultsMetadata, sessionFactory ) );
+		public CompletionStage<JdbcValuesMapping> reactiveResolve(
+				JdbcValuesMetadata jdbcResultsMetadata,
+				LoadQueryInfluencers loadQueryInfluencers,
+				SessionFactoryImplementor sessionFactory) {
+		return completedFuture( super.resolve( jdbcResultsMetadata, loadQueryInfluencers, sessionFactory ) );
 	}
 }

hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/results/spi/ReactiveValuesMappingProducer.java

@@ -7,6 +7,7 @@
 
 import java.util.concurrent.CompletionStage;
 
+import org.hibernate.engine.spi.LoadQueryInfluencers;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMapping;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
@@ -16,5 +17,8 @@
  */
 public interface ReactiveValuesMappingProducer {
 
-	CompletionStage<JdbcValuesMapping> reactiveResolve(JdbcValuesMetadata jdbcResultsMetadata, SessionFactoryImplementor sessionFactory);
+	CompletionStage<JdbcValuesMapping> reactiveResolve(
+			JdbcValuesMetadata jdbcResultsMetadata,
+			LoadQueryInfluencers loadQueryInfluencers,
+			SessionFactoryImplementor sessionFactory);
 }