HHH-19366 - Upgrade hibernate-models to 1.0.0.CR1

hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java

@@ -29,7 +29,7 @@
 import org.hibernate.metamodel.internal.ManagedTypeRepresentationResolverStandard;
 import org.hibernate.metamodel.spi.ManagedTypeRepresentationResolver;
 import org.hibernate.models.spi.ModelsConfiguration;
-import org.hibernate.models.spi.SourceModelBuildingContext;
+import org.hibernate.models.spi.ModelsContext;
 import org.hibernate.query.sqm.function.SqmFunctionDescriptor;
 import org.hibernate.query.sqm.function.SqmFunctionRegistry;
 import org.hibernate.resource.beans.spi.BeanInstanceProducer;
@@ -80,7 +80,7 @@ public class BootstrapContextImpl implements BootstrapContext {
 	private final ManagedTypeRepresentationResolver representationStrategySelector;
 	private final ConfigurationService configurationService;
 
-	private final SourceModelBuildingContext modelsContext;
+	private final ModelsContext modelsContext;
 
 	public BootstrapContextImpl(
 			StandardServiceRegistry serviceRegistry,
@@ -136,7 +136,7 @@ public TypeConfiguration getTypeConfiguration() {
 	}
 
 	@Override
-	public SourceModelBuildingContext getModelsContext() {
+	public ModelsContext getModelsContext() {
 		return modelsContext;
 	}
 
@@ -354,7 +354,7 @@ public void addCacheRegionDefinition(CacheRegionDefinition cacheRegionDefinition
 		cacheRegionDefinitions.add( cacheRegionDefinition );
 	}
 
-	public static SourceModelBuildingContext createModelBuildingContext(
+	public static ModelsContext createModelBuildingContext(
 			ClassLoaderService classLoaderService,
 			ConfigurationService configService) {
 		final ClassLoaderServiceLoading classLoading = new ClassLoaderServiceLoading( classLoaderService );

hibernate-core/src/main/java/org/hibernate/boot/model/internal/AbstractPropertyHolder.java

@@ -25,7 +25,7 @@
 import org.hibernate.models.spi.AnnotationTarget;
 import org.hibernate.models.spi.ClassDetails;
 import org.hibernate.models.spi.MemberDetails;
-import org.hibernate.models.spi.SourceModelBuildingContext;
+import org.hibernate.models.spi.ModelsContext;
 import org.hibernate.usertype.internal.AbstractTimeZoneStorageCompositeUserType;
 import org.hibernate.usertype.internal.OffsetTimeCompositeUserType;
 
@@ -172,7 +172,7 @@ protected MetadataBuildingContext getContext() {
 		return context;
 	}
 
-	protected SourceModelBuildingContext getSourceModelContext() {
+	protected ModelsContext getSourceModelContext() {
 		return getContext().getBootstrapContext().getModelsContext();
 	}
 
@@ -435,7 +435,7 @@ private static Map<String, Column[]> buildColumnOverride(
 			return result;
 		}
 
-		final SourceModelBuildingContext sourceModelContext =
+		final ModelsContext sourceModelContext =
 				context.getBootstrapContext().getModelsContext();
 		final Map<String, List<Column>> columnOverrideMap = new HashMap<>();
 
@@ -571,7 +571,7 @@ public MetadataBuildingContext getBuildingContext() {
 	}
 
 	private static Map<String, ColumnTransformer> buildColumnTransformerOverride(AnnotationTarget element, MetadataBuildingContext context) {
-		final SourceModelBuildingContext sourceModelContext = context.getBootstrapContext().getModelsContext();
+		final ModelsContext sourceModelContext = context.getBootstrapContext().getModelsContext();
 		final Map<String, ColumnTransformer> columnOverride = new HashMap<>();
 		if ( element != null ) {
 			element.forEachAnnotationUsage( ColumnTransformer.class, sourceModelContext, (usage) -> {

hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotatedColumn.java

@@ -36,7 +36,7 @@
 import org.hibernate.mapping.SimpleValue;
 import org.hibernate.mapping.Table;
 import org.hibernate.models.spi.MemberDetails;
-import org.hibernate.models.spi.SourceModelBuildingContext;
+import org.hibernate.models.spi.ModelsContext;
 
 import static org.hibernate.boot.model.internal.BinderHelper.getPath;
 import static org.hibernate.boot.model.internal.BinderHelper.getRelativePath;
@@ -831,7 +831,7 @@ private static AnnotatedColumn buildColumn(
 			FractionalSeconds fractionalSeconds,
 			String sqlType,
 			String tableName,
-			SourceModelBuildingContext sourceModelContext) {
+			ModelsContext sourceModelContext) {
 		final String columnName = logicalColumnName( inferredData, suffixForDefaultColumnName, database, column );
 		final AnnotatedColumn annotatedColumn = new AnnotatedColumn();
 		annotatedColumn.setLogicalColumnName( columnName );
@@ -983,7 +983,7 @@ void applyCheckConstraint(PropertyData inferredData, int length) {
 	private void extractDataFromPropertyData(
 			PropertyHolder propertyHolder,
 			PropertyData inferredData,
-			SourceModelBuildingContext context) {
+			ModelsContext context) {
 		if ( inferredData != null ) {
 			final MemberDetails attributeMember = inferredData.getAttributeMember();
 			if ( attributeMember != null ) {

hibernate-core/src/main/java/org/hibernate/boot/model/internal/AnnotationBinder.java

@@ -35,7 +35,7 @@
 import org.hibernate.internal.CoreMessageLogger;
 import org.hibernate.models.spi.AnnotationTarget;
 import org.hibernate.models.spi.ClassDetails;
-import org.hibernate.models.spi.SourceModelBuildingContext;
+import org.hibernate.models.spi.ModelsContext;
 import org.hibernate.resource.beans.internal.FallbackBeanInstanceProducer;
 import org.hibernate.resource.beans.spi.ManagedBeanRegistry;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
@@ -124,7 +124,7 @@ public static void bindDefaults(MetadataBuildingContext context) {
 
 	}
 
-	private static SourceModelBuildingContext modelsContext(MetadataBuildingContext context) {
+	private static ModelsContext modelsContext(MetadataBuildingContext context) {
 		return context.getBootstrapContext().getModelsContext();
 	}
 
@@ -170,7 +170,7 @@ public static void bindQueries(AnnotationTarget annotationTarget, MetadataBuildi
 	}
 
 	private static void bindNamedHibernateQueries(AnnotationTarget annotationTarget, MetadataBuildingContext context) {
-		final SourceModelBuildingContext sourceModelContext = modelsContext( context );
+		final ModelsContext sourceModelContext = modelsContext( context );
 
 		annotationTarget.forEachRepeatedAnnotationUsages(
 				HibernateAnnotations.NAMED_QUERY,
@@ -186,7 +186,7 @@ private static void bindNamedHibernateQueries(AnnotationTarget annotationTarget,
 	}
 
 	private static void bindNamedJpaQueries(AnnotationTarget annotationTarget, MetadataBuildingContext context) {
-		final SourceModelBuildingContext sourceModelContext = modelsContext( context );
+		final ModelsContext sourceModelContext = modelsContext( context );
 
 		annotationTarget.forEachRepeatedAnnotationUsages(
 				JpaAnnotations.SQL_RESULT_SET_MAPPING,
@@ -277,7 +277,7 @@ private static void bindTypeDescriptorRegistrations(
 		final ManagedBeanRegistry managedBeanRegistry =
 				context.getBootstrapContext().getManagedBeanRegistry();
 
-		final SourceModelBuildingContext sourceModelContext = modelsContext( context );
+		final ModelsContext sourceModelContext = modelsContext( context );
 
 		annotatedElement.forEachAnnotationUsage( JavaTypeRegistration.class, sourceModelContext, (usage) -> {
 			handleJavaTypeRegistration( context, managedBeanRegistry, usage );
@@ -382,7 +382,7 @@ private static void handleCompositeUserTypeRegistration(
 	}
 
 	private static void bindConverterRegistrations(AnnotationTarget container, MetadataBuildingContext context) {
-		final SourceModelBuildingContext sourceModelContext = modelsContext( context );
+		final ModelsContext sourceModelContext = modelsContext( context );
 		container.forEachAnnotationUsage( ConverterRegistration.class, sourceModelContext, (usage) -> {
 			handleConverterRegistration( usage, context );
 		} );

hibernate-core/src/main/java/org/hibernate/boot/model/internal/BasicValueBinder.java

@@ -42,7 +42,7 @@
 import org.hibernate.mapping.Table;
 import org.hibernate.models.spi.ClassDetails;
 import org.hibernate.models.spi.MemberDetails;
-import org.hibernate.models.spi.SourceModelBuildingContext;
+import org.hibernate.models.spi.ModelsContext;
 import org.hibernate.models.spi.TypeDetails;
 import org.hibernate.resource.beans.internal.FallbackBeanInstanceProducer;
 import org.hibernate.resource.beans.spi.ManagedBeanRegistry;
@@ -151,7 +151,7 @@ public BasicValueBinder(Kind kind, Component aggregateComponent, MetadataBuildin
 		this.buildingContext = buildingContext;
 	}
 
-	protected SourceModelBuildingContext getSourceModelContext() {
+	protected ModelsContext getSourceModelContext() {
 		return buildingContext.getBootstrapContext().getModelsContext();
 	}
 
@@ -1370,21 +1370,21 @@ private Map<String, Object> createDynamicParameterizedTypeParameters() {
 	 * Access to detail of basic value mappings based on {@link Kind}
 	 */
 	private interface BasicMappingAccess {
-		Class<? extends UserType<?>> customType(MemberDetails attribute, SourceModelBuildingContext context);
-		Map<String,String> customTypeParameters(MemberDetails attribute, SourceModelBuildingContext context);
+		Class<? extends UserType<?>> customType(MemberDetails attribute, ModelsContext context);
+		Map<String,String> customTypeParameters(MemberDetails attribute, ModelsContext context);
 	}
 
 	private static class ValueMappingAccess implements BasicMappingAccess {
 		private static final ValueMappingAccess INSTANCE = new ValueMappingAccess();
 
 		@Override
-		public Class<? extends UserType<?>> customType(MemberDetails attribute, SourceModelBuildingContext context) {
+		public Class<? extends UserType<?>> customType(MemberDetails attribute, ModelsContext context) {
 			final Type customType = attribute.locateAnnotationUsage( Type.class, context );
 			return customType == null ? null : customType.value();
 		}
 
 		@Override
-		public Map<String,String> customTypeParameters(MemberDetails attribute, SourceModelBuildingContext context) {
+		public Map<String,String> customTypeParameters(MemberDetails attribute, ModelsContext context) {
 			final Type customType = attribute.locateAnnotationUsage( Type.class, context );
 			return customType == null ? null : extractParameterMap( customType.parameters() );
 		}
@@ -1394,12 +1394,12 @@ private static class AnyDiscriminatorMappingAccess implements BasicMappingAccess
 		private static final AnyDiscriminatorMappingAccess INSTANCE = new AnyDiscriminatorMappingAccess();
 
 		@Override
-		public Class<? extends UserType<?>> customType(MemberDetails attribute, SourceModelBuildingContext context) {
+		public Class<? extends UserType<?>> customType(MemberDetails attribute, ModelsContext context) {
 			return null;
 		}
 
 		@Override
-		public Map<String,String> customTypeParameters(MemberDetails attribute, SourceModelBuildingContext context) {
+		public Map<String,String> customTypeParameters(MemberDetails attribute, ModelsContext context) {
 			return emptyMap();
 		}
 	}
@@ -1408,12 +1408,12 @@ private static class AnyKeyMappingAccess implements BasicMappingAccess {
 		private static final AnyKeyMappingAccess INSTANCE = new AnyKeyMappingAccess();
 
 		@Override
-		public Class<? extends UserType<?>> customType(MemberDetails attribute, SourceModelBuildingContext context) {
+		public Class<? extends UserType<?>> customType(MemberDetails attribute, ModelsContext context) {
 			return null;
 		}
 
 		@Override
-		public Map<String,String> customTypeParameters(MemberDetails attribute, SourceModelBuildingContext context) {
+		public Map<String,String> customTypeParameters(MemberDetails attribute, ModelsContext context) {
 			return emptyMap();
 		}
 	}
@@ -1422,14 +1422,14 @@ private static class MapKeyMappingAccess implements BasicMappingAccess {
 		private static final MapKeyMappingAccess INSTANCE = new MapKeyMappingAccess();
 
 		@Override
-		public Class<? extends UserType<?>> customType(MemberDetails attribute, SourceModelBuildingContext context) {
+		public Class<? extends UserType<?>> customType(MemberDetails attribute, ModelsContext context) {
 			final MapKeyType customType = attribute.locateAnnotationUsage( MapKeyType.class, context );
 			return customType == null ? null : customType.value();
 
 		}
 
 		@Override
-		public Map<String,String> customTypeParameters(MemberDetails attribute, SourceModelBuildingContext context) {
+		public Map<String,String> customTypeParameters(MemberDetails attribute, ModelsContext context) {
 			final MapKeyType customType = attribute.locateAnnotationUsage( MapKeyType.class, context );
 			return customType == null ? null : extractParameterMap( customType.parameters() );
 
@@ -1440,14 +1440,14 @@ private static class CollectionIdMappingAccess implements BasicMappingAccess {
 		private static final CollectionIdMappingAccess INSTANCE = new CollectionIdMappingAccess();
 
 		@Override
-		public Class<? extends UserType<?>> customType(MemberDetails attribute, SourceModelBuildingContext context) {
+		public Class<? extends UserType<?>> customType(MemberDetails attribute, ModelsContext context) {
 			final CollectionIdType customType = attribute.locateAnnotationUsage( CollectionIdType.class, context );
 			return customType == null ? null : customType.value();
 
 		}
 
 		@Override
-		public Map<String,String> customTypeParameters(MemberDetails attribute, SourceModelBuildingContext context) {
+		public Map<String,String> customTypeParameters(MemberDetails attribute, ModelsContext context) {
 			final CollectionIdType customType = attribute.locateAnnotationUsage( CollectionIdType.class, context );
 			return customType == null ? null : extractParameterMap( customType.parameters() );
 
@@ -1458,12 +1458,12 @@ private static class ListIndexMappingAccess implements BasicMappingAccess {
 		private static final ListIndexMappingAccess INSTANCE = new ListIndexMappingAccess();
 
 		@Override
-		public Class<? extends UserType<?>> customType(MemberDetails attribute, SourceModelBuildingContext context) {
+		public Class<? extends UserType<?>> customType(MemberDetails attribute, ModelsContext context) {
 			return null;
 		}
 
 		@Override
-		public Map<String,String> customTypeParameters(MemberDetails attribute, SourceModelBuildingContext context) {
+		public Map<String,String> customTypeParameters(MemberDetails attribute, ModelsContext context) {
 			return emptyMap();
 		}
 	}

hibernate-core/src/main/java/org/hibernate/boot/model/internal/BinderHelper.java

@@ -44,7 +44,7 @@
 import org.hibernate.models.spi.AnnotationTarget;
 import org.hibernate.models.spi.ClassDetails;
 import org.hibernate.models.spi.MemberDetails;
-import org.hibernate.models.spi.SourceModelBuildingContext;
+import org.hibernate.models.spi.ModelsContext;
 import org.hibernate.models.spi.TypeDetails;
 import org.hibernate.type.descriptor.java.JavaType;
 
@@ -828,7 +828,7 @@ public static Any buildAnyValue(
 	private static void processAnyDiscriminatorValues(
 			MemberDetails property,
 			Consumer<AnyDiscriminatorValue> consumer,
-			SourceModelBuildingContext sourceModelContext) {
+			ModelsContext sourceModelContext) {
 		final AnyDiscriminatorValues valuesAnn =
 				property.locateAnnotationUsage( AnyDiscriminatorValues.class, sourceModelContext );
 		if ( valuesAnn != null ) {
@@ -1076,7 +1076,7 @@ public static <A extends Annotation> A extractFromPackage(
 			return null;
 		}
 		else {
-			final SourceModelBuildingContext modelsContext =
+			final ModelsContext modelsContext =
 					context.getBootstrapContext().getModelsContext();
 			try {
 				return modelsContext.getClassDetailsRegistry()

hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java

@@ -106,7 +106,7 @@
 import org.hibernate.models.internal.ClassTypeDetailsImpl;
 import org.hibernate.models.spi.ClassDetails;
 import org.hibernate.models.spi.MemberDetails;
-import org.hibernate.models.spi.SourceModelBuildingContext;
+import org.hibernate.models.spi.ModelsContext;
 import org.hibernate.models.spi.TypeDetails;
 import org.hibernate.resource.beans.spi.ManagedBean;
 import org.hibernate.usertype.CompositeUserType;
@@ -264,7 +264,7 @@ public static void bindCollection(
 			Map<ClassDetails, InheritanceState> inheritanceStatePerClass,
 			MemberDetails property,
 			AnnotatedJoinColumns joinColumns) {
-		final SourceModelBuildingContext modelsContext = context.getBootstrapContext().getModelsContext();
+		final ModelsContext modelsContext = context.getBootstrapContext().getModelsContext();
 
 		final OneToMany oneToManyAnn = property.getAnnotationUsage( OneToMany.class, modelsContext );
 		final ManyToMany manyToManyAnn = property.getAnnotationUsage( ManyToMany.class, modelsContext );
@@ -381,7 +381,7 @@ private static NotFoundAction notFoundAction(
 			PropertyData inferredData,
 			MemberDetails property,
 			ManyToMany manyToManyAnn,
-			SourceModelBuildingContext sourceModelContext) {
+			ModelsContext sourceModelContext) {
 		final NotFound notFound = property.getAnnotationUsage( NotFound.class, sourceModelContext );
 		if ( notFound != null ) {
 			if ( manyToManyAnn == null ) {
@@ -634,7 +634,7 @@ else if ( property.hasDirectAnnotationUsage( Columns.class ) ) {
 	private static JoinColumn[] mapKeyJoinColumnAnnotations(
 			MemberDetails property,
 			MetadataBuildingContext context) {
-		final SourceModelBuildingContext modelsContext = context.getBootstrapContext().getModelsContext();
+		final ModelsContext modelsContext = context.getBootstrapContext().getModelsContext();
 
 		final MapKeyJoinColumn[] mapKeyJoinColumns = property.getRepeatedAnnotationUsages(
 				JpaAnnotations.MAP_KEY_JOIN_COLUMN,
@@ -957,7 +957,7 @@ private static CollectionClassification determineCollectionClassification(
 			return CollectionClassification.ARRAY;
 		}
 
-		final SourceModelBuildingContext modelsContext = buildingContext.getBootstrapContext().getModelsContext();
+		final ModelsContext modelsContext = buildingContext.getBootstrapContext().getModelsContext();
 		if ( !property.hasAnnotationUsage( Bag.class, modelsContext ) ) {
 			return determineCollectionClassification( determineSemanticJavaType( property ), property, buildingContext );
 		}
@@ -1026,7 +1026,7 @@ private static CollectionClassification determineCollectionClassification(
 				return CollectionClassification.BAG;
 			}
 
-			final SourceModelBuildingContext modelsContext =
+			final ModelsContext modelsContext =
 					buildingContext.getBootstrapContext().getModelsContext();
 			final ManyToMany manyToMany = property.getAnnotationUsage( ManyToMany.class, modelsContext );
 			if ( manyToMany != null && !manyToMany.mappedBy().isBlank() ) {
@@ -1460,7 +1460,7 @@ private void defineFetchingStrategy() {
 		handleFetchProfileOverrides();
 	}
 
-	private SourceModelBuildingContext modelsContext() {
+	private ModelsContext modelsContext() {
 		return buildingContext.getBootstrapContext().getModelsContext();
 	}
 

hibernate-core/src/main/java/org/hibernate/boot/model/internal/ColumnsBuilder.java

@@ -16,7 +16,7 @@
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.boot.spi.PropertyData;
 import org.hibernate.models.spi.MemberDetails;
-import org.hibernate.models.spi.SourceModelBuildingContext;
+import org.hibernate.models.spi.ModelsContext;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.ElementCollection;
@@ -239,7 +239,7 @@ private AnnotatedJoinColumns buildExplicitJoinColumns(MemberDetails property, Pr
 	}
 
 	private JoinColumnOrFormula[] joinColumnOrFormulaAnnotations(MemberDetails property, PropertyData inferredData) {
-		final SourceModelBuildingContext modelsContext = buildingContext.getBootstrapContext().getModelsContext();
+		final ModelsContext modelsContext = buildingContext.getBootstrapContext().getModelsContext();
 		final JoinColumnOrFormula[] annotations = property.getRepeatedAnnotationUsages(
 				HibernateAnnotations.JOIN_COLUMN_OR_FORMULA,
 				modelsContext
@@ -252,7 +252,7 @@ private JoinColumnOrFormula[] joinColumnOrFormulaAnnotations(MemberDetails prope
 	}
 
 	private JoinColumn[] getJoinColumnAnnotations(MemberDetails property, PropertyData inferredData) {
-		final SourceModelBuildingContext modelsContext = buildingContext.getBootstrapContext().getModelsContext();
+		final ModelsContext modelsContext = buildingContext.getBootstrapContext().getModelsContext();
 
 		final JoinColumn[] joinColumns = property.getRepeatedAnnotationUsages(
 				JpaAnnotations.JOIN_COLUMN,