fix

Author: DavideD

hibernate-reactive-core/src/main/java/org/hibernate/reactive/generator/values/ReactiveInsertGeneratedIdentifierDelegate.java

@@ -63,14 +63,14 @@ public class ReactiveGeneratedValuesHelper {
 	 *
 	 * @see GeneratedValuesHelper#getGeneratedValuesDelegate(EntityPersister, EventType)
 	 */
-	public static GeneratedValuesMutationDelegate getGeneratedValuesDelegate(
-			EntityPersister persister,
-			EventType timing) {
+	public static GeneratedValuesMutationDelegate getGeneratedValuesDelegate(EntityPersister persister, EventType timing) {
 		final boolean hasGeneratedProperties = !persister.getGeneratedProperties( timing ).isEmpty();
 		final boolean hasRowId = timing == EventType.INSERT && persister.getRowIdMapping() != null;
 		final Dialect dialect = persister.getFactory().getJdbcServices().getDialect();
 
-		if ( hasRowId && dialect.supportsInsertReturning() && dialect.supportsInsertReturningRowId()
+		if ( hasRowId
+				&& dialect.supportsInsertReturning()
+				&& dialect.supportsInsertReturningRowId()
 				&& noCustomSql( persister, timing ) ) {
 			// Special case for RowId on INSERT, since GetGeneratedKeysDelegate doesn't support it
 			// make InsertReturningDelegate the preferred method if the dialect supports it

hibernate-reactive-core/src/main/java/org/hibernate/reactive/generator/values/internal/ReactiveGeneratedValuesHelper.java

@@ -50,6 +50,10 @@ public class ReactiveInsertReturningDelegate extends AbstractReturningDelegate i
 	private final MutatingTableReference tableReference;
 	private final List<ColumnReference> generatedColumns;
 
+	public ReactiveInsertReturningDelegate(EntityPersister persister, EventType timing) {
+		this( persister, timing, false );
+	}
+
 	public ReactiveInsertReturningDelegate(EntityPersister persister, Dialect dialect) {
 		// With JDBC it's possible to enabled GetGeneratedKeys for identity generation.
 		// Vert.x doesn't have this option, so we always use the same strategy for all database.

hibernate-reactive-core/src/main/java/org/hibernate/reactive/id/insert/ReactiveInsertReturningDelegate.java

@@ -5,7 +5,6 @@
  */
 package org.hibernate.reactive.persister.entity.impl;
 
-import java.lang.invoke.MethodHandles;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -43,7 +42,6 @@
 import org.hibernate.reactive.loader.ast.internal.ReactiveSingleIdArrayLoadPlan;
 import org.hibernate.reactive.loader.ast.spi.ReactiveSingleIdEntityLoader;
 import org.hibernate.reactive.logging.impl.Log;
-import org.hibernate.reactive.logging.impl.LoggerFactory;
 import org.hibernate.reactive.metamodel.mapping.internal.ReactiveCompoundNaturalIdMapping;
 import org.hibernate.reactive.metamodel.mapping.internal.ReactiveSimpleNaturalIdMapping;
 import org.hibernate.reactive.pool.ReactiveConnection;
@@ -58,11 +56,13 @@
 
 import jakarta.persistence.metamodel.Attribute;
 
+import static java.lang.invoke.MethodHandles.lookup;
 import static java.util.Collections.emptyMap;
 import static org.hibernate.generator.EventType.INSERT;
 import static org.hibernate.generator.EventType.UPDATE;
 import static org.hibernate.internal.util.collections.CollectionHelper.setOfSize;
 import static org.hibernate.pretty.MessageHelper.infoString;
+import static org.hibernate.reactive.logging.impl.LoggerFactory.make;
 import static org.hibernate.reactive.util.impl.CompletionStages.completedFuture;
 import static org.hibernate.reactive.util.impl.CompletionStages.failedFuture;
 import static org.hibernate.reactive.util.impl.CompletionStages.logSqlException;
@@ -90,8 +90,6 @@
  */
 public interface ReactiveAbstractEntityPersister extends ReactiveEntityPersister {
 
-	Log LOG = LoggerFactory.make( Log.class, MethodHandles.lookup() );
-
 	default Parameters parameters() {
 		return Parameters.instance( getFactory().getJdbcServices().getDialect() );
 	}
@@ -259,6 +257,7 @@ default Object nextVersionForLock(LockMode lockMode, Object id, Object currentVe
 			final Object nextVersion = getVersionJavaType()
 					.next( currentVersion, versionMapping.getLength(), versionMapping.getPrecision(), versionMapping.getScale(), session );
 
+			Log LOG = make( Log.class, lookup() );
 			if ( LOG.isTraceEnabled() ) {
 				LOG.trace( "Forcing version increment [" + infoString( this, id, getFactory() ) + "; "
 								+ versionType.toLoggableString( currentVersion, getFactory() ) + " -> "
@@ -289,6 +288,7 @@ default ReactiveSingleIdEntityLoader<?> getReactiveSingleIdEntityLoader() {
 	 */
 	@Override
 	default CompletionStage<Object> reactiveGetCurrentVersion(Object id, SharedSessionContractImplementor session) {
+		Log LOG = make( Log.class, lookup() );
 		if ( LOG.isTraceEnabled() ) {
 			LOG.tracev( "Getting version: {0}", infoString( this, id, getFactory() ) );
 		}
@@ -379,7 +379,8 @@ default CompletionStage<Object> reactiveInitializeLazyPropertiesFromDatastore(
 			throw new AssertionFailure( "Expecting bytecode interceptor to be non-null" );
 		}
 
-		LOG.tracef( "Initializing lazy properties from datastore (triggered for `%s`)", fieldName );
+		make( Log.class, lookup() )
+				.tracef( "Initializing lazy properties from datastore (triggered for `%s`)", fieldName );
 
 		final String fetchGroup = getEntityPersister().getBytecodeEnhancementMetadata()
 				.getLazyAttributesMetadata()
@@ -459,7 +460,7 @@ default CompletionStage<Object> initLazyProperty(
 		}
 
 		return resultStage.thenApply( result -> {
-			LOG.trace( "Done initializing lazy properties" );
+			make( Log.class, lookup() ).trace( "Done initializing lazy properties" );
 			return result;
 		} );
 	}
@@ -539,12 +540,8 @@ private CompletionStage<?> loadFromDatabaseOrCache(
 
 	Object initializeLazyProperty(String fieldName, Object entity, SharedSessionContractImplementor session);
 
-	String[][] getLazyPropertyColumnAliases();
-
 	ReactiveSingleIdArrayLoadPlan reactiveGetSQLLazySelectLoadPlan(String fetchGroup);
 
-	boolean isBatchable();
-
 	/**
 	 * @see AbstractEntityPersister#generateNaturalIdMapping(MappingModelCreationProcess, PersistentClass)
 	 */

hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveAbstractEntityPersister.java

@@ -44,6 +44,7 @@
 import org.hibernate.property.access.spi.PropertyAccess;
 import org.hibernate.reactive.loader.ast.internal.ReactiveSingleIdArrayLoadPlan;
 import org.hibernate.reactive.loader.ast.spi.ReactiveSingleUniqueKeyEntityLoader;
+import org.hibernate.reactive.logging.impl.Log;
 import org.hibernate.reactive.persister.entity.mutation.ReactiveDeleteCoordinator;
 import org.hibernate.reactive.persister.entity.mutation.ReactiveInsertCoordinatorStandard;
 import org.hibernate.reactive.persister.entity.mutation.ReactiveUpdateCoordinator;
@@ -54,13 +55,18 @@
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.type.EntityType;
 
+import static java.lang.invoke.MethodHandles.lookup;
+import static org.hibernate.reactive.logging.impl.LoggerFactory.make;
+
 /**
  * An {@link ReactiveEntityPersister} backed by {@link JoinedSubclassEntityPersister}
  * and {@link ReactiveAbstractEntityPersister}.
  */
 public class ReactiveJoinedSubclassEntityPersister extends JoinedSubclassEntityPersister
 		implements ReactiveAbstractEntityPersister {
 
+	private static final Log LOG = make( Log.class, lookup() );
+
 	private final ReactiveAbstractPersisterDelegate reactiveDelegate;
 
 	public ReactiveJoinedSubclassEntityPersister(
@@ -291,11 +297,6 @@ public boolean initializeLazyProperty(String fieldName, Object entity, EntityEnt
 		return super.initializeLazyProperty( fieldName, entity, entry, lazyIndex, selectedValue );
 	}
 
-	@Override
-	public String[][] getLazyPropertyColumnAliases() {
-		return super.getLazyPropertyColumnAliases();
-	}
-
 	/**
 	 * Process properties generated with an insert
 	 *

hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveJoinedSubclassEntityPersister.java

@@ -23,7 +23,6 @@
 import org.hibernate.generator.Generator;
 import org.hibernate.generator.values.GeneratedValues;
 import org.hibernate.generator.values.GeneratedValuesMutationDelegate;
-import org.hibernate.id.insert.InsertGeneratedIdentifierDelegate;
 import org.hibernate.jdbc.Expectation;
 import org.hibernate.loader.ast.spi.MultiIdEntityLoader;
 import org.hibernate.loader.ast.spi.MultiIdLoadOptions;
@@ -47,9 +46,9 @@
 import org.hibernate.persister.entity.mutation.UpdateCoordinator;
 import org.hibernate.property.access.spi.PropertyAccess;
 import org.hibernate.reactive.generator.values.GeneratedValuesMutationDelegateAdaptor;
-import org.hibernate.reactive.generator.values.ReactiveInsertGeneratedIdentifierDelegate;
 import org.hibernate.reactive.loader.ast.internal.ReactiveSingleIdArrayLoadPlan;
 import org.hibernate.reactive.loader.ast.spi.ReactiveSingleUniqueKeyEntityLoader;
+import org.hibernate.reactive.logging.impl.Log;
 import org.hibernate.reactive.persister.entity.mutation.ReactiveAbstractDeleteCoordinator;
 import org.hibernate.reactive.persister.entity.mutation.ReactiveInsertCoordinatorStandard;
 import org.hibernate.reactive.persister.entity.mutation.ReactiveUpdateCoordinator;
@@ -60,13 +59,18 @@
 import org.hibernate.sql.results.graph.DomainResultCreationState;
 import org.hibernate.type.EntityType;
 
+import static java.lang.invoke.MethodHandles.lookup;
+import static org.hibernate.reactive.logging.impl.LoggerFactory.make;
+
 
 /**
  * A {@link ReactiveEntityPersister} backed by {@link SingleTableEntityPersister}
  * and {@link ReactiveAbstractEntityPersister}.
  */
 public class ReactiveSingleTableEntityPersister extends SingleTableEntityPersister implements ReactiveAbstractEntityPersister {
 
+	private static final Log LOG = make( Log.class, lookup() );
+
 	private ReactiveAbstractPersisterDelegate reactiveDelegate;
 
 	public ReactiveSingleTableEntityPersister(
@@ -147,15 +151,6 @@ public GeneratedValuesMutationDelegate getUpdateDelegate() {
 		return new GeneratedValuesMutationDelegateAdaptor( updateDelegate );
 	}
 
-	@Override
-	public InsertGeneratedIdentifierDelegate getIdentityInsertDelegate() {
-		final GeneratedValuesMutationDelegate insertDelegate = super.getInsertDelegate();
-		if ( insertDelegate instanceof InsertGeneratedIdentifierDelegate ) {
-			return new ReactiveInsertGeneratedIdentifierDelegate( (InsertGeneratedIdentifierDelegate) insertDelegate );
-		}
-		return null;
-	}
-
 	@Override
 	public <T> DomainResult<T> createDomainResult(
 			NavigablePath navigablePath,
@@ -232,11 +227,6 @@ public Object initializeLazyPropertiesFromDatastore(final Object entity, final O
 		return reactiveInitializeLazyPropertiesFromDatastore( entity, id, entry, fieldName, session );
 	}
 
-	@Override
-	public String[][] getLazyPropertyColumnAliases() {
-		return super.getLazyPropertyColumnAliases();
-	}
-
 	@Override
 	public Object insert(Object[] fields, Object object, SharedSessionContractImplementor session) {
 		throw LOG.nonReactiveMethodCall( "insertReactive" );

hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveSingleTableEntityPersister.java

@@ -187,11 +187,6 @@ public Generator getGenerator() throws HibernateException {
 		return reactiveDelegate.reactive( super.getGenerator() );
 	}
 
-	@Override
-	public String[][] getLazyPropertyColumnAliases() {
-		return super.getLazyPropertyColumnAliases();
-	}
-
 	@Override
 	public boolean check(int rows, Object id, int tableNumber, Expectation expectation, PreparedStatement statement, String sql) throws HibernateException {
 		return super.check(rows, id, tableNumber, expectation, statement, sql);

hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveUnionSubclassEntityPersister.java

@@ -69,10 +69,7 @@ public ReactiveInsertCoordinatorStandard(AbstractEntityPersister entityPersister
 			batchKey = null;
 		}
 		else {
-			batchKey = new BasicBatchKey(
-					entityPersister.getEntityName() + "#INSERT",
-					null
-			);
+			batchKey = new BasicBatchKey( entityPersister.getEntityName() + "#INSERT" );
 		}
 
 		if ( entityPersister.getEntityMetamodel().isDynamicInsert() ) {

hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/mutation/ReactiveInsertCoordinatorStandard.java

@@ -7,7 +7,7 @@
 
 import org.hibernate.engine.jdbc.batch.spi.BatchKey;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.persister.entity.AbstractEntityPersister;
+import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.persister.entity.mutation.EntityTableMapping;
 import org.hibernate.sql.model.MutationOperation;
 import org.hibernate.sql.model.MutationOperationGroup;
@@ -20,7 +20,7 @@
  */
 public class ReactiveMergeCoordinator extends ReactiveUpdateCoordinatorStandard {
 	public ReactiveMergeCoordinator(
-			AbstractEntityPersister entityPersister,
+			EntityPersister entityPersister,
 			SessionFactoryImplementor factory,
 			MutationOperationGroup staticUpdateGroup,
 			BatchKey batchKey,