[#1904] Small refactoring

With this change we avoid the creation of a couple of CompletionStage objects
hibernate · Jan 23, 2025 · 89f7cf2 · 89f7cf2
1 parent 8f00411
commit 89f7cf2
Showing 1 changed file with 15 additions and 14 deletions.
diff --git a/...re/src/main/java/org/hibernate/reactive/event/impl/AbstractReactiveSaveEventListener.java b/...re/src/main/java/org/hibernate/reactive/event/impl/AbstractReactiveSaveEventListener.java
@@ -182,20 +182,21 @@ private CompletionStage<Object> generateId(
 			EntityPersister persister) {
 		return generator
 				.generate( (ReactiveConnectionSupplier) source, entity )
-				.thenApply( id -> castToIdentifierType( id, persister ) )
-				.thenCompose( generatedId -> {
-					if ( generatedId == null ) {
-						return failedFuture( new IdentifierGenerationException( "null id generated for: " + entity.getClass() ) );
-					}
-					if ( LOG.isDebugEnabled() ) {
-						LOG.debugf(
-								"Generated identifier: %s, using strategy: %s",
-								persister.getIdentifierType().toLoggableString( generatedId, source.getFactory() ),
-								generator.getClass().getName()
-						);
-					}
-					return completedFuture( generatedId );
-				} );
+				.thenApply( id -> {
+								final Object generatedId = castToIdentifierType( id, persister );
+								if ( generatedId == null ) {
+									throw new IdentifierGenerationException( "null id generated for: " + entity.getClass() );
+								}
+								if ( LOG.isDebugEnabled() ) {
+									LOG.debugf(
+											"Generated identifier: %s, using strategy: %s",
+											persister.getIdentifierType().toLoggableString( generatedId, source.getFactory() ),
+											generator.getClass().getName()
+									);
+								}
+								return generatedId;
+							}
+				);
 	}
 
 	/**