make AbstractEntityPersister inherit EntityMetamodel

first step toward removing EntityMetamodel, as promised since 6.0

Author: gavinking

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

@@ -287,7 +287,7 @@ public void postUpdate(Object entity, Object[] updatedState, Object nextVersion)
 
 		if ( persister.isVersioned() ) {
 			version = nextVersion;
-			persister.setValue( entity, persister.getVersionProperty(), nextVersion );
+			persister.setValue( entity, persister.getVersionPropertyIndex(), nextVersion );
 		}
 
 		processIfSelfDirtinessTracker( entity, EntityEntryImpl::clearDirtyAttributes );
@@ -421,7 +421,7 @@ public boolean isModifiableEntity() {
 	@Override
 	public void forceLocked(Object entity, Object nextVersion) {
 		version = nextVersion;
-		final int versionProperty = persister.getVersionProperty();
+		final int versionProperty = persister.getVersionPropertyIndex();
 		loadedState[versionProperty] = version;
 		setLockMode( PESSIMISTIC_FORCE_INCREMENT );
 		persister.setValue( entity, versionProperty, nextVersion );

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

@@ -67,7 +67,7 @@ public static boolean seedVersion(
 			Object[] fields,
 			EntityPersister persister,
 			SharedSessionContractImplementor session) {
-		final int versionProperty = persister.getVersionProperty();
+		final int versionProperty = persister.getVersionPropertyIndex();
 		final Object initialVersion = fields[versionProperty];
 		if ( isNullInitialVersion( initialVersion ) ) {
 			fields[versionProperty] = persister.getVersionGenerator().generate( session, entity, initialVersion, INSERT );
@@ -150,7 +150,7 @@ public static Object increment(Object version, EntityVersionMapping versionMappi
 	 */
 	public static void setVersion(Object[] fields, Object version, EntityPersister persister) {
 		if ( persister.isVersioned() ) {
-			fields[ persister.getVersionProperty() ] = version;
+			fields[ persister.getVersionPropertyIndex() ] = version;
 		}
 	}
 
@@ -162,7 +162,7 @@ public static void setVersion(Object[] fields, Object version, EntityPersister p
 	 * @return The extracted optimistic locking value
 	 */
 	public static Object getVersion(Object[] fields, EntityPersister persister) {
-		return persister.isVersioned() ? fields[persister.getVersionProperty()] : null;
+		return persister.isVersioned() ? fields[persister.getVersionPropertyIndex()] : null;
 	}
 
 	/**

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

@@ -519,7 +519,7 @@ protected Object versionToUpsert(Object entity, EntityPersister persister, Objec
 				}
 				// this is a nonsense but avoids setting version restriction
 				// parameter to null later on deep in the guts
-				return state[persister.getVersionProperty()];
+				return state[persister.getVersionPropertyIndex()];
 			}
 			else {
 				final Object newVersion = incrementVersion( entity, oldVersion, persister, this );

hibernate-core/src/main/java/org/hibernate/metamodel/spi/RuntimeModelCreationContext.java

@@ -14,11 +14,8 @@
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.generator.Generator;
 import org.hibernate.mapping.GeneratorSettings;
-import org.hibernate.mapping.PersistentClass;
-import org.hibernate.persister.entity.EntityPersister;
 import org.hibernate.query.sqm.function.SqmFunctionRegistry;
 import org.hibernate.service.ServiceRegistry;
-import org.hibernate.tuple.entity.EntityMetamodel;
 import org.hibernate.type.descriptor.java.spi.JavaTypeRegistry;
 import org.hibernate.type.spi.TypeConfiguration;
 
@@ -68,11 +65,4 @@ default MetadataImplementor getMetadata() {
 	Map<String, Generator> getGenerators();
 
 	GeneratorSettings getGeneratorSettings();
-
-	/*
-	 * Used by Hibernate Reactive
-	 */
-	default EntityMetamodel createEntityMetamodel(PersistentClass persistentClass, EntityPersister persister) {
-		return new EntityMetamodel( persistentClass, persister, this );
-	}
 }