HHH-19232 Also listen to collection update events for bean validation

Author: mbellade

hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/BeanValidationEventListener.java

@@ -13,6 +13,8 @@
 import org.hibernate.boot.internal.ClassLoaderAccessImpl;
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.event.spi.PreCollectionUpdateEvent;
+import org.hibernate.event.spi.PreCollectionUpdateEventListener;
 import org.hibernate.event.spi.PreDeleteEvent;
 import org.hibernate.event.spi.PreDeleteEventListener;
 import org.hibernate.event.spi.PreInsertEvent;
@@ -34,6 +36,7 @@
 import jakarta.validation.ValidatorFactory;
 
 import static jakarta.validation.Validation.buildDefaultValidatorFactory;
+import static org.hibernate.internal.util.NullnessUtil.castNonNull;
 import static org.hibernate.internal.util.collections.CollectionHelper.setOfSize;
 
 /**
@@ -44,7 +47,7 @@
  */
 //FIXME review exception model
 public class BeanValidationEventListener
-		implements PreInsertEventListener, PreUpdateEventListener, PreDeleteEventListener, PreUpsertEventListener {
+		implements PreInsertEventListener, PreUpdateEventListener, PreDeleteEventListener, PreUpsertEventListener, PreCollectionUpdateEventListener {
 
 	private static final CoreMessageLogger LOG = Logger.getMessageLogger(
 			MethodHandles.lookup(),
@@ -121,6 +124,17 @@ public boolean onPreUpsert(PreUpsertEvent event) {
 		return false;
 	}
 
+	@Override
+	public void onPreUpdateCollection(PreCollectionUpdateEvent event) {
+		final Object entity = castNonNull( event.getCollection().getOwner() );
+		validate(
+				entity,
+				event.getSession().getEntityPersister( event.getAffectedOwnerEntityName(), entity ),
+				event.getFactory(),
+				GroupsPerOperation.Operation.UPDATE
+		);
+	}
+
 	private <T> void validate(
 			T object,
 			EntityPersister persister,

hibernate-core/src/main/java/org/hibernate/boot/beanvalidation/TypeSafeActivator.java

@@ -152,6 +152,7 @@ private static void setupListener(ValidatorFactory validatorFactory, SessionFact
 		listenerRegistry.appendListeners( EventType.PRE_UPDATE, listener );
 		listenerRegistry.appendListeners( EventType.PRE_DELETE, listener );
 		listenerRegistry.appendListeners( EventType.PRE_UPSERT, listener );
+		listenerRegistry.appendListeners( EventType.PRE_COLLECTION_UPDATE, listener );
 		listener.initialize( cfgService.getSettings(), classLoaderService );
 	}