HHH-18885 let queuedAdditionIterator() return Iterator<?>

For maps the iterator operates over a collection of Map.Entry

Author: gtoison

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

@@ -845,13 +845,13 @@ 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() {
+				public Object next() {
 					return operationQueue.get( index++ ).getAddedEntry();
 				}
 
@@ -1226,8 +1226,8 @@ protected interface DelayedOperation<E> {
 		void operate();
 
 		E getAddedInstance();
-		
-		default E getAddedEntry() {
+
+		default Object getAddedEntry() {
 			return getAddedInstance();
 		}
 

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

@@ -388,7 +388,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

@@ -526,11 +526,10 @@ protected AbstractMapValueDelayedOperation(K index, E addedValue, E orphan) {
 		protected final K getIndex() {
 			return index;
 		}
-		
+
 		@Override
-		public E getAddedEntry() {
-			// The (E) cast is very hacky because E is not Map.Entry but we need it to conform to PersistentCollection.queuedAdditionIterator()
-			return (E) Map.entry( getIndex(), getAddedInstance() );
+		public Object getAddedEntry() {
+			return Map.entry( getIndex(), getAddedInstance() );
 		}
 	}