two improvements to org.hibernate.metamodel.mapping package

Author: gavinking

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/AssociationKey.java

@@ -16,45 +16,9 @@
  *
  * @author Andrea Boriero
  */
-public class AssociationKey {
-	private final String table;
-	private final List<String> columns;
-
-	public AssociationKey(String table, List<String> columns) {
-		this.table = table;
-		this.columns = columns;
-	}
-
+public record AssociationKey(String table, List<String> columns) {
+	@Deprecated(since = "7")
 	public String getTable() {
 		return table;
 	}
-
-	@Override
-	public boolean equals(Object o) {
-		if ( this == o ) {
-			return true;
-		}
-		if ( o == null || getClass() != o.getClass() ) {
-			return false;
-		}
-
-		final AssociationKey that = (AssociationKey) o;
-		return table.equals( that.table ) && columns.equals( that.columns );
-	}
-
-	@Override
-	public int hashCode() {
-		return table.hashCode();
-	}
-
-	private String str;
-
-	@Override
-	public String toString() {
-		if ( str == null ) {
-			str = "AssociationKey(table=" + table + ", columns={" + String.join( ",", columns ) + "})";
-		}
-		return str;
-	}
-
 }

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/SelectablePath.java

@@ -122,16 +122,11 @@ public boolean equals(Object o) {
 		if ( this == o ) {
 			return true;
 		}
-		if ( o == null || getClass() != o.getClass() ) {
+		if ( !(o instanceof SelectablePath that) ) {
 			return false;
 		}
-
-		SelectablePath that = (SelectablePath) o;
-
-		if ( !Objects.equals( parent, that.parent ) ) {
-			return false;
-		}
-		return name.equals( that.name );
+		return Objects.equals( parent, that.parent )
+			&& name.equals( that.name );
 	}
 
 	@Override

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

@@ -340,7 +340,7 @@ public TableGroup createTableGroupInternal(
 				creationContext.getSessionFactory()
 		);
 		// Make sure the association key's table is resolved in the table group
-		tableGroup.getTableReference( null, resolveFetchAssociationKey().getTable(), true );
+		tableGroup.getTableReference( null, resolveFetchAssociationKey().table(), true );
 		return tableGroup;
 	}
 

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

@@ -269,7 +269,7 @@ public DomainResult<?> createKeyDomainResult(
 			FetchParent fetchParent,
 			DomainResultCreationState creationState) {
 		assert fromSide == Nature.TARGET
-				? targetTableGroup.getTableReference( navigablePath, associationKey.getTable(), false ) != null
+				? targetTableGroup.getTableReference( navigablePath, associationKey.table(), false ) != null
 				: isTargetTableGroup( targetTableGroup );
 		return createDomainResult(
 				navigablePath.append( ForeignKeyDescriptor.PART_NAME ),

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/MappingModelHelper.java renamed to hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/MappingModelHelper.java

@@ -2,8 +2,15 @@
  * SPDX-License-Identifier: Apache-2.0
  * Copyright Red Hat Inc. and Hibernate Authors
  */
-package org.hibernate.metamodel.mapping;
+package org.hibernate.metamodel.mapping.internal;
 
+import org.hibernate.metamodel.mapping.Association;
+import org.hibernate.metamodel.mapping.BasicValuedModelPart;
+import org.hibernate.metamodel.mapping.CollectionPart;
+import org.hibernate.metamodel.mapping.EmbeddableMappingType;
+import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart;
+import org.hibernate.metamodel.mapping.ModelPart;
+import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.persister.entity.UnionSubclassEntityPersister;
 
 import static org.hibernate.internal.util.NullnessUtil.castNonNull;

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

@@ -273,7 +273,7 @@ public DomainResult<?> createKeyDomainResult(
 			FetchParent fetchParent,
 			DomainResultCreationState creationState) {
 		assert fromSide == Nature.TARGET
-				? targetTableGroup.getTableReference( navigablePath, associationKey.getTable(), false ) != null
+				? targetTableGroup.getTableReference( navigablePath, associationKey.table(), false ) != null
 				: isTargetTableGroup( targetTableGroup );
 		return createDomainResult(
 				navigablePath.append( ForeignKeyDescriptor.PART_NAME ),

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

@@ -838,8 +838,8 @@ public void setForeignKeyDescriptor(ForeignKeyDescriptor foreignKeyDescriptor) {
 			this.sideNature = ForeignKeyDescriptor.Nature.TARGET;
 		}
 		else {
-			this.sideNature = foreignKeyDescriptor.getAssociationKey().getTable().equals(
-					identifyingColumnsTableExpression )
+			this.sideNature = foreignKeyDescriptor.getAssociationKey().table()
+				.equals( identifyingColumnsTableExpression )
 					? ForeignKeyDescriptor.Nature.KEY
 					: ForeignKeyDescriptor.Nature.TARGET;
 		}

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/DomainModelHelper.java

@@ -11,7 +11,7 @@
 import org.hibernate.metamodel.model.domain.ManagedDomainType;
 import org.hibernate.metamodel.model.domain.PersistentAttribute;
 
-import static org.hibernate.metamodel.mapping.MappingModelHelper.isCompatibleModelPart;
+import static org.hibernate.metamodel.mapping.internal.MappingModelHelper.isCompatibleModelPart;
 
 /**
  * Helper containing utilities useful for domain model handling

hibernate-core/src/main/java/org/hibernate/persister/entity/AbstractEntityPersister.java

@@ -136,7 +136,7 @@
 import org.hibernate.metamodel.mapping.ForeignKeyDescriptor;
 import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.metamodel.mapping.ManagedMappingType;
-import org.hibernate.metamodel.mapping.MappingModelHelper;
+import org.hibernate.metamodel.mapping.internal.MappingModelHelper;
 import org.hibernate.metamodel.mapping.ModelPart;
 import org.hibernate.metamodel.mapping.NaturalIdMapping;
 import org.hibernate.metamodel.mapping.NonAggregatedIdentifierMapping;