Fix latest compilation errors

Author: DavideD

hibernate-reactive-core/src/main/java/org/hibernate/reactive/generator/values/internal/ReactiveGeneratedValuesHelper.java

@@ -5,13 +5,6 @@
  */
 package org.hibernate.reactive.generator.values.internal;
 
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CompletionStage;
-
 import org.hibernate.HibernateException;
 import org.hibernate.Internal;
 import org.hibernate.dialect.Dialect;
@@ -48,8 +41,15 @@
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesSourceProcessingOptions;
 import org.hibernate.type.descriptor.WrapperOptions;
 
-import static org.hibernate.generator.internal.NaturalIdHelper.getNaturalIdPropertyNames;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CompletionStage;
+
 import static org.hibernate.generator.values.internal.GeneratedValuesHelper.noCustomSql;
+import static org.hibernate.internal.NaturalIdHelper.getNaturalIdPropertyNames;
 import static org.hibernate.reactive.sql.results.spi.ReactiveListResultsConsumer.UniqueSemantic.NONE;
 
 /**

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

@@ -55,8 +55,7 @@ public CompletionStage<T> load(
 			SharedSessionContractImplementor session) {
 		final ReactiveSingleIdLoadPlan<T> loadPlan = (ReactiveSingleIdLoadPlan<T>) resolveLoadPlan(
 				lockOptions,
-				session.getLoadQueryInfluencers(),
-				session.getFactory()
+				session.getLoadQueryInfluencers()
 		);
 		return loadPlan.load( key, readOnly, true, session );
 	}
@@ -68,7 +67,7 @@ public CompletionStage<T> load(
 			LockOptions lockOptions,
 			Boolean readOnly,
 			SharedSessionContractImplementor session) {
-		final ReactiveSingleIdLoadPlan<T> loadPlan = (ReactiveSingleIdLoadPlan<T>) resolveLoadPlan( lockOptions, session.getLoadQueryInfluencers(), session.getFactory() );
+		final ReactiveSingleIdLoadPlan<T> loadPlan = (ReactiveSingleIdLoadPlan<T>) resolveLoadPlan( lockOptions, session.getLoadQueryInfluencers() );
 		return loadPlan.load( key, entityInstance, readOnly, false, session );
 	}
 

hibernate-reactive-core/src/main/java/org/hibernate/reactive/query/internal/ReactiveNamedObjectRepositoryImpl.java

@@ -5,6 +5,7 @@
  */
 package org.hibernate.reactive.query.internal;
 
+import jakarta.persistence.TypedQuery;
 import java.util.Map;
 import java.util.function.Consumer;
 
@@ -48,6 +49,11 @@ public void registerNamedQuery(String name, Query query) {
 		delegate.registerNamedQuery( name, query );
 	}
 
+	@Override
+	public <R> TypedQueryReference<R> registerNamedQuery(String name, TypedQuery<R> query) {
+		return delegate.registerNamedQuery( name, query );
+	}
+
 	@Override
 	public void visitSqmQueryMementos(Consumer<NamedSqmQueryMemento<?>> action) {
 		delegate.visitSqmQueryMementos( action );

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

@@ -412,14 +412,17 @@ 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
-        );
+		return coalesceSuppliedValues(
+				() -> queryOptions == null ? null : queryOptions.getCacheMode(),
+				session::getCacheMode,
+				() -> CacheMode.NORMAL
+		);
 	}
 
 	/**