minor cleanups to ColumnsBuilder

Author: gavinking

hibernate-core/src/main/java/org/hibernate/boot/internal/SessionFactoryBuilderImpl.java

@@ -4,7 +4,6 @@
  */
 package org.hibernate.boot.internal;
 
-import java.util.Map;
 import java.util.function.Supplier;
 
 import org.hibernate.CustomEntityDirtinessStrategy;
@@ -59,7 +58,7 @@ public SessionFactoryBuilderImpl(MetadataImplementor metadata, SessionFactoryOpt
 		this.bootstrapContext = context;
 
 		if ( metadata.getSqlFunctionMap() != null ) {
-			for ( Map.Entry<String, SqmFunctionDescriptor> sqlFunctionEntry : metadata.getSqlFunctionMap().entrySet() ) {
+			for ( var sqlFunctionEntry : metadata.getSqlFunctionMap().entrySet() ) {
 				applySqlFunction( sqlFunctionEntry.getKey(), sqlFunctionEntry.getValue() );
 			}
 		}

hibernate-core/src/main/java/org/hibernate/boot/model/internal/ColumnsBuilder.java

@@ -91,7 +91,6 @@ public ColumnsBuilder extractMetadata() {
 			columns = buildColumnFromAnnotation(
 					columnAnn,
 					property.getDirectAnnotationUsage( FractionalSeconds.class ),
-//					comment,
 					nullability,
 					propertyHolder,
 					inferredData,
@@ -149,7 +148,6 @@ else if ( joinColumns == null
 			//useful for collection of embedded elements
 			columns = buildColumnFromNoAnnotation(
 					property.getDirectAnnotationUsage( FractionalSeconds.class ),
-//					comment,
 					nullability,
 					propertyHolder,
 					inferredData,
@@ -196,7 +194,7 @@ private AnnotatedJoinColumns buildDefaultJoinColumnsForToOne(
 
 	private AnnotatedJoinColumns buildExplicitJoinColumns(MemberDetails property, PropertyData inferredData) {
 		// process @JoinColumns before @Columns to handle collection of entities properly
-		final JoinColumn[] joinColumnAnnotations = getJoinColumnAnnotations( property, inferredData );
+		final JoinColumn[] joinColumnAnnotations = getJoinColumnAnnotations( property );
 		if ( joinColumnAnnotations != null ) {
 			return AnnotatedJoinColumns.buildJoinColumns(
 					joinColumnAnnotations,
@@ -208,7 +206,7 @@ private AnnotatedJoinColumns buildExplicitJoinColumns(MemberDetails property, Pr
 			);
 		}
 
-		final JoinColumnOrFormula[] joinColumnOrFormulaAnnotations = joinColumnOrFormulaAnnotations( property, inferredData );
+		final JoinColumnOrFormula[] joinColumnOrFormulaAnnotations = joinColumnOrFormulaAnnotations( property );
 		if ( joinColumnOrFormulaAnnotations != null ) {
 			return AnnotatedJoinColumns.buildJoinColumnsOrFormulas(
 					joinColumnOrFormulaAnnotations,
@@ -234,20 +232,16 @@ private AnnotatedJoinColumns buildExplicitJoinColumns(MemberDetails property, Pr
 		return null;
 	}
 
-	private JoinColumnOrFormula[] joinColumnOrFormulaAnnotations(MemberDetails property, PropertyData inferredData) {
+	private JoinColumnOrFormula[] joinColumnOrFormulaAnnotations(MemberDetails property) {
 		final ModelsContext modelsContext = buildingContext.getBootstrapContext().getModelsContext();
 		final JoinColumnOrFormula[] annotations = property.getRepeatedAnnotationUsages(
 				HibernateAnnotations.JOIN_COLUMN_OR_FORMULA,
 				modelsContext
 		);
-		if ( isNotEmpty( annotations ) ) {
-			return annotations;
-		}
-
-		return null;
+		return isNotEmpty( annotations ) ? annotations : null;
 	}
 
-	private JoinColumn[] getJoinColumnAnnotations(MemberDetails property, PropertyData inferredData) {
+	private JoinColumn[] getJoinColumnAnnotations(MemberDetails property) {
 		final ModelsContext modelsContext = buildingContext.getBootstrapContext().getModelsContext();
 
 		final JoinColumn[] joinColumns = property.getRepeatedAnnotationUsages(
@@ -257,8 +251,7 @@ private JoinColumn[] getJoinColumnAnnotations(MemberDetails property, PropertyDa
 		if ( isNotEmpty( joinColumns ) ) {
 			return joinColumns;
 		}
-
-		if ( property.hasDirectAnnotationUsage( MapsId.class ) ) {
+		else if ( property.hasDirectAnnotationUsage( MapsId.class ) ) {
 			// inelegant solution to HHH-16463, let the PrimaryKeyJoinColumn
 			// masquerade as a regular JoinColumn (when a @OneToOne maps to
 			// the primary key of the child table, it's more elegant and more
@@ -275,19 +268,24 @@ private JoinColumn[] getJoinColumnAnnotations(MemberDetails property, PropertyDa
 				}
 				return adapters;
 			}
+			else {
+				return null;
+			}
+		}
+		else {
+			return null;
 		}
-
-		return null;
 	}
 
 	/**
 	 * Useful to override a column either by {@code @MapsId} or by {@code @IdClass}
 	 */
 	AnnotatedColumns overrideColumnFromMapperOrMapsIdProperty(PropertyData override) {
 		if ( override != null ) {
-			final AnnotatedJoinColumns joinColumns = buildExplicitJoinColumns( override.getAttributeMember(), override );
+			final MemberDetails attributeMember = override.getAttributeMember();
+			final AnnotatedJoinColumns joinColumns = buildExplicitJoinColumns( attributeMember, override );
 			return joinColumns == null
-					? buildDefaultJoinColumnsForToOne( override.getAttributeMember(), override )
+					? buildDefaultJoinColumnsForToOne( attributeMember, override )
 					: joinColumns;
 		}
 		else {