[#487] Close stateless sessions

Author: DavideD

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

@@ -72,8 +72,7 @@ public abstract class BaseReactiveTest {
 		return vertx;
 	} );
 
-
-	private AutoCloseable session;
+	private AutoCloseable session, statelessSession;
 	private ReactiveConnection connection;
 	private org.hibernate.SessionFactory sessionFactory;
 	private ReactiveConnectionPool poolProvider;
@@ -213,6 +212,11 @@ public void after(TestContext context) {
 			session.close();
 			session = null;
 		}
+		if ( statelessSession != null && statelessSession.isOpen() ) {
+			statelessSession.close();
+			statelessSession = null;
+		}
+
 		if ( connection != null ) {
 			try {
 				connection.close();
@@ -246,6 +250,15 @@ protected Stage.Session openSession() {
 		return newSession;
 	}
 
+	protected Stage.StatelessSession openStatelessSession() {
+		if ( statelessSession != null && statelessSession.isOpen() ) {
+			statelessSession.close();
+		}
+		Stage.StatelessSession newSession = getSessionFactory().openStatelessSession();
+		this.statelessSession = newSession;
+		return newSession;
+	}
+
 	protected CompletionStage<ReactiveConnection> connection() {
 		return poolProvider.getConnection().thenApply( c -> connection = c );
 	}
@@ -268,4 +281,13 @@ protected Mutiny.SessionFactory getMutinySessionFactory() {
 		return sessionFactory.unwrap( Mutiny.SessionFactory.class );
 	}
 
+	protected Mutiny.StatelessSession openMutinyStatelessSession() {
+		if ( statelessSession != null ) {
+			statelessSession.close();
+		}
+		Mutiny.StatelessSession newSession = getMutinySessionFactory().openStatelessSession();
+		this.statelessSession = newSession;
+		return newSession;
+	}
+
 }

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

@@ -97,13 +97,13 @@ public void getBookWithAuthors(TestContext context) {
 
 		test(
 				context,
-				completedFuture( getSessionFactory().openStatelessSession() )
+				completedFuture( openStatelessSession() )
 						.thenCompose( s -> voidFuture()
 								.thenCompose( v -> s.insert(goodOmens) )
 								.thenCompose( v -> s.insert(neilGaiman) )
 								.thenCompose( v -> s.insert(terryPratchett) )
 						)
-						.thenApply( v -> getSessionFactory().openStatelessSession() )
+						.thenApply( v -> openStatelessSession() )
 						.thenCompose( s -> s.get( Book.class, goodOmens.getId() ) )
 						.thenAccept( optionalBook -> {
 							context.assertNotNull( optionalBook );

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

@@ -246,12 +246,12 @@ public void getBookWithFetchAuthors(TestContext context) {
 
 		test(
 				context,
-				completedFuture( getSessionFactory().openStatelessSession() )
+				completedFuture( openStatelessSession() )
 						.thenCompose(s -> s.insert(goodOmens)
 								.thenCompose(v -> s.insert(neilGaiman))
 								.thenCompose(v -> s.insert(terryPratchett))
 						)
-						.thenApply( v -> getSessionFactory().openStatelessSession() )
+						.thenApply( v -> openStatelessSession() )
 						.thenCompose( s -> s.get(Book.class, goodOmens.getId())
 								.thenCompose(
 										book -> s.fetch( book.getAuthors() )
@@ -276,7 +276,7 @@ public void getBookWithEntityGrpahAuthors(TestContext context) {
 
 		test(
 				context,
-				completedFuture( getSessionFactory().openStatelessSession() )
+				completedFuture( openStatelessSession() )
 						.thenCompose(s -> s.insert(goodOmens)
 								.thenCompose(v -> s.insert(neilGaiman))
 								.thenCompose(v -> s.insert(terryPratchett))

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

@@ -38,7 +38,7 @@ public void cleanDb(TestContext context) {
 	@Test
 	public void testStatelessSession(TestContext context) {
 		GuineaPig pig = new GuineaPig("Aloi");
-		Stage.StatelessSession ss = getSessionFactory().openStatelessSession();
+		Stage.StatelessSession ss = openStatelessSession();
 		test(
 				context,
 				ss.insert(pig)
@@ -135,6 +135,7 @@ public void testStatelessSessionCriteria(TestContext context) {
 						.thenAccept( rows -> context.assertEquals(1, rows) )
 						.thenCompose( v -> ss.createQuery(delete).executeUpdate() )
 						.thenAccept( rows -> context.assertEquals(1, rows) )
+						.thenAccept( v -> ss.close() )
 		);
 	}