[#1906] Minor refactoring and clean up

Author: DavideD

hibernate-reactive-core/src/main/java/org/hibernate/reactive/generator/values/internal/ReactiveGeneratedValuesHelper.java

@@ -65,7 +65,6 @@ public class ReactiveGeneratedValuesHelper {
 private static final CoreMessageLogger LOG = CoreLogging.messageLogger( IdentifierGeneratorHelper.class );
 
 /**
- *
  * @see GeneratedValuesHelper#getGeneratedValuesDelegate(EntityPersister, EventType)
  */
 public static GeneratedValuesMutationDelegate getGeneratedValuesDelegate(EntityPersister persister, EventType timing) {
@@ -74,10 +73,8 @@ public static GeneratedValuesMutationDelegate getGeneratedValuesDelegate(EntityP
 final boolean hasRowId = timing == EventType.INSERT && persister.getRowIdMapping() != null;
 final Dialect dialect = persister.getFactory().getJdbcServices().getDialect();
 
-final boolean hasFormula =
-generatedProperties.stream()
-.anyMatch( part -> part instanceof SelectableMapping selectable
-&& selectable.isFormula() );
+final boolean hasFormula = generatedProperties.stream()
+.anyMatch( ReactiveGeneratedValuesHelper::isFormula );
 
 boolean supportsInsertReturningRowId = trueIfCockroach( dialect, dialect.supportsInsertReturningRowId() );
 if ( hasRowId
@@ -99,8 +96,8 @@ && noCustomSql( persister, timing ) ) {
 else if ( !hasFormula && dialect.supportsInsertReturningGeneratedKeys() ) {
 return new ReactiveGetGeneratedKeysDelegate( persister, false, timing );
 }
-else if ( timing == EventType.INSERT && persister.getNaturalIdentifierProperties() != null && !persister.getEntityMetamodel()
-.isNaturalIdentifierInsertGenerated() ) {
+else if ( timing == EventType.INSERT && persister.getNaturalIdentifierProperties() != null
+&& !persister.getEntityMetamodel().isNaturalIdentifierInsertGenerated() ) {
 return new ReactiveUniqueKeySelectingDelegate( persister, getNaturalIdPropertyNames( persister ), timing );
 }
 return null;
@@ -114,6 +111,10 @@ private static boolean trueIfCockroach(Dialect dialect, boolean predicate) {
 return predicate || dialect instanceof CockroachDialect;
 }
 
+private static boolean isFormula(ModelPart part) {
+return part instanceof SelectableMapping selectable && selectable.isFormula();
+}
+
 public static boolean supportReactiveGetGeneratedKey(Dialect dialect, List<? extends ModelPart> generatedProperties) {
 return dialect instanceof OracleDialect
 || (dialect instanceof MySQLDialect && generatedProperties.size() == 1 && !(dialect instanceof MariaDBDialect));

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

@@ -14,7 +14,6 @@
 import org.hibernate.generator.EventType;
 import org.hibernate.generator.values.GeneratedValues;
 import org.hibernate.id.insert.AbstractSelectingDelegate;
-import org.hibernate.id.insert.BasicSelectingDelegate;
 import org.hibernate.jdbc.Expectation;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.reactive.adaptor.impl.PrepareStatementDetailsAdaptor;
@@ -31,7 +30,7 @@
 import java.util.concurrent.CompletionStage;
 
 /**
- * @see BasicSelectingDelegate
+ * @see org.hibernate.id.insert.BasicSelectingDelegate
  */
 public class ReactiveBasicSelectingDelegate extends AbstractSelectingDelegate implements
 ReactiveGeneratedValuesMutationDelegate {
@@ -56,7 +55,7 @@ public CompletionStage<GeneratedValues> reactivePerformMutation(
 PreparedStatementDetails details = new PrepareStatementDetailsAdaptor( statementDetails, statement, jdbcServices );
 valueBindings.beforeStatement( details );
 } );
-return ((ReactiveConnectionSupplier) session).getReactiveConnection()
+return ( (ReactiveConnectionSupplier) session ).getReactiveConnection()
 .update( statementDetails.getSqlString(), params )
 .thenCompose( unused -> getGeneratedValues( session ) );
 }

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

@@ -36,7 +36,6 @@ public class ReactiveUniqueKeySelectingDelegate extends UniqueKeySelectingDelega
 private final String[] uniqueKeyPropertyNames;
 private final Type[] uniqueKeyTypes;
 
-
 public ReactiveUniqueKeySelectingDelegate(
 EntityPersister persister,
 String[] uniqueKeyPropertyNames,
@@ -60,8 +59,8 @@ public CompletionStage<GeneratedValues> reactivePerformMutation(
 PreparedStatementDetails details = new PrepareStatementDetailsAdaptor( statementDetails, statement, jdbcServices );
 valueBindings.beforeStatement( details );
 } );
-return ((ReactiveConnectionSupplier) session).getReactiveConnection()
-.update(  statementDetails.getSqlString(), params )
+return ( (ReactiveConnectionSupplier) session ).getReactiveConnection()
+.update( statementDetails.getSqlString(), params )
 .thenCompose( unused -> getGeneratedValues( entity, session ) );
 }
 

hibernate-reactive-core/src/main/java/org/hibernate/reactive/persister/entity/impl/ReactiveIdentityGenerator.java

@@ -31,8 +31,8 @@ public class ReactiveIdentityGenerator extends IdentityGenerator {
 public InsertGeneratedIdentifierDelegate getGeneratedIdentifierDelegate(EntityPersister persister) {
 final 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 Vertex driver does not support get generated keys.
+Hibernate ORM allows the selection of different strategies based on the property `hibernate.jdbc.use_get_generated_keys`,
+but the Vert.x driver does not support get generated keys.
  */
 final boolean supportsInsertReturning = ReactiveGeneratedValuesHelper.supportsInsertReturning( dialect );
 if ( supportsInsertReturning && noCustomSql( persister, INSERT ) ) {