deal with some warnings

Author: gavinking

hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/InsertCoordinatorStandard.java

@@ -121,10 +121,10 @@ public GeneratedValues coordinateInsert(
 			SharedSessionContractImplementor session) {
 		// apply any pre-insert in-memory value generation
 		final boolean needsDynamicInsert = preInsertInMemoryValueGeneration( values, entity, session );
-
-		final EntityMetamodel entityMetamodel = entityPersister().getEntityMetamodel();
-		final boolean forceIdentifierBinding = entityPersister().getGenerator().generatedOnExecution() && id != null;
-		if ( entityMetamodel.isDynamicInsert() || needsDynamicInsert || forceIdentifierBinding ) {
+		final EntityPersister persister = entityPersister();
+		final boolean forceIdentifierBinding = persister.getGenerator().generatedOnExecution() && id != null;
+		if ( persister.getEntityMetamodel().isDynamicInsert()
+				|| needsDynamicInsert || forceIdentifierBinding ) {
 			return doDynamicInserts( id, values, entity, session, forceIdentifierBinding );
 		}
 		else {
@@ -432,7 +432,7 @@ else if ( isValueGenerationInSql( generator, factory.getJdbcServices().getDialec
 			if ( tableMapping.isIdentifierTable() && entityPersister().isIdentifierAssignedByInsert() && !forceIdentifierBinding ) {
 				assert entityPersister().getInsertDelegate() != null;
 				final OnExecutionGenerator generator = (OnExecutionGenerator) entityPersister().getGenerator();
-				if ( generator.referenceColumnsInSql( dialect() ) ) {
+				if ( generator.referenceColumnsInSql( dialect ) ) {
 					final BasicEntityIdentifierMapping identifierMapping = (BasicEntityIdentifierMapping) entityPersister().getIdentifierMapping();
 					final String[] columnValues = generator.getReferencedColumnValues( dialect );
 					tableMapping.getKeyMapping().forEachKeyColumn( (i, column) -> tableInsertBuilder.addKeyColumn(
@@ -450,8 +450,8 @@ else if ( isValueGenerationInSql( generator, factory.getJdbcServices().getDialec
 
 	private static boolean isValueGenerated(Generator generator) {
 		return generator != null
-				&& generator.generatesOnInsert()
-				&& generator.generatedOnExecution();
+			&& generator.generatesOnInsert()
+			&& generator.generatedOnExecution();
 	}
 
 	private static boolean isValueGenerationInSql(Generator generator, Dialect dialect) {

hibernate-core/src/main/java/org/hibernate/persister/entity/mutation/UpdateCoordinatorStandard.java

@@ -11,7 +11,6 @@
 import java.util.Locale;
 import java.util.function.Supplier;
 
-import org.hibernate.AssertionFailure;
 import org.hibernate.HibernateException;
 import org.hibernate.Internal;
 import org.hibernate.StaleObjectStateException;
@@ -200,7 +199,6 @@ public GeneratedValues update(
 
 		final boolean[] attributeUpdateability;
 		boolean forceDynamicUpdate;
-
 		if ( entityPersister().getEntityMetamodel().isDynamicUpdate() && dirtyAttributeIndexes != null ) {
 			attributeUpdateability = getPropertiesToUpdate( dirtyAttributeIndexes, hasDirtyCollection );
 			forceDynamicUpdate = true;
@@ -374,21 +372,15 @@ private static boolean includedInLock(
 			int position,
 			SingularAttributeMapping attribute,
 			EntityPersister persister) {
-		switch ( persister.optimisticLockStyle() ) {
-			case NONE:
-				return false;
-			case VERSION:
-				return versionMapping != null
-						&& versionMapping.getVersionAttribute() == attribute;
+		return switch ( persister.optimisticLockStyle() ) {
+			case NONE -> false;
+			case VERSION -> versionMapping != null
+					&& versionMapping.getVersionAttribute() == attribute;
 //						&& updateableAttributeIndexes[position];
-			case ALL:
-				return attribute.getAttributeMetadata().isIncludedInOptimisticLocking();
-			case DIRTY:
-				return attribute.getAttributeMetadata().isIncludedInOptimisticLocking()
-						&& dirtinessChecker.include( position, attribute );
-			default:
-				throw new AssertionFailure( "unknown OptimisticLockStyle" );
-		}
+			case ALL -> attribute.getAttributeMetadata().isIncludedInOptimisticLocking();
+			case DIRTY -> attribute.getAttributeMetadata().isIncludedInOptimisticLocking()
+					&& dirtinessChecker.include( position, attribute );
+		};
 	}
 
 	protected Supplier<GeneratedValues> handlePotentialImplicitForcedVersionIncrement(
@@ -988,7 +980,7 @@ private MutationExecutor updateVersionExecutor(
 			boolean dynamicUpdate,
 			boolean batching) {
 		if ( batching ) {
-			return updateVersionExecutor(session, group,dynamicUpdate);
+			return updateVersionExecutor( session, group, dynamicUpdate );
 		}
 		return mutationExecutorService.createExecutor( NoBatchKeyAccess.INSTANCE, group, session );
 
@@ -1228,9 +1220,7 @@ private void applyAttributeUpdateDetails(
 			TableUpdateBuilder<?> tableUpdateBuilder,
 			SharedSessionContractImplementor session) {
 		final Generator generator = attributeMapping.getGenerator();
-		if ( isValueGenerated( generator )
-				&& ( session == null && generator.generatedOnExecution() || generator.generatedOnExecution( entity, session ) )
-				&& isValueGenerationInSql( generator, dialect ) ) {
+		if ( needsValueGeneration( entity, session, generator ) ) {
 			handleValueGeneration( attributeMapping, updateGroupBuilder, (OnExecutionGenerator) generator );
 		}
 		else if ( versionMapping != null
@@ -1247,6 +1237,12 @@ else if ( versionMapping != null
 		}
 	}
 
+	private boolean needsValueGeneration(Object entity, SharedSessionContractImplementor session, Generator generator) {
+		return isValueGenerated( generator )
+			&& (session == null && generator.generatedOnExecution() || generator.generatedOnExecution( entity, session ) )
+			&& isValueGenerationInSql( generator, dialect );
+	}
+
 	/**
 	 * Contains the aggregated analysis of the update values to determine
 	 * what SQL UPDATE statement(s) should be used to update the entity
@@ -1608,19 +1604,19 @@ private MutationOperationGroup buildStaticUpdateGroup() {
 				null,
 				null,
 				null,
-				(index,attribute) -> isValueGenerated( attribute.getGenerator() ) && isValueGenerationInSql( attribute.getGenerator(), dialect() )
+				(index,attribute) ->
+						isValueGenerated( attribute.getGenerator() )
+								&& isValueGenerationInSql( attribute.getGenerator(), dialect() )
 						|| entityPersister().getPropertyUpdateability()[index],
-				(index,attribute) -> {
-					switch ( entityPersister().optimisticLockStyle() ) {
-						case ALL:
-							return true;
-						case VERSION:
-							final EntityVersionMapping versionMapping = entityPersister().getVersionMapping();
-							return versionMapping != null && attribute == versionMapping.getVersionAttribute();
-						default:
-							return false;
-					}
-				},
+				(index,attribute) ->
+						switch ( entityPersister().optimisticLockStyle() ) {
+							case ALL -> true;
+							case VERSION -> {
+								final EntityVersionMapping versionMapping = entityPersister().getVersionMapping();
+								yield versionMapping != null && attribute == versionMapping.getVersionAttribute();
+							}
+							default -> false;
+						},
 				(index,attribute) -> true,
 				"", // pass anything here to generate the row id restriction if possible
 				false,