minor cleanups

Author: gavinking

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/BasicValuedCollectionPart.java

@@ -188,7 +188,8 @@ private SqlSelection resolveSqlSelection(
 		// If the index is part of the element table group, we must use that explicitly here because the index is basic
 		// and thus there is no index table group registered. The logic in the PluralTableGroup prevents from looking
 		// into the element table group though because the element table group navigable path is not the parent of this navigable path
-		if ( nature == Nature.INDEX &&  collectionDescriptor.getAttributeMapping().getIndexMetadata().getIndexPropertyName() != null ) {
+		if ( nature == Nature.INDEX
+				&& collectionDescriptor.getAttributeMapping().getIndexMetadata().getIndexPropertyName() != null ) {
 			targetTableGroup = ( (PluralTableGroup) tableGroup ).getElementTableGroup();
 		}
 		else {
@@ -199,10 +200,7 @@ private SqlSelection resolveSqlSelection(
 				getContainingTableExpression()
 		);
 		return exprResolver.resolveSqlSelection(
-				exprResolver.resolveSqlExpression(
-						tableReference,
-						selectableMapping
-				),
+				exprResolver.resolveSqlExpression( tableReference, selectableMapping ),
 				getJdbcMapping().getJdbcJavaType(),
 				fetchParent,
 				creationState.getSqlAstCreationState().getCreationContext().getTypeConfiguration()
@@ -275,9 +273,9 @@ public Fetch generateFetch(
 			parentNavigablePath = parentNavigablePath.getParent();
 		}
 
-		final TableGroup tableGroup = creationState.getSqlAstCreationState()
-				.getFromClauseAccess()
-				.findTableGroup( parentNavigablePath );
+		final TableGroup tableGroup =
+				creationState.getSqlAstCreationState().getFromClauseAccess()
+						.findTableGroup( parentNavigablePath );
 		final SqlSelection sqlSelection = resolveSqlSelection( fetchablePath, tableGroup, fetchParent, creationState );
 
 		return new BasicFetch<>(

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ManyToManyCollectionPart.java

@@ -32,7 +32,6 @@
 import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.metamodel.mapping.ManagedMappingType;
 import org.hibernate.metamodel.mapping.ModelPart;
-import org.hibernate.metamodel.mapping.ModelPartContainer;
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.metamodel.mapping.SelectableConsumer;
 import org.hibernate.metamodel.mapping.SelectableMapping;
@@ -78,8 +77,8 @@
  *
  * @author Steve Ebersole
  */
-public class ManyToManyCollectionPart extends AbstractEntityCollectionPart implements EntityAssociationMapping,
-		LazyTableGroup.ParentTableGroupUseChecker {
+public class ManyToManyCollectionPart extends AbstractEntityCollectionPart
+		implements EntityAssociationMapping, LazyTableGroup.ParentTableGroupUseChecker {
 	private ForeignKeyDescriptor foreignKey;
 	private ValuedModelPart fkTargetModelPart;
 
@@ -126,8 +125,9 @@ public ModelPart findSubPart(String name, EntityMappingType targetType) {
 		// to preserve the cardinality. Also, the OneToManyTableGroup has no reference to the parent table group
 		if ( getTargetKeyPropertyNames().contains( name ) ) {
 			final ModelPart keyPart = foreignKey.getKeyPart();
-			if ( keyPart instanceof EmbeddableValuedModelPart && keyPart instanceof VirtualModelPart ) {
-				return ( (ModelPartContainer) keyPart ).findSubPart( name, targetType );
+			if ( keyPart instanceof EmbeddableValuedModelPart embeddableValuedModelPart
+					&& keyPart instanceof VirtualModelPart ) {
+				return embeddableValuedModelPart.findSubPart( name, targetType );
 			}
 			return keyPart;
 		}
@@ -170,11 +170,9 @@ public int forEachSelectable(int offset, SelectableConsumer consumer) {
 	public void forEachInsertable(SelectableConsumer consumer) {
 		forEachSelectable(
 				(selectionIndex, selectableMapping) -> {
-					if ( !foreignKey.getKeyPart().getSelectable( selectionIndex ).isInsertable() ) {
-						return;
+					if ( foreignKey.getKeyPart().getSelectable( selectionIndex ).isInsertable() ) {
+						consumer.accept( selectionIndex, selectableMapping );
 					}
-
-					consumer.accept( selectionIndex, selectableMapping );
 				}
 		);
 	}
@@ -183,11 +181,9 @@ public void forEachInsertable(SelectableConsumer consumer) {
 	public void forEachUpdatable(SelectableConsumer consumer) {
 		forEachSelectable(
 				(selectionIndex, selectableMapping) -> {
-					if ( !foreignKey.getKeyPart().getSelectable( selectionIndex ).isUpdateable() ) {
-						return;
+					if ( foreignKey.getKeyPart().getSelectable( selectionIndex ).isUpdateable() ) {
+						consumer.accept( selectionIndex, selectableMapping );
 					}
-
-					consumer.accept( selectionIndex, selectableMapping );
 				}
 		);
 	}
@@ -396,8 +392,11 @@ else if ( getNature() == Nature.INDEX ) {
 			}
 		}
 		else if ( StringHelper.isNotEmpty( bootCollectionDescriptor.getMappedByProperty() ) ) {
-			final ModelPart mappedByPart = resolveNamedTargetPart( bootCollectionDescriptor.getMappedByProperty(), getAssociatedEntityMappingType(), collectionDescriptor );
-			if ( mappedByPart instanceof ToOneAttributeMapping || mappedByPart instanceof DiscriminatedAssociationAttributeMapping ) {
+			final ModelPart mappedByPart =
+					resolveNamedTargetPart( bootCollectionDescriptor.getMappedByProperty(),
+							getAssociatedEntityMappingType(), collectionDescriptor );
+			if ( mappedByPart instanceof ToOneAttributeMapping
+					|| mappedByPart instanceof DiscriminatedAssociationAttributeMapping ) {
 				////////////////////////////////////////////////
 				// E.g.
 				//
@@ -622,7 +621,9 @@ private ForeignKeyDescriptor createForeignKeyDescriptor(
 			);
 		}
 
-		final String collectionTableName = ( (CollectionMutationTarget) getCollectionDescriptor() ).getCollectionTableMapping().getTableName();
+		final String collectionTableName =
+				( (CollectionMutationTarget) getCollectionDescriptor() )
+						.getCollectionTableMapping().getTableName();
 
 		final BasicValuedModelPart basicFkTarget = fkTargetModelPart.asBasicValuedModelPart();
 		if ( basicFkTarget != null ) {
@@ -662,16 +663,12 @@ private ForeignKeyDescriptor determineForeignKey(
 		final int selectableCount = foreignKeyDescriptor.getJdbcTypeCount();
 		final ValuedModelPart keyPart = foreignKeyDescriptor.getKeyPart();
 		for ( int i = 0; i < selectableCount; i++ ) {
-			if ( keyPart.getSelectable( i ).isInsertable() != fkBootDescriptorSource.isColumnInsertable( i )
-					|| keyPart.getSelectable( i ).isUpdateable() != fkBootDescriptorSource.isColumnUpdateable( i ) ) {
+			final SelectableMapping selectable = keyPart.getSelectable( i );
+			if ( selectable.isInsertable() != fkBootDescriptorSource.isColumnInsertable( i )
+				|| selectable.isUpdateable() != fkBootDescriptorSource.isColumnUpdateable( i ) ) {
 				final AttributeMapping attributeMapping = keyPart.asAttributeMapping();
-				final ManagedMappingType declaringType;
-				if ( attributeMapping == null ) {
-					declaringType = null;
-				}
-				else {
-					declaringType = attributeMapping.getDeclaringType();
-				}
+				final ManagedMappingType declaringType =
+						attributeMapping == null ? null : attributeMapping.getDeclaringType();
 				final SelectableMappings selectableMappings = SelectableMappingsImpl.from(
 						keyPart.getContainingTableExpression(),
 						fkBootDescriptorSource,

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/OneToManyCollectionPart.java

@@ -66,12 +66,10 @@ public OneToManyCollectionPart(
 			MappingModelCreationProcess creationProcess) {
 		super( nature, bootCollectionDescriptor, collectionDescriptor, elementTypeDescriptor, notFoundAction, creationProcess );
 
-		if ( nature == Nature.INDEX && bootCollectionDescriptor instanceof Map ) {
-			mapKeyPropertyName = ( (Map) bootCollectionDescriptor ).getMapKeyPropertyName();
-		}
-		else {
-			mapKeyPropertyName = null;
-		}
+		mapKeyPropertyName =
+				nature == Nature.INDEX && bootCollectionDescriptor instanceof Map map
+						? map.getMapKeyPropertyName()
+						: null;
 	}
 
 	/**
@@ -165,10 +163,11 @@ public TableGroupJoin createTableGroupJoin(
 
 		// INDEX is implied if mapKeyPropertyName is not null
 		if ( mapKeyPropertyName != null ) {
-			final EntityCollectionPart elementPart = (EntityCollectionPart) getCollectionDescriptor().getAttributeMapping().getElementDescriptor();
-			final EntityMappingType elementEntity = elementPart.getAssociatedEntityMappingType();
-			final AttributeMapping mapKeyAttribute = elementEntity.findAttributeMapping( mapKeyPropertyName );
-			if ( mapKeyAttribute instanceof ToOneAttributeMapping toOne ) {
+			final EntityCollectionPart elementPart =
+					(EntityCollectionPart)
+							getCollectionDescriptor().getAttributeMapping().getElementDescriptor();
+			if ( elementPart.getAssociatedEntityMappingType().findAttributeMapping( mapKeyPropertyName )
+							instanceof ToOneAttributeMapping toOne ) {
 				final NavigablePath mapKeyPropertyPath = navigablePath.append( mapKeyPropertyName );
 				final TableGroupJoin tableGroupJoin = toOne.createTableGroupJoin(
 						mapKeyPropertyPath,
@@ -180,7 +179,8 @@ public TableGroupJoin createTableGroupJoin(
 						addsPredicate,
 						creationState
 				);
-				creationState.getFromClauseAccess().registerTableGroup( mapKeyPropertyPath, tableGroupJoin.getJoinedGroup() );
+				creationState.getFromClauseAccess()
+						.registerTableGroup( mapKeyPropertyPath, tableGroupJoin.getJoinedGroup() );
 				return tableGroupJoin;
 			}
 		}