[hibernate#2055] SessionFactoryManager.stop() should always call SessionFactory.close()

PersistentTemporaryTable dropping is obtained setting PersistentTableStrategy.DROP_ID_TABLES to true

Author: dreab8

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

@@ -18,6 +18,8 @@
 import org.hibernate.dialect.Dialect;
 import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.query.sqm.mutation.internal.temptable.GlobalTemporaryTableStrategy;
+import org.hibernate.query.sqm.mutation.internal.temptable.PersistentTableStrategy;
 import org.hibernate.reactive.containers.DatabaseConfiguration;
 import org.hibernate.reactive.containers.DatabaseConfiguration.DBType;
 import org.hibernate.reactive.mutiny.Mutiny;
@@ -33,6 +35,7 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.condition.DisabledIf;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -105,6 +108,8 @@ public static void setDefaultProperties(Configuration configuration) {
 		configuration.setProperty( Settings.SHOW_SQL, System.getProperty( Settings.SHOW_SQL, "false" ) );
 		configuration.setProperty( Settings.FORMAT_SQL, System.getProperty( Settings.FORMAT_SQL, "false" ) );
 		configuration.setProperty( Settings.HIGHLIGHT_SQL, System.getProperty( Settings.HIGHLIGHT_SQL, "true" ) );
+		configuration.setProperty( PersistentTableStrategy.DROP_ID_TABLES, "true" );
+		configuration.setProperty( GlobalTemporaryTableStrategy.DROP_ID_TABLES, "true" );
 	}
 
 	public static final SessionFactoryManager factoryManager = new SessionFactoryManager();
@@ -186,6 +191,7 @@ private <T> CriteriaQuery<T> queryForDelete(Class<T> entityClass) {
 	}
 
 	@BeforeEach
+	@DisabledIf( "" )
 	@Timeout(value = 10, timeUnit = MINUTES)
 	public void before(VertxTestContext context) {
 		test( context, setupSessionFactory( this::constructConfiguration ) );

hibernate-reactive-core/src/test/java/org/hibernate/reactive/testing/SessionFactoryManager.java

@@ -5,20 +5,13 @@
  */
 package org.hibernate.reactive.testing;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.concurrent.CompletionStage;
 import java.util.function.Supplier;
 
 import org.hibernate.SessionFactory;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.metamodel.spi.MappingMetamodelImplementor;
-import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.query.sqm.mutation.internal.temptable.PersistentTableStrategy;
 import org.hibernate.reactive.pool.ReactiveConnectionPool;
-import org.hibernate.reactive.query.sqm.mutation.internal.temptable.ReactivePersistentTableStrategy;
 
-import static org.hibernate.reactive.util.impl.CompletionStages.loop;
 import static org.hibernate.reactive.util.impl.CompletionStages.voidFuture;
 
 /**
@@ -60,24 +53,8 @@ public ReactiveConnectionPool getReactiveConnectionPool() {
 	public CompletionStage<Void> stop() {
 		CompletionStage<Void> releasedStage = voidFuture();
 		if ( sessionFactory != null && sessionFactory.isOpen() ) {
-			SessionFactoryImplementor sessionFactoryImplementor = sessionFactory.unwrap( SessionFactoryImplementor.class );
-			MappingMetamodelImplementor mappingMetamodel = sessionFactoryImplementor
-					.getRuntimeMetamodels()
-					.getMappingMetamodel();
-			final List<ReactivePersistentTableStrategy> reactiveStrategies = new ArrayList<>();
-			mappingMetamodel.forEachEntityDescriptor(
-					entityPersister -> addPersistentTableStrategy( reactiveStrategies, entityPersister )
-			);
-			if ( !reactiveStrategies.isEmpty() ) {
-				releasedStage = loop( reactiveStrategies, strategy -> {
-					( (PersistentTableStrategy) strategy )
-							.release( sessionFactory.unwrap( SessionFactoryImplementor.class ), null );
-					return strategy.getDropTableActionStage();
-				} );
-
-				releasedStage = releasedStage
-						.whenComplete( (unused, throwable) -> sessionFactory.close() );
-			}
+			releasedStage = releasedStage
+					.whenComplete( (unused, throwable) -> sessionFactory.close() );
 		}
 		return releasedStage
 				.thenCompose( unused -> {
@@ -93,13 +70,4 @@ public CompletionStage<Void> stop() {
 					return closeFuture;
 				} );
 	}
-
-	private void addPersistentTableStrategy(List<ReactivePersistentTableStrategy> reactiveStrategies, EntityPersister entityPersister) {
-		if ( entityPersister.getSqmMultiTableMutationStrategy() instanceof ReactivePersistentTableStrategy ) {
-			reactiveStrategies.add( (ReactivePersistentTableStrategy) entityPersister.getSqmMultiTableMutationStrategy() );
-		}
-		if ( entityPersister.getSqmMultiTableInsertStrategy() instanceof ReactivePersistentTableStrategy ) {
-			reactiveStrategies.add( (ReactivePersistentTableStrategy) entityPersister.getSqmMultiTableInsertStrategy() );
-		}
-	}
 }