deprecate some convenience methods which weren't actually particularly convenient

two of them are still used in tests

Author: gavinking

hibernate-core/src/main/java/org/hibernate/engine/profile/DefaultFetchProfile.java

@@ -4,7 +4,7 @@
  */
 package org.hibernate.engine.profile;
 
-import org.hibernate.metamodel.RuntimeMetamodels;
+import org.hibernate.metamodel.MappingMetamodel;
 import org.hibernate.metamodel.mapping.AttributeMapping;
 import org.hibernate.metamodel.mapping.AttributeMappingsList;
 import org.hibernate.metamodel.mapping.EntityMappingType;
@@ -27,9 +27,9 @@ public class DefaultFetchProfile extends FetchProfile {
 	 * The name of an implicit fetch profile which includes all eager to-one associations.
 	 */
 	public static final String HIBERNATE_DEFAULT_PROFILE = "org.hibernate.defaultProfile";
-	private final RuntimeMetamodels metamodels;
+	private final MappingMetamodel metamodels;
 
-	public DefaultFetchProfile(RuntimeMetamodels metamodels) {
+	public DefaultFetchProfile(MappingMetamodel metamodels) {
 		super(HIBERNATE_DEFAULT_PROFILE);
 		this.metamodels = metamodels;
 	}
@@ -39,7 +39,7 @@ public DefaultFetchProfile(RuntimeMetamodels metamodels) {
 		final int last = role.lastIndexOf('.');
 		final String entityName = role.substring( 0, last );
 		final String property = role.substring( last + 1 );
-		final EntityMappingType entity = metamodels.getEntityMappingType( entityName );
+		final EntityMappingType entity = metamodels.getEntityDescriptor( entityName );
 		if ( entity != null ) {
 			final AttributeMapping attributeMapping = entity.findAttributeMapping( property );
 			if ( attributeMapping != null && !attributeMapping.isPluralAttributeMapping() ) {
@@ -54,8 +54,7 @@ public DefaultFetchProfile(RuntimeMetamodels metamodels) {
 
 	@Override
 	public boolean hasSubselectLoadableCollectionsEnabled(EntityPersister persister) {
-		final EntityMappingType entity = metamodels.getEntityMappingType( persister.getEntityName() );
-		final AttributeMappingsList attributeMappings = entity.getAttributeMappings();
+		final AttributeMappingsList attributeMappings = persister.getAttributeMappings();
 		for ( int i = 0; i < attributeMappings.size(); i++ ) {
 			AttributeMapping attributeMapping = attributeMappings.get( i );
 			if ( attributeMapping.getMappedFetchOptions().getStyle() == SUBSELECT ) {

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

@@ -357,8 +357,8 @@ private boolean copyState(Object entity, Type[] types, Object[] state, SessionFa
 	}
 
 	private static Object[] currentState(Object entity, SessionFactoryImplementor factory) {
-		return factory.getRuntimeMetamodels()
-				.getEntityMappingType( entity.getClass() )
+		return factory.getMappingMetamodel()
+				.getEntityDescriptor( entity.getClass() )
 				.getEntityPersister()
 				.getValues( entity );
 	}

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

@@ -46,19 +46,20 @@ static void addFetchProfiles(
 			MetadataImplementor bootMetamodel,
 			RuntimeMetamodels runtimeMetamodels,
 			Map<String, FetchProfile> fetchProfiles) {
-		for ( org.hibernate.mapping.FetchProfile mappingProfile : bootMetamodel.getFetchProfiles() ) {
-			final FetchProfile fetchProfile = createFetchProfile( runtimeMetamodels.getMappingMetamodel(), mappingProfile );
+		final MappingMetamodel mappingMetamodel = runtimeMetamodels.getMappingMetamodel();
+		for ( var mappingProfile : bootMetamodel.getFetchProfiles() ) {
+			final FetchProfile fetchProfile = createFetchProfile( mappingMetamodel, mappingProfile );
 			fetchProfiles.put( fetchProfile.getName(), fetchProfile );
 		}
-		fetchProfiles.put( HIBERNATE_DEFAULT_PROFILE, new DefaultFetchProfile( runtimeMetamodels ) );
+		fetchProfiles.put( HIBERNATE_DEFAULT_PROFILE, new DefaultFetchProfile( mappingMetamodel ) );
 	}
 
 	private static FetchProfile createFetchProfile(
 			MappingMetamodel mappingMetamodel,
 			org.hibernate.mapping.FetchProfile mappingProfile) {
 		final String profileName = mappingProfile.getName();
 		final FetchProfile fetchProfile = new FetchProfile( profileName );
-		for ( org.hibernate.mapping.FetchProfile.Fetch mappingFetch : mappingProfile.getFetches() ) {
+		for ( var mappingFetch : mappingProfile.getFetches() ) {
 			// resolve the persister owning the fetch
 			final EntityPersister owner = getEntityPersister( mappingMetamodel, fetchProfile, mappingFetch );
 			if ( owner instanceof FetchProfileAffectee fetchProfileAffectee ) {

hibernate-core/src/main/java/org/hibernate/metamodel/RuntimeMetamodels.java

@@ -36,18 +36,34 @@ public interface RuntimeMetamodels {
 
 	// some convenience methods...
 
+	/**
+	 * @deprecated Only called from tests
+	 */
+	@Deprecated(since = "7.0", forRemoval = true)
 	default EntityMappingType getEntityMappingType(String entityName) {
 		return getMappingMetamodel().getEntityDescriptor( entityName );
 	}
 
+	/**
+	 * @deprecated Only called from tests
+	 */
+	@Deprecated(since = "7.0", forRemoval = true)
 	default EntityMappingType getEntityMappingType(Class<?> entityType) {
 		return getMappingMetamodel().getEntityDescriptor( entityType );
 	}
 
+	/**
+	 * @deprecated No longer called
+	 */
+	@Deprecated(since = "7.0", forRemoval = true)
 	default PluralAttributeMapping getPluralAttributeMapping(String role) {
 		return getMappingMetamodel().findCollectionDescriptor( role ).getAttributeMapping();
 	}
 
+	/**
+	 * @deprecated No longer called
+	 */
+	@Deprecated(since = "7.0", forRemoval = true)
 	default String getImportedName(String name) {
 		return getMappingMetamodel().getImportedName( name );
 	}

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

@@ -270,9 +270,8 @@ private EntityMappingType determineConcreteType(Object entity, SharedSessionCont
 		final String entityName = session == null
 				? sessionFactory.bestGuessEntityName( entity )
 				: session.bestGuessEntityName( entity );
-		return sessionFactory
-				.getRuntimeMetamodels()
-				.getEntityMappingType( entityName );
+		return sessionFactory.getMappingMetamodel()
+				.getEntityDescriptor( entityName );
 	}
 
 	@Override

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

@@ -232,9 +232,8 @@ private EntityMappingType determineConcreteType(Object entity, SharedSessionCont
 		final String entityName = session == null
 				? sessionFactory.bestGuessEntityName( entity )
 				: session.bestGuessEntityName( entity );
-		return sessionFactory
-				.getRuntimeMetamodels()
-				.getEntityMappingType( entityName );
+		return sessionFactory.getMappingMetamodel()
+				.getEntityDescriptor( entityName );
 	}
 
 	public ModelPart findSubPart(String name, EntityMappingType treatTarget) {

hibernate-core/src/main/java/org/hibernate/query/results/internal/Builders.java

@@ -11,7 +11,6 @@
 import org.hibernate.LockMode;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.metamodel.MappingMetamodel;
-import org.hibernate.metamodel.RuntimeMetamodels;
 import org.hibernate.metamodel.mapping.AttributeMapping;
 import org.hibernate.metamodel.mapping.BasicValuedModelPart;
 import org.hibernate.metamodel.mapping.EntityMappingType;
@@ -206,9 +205,8 @@ public static DynamicResultBuilderEntityStandard entity(
 			String tableAlias,
 			String entityName,
 			SessionFactoryImplementor sessionFactory) {
-		final RuntimeMetamodels runtimeMetamodels = sessionFactory.getRuntimeMetamodels();
-		final EntityMappingType entityMapping = runtimeMetamodels.getEntityMappingType( entityName );
-
+		final EntityMappingType entityMapping =
+				sessionFactory.getMappingMetamodel().getEntityDescriptor( entityName );
 		return new DynamicResultBuilderEntityStandard( entityMapping, tableAlias );
 	}
 
@@ -239,7 +237,7 @@ public static DynamicResultBuilderEntityCalculated entityCalculated(
 			String entityName,
 			LockMode explicitLockMode,
 			SessionFactoryImplementor sessionFactory) {
-		final EntityMappingType entityMapping = sessionFactory.getRuntimeMetamodels().getEntityMappingType( entityName );
+		final EntityMappingType entityMapping = sessionFactory.getMappingMetamodel().getEntityDescriptor( entityName );
 		return new DynamicResultBuilderEntityCalculated( entityMapping, tableAlias, explicitLockMode );
 	}
 

hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/MatchingIdSelectionHelper.java

@@ -226,10 +226,11 @@ public static List<Object> selectMatchingIds(
 			DomainQueryExecutionContext executionContext) {
 		final SessionFactoryImplementor factory = executionContext.getSession().getFactory();
 
-		final EntityMappingType entityDescriptor = factory.getRuntimeMetamodels().getEntityMappingType(
-				sqmMutationStatement.getTarget().getModel().getHibernateEntityName()
-		);
-		final SqmSelectStatement<?> sqmSelectStatement = generateMatchingIdSelectStatement( sqmMutationStatement, entityDescriptor );
+		final EntityMappingType entityDescriptor =
+				factory.getMappingMetamodel()
+						.getEntityDescriptor( sqmMutationStatement.getTarget().getModel().getHibernateEntityName() );
+		final SqmSelectStatement<?> sqmSelectStatement =
+				generateMatchingIdSelectStatement( sqmMutationStatement, entityDescriptor );
 		final SqmQuerySpec<?> sqmQuerySpec = sqmSelectStatement.getQuerySpec();
 
 		if ( sqmMutationStatement instanceof SqmDeleteStatement<?> ) {

hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/cte/CteInsertHandler.java

@@ -136,7 +136,7 @@ public CteInsertHandler(
 				.getModel()
 				.getHibernateEntityName();
 
-		this.entityDescriptor = sessionFactory.getRuntimeMetamodels().getEntityMappingType( entityName );
+		this.entityDescriptor = sessionFactory.getMappingMetamodel().getEntityDescriptor( entityName );
 		this.cteTable = cteTable;
 		this.domainParameterXref = domainParameterXref;
 	}

hibernate-core/src/main/java/org/hibernate/query/sqm/mutation/internal/inline/InlineDeleteHandler.java

@@ -86,7 +86,7 @@ public int execute(DomainQueryExecutionContext executionContext) {
 		final SessionFactoryImplementor factory = executionContext.getSession().getFactory();
 
 		final String mutatingEntityName = sqmDeleteStatement.getTarget().getModel().getHibernateEntityName();
-		final EntityMappingType entityDescriptor = factory.getRuntimeMetamodels().getEntityMappingType( mutatingEntityName );
+		final EntityMappingType entityDescriptor = factory.getMappingMetamodel().getEntityDescriptor( mutatingEntityName );
 
 		final List<Expression> inListExpressions = matchingIdsPredicateProducer.produceIdExpressionList( idsAndFks, entityDescriptor );
 		final JdbcParameterBindings jdbcParameterBindings = new JdbcParameterBindingsImpl( domainParameterXref.getQueryParameterCount() );