[#1767][#1756] Upgrade Hibernate ORM to 6.3.1.Final

And Fix ignored RowId for delete query

Author: DavideD

README.md

@@ -37,7 +37,7 @@ Hibernate Reactive has been tested with:
 - CockroachDB 22.1
 - MS SQL Server 2019
 - Oracle 21.3
-- [Hibernate ORM][] 6.3.0.Final
+- [Hibernate ORM][] 6.3.1.Final
 - [Vert.x Reactive PostgreSQL Client](https://vertx.io/docs/vertx-pg-client/java/) 4.4.5
 - [Vert.x Reactive MySQL Client](https://vertx.io/docs/vertx-mysql-client/java/) 4.4.5
 - [Vert.x Reactive Db2 Client](https://vertx.io/docs/vertx-db2-client/java/) 4.4.5

build.gradle

@@ -53,7 +53,7 @@ version = projectVersion
 // ./gradlew clean build -PhibernateOrmVersion=5.6.15-SNAPSHOT
 ext {
     if ( !project.hasProperty('hibernateOrmVersion') ) {
-        hibernateOrmVersion = '6.3.0.Final'
+        hibernateOrmVersion = '6.3.1.Final'
     }
     if ( !project.hasProperty( 'hibernateOrmGradlePluginVersion' ) ) {
         // Same as ORM as default

hibernate-reactive-core/src/main/java/org/hibernate/reactive/engine/impl/ReactiveEntityDeleteAction.java

@@ -64,12 +64,14 @@ public CompletionStage<Void> reactiveExecute() throws HibernateException {
 		final boolean veto = isInstanceLoaded() && preDelete();
 
 		final Object ck = lockCacheItem();
-
-		final CompletionStage<Void> deleteStep = !isCascadeDeleteEnabled() && !veto
-				? ( (ReactiveEntityPersister) persister ).deleteReactive( id, version, instance, session )
-				: voidFuture();
-
-		return deleteStep.thenAccept( v -> {
+		return deleteStep(
+				veto,
+				(ReactiveEntityPersister) persister,
+				id,
+				version,
+				instance,
+				session
+		).thenAccept( v -> {
 			if ( isInstanceLoaded() ) {
 				postDeleteLoaded( id, persister, session, instance, ck );
 			}
@@ -84,4 +86,16 @@ public CompletionStage<Void> reactiveExecute() throws HibernateException {
 			}
 		} );
 	}
+
+	private CompletionStage<Void> deleteStep(
+			boolean veto,
+			ReactiveEntityPersister persister,
+			Object id,
+			Object version,
+			Object instance,
+			SharedSessionContractImplementor session) {
+		return !isCascadeDeleteEnabled() && !veto
+				? persister.deleteReactive( id, version, instance, session )
+				: voidFuture();
+	}
 }

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

@@ -11,12 +11,10 @@
 
 import org.hibernate.engine.jdbc.mutation.JdbcValueBindings;
 import org.hibernate.engine.jdbc.mutation.MutationExecutor;
-import org.hibernate.engine.jdbc.mutation.ParameterUsage;
 import org.hibernate.engine.jdbc.mutation.group.PreparedStatementDetails;
 import org.hibernate.engine.jdbc.mutation.spi.MutationExecutorService;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
-import org.hibernate.metamodel.mapping.EntityRowIdMapping;
 import org.hibernate.persister.entity.AbstractEntityPersister;
 import org.hibernate.persister.entity.mutation.DeleteCoordinator;
 import org.hibernate.persister.entity.mutation.EntityTableMapping;
@@ -25,6 +23,7 @@
 import org.hibernate.reactive.engine.jdbc.env.internal.ReactiveMutationExecutor;
 import org.hibernate.reactive.logging.impl.Log;
 import org.hibernate.reactive.logging.impl.LoggerFactory;
+import org.hibernate.sql.model.MutationOperation;
 import org.hibernate.sql.model.MutationOperationGroup;
 
 import static org.hibernate.engine.jdbc.mutation.internal.ModelMutationHelper.identifiedResultsCheck;
@@ -61,17 +60,18 @@ public CompletionStage<Void> coordinateReactiveDelete(Object entity, Object id,
 	}
 
 	@Override
-	protected void doDynamicDelete(Object entity, Object id, Object rowId, Object[] loadedState, SharedSessionContractImplementor session) {
+	protected void doDynamicDelete(Object entity, Object id, Object[] loadedState, SharedSessionContractImplementor session) {
 		stage = new CompletableFuture<>();
-		final MutationOperationGroup operationGroup = generateOperationGroup( loadedState, true, session );
+		final MutationOperationGroup operationGroup = generateOperationGroup( null, loadedState, true, session );
 		final ReactiveMutationExecutor mutationExecutor = mutationExecutor( session, operationGroup );
 
-		operationGroup.forEachOperation( (position, mutation) -> {
+		for ( int i = 0; i < operationGroup.getNumberOfOperations(); i++ ) {
+			final MutationOperation mutation = operationGroup.getOperation( i );
 			if ( mutation != null ) {
 				final String tableName = mutation.getTableDetails().getTableName();
 				mutationExecutor.getPreparedStatementDetails( tableName );
 			}
-		} );
+		}
 
 		applyLocking( null, loadedState, mutationExecutor, session );
 		applyId( id, null, mutationExecutor, getStaticDeleteGroup(), session );
@@ -102,44 +102,49 @@ protected void applyId(
 			MutationOperationGroup operationGroup,
 			SharedSessionContractImplementor session) {
 		final JdbcValueBindings jdbcValueBindings = mutationExecutor.getJdbcValueBindings();
-		final EntityRowIdMapping rowIdMapping = entityPersister().getRowIdMapping();
 
-		operationGroup.forEachOperation( (position, jdbcMutation) -> {
+		for ( int position = 0; position < operationGroup.getNumberOfOperations(); position++ ) {
+			final MutationOperation jdbcMutation = operationGroup.getOperation( position );
 			final EntityTableMapping tableDetails = (EntityTableMapping) jdbcMutation.getTableDetails();
-			breakDownIdJdbcValues( id, rowId, session, jdbcValueBindings, rowIdMapping, tableDetails );
+			breakDownKeyJdbcValues( id, rowId, session, jdbcValueBindings, tableDetails );
 			final PreparedStatementDetails statementDetails = mutationExecutor.getPreparedStatementDetails( tableDetails.getTableName() );
 			if ( statementDetails != null ) {
 				PreparedStatementAdaptor.bind( statement -> {
-					PrepareStatementDetailsAdaptor detailsAdaptor = new PrepareStatementDetailsAdaptor( statementDetails, statement, session.getJdbcServices() );
+					PrepareStatementDetailsAdaptor detailsAdaptor = new PrepareStatementDetailsAdaptor(
+							statementDetails,
+							statement,
+							session.getJdbcServices()
+					);
 					// force creation of the PreparedStatement
 					//noinspection resource
 					detailsAdaptor.resolveStatement();
 				} );
 			}
-		} );
+		}
 	}
 
 	@Override
-	protected void doStaticDelete(Object entity, Object id, Object[] loadedState, Object version, SharedSessionContractImplementor session) {
+	protected void doStaticDelete(Object entity, Object id, Object rowId, Object[] loadedState, Object version, SharedSessionContractImplementor session) {
 		stage = new CompletableFuture<>();
 		final boolean applyVersion = entity != null;
 		final MutationOperationGroup operationGroupToUse = entity == null
 				? resolveNoVersionDeleteGroup( session )
 				: getStaticDeleteGroup();
 
 		final ReactiveMutationExecutor mutationExecutor = mutationExecutor( session, operationGroupToUse );
-		getStaticDeleteGroup().forEachOperation( (position, mutation) -> {
+		for ( int position = 0; position < getStaticDeleteGroup().getNumberOfOperations(); position++ ) {
+			final MutationOperation mutation = getStaticDeleteGroup().getOperation( position );
 			if ( mutation != null ) {
 				mutationExecutor.getPreparedStatementDetails( mutation.getTableDetails().getTableName() );
 			}
-		} );
+		}
 
 		if ( applyVersion ) {
 			applyLocking( version, null, mutationExecutor, session );
 		}
 		final JdbcValueBindings jdbcValueBindings = mutationExecutor.getJdbcValueBindings();
 		bindPartitionColumnValueBindings( loadedState, session, jdbcValueBindings );
-		applyId( id, null, mutationExecutor, getStaticDeleteGroup(), session );
+		applyId( id, rowId, mutationExecutor, getStaticDeleteGroup(), session );
 		mutationExecutor.executeReactive(
 						entity,
 						null,
@@ -158,38 +163,6 @@ protected void doStaticDelete(Object entity, Object id, Object[] loadedState, Ob
 				.whenComplete( this::complete );
 	}
 
-	/**
-	 * Copy and paste of the on in ORM
-	 */
-	private static void breakDownIdJdbcValues(
-			Object id,
-			Object rowId,
-			SharedSessionContractImplementor session,
-			JdbcValueBindings jdbcValueBindings,
-			EntityRowIdMapping rowIdMapping,
-			EntityTableMapping tableDetails) {
-		if ( rowId != null && rowIdMapping != null && tableDetails.isIdentifierTable() ) {
-			jdbcValueBindings.bindValue(
-					rowId,
-					tableDetails.getTableName(),
-					rowIdMapping.getRowIdName(),
-					ParameterUsage.RESTRICT
-			);
-		}
-		else {
-			tableDetails.getKeyMapping().breakDownKeyJdbcValues(
-					id,
-					(jdbcValue, columnMapping) -> jdbcValueBindings.bindValue(
-							jdbcValue,
-							tableDetails.getTableName(),
-							columnMapping.getColumnName(),
-							ParameterUsage.RESTRICT
-					),
-					session
-			);
-		}
-	}
-
 	private void complete(Object o, Throwable throwable) {
 		if ( throwable != null ) {
 			stage.toCompletableFuture().completeExceptionally( throwable );

hibernate-reactive-core/src/main/java/org/hibernate/reactive/pool/impl/SqlClientConnection.java

@@ -184,7 +184,7 @@ public CompletionStage<int[]> updateBatch(String sql, List<Tuple> parametersBatc
 
 			int i = 0;
 			RowSet<Row> resultNext = result;
-			if ( parametersBatch.size() > 0 ) {
+			if ( !parametersBatch.isEmpty() ) {
 				final RowIterator<Row> iterator = resultNext.iterator();
 				if ( iterator.hasNext() ) {
 					while ( iterator.hasNext() ) {