HHH-17460 - Ongoing JPA 32 work

Author: sebersole

hibernate-core/src/main/java/org/hibernate/jpa/event/internal/CallbackDefinitionResolver.java

@@ -264,15 +264,21 @@ private static void applyListeners(ClassDetails currentClazz, List<ClassDetails>
 		final AnnotationUsage<EntityListeners> entityListeners = currentClazz.getAnnotationUsage( EntityListeners.class );
 		if ( entityListeners != null ) {
 			final List<ClassDetails> listeners = entityListeners.getList( "value" );
-			listOfListeners.addAll( listeners );
+			int size = listeners.size();
+			for ( int index = size - 1; index >= 0; index-- ) {
+				listOfListeners.add( listeners.get( index ) );
+			}
 		}
 
 		if ( useAnnotationAnnotatedByListener ) {
 			final List<AnnotationUsage<?>> metaAnnotatedUsageList = currentClazz.getMetaAnnotated( EntityListeners.class );
 			for ( AnnotationUsage<?> metaAnnotatedUsage : metaAnnotatedUsageList ) {
 				final AnnotationUsage<EntityListeners> metaAnnotatedListeners = metaAnnotatedUsage.getAnnotationDescriptor().getAnnotationUsage( EntityListeners.class );
 				final List<ClassDetails> listeners = metaAnnotatedListeners.getList( "value" );
-				listOfListeners.addAll( listeners );
+				int size = listeners.size();
+				for ( int index = size - 1; index >= 0; index-- ) {
+					listOfListeners.add( listeners.get( index ) );
+				}
 			}
 		}
 	}

hibernate-core/src/main/java/org/hibernate/jpa/event/internal/EmbeddableCallback.java

@@ -8,6 +8,7 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.Locale;
 
 import org.hibernate.jpa.event.spi.Callback;
 import org.hibernate.jpa.event.spi.CallbackDefinition;
@@ -70,4 +71,15 @@ public boolean performCallback(Object entity) {
 			throw new RuntimeException( e );
 		}
 	}
+
+	@Override
+	public String toString() {
+		return String.format(
+				Locale.ROOT,
+				"EmbeddableCallback([%s] %s.%s)",
+				getCallbackType().name(),
+				callbackMethod.getDeclaringClass().getName(),
+				callbackMethod.getName()
+		);
+	}
 }

hibernate-core/src/main/java/org/hibernate/jpa/event/internal/EntityCallback.java

@@ -8,6 +8,7 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.Locale;
 
 import org.hibernate.jpa.event.spi.Callback;
 import org.hibernate.jpa.event.spi.CallbackDefinition;
@@ -69,4 +70,15 @@ public boolean performCallback(Object entity) {
 			throw new RuntimeException( e );
 		}
 	}
+
+	@Override
+	public String toString() {
+		return String.format(
+				Locale.ROOT,
+				"EntityCallback([%s] %s.%s)",
+				getCallbackType().name(),
+				callbackMethod.getDeclaringClass().getName(),
+				callbackMethod.getName()
+		);
+	}
 }

hibernate-core/src/main/java/org/hibernate/jpa/event/internal/ListenerCallback.java

@@ -8,6 +8,7 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.util.Locale;
 
 import org.hibernate.jpa.event.spi.Callback;
 import org.hibernate.jpa.event.spi.CallbackDefinition;
@@ -71,4 +72,15 @@ public boolean performCallback(Object entity) {
 			throw new RuntimeException( e );
 		}
 	}
+
+	@Override
+	public String toString() {
+		return String.format(
+				Locale.ROOT,
+				"ListenerCallback([%s] %s.%s)",
+				getCallbackType().name(),
+				callbackMethod.getDeclaringClass().getName(),
+				callbackMethod.getName()
+		);
+	}
 }