[#1906] Support @IdGeneratorType

Author: dreab8

hibernate-reactive-core/src/main/java/org/hibernate/reactive/id/ReactiveIdentifierGenerator.java

@@ -6,11 +6,14 @@
 package org.hibernate.reactive.id;
 
 import org.hibernate.Incubating;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.generator.EventType;
-import org.hibernate.generator.Generator;
 import org.hibernate.id.IdentifierGenerator;
+import org.hibernate.reactive.logging.impl.Log;
+import org.hibernate.reactive.logging.impl.LoggerFactory;
 import org.hibernate.reactive.session.ReactiveConnectionSupplier;
 
+import java.lang.invoke.MethodHandles;
 import java.util.concurrent.CompletionStage;
 
 /**
@@ -26,7 +29,7 @@
  * @see IdentifierGenerator
  */
 @Incubating
-public interface ReactiveIdentifierGenerator<Id> extends Generator {
+public interface ReactiveIdentifierGenerator<Id> extends IdentifierGenerator {
 
 	/**
 	 * Returns a generated identifier, via a {@link CompletionStage}.
@@ -38,4 +41,18 @@ public interface ReactiveIdentifierGenerator<Id> extends Generator {
 	default CompletionStage<Id> generate(ReactiveConnectionSupplier session, Object owner, Object currentValue, EventType eventType) {
 		return generate( session, owner );
 	}
+
+	@Override
+	default Id generate(
+			SharedSessionContractImplementor session,
+			Object owner,
+			Object currentValue,
+			EventType eventType){
+		throw LoggerFactory.make( Log.class, MethodHandles.lookup() ).nonReactiveMethodCall( "generate(ReactiveConnectionSupplier, Object, Object, EventType)" );
+	}
+
+	@Override
+	default Object generate(SharedSessionContractImplementor session, Object object){
+		throw LoggerFactory.make( Log.class, MethodHandles.lookup() ).nonReactiveMethodCall( "generate(ReactiveConnectionSupplier, Object)" );
+	}
 }

hibernate-reactive-core/src/main/java/org/hibernate/reactive/id/ReactiveOnExecutionGenerator.java

@@ -0,0 +1,24 @@
+/* Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright: Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.reactive.id;
+
+import org.hibernate.dialect.Dialect;
+import org.hibernate.generator.OnExecutionGenerator;
+import org.hibernate.id.insert.InsertGeneratedIdentifierDelegate;
+import org.hibernate.persister.entity.EntityPersister;
+import org.hibernate.reactive.id.insert.ReactiveInsertReturningDelegate;
+
+public interface ReactiveOnExecutionGenerator extends OnExecutionGenerator {
+
+	@Override
+	default InsertGeneratedIdentifierDelegate getGeneratedIdentifierDelegate(EntityPersister persister) {
+		Dialect dialect = persister.getFactory().getJdbcServices().getDialect();
+		// Hibernate ORM allows the selection of different strategies based on the property `hibernate.jdbc.use_get_generated_keys`.
+		// But that's a specific JDBC property and with Vert.x we only have one viable option for each supported database.
+		return new ReactiveInsertReturningDelegate( persister, dialect );
+	}
+
+}

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

@@ -12,6 +12,7 @@
 import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.MariaDBDialect;
 import org.hibernate.dialect.MySQLDialect;
 import org.hibernate.dialect.OracleDialect;
 import org.hibernate.dialect.SQLServerDialect;
@@ -86,6 +87,12 @@ && getPersister().getFactory().getJdbcServices().getDialect() instanceof Cockroa
 	}
 
 	private static String createInsert(String insertSql, String identifierColumnName, Dialect dialect) {
+		if ( dialect instanceof MariaDBDialect ) {
+			// The queries for MariDB seem to work fine, we don't have to change them.
+			// In particular, removing the " returning id" at the end will cause a failure when a column value
+			// is generated by the database
+			return insertSql;
+		}
 		String sql = insertSql;
 		final String sqlEnd = " returning " + identifierColumnName;
 		if ( dialect instanceof MySQLDialect ) {

hibernate-reactive-core/src/main/java/org/hibernate/reactive/session/impl/ReactiveStatelessSessionImpl.java

@@ -70,6 +70,7 @@
 import org.hibernate.reactive.query.sql.spi.ReactiveNativeQueryImplementor;
 import org.hibernate.reactive.query.sqm.internal.ReactiveQuerySqmImpl;
 import org.hibernate.reactive.query.sqm.internal.ReactiveSqmSelectionQueryImpl;
+import org.hibernate.reactive.session.ReactiveConnectionSupplier;
 import org.hibernate.reactive.session.ReactiveSqmQueryImplementor;
 import org.hibernate.reactive.session.ReactiveStatelessSession;
 import org.hibernate.reactive.util.impl.CompletionStages.Completable;
@@ -438,7 +439,7 @@ private CompletionStage<?> generatedIdBeforeInsert(
 
 	private CompletionStage<?> generateIdForInsert(Object entity, Generator generator, ReactiveEntityPersister persister) {
 		if ( generator instanceof ReactiveIdentifierGenerator<?> reactiveGenerator ) {
-			return reactiveGenerator.generate( this, this )
+			return reactiveGenerator.generate( (ReactiveConnectionSupplier) this, this )
 					.thenApply( id -> castToIdentifierType( id, persister ) );
 		}