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

Author: marko-bekhta

hibernate-envers/src/main/java/org/hibernate/envers/boot/internal/EnversMetadataBuildingContextImpl.java

@@ -16,7 +16,7 @@
 import org.hibernate.envers.configuration.internal.metadata.AuditEntityConfigurationRegistry;
 import org.hibernate.envers.configuration.internal.metadata.AuditEntityNameRegister;
 import org.hibernate.models.spi.ClassDetailsRegistry;
-import org.hibernate.models.spi.SourceModelBuildingContext;
+import org.hibernate.models.spi.ModelsContext;
 import org.hibernate.service.ServiceRegistry;
 
 /**
@@ -100,8 +100,8 @@ public ServiceRegistry getServiceRegistry() {
 	}
 
 	@Override
-	public SourceModelBuildingContext getSourceModelBuildingContext() {
-		return metadataCollector.getSourceModelBuildingContext();
+	public ModelsContext getModelsContext() {
+		return metadataCollector.getBootstrapContext().getModelsContext();
 	}
 
 	@Override

hibernate-envers/src/main/java/org/hibernate/envers/boot/spi/EnversMetadataBuildingContext.java

@@ -10,7 +10,7 @@
 import org.hibernate.envers.configuration.internal.metadata.AuditEntityConfigurationRegistry;
 import org.hibernate.envers.configuration.internal.metadata.AuditEntityNameRegister;
 import org.hibernate.models.spi.ClassDetailsRegistry;
-import org.hibernate.models.spi.SourceModelBuildingContext;
+import org.hibernate.models.spi.ModelsContext;
 import org.hibernate.service.ServiceRegistry;
 
 /**
@@ -25,7 +25,7 @@ public interface EnversMetadataBuildingContext extends MetadataBuildingContext {
 
 	ServiceRegistry getServiceRegistry();
 
-	SourceModelBuildingContext getSourceModelBuildingContext();
+	ModelsContext getModelsContext();
 
 	ClassDetailsRegistry getClassDetailsRegistry();
 

hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/ModelsHelper.java

@@ -14,7 +14,7 @@
 import org.hibernate.models.spi.FieldDetails;
 import org.hibernate.models.spi.MemberDetails;
 import org.hibernate.models.spi.MethodDetails;
-import org.hibernate.models.spi.SourceModelBuildingContext;
+import org.hibernate.models.spi.ModelsContext;
 import org.hibernate.models.spi.TypeDetails;
 
 /**
@@ -69,22 +69,22 @@ public static MemberDetails getMember(ClassDetails classDetails, String name) {
 	 *
 	 * @param propertiesSource The property source containing the virtual field
 	 * @param propertyName The property name of the dynamic field
-	 * @param sourceModelBuildingContext Context object for models
+	 * @param modelsContext Context object for models
 	 *
 	 * @return The newly created dynamic field details
 	 */
 	public static FieldDetails dynamicFieldDetails(
 			PersistentPropertiesSource propertiesSource,
 			String propertyName,
-			SourceModelBuildingContext sourceModelBuildingContext) {
+			ModelsContext modelsContext) {
 		return new DynamicFieldDetails(
 				propertyName,
 				new ClassTypeDetailsImpl( propertiesSource.getClassDetails(), TypeDetails.Kind.CLASS ),
 				propertiesSource.getClassDetails(),
 				ModifierUtils.DYNAMIC_ATTRIBUTE_MODIFIERS,
 				false,
 				false,
-				sourceModelBuildingContext
+				modelsContext
 		);
 	}
 }

hibernate-envers/src/main/java/org/hibernate/envers/configuration/internal/metadata/reader/AuditedPropertiesReader.java

@@ -36,7 +36,7 @@
 import org.hibernate.models.spi.ClassDetails;
 import org.hibernate.models.spi.FieldDetails;
 import org.hibernate.models.spi.MemberDetails;
-import org.hibernate.models.spi.SourceModelBuildingContext;
+import org.hibernate.models.spi.ModelsContext;
 import org.hibernate.spi.NavigablePath;
 
 import jakarta.persistence.ElementCollection;
@@ -356,8 +356,8 @@ private void addPropertiesFromDynamicComponent(PersistentPropertiesSource proper
 			String accessType = entry.getValue();
 			if ( !auditedPropertiesHolder.contains( property ) ) {
 				final Value propertyValue = persistentPropertiesSource.getProperty( property ).getValue();
-				final SourceModelBuildingContext buildingContext = metadataBuildingContext.getSourceModelBuildingContext();
-				final FieldDetails fieldDetails = dynamicFieldDetails( propertiesSource, property, buildingContext );
+				final ModelsContext modelsContext = metadataBuildingContext.getModelsContext();
+				final FieldDetails fieldDetails = dynamicFieldDetails( propertiesSource, property, modelsContext );
 				if ( propertyValue instanceof Component ) {
 					this.addFromComponentProperty(
 							fieldDetails,