Fix dependencies

Author: DavideD

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

@@ -12,14 +12,16 @@
 import java.util.concurrent.TimeUnit;
 
 import org.hibernate.CacheMode;
+import org.hibernate.SharedSessionContract;
 import org.hibernate.cache.spi.QueryKey;
 import org.hibernate.cache.spi.QueryResultsCache;
+import org.hibernate.engine.internal.ReactivePersistenceContextAdapter;
 import org.hibernate.engine.spi.PersistenceContext;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.internal.util.collections.ArrayHelper;
 import org.hibernate.query.TupleTransformer;
-import org.hibernate.engine.internal.ReactivePersistenceContextAdapter;
+import org.hibernate.query.spi.QueryOptions;
 import org.hibernate.reactive.sql.exec.spi.ReactiveRowProcessingState;
 import org.hibernate.reactive.sql.exec.spi.ReactiveSelectExecutor;
 import org.hibernate.reactive.sql.exec.spi.ReactiveValuesResultSet;
@@ -31,7 +33,6 @@
 import org.hibernate.reactive.sql.results.spi.ReactiveRowReader;
 import org.hibernate.reactive.sql.results.spi.ReactiveValuesMappingProducer;
 import org.hibernate.sql.exec.SqlExecLogger;
-import org.hibernate.sql.exec.internal.JdbcExecHelper;
 import org.hibernate.sql.exec.internal.StandardStatementCreator;
 import org.hibernate.sql.exec.spi.ExecutionContext;
 import org.hibernate.sql.exec.spi.JdbcOperationQuerySelect;
@@ -50,6 +51,8 @@
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.spi.TypeConfiguration;
 
+import static org.hibernate.internal.util.NullnessHelper.coalesceSuppliedValues;
+
 /**
  * @see org.hibernate.sql.exec.internal.JdbcSelectExecutorStandardImpl
  */
@@ -254,26 +257,26 @@ private static <R> RowTransformer<R> rowTransformer(
 			ExecutionContext executionContext,
 			RowTransformer<R> transformer,
 			ReactiveValuesResultSet jdbcValues) {
-		RowTransformer<R> rowTransformer = transformer;
-		if ( rowTransformer == null ) {
-			@SuppressWarnings("unchecked") final TupleTransformer<R> tupleTransformer = (TupleTransformer<R>) executionContext
-					.getQueryOptions()
-					.getTupleTransformer();
-
-			if ( tupleTransformer == null ) {
-				rowTransformer = RowTransformerStandardImpl.instance();
-			}
-			else {
-				final List<DomainResult<?>> domainResults = jdbcValues.getValuesMapping()
-						.getDomainResults();
-				final String[] aliases = new String[domainResults.size()];
-				for ( int i = 0; i < domainResults.size(); i++ ) {
-					aliases[i] = domainResults.get( i ).getResultVariable();
-				}
-				rowTransformer = new RowTransformerTupleTransformerAdapter<>( aliases, tupleTransformer );
-			}
+		if ( transformer != null ) {
+			return transformer;
+		}
+
+		@SuppressWarnings("unchecked")
+		final TupleTransformer<R> tupleTransformer = (TupleTransformer<R>) executionContext
+				.getQueryOptions()
+				.getTupleTransformer();
+
+		if ( tupleTransformer == null ) {
+			return RowTransformerStandardImpl.instance();
 		}
-		return rowTransformer;
+
+		final List<DomainResult<?>> domainResults = jdbcValues
+				.getValuesMapping().getDomainResults();
+		final String[] aliases = new String[domainResults.size()];
+		for ( int i = 0; i < domainResults.size(); i++ ) {
+			aliases[i] = domainResults.get( i ).getResultVariable();
+		}
+		return new RowTransformerTupleTransformerAdapter<>( aliases, tupleTransformer );
 	}
 
 	public CompletionStage<ReactiveValuesResultSet> resolveJdbcValuesSource(
@@ -286,13 +289,13 @@ public CompletionStage<ReactiveValuesResultSet> resolveJdbcValuesSource(
 		final SessionFactoryImplementor factory = session.getFactory();
 		final boolean queryCacheEnabled = factory.getSessionFactoryOptions().isQueryCacheEnabled();
 
-		final List<?> cachedResults;
-		final CacheMode cacheMode = JdbcExecHelper.resolveCacheMode( executionContext );
+		final CacheMode cacheMode = resolveCacheMode( executionContext );
 		final boolean cacheable = queryCacheEnabled
 				&& canBeCached
 				&& executionContext.getQueryOptions().isResultCachingEnabled() == Boolean.TRUE;
 		final QueryKey queryResultsCacheKey;
 
+		final List<?> cachedResults;
 		if ( cacheable && cacheMode.isGetEnabled() ) {
 			SqlExecLogger.SQL_EXEC_LOGGER.debugf( "Reading Query result cache data per CacheMode#isGetEnabled [%s]", cacheMode.name() );
 			final Set<String> querySpaces = jdbcSelect.getAffectedTableNames();
@@ -419,6 +422,20 @@ public CompletionStage<ReactiveValuesResultSet> resolveJdbcValuesSource(
 		}
 	}
 
+
+	/**
+	 * Copied from Hibernate ORM
+	 */
+	private static CacheMode resolveCacheMode(ExecutionContext executionContext) {
+		final QueryOptions queryOptions = executionContext.getQueryOptions();
+		final SharedSessionContract session = executionContext.getSession();
+		return coalesceSuppliedValues(
+				() -> queryOptions == null ? null : queryOptions.getCacheMode(),
+				session::getCacheMode,
+				() -> CacheMode.NORMAL
+		);
+	}
+
 	/**
 	 * see {@link CachedJdbcValuesMetadata}
 	 */