HHH-18885 Let getAddedEntry() return an Object since it can be an entry

Author: gtoison

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

@@ -849,7 +849,8 @@ public final Iterator<E> queuedAdditionIterator() {
 
 				@Override
 				public E next() {
-					return operationQueue.get( index++ ).getAddedEntry();
+					//noinspection unchecked
+					return (E) operationQueue.get( index++ ).getAddedEntry();
 				}
 
 				@Override
@@ -1205,7 +1206,7 @@ protected interface DelayedOperation<E> {
 
 		E getAddedInstance();
 
-		default E getAddedEntry() {
+		default Object getAddedEntry() {
 			return getAddedInstance();
 		}
 

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

@@ -530,9 +530,8 @@ protected final K getIndex() {
 		}
 
 		@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() );
 		}
 	}