[hibernate#1826] ReactiveIdentifierGenerator

Author: DavideD

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

@@ -6,6 +6,7 @@
 package org.hibernate.reactive.id;
 
 import org.hibernate.Incubating;
+import org.hibernate.generator.Generator;
 import org.hibernate.id.IdentifierGenerator;
 import org.hibernate.reactive.session.ReactiveConnectionSupplier;
 
@@ -24,7 +25,7 @@
  * @see IdentifierGenerator
  */
 @Incubating
-public interface ReactiveIdentifierGenerator<Id> {
+public interface ReactiveIdentifierGenerator<Id> extends Generator {
 
 	/**
 	 * Returns a generated identifier, via a {@link CompletionStage}.

hibernate-reactive-core/src/test/java/org/hibernate/reactive/CustomGeneratorTest.java

@@ -6,18 +6,20 @@
 package org.hibernate.reactive;
 
 import java.util.Collection;
+import java.util.EnumSet;
 import java.util.List;
 import java.util.Objects;
 import java.util.Properties;
 import java.util.concurrent.CompletionStage;
 
+import org.hibernate.MappingException;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.annotations.Parameter;
+import org.hibernate.generator.EventType;
+import org.hibernate.generator.GeneratorCreationContext;
 import org.hibernate.id.Configurable;
 import org.hibernate.reactive.id.ReactiveIdentifierGenerator;
 import org.hibernate.reactive.session.ReactiveConnectionSupplier;
-import org.hibernate.service.ServiceRegistry;
-import org.hibernate.type.Type;
 
 import org.junit.jupiter.api.Test;
 
@@ -44,36 +46,33 @@ protected Collection<Class<?>> annotatedEntities() {
 
 	@Test
 	public void testSequenceGenerator(VertxTestContext context) {
-
 		CustomId b = new CustomId();
 		b.string = "Hello World";
 
-		test(
-				context,
-				openSession()
-						.thenCompose( s -> s.persist( b ).thenCompose( v -> s.flush() ) )
-						.thenCompose( v -> openSession() )
-						.thenCompose( s2 -> s2
-								.find( CustomId.class, b.getId() )
-								.thenAccept( bb -> {
-									assertNotNull( bb );
-									assertEquals( bb.id, 1100 );
-									assertEquals( bb.string, b.string );
-									assertEquals( bb.version, 0 );
-
-									bb.string = "Goodbye";
-								} )
-								.thenCompose( vv -> s2.flush() )
-								.thenCompose( vv -> s2.find( CustomId.class, b.getId() ) )
-								.thenAccept( bt -> {
-									assertEquals( bt.version, 1 );
-								} ) )
-						.thenCompose( v -> openSession() )
-						.thenCompose( s3 -> s3.find( CustomId.class, b.getId() ) )
+		test( context, openSession()
+				.thenCompose( s -> s.persist( b ).thenCompose( v -> s.flush() ) )
+				.thenCompose( v -> openSession() )
+				.thenCompose( s2 -> s2
+						.find( CustomId.class, b.getId() )
 						.thenAccept( bb -> {
-							assertEquals( bb.version, 1 );
-							assertEquals( bb.string, "Goodbye" );
+							assertNotNull( bb );
+							assertEquals( bb.id, 1100 );
+							assertEquals( bb.string, b.string );
+							assertEquals( bb.version, 0 );
+
+							bb.string = "Goodbye";
 						} )
+						.thenCompose( vv -> s2.flush() )
+						.thenCompose( vv -> s2.find( CustomId.class, b.getId() ) )
+						.thenAccept( bt -> {
+							assertEquals( bt.version, 1 );
+						} ) )
+				.thenCompose( v -> openSession() )
+				.thenCompose( s3 -> s3.find( CustomId.class, b.getId() ) )
+				.thenAccept( bb -> {
+					assertEquals( bb.version, 1 );
+					assertEquals( bb.string, "Goodbye" );
+				} )
 		);
 	}
 
@@ -87,15 +86,25 @@ public CompletionStage<Integer> generate(ReactiveConnectionSupplier session, Obj
 		}
 
 		@Override
-		public void configure(Type type, Properties params, ServiceRegistry serviceRegistry) {
-			current = Integer.parseInt( params.getProperty( "offset", "0" ) );
+		public void configure(GeneratorCreationContext creationContext, Properties parameters) throws MappingException {
+			current = Integer.parseInt( parameters.getProperty( "offset", "0" ) );
+		}
+
+		@Override
+		public boolean generatedOnExecution() {
+			return false;
+		}
+
+		@Override
+		public EnumSet<EventType> getEventTypes() {
+			return EnumSet.of( EventType.INSERT );
 		}
 	}
 
 	@Entity
 	@GenericGenerator(
 			name = "thousands",
-			strategy = "org.hibernate.reactive.CustomGeneratorTest$Thousands",
+			type = Thousands.class,
 			parameters = @Parameter(name = "offset", value = "100")
 	)
 	public static class CustomId {