HHH-17955 Bean Validation and @PostXxxx callbacks for StatelessSession

Signed-off-by: Gavin King <gavin@hibernate.org>

Author: gavinking

hibernate-core/src/main/java/org/hibernate/action/internal/EntityInsertAction.java

@@ -239,18 +239,19 @@ private void postCommitOnFailure(PostInsertEventListener listener, PostInsertEve
 }
 
 protected boolean preInsert() {
-boolean veto = false;
-
 final EventListenerGroup<PreInsertEventListener> listenerGroup
 = getFastSessionServices().eventListenerGroup_PRE_INSERT;
 if ( listenerGroup.isEmpty() ) {
-return veto;
+return false;
 }
-final PreInsertEvent event = new PreInsertEvent( getInstance(), getId(), getState(), getPersister(), eventSource() );
-for ( PreInsertEventListener listener : listenerGroup.listeners() ) {
-veto |= listener.onPreInsert( event );
+else {
+boolean veto = false;
+final PreInsertEvent event = new PreInsertEvent( getInstance(), getId(), getState(), getPersister(), eventSource() );
+for ( PreInsertEventListener listener : listenerGroup.listeners() ) {
+veto |= listener.onPreInsert( event );
+}
+return veto;
 }
-return veto;
 }
 
 @Override

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

@@ -20,6 +20,8 @@
 import org.hibernate.event.spi.PreInsertEventListener;
 import org.hibernate.event.spi.PreUpdateEvent;
 import org.hibernate.event.spi.PreUpdateEventListener;
+import org.hibernate.event.spi.PreUpsertEvent;
+import org.hibernate.event.spi.PreUpsertEventListener;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.collections.CollectionHelper;
 import org.hibernate.metamodel.RepresentationMode;
@@ -42,7 +44,7 @@
  */
 //FIXME review exception model
 public class BeanValidationEventListener
-implements PreInsertEventListener, PreUpdateEventListener, PreDeleteEventListener {
+implements PreInsertEventListener, PreUpdateEventListener, PreDeleteEventListener, PreUpsertEventListener {
 
 private static final CoreMessageLogger LOG = Logger.getMessageLogger(
 CoreMessageLogger.class,
@@ -60,7 +62,8 @@ public class BeanValidationEventListener
  * @param factory The {@code ValidatorFactory} to use to create {@code Validator} instance(s)
  * @param settings Configured properties
  */
-public BeanValidationEventListener(ValidatorFactory factory, Map<String,Object> settings, ClassLoaderService classLoaderService) {
+public BeanValidationEventListener(
+ValidatorFactory factory, Map<String,Object> settings, ClassLoaderService classLoaderService) {
 init( factory, settings, classLoaderService );
 }
 
@@ -80,9 +83,8 @@ private void init(ValidatorFactory factory, Map<String,Object> settings, ClassLo
 public boolean onPreInsert(PreInsertEvent event) {
 validate(
 event.getEntity(),
-event.getPersister().getRepresentationStrategy().getMode(),
 event.getPersister(),
-event.getSession().getFactory(),
+event.getFactory(),
 GroupsPerOperation.Operation.INSERT
 );
 return false;
@@ -91,9 +93,8 @@ public boolean onPreInsert(PreInsertEvent event) {
 public boolean onPreUpdate(PreUpdateEvent event) {
 validate(
 event.getEntity(),
-event.getPersister().getRepresentationStrategy().getMode(),
 event.getPersister(),
-event.getSession().getFactory(),
+event.getFactory(),
 GroupsPerOperation.Operation.UPDATE
 );
 return false;
@@ -102,21 +103,30 @@ public boolean onPreUpdate(PreUpdateEvent event) {
 public boolean onPreDelete(PreDeleteEvent event) {
 validate(
 event.getEntity(),
-event.getPersister().getRepresentationStrategy().getMode(),
 event.getPersister(),
-event.getSession().getFactory(),
+event.getFactory(),
 GroupsPerOperation.Operation.DELETE
 );
 return false;
 }
 
+@Override
+public boolean onPreUpsert(PreUpsertEvent event) {
+validate(
+event.getEntity(),
+event.getPersister(),
+event.getFactory(),
+GroupsPerOperation.Operation.UPSERT
+);
+return false;
+}
+
 private <T> void validate(
 T object,
-RepresentationMode mode,
 EntityPersister persister,
 SessionFactoryImplementor sessionFactory,
 GroupsPerOperation.Operation operation) {
-if ( object == null || mode != RepresentationMode.POJO ) {
+if ( object == null || persister.getRepresentationStrategy().getMode() != RepresentationMode.POJO ) {
 return;
 }
 TraversableResolver tr = new HibernateTraversableResolver( persister, associationsPerEntityPersister, sessionFactory );

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

@@ -39,6 +39,7 @@ public static GroupsPerOperation from(Map settings, ClassLoaderAccess classLoade
 applyOperationGrouping( groupsPerOperation, Operation.INSERT, settings, classLoaderAccess );
 applyOperationGrouping( groupsPerOperation, Operation.UPDATE, settings, classLoaderAccess );
 applyOperationGrouping( groupsPerOperation, Operation.DELETE, settings, classLoaderAccess );
+applyOperationGrouping( groupsPerOperation, Operation.UPSERT, settings, classLoaderAccess );
 applyOperationGrouping( groupsPerOperation, Operation.DDL, settings, classLoaderAccess );
 
 return groupsPerOperation;
@@ -99,10 +100,11 @@ public Class<?>[] get(Operation operation) {
 return groupsPerOperation.get( operation );
 }
 
-public static enum Operation {
+public enum Operation {
 INSERT( "persist", JPA_GROUP_PREFIX + "pre-persist", JAKARTA_JPA_GROUP_PREFIX + "pre-persist" ),
 UPDATE( "update", JPA_GROUP_PREFIX + "pre-update", JAKARTA_JPA_GROUP_PREFIX + "pre-update" ),
 DELETE( "remove", JPA_GROUP_PREFIX + "pre-remove", JAKARTA_JPA_GROUP_PREFIX + "pre-remove" ),
+UPSERT( "upsert", JPA_GROUP_PREFIX + "pre-upsert", JAKARTA_JPA_GROUP_PREFIX + "pre-upsert" ),
 DDL( "ddl", HIBERNATE_GROUP_PREFIX + "ddl", HIBERNATE_GROUP_PREFIX + "ddl" );