Rework type hierarchy of ReactiveEntityInsertAction

Author: Sanne

hibernate-reactive-core/src/main/java/org/hibernate/reactive/engine/ReactiveActionQueue.java

@@ -44,6 +44,7 @@
 import org.hibernate.reactive.engine.impl.ReactiveEntityActionVetoException;
 import org.hibernate.reactive.engine.impl.ReactiveEntityDeleteAction;
 import org.hibernate.reactive.engine.impl.ReactiveEntityInsertAction;
+import org.hibernate.reactive.engine.impl.ReactiveEntityInsertActionHolder;
 import org.hibernate.reactive.engine.impl.ReactiveEntityRegularInsertAction;
 import org.hibernate.reactive.engine.impl.ReactiveEntityUpdateAction;
 import org.hibernate.reactive.engine.impl.ReactiveOrphanRemovalAction;
@@ -78,7 +79,7 @@ public class ReactiveActionQueue {
 	// Object insertions, updates, and deletions have list semantics because
 	// they must happen in the right order to respect referential
 	// integrity
-	private ExecutableList<ReactiveEntityInsertAction> insertions;
+	private ExecutableList<ReactiveEntityInsertActionHolder> insertions;
 	private ExecutableList<ReactiveEntityDeleteAction> deletions;
 	private ExecutableList<ReactiveEntityUpdateAction> updates;
 	// Actually the semantics of the next three are really "Bag"
@@ -281,7 +282,7 @@ private CompletionStage<Void> addResolvedEntityInsertAction(ReactiveEntityInsert
 		else {
 			LOG.trace( "Adding resolved non-early insert action." );
 			OrderedActions.EntityInsertAction.ensureInitialized( this );
-			this.insertions.add( insert );
+			this.insertions.add( new ReactiveEntityInsertActionHolder( insert ) );
 			ret = voidFuture();
 		}
 
@@ -1016,34 +1017,35 @@ public CompletionStage<Void> afterTransactionCompletion(boolean success) {
 	 *
 	 * @author Jay Erb
 	 */
-	private static class InsertActionSorter implements ExecutableList.Sorter<ReactiveEntityInsertAction> {
+	private static class InsertActionSorter implements ExecutableList.Sorter<ReactiveEntityInsertActionHolder> {
 		/**
 		 * Singleton access
 		 */
 		public static final InsertActionSorter INSTANCE = new InsertActionSorter();
 		// the map of batch numbers to EntityInsertAction lists
-		private Map<BatchIdentifier, List<ReactiveEntityInsertAction>> actionBatches;
+		private Map<BatchIdentifier, List<ReactiveEntityInsertActionHolder>> actionBatches;
 
 		public InsertActionSorter() {
 		}
 
 		/**
 		 * Sort the insert actions.
 		 */
-		public void sort(List<ReactiveEntityInsertAction> insertions) {
+		public void sort(List<ReactiveEntityInsertActionHolder> insertions) {
 			// optimize the hash size to eliminate a rehash.
 			this.actionBatches = new HashMap<>();
 
 			// the mapping of entity names to their latest batch numbers.
 			final List<BatchIdentifier> latestBatches = new ArrayList<>();
 
-			for ( ReactiveEntityInsertAction action : insertions ) {
+			for ( ReactiveEntityInsertActionHolder action : insertions ) {
+				final ReactiveEntityInsertAction actionDelegate = action.getDelegate();
 				BatchIdentifier batchIdentifier = new BatchIdentifier(
-						action.getEntityName(),
-						action.getSession()
+						actionDelegate.getEntityName(),
+						actionDelegate.getSession()
 								.getFactory()
 								.getMetamodel()
-								.entityPersister( action.getEntityName() )
+								.entityPersister( actionDelegate.getEntityName() )
 								.getRootEntityName()
 				);
 
@@ -1055,8 +1057,8 @@ public void sort(List<ReactiveEntityInsertAction> insertions) {
 				else {
 					latestBatches.add( batchIdentifier );
 				}
-				addParentChildEntityNames( action, batchIdentifier );
-				addToBatch( batchIdentifier, action );
+				addParentChildEntityNames( actionDelegate, batchIdentifier );
+				addToBatch( batchIdentifier, actionDelegate );
 			}
 			insertions.clear();
 
@@ -1233,10 +1235,10 @@ else if ( type.isComponentType() && value != null ) {
 		}
 
 		private void addToBatch(BatchIdentifier batchIdentifier, ReactiveEntityInsertAction action) {
-			List<ReactiveEntityInsertAction> actions = actionBatches
+			List<ReactiveEntityInsertActionHolder> actions = actionBatches
 					.computeIfAbsent( batchIdentifier, k -> new LinkedList<>() );
 
-			actions.add( action );
+			actions.add( new ReactiveEntityInsertActionHolder( action ) );
 		}
 
 		private static class BatchIdentifier {

hibernate-reactive-core/src/main/java/org/hibernate/reactive/engine/impl/ReactiveEntityInsertAction.java

@@ -9,7 +9,6 @@
 
 import org.hibernate.LockMode;
 import org.hibernate.action.internal.AbstractEntityInsertAction;
-import org.hibernate.action.internal.ComparableEntityAction;
 import org.hibernate.engine.internal.NonNullableTransientDependencies;
 import org.hibernate.engine.internal.Nullability;
 import org.hibernate.engine.internal.Versioning;
@@ -29,7 +28,7 @@
  *
  * @see org.hibernate.action.internal.AbstractEntityInsertAction
  */
-public interface ReactiveEntityInsertAction extends ReactiveExecutable, ComparableEntityAction {
+public interface ReactiveEntityInsertAction extends ReactiveExecutable {
 	boolean isEarlyInsert();
 	NonNullableTransientDependencies findNonNullableTransientEntities();
 	SharedSessionContractImplementor getSession();
@@ -98,4 +97,8 @@ default CompletionStage<NonNullableTransientDependencies> reactiveFindNonNullabl
 
 	AbstractEntityInsertAction asAbstractEntityInsertAction();
 
+	default int compareActionTo(ReactiveEntityInsertAction delegate) {
+		return asAbstractEntityInsertAction().compareTo( delegate.asAbstractEntityInsertAction() );
+	}
+
 }

hibernate-reactive-core/src/main/java/org/hibernate/reactive/engine/impl/ReactiveEntityInsertActionHolder.java

@@ -0,0 +1,72 @@
+/* Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.reactive.engine.impl;
+
+import java.io.Serializable;
+import java.util.Objects;
+import java.util.concurrent.CompletionStage;
+
+import org.hibernate.HibernateException;
+import org.hibernate.action.spi.AfterTransactionCompletionProcess;
+import org.hibernate.action.spi.BeforeTransactionCompletionProcess;
+import org.hibernate.action.spi.Executable;
+import org.hibernate.event.spi.EventSource;
+import org.hibernate.reactive.engine.ReactiveExecutable;
+
+public final class ReactiveEntityInsertActionHolder implements Executable, ReactiveExecutable, Comparable<ReactiveEntityInsertActionHolder>,
+		Serializable {
+
+	private final ReactiveEntityInsertAction delegate;
+
+	public ReactiveEntityInsertActionHolder(ReactiveEntityInsertAction delegate) {
+		Objects.requireNonNull( delegate );
+		this.delegate = delegate;
+	}
+
+	@Override
+	public int compareTo(ReactiveEntityInsertActionHolder o) {
+		return delegate.compareActionTo( o.delegate );
+	}
+
+	@Override
+	public Serializable[] getPropertySpaces() {
+		return delegate.getPropertySpaces();
+	}
+
+	@Override
+	public void beforeExecutions() throws HibernateException {
+		delegate.beforeExecutions();
+	}
+
+	@Override
+	public void execute() throws HibernateException {
+		delegate.execute();
+	}
+
+	@Override
+	public AfterTransactionCompletionProcess getAfterTransactionCompletionProcess() {
+		return delegate.getAfterTransactionCompletionProcess();
+	}
+
+	@Override
+	public BeforeTransactionCompletionProcess getBeforeTransactionCompletionProcess() {
+		return delegate.getBeforeTransactionCompletionProcess();
+	}
+
+	@Override
+	public void afterDeserialize(EventSource session) {
+		delegate.afterDeserialize( session );
+	}
+
+	@Override
+	public CompletionStage<Void> reactiveExecute() {
+		return delegate.reactiveExecute();
+	}
+
+	public ReactiveEntityInsertAction getDelegate() {
+		return delegate;
+	}
+}