remove return value of Callback.performCallback, since it was always true and ignored

Author: gavinking

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

@@ -15,7 +15,12 @@
 import org.hibernate.resource.beans.spi.ManagedBeanRegistry;
 
 /**
- * Represents a JPA callback on the embeddable type
+ * Represents a JPA callback method declared by an embeddable type.
+ *
+ * @apiNote The JPA specification does not require that we allow
+ * entity lifecycle callbacks on embeddable classes, and this is
+ * at least arguably a misfeature. It would by OK to simply remove
+ * or deprecate this.
  *
  * @author Vlad Mihalcea
  */
@@ -48,18 +53,17 @@ private EmbeddableCallback(Getter embeddableGetter, Method callbackMethod, Callb
 	}
 
 	@Override
-	public boolean performCallback(Object entity) {
+	public void performCallback(Object entity) {
 		try {
-			Object embeddable = embeddableGetter.get( entity );
+			final Object embeddable = embeddableGetter.get( entity );
 			if ( embeddable != null ) {
 				callbackMethod.invoke( embeddable );
 			}
-			return true;
 		}
 		catch (InvocationTargetException e) {
 			//keep runtime exceptions as is
-			if ( e.getTargetException() instanceof RuntimeException ) {
-				throw (RuntimeException) e.getTargetException();
+			if ( e.getTargetException() instanceof RuntimeException runtimeException ) {
+				throw runtimeException;
 			}
 			else {
 				throw new RuntimeException( e.getTargetException() );

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

@@ -15,7 +15,7 @@
 import org.hibernate.resource.beans.spi.ManagedBeanRegistry;
 
 /**
- * Represents a JPA callback on the entity itself
+ * Represents a JPA callback method declared by the entity itself.
  *
  * @author Kabir Khan
  * @author Steve Ebersole
@@ -50,15 +50,14 @@ private EntityCallback(Method callbackMethod, CallbackType callbackType) {
 	}
 
 	@Override
-	public boolean performCallback(Object entity) {
+	public void performCallback(Object entity) {
 		try {
 			callbackMethod.invoke( entity );
-			return true;
 		}
 		catch (InvocationTargetException e) {
 			//keep runtime exceptions as is
-			if ( e.getTargetException() instanceof RuntimeException ) {
-				throw (RuntimeException) e.getTargetException();
+			if ( e.getTargetException() instanceof RuntimeException runtimeException ) {
+				throw runtimeException;
 			}
 			else {
 				throw new RuntimeException( e.getTargetException() );

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

@@ -15,7 +15,9 @@
 import org.hibernate.resource.beans.spi.ManagedBeanRegistry;
 
 /**
- * Represents a JPA callback using a dedicated listener
+ * Represents a JPA callback method declared by an entity listener class.
+ *
+ * @see jakarta.persistence.EntityListeners
  *
  * @author Kabir Khan
  * @author Steve Ebersole
@@ -49,15 +51,14 @@ public Callback createCallback(ManagedBeanRegistry beanRegistry) {
 	}
 
 	@Override
-	public boolean performCallback(Object entity) {
+	public void performCallback(Object entity) {
 		try {
 			callbackMethod.invoke( listenerManagedBean.getBeanInstance(), entity );
-			return true;
 		}
 		catch (InvocationTargetException e) {
 			//keep runtime exceptions as is
-			if ( e.getTargetException() instanceof RuntimeException ) {
-				throw (RuntimeException) e.getTargetException();
+			if ( e.getTargetException() instanceof RuntimeException runtimeException ) {
+				throw runtimeException;
 			}
 			else {
 				throw new RuntimeException( e.getTargetException() );

hibernate-core/src/main/java/org/hibernate/jpa/event/spi/Callback.java

@@ -7,11 +7,15 @@
 import java.io.Serializable;
 
 /**
- * Represents a JPA event callback (the method).
- *
- * Generally there are 2 flavors of this; either an annotated method on the entity itself
- * or an annotated method on a separate "listener" class.  This contract presents
- * a unified abstraction for both cases
+ * Represents a JPA entity lifecycle callback method.
+ * <p>
+ * There are two flavors of this, which we abstract here:
+ * <ul>
+ * <li>an annotated method of the entity class itself, or
+ * <li>an annotated method of a separate <em>entity listener</em> class
+ *     identified via the {@link jakarta.persistence.EntityListeners}
+ *     annotation.
+ * </ul>
  *
  * @author Kabir Khan
  * @author Steve Ebersole
@@ -26,8 +30,6 @@ public interface Callback extends Serializable {
 	 * Contract for performing the callback
 	 *
 	 * @param entity Reference to the entity for which the callback is triggered.
-	 *
-	 * @return Did a callback actually happen?
 	 */
-	boolean performCallback(Object entity);
+	void performCallback(Object entity);
 }