[#2518] Remove CompletionException as cause of exception

Author: DavideD

hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveSessionImpl.java

@@ -151,7 +151,6 @@
 import static org.hibernate.reactive.util.impl.CompletionStages.nullFuture;
 import static org.hibernate.reactive.util.impl.CompletionStages.rethrow;
 import static org.hibernate.reactive.util.impl.CompletionStages.returnNullorRethrow;
-import static org.hibernate.reactive.util.impl.CompletionStages.returnOrRethrow;
 import static org.hibernate.reactive.util.impl.CompletionStages.supplyStage;
 import static org.hibernate.reactive.util.impl.CompletionStages.voidFuture;
 
@@ -171,10 +170,7 @@ public class ReactiveSessionImpl extends SessionImpl implements ReactiveSession,
 	//Lazily initialized
 	private transient ExceptionConverter exceptionConverter;
 
-	public ReactiveSessionImpl(
-			SessionFactoryImpl delegate,
-			SessionCreationOptions options,
-			ReactiveConnection connection) {
+	public ReactiveSessionImpl(SessionFactoryImpl delegate, SessionCreationOptions options, ReactiveConnection connection) {
 		super( delegate, options );
 		InternalStateAssertions.assertUseOnEventLoop();
 		this.associatedWorkThread = Thread.currentThread();
@@ -977,20 +973,13 @@ private CompletionStage<Void> fireRemove(DeleteEvent event) {
 
 		return getFactory().getEventListenerGroups().eventListenerGroup_DELETE
 				.fireEventOnEachListener( event, (ReactiveDeleteEventListener l) -> l::reactiveOnDelete )
-				.handle( (v, e) -> {
+				.handle( CompletionStages::handle )
+				.thenCompose( handler -> {
 					delayedAfterCompletion();
-
-					if ( e instanceof ObjectDeletedException ) {
-						throw getExceptionConverter().convert( new IllegalArgumentException( e ) );
-					}
-					else if ( e instanceof MappingException ) {
-						throw getExceptionConverter().convert( new IllegalArgumentException( e.getMessage(), e ) );
-					}
-					else if ( e instanceof RuntimeException ) {
-						//including HibernateException
-						throw getExceptionConverter().convert( (RuntimeException) e );
-					}
-					return returnNullorRethrow( e );
+					final Throwable e = handler.getThrowable();
+					return e != null
+							? failedFuture( convertException( e ) )
+							: voidFuture();
 				} );
 	}
 
@@ -999,20 +988,13 @@ private CompletionStage<Void> fireRemove(DeleteEvent event, DeleteContext transi
 
 		return getFactory().getEventListenerGroups().eventListenerGroup_DELETE
 				.fireEventOnEachListener( event, transientEntities, (ReactiveDeleteEventListener l) -> l::reactiveOnDelete )
-				.handle( (v, e) -> {
+				.handle( CompletionStages::handle )
+				.thenCompose( handler -> {
 					delayedAfterCompletion();
-
-					if ( e instanceof ObjectDeletedException ) {
-						throw getExceptionConverter().convert( new IllegalArgumentException( e ) );
-					}
-					else if ( e instanceof MappingException ) {
-						throw getExceptionConverter().convert( new IllegalArgumentException( e.getMessage(), e ) );
-					}
-					else if ( e instanceof RuntimeException ) {
-						//including HibernateException
-						throw getExceptionConverter().convert( (RuntimeException) e );
-					}
-					return returnNullorRethrow( e );
+					final Throwable e = handler.getThrowable();
+					return e != null
+							? failedFuture( convertException( e ) )
+							: voidFuture();
 				} );
 	}
 
@@ -1036,42 +1018,45 @@ private <T> CompletionStage<T> fireMerge(MergeEvent event) {
 
 		return getFactory().getEventListenerGroups().eventListenerGroup_MERGE
 				.fireEventOnEachListener( event, (ReactiveMergeEventListener l) -> l::reactiveOnMerge )
-				.handle( (v, e) -> {
+				.handle( CompletionStages::handle )
+				.thenCompose( handler -> {
 					checkNoUnresolvedActionsAfterOperation();
-
-					if ( e instanceof ObjectDeletedException ) {
-						throw getExceptionConverter().convert( new IllegalArgumentException( e ) );
-					}
-					else if ( e instanceof MappingException ) {
-						throw getExceptionConverter().convert( new IllegalArgumentException( e.getMessage(), e ) );
-					}
-					else if ( e instanceof RuntimeException ) {
-						//including HibernateException
-						throw getExceptionConverter().convert( (RuntimeException) e );
-					}
-					return returnOrRethrow( e, (T) event.getResult() );
+					final Throwable e = handler.getThrowable();
+					return e != null
+							? failedFuture( convertException( e ) )
+							: completedFuture( (T) event.getResult() );
 				} );
 	}
 
+	private Throwable convertException(Throwable e) {
+		if ( e instanceof CompletionException) {
+			return convertException( e.getCause() );
+		}
+		if ( e instanceof ObjectDeletedException ) {
+			return getExceptionConverter().convert( new IllegalArgumentException( e ) );
+		}
+		if ( e instanceof MappingException ) {
+			return getExceptionConverter().convert( new IllegalArgumentException( e.getMessage(), e ) );
+		}
+		if ( e instanceof RuntimeException ) {
+			//including HibernateException
+			return getExceptionConverter().convert( (RuntimeException) e );
+		}
+		return e;
+	}
+
 	private CompletionStage<Void> fireMerge(MergeContext copiedAlready, MergeEvent event) {
 		pulseTransactionCoordinator();
 
 		return getFactory().getEventListenerGroups().eventListenerGroup_MERGE
 				.fireEventOnEachListener( event, copiedAlready,(ReactiveMergeEventListener l) -> l::reactiveOnMerge )
-				.handle( (v, e) -> {
+				.handle( CompletionStages::handle )
+				.thenCompose( handler -> {
 					delayedAfterCompletion();
-
-					if ( e instanceof ObjectDeletedException ) {
-						throw getExceptionConverter().convert( new IllegalArgumentException( e ) );
-					}
-					else if ( e instanceof MappingException ) {
-						throw getExceptionConverter().convert( new IllegalArgumentException( e.getMessage(), e ) );
-					}
-					else if ( e instanceof RuntimeException ) {
-						//including HibernateException
-						throw getExceptionConverter().convert( (RuntimeException) e );
-					}
-					return returnNullorRethrow( e );
+					final Throwable e = handler.getThrowable();
+					return e != null
+							? failedFuture( convertException( e ) )
+							: voidFuture();
 				} );
 	}
 

hibernate-reactive-core/src/test/java/org/hibernate/reactive/ReactiveSessionTest.java

@@ -10,6 +10,7 @@
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.CompletionStage;
 
+import org.hibernate.HibernateException;
 import org.hibernate.LockMode;
 import org.hibernate.reactive.common.AffectedEntities;
 import org.hibernate.reactive.stage.Stage;
@@ -29,6 +30,7 @@
 
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.hibernate.reactive.testing.ReactiveAssertions.assertThrown;
 import static org.hibernate.reactive.util.impl.CompletionStages.voidFuture;
 
 @Timeout(value = 10, timeUnit = MINUTES)
@@ -619,14 +621,12 @@ public void reactiveRemoveTransientEntity(VertxTestContext context) {
 				.thenCompose( v -> selectNameFromId( 5 ) )
 				.thenAccept( result -> assertThat( result ).isNotNull() )
 				.thenCompose( v -> openSession() )
-				.thenCompose( session -> session.remove( new GuineaPig( 5, "Aloi" ) )
-						.thenCompose( v -> session.flush() )
-						.thenCompose( v -> session.close() )
+				.thenCompose( session -> assertThrown( HibernateException.class, session.remove( new GuineaPig( 5, "Aloi" ) ) )
+				)
+				.thenAccept( t -> assertThat( t )
+						.hasCauseInstanceOf( IllegalArgumentException.class )
+						.hasMessageContaining( "unmanaged instance" )
 				)
-				.handle( (r, e) -> {
-					assertNotNull( e );
-					return r;
-				} )
 		);
 	}