eliminate casts to AbstractEntityPersister

Signed-off-by: Gavin King <gavin@hibernate.org>

Author: gavinking

hibernate-core/src/main/java/org/hibernate/action/internal/AbstractEntityInsertAction.java

@@ -212,7 +212,7 @@ private void addCollectionKey(
 			final CollectionPersister collectionPersister = pluralAttributeMapping.getCollectionDescriptor();
 			final CollectionKey collectionKey = new CollectionKey(
 					collectionPersister,
-					( (AbstractEntityPersister) getPersister() ).getCollectionKey(
+					AbstractEntityPersister.getCollectionKey(
 							collectionPersister,
 							getInstance(),
 							persistenceContext.getEntry( getInstance() ),

hibernate-core/src/main/java/org/hibernate/event/internal/WrapVisitor.java

@@ -115,9 +115,7 @@ else if ( attributeInterceptor != null
 							&& ((LazyAttributeLoadingInterceptor)attributeInterceptor).isAttributeLoaded( persister.getAttributeMapping().getAttributeName() ) ) {
 						final EntityEntry entry = persistenceContext.getEntry( entity );
 						if ( entry.isExistsInDatabase() ) {
-							final AbstractEntityPersister entityDescriptor =
-									(AbstractEntityPersister) persister.getOwnerEntityPersister();
-							final Object key = entityDescriptor.getCollectionKey(
+							final Object key = AbstractEntityPersister.getCollectionKey(
 									persister,
 									entity,
 									entry,

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

@@ -59,7 +59,6 @@
 import org.hibernate.metamodel.mapping.VirtualModelPart;
 import org.hibernate.metamodel.model.domain.NavigableRole;
 import org.hibernate.persister.collection.AbstractCollectionPersister;
-import org.hibernate.persister.entity.AbstractEntityPersister;
 import org.hibernate.persister.entity.EntityNameUse;
 import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.persister.entity.JoinedSubclassEntityPersister;
@@ -358,12 +357,11 @@ && equal( join.getKey(), manyToOne ) ) {
 					isKeyTableNullable = !persister.getTableName().equals( targetTableName );
 				}
 				else {
-					final AbstractEntityPersister persister = (AbstractEntityPersister) declaringEntityPersister;
 					final int tableIndex = ArrayHelper.indexOf(
-							persister.getTableNames(),
+							declaringEntityPersister.getTableNames(),
 							targetTableName
 					);
-					isKeyTableNullable = persister.isNullableTable( tableIndex );
+					isKeyTableNullable = declaringEntityPersister.isNullableTable( tableIndex );
 				}
 			}
 			isOptional = ( (ManyToOne) bootValue ).isIgnoreNotFound();
@@ -723,8 +721,8 @@ private static boolean equal(Value lhsValue, Value rhsValue) {
 	}
 
 	static String findMapsIdPropertyName(EntityMappingType entityMappingType, String referencedPropertyName) {
-		final AbstractEntityPersister persister = (AbstractEntityPersister) entityMappingType.getEntityPersister();
-		if ( Arrays.equals( persister.getKeyColumnNames(), persister.getPropertyColumnNames( referencedPropertyName ) ) ) {
+		final EntityPersister persister = entityMappingType.getEntityPersister();
+		if ( Arrays.equals( persister.getIdentifierColumnNames(), persister.getPropertyColumnNames( referencedPropertyName ) ) ) {
 			return persister.getIdentifierPropertyName();
 		}
 		return null;

hibernate-core/src/main/java/org/hibernate/metamodel/mapping/ordering/ast/ColumnReference.java

@@ -11,7 +11,7 @@
 import org.hibernate.metamodel.mapping.ModelPartContainer;
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.metamodel.mapping.ordering.TranslationContext;
-import org.hibernate.persister.entity.AbstractEntityPersister;
+import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.query.NullPrecedence;
 import org.hibernate.query.SortDirection;
 import org.hibernate.sql.ast.spi.SqlAstCreationState;
@@ -119,11 +119,9 @@ TableReference getTableReference(TableGroup tableGroup) {
 
 			final MappingType elementMappingType = pluralAttribute.getElementDescriptor().getPartMappingType();
 
-			if ( elementMappingType instanceof AbstractEntityPersister ) {
-				final AbstractEntityPersister abstractEntityPersister = (AbstractEntityPersister) elementMappingType;
-				final int tableNumber = abstractEntityPersister.determineTableNumberForColumn( columnExpression );
-				final String tableName = abstractEntityPersister.getTableName( tableNumber );
-
+			if ( elementMappingType instanceof EntityPersister) {
+				final EntityPersister entityPersister = (EntityPersister) elementMappingType;
+				final String tableName = entityPersister.getTableNameForColumn( columnExpression );
 				return tableGroup.getTableReference( tableGroup.getNavigablePath(), tableName );
 			}
 			else {

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

@@ -250,7 +250,6 @@
 import org.hibernate.sql.ast.tree.from.TableGroup;
 import org.hibernate.sql.ast.tree.from.TableReference;
 import org.hibernate.sql.ast.tree.from.TableReferenceJoin;
-import org.hibernate.sql.ast.tree.insert.InsertSelectStatement;
 import org.hibernate.sql.ast.tree.predicate.ComparisonPredicate;
 import org.hibernate.sql.ast.tree.predicate.InListPredicate;
 import org.hibernate.sql.ast.tree.predicate.Junction;
@@ -511,7 +510,7 @@ public AbstractEntityPersister(
 		assert javaType != null;
 		this.implementsLifecycle = Lifecycle.class.isAssignableFrom( javaType.getJavaTypeClass() );
 
-		concreteProxy = isPolymorphic()
+		concreteProxy = entityMetamodel.isPolymorphic()
 				&& ( getBytecodeEnhancementMetadata().isEnhancedForLazyLoading() || hasProxy() )
 				&& persistentClass.isConcreteProxy();
 
@@ -924,8 +923,6 @@ private boolean shouldStoreDiscriminatorInShallowQueryCacheLayout(CacheLayout en
 		return queryCacheLayout == CacheLayout.SHALLOW_WITH_DISCRIMINATOR;
 	}
 
-	public abstract String getSubclassTableName(int j);
-
 	protected abstract String[] getSubclassTableNames();
 
 	protected abstract String[] getSubclassTableKeyColumns(int j);
@@ -948,37 +945,12 @@ protected boolean isClassOrSuperclassJoin(int j) {
 		return isClassOrSuperclassTable( j );
 	}
 
-	public abstract int getSubclassTableSpan();
-
-	public abstract int getTableSpan();
-
-	public abstract boolean hasDuplicateTables();
-
-	/**
-	 * @deprecated Only ever used from places where we really want to use<ul>
-	 *     <li>{@link SelectStatement} (select generator)</li>
-	 *     <li>{@link InsertSelectStatement}</li>
-	 *     <li>{@link org.hibernate.sql.ast.tree.update.UpdateStatement}</li>
-	 *     <li>{@link org.hibernate.sql.ast.tree.delete.DeleteStatement}</li>
-	 * </ul>
-	 */
-	@Deprecated( since = "6.2" )
-	public abstract String getTableName(int j);
-
-	public abstract String[] getKeyColumns(int j);
-
 	public abstract boolean isPropertyOfTable(int property, int j);
 
 	protected abstract int[] getPropertyTableNumbers();
 
 	private static final String DISCRIMINATOR_ALIAS = "clazz_";
 
-	/**
-	 * The name of the table to use when performing mutations (INSERT,UPDATE,DELETE)
-	 * for the given attribute
-	 */
-	public abstract String getAttributeMutationTableName(int i);
-
 	@Override
 	public String getDiscriminatorColumnName() {
 		return DISCRIMINATOR_ALIAS;
@@ -998,10 +970,12 @@ public String getDiscriminatorFormulaTemplate() {
 		return null;
 	}
 
+	@Override
 	public boolean isInverseTable(int j) {
 		return false;
 	}
 
+	@Override
 	public boolean isNullableTable(int j) {
 		return false;
 	}
@@ -1015,6 +989,7 @@ public boolean isSubclassEntityName(String entityName) {
 		return entityMetamodel.getSubclassEntityNames().contains( entityName );
 	}
 
+	@Override
 	public boolean isSharedColumn(String columnExpression) {
 		return sharedColumnNames.contains( columnExpression );
 	}
@@ -1069,6 +1044,7 @@ public boolean hasRowId() {
 		return rowIdName != null;
 	}
 
+	@Override
 	public String[] getTableNames() {
 		final String[] tableNames = new String[getTableSpan()];
 		for ( int i = 0; i < tableNames.length; i++ ) {
@@ -1373,7 +1349,7 @@ protected TableReferenceJoin generateTableReferenceJoin(
 				generateJoinPredicate(
 						lhs,
 						joinedTableReference,
-						getKeyColumnNames(),
+						getIdentifierColumnNames(),
 						targetColumns,
 						creationState
 				)
@@ -1524,7 +1500,7 @@ public Object initializeLazyProperty(String fieldName, Object entity, SharedSess
 
 	}
 
-	public Object getCollectionKey(
+	public static Object getCollectionKey(
 			CollectionPersister persister,
 			Object owner,
 			EntityEntry ownerEntry,
@@ -2244,20 +2220,20 @@ public boolean hasFormulaProperties() {
 		return hasFormulaProperties;
 	}
 
-	@Override
 	public FetchMode getFetchMode(int i) {
 		return subclassPropertyFetchModeClosure[i];
 	}
 
-	@Override
 	public Type getSubclassPropertyType(int i) {
 		return subclassPropertyTypeClosure[i];
 	}
 
+	@Override
 	public int countSubclassProperties() {
 		return subclassPropertyTypeClosure.length;
 	}
 
+	@Override
 	public String[] getSubclassPropertyColumnNames(int i) {
 		return subclassPropertyColumnNameClosure[i];
 	}
@@ -2607,17 +2583,6 @@ public String getSelectByUniqueKeyString(String[] propertyNames, String[] column
 		return select.toStatementString();
 	}
 
-	@Internal
-	public boolean hasLazyDirtyFields(int[] dirtyFields) {
-		final boolean[] propertyLaziness = getPropertyLaziness();
-		for ( int i = 0; i < dirtyFields.length; i++ ) {
-			if ( propertyLaziness[dirtyFields[i]] ) {
-				return true;
-			}
-		}
-		return false;
-	}
-
 	@Override
 	public GeneratedValuesMutationDelegate getInsertDelegate() {
 		return insertDelegate;
@@ -2628,34 +2593,25 @@ public GeneratedValuesMutationDelegate getUpdateDelegate() {
 		return updateDelegate;
 	}
 
-	protected EntityTableMapping[] getTableMappings() {
+	@Override
+	public EntityTableMapping[] getTableMappings() {
 		return tableMappings;
 	}
 
-	public EntityTableMapping getTableMapping(int i) {
+	protected EntityTableMapping getTableMapping(int i) {
 		return tableMappings[i];
 	}
 
 	/**
 	 * Unfortunately we cannot directly use `SelectableMapping#getContainingTableExpression()`
 	 * as that blows up for attributes declared on super-type for union-subclass mappings
 	 */
+	@Override
 	public String physicalTableNameForMutation(SelectableMapping selectableMapping) {
 		assert !selectableMapping.isFormula();
 		return selectableMapping.getContainingTableExpression();
 	}
 
-	public EntityTableMapping getPhysicalTableMappingForMutation(SelectableMapping selectableMapping) {
-		final String tableNameForMutation = physicalTableNameForMutation( selectableMapping );
-		for ( int i = 0; i < tableMappings.length; i++ ) {
-			if ( tableNameForMutation.equals( tableMappings[i].getTableName() ) ) {
-				return tableMappings[i];
-			}
-		}
-
-		throw new IllegalArgumentException( "Unable to resolve TableMapping for selectable - " + selectableMapping );
-	}
-
 	@Override
 	public EntityMappingType getTargetPart() {
 		return this;
@@ -2823,7 +2779,7 @@ public TableGroup createRootTableGroup(
 													joinedTableReference,
 													needsDiscriminator()
 															? getRootTableKeyColumnNames()
-															: getKeyColumnNames(),
+															: getIdentifierColumnNames(),
 													getSubclassTableKeyColumns( i ),
 													creationState
 											)
@@ -3200,8 +3156,6 @@ protected GeneratedValuesMutationDelegate createUpdateDelegate() {
 		return GeneratedValuesHelper.getGeneratedValuesDelegate( this, UPDATE );
 	}
 
-	public abstract String[][] getContraintOrderedTableKeyColumnClosure();
-
 	private static class TableMappingBuilder {
 		private final String tableName;
 		private final int relativePosition;
@@ -3436,9 +3390,11 @@ protected DeleteCoordinator buildDeleteCoordinator() {
 		}
 	}
 
+	@Override
 	public void addDiscriminatorToInsertGroup(MutationGroupBuilder insertGroupBuilder) {
 	}
 
+	@Override
 	public void addSoftDeleteToInsertGroup(MutationGroupBuilder insertGroupBuilder) {
 		if ( softDeleteMapping != null ) {
 			final TableInsertBuilder insertBuilder = insertGroupBuilder.getTableDetailsBuilder( getIdentifierTableName() );
@@ -3755,10 +3711,6 @@ public final String getEntityName() {
 		return entityMetamodel.getName();
 	}
 
-	public boolean isPolymorphic() {
-		return entityMetamodel.isPolymorphic();
-	}
-
 	@Override
 	public boolean isInherited() {
 		return entityMetamodel.isInherited();
@@ -3997,10 +3949,6 @@ public EntityMappingType resolveConcreteProxyTypeForId(Object id, SharedSessionC
 		return concreteTypeLoader.getConcreteType( id, session );
 	}
 
-	public String[] getKeyColumnNames() {
-		return getIdentifierColumnNames();
-	}
-
 	/**
 	 * {@inheritDoc}
 	 *
@@ -4119,6 +4067,7 @@ public boolean[] getPropertyCheckability() {
 		return entityMetamodel.getPropertyCheckability();
 	}
 
+	@Override
 	public boolean[] getNonLazyPropertyUpdateability() {
 		return entityMetamodel.getNonlazyPropertyUpdateability();
 	}
@@ -4366,6 +4315,7 @@ && hasSubclasses()
 		return this;
 	}
 
+	@Override
 	public boolean hasMultipleTables() {
 		return false;
 	}
@@ -4589,7 +4539,12 @@ public BytecodeEnhancementMetadata getBytecodeEnhancementMetadata() {
 		return entityMetamodel.getBytecodeEnhancementMetadata();
 	}
 
-	public int determineTableNumberForColumn(String columnName) {
+	@Override
+	public String getTableNameForColumn(String columnName) {
+		return getTableName( determineTableNumberForColumn( columnName ) );
+	}
+
+	protected int determineTableNumberForColumn(String columnName) {
 		return 0;
 	}