hide the EntityMetamodel inside AbstractEntityPersister

second step toward removing EntityMetamodel, as promised since 6.0

Author: gavinking

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

@@ -283,9 +283,9 @@ private void handleGeneratedProperties(EntityEntry entry, GeneratedValues genera
 	 */
 	protected void handleDeleted(EntityEntry entry) {
 		if ( entry.getStatus() == Status.DELETED ) {
-			final var entityMetamodel = getPersister().getEntityMetamodel();
+			final var entityMetamodel = getPersister();
 			final boolean isImpliedOptimisticLocking = !entityMetamodel.isVersioned()
-					&& entityMetamodel.getOptimisticLockStyle().isAllOrDirty();
+					&& entityMetamodel.optimisticLockStyle().isAllOrDirty();
 			if ( isImpliedOptimisticLocking && entry.getLoadedState() != null ) {
 				// The entity will be deleted, and because we are going to create a delete statement
 				// that uses all the state values in the where clause, the entry state needs to be

hibernate-core/src/main/java/org/hibernate/bytecode/enhance/spi/interceptor/EnhancementAsProxyLazinessInterceptor.java

@@ -355,8 +355,8 @@ public EntityRelatedState(EntityPersister persister,
 			// versioned, we need to fetch the current version.
 			this.initializeBeforeWrite =
 					!inLineDirtyChecking
-					|| !persister.getEntityMetamodel().isDynamicUpdate()
-					|| persister.isVersioned();
+						|| !persister.isDynamicUpdate()
+						|| persister.isVersioned();
 		}
 	}
 }

hibernate-core/src/main/java/org/hibernate/bytecode/internal/BytecodeEnhancementMetadataPojoImpl.java

@@ -187,8 +187,7 @@ public PersistentAttributeInterceptable createEnhancedProxy(EntityKey entityKey,
 		}
 
 		// inject the interceptor
-		persister.getEntityMetamodel()
-				.getBytecodeEnhancementMetadata()
+		persister.getBytecodeEnhancementMetadata()
 				.injectEnhancedEntityAsProxyInterceptor( entity, entityKey, session );
 
 		return entity;

hibernate-core/src/main/java/org/hibernate/engine/internal/Cascade.java

@@ -665,7 +665,7 @@ private static <T> boolean cascadeDeleteEnabled(CascadingAction<T> action, Colle
 
 	private static <T> boolean cascadeDeleteEnabled(CascadingAction<T> action, EntityPersister persister, int i) {
 		return action.directionAffectedByCascadeDelete() == ForeignKeyDirection.TO_PARENT
-			&& persister.getEntityMetamodel().getPropertyOnDeleteActions()[i] == OnDeleteAction.CASCADE;
+			&& persister.getPropertyOnDeleteActions()[i] == OnDeleteAction.CASCADE;
 	}
 
 	private static <T> boolean cascadeDeleteEnabled(CascadingAction<T> action, CompositeType componentType, int i) {

hibernate-core/src/main/java/org/hibernate/engine/internal/Nullability.java

@@ -105,7 +105,7 @@ public void checkNullability(final Object[] values, final EntityPersister persis
 			final boolean[] nullability = persister.getPropertyNullability();
 			final boolean[] checkability = getCheckability( persister );
 			final Type[] propertyTypes = persister.getPropertyTypes();
-			final Generator[] generators = persister.getEntityMetamodel().getGenerators();
+			final Generator[] generators = persister.getGenerators();
 			for ( int i = 0; i < values.length; i++ ) {
 				if ( checkability[i]
 						&& !unfetched( values[i] )

hibernate-core/src/main/java/org/hibernate/engine/internal/StatefulPersistenceContext.java

@@ -348,7 +348,7 @@ public Object getNaturalIdSnapshot(Object id, EntityPersister persister) throws
 			return cachedValue;
 		}
 		// check to see if the natural id is mutable/immutable
-		else if ( persister.getEntityMetamodel().hasImmutableNaturalId() ) {
+		else if ( persister.hasImmutableNaturalId() ) {
 			// an immutable natural-id is not retrieved during a normal database-snapshot operation...
 			final Object naturalIdFromDb = persister.getNaturalIdentifierSnapshot( id, session );
 			naturalIdResolutions.cacheResolutionFromLoad( id, naturalIdFromDb, persister );

hibernate-core/src/main/java/org/hibernate/generator/values/internal/GeneratedValuesHelper.java

@@ -298,7 +298,7 @@ else if ( supportsReturning( dialect, timing ) && noCustomSql( persister, timing
 		}
 		else if ( timing == EventType.INSERT
 					&& persister.getNaturalIdentifierProperties() != null
-					&& !persister.getEntityMetamodel().isNaturalIdentifierInsertGenerated() ) {
+					&& !persister.isNaturalIdentifierInsertGenerated() ) {
 			return new UniqueKeySelectingDelegate( persister, getNaturalIdPropertyNames( persister ), timing );
 		}
 		return null;

hibernate-core/src/main/java/org/hibernate/id/IdentityGenerator.java

@@ -74,7 +74,7 @@ else if ( sessionFactoryOptions.isGetGeneratedKeysEnabled() ) {
 			return dialect.getIdentityColumnSupport().buildGetGeneratedKeysDelegate( persister );
 		}
 		else if ( persister.getNaturalIdentifierProperties() != null
-				&& !persister.getEntityMetamodel().isNaturalIdentifierInsertGenerated() ) {
+				&& !persister.isNaturalIdentifierInsertGenerated() ) {
 			return new UniqueKeySelectingDelegate( persister, getNaturalIdPropertyNames( persister ), INSERT );
 		}
 		else {

hibernate-core/src/main/java/org/hibernate/internal/NaturalIdHelper.java

@@ -23,7 +23,7 @@ public static String[] getNaturalIdPropertyNames(EntityPersister persister) {
 			throw new IdentifierGenerationException( "Entity '" + persister.getEntityName()
 					+ "' has no '@NaturalId' property" );
 		}
-		if ( persister.getEntityMetamodel().isNaturalIdentifierInsertGenerated() ) {
+		if ( persister.isNaturalIdentifierInsertGenerated() ) {
 			throw new IdentifierGenerationException( "Entity '" + persister.getEntityName()
 					+ "' has a '@NaturalId' property which is also defined as insert-generated" );
 		}

hibernate-core/src/main/java/org/hibernate/internal/StatelessSessionImpl.java

@@ -1013,8 +1013,7 @@ public Object internalLoad(
 
 			// first, check to see if we can use "bytecode proxies"
 
-			final var entityMetamodel = persister.getEntityMetamodel();
-			final var enhancementMetadata = entityMetamodel.getBytecodeEnhancementMetadata();
+			final var enhancementMetadata = persister.getBytecodeEnhancementMetadata();
 			if ( enhancementMetadata.isEnhancedForLazyLoading() ) {
 				// if the entity defines a HibernateProxy factory, see if there is an
 				// existing proxy associated with the PC - and if so, use it
@@ -1031,14 +1030,14 @@ public Object internalLoad(
 					}
 
 					// specialized handling for entities with subclasses with a HibernateProxy factory
-					if ( entityMetamodel.hasSubclasses() ) {
+					if ( persister.hasSubclasses() ) {
 						// entities with subclasses that define a ProxyFactory can create a HibernateProxy.
 						LOG.trace( "Creating a HibernateProxy for to-one association with subclasses to honor laziness" );
 						return createProxy( entityKey );
 					}
 					return enhancementMetadata.createEnhancedProxy( entityKey, false, this );
 				}
-				else if ( !entityMetamodel.hasSubclasses() ) {
+				else if ( !persister.hasSubclasses() ) {
 					return enhancementMetadata.createEnhancedProxy( entityKey, false, this );
 				}
 				// If we get here, then the entity class has subclasses and there is no HibernateProxy factory.