[#2800] remove() is documented to throw IllegalArgumentException

not HibernateException

Author: gavinking

hibernate-reactive-core/src/main/java/org/hibernate/reactive/event/impl/DefaultReactiveDeleteEventListener.java

@@ -195,7 +195,7 @@ private CompletionStage<Void> fetchAndDelete(DeleteEvent event, DeleteContext tr
 				: !source.contains( objectEvent );
 		if ( detached ) {
 			// Hibernate Reactive doesn't support detached instances in remove()
-			throw new IllegalArgumentException( "unmanaged instance passed to remove()" );
+			throw new IllegalArgumentException( "Unmanaged instance passed to remove()" );
 		}
 
 		//Object entity = persistenceContext.unproxyAndReassociate( event.getObject() );

hibernate-reactive-core/src/main/java/org/hibernate/reactive/event/impl/DefaultReactiveLockEventListener.java

@@ -73,7 +73,7 @@ public CompletionStage<Void> reactiveOnLock(LockEvent event) throws HibernateExc
 				: !source.contains( event.getObject() );
 		if ( detached ) {
 			// Hibernate Reactive doesn't support detached instances in refresh()
-			throw new IllegalArgumentException( "unmanaged instance passed to refresh()" );
+			throw new IllegalArgumentException( "Unmanaged instance passed to refresh()" );
 		}
 
 

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

@@ -9,7 +9,6 @@
 import org.hibernate.boot.spi.MetadataImplementor;
 import org.hibernate.boot.spi.SessionFactoryOptions;
 import org.hibernate.internal.SessionFactoryImpl;
-import org.hibernate.query.spi.QueryEngine;
 import org.hibernate.reactive.boot.spi.ReactiveMetadataImplementor;
 import org.hibernate.reactive.mutiny.Mutiny;
 import org.hibernate.reactive.mutiny.impl.MutinySessionFactoryImpl;
@@ -29,11 +28,6 @@ public ReactiveSessionFactoryImpl(MetadataImplementor bootMetamodel, SessionFact
 		super( new ReactiveMetadataImplementor( bootMetamodel ), options, bootstrapContext );
 	}
 
-	@Override
-	public QueryEngine getQueryEngine() {
-		return super.getQueryEngine();
-	}
-
 	@Override
 	public <T> T unwrap(Class<T> type) {
 		if ( type.isAssignableFrom( Stage.SessionFactory.class ) ) {

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

@@ -36,7 +36,6 @@
 import org.hibernate.engine.spi.EffectiveEntityGraph;
 import org.hibernate.engine.spi.EntityEntry;
 import org.hibernate.engine.spi.EntityKey;
-import org.hibernate.engine.spi.ExceptionConverter;
 import org.hibernate.engine.spi.PersistenceContext;
 import org.hibernate.engine.spi.PersistentAttributeInterceptable;
 import org.hibernate.engine.spi.PersistentAttributeInterceptor;
@@ -167,9 +166,6 @@ public class ReactiveSessionImpl extends SessionImpl implements ReactiveSession,
 	private ReactiveConnection reactiveConnection;
 	private final Thread associatedWorkThread;
 
-	//Lazily initialized
-	private transient ExceptionConverter exceptionConverter;
-
 	public ReactiveSessionImpl(SessionFactoryImpl delegate, SessionCreationOptions options, ReactiveConnection connection) {
 		super( delegate, options );
 		InternalStateAssertions.assertUseOnEventLoop();
@@ -1128,14 +1124,6 @@ private CompletionStage<Void> doFlush() {
 				} );
 	}
 
-	@Override
-	public ExceptionConverter getExceptionConverter() {
-		if ( exceptionConverter == null ) {
-			exceptionConverter = new ReactiveExceptionConverter( this );
-		}
-		return exceptionConverter;
-	}
-
 	@Override
 	public CompletionStage<Void> reactiveRefresh(Object entity, LockOptions lockOptions) {
 		checkOpen();

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

@@ -10,7 +10,6 @@
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.hibernate.HibernateException;
 import org.hibernate.LockMode;
 import org.hibernate.exception.ConstraintViolationException;
 import org.hibernate.reactive.mutiny.Mutiny;
@@ -301,13 +300,10 @@ context, populateDB()
 						.chain( () -> selectNameFromId( 5 ) )
 						.invoke( name -> assertThat( name ).isNotNull() )
 						.chain( this::openMutinySession )
-						.chain( session -> assertThrown(
-								HibernateException.class,
-								session.remove( new GuineaPig( 5, "Aloi" ) )
-						) )
+						.chain( session -> assertThrown( IllegalArgumentException.class, session
+								.remove( new GuineaPig( 5, "Aloi" ) ) ) )
 						.invoke( e -> assertThat( e )
-								.hasMessageContaining( "unmanaged instance passed to remove" )
-						)
+								.hasMessageContaining( "Unmanaged instance passed to remove" ) )
 		);
 	}
 

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

@@ -10,7 +10,6 @@
 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.mutiny.Mutiny;
@@ -725,11 +724,11 @@ public void reactiveRemoveTransientEntity(VertxTestContext context) {
 				.thenCompose( v -> selectNameFromId( 5 ) )
 				.thenAccept( result -> assertThat( result ).isNotNull() )
 				.thenCompose( v -> openSession() )
-				.thenCompose( session -> assertThrown( HibernateException.class, session.remove( new GuineaPig( 5, "Aloi" ) ) )
-				)
+				.thenCompose( session -> assertThrown( IllegalArgumentException.class, session
+						.remove( new GuineaPig( 5, "Aloi" ) ) ) )
 				.thenAccept( t -> assertThat( t )
-						.hasCauseInstanceOf( IllegalArgumentException.class )
-						.hasMessageContaining( "unmanaged instance" )
+						.isInstanceOf( IllegalArgumentException.class )
+						.hasMessageContaining( "Unmanaged instance" )
 				)
 		);
 	}

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

@@ -10,7 +10,6 @@
 import java.util.concurrent.TimeUnit;
 
 
-import org.hibernate.HibernateException;
 
 import org.junit.jupiter.api.Test;
 
@@ -43,29 +42,27 @@ public static <U extends Throwable> Uni<U> assertThrown(Class<U> expectedExcepti
 
 	@Test
 	public void nameIsTooLong(VertxTestContext context) {
-		test( context, assertThrown( HibernateException.class, getMutinySessionFactory()
+		test( context, assertThrown( ConstraintViolationException.class, getMutinySessionFactory()
 				.withTransaction( s -> {
 					Author author = new Author();
 					author.setName( "A very long long long long name ... " );
 					return s.persist( author );
 				} ) )
-				.invoke( he -> assertThat( he.getCause() )
-						.isInstanceOf( ConstraintViolationException.class )
+				.invoke( he -> assertThat( he )
 						.hasMessageContaining( "size must be between" )
 				)
 		);
 	}
 
 	@Test
 	public void nameIsNull(VertxTestContext context) {
-		test( context, assertThrown( HibernateException.class, getMutinySessionFactory()
+		test( context, assertThrown( ConstraintViolationException.class, getMutinySessionFactory()
 				.withTransaction( s -> {
 					Author author = new Author();
 					author.setName( null );
 					return s.persist( author );
 				} ) )
-				.invoke( he -> assertThat( he.getCause() )
-						.isInstanceOf( ConstraintViolationException.class )
+				.invoke( he -> assertThat( he )
 						.hasMessageContaining( "must not be null" )
 				)
 		);