HHH-19466 get rid of SPI type JpaCompliance from JpaMetamodel

gavinking · gavinking · commit b3ff1d8f2297 · 2025-05-15T20:43:59.000+02:00
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java b/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java
@@ -1468,7 +1468,7 @@ public <T> QueryImplementor<T> createQuery(CriteriaQuery<T> criteriaQuery) {
 				return createCriteriaQuery( selectStatement, criteriaQuery.getResultType() );
 			}
 			catch (RuntimeException e) {
-				if ( getSessionFactory().getJpaMetamodel().getJpaCompliance().isJpaTransactionComplianceEnabled() ) {
+				if ( getSessionFactory().getSessionFactoryOptions().getJpaCompliance().isJpaTransactionComplianceEnabled() ) {
 					markForRollbackOnly();
 				}
 				throw getExceptionConverter().convert( e );
@@ -1483,7 +1483,7 @@ public QueryImplementor<?> createQuery(@SuppressWarnings("rawtypes") CriteriaUpd
 			return createCriteriaQuery( (SqmUpdateStatement<?>) criteriaUpdate, null );
 		}
 		catch (RuntimeException e) {
-			if ( getSessionFactory().getJpaMetamodel().getJpaCompliance().isJpaTransactionComplianceEnabled() ) {
+			if ( getSessionFactory().getSessionFactoryOptions().getJpaCompliance().isJpaTransactionComplianceEnabled() ) {
 				markForRollbackOnly();
 			}
 			throw getExceptionConverter().convert( e );
@@ -1497,7 +1497,7 @@ public QueryImplementor<?> createQuery(@SuppressWarnings("rawtypes") CriteriaDel
 			return createCriteriaQuery( (SqmDeleteStatement<?>) criteriaDelete, null );
 		}
 		catch (RuntimeException e) {
-			if ( getSessionFactory().getJpaMetamodel().getJpaCompliance().isJpaTransactionComplianceEnabled() ) {
+			if ( getSessionFactory().getSessionFactoryOptions().getJpaCompliance().isJpaTransactionComplianceEnabled() ) {
 				markForRollbackOnly();
 			}
 			throw getExceptionConverter().convert( e );
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java b/hibernate-core/src/main/java/org/hibernate/internal/SessionImpl.java
@@ -1755,7 +1755,7 @@ public <T> QueryImplementor<T> createQuery(CriteriaSelect<T> selectQuery) {
 				return createCriteriaQuery( selectStatement, selectStatement.getResultType() );
 			}
 			catch (RuntimeException e) {
-				if ( getSessionFactory().getJpaMetamodel().getJpaCompliance().isJpaTransactionComplianceEnabled() ) {
+				if ( getSessionFactory().getSessionFactoryOptions().getJpaCompliance().isJpaTransactionComplianceEnabled() ) {
 					markForRollbackOnly();
 				}
 				throw getExceptionConverter().convert( e );
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractMultiIdEntityLoader.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/AbstractMultiIdEntityLoader.java
@@ -335,7 +335,7 @@ else if ( unresolvedIds.size() == ids.length ) {
 	protected abstract Object[] toIdArray(List<Object> ids);
 
 	private boolean isIdCoercionEnabled() {
-		return !getSessionFactory().getJpaMetamodel().getJpaCompliance().isLoadByIdComplianceEnabled();
+		return !getSessionFactory().getSessionFactoryOptions().getJpaCompliance().isLoadByIdComplianceEnabled();
 	}
 
 	public interface ResolutionConsumer<T> {
diff --git a/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderHelper.java b/hibernate-core/src/main/java/org/hibernate/loader/ast/internal/LoaderHelper.java
@@ -183,7 +183,7 @@ public static <K> K[] normalizeKeys(
 		}
 
 		final K[] typedArray = createTypedArray( keyClass, keys.length );
-		final boolean coerce = !sessionFactory.getJpaMetamodel().getJpaCompliance().isLoadByIdComplianceEnabled();
+		final boolean coerce = !sessionFactory.getSessionFactoryOptions().getJpaCompliance().isLoadByIdComplianceEnabled();
 		if ( !coerce ) {
 			System.arraycopy( keys, 0, typedArray, 0, keys.length );
 		}
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleNaturalIdMapping.java b/hibernate-core/src/main/java/org/hibernate/metamodel/mapping/internal/SimpleNaturalIdMapping.java
@@ -162,7 +162,7 @@ else if ( incoming instanceof Object[] values ) {
 	}
 
 	private boolean isLoadByIdComplianceEnabled() {
-		return getTypeConfiguration().getJpaCompliance().isLoadByIdComplianceEnabled();
+		return sessionFactory.getSessionFactoryOptions().getJpaCompliance().isLoadByIdComplianceEnabled();
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/JpaMetamodel.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/JpaMetamodel.java
@@ -17,7 +17,6 @@
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.hibernate.Incubating;
 import org.hibernate.graph.RootGraph;
-import org.hibernate.jpa.spi.JpaCompliance;
 import org.hibernate.metamodel.MappingMetamodel;
 import org.hibernate.type.descriptor.java.EnumJavaType;
 import org.hibernate.type.descriptor.java.JavaType;
@@ -144,6 +143,4 @@ public interface JpaMetamodel extends Metamodel {
 	<T> List<RootGraph<? super T>> findEntityGraphsByJavaType(Class<T> entityClass);
 
 	<T> Map<String, EntityGraph<? extends T>> getNamedEntityGraphs(Class<T> entityType);
-
-	JpaCompliance getJpaCompliance();
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java
@@ -31,7 +31,6 @@
 import org.hibernate.graph.spi.RootGraphImplementor;
 import org.hibernate.internal.CoreLogging;
 import org.hibernate.internal.CoreMessageLogger;
-import org.hibernate.jpa.spi.JpaCompliance;
 import org.hibernate.mapping.MappedSuperclass;
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.metamodel.MappingMetamodel;
@@ -120,11 +119,6 @@ public ServiceRegistry getServiceRegistry() {
 		return serviceRegistry;
 	}
 
-	@Override
-	public JpaCompliance getJpaCompliance() {
-		return typeConfiguration.getJpaCompliance();
-	}
-
 	@Override
 	public @Nullable <X> ManagedDomainType<X> findManagedType(@Nullable String typeName) {
 		//noinspection unchecked
diff --git a/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java b/hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/MappingMetamodelImpl.java
@@ -26,7 +26,6 @@
 import org.hibernate.internal.CoreLogging;
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.internal.util.collections.ArrayHelper;
-import org.hibernate.jpa.spi.JpaCompliance;
 import org.hibernate.mapping.Collection;
 import org.hibernate.mapping.Component;
 import org.hibernate.mapping.MappedSuperclass;
@@ -582,11 +581,6 @@ public <T> List<RootGraph<? super T>> findEntityGraphsByJavaType(Class<T> entity
 		return jpaMetamodel.findEntityGraphsByJavaType( entityClass );
 	}
 
-	@Override
-	public JpaCompliance getJpaCompliance() {
-		return jpaMetamodel.getJpaCompliance();
-	}
-
 	@Override
 	public RootGraph<?> findNamedGraph(String name) {
 		return findEntityGraphByName( name );
diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SqmPathRegistryImpl.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SqmPathRegistryImpl.java
@@ -51,7 +51,7 @@ public class SqmPathRegistryImpl implements SqmPathRegistry {
 
 	public SqmPathRegistryImpl(SqmCreationProcessingState associatedProcessingState) {
 		this.associatedProcessingState = associatedProcessingState;
-		this.jpaCompliance = associatedProcessingState.getCreationState().getCreationContext().getJpaMetamodel().getJpaCompliance();
+		this.jpaCompliance = associatedProcessingState.getCreationState().getCreationContext().getNodeBuilder().getJpaCompliance();
 	}
 
 	@Override
diff --git a/hibernate-core/src/main/java/org/hibernate/type/spi/TypeConfiguration.java b/hibernate-core/src/main/java/org/hibernate/type/spi/TypeConfiguration.java
@@ -252,7 +252,10 @@ public ServiceRegistry getServiceRegistry() {
 
 	/**
 	 * Obtain the {@link JpaCompliance} setting.
+	 *
+	 * @deprecated No longer used
 	 */
+	@Deprecated(since = "7.0", forRemoval = true)
 	public JpaCompliance getJpaCompliance() {
 		return scope.getJpaCompliance();
 	}
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
@@ -46,7 +46,6 @@
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.graph.spi.RootGraphImplementor;
 import org.hibernate.jpa.internal.MutableJpaComplianceImpl;
-import org.hibernate.jpa.spi.JpaCompliance;
 import org.hibernate.jpa.spi.MutableJpaCompliance;
 import org.hibernate.mapping.Property;
 import org.hibernate.metamodel.AttributeClassification;
@@ -913,11 +912,6 @@ public <E extends Enum<E>> E enumValue(EnumJavaType<E> enumType, String enumValu
 		public @Nullable Set<String> getEnumTypesForValue(String enumValue) {
 			return MockSessionFactory.this.getEnumTypesForValue(enumValue);
 		}
-
-		@Override
-		public JpaCompliance getJpaCompliance() {
-			return jpaCompliance;
-		}
 	}
 
 	@Nullable Set<String> getEnumTypesForValue(String value) {

Original file line number	Diff line number	Diff line change
`@@ -1468,7 +1468,7 @@ public <T> QueryImplementor<T> createQuery(CriteriaQuery<T> criteriaQuery) {`
`1468`	`1468`	`return createCriteriaQuery( selectStatement, criteriaQuery.getResultType() );`
`1469`	`1469`	`}`
`1470`	`1470`	`catch (RuntimeException e) {`
`1471`		`- if ( getSessionFactory().getJpaMetamodel().getJpaCompliance().isJpaTransactionComplianceEnabled() ) {`
	`1471`	`+ if ( getSessionFactory().getSessionFactoryOptions().getJpaCompliance().isJpaTransactionComplianceEnabled() ) {`
`1472`	`1472`	`markForRollbackOnly();`
`1473`	`1473`	`}`
`1474`	`1474`	`throw getExceptionConverter().convert( e );`
`@@ -1483,7 +1483,7 @@ public QueryImplementor<?> createQuery(@SuppressWarnings("rawtypes") CriteriaUpd`
`1483`	`1483`	`return createCriteriaQuery( (SqmUpdateStatement<?>) criteriaUpdate, null );`
`1484`	`1484`	`}`
`1485`	`1485`	`catch (RuntimeException e) {`
`1486`		`- if ( getSessionFactory().getJpaMetamodel().getJpaCompliance().isJpaTransactionComplianceEnabled() ) {`
	`1486`	`+ if ( getSessionFactory().getSessionFactoryOptions().getJpaCompliance().isJpaTransactionComplianceEnabled() ) {`
`1487`	`1487`	`markForRollbackOnly();`
`1488`	`1488`	`}`
`1489`	`1489`	`throw getExceptionConverter().convert( e );`
`@@ -1497,7 +1497,7 @@ public QueryImplementor<?> createQuery(@SuppressWarnings("rawtypes") CriteriaDel`
`1497`	`1497`	`return createCriteriaQuery( (SqmDeleteStatement<?>) criteriaDelete, null );`
`1498`	`1498`	`}`
`1499`	`1499`	`catch (RuntimeException e) {`
`1500`		`- if ( getSessionFactory().getJpaMetamodel().getJpaCompliance().isJpaTransactionComplianceEnabled() ) {`
	`1500`	`+ if ( getSessionFactory().getSessionFactoryOptions().getJpaCompliance().isJpaTransactionComplianceEnabled() ) {`
`1501`	`1501`	`markForRollbackOnly();`
`1502`	`1502`	`}`
`1503`	`1503`	`throw getExceptionConverter().convert( e );`
Original file line number	Diff line number	Diff line change
`@@ -1755,7 +1755,7 @@ public <T> QueryImplementor<T> createQuery(CriteriaSelect<T> selectQuery) {`
`1755`	`1755`	`return createCriteriaQuery( selectStatement, selectStatement.getResultType() );`
`1756`	`1756`	`}`
`1757`	`1757`	`catch (RuntimeException e) {`
`1758`		`- if ( getSessionFactory().getJpaMetamodel().getJpaCompliance().isJpaTransactionComplianceEnabled() ) {`
	`1758`	`+ if ( getSessionFactory().getSessionFactoryOptions().getJpaCompliance().isJpaTransactionComplianceEnabled() ) {`
`1759`	`1759`	`markForRollbackOnly();`
`1760`	`1760`	`}`
`1761`	`1761`	`throw getExceptionConverter().convert( e );`
Original file line number	Diff line number	Diff line change
`@@ -335,7 +335,7 @@ else if ( unresolvedIds.size() == ids.length ) {`
`335`	`335`	`protected abstract Object[] toIdArray(List<Object> ids);`
`336`	`336`
`337`	`337`	`private boolean isIdCoercionEnabled() {`
`338`		`- return !getSessionFactory().getJpaMetamodel().getJpaCompliance().isLoadByIdComplianceEnabled();`
	`338`	`+ return !getSessionFactory().getSessionFactoryOptions().getJpaCompliance().isLoadByIdComplianceEnabled();`
`339`	`339`	`}`
`340`	`340`
`341`	`341`	`public interface ResolutionConsumer<T> {`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ public static <K> K[] normalizeKeys(`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`final K[] typedArray = createTypedArray( keyClass, keys.length );`
`186`		`- final boolean coerce = !sessionFactory.getJpaMetamodel().getJpaCompliance().isLoadByIdComplianceEnabled();`
	`186`	`+ final boolean coerce = !sessionFactory.getSessionFactoryOptions().getJpaCompliance().isLoadByIdComplianceEnabled();`
`187`	`187`	`if ( !coerce ) {`
`188`	`188`	`System.arraycopy( keys, 0, typedArray, 0, keys.length );`
`189`	`189`	`}`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ else if ( incoming instanceof Object[] values ) {`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`private boolean isLoadByIdComplianceEnabled() {`
`165`		`- return getTypeConfiguration().getJpaCompliance().isLoadByIdComplianceEnabled();`
	`165`	`+ return sessionFactory.getSessionFactoryOptions().getJpaCompliance().isLoadByIdComplianceEnabled();`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public class SqmPathRegistryImpl implements SqmPathRegistry {`
`51`	`51`
`52`	`52`	`public SqmPathRegistryImpl(SqmCreationProcessingState associatedProcessingState) {`
`53`	`53`	`this.associatedProcessingState = associatedProcessingState;`
`54`		`- this.jpaCompliance = associatedProcessingState.getCreationState().getCreationContext().getJpaMetamodel().getJpaCompliance();`
	`54`	`+ this.jpaCompliance = associatedProcessingState.getCreationState().getCreationContext().getNodeBuilder().getJpaCompliance();`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`@Override`