HHH-18885 Introduce DelayedOperation.getAddedEntry() for maps

Author: gtoison

hibernate-core/src/main/java/org/hibernate/collection/spi/AbstractPersistentCollection.java

@@ -867,14 +867,14 @@ public final boolean hasQueuedOperations() {
 	}
 
 	@Override
-	public final Iterator<E> queuedAdditionIterator() {
+	public final Iterator<?> queuedAdditionIterator() {
 		if ( hasQueuedOperations() ) {
 			return new Iterator<>() {
 				private int index;
 
 				@Override
-				public E next() {
-					return operationQueue.get( index++ ).getAddedInstance();
+				public Object next() {
+					return operationQueue.get( index++ ).getAddedEntry();
 				}
 
 				@Override
@@ -1249,6 +1249,10 @@ protected interface DelayedOperation<E> {
 
 		E getAddedInstance();
 
+		default Object getAddedEntry() {
+			return getAddedInstance();
+		}
+
 		E getOrphan();
 	}
 

hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentCollection.java

@@ -399,7 +399,7 @@ default boolean needsUpdating(
 	 *
 	 * @return The iterator
 	 */
-	Iterator<E> queuedAdditionIterator();
+	Iterator<?> queuedAdditionIterator();
 
 	/**
 	 * Get the "queued" orphans

hibernate-core/src/main/java/org/hibernate/collection/spi/PersistentMap.java

@@ -539,6 +539,11 @@ protected AbstractMapValueDelayedOperation(K index, E addedValue, E orphan) {
 		protected final K getIndex() {
 			return index;
 		}
+
+		@Override
+		public Object getAddedEntry() {
+			return Map.entry( getIndex(), getAddedInstance() );
+		}
 	}
 
 	final class Put extends AbstractMapValueDelayedOperation {