Refactoring of ReactiveSingleResultConsumer

Author: DavideD

hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/results/spi/ReactiveListResultsConsumer.java

@@ -135,17 +135,15 @@ private static CompletionStage<Void> finishUp(
 			SharedSessionContractImplementor session,
 			JdbcValuesSourceProcessingStateStandardImpl jdbcValuesSourceProcessingState) {
 		jdbcValuesSourceProcessingState.finishLoadingCollections();
-
 		return ( (ReactivePersistenceContextAdapter) session.getPersistenceContextInternal() )
 				.reactivePostLoad(
 						jdbcValuesSourceProcessingState,
-						registerSubselects ?
-								jdbcValuesSourceProcessingState.getExecutionContext()::registerLoadingEntityHolder :
-								null
+						registerSubselects
+								? jdbcValuesSourceProcessingState.getExecutionContext()::registerLoadingEntityHolder
+								: null
 				);
 	}
 
-
 	/**
 	 * The boolean in the CompletionStage is true if the element has been added to the results
 	 */

hibernate-reactive-core/src/main/java/org/hibernate/reactive/sql/results/spi/ReactiveSingleResultConsumer.java

@@ -12,9 +12,13 @@
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.reactive.sql.exec.spi.ReactiveRowProcessingState;
 import org.hibernate.reactive.sql.exec.spi.ReactiveValuesResultSet;
+import org.hibernate.sql.exec.spi.ExecutionContext;
 import org.hibernate.sql.results.jdbc.internal.JdbcValuesSourceProcessingStateStandardImpl;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesSourceProcessingOptions;
 
+/**
+ * @see org.hibernate.sql.results.spi.SingleResultConsumer
+ */
 @Incubating
 public class ReactiveSingleResultConsumer<T> implements ReactiveResultsConsumer<T, T> {
 
@@ -33,15 +37,25 @@ public CompletionStage<T> consume(
 						.thenCompose( result -> {
 							rowProcessingState.finishRowProcessing( true );
 							rowReader.finishUp( rowProcessingState );
-							session.getPersistenceContext();
-							jdbcValuesSourceProcessingState.finishLoadingCollections();
-							return ( (ReactivePersistenceContextAdapter) session.getPersistenceContextInternal() )
-									.reactivePostLoad( jdbcValuesSourceProcessingState, null )
-									.thenApply( v -> result );
+							return finishUp( session, jdbcValuesSourceProcessingState, result );
 						} )
 				);
 	}
 
+	/**
+	 * Reactive version of {@link JdbcValuesSourceProcessingStateStandardImpl#finishUp(boolean)}
+	 */
+	private static <T> CompletionStage<T> finishUp(
+			SharedSessionContractImplementor session,
+			JdbcValuesSourceProcessingStateStandardImpl jdbcValuesSourceProcessingState,
+			T result) {
+		jdbcValuesSourceProcessingState.finishLoadingCollections();
+		final ExecutionContext executionContext = jdbcValuesSourceProcessingState.getExecutionContext();
+		return ( (ReactivePersistenceContextAdapter) session.getPersistenceContextInternal() )
+				.reactivePostLoad( jdbcValuesSourceProcessingState, executionContext::registerLoadingEntityHolder )
+				.thenApply( v -> result );
+	}
+
 	@Override
 	public boolean canResultsBeCached() {
 		return false;