[#1613] Minor clean up

DavideD · DavideD · commit 36240cc4ab15 · 2023-05-07T19:27:26.000+02:00
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/loader/ast/internal/ReactiveCollectionLoader.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/loader/ast/internal/ReactiveCollectionLoader.java
@@ -13,18 +13,17 @@
 import org.hibernate.loader.ast.spi.CollectionLoader;
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.reactive.logging.impl.Log;
-import org.hibernate.reactive.logging.impl.LoggerFactory;
 
-public interface ReactiveCollectionLoader extends CollectionLoader {
+import static org.hibernate.reactive.logging.impl.LoggerFactory.make;
 
-	Log LOG = LoggerFactory.make( Log.class, MethodHandles.lookup() );
+public interface ReactiveCollectionLoader extends CollectionLoader {
 
 	@Override
 	PluralAttributeMapping getLoadable();
 
 	@Override
 	default PersistentCollection<?> load(Object key, SharedSessionContractImplementor session) {
-		throw LOG.nonReactiveMethodCall( "reactiveLoad(Object, SharedSessionContractImplementor)" );
+		throw make( Log.class, MethodHandles.lookup() ).nonReactiveMethodCall( "reactiveLoad(Object, SharedSessionContractImplementor)" );
 	}
 
 	/**
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/loader/ast/spi/ReactiveSingleIdEntityLoader.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/loader/ast/spi/ReactiveSingleIdEntityLoader.java
@@ -9,6 +9,10 @@
 
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.loader.ast.spi.SingleIdEntityLoader;
+import org.hibernate.reactive.logging.impl.Log;
+
+import static java.lang.invoke.MethodHandles.lookup;
+import static org.hibernate.reactive.logging.impl.LoggerFactory.make;
 
 /**
  * Reactive version of {@link SingleIdEntityLoader}.
@@ -22,7 +26,7 @@ public interface ReactiveSingleIdEntityLoader<T> extends SingleIdEntityLoader<Co
 	@Deprecated
 	@Override
 	default Object[] loadDatabaseSnapshot(Object id, SharedSessionContractImplementor session) {
-		throw new UnsupportedOperationException("Use the reactive method: loadDatabaseSnapshot(Object, SharedSessionContractImplementor)");
+		throw make( Log.class, lookup() ).nonReactiveMethodCall( "reactiveLoadDatabaseSnapshot" );
 	}
 
 	CompletionStage<Object[]> reactiveLoadDatabaseSnapshot(Object id, SharedSessionContractImplementor session);
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/collection/impl/ReactiveAbstractCollectionPersister.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/collection/impl/ReactiveAbstractCollectionPersister.java
@@ -22,8 +22,6 @@
  */
 public interface ReactiveAbstractCollectionPersister extends ReactiveCollectionPersister {
 
-    Log LOG = LoggerFactory.make( Log.class, MethodHandles.lookup() );
-
     default ReactiveConnection getReactiveConnection(SharedSessionContractImplementor session) {
         return ( (ReactiveConnectionSupplier) session ).getReactiveConnection();
     }
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/collection/impl/ReactiveCollectionPersister.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/collection/impl/ReactiveCollectionPersister.java
@@ -13,23 +13,22 @@
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.reactive.logging.impl.Log;
-import org.hibernate.reactive.logging.impl.LoggerFactory;
+
+import static org.hibernate.reactive.logging.impl.LoggerFactory.make;
 
 /**
  * A reactive {@link CollectionPersister}
  */
 public interface ReactiveCollectionPersister extends CollectionPersister {
 
-	Log LOG = LoggerFactory.make( Log.class, MethodHandles.lookup() );
-
 	/**
 	 * Reactive version of {@link CollectionPersister#recreate(PersistentCollection, Object, SharedSessionContractImplementor)}
 	 */
 	CompletionStage<Void> reactiveRecreate(PersistentCollection<?> collection, Object id, SharedSessionContractImplementor session);
 
 	@Override
 	default void remove(Object id, SharedSessionContractImplementor session) {
-		throw LOG.nonReactiveMethodCall( "reactiveRemove" );
+		throw make( Log.class, MethodHandles.lookup() ).nonReactiveMethodCall( "reactiveRemove" );
 	}
 
 	/**
@@ -39,7 +38,7 @@ default void remove(Object id, SharedSessionContractImplementor session) {
 
 	@Override
 	default void deleteRows(PersistentCollection<?> collection, Object key, SharedSessionContractImplementor session) {
-		throw LOG.nonReactiveMethodCall( "reactiveDeleteRows" );
+		throw make( Log.class, MethodHandles.lookup() ).nonReactiveMethodCall( "reactiveDeleteRows" );
 	}
 
 	/**
@@ -49,7 +48,7 @@ default void deleteRows(PersistentCollection<?> collection, Object key, SharedSe
 
 	@Override
 	default void insertRows(PersistentCollection<?> collection, Object key, SharedSessionContractImplementor session) {
-		throw LOG.nonReactiveMethodCall( "reactiveInsertRows" );
+		throw make( Log.class, MethodHandles.lookup() ).nonReactiveMethodCall( "reactiveInsertRows" );
 	}
 
 	/**
@@ -59,7 +58,7 @@ default void insertRows(PersistentCollection<?> collection, Object key, SharedSe
 
 	@Override
 	default void updateRows(PersistentCollection<?> collection, Object key, SharedSessionContractImplementor session) {
-		throw LOG.nonReactiveMethodCall( "reactiveUpdateRows" );
+		throw make( Log.class, MethodHandles.lookup() ).nonReactiveMethodCall( "reactiveUpdateRows" );
 	}
 
 	/**
@@ -69,7 +68,7 @@ default void updateRows(PersistentCollection<?> collection, Object key, SharedSe
 
 	@Override
 	default void initialize(Object key, SharedSessionContractImplementor session) throws HibernateException {
-		throw LOG.nonReactiveMethodCall( "reactiveInitialize" );
+		throw make( Log.class, MethodHandles.lookup() ).nonReactiveMethodCall( "reactiveInitialize" );
 	}
 
 	/**
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveSessionImpl.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveSessionImpl.java
@@ -1294,8 +1294,8 @@ private CompletionStage<Void> fireReactiveLoad(LoadEvent event, LoadEventListene
 	private CompletionStage<Void> fireLoadNoChecks(LoadEvent event, LoadEventListener.LoadType loadType) {
 		pulseTransactionCoordinator();
 
-		return fastSessionServices.eventListenerGroup_LOAD.fireEventOnEachListener( event, loadType,
-																					(ReactiveLoadEventListener l) -> l::reactiveOnLoad
+		return fastSessionServices.eventListenerGroup_LOAD
+				.fireEventOnEachListener( event, loadType,(ReactiveLoadEventListener l) -> l::reactiveOnLoad
 		);
 	}
 
@@ -1721,7 +1721,7 @@ public ReactiveConnection getReactiveConnection() {
 
 	@Override
 	public void close() throws HibernateException {
-		throw new UnsupportedOperationException( "Non-reactive 'close()' method called. Use 'reactiveClose()' instead." );
+		throw LOG.nonReactiveMethodCall( "reactiveClose()" );
 	}
 
 	@Override
diff --git a/hibernate-reactive-core/src/test/java/org/hibernate/reactive/LazyOneToManyAssociationWithFetchTest.java b/hibernate-reactive-core/src/test/java/org/hibernate/reactive/LazyOneToManyAssociationWithFetchTest.java
@@ -5,7 +5,10 @@
  */
 package org.hibernate.reactive;
 
-import io.vertx.ext.unit.TestContext;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Objects;
 
 import org.hibernate.Hibernate;
 import org.hibernate.annotations.FetchMode;
@@ -14,6 +17,7 @@
 
 import org.junit.Test;
 
+import io.vertx.ext.unit.TestContext;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EntityGraph;
 import jakarta.persistence.FetchType;
@@ -24,37 +28,13 @@
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.CompletionStage;
-
-import static org.hibernate.reactive.util.impl.CompletionStages.loop;
-
 public class LazyOneToManyAssociationWithFetchTest extends BaseReactiveTest {
 
 	@Override
 	protected Collection<Class<?>> annotatedEntities() {
 		return List.of( Author.class, Book.class );
 	}
 
-	@Override
-	public CompletionStage<Void> deleteEntities(Class<?>... entities) {
-		return getSessionFactory()
-				.withTransaction( s -> loop( entities, entityClass -> s
-						.createQuery( "from " + entityName( entityClass ), entityClass )
-						.getResultList()
-						.thenCompose( list -> loop( list, entity -> s.remove( entity ) ) ) ) );
-	}
-
-	private String entityName(Class<?> entityClass) {
-		if ( Author.class.equals( entityClass ) ) {
-			return "Writer";
-		}
-		return "Tome";
-	}
-
 	@Test
 	public void findBookWithFetchAuthors(TestContext context) {
 		final Book goodOmens = new Book(

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,6 @@`
`22`	`22`	`*/`
`23`	`23`	`public interface ReactiveAbstractCollectionPersister extends ReactiveCollectionPersister {`
`24`	`24`
`25`		`- Log LOG = LoggerFactory.make( Log.class, MethodHandles.lookup() );`
`26`		`-`
`27`	`25`	`default ReactiveConnection getReactiveConnection(SharedSessionContractImplementor session) {`
`28`	`26`	`return ( (ReactiveConnectionSupplier) session ).getReactiveConnection();`
`29`	`27`	`}`