fix up some unchecked casts and other warnings

gavinking · DavideD · commit 7af1fc0eb366 · 2025-04-25T17:22:23.000+02:00
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveAbstractPersisterDelegate.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveAbstractPersisterDelegate.java
@@ -24,6 +24,7 @@
 import org.hibernate.generator.values.GeneratedValues;
 import org.hibernate.id.IdentityGenerator;
 import org.hibernate.loader.ast.spi.BatchLoaderFactory;
+import org.hibernate.loader.ast.spi.EntityBatchLoader;
 import org.hibernate.loader.ast.spi.MultiIdLoadOptions;
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.mapping.Property;
@@ -80,11 +81,11 @@ public class ReactiveAbstractPersisterDelegate {
 
 	private static final Log LOG = LoggerFactory.make( Log.class, MethodHandles.lookup() );
 
-	private final Supplier<ReactiveSingleIdEntityLoader<Object>> singleIdEntityLoaderSupplier;
-	private final Supplier<ReactiveMultiIdEntityLoader<Object>> multiIdEntityLoaderSupplier;
+	private final Supplier<ReactiveSingleIdEntityLoader<?>> singleIdEntityLoaderSupplier;
+	private final Supplier<ReactiveMultiIdEntityLoader<?>> multiIdEntityLoaderSupplier;
 
-	private ReactiveSingleIdEntityLoader<Object> singleIdEntityLoader;
-	private ReactiveMultiIdEntityLoader<Object> multiIdEntityLoader;
+	private ReactiveSingleIdEntityLoader<?> singleIdEntityLoader;
+	private ReactiveMultiIdEntityLoader<?> multiIdEntityLoader;
 
 	private final EntityPersister entityDescriptor;
 
@@ -100,12 +101,12 @@ public ReactiveAbstractPersisterDelegate(
 		entityDescriptor = entityPersister;
 	}
 
-	public ReactiveSingleIdEntityLoader<Object> buildSingleIdEntityLoader() {
+	public ReactiveSingleIdEntityLoader<?> buildSingleIdEntityLoader() {
 		singleIdEntityLoader = singleIdEntityLoaderSupplier.get();
 		return singleIdEntityLoader;
 	}
 
-	public ReactiveMultiIdEntityLoader<Object> buildMultiIdEntityLoader() {
+	public ReactiveMultiIdEntityLoader<?> buildMultiIdEntityLoader() {
 		multiIdEntityLoader = multiIdEntityLoaderSupplier.get();
 		return multiIdEntityLoader;
 	}
@@ -134,45 +135,58 @@ private static ReactiveMultiIdEntityLoader<Object> buildMultiIdEntityLoader(
 			PersistentClass persistentClass,
 			SessionFactoryImplementor factory) {
 		return entityDescriptor.getIdentifierType() instanceof BasicType
-				&& supportsSqlArrayType( factory.getJdbcServices().getDialect() )
+			&& supportsSqlArrayType( factory.getJdbcServices().getDialect() )
 				? new ReactiveMultiIdEntityLoaderArrayParam<>( entityDescriptor, factory )
 				: new ReactiveMultiIdEntityLoaderStandard<>( entityDescriptor, persistentClass, factory );
 	}
 
-	private static ReactiveSingleIdEntityLoader<Object> buildSingleIdEntityLoader(
+	private static ReactiveSingleIdEntityLoader<?> buildSingleIdEntityLoader(
 			EntityPersister entityDescriptor,
 			PersistentClass bootDescriptor,
 			RuntimeModelCreationContext creationContext,
 			SessionFactoryImplementor factory,
 			String entityName) {
 		if ( bootDescriptor.getLoaderName() != null ) {
 			// We must resolve the named query on-demand through the boot model because it isn't initialized yet
-			final NamedQueryMemento namedQueryMemento = factory.getQueryEngine().getNamedObjectRepository()
-					.resolve( factory, creationContext.getBootModel(), bootDescriptor.getLoaderName() );
-			if ( namedQueryMemento == null ) {
-				throw new IllegalArgumentException( "Could not resolve named load-query [" + entityName + "] : " + bootDescriptor.getLoaderName() );
-			}
+			final NamedQueryMemento<?> namedQueryMemento =
+					getNamedQueryMemento( bootDescriptor, creationContext, factory, entityName );
 			return new ReactiveSingleIdEntityLoaderProvidedQueryImpl<>( entityDescriptor, namedQueryMemento );
 		}
-
-		LoadQueryInfluencers loadQueryInfluencers = new LoadQueryInfluencers( factory );
-		if ( loadQueryInfluencers.effectivelyBatchLoadable( entityDescriptor ) ) {
-			final int batchSize = loadQueryInfluencers.effectiveBatchSize( entityDescriptor );
-			if ( batchSize > 1 ) {
+		else {
+			final LoadQueryInfluencers loadQueryInfluencers = new LoadQueryInfluencers( factory );
+			if ( loadQueryInfluencers.effectivelyBatchLoadable( entityDescriptor ) ) {
+				final int batchSize = loadQueryInfluencers.effectiveBatchSize( entityDescriptor );
 				return createBatchingIdEntityLoader( entityDescriptor, batchSize, factory );
 			}
+			else {
+				return new ReactiveSingleIdEntityLoaderStandardImpl<>( entityDescriptor, loadQueryInfluencers );
+			}
 		}
+	}
 
-		return new ReactiveSingleIdEntityLoaderStandardImpl<>( entityDescriptor, new LoadQueryInfluencers( factory ) );
+	private static NamedQueryMemento<?> getNamedQueryMemento(
+			PersistentClass bootDescriptor,
+			RuntimeModelCreationContext creationContext,
+			SessionFactoryImplementor factory,
+			String entityName) {
+		final NamedQueryMemento<?> namedQueryMemento =
+				factory.getQueryEngine().getNamedObjectRepository()
+						.resolve(factory, creationContext.getBootModel(), bootDescriptor.getLoaderName() );
+		if ( namedQueryMemento == null ) {
+			throw new IllegalArgumentException( "Could not resolve named query '" + bootDescriptor.getLoaderName()
+					+ "' for loading entity '" + entityName + "'" );
+		}
+		return namedQueryMemento;
 	}
 
-	private static ReactiveSingleIdEntityLoader<Object> createBatchingIdEntityLoader(
+	private static <T> ReactiveSingleIdEntityLoader<?> createBatchingIdEntityLoader(
 			EntityMappingType entityDescriptor,
 			int domainBatchSize,
 			SessionFactoryImplementor factory) {
-		return (ReactiveSingleIdEntityLoader) factory.getServiceRegistry()
-				.getService( BatchLoaderFactory.class )
-				.createEntityBatchLoader( domainBatchSize, entityDescriptor, factory );
+		final EntityBatchLoader<?> batchLoader =
+				factory.getServiceRegistry().requireService( BatchLoaderFactory.class )
+						.createEntityBatchLoader( domainBatchSize, entityDescriptor, factory );
+		return (ReactiveSingleIdEntityLoader<?>) batchLoader;
 	}
 
 	public CompletionStage<Void> processInsertGeneratedProperties(
@@ -235,7 +249,7 @@ protected ReactiveSingleUniqueKeyEntityLoader<Object> getReactiveUniqueKeyLoader
 		);
 	}
 
-	public CompletionStage<Object> load(
+	public CompletionStage<?> load(
 			EntityPersister persister,
 			Object id,
 			Object optionalObject,
@@ -254,7 +268,7 @@ public Generator reactive(Generator generator) {
 		return generator instanceof IdentityGenerator ? new ReactiveIdentityGenerator() : generator;
 	}
 
-	public CompletionStage<Object> loadEntityIdByNaturalId(
+	public CompletionStage<?> loadEntityIdByNaturalId(
 			Object[] orderedNaturalIdValues, LockOptions lockOptions, SharedSessionContractImplementor session) {
 		if ( LOG.isTraceEnabled() ) {
 			LOG.tracef( "Resolving natural-id [%s] to id : %s ",
@@ -263,7 +277,7 @@ public CompletionStage<Object> loadEntityIdByNaturalId(
 			);
 		}
 
-		return ( (ReactiveNaturalIdLoader) entityDescriptor.getNaturalIdLoader() )
+		return ( (ReactiveNaturalIdLoader<?>) entityDescriptor.getNaturalIdLoader() )
 				.resolveNaturalIdToId( orderedNaturalIdValues, session );
 	}
 
@@ -322,13 +336,15 @@ public AttributeMapping buildPluralAttributeMapping(
 	}
 
 	public EntityIdentifierMapping convertEntityIdentifierMapping(EntityIdentifierMapping entityIdentifierMapping) {
-		if ( entityIdentifierMapping instanceof NonAggregatedIdentifierMappingImpl ) {
-			return new ReactiveNonAggregatedIdentifierMappingImpl( (NonAggregatedIdentifierMappingImpl) entityIdentifierMapping );
+		if ( entityIdentifierMapping instanceof NonAggregatedIdentifierMappingImpl nonAggregatedIdentifierMapping ) {
+			return new ReactiveNonAggregatedIdentifierMappingImpl(nonAggregatedIdentifierMapping);
+		}
+		else if ( entityIdentifierMapping instanceof EmbeddedIdentifierMappingImpl embeddedIdentifierMapping ) {
+			return new ReactiveEmbeddedIdentifierMappingImpl(embeddedIdentifierMapping);
 		}
-		if ( entityIdentifierMapping instanceof EmbeddedIdentifierMappingImpl ) {
-			return new ReactiveEmbeddedIdentifierMappingImpl( (EmbeddedIdentifierMappingImpl) entityIdentifierMapping );
+		else {
+			return entityIdentifierMapping;
 		}
-		return entityIdentifierMapping;
 	}
 
 	private static class ReactiveNonAggregatedIdentifierMappingImpl extends NonAggregatedIdentifierMappingImpl {
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveEntityPersister.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveEntityPersister.java
@@ -94,37 +94,37 @@ <K> CompletionStage<? extends List<?>> reactiveMultiLoad(
 			SharedSessionContractImplementor session,
 			MultiIdLoadOptions loadOptions);
 
-	CompletionStage<Object> reactiveLoad(
+	CompletionStage<?> reactiveLoad(
 			Object id,
 			Object optionalObject,
 			LockMode lockMode,
 			SharedSessionContractImplementor session);
 
-	CompletionStage<Object> reactiveLoad(
+	CompletionStage<?> reactiveLoad(
 			Object id,
 			Object optionalObject,
 			LockOptions lockOptions,
 			SharedSessionContractImplementor session);
 
-	CompletionStage<Object> reactiveLoad(
+	CompletionStage<?> reactiveLoad(
 			Object id,
 			Object optionalObject,
 			LockOptions lockOptions,
 			SharedSessionContractImplementor session,
 			Boolean readOnly);
 
-	CompletionStage<Object> reactiveLoadByUniqueKey(
+	CompletionStage<?> reactiveLoadByUniqueKey(
 			String propertyName,
 			Object uniqueKey,
 			SharedSessionContractImplementor session);
 
-	CompletionStage<Object> reactiveLoadByUniqueKey(
+	CompletionStage<?> reactiveLoadByUniqueKey(
 			String propertyName,
 			Object uniqueKey,
 			Boolean readOnly,
 			SharedSessionContractImplementor session);
 
-	CompletionStage<Object> reactiveLoadEntityIdByNaturalId(
+	CompletionStage<?> reactiveLoadEntityIdByNaturalId(
 			Object[] naturalIdValues,
 			LockOptions lockOptions,
 			SharedSessionContractImplementor session);
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveJoinedSubclassEntityPersister.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveJoinedSubclassEntityPersister.java
@@ -82,7 +82,7 @@ protected SingleIdEntityLoader<?> buildSingleIdEntityLoader() {
 	}
 
 	@Override
-	protected MultiIdEntityLoader<Object> buildMultiIdLoader() {
+	protected MultiIdEntityLoader<?> buildMultiIdLoader() {
 		return reactiveDelegate.buildMultiIdEntityLoader();
 	}
 
@@ -312,7 +312,7 @@ protected Object initializeLazyPropertiesFromDatastore(Object entity, Object id,
 	}
 
 	@Override
-	public CompletionStage<Object> reactiveLoad(Object id, Object optionalObject, LockMode lockMode, SharedSessionContractImplementor session) {
+	public CompletionStage<?> reactiveLoad(Object id, Object optionalObject, LockMode lockMode, SharedSessionContractImplementor session) {
 		return reactiveLoad( id, optionalObject, new LockOptions().setLockMode( lockMode ), session );
 	}
 
@@ -322,7 +322,7 @@ public Object load(Object id, Object optionalObject, LockOptions lockOptions, Sh
 	}
 
 	@Override
-	public CompletionStage<Object> reactiveLoad(Object id, Object optionalObject, LockOptions lockOptions, SharedSessionContractImplementor session) {
+	public CompletionStage<?> reactiveLoad(Object id, Object optionalObject, LockOptions lockOptions, SharedSessionContractImplementor session) {
 		return doReactiveLoad( id, optionalObject, lockOptions, null, session );
 	}
 
@@ -332,11 +332,11 @@ public Object load(Object id, Object optionalObject, LockOptions lockOptions, Sh
 	}
 
 	@Override
-	public CompletionStage<Object> reactiveLoad(Object id, Object optionalObject, LockOptions lockOptions, SharedSessionContractImplementor session, Boolean readOnly) {
+	public CompletionStage<?> reactiveLoad(Object id, Object optionalObject, LockOptions lockOptions, SharedSessionContractImplementor session, Boolean readOnly) {
 		return doReactiveLoad( id, optionalObject, lockOptions, readOnly, session );
 	}
 
-	private CompletionStage<Object> doReactiveLoad(Object id, Object optionalObject, LockOptions lockOptions, Boolean readOnly, SharedSessionContractImplementor session) {
+	private CompletionStage<?> doReactiveLoad(Object id, Object optionalObject, LockOptions lockOptions, Boolean readOnly, SharedSessionContractImplementor session) {
 		return reactiveDelegate.load( this, id, optionalObject, lockOptions, readOnly, session );
 	}
 
@@ -370,7 +370,7 @@ public CompletionStage<Object> reactiveLoadByUniqueKey(String propertyName, Obje
 	 * @see AbstractEntityPersister#loadEntityIdByNaturalId(Object[], LockOptions, SharedSessionContractImplementor)
 	 */
 	@Override
-	public CompletionStage<Object> reactiveLoadEntityIdByNaturalId(Object[] orderedNaturalIdValues, LockOptions lockOptions, SharedSessionContractImplementor session) {
+	public CompletionStage<?> reactiveLoadEntityIdByNaturalId(Object[] orderedNaturalIdValues, LockOptions lockOptions, SharedSessionContractImplementor session) {
 		verifyHasNaturalId();
 		return reactiveDelegate.loadEntityIdByNaturalId( orderedNaturalIdValues, lockOptions, session );
 	}
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveSingleTableEntityPersister.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveSingleTableEntityPersister.java
@@ -69,7 +69,7 @@ public class ReactiveSingleTableEntityPersister extends SingleTableEntityPersist
 
 	private static final Log LOG = make( Log.class, lookup() );
 
-	private ReactiveAbstractPersisterDelegate reactiveDelegate;
+	private final ReactiveAbstractPersisterDelegate reactiveDelegate;
 
 	public ReactiveSingleTableEntityPersister(
 			final PersistentClass persistentClass,
@@ -101,7 +101,7 @@ protected SingleIdEntityLoader<?> buildSingleIdEntityLoader() {
 	}
 
 	@Override
-	protected MultiIdEntityLoader<Object> buildMultiIdLoader() {
+	protected MultiIdEntityLoader<?> buildMultiIdLoader() {
 		return reactiveDelegate.buildMultiIdEntityLoader();
 	}
 
@@ -301,13 +301,13 @@ public CompletionStage<Void> reactiveProcessUpdateGenerated(Object id, Object en
 	 * @see AbstractEntityPersister#loadEntityIdByNaturalId(Object[], LockOptions, SharedSessionContractImplementor)
 	 */
 	@Override
-	public CompletionStage<Object> reactiveLoadEntityIdByNaturalId(Object[] orderedNaturalIdValues, LockOptions lockOptions, SharedSessionContractImplementor session) {
+	public CompletionStage<?> reactiveLoadEntityIdByNaturalId(Object[] orderedNaturalIdValues, LockOptions lockOptions, SharedSessionContractImplementor session) {
 		verifyHasNaturalId();
 		return reactiveDelegate.loadEntityIdByNaturalId( orderedNaturalIdValues, lockOptions, session );
 	}
 
 	@Override
-	public CompletionStage<Object> reactiveLoad(Object id, Object optionalObject, LockMode lockMode, SharedSessionContractImplementor session) {
+	public CompletionStage<?> reactiveLoad(Object id, Object optionalObject, LockMode lockMode, SharedSessionContractImplementor session) {
 		return reactiveLoad( id, optionalObject, new LockOptions().setLockMode( lockMode ), session );
 	}
 
@@ -317,7 +317,7 @@ public Object load(Object id, Object optionalObject, LockOptions lockOptions, Sh
 	}
 
 	@Override
-	public CompletionStage<Object> reactiveLoad(Object id, Object optionalObject, LockOptions lockOptions, SharedSessionContractImplementor session) {
+	public CompletionStage<?> reactiveLoad(Object id, Object optionalObject, LockOptions lockOptions, SharedSessionContractImplementor session) {
 		return doReactiveLoad( id, optionalObject, lockOptions, null, session );
 	}
 
@@ -327,11 +327,11 @@ public Object load(Object id, Object optionalObject, LockOptions lockOptions, Sh
 	}
 
 	@Override
-	public CompletionStage<Object> reactiveLoad(Object id, Object optionalObject, LockOptions lockOptions, SharedSessionContractImplementor session, Boolean readOnly) {
+	public CompletionStage<?> reactiveLoad(Object id, Object optionalObject, LockOptions lockOptions, SharedSessionContractImplementor session, Boolean readOnly) {
 		return doReactiveLoad( id, optionalObject, lockOptions, readOnly, session );
 	}
 
-	private CompletionStage<Object> doReactiveLoad(Object id, Object optionalObject, LockOptions lockOptions, Boolean readOnly, SharedSessionContractImplementor session) {
+	private CompletionStage<?> doReactiveLoad(Object id, Object optionalObject, LockOptions lockOptions, Boolean readOnly, SharedSessionContractImplementor session) {
 		return reactiveDelegate.load( this, id, optionalObject, lockOptions, readOnly, session );
 	}
 
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveUnionSubclassEntityPersister.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveUnionSubclassEntityPersister.java
@@ -82,7 +82,7 @@ protected SingleIdEntityLoader<?> buildSingleIdEntityLoader() {
 	}
 
 	@Override
-	protected MultiIdEntityLoader<Object> buildMultiIdLoader() {
+	protected MultiIdEntityLoader<?> buildMultiIdLoader() {
 		return reactiveDelegate.buildMultiIdEntityLoader();
 	}
 
@@ -148,14 +148,6 @@ public NaturalIdMapping generateNaturalIdMapping(MappingModelCreationProcess cre
 		return ReactiveAbstractEntityPersister.super.generateNaturalIdMapping(creationProcess, bootEntityDescriptor);
 	}
 
-
-	@Override
-	protected void validateGenerator() {
-		if ( super.getGenerator() instanceof IdentityGenerator ) {
-			throw new MappingException( "Cannot use identity column key generation with <union-subclass> mapping for: " + getEntityName() );
-		}
-	}
-
 	@Override
 	protected InsertCoordinator buildInsertCoordinator() {
 		return ReactiveCoordinatorFactory.buildInsertCoordinator( this, getFactory() );
@@ -180,6 +172,13 @@ public <T> DomainResult<T> createDomainResult(
 		return reactiveDelegate.createDomainResult( this, navigablePath, tableGroup, resultVariable, creationState );
 	}
 
+	@Override
+	protected void validateGenerator() {
+		if ( super.getGenerator() instanceof IdentityGenerator) {
+			throw new MappingException( "Cannot use identity column key generation with <union-subclass> mapping for: " + getEntityName() );
+		}
+	}
+
 	@Override
 	public Generator getGenerator() throws HibernateException {
 		return reactiveDelegate.reactive( super.getGenerator() );
@@ -279,7 +278,7 @@ protected Object initializeLazyPropertiesFromDatastore(Object entity, Object id,
 	}
 
 	@Override
-	public CompletionStage<Object> reactiveLoad(Object id, Object optionalObject, LockMode lockMode, SharedSessionContractImplementor session) {
+	public CompletionStage<?> reactiveLoad(Object id, Object optionalObject, LockMode lockMode, SharedSessionContractImplementor session) {
 		return reactiveLoad( id, optionalObject, new LockOptions().setLockMode( lockMode ), session );
 	}
 
@@ -289,7 +288,7 @@ public Object load(Object id, Object optionalObject, LockOptions lockOptions, Sh
 	}
 
 	@Override
-	public CompletionStage<Object> reactiveLoad(Object id, Object optionalObject, LockOptions lockOptions, SharedSessionContractImplementor session) {
+	public CompletionStage<?> reactiveLoad(Object id, Object optionalObject, LockOptions lockOptions, SharedSessionContractImplementor session) {
 		return doReactiveLoad( id, optionalObject, lockOptions, null, session );
 	}
 
@@ -299,11 +298,11 @@ public Object load(Object id, Object optionalObject, LockOptions lockOptions, Sh
 	}
 
 	@Override
-	public CompletionStage<Object> reactiveLoad(Object id, Object optionalObject, LockOptions lockOptions, SharedSessionContractImplementor session, Boolean readOnly) {
+	public CompletionStage<?> reactiveLoad(Object id, Object optionalObject, LockOptions lockOptions, SharedSessionContractImplementor session, Boolean readOnly) {
 		return doReactiveLoad( id, optionalObject, lockOptions, readOnly, session );
 	}
 
-	private CompletionStage<Object> doReactiveLoad(Object id, Object optionalObject, LockOptions lockOptions, Boolean readOnly, SharedSessionContractImplementor session) {
+	private CompletionStage<?> doReactiveLoad(Object id, Object optionalObject, LockOptions lockOptions, Boolean readOnly, SharedSessionContractImplementor session) {
 		return reactiveDelegate.load( this, id, optionalObject, lockOptions, readOnly, session );
 	}
 
@@ -372,7 +371,7 @@ public <K> CompletionStage<? extends List<?>> reactiveMultiLoad(K[] ids, SharedS
 	 * @see AbstractEntityPersister#loadEntityIdByNaturalId(Object[], LockOptions, SharedSessionContractImplementor)
 	 */
 	@Override
-	public CompletionStage<Object> reactiveLoadEntityIdByNaturalId(Object[] orderedNaturalIdValues, LockOptions lockOptions, SharedSessionContractImplementor session) {
+	public CompletionStage<?> reactiveLoadEntityIdByNaturalId(Object[] orderedNaturalIdValues, LockOptions lockOptions, SharedSessionContractImplementor session) {
 		verifyHasNaturalId();
 		return reactiveDelegate.loadEntityIdByNaturalId( orderedNaturalIdValues, lockOptions, session );
 	}
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveStatelessSessionImpl.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveStatelessSessionImpl.java

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ protected SingleIdEntityLoader<?> buildSingleIdEntityLoader() {`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`@Override`
`85`		`- protected MultiIdEntityLoader<Object> buildMultiIdLoader() {`
	`85`	`+ protected MultiIdEntityLoader<?> buildMultiIdLoader() {`
`86`	`86`	`return reactiveDelegate.buildMultiIdEntityLoader();`
`87`	`87`	`}`
`88`	`88`
`@@ -312,7 +312,7 @@ protected Object initializeLazyPropertiesFromDatastore(Object entity, Object id,`
`312`	`312`	`}`
`313`	`313`
`314`	`314`	`@Override`
`315`		`- public CompletionStage<Object> reactiveLoad(Object id, Object optionalObject, LockMode lockMode, SharedSessionContractImplementor session) {`
	`315`	`+ public CompletionStage<?> reactiveLoad(Object id, Object optionalObject, LockMode lockMode, SharedSessionContractImplementor session) {`
`316`	`316`	`return reactiveLoad( id, optionalObject, new LockOptions().setLockMode( lockMode ), session );`
`317`	`317`	`}`
`318`	`318`
`@@ -322,7 +322,7 @@ public Object load(Object id, Object optionalObject, LockOptions lockOptions, Sh`
`322`	`322`	`}`
`323`	`323`
`324`	`324`	`@Override`
`325`		`- public CompletionStage<Object> reactiveLoad(Object id, Object optionalObject, LockOptions lockOptions, SharedSessionContractImplementor session) {`
	`325`	`+ public CompletionStage<?> reactiveLoad(Object id, Object optionalObject, LockOptions lockOptions, SharedSessionContractImplementor session) {`
`326`	`326`	`return doReactiveLoad( id, optionalObject, lockOptions, null, session );`
`327`	`327`	`}`
`328`	`328`
`@@ -332,11 +332,11 @@ public Object load(Object id, Object optionalObject, LockOptions lockOptions, Sh`
`332`	`332`	`}`
`333`	`333`
`334`	`334`	`@Override`
`335`		`- public CompletionStage<Object> reactiveLoad(Object id, Object optionalObject, LockOptions lockOptions, SharedSessionContractImplementor session, Boolean readOnly) {`
	`335`	`+ public CompletionStage<?> reactiveLoad(Object id, Object optionalObject, LockOptions lockOptions, SharedSessionContractImplementor session, Boolean readOnly) {`
`336`	`336`	`return doReactiveLoad( id, optionalObject, lockOptions, readOnly, session );`
`337`	`337`	`}`
`338`	`338`
`339`		`- private CompletionStage<Object> doReactiveLoad(Object id, Object optionalObject, LockOptions lockOptions, Boolean readOnly, SharedSessionContractImplementor session) {`
	`339`	`+ private CompletionStage<?> doReactiveLoad(Object id, Object optionalObject, LockOptions lockOptions, Boolean readOnly, SharedSessionContractImplementor session) {`
`340`	`340`	`return reactiveDelegate.load( this, id, optionalObject, lockOptions, readOnly, session );`
`341`	`341`	`}`
`342`	`342`
`@@ -370,7 +370,7 @@ public CompletionStage<Object> reactiveLoadByUniqueKey(String propertyName, Obje`
`370`	`370`	`* @see AbstractEntityPersister#loadEntityIdByNaturalId(Object[], LockOptions, SharedSessionContractImplementor)`
`371`	`371`	`*/`
`372`	`372`	`@Override`
`373`		`- public CompletionStage<Object> reactiveLoadEntityIdByNaturalId(Object[] orderedNaturalIdValues, LockOptions lockOptions, SharedSessionContractImplementor session) {`
	`373`	`+ public CompletionStage<?> reactiveLoadEntityIdByNaturalId(Object[] orderedNaturalIdValues, LockOptions lockOptions, SharedSessionContractImplementor session) {`
`374`	`374`	`verifyHasNaturalId();`
`375`	`375`	`return reactiveDelegate.loadEntityIdByNaturalId( orderedNaturalIdValues, lockOptions, session );`
`376`	`376`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public class ReactiveSingleTableEntityPersister extends SingleTableEntityPersist`
`69`	`69`
`70`	`70`	`private static final Log LOG = make( Log.class, lookup() );`
`71`	`71`
`72`		`- private ReactiveAbstractPersisterDelegate reactiveDelegate;`
	`72`	`+ private final ReactiveAbstractPersisterDelegate reactiveDelegate;`
`73`	`73`
`74`	`74`	`public ReactiveSingleTableEntityPersister(`
`75`	`75`	`final PersistentClass persistentClass,`
`@@ -101,7 +101,7 @@ protected SingleIdEntityLoader<?> buildSingleIdEntityLoader() {`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`@Override`
`104`		`- protected MultiIdEntityLoader<Object> buildMultiIdLoader() {`
	`104`	`+ protected MultiIdEntityLoader<?> buildMultiIdLoader() {`
`105`	`105`	`return reactiveDelegate.buildMultiIdEntityLoader();`
`106`	`106`	`}`
`107`	`107`
`@@ -301,13 +301,13 @@ public CompletionStage<Void> reactiveProcessUpdateGenerated(Object id, Object en`
`301`	`301`	`* @see AbstractEntityPersister#loadEntityIdByNaturalId(Object[], LockOptions, SharedSessionContractImplementor)`
`302`	`302`	`*/`
`303`	`303`	`@Override`
`304`		`- public CompletionStage<Object> reactiveLoadEntityIdByNaturalId(Object[] orderedNaturalIdValues, LockOptions lockOptions, SharedSessionContractImplementor session) {`
	`304`	`+ public CompletionStage<?> reactiveLoadEntityIdByNaturalId(Object[] orderedNaturalIdValues, LockOptions lockOptions, SharedSessionContractImplementor session) {`
`305`	`305`	`verifyHasNaturalId();`
`306`	`306`	`return reactiveDelegate.loadEntityIdByNaturalId( orderedNaturalIdValues, lockOptions, session );`
`307`	`307`	`}`
`308`	`308`
`309`	`309`	`@Override`
`310`		`- public CompletionStage<Object> reactiveLoad(Object id, Object optionalObject, LockMode lockMode, SharedSessionContractImplementor session) {`
	`310`	`+ public CompletionStage<?> reactiveLoad(Object id, Object optionalObject, LockMode lockMode, SharedSessionContractImplementor session) {`
`311`	`311`	`return reactiveLoad( id, optionalObject, new LockOptions().setLockMode( lockMode ), session );`
`312`	`312`	`}`
`313`	`313`
`@@ -317,7 +317,7 @@ public Object load(Object id, Object optionalObject, LockOptions lockOptions, Sh`
`317`	`317`	`}`
`318`	`318`
`319`	`319`	`@Override`
`320`		`- public CompletionStage<Object> reactiveLoad(Object id, Object optionalObject, LockOptions lockOptions, SharedSessionContractImplementor session) {`
	`320`	`+ public CompletionStage<?> reactiveLoad(Object id, Object optionalObject, LockOptions lockOptions, SharedSessionContractImplementor session) {`
`321`	`321`	`return doReactiveLoad( id, optionalObject, lockOptions, null, session );`
`322`	`322`	`}`
`323`	`323`
`@@ -327,11 +327,11 @@ public Object load(Object id, Object optionalObject, LockOptions lockOptions, Sh`
`327`	`327`	`}`
`328`	`328`
`329`	`329`	`@Override`
`330`		`- public CompletionStage<Object> reactiveLoad(Object id, Object optionalObject, LockOptions lockOptions, SharedSessionContractImplementor session, Boolean readOnly) {`
	`330`	`+ public CompletionStage<?> reactiveLoad(Object id, Object optionalObject, LockOptions lockOptions, SharedSessionContractImplementor session, Boolean readOnly) {`
`331`	`331`	`return doReactiveLoad( id, optionalObject, lockOptions, readOnly, session );`
`332`	`332`	`}`
`333`	`333`
`334`		`- private CompletionStage<Object> doReactiveLoad(Object id, Object optionalObject, LockOptions lockOptions, Boolean readOnly, SharedSessionContractImplementor session) {`
	`334`	`+ private CompletionStage<?> doReactiveLoad(Object id, Object optionalObject, LockOptions lockOptions, Boolean readOnly, SharedSessionContractImplementor session) {`
`335`	`335`	`return reactiveDelegate.load( this, id, optionalObject, lockOptions, readOnly, session );`
`336`	`336`	`}`
`337`	`337`