move impl of MappingContext from SessionFactoryImplementor to RuntimeMetamodelsImplementor

gavinking · gavinking · commit fc4a9a245ec1 · 2025-01-05T20:46:40.000+01:00
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/AbstractSelectLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/AbstractSelectLockingStrategy.java
@@ -83,7 +83,7 @@ public void lock(Object id, Object version, Object object, int timeout, EventSou
 					lockable.getVersionType().nullSafeSet(
 							st,
 							version,
-							lockable.getIdentifierType().getColumnSpan( factory ) + 1,
+							lockable.getIdentifierType().getColumnSpan( factory.getRuntimeMetamodels() ) + 1,
 							session
 					);
 				}
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadUpdateLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticReadUpdateLockingStrategy.java
@@ -84,7 +84,7 @@ public void lock(Object id, Object version, Object object, int timeout, EventSou
 					int offset = 2;
 
 					lockable.getIdentifierType().nullSafeSet( st, id, offset, session );
-					offset += lockable.getIdentifierType().getColumnSpan( factory );
+					offset += lockable.getIdentifierType().getColumnSpan( factory.getRuntimeMetamodels() );
 
 					if ( lockable.isVersioned() ) {
 						lockable.getVersionType().nullSafeSet( st, version, offset, session );
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteUpdateLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/PessimisticWriteUpdateLockingStrategy.java
@@ -83,7 +83,7 @@ public void lock(Object id, Object version, Object object, int timeout, EventSou
 					int offset = 2;
 
 					lockable.getIdentifierType().nullSafeSet( st, id, offset, session );
-					offset += lockable.getIdentifierType().getColumnSpan( factory );
+					offset += lockable.getIdentifierType().getColumnSpan( factory.getRuntimeMetamodels() );
 
 					if ( lockable.isVersioned() ) {
 						lockable.getVersionType().nullSafeSet( st, version, offset, session );
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/lock/UpdateLockingStrategy.java b/hibernate-core/src/main/java/org/hibernate/dialect/lock/UpdateLockingStrategy.java
@@ -90,7 +90,7 @@ public void lock(
 
 				final Type lockableIdentifierType = lockable.getIdentifierType();
 				lockableIdentifierType.nullSafeSet( st, id, offset, session );
-				offset += lockableIdentifierType.getColumnSpan( factory );
+				offset += lockableIdentifierType.getColumnSpan( factory.getRuntimeMetamodels() );
 
 				if ( lockable.isVersioned() ) {
 					lockableVersionType.nullSafeSet( st, version, offset, session );
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/Mapping.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/Mapping.java
@@ -19,10 +19,9 @@
  * @author Gavin King
  *
  * @deprecated Use {@link org.hibernate.type.spi.TypeConfiguration},
- * {@link org.hibernate.boot.Metadata}, or
- * {@link org.hibernate.metamodel.RuntimeMetamodels}
- * or {@link  MappingContext}
- * to access such information
+ *             {@link org.hibernate.boot.Metadata},
+ *             {@link org.hibernate.metamodel.RuntimeMetamodels},
+ *             or {@link MappingContext} to access such information
  */
 @Deprecated(since = "6.0")
 public interface Mapping extends MappingContext {
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryDelegatingImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryDelegatingImpl.java
@@ -23,7 +23,6 @@
 
 import org.hibernate.CustomEntityDirtinessStrategy;
 import org.hibernate.HibernateException;
-import org.hibernate.MappingException;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.SessionFactoryObserver;
@@ -55,7 +54,6 @@
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMappingProducerProvider;
 import org.hibernate.stat.spi.StatisticsImplementor;
 import org.hibernate.generator.Generator;
-import org.hibernate.type.Type;
 import org.hibernate.type.descriptor.WrapperOptions;
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.spi.TypeConfiguration;
@@ -298,21 +296,6 @@ public JavaType<Object> getTenantIdentifierJavaType() {
 		return delegate.getTenantIdentifierJavaType();
 	}
 
-	@Override
-	public Type getIdentifierType(String className) throws MappingException {
-		return delegate.getIdentifierType( className );
-	}
-
-	@Override
-	public String getIdentifierPropertyName(String className) throws MappingException {
-		return delegate.getIdentifierPropertyName( className );
-	}
-
-	@Override
-	public Type getReferencedPropertyType(String className, String propertyName) throws MappingException {
-		return delegate.getReferencedPropertyType( className, propertyName );
-	}
-
 	@Override
 	public String getUuid() {
 		return delegate.getUuid();
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryImplementor.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/SessionFactoryImplementor.java
@@ -37,7 +37,6 @@
 import org.hibernate.generator.Generator;
 import org.hibernate.type.descriptor.WrapperOptions;
 import org.hibernate.type.descriptor.java.JavaType;
-import org.hibernate.type.MappingContext;
 import org.hibernate.type.spi.TypeConfiguration;
 
 /**
@@ -50,7 +49,7 @@
  * @author Gavin King
  * @author Steve Ebersole
  */
-public interface SessionFactoryImplementor extends MappingContext, SessionFactory {
+public interface SessionFactoryImplementor extends SessionFactory {
 	/**
 	 * The UUID assigned to this {@code SessionFactory}.
 	 * <p>
diff --git a/hibernate-core/src/main/java/org/hibernate/id/insert/UniqueKeySelectingDelegate.java b/hibernate-core/src/main/java/org/hibernate/id/insert/UniqueKeySelectingDelegate.java
@@ -82,7 +82,7 @@ protected void bindParameters(Object entity, PreparedStatement ps, SharedSession
 		int index = 1;
 		for ( int i = 0; i < uniqueKeyPropertyNames.length; i++ ) {
 			uniqueKeyTypes[i].nullSafeSet( ps, persister.getPropertyValue( entity, uniqueKeyPropertyNames[i] ), index, session );
-			index += uniqueKeyTypes[i].getColumnSpan( session.getFactory() );
+			index += uniqueKeyTypes[i].getColumnSpan( session.getFactory().getRuntimeMetamodels() );
 		}
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionFactoryImpl.java
@@ -31,7 +31,6 @@
 import org.hibernate.FlushMode;
 import org.hibernate.HibernateException;
 import org.hibernate.Interceptor;
-import org.hibernate.MappingException;
 import org.hibernate.Session;
 import org.hibernate.SessionEventListener;
 import org.hibernate.SessionFactory;
@@ -119,7 +118,6 @@
 import org.hibernate.sql.ast.spi.ParameterMarkerStrategy;
 import org.hibernate.sql.results.jdbc.spi.JdbcValuesMappingProducerProvider;
 import org.hibernate.stat.spi.StatisticsImplementor;
-import org.hibernate.type.Type;
 import org.hibernate.type.descriptor.WrapperOptions;
 import org.hibernate.type.descriptor.java.JavaType;
 import org.hibernate.type.spi.TypeConfiguration;
@@ -781,21 +779,6 @@ public Reference getReference() {
 		);
 	}
 
-	@Override
-	public Type getIdentifierType(String className) throws MappingException {
-		return runtimeMetamodels.getMappingMetamodel().getEntityDescriptor( className ).getIdentifierType();
-	}
-
-	@Override
-	public String getIdentifierPropertyName(String className) throws MappingException {
-		return runtimeMetamodels.getMappingMetamodel().getEntityDescriptor( className ).getIdentifierPropertyName();
-	}
-
-	@Override
-	public Type getReferencedPropertyType(String className, String propertyName) throws MappingException {
-		return runtimeMetamodels.getMappingMetamodel().getEntityDescriptor( className ).getPropertyType( propertyName );
-	}
-
 	/**
 	 * Closes the session factory, releasing all held resources.
 	 *
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityBatchLoaderInPredicate.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/EntityBatchLoaderInPredicate.java
@@ -56,7 +56,9 @@ public EntityBatchLoaderInPredicate(
 		super( entityDescriptor, loadQueryInfluencers );
 		this.loadQueryInfluencers = loadQueryInfluencers;
 		this.domainBatchSize = domainBatchSize;
-		int idColumnCount = entityDescriptor.getEntityPersister().getIdentifierType().getColumnSpan( sessionFactory );
+		int idColumnCount =
+				entityDescriptor.getEntityPersister().getIdentifierType()
+						.getColumnSpan( sessionFactory .getRuntimeMetamodels());
 		this.sqlBatchSize = sessionFactory.getJdbcServices()
 				.getDialect()
 				.getBatchLoadSizingStrategy()
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/StandardBatchLoaderFactory.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/StandardBatchLoaderFactory.java
@@ -37,7 +37,7 @@ public <T> EntityBatchLoader<T> createEntityBatchLoader(
 		final SessionFactoryImplementor factory = loadQueryInfluencers.getSessionFactory();
 		// NOTE : don't use the EntityIdentifierMapping here because it will not be known until later
 		final Type identifierType = entityDescriptor.getEntityPersister().getIdentifierType();
-		if ( identifierType.getColumnSpan( factory ) == 1
+		if ( identifierType.getColumnSpan( factory.getRuntimeMetamodels() ) == 1
 				&& supportsSqlArrayType( factory.getJdbcServices().getDialect() )
 				&& identifierType instanceof BasicType ) {
 			// we can use a single ARRAY parameter to send all the ids
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/RuntimeMetamodels.java b/hibernate-core/src/main/java/org/hibernate/metamodel/RuntimeMetamodels.java
@@ -5,11 +5,9 @@
 package org.hibernate.metamodel;
 
 import org.hibernate.Incubating;
-import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart;
 import org.hibernate.metamodel.mapping.EntityMappingType;
 import org.hibernate.metamodel.mapping.PluralAttributeMapping;
 import org.hibernate.metamodel.model.domain.JpaMetamodel;
-import org.hibernate.metamodel.model.domain.NavigableRole;
 
 /**
  * Entry point providing access to the runtime metamodels:
@@ -42,21 +40,14 @@ default EntityMappingType getEntityMappingType(String entityName) {
 		return getMappingMetamodel().getEntityDescriptor( entityName );
 	}
 
-	default EntityMappingType getEntityMappingType(Class entityType) {
+	default EntityMappingType getEntityMappingType(Class<?> entityType) {
 		return getMappingMetamodel().getEntityDescriptor( entityType );
 	}
 
 	default PluralAttributeMapping getPluralAttributeMapping(String role) {
 		return getMappingMetamodel().findCollectionDescriptor( role ).getAttributeMapping();
 	}
 
-	/**
-	 * @deprecated Use {@link #getEmbedded(NavigableRole)} instead
-	 */
-	@Deprecated
-	EmbeddableValuedModelPart getEmbedded(String role);
-	EmbeddableValuedModelPart getEmbedded(NavigableRole role);
-
 	default String getImportedName(String name) {
 		return getMappingMetamodel().getImportedName( name );
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/internal/RuntimeMetamodelsImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/internal/RuntimeMetamodelsImpl.java
@@ -4,16 +4,17 @@
  */
 package org.hibernate.metamodel.internal;
 
-import org.hibernate.metamodel.mapping.EmbeddableValuedModelPart;
-import org.hibernate.metamodel.model.domain.NavigableRole;
+import org.hibernate.MappingException;
 import org.hibernate.metamodel.model.domain.spi.JpaMetamodelImplementor;
 import org.hibernate.metamodel.spi.MappingMetamodelImplementor;
 import org.hibernate.metamodel.spi.RuntimeMetamodelsImplementor;
+import org.hibernate.type.Type;
 
 /**
  * @author Steve Ebersole
  */
 public class RuntimeMetamodelsImpl implements RuntimeMetamodelsImplementor {
+
 	private JpaMetamodelImplementor jpaMetamodel;
 	private MappingMetamodelImplementor mappingMetamodel;
 
@@ -31,15 +32,21 @@ public MappingMetamodelImplementor getMappingMetamodel() {
 	}
 
 	@Override
-	public EmbeddableValuedModelPart getEmbedded(String role) {
-		throw new UnsupportedOperationException( "Locating EmbeddableValuedModelPart by (String) role is not supported" );
+	public Type getIdentifierType(String className) throws MappingException {
+		return mappingMetamodel.getEntityDescriptor( className ).getIdentifierType();
 	}
 
 	@Override
-	public EmbeddableValuedModelPart getEmbedded(NavigableRole role) {
-		return mappingMetamodel.getEmbeddableValuedModelPart( role );
+	public String getIdentifierPropertyName(String className) throws MappingException {
+		return mappingMetamodel.getEntityDescriptor( className ).getIdentifierPropertyName();
 	}
 
+	@Override
+	public Type getReferencedPropertyType(String className, String propertyName) throws MappingException {
+		return mappingMetamodel.getEntityDescriptor( className ).getPropertyType( propertyName );
+	}
+
+
 	public void setMappingMetamodel(MappingMetamodelImplementor mappingMetamodel) {
 		this.mappingMetamodel = mappingMetamodel;
 	}
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/ToOneAttributeMapping.java
@@ -779,7 +779,8 @@ public static void addPrefixedPropertyNames(
 			}
 		}
 		else if ( type instanceof EntityType entityType ) {
-			final Type identifierOrUniqueKeyType = entityType.getIdentifierOrUniqueKeyType( factory );
+			final Type identifierOrUniqueKeyType =
+					entityType.getIdentifierOrUniqueKeyType( factory.getRuntimeMetamodels() );
 			final String propertyName;
 			if ( entityType.isReferenceToPrimaryKey() ) {
 				propertyName = entityType.getAssociatedEntityPersister( factory ).getIdentifierPropertyName();
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/spi/RuntimeMetamodelsImplementor.java b/hibernate-core/src/main/java/org/hibernate/metamodel/spi/RuntimeMetamodelsImplementor.java
@@ -6,13 +6,14 @@
 
 import org.hibernate.metamodel.RuntimeMetamodels;
 import org.hibernate.metamodel.model.domain.spi.JpaMetamodelImplementor;
+import org.hibernate.type.MappingContext;
 
 /**
- * SPI extending {@link RuntimeMetamodels}.
+ * SPI extending {@link RuntimeMetamodels} and mixing in {@link MappingContext}.
  *
  * @author Steve Ebersole
  */
-public interface RuntimeMetamodelsImplementor extends RuntimeMetamodels {
+public interface RuntimeMetamodelsImplementor extends RuntimeMetamodels, MappingContext {
 	@Override
 	MappingMetamodelImplementor getMappingMetamodel();
 
diff --git a/hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java b/hibernate-core/src/main/java/org/hibernate/persister/collection/AbstractCollectionPersister.java
@@ -381,7 +381,7 @@ public AbstractCollectionPersister(
 			else {
 				final Column col = (Column) selectable;
 				elementColumnNames[j] = col.getQuotedName( dialect );
-				elementColumnWriters[j] = col.getWriteExpr( elementBootDescriptor.getSelectableType( factory, j ), dialect );
+				elementColumnWriters[j] = col.getWriteExpr( elementBootDescriptor.getSelectableType( factory.getRuntimeMetamodels(), j ), dialect );
 				elementColumnReaders[j] = col.getReadExpr( dialect );
 				elementColumnReaderTemplates[j] = col.getTemplate(
 						dialect,
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sql/internal/ResultSetMappingProcessor.java b/hibernate-core/src/main/java/org/hibernate/query/sql/internal/ResultSetMappingProcessor.java
@@ -378,7 +378,7 @@ else if ( propertyType instanceof ComponentType componentType ) {
 			final Type[] propertyTypes = componentType.getSubtypes();
 			int aliasIndex = 0;
 			for ( int i = 0; i < propertyNames.length; i++ ) {
-				final int columnSpan = propertyTypes[i].getColumnSpan( loadable.getFactory() );
+				final int columnSpan = propertyTypes[i].getColumnSpan( loadable.getFactory().getRuntimeMetamodels() );
 				addFetchBuilder(
 						suffix,
 						loadable,
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityDelayedFetchInitializer.java b/hibernate-core/src/main/java/org/hibernate/sql/results/graph/entity/internal/EntityDelayedFetchInitializer.java
@@ -178,7 +178,7 @@ public void resolveInstance(EntityDelayedFetchInitializerData data) {
 				final String uniqueKeyPropertyName = referencedModelPart.getReferencedPropertyName();
 				final Type uniqueKeyPropertyType = ( referencedModelPart.getReferencedPropertyName() == null ) ?
 						concreteDescriptor.getIdentifierType() :
-						session.getFactory()
+						session.getFactory().getRuntimeMetamodels()
 								.getReferencedPropertyType(
 										concreteDescriptor.getEntityName(),
 										uniqueKeyPropertyName
diff --git a/hibernate-core/src/main/java/org/hibernate/type/ComponentType.java b/hibernate-core/src/main/java/org/hibernate/type/ComponentType.java
@@ -284,7 +284,7 @@ public boolean isDirty(final Object x, final Object y, final boolean[] checkable
 		// null value and empty component are considered equivalent
 		int loc = 0;
 		for ( int i = 0; i < propertySpan; i++ ) {
-			int len = propertyTypes[i].getColumnSpan( session.getFactory() );
+			int len = propertyTypes[i].getColumnSpan( session.getFactory().getRuntimeMetamodels() );
 			if ( len <= 1 ) {
 				final boolean dirty = ( len == 0 || checkable[loc] ) &&
 						propertyTypes[i].isDirty( getPropertyValue( x, i ), getPropertyValue( y, i ), session );
@@ -322,7 +322,7 @@ public boolean isModified(
 		// null value and empty components are considered equivalent
 		int loc = 0;
 		for ( int i = 0; i < propertySpan; i++ ) {
-			final int len = propertyTypes[i].getColumnSpan( session.getFactory() );
+			final int len = propertyTypes[i].getColumnSpan( session.getFactory().getRuntimeMetamodels() );
 			final boolean[] subcheckable = new boolean[len];
 			System.arraycopy( checkable, loc, subcheckable, 0, len );
 			if ( propertyTypes[i].isModified( getPropertyValue( old, i ),
@@ -343,7 +343,7 @@ public void nullSafeSet(PreparedStatement st, Object value, int begin, SharedSes
 
 		for ( int i = 0; i < propertySpan; i++ ) {
 			propertyTypes[i].nullSafeSet( st, subvalues[i], begin, session );
-			begin += propertyTypes[i].getColumnSpan( session.getFactory() );
+			begin += propertyTypes[i].getColumnSpan( session.getFactory().getRuntimeMetamodels() );
 		}
 	}
 
@@ -359,7 +359,7 @@ public void nullSafeSet(
 		final Object[] subvalues = nullSafeGetValues( value );
 		int loc = 0;
 		for ( int i = 0; i < propertySpan; i++ ) {
-			int len = propertyTypes[i].getColumnSpan( session.getFactory() );
+			int len = propertyTypes[i].getColumnSpan( session.getFactory().getRuntimeMetamodels() );
 			//noinspection StatementWithEmptyBody
 			if ( len == 0 ) {
 				//noop
@@ -763,7 +763,7 @@ public Object extract(CallableStatement statement, int startIndex, SharedSession
 					notNull = true;
 				}
 				values[i] = value;
-				currentIndex += propertyType.getColumnSpan( session.getFactory() );
+				currentIndex += propertyType.getColumnSpan( session.getFactory().getRuntimeMetamodels() );
 			}
 
 			if ( polymorphic ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/type/EntityType.java b/hibernate-core/src/main/java/org/hibernate/type/EntityType.java
diff --git a/hibernate-core/src/main/java/org/hibernate/type/ManyToOneType.java b/hibernate-core/src/main/java/org/hibernate/type/ManyToOneType.java
diff --git a/hibernate-core/src/main/java/org/hibernate/type/MappingContext.java b/hibernate-core/src/main/java/org/hibernate/type/MappingContext.java
diff --git a/hibernate-core/src/main/java/org/hibernate/type/SpecialOneToOneType.java b/hibernate-core/src/main/java/org/hibernate/type/SpecialOneToOneType.java
diff --git a/hibernate-envers/src/main/java/org/hibernate/envers/strategy/internal/ValidityAuditStrategy.java b/hibernate-envers/src/main/java/org/hibernate/envers/strategy/internal/ValidityAuditStrategy.java
diff --git a/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockSessionFactory.java b/tooling/metamodel-generator/src/main/java/org/hibernate/processor/validation/MockSessionFactory.java

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public void lock(Object id, Object version, Object object, int timeout, EventSou`
`83`	`83`	`lockable.getVersionType().nullSafeSet(`
`84`	`84`	`st,`
`85`	`85`	`version,`
`86`		`- lockable.getIdentifierType().getColumnSpan( factory ) + 1,`
	`86`	`+ lockable.getIdentifierType().getColumnSpan( factory.getRuntimeMetamodels() ) + 1,`
`87`	`87`	`session`
`88`	`88`	`);`
`89`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ protected void bindParameters(Object entity, PreparedStatement ps, SharedSession`
`82`	`82`	`int index = 1;`
`83`	`83`	`for ( int i = 0; i < uniqueKeyPropertyNames.length; i++ ) {`
`84`	`84`	`uniqueKeyTypes[i].nullSafeSet( ps, persister.getPropertyValue( entity, uniqueKeyPropertyNames[i] ), index, session );`
`85`		`- index += uniqueKeyTypes[i].getColumnSpan( session.getFactory() );`
	`85`	`+ index += uniqueKeyTypes[i].getColumnSpan( session.getFactory().getRuntimeMetamodels() );`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`	`}`