HHH-18557 Regression in automatic association management

hibernate-core/src/main/java/org/hibernate/bytecode/enhance/internal/bytebuddy/CodeTemplates.java

@@ -11,7 +11,6 @@ import java.lang.annotation.RetentionPolicy;
 import java.util.Collection;
 import java.util.Map;
 
-import org.hibernate.Hibernate;
 import org.hibernate.bytecode.enhance.internal.tracker.CompositeOwnerTracker;
 import org.hibernate.bytecode.enhance.internal.tracker.DirtyTracker;
 import org.hibernate.bytecode.enhance.internal.tracker.NoopCollectionTracker;
@@ -22,7 +21,6 @@ import org.hibernate.bytecode.enhance.spi.EnhancerConstants;
 import org.hibernate.bytecode.enhance.spi.interceptor.LazyAttributeLoadingInterceptor;
 import org.hibernate.collection.spi.PersistentCollection;
 import org.hibernate.engine.spi.CompositeOwner;
-import org.hibernate.engine.spi.CompositeTracker;
 import org.hibernate.engine.spi.ExtendedSelfDirtinessTracker;
 import org.hibernate.engine.spi.PersistentAttributeInterceptor;
 import org.hibernate.internal.util.collections.ArrayHelper;
@@ -493,16 +491,24 @@ class CodeTemplates {
 			if ( getterSelf() != null ) {
 				Collection<?> c = getter( field );
 				if ( c != null ) {
+					if ( c instanceof PersistentCollection<?> ) {
+						( (PersistentCollection) c ).queueRemoveOperation( self );
+					}
+					else {
 						c.remove( self );
 					}
 				}
 			}
+		}
 
 		@Advice.OnMethodExit
 		static void exit(@Advice.This Object self, @Advice.Argument(0) Object argument, @BidirectionalAttribute String inverseAttribute) {
 			if ( argument != null ) {
 				Collection<Object> c = getter( argument );
-				if ( c != null && !c.contains( self ) ) {
+				if ( c != null && c instanceof PersistentCollection<?> ) {
+					( (PersistentCollection) c ).queueAddOperation( self );
+				}
+				else if ( c != null && !c.contains( self ) ) {
 					c.add( self );
 				}
 			}

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

@@ -407,6 +407,58 @@ public class PersistentBag<E> extends AbstractPersistentCollection<E> implements
 		}
 	}
 
+	@Override
+	public void queueRemoveOperation(Object o) {
+		if ( !isInitialized() ) {
+			final DelayedOperation operation = new DelayedOperation() {
+				@Override
+				public void operate() {
+					remove( o );
+				}
+
+				@Override
+				public Object getAddedInstance() {
+					return null;
+				}
+
+				@Override
+				public Object getOrphan() {
+					return null;
+				}
+			};
+			queueOperation( operation );
+		}
+		else {
+			remove( o );
+		}
+	}
+
+	@Override
+	public void queueAddOperation(E o){
+		if ( !isInitialized() ) {
+			final DelayedOperation operation = new DelayedOperation() {
+				@Override
+				public void operate() {
+					add( o );
+				}
+
+				@Override
+				public Object getAddedInstance() {
+					return null;
+				}
+
+				@Override
+				public Object getOrphan() {
+					return null;
+				}
+			};
+			queueOperation( operation );
+		}
+		else {
+			add( o );
+		}
+	}
+
 	@Override
 	public boolean containsAll(Collection<?> c) {
 		read();

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

@@ -518,7 +518,7 @@ public interface PersistentCollection<E> extends LazyInitializable {
 	 * @return {@code true} if the collection is newly instantiated
 	 */
 	default boolean isNewlyInstantiated() {
-		return getKey() == null && !isDirty();
+		return false;
 	}
 
 	/**
@@ -527,4 +527,13 @@ public interface PersistentCollection<E> extends LazyInitializable {
 	default String render() {
 		return getRole() + "#" + getKey() + "(initialized: " + wasInitialized() + ")";
 	}
+
+	default void queueRemoveOperation(Object o){
+
+	}
+
+	default void queueAddOperation(E o){
+
+	}
+
 }

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

@@ -181,6 +181,58 @@ public class PersistentIdentifierBag<E> extends AbstractPersistentCollection<E>
 		}
 	}
 
+	@Override
+	public void queueRemoveOperation(Object o) {
+		if ( !isInitialized() ) {
+			final DelayedOperation operation = new DelayedOperation() {
+				@Override
+				public void operate() {
+					remove( o );
+				}
+
+				@Override
+				public Object getAddedInstance() {
+					return null;
+				}
+
+				@Override
+				public Object getOrphan() {
+					return null;
+				}
+			};
+			queueOperation( operation );
+		}
+		else {
+			remove( o );
+		}
+	}
+
+	@Override
+	public void queueAddOperation(E o){
+		if ( !isInitialized() ) {
+			final DelayedOperation operation = new DelayedOperation() {
+				@Override
+				public void operate() {
+					add( o );
+				}
+
+				@Override
+				public Object getAddedInstance() {
+					return null;
+				}
+
+				@Override
+				public Object getOrphan() {
+					return null;
+				}
+			};
+			queueOperation( operation );
+		}
+		else {
+			add( o );
+		}
+	}
+
 	@Override
 	public boolean removeAll(Collection c) {
 		if ( c.size() > 0 ) {

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

@@ -219,6 +219,58 @@ public class PersistentList<E> extends AbstractPersistentCollection<E> implement
 		}
 	}
 
+	@Override
+	public void queueRemoveOperation(Object o) {
+		if ( !isInitialized() ) {
+			final DelayedOperation operation = new DelayedOperation() {
+				@Override
+				public void operate() {
+					remove( o );
+				}
+
+				@Override
+				public Object getAddedInstance() {
+					return null;
+				}
+
+				@Override
+				public Object getOrphan() {
+					return null;
+				}
+			};
+			queueOperation( operation );
+		}
+		else {
+			remove( o );
+		}
+	}
+
+	@Override
+	public void queueAddOperation(E o){
+		if ( !isInitialized() ) {
+			final DelayedOperation operation = new DelayedOperation() {
+				@Override
+				public void operate() {
+					add( o );
+				}
+
+				@Override
+				public Object getAddedInstance() {
+					return null;
+				}
+
+				@Override
+				public Object getOrphan() {
+					return null;
+				}
+			};
+			queueOperation( operation );
+		}
+		else {
+			add( o );
+		}
+	}
+
 	@Override
 	public boolean containsAll(Collection<?> coll) {
 		read();

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

@@ -225,6 +225,58 @@ public class PersistentSet<E> extends AbstractPersistentCollection<E> implements
 		}
 	}
 
+	@Override
+	public void queueRemoveOperation(Object o) {
+		if ( !isInitialized() ) {
+			final DelayedOperation operation = new DelayedOperation() {
+				@Override
+				public void operate() {
+					remove( o );
+				}
+
+				@Override
+				public Object getAddedInstance() {
+					return null;
+				}
+
+				@Override
+				public Object getOrphan() {
+					return null;
+				}
+			};
+			queueOperation( operation );
+		}
+		else {
+			remove( o );
+		}
+	}
+
+	@Override
+	public void queueAddOperation(E o){
+		if ( !isInitialized() ) {
+			final DelayedOperation operation = new DelayedOperation() {
+				@Override
+				public void operate() {
+					add( o );
+				}
+
+				@Override
+				public Object getAddedInstance() {
+					return null;
+				}
+
+				@Override
+				public Object getOrphan() {
+					return null;
+				}
+			};
+			queueOperation( operation );
+		}
+		else {
+			add( o );
+		}
+	}
+
 	@Override
 	public boolean containsAll(Collection<?> coll) {
 		read();