HHH-19466 get rid of TypeConfiguration and ServiceRegistry from JpaMetamodel

Author: gavinking

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/JpaMetamodel.java

@@ -19,10 +19,8 @@
 import org.hibernate.graph.RootGraph;
 import org.hibernate.jpa.spi.JpaCompliance;
 import org.hibernate.metamodel.MappingMetamodel;
-import org.hibernate.service.ServiceRegistry;
 import org.hibernate.type.descriptor.java.EnumJavaType;
 import org.hibernate.type.descriptor.java.JavaType;
-import org.hibernate.type.spi.TypeConfiguration;
 
 /**
  * Extensions to the JPA-defined {@linkplain Metamodel metamodel} of
@@ -36,17 +34,6 @@
 @Incubating
 public interface JpaMetamodel extends Metamodel {
 
-	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-	// Context
-
-	/**
-	 * todo (6.0) : should we expose JpaMetamodel from TypeConfiguration?
-	 */
-	TypeConfiguration getTypeConfiguration();
-
-	ServiceRegistry getServiceRegistry();
-
-
 	// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	// Extended features
 

hibernate-core/src/main/java/org/hibernate/metamodel/model/domain/internal/JpaMetamodelImpl.java

@@ -112,12 +112,10 @@ public JpaMetamodelImpl(
 		this.classLoaderService = serviceRegistry.getService( ClassLoaderService.class );
 	}
 
-	@Override
 	public TypeConfiguration getTypeConfiguration() {
 		return typeConfiguration;
 	}
 
-	@Override
 	public ServiceRegistry getServiceRegistry() {
 		return serviceRegistry;
 	}

hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java

@@ -3685,7 +3685,6 @@ public Object visitAdditionExpression(HqlParser.AdditionExpressionContext ctx) {
 				operator,
 				left,
 				right,
-				creationContext.getJpaMetamodel(),
 				creationContext.getNodeBuilder()
 		);
 	}
@@ -3713,7 +3712,6 @@ public Object visitMultiplicationExpression(HqlParser.MultiplicationExpressionCo
 					operator,
 					left,
 					right,
-					creationContext.getJpaMetamodel(),
 					creationContext.getNodeBuilder()
 			);
 		}
@@ -5779,15 +5777,13 @@ else if ( lhsExpressible.getRelationalJavaType() instanceof StringJavaType
 												BinaryArithmeticOperator.SUBTRACT,
 												end,
 												start,
-												creationContext.getJpaMetamodel(),
 												creationContext.getNodeBuilder()
 										),
 										new SqmLiteral<>(
 												1,
 												creationContext.getNodeBuilder().getIntegerType(),
 												creationContext.getNodeBuilder()
 										),
-										creationContext.getJpaMetamodel(),
 										creationContext.getNodeBuilder()
 								)
 						),

hibernate-core/src/main/java/org/hibernate/query/sqm/tree/expression/SqmBinaryArithmetic.java

@@ -4,7 +4,6 @@
  */
 package org.hibernate.query.sqm.tree.expression;
 
-import org.hibernate.metamodel.model.domain.JpaMetamodel;
 import org.hibernate.query.sqm.BinaryArithmeticOperator;
 import org.hibernate.query.sqm.NodeBuilder;
 import org.hibernate.query.sqm.SemanticQueryWalker;
@@ -29,11 +28,10 @@ public SqmBinaryArithmetic(
 			BinaryArithmeticOperator operator,
 			SqmExpression<?> lhsOperand,
 			SqmExpression<?> rhsOperand,
-			JpaMetamodel domainModel,
 			NodeBuilder nodeBuilder) {
 		//noinspection unchecked
 		super(
-				(SqmBindableType<T>) domainModel.getTypeConfiguration().resolveArithmeticType(
+				(SqmBindableType<T>) nodeBuilder.getTypeConfiguration().resolveArithmeticType(
 						lhsOperand.getExpressible(),
 						rhsOperand.getExpressible(),
 						operator