minor changes

Author: gavinking

hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveSessionImpl.java

@@ -1435,7 +1435,7 @@ protected final CompletionStage<T> doLoad(Object id, LoadEventListener.LoadType
 	}
 
 	private class ReactiveMultiIdentifierLoadAccessImpl<T> implements MultiIdLoadOptions {
-		private final EntityPersister entityPersister;
+		private final ReactiveEntityPersister entityPersister;
 
 		private LockOptions lockOptions;
 		private CacheMode cacheMode;
@@ -1450,7 +1450,7 @@ private class ReactiveMultiIdentifierLoadAccessImpl<T> implements MultiIdLoadOpt
 		private boolean readOnly;
 
 		public ReactiveMultiIdentifierLoadAccessImpl(EntityPersister entityPersister) {
-			this.entityPersister = entityPersister;
+			this.entityPersister = (ReactiveEntityPersister) entityPersister;
 		}
 
 		@Override
@@ -1489,12 +1489,7 @@ public Integer getBatchSize() {
 		}
 
 		public ReactiveMultiIdentifierLoadAccessImpl<T> withBatchSize(int batchSize) {
-			if ( batchSize < 1 ) {
-				this.batchSize = null;
-			}
-			else {
-				this.batchSize = batchSize;
-			}
+            this.batchSize = batchSize < 1 ? null : batchSize;
 			return this;
 		}
 
@@ -1537,8 +1532,11 @@ public CompletionStage<List<T>> multiLoad(Object... ids) {
 			Object[] sids = new Object[ids.length];
 			System.arraycopy( ids, 0, sids, 0, ids.length );
 
-			return perform( () -> (CompletionStage) ( (ReactiveEntityPersister) entityPersister )
-							.reactiveMultiLoad( sids, ReactiveSessionImpl.this, this ) );
+			return perform( () -> {
+				final CompletionStage<? extends List<?>> stage =
+						entityPersister.reactiveMultiLoad( sids, ReactiveSessionImpl.this, this );
+				return (CompletionStage<List<T>>) stage;
+            });
 		}
 
 		public CompletionStage<List<T>> perform(Supplier<CompletionStage<List<T>>> executor) {
@@ -1572,12 +1570,6 @@ public CompletionStage<List<T>> perform(Supplier<CompletionStage<List<T>>> execu
 						}
 					} );
 		}
-
-		@SuppressWarnings("unchecked")
-		public <K extends Object> CompletionStage<List<T>> multiLoad(List<K> ids) {
-			return perform( () -> (CompletionStage<List<T>>)
-					entityPersister.multiLoad( ids.toArray( new Object[0] ), ReactiveSessionImpl.this, this ) );
-		}
 	}
 
 	private class NaturalIdLoadAccessImpl<T> {

hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveStatelessSessionImpl.java

@@ -223,14 +223,15 @@ public <T> CompletionStage<List<T>> reactiveGet(Class<T> entityClass, Object...
 		Object[] sids = new Object[ids.length];
 		System.arraycopy( ids, 0, sids, 0, ids.length );
 
-		return getEntityPersister( entityClass.getName() )
-				.reactiveMultiLoad( sids, this, StatelessSessionImpl.MULTI_ID_LOAD_OPTIONS )
-				.whenComplete( (v, e) -> {
-					if ( getPersistenceContext().isLoadFinished() ) {
-						getPersistenceContext().clear();
-					}
-				} )
-				.thenApply( list -> (List<T>) list );
+		final CompletionStage<? extends List<?>> stage =
+				getEntityPersister( entityClass.getName() )
+						.reactiveMultiLoad( sids, this, StatelessSessionImpl.MULTI_ID_LOAD_OPTIONS )
+						.whenComplete( (v, e) -> {
+							if ( getPersistenceContext().isLoadFinished() ) {
+								getPersistenceContext().clear();
+							}
+						} );
+		return (CompletionStage<List<T>>) stage;
 	}
 
 	@Override