From 0186826df874f9c97f5a991a361f340bd971909e Mon Sep 17 00:00:00 2001
From: Gavin King <gavin@hibernate.org>
Date: Fri, 4 Apr 2025 21:33:04 +0200
Subject: [PATCH] clean up a method

---
 ...SingleIdEntityLoaderProvidedQueryImpl.java | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/loader/ast/internal/ReactiveSingleIdEntityLoaderProvidedQueryImpl.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/loader/ast/internal/ReactiveSingleIdEntityLoaderProvidedQueryImpl.java
index b2ec82649..a2b3a384e 100644
--- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/loader/ast/internal/ReactiveSingleIdEntityLoaderProvidedQueryImpl.java
+++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/loader/ast/internal/ReactiveSingleIdEntityLoaderProvidedQueryImpl.java
@@ -7,17 +7,18 @@
 
 import java.util.concurrent.CompletionStage;
 
-import org.hibernate.FlushMode;
 import org.hibernate.LockOptions;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.internal.util.collections.ArrayHelper;
 import org.hibernate.metamodel.mapping.EntityMappingType;
+import org.hibernate.query.Query;
+import org.hibernate.query.QueryFlushMode;
 import org.hibernate.query.named.NamedQueryMemento;
-import org.hibernate.query.spi.QueryImplementor;
 import org.hibernate.reactive.loader.ast.spi.ReactiveSingleIdEntityLoader;
 import org.hibernate.reactive.query.ReactiveSelectionQuery;
 
 import jakarta.persistence.Parameter;
+import org.hibernate.type.descriptor.java.JavaType;
 
 import static org.hibernate.reactive.util.impl.CompletionStages.completedFuture;
 
@@ -30,9 +31,9 @@ public class ReactiveSingleIdEntityLoaderProvidedQueryImpl<T> implements Reactiv
 	private static final CompletionStage<Object[]> EMPTY_ARRAY_STAGE = completedFuture( ArrayHelper.EMPTY_OBJECT_ARRAY );
 
 	private final EntityMappingType entityDescriptor;
-	private final NamedQueryMemento namedQueryMemento;
+	private final NamedQueryMemento<T> namedQueryMemento;
 
-	public ReactiveSingleIdEntityLoaderProvidedQueryImpl(EntityMappingType entityDescriptor, NamedQueryMemento namedQueryMemento) {
+	public ReactiveSingleIdEntityLoaderProvidedQueryImpl(EntityMappingType entityDescriptor, NamedQueryMemento<T> namedQueryMemento) {
 		this.entityDescriptor = entityDescriptor;
 		this.namedQueryMemento = namedQueryMemento;
 	}
@@ -42,17 +43,13 @@ public EntityMappingType getLoadable() {
 		return entityDescriptor;
 	}
 
-	@Override
+	@Override @SuppressWarnings("unchecked")
 	public CompletionStage<T> load(Object pkValue, LockOptions lockOptions, Boolean readOnly, SharedSessionContractImplementor session) {
-		// noinspection unchecked
-		final QueryImplementor<T> query = namedQueryMemento
-				.toQuery( session, entityDescriptor.getMappedJavaType().getJavaTypeClass() );
-
-		//noinspection unchecked
+		final JavaType<T> mappedJavaType = (JavaType<T>) entityDescriptor.getMappedJavaType();
+		final Query<T> query = namedQueryMemento.toQuery( session, mappedJavaType.getJavaTypeClass() );
 		query.setParameter( (Parameter<Object>) query.getParameters().iterator().next(), pkValue );
-		query.setHibernateFlushMode( FlushMode.MANUAL );
-
-		return ( (ReactiveSelectionQuery) query ).reactiveUnique();
+		query.setQueryFlushMode( QueryFlushMode.NO_FLUSH );
+		return ( (ReactiveSelectionQuery<T>) query ).reactiveUnique();
 	}
 
 	@Override