Merge branch 'main' into dependabot/gradle/main/mutiny-ab532cbfc2

Author: DavideD

.github/workflows/build.yml

@@ -193,8 +193,8 @@ jobs:
           # and it's useful to test that.
           - { name: "20", java_version_numeric: 20, jvm_args: '--enable-preview' }
           - { name: "21", java_version_numeric: 21, jvm_args: '--enable-preview' }
-          - { name: "24", java_version_numeric: 24, from: 'jdk.java.net', jvm_args: '--enable-preview' }
-          - { name: "25-ea", java_version_numeric: 25, from: 'jdk.java.net', jvm_args: '--enable-preview' }
+          - { name: "24", java_version_numeric: 24, jvm_args: '--enable-preview' }
+          - { name: "25", java_version_numeric: 25, from: 'jdk.java.net', jvm_args: '--enable-preview' }
           - { name: "26-ea", java_version_numeric: 26, from: 'jdk.java.net', jvm_args: '--enable-preview' }
     steps:
       - name: Checkout ${{ inputs.branch }}

documentation/src/main/asciidoc/reference/introduction.adoc

@@ -89,7 +89,7 @@ Optionally, you might also add any of the following additional features:
 | Hibernate Validator | `org.hibernate.validator:hibernate-validator` and `org.glassfish:jakarta.el`
 | Compile-time checking for your HQL queries | `org.hibernate:query-validator`
 | Second-level cache support via JCache and EHCache | `org.hibernate.orm:hibernate-jcache` along with `org.ehcache:ehcache`
-| SCRAM authentication support for PostgreSQL | `com.ongres.scram:scram-client:3.1`
+| SCRAM authentication support for PostgreSQL | `com.ongres.scram:scram-client:3.2`
 |===
 
 You might also add the Hibernate {enhancer}[bytecode enhancer] to your

gradle.properties

@@ -39,10 +39,10 @@ org.gradle.java.installations.auto-download=false
 ### Settings the following properties will override the version defined in gradle/libs.versions.toml
 
 # The default Hibernate ORM version (override using `-PhibernateOrmVersion=the.version.you.want`)
-#hibernateOrmVersion = 7.1.0.Final
+#hibernateOrmVersion = 7.1.1.Final
 
 # Override default Hibernate ORM Gradle plugin version
-#hibernateOrmGradlePluginVersion = 7.1.0.Final
+#hibernateOrmGradlePluginVersion = 7.1.1.Final
 
 # If set to true, skip Hibernate ORM version parsing (default is true, if set to null)
 # this is required when using intervals or weird versions or the build will fail

gradle/libs.versions.toml

@@ -1,24 +1,24 @@
 [versions]
-assertjVersion = "3.27.4"
-hibernateOrmVersion = "7.1.0.Final"
-hibernateOrmGradlePluginVersion = "7.1.0.Final"
+assertjVersion = "3.27.6"
+hibernateOrmVersion = "7.1.1.Final"
+hibernateOrmGradlePluginVersion = "7.1.1.Final"
 jacksonDatabindVersion = "2.20.0"
 jbossLoggingAnnotationVersion = "3.0.4.Final"
 jbossLoggingVersion = "3.6.1.Final"
 junitVersion = "5.13.4"
 junitPlatformVersion = "1.13.3"
-log4jVersion = "2.25.1"
+log4jVersion = "2.25.2"
 testcontainersVersion = "1.21.3"
-vertxSqlClientVersion = "5.0.3"
-vertxWebVersion= "5.0.3"
-vertxWebClientVersion = "5.0.3"
+vertxSqlClientVersion = "5.0.4"
+vertxWebVersion= "5.0.4"
+vertxWebClientVersion = "5.0.4"
 
 [libraries]
 com-fasterxml-jackson-core-jackson-databind = { group = "com.fasterxml.jackson.core", name = "jackson-databind", version.ref = "jacksonDatabindVersion" }
 com-ibm-db2-jcc = { group = "com.ibm.db2", name = "jcc", version = "12.1.2.0" }
 com-microsoft-sqlserver-mssql-jdbc = { group = "com.microsoft.sqlserver", name = "mssql-jdbc", version = "13.2.0.jre11" }
 com-mysql-mysql-connector-j = { group = "com.mysql", name = "mysql-connector-j", version = "9.4.0" }
-com-ongres-scram-scram-client = { group = "com.ongres.scram", name = "scram-client", version = "3.1" }
+com-ongres-scram-scram-client = { group = "com.ongres.scram", name = "scram-client", version = "3.2" }
 io-smallrye-reactive-mutiny = { group = "io.smallrye.reactive", name = "mutiny", version = "3.0.0" }
 io-vertx-vertx-db2-client = { group = "io.vertx", name = "vertx-db2-client", version.ref = "vertxSqlClientVersion" }
 io-vertx-vertx-junit5 = { group = "io.vertx", name = "vertx-junit5", version.ref = "vertxSqlClientVersion" }
@@ -44,8 +44,8 @@ org-jboss-logging-jboss-logging-processor = { group = "org.jboss.logging", name
 org-junit-jupiter-junit-jupiter-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junitVersion" }
 org-junit-jupiter-junit-jupiter-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junitVersion" }
 org-junit-platform-junit-platform-launcher = { group = "org.junit.platform", name = "junit-platform-launcher", version = "1.13.4" }
-org-mariadb-jdbc-mariadb-java-client = { group = "org.mariadb.jdbc", name = "mariadb-java-client", version = "3.5.5" }
-org-postgresql-postgresql = { group = "org.postgresql", name = "postgresql", version = "42.7.7" }
+org-mariadb-jdbc-mariadb-java-client = { group = "org.mariadb.jdbc", name = "mariadb-java-client", version = "3.5.6" }
+org-postgresql-postgresql = { group = "org.postgresql", name = "postgresql", version = "42.7.8" }
 org-testcontainers-cockroachdb = { group = "org.testcontainers", name = "cockroachdb", version.ref = "testcontainersVersion" }
 org-testcontainers-db2 = { group = "org.testcontainers", name = "db2", version.ref = "testcontainersVersion" }
 org-testcontainers-mariadb = { group = "org.testcontainers", name = "mariadb", version.ref = "testcontainersVersion" }

hibernate-reactive-core/src/main/java/org/hibernate/reactive/adaptor/impl/ResultSetAdaptor.java

@@ -28,6 +28,7 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.Iterator;
@@ -134,20 +135,27 @@ public ResultSetAdaptor(RowSet<Row> rows) {
 		this.columnDescriptors = rows.columnDescriptors();
 	}
 
-	public ResultSetAdaptor(RowSet<Row> rows, PropertyKind<Row> propertyKind, String idColumnName, Class<?> idClass) {
-		this( rows, rows.property( propertyKind ), idColumnName, idClass );
+	public ResultSetAdaptor(RowSet<Row> rows, PropertyKind<Row> propertyKind, List<String> generatedColumnNames, List<Class<?>> generatedColumnClasses) {
+		this( rows, rows.property( propertyKind ), generatedColumnNames, generatedColumnClasses );
 	}
 
 	public ResultSetAdaptor(RowSet<Row> rows, Collection<?> ids, String idColumnName, Class<?> idClass) {
 		this( rows, new RowFromId( ids, idColumnName ), idColumnName, idClass );
 	}
 
 	private ResultSetAdaptor(RowSet<Row> rows, Row row, String idColumnName, Class<?> idClass) {
+		this( rows, row, List.of( idColumnName ), List.of( idClass ) );
+	}
+
+	private ResultSetAdaptor(RowSet<Row> rows, Row row, List<String> columnNames, List<Class<?>> columnClasses) {
 		requireNonNull( rows );
-		requireNonNull( idColumnName );
+		requireNonNull( columnNames );
 		this.iterator = List.of( row ).iterator();
-		this.columnNames = List.of( idColumnName );
-		this.columnDescriptors = List.of( toColumnDescriptor( idClass, idColumnName ) );
+		this.columnNames =  columnNames ;
+		this.columnDescriptors = new ArrayList<>(columnNames.size());
+		for (int i =0; i < columnNames.size(); i++) {
+			columnDescriptors.add( toColumnDescriptor( columnClasses.get( i ), columnNames.get(i) ) );
+		}
 	}
 
 	private static ColumnDescriptor toColumnDescriptor(Class<?> idClass, String idColumnName) {

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

@@ -11,7 +11,6 @@
 import org.hibernate.TransientObjectException;
 import org.hibernate.bytecode.enhance.spi.LazyPropertyInitializer;
 import org.hibernate.engine.internal.NonNullableTransientDependencies;
-import org.hibernate.engine.internal.ReactivePersistenceContextAdapter;
 import org.hibernate.engine.spi.EntityEntry;
 import org.hibernate.engine.spi.PersistenceContext;
 import org.hibernate.engine.spi.SelfDirtinessTracker;

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

@@ -16,6 +16,7 @@
 import org.hibernate.event.spi.EventSource;
 import org.hibernate.generator.values.GeneratedValues;
 import org.hibernate.internal.util.NullnessUtil;
+import org.hibernate.metamodel.mapping.EntityRowIdMapping;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.reactive.persister.entity.impl.ReactiveEntityPersister;
 import org.hibernate.stat.spi.StatisticsImplementor;
@@ -31,6 +32,7 @@ public class ReactiveEntityIdentityInsertAction extends EntityIdentityInsertActi
 	private final boolean isVersionIncrementDisabled;
 	private boolean executed;
 	private boolean transientReferencesNullified;
+	private Object rowId;
 
 	public ReactiveEntityIdentityInsertAction(
 			Object[] state,
@@ -108,6 +110,13 @@ private CompletionStage<Void> processInsertGeneratedProperties(
 			Object instance,
 			GeneratedValues generatedValues,
 			SharedSessionContractImplementor session) {
+		final EntityRowIdMapping rowIdMapping = persister.getRowIdMapping();
+		if ( rowIdMapping != null ) {
+			rowId = generatedValues.getGeneratedValue( rowIdMapping );
+			if ( rowId != null && !isEarlyInsert() ) {
+				session.getPersistenceContext().replaceEntityEntryRowId( getInstance(), rowId );
+			}
+		}
 		return persister.hasInsertGeneratedProperties()
 				? persister.reactiveProcessInsertGenerated( generatedId, instance, getState(), generatedValues, session )
 				: voidFuture();
@@ -153,4 +162,9 @@ public boolean areTransientReferencesNullified() {
 	public void setTransientReferencesNullified() {
 		transientReferencesNullified = true;
 	}
+
+	@Override
+	public Object getRowId() {
+		return rowId;
+	}
 }

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

@@ -17,6 +17,7 @@
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.event.spi.EventSource;
 import org.hibernate.generator.values.GeneratedValues;
+import org.hibernate.metamodel.mapping.EntityRowIdMapping;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.reactive.persister.entity.impl.ReactiveEntityPersister;
 import org.hibernate.stat.spi.StatisticsImplementor;
@@ -111,8 +112,19 @@ private CompletionStage<Void> processInsertGeneratedProperties(
 //				setVersion( Versioning.getVersion( getState(), persister ) );
 			}
 			return persister.reactiveProcessInsertGenerated( id, instance, getState(), generatedValues, session )
-					.thenAccept( v -> entry.postUpdate( instance, getState(), getVersion() ) );
-
+					.thenAccept( v -> {
+						// Process row-id values when available early by replacing the entity entry
+						if ( generatedValues != null ) {
+							final EntityRowIdMapping rowIdMapping = persister.getRowIdMapping();
+							if ( rowIdMapping != null ) {
+								final Object rowId = generatedValues.getGeneratedValue( rowIdMapping );
+								if ( rowId != null ) {
+									session.getPersistenceContext().replaceEntityEntryRowId( getInstance(), rowId );
+								}
+							}
+						}
+						entry.postUpdate( instance, getState(), getVersion() );
+					} );
 		}
 		else {
 			return voidFuture();

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

@@ -15,6 +15,7 @@
 import org.hibernate.engine.spi.Status;
 import org.hibernate.event.spi.EventSource;
 import org.hibernate.generator.values.GeneratedValues;
+import org.hibernate.metamodel.mapping.EntityRowIdMapping;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.reactive.engine.ReactiveExecutable;
 import org.hibernate.reactive.persister.entity.impl.ReactiveEntityPersister;
@@ -143,7 +144,19 @@ private CompletionStage<Void> processGeneratedProperties(
 				throw new UnsupportedOperationException( "generated version attribute not supported in Hibernate Reactive" );
 //				setNextVersion( Versioning.getVersion( getState(), persister ) );
 			}
-			return persister.reactiveProcessUpdateGenerated( id, instance, getState(), generatedValues, session );
+			return persister.reactiveProcessUpdateGenerated( id, instance, getState(), generatedValues, session )
+					.thenAccept( v -> {
+						// Process row-id values when available early by replacing the entity entry
+						if ( generatedValues != null ) {
+							final EntityRowIdMapping rowIdMapping = persister.getRowIdMapping();
+							if ( rowIdMapping != null ) {
+								final Object rowId = generatedValues.getGeneratedValue( rowIdMapping );
+								if ( rowId != null ) {
+									session.getPersistenceContext().replaceEntityEntryRowId( getInstance(), rowId );
+								}
+							}
+						}
+					} );
 
 		}
 		else {

hibernate-reactive-core/src/main/java/org/hibernate/engine/internal/ReactivePersistenceContextAdapter.java renamed to hibernate-reactive-core/src/main/java/org/hibernate/reactive/engine/impl/ReactivePersistenceContextAdapter.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright: Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.engine.internal;
+package org.hibernate.reactive.engine.impl;
 
 import java.io.Serializable;
 import java.util.Iterator;
@@ -36,7 +36,6 @@
 import org.hibernate.event.spi.PostLoadEventListener;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.persister.entity.EntityPersister;
-import org.hibernate.reactive.engine.impl.ReactiveCallbackImpl;
 import org.hibernate.reactive.engine.spi.ReactiveSharedSessionContractImplementor;
 import org.hibernate.reactive.logging.impl.Log;
 import org.hibernate.reactive.persister.entity.impl.ReactiveEntityPersister;
@@ -106,7 +105,7 @@ public Object[] getDatabaseSnapshot(Object id, EntityPersister persister) throws
 		throw LOG.nonReactiveMethodCall( "reactiveGetDatabaseSnapshot" );
 	}
 
-	private static final Object[] NO_ROW = new Object[] {StatefulPersistenceContext.NO_ROW};
+	private static final Object[] NO_ROW = new Object[] {PersistenceContext.NO_ROW};
 
 	public CompletionStage<Object[]> reactiveGetDatabaseSnapshot(Object id, EntityPersister persister) throws HibernateException {
 		SessionImplementor session = (SessionImplementor) getSession();
@@ -720,7 +719,7 @@ public NaturalIdResolutions getNaturalIdResolutions() {
 	}
 
 	/**
-	 * Reactive version of {@link StatefulPersistenceContext#postLoad(JdbcValuesSourceProcessingState, Consumer)}
+	 * Reactive version of {@link org.hibernate.engine.internal.StatefulPersistenceContext#postLoad(JdbcValuesSourceProcessingState, Consumer)}
 	 */
 	public CompletionStage<Void> reactivePostLoad(
 			JdbcValuesSourceProcessingState processingState,
@@ -763,7 +762,7 @@ private CompletionStage<Void> processHolders(
 	}
 
 	/**
-	 * Reactive version of {@link StatefulPersistenceContext#processLoadedEntityHolder(EntityHolder, EventListenerGroup, PostLoadEvent, Callback, Consumer)}
+	 * Reactive version of {@link org.hibernate.engine.internal.StatefulPersistenceContext#processLoadedEntityHolder(EntityHolder, EventListenerGroup, PostLoadEvent, Callback, Consumer)}
 	 */
 	private CompletionStage<Void> processLoadedEntityHolder(
 			EntityHolder holder,