HHH-18520 Upgrade to hibernate-models 0.9.0 + HHH-18521 Leverage hibernate-models ModelsConfiguration

Author: dreab8

hibernate-core/hibernate-core.gradle

@@ -28,6 +28,7 @@ dependencies {
     api jakartaLibs.jta
 
     implementation libs.hibernateModels
+    implementation libs.hibernateModelsJandex
     implementation libs.jandex
     implementation libs.classmate
     implementation libs.byteBuddy
@@ -65,6 +66,7 @@ dependencies {
     }
     testImplementation "joda-time:joda-time:2.3"
     testImplementation dbLibs.h2
+    testImplementation libs.hibernateModelsJandex
 
     testRuntimeOnly libs.byteBuddy
     testRuntimeOnly testLibs.weld

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

@@ -105,8 +105,8 @@
 import org.hibernate.metamodel.CollectionClassification;
 import org.hibernate.metamodel.mapping.DiscriminatorType;
 import org.hibernate.metamodel.spi.EmbeddableInstantiator;
-import org.hibernate.models.internal.SourceModelBuildingContextImpl;
 import org.hibernate.models.spi.ClassDetails;
+import org.hibernate.models.spi.ModelsConfiguration;
 import org.hibernate.models.spi.SourceModelBuildingContext;
 import org.hibernate.query.named.NamedObjectRepository;
 import org.hibernate.query.sqm.function.SqmFunctionDescriptor;
@@ -228,11 +228,13 @@ public InFlightMetadataCollectorImpl(
 	private static SourceModelBuildingContext createModelBuildingContext(BootstrapContext bootstrapContext) {
 		final ClassLoaderService classLoaderService = bootstrapContext.getServiceRegistry().getService( ClassLoaderService.class );
 		final ClassLoaderServiceLoading classLoading = new ClassLoaderServiceLoading( classLoaderService );
-		return new SourceModelBuildingContextImpl(
-				classLoading,
-				bootstrapContext.getJandexView(),
-				ModelsHelper::preFillRegistries
-		);
+
+		final ModelsConfiguration modelsConfiguration = new ModelsConfiguration();
+		modelsConfiguration.setClassLoading(classLoading);
+//		modelsConfiguration.setExplicitContextProvider(  );
+		modelsConfiguration.configValue( "hibernate.models.jandex.index", bootstrapContext.getJandexView() );
+		modelsConfiguration.setRegistryPrimer( ModelsHelper::preFillRegistries );
+		return modelsConfiguration.bootstrap();
 	}
 
 	@Override

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

@@ -87,10 +87,8 @@ public TypeDetails getPropertyType() throws MappingException {
 		if ( targetAnnotation != null ) {
 			final String targetName = targetAnnotation.value();
 			final SourceModelBuildingContext sourceModelBuildingContext = sourceModelContext;
-			final ClassDetails classDetails = sourceModelBuildingContext.getClassDetailsRegistry().resolveClassDetails(
-					targetName,
-					name -> new DynamicClassDetails( targetName, sourceModelBuildingContext )
-			);
+			final ClassDetails classDetails = sourceModelBuildingContext.getClassDetailsRegistry()
+					.resolveClassDetails( targetName );
 			return new ClassTypeDetailsImpl( classDetails, TypeDetails.Kind.CLASS );
 		}
 
@@ -119,10 +117,8 @@ public TypeDetails getClassOrElementType() throws MappingException {
 		final org.hibernate.boot.internal.Target annotationUsage = propertyMember.getDirectAnnotationUsage( org.hibernate.boot.internal.Target.class );
 		if ( annotationUsage != null ) {
 			final String targetName = annotationUsage.value();
-			final ClassDetails classDetails = sourceModelBuildingContext.getClassDetailsRegistry().resolveClassDetails(
-					targetName,
-					name -> new DynamicClassDetails( targetName, sourceModelBuildingContext )
-			);
+			final ClassDetails classDetails = sourceModelBuildingContext.getClassDetailsRegistry()
+					.resolveClassDetails( targetName );
 			return new ClassTypeDetailsImpl( classDetails, TypeDetails.Kind.CLASS );
 		}
 

hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/MetadataBuildingProcess.java

@@ -72,7 +72,8 @@
 import org.hibernate.engine.config.spi.StandardConverters;
 import org.hibernate.engine.jdbc.spi.JdbcServices;
 import org.hibernate.mapping.Table;
-import org.hibernate.models.internal.jandex.JandexIndexerHelper;
+import org.hibernate.models.internal.MutableClassDetailsRegistry;
+import org.hibernate.models.jandex.internal.JandexIndexerHelper;
 import org.hibernate.models.spi.ClassDetails;
 import org.hibernate.models.spi.ClassDetailsRegistry;
 import org.hibernate.models.spi.ClassLoading;
@@ -458,7 +459,7 @@ public static DomainModelSource processManagedResources(
 		xmlProcessingResult.apply( xmlPreProcessingResult.getPersistenceUnitMetadata() );
 
 		return new DomainModelSource(
-				classDetailsRegistry.makeImmutableCopy(),
+				classDetailsRegistry,
 				jandexIndex,
 				allKnownClassNames,
 				modelCategorizationCollector.getGlobalRegistrations(),
@@ -516,40 +517,6 @@ public static IndexView resolveJandexIndex(
 
 		return CompositeIndex.create( suppliedJandexIndex, jandexIndexer.complete() );
 	}
-//
-//	public static void preFillRegistries(RegistryPrimer.Contributions contributions, SourceModelBuildingContext buildingContext) {
-//		OrmAnnotationHelper.forEachOrmAnnotation( contributions::registerAnnotation );
-//
-//		final IndexView jandexIndex = buildingContext.getJandexIndex();
-//		if ( jandexIndex == null ) {
-//			return;
-//		}
-//
-//		final ClassDetailsRegistry classDetailsRegistry = buildingContext.getClassDetailsRegistry();
-//		final AnnotationDescriptorRegistry annotationDescriptorRegistry = buildingContext.getAnnotationDescriptorRegistry();
-//
-//		for ( ClassInfo knownClass : jandexIndex.getKnownClasses() ) {
-//			final String className = knownClass.name().toString();
-//
-//			if ( knownClass.isAnnotation() ) {
-//				// it is always safe to load the annotation classes - we will never be enhancing them
-//				//noinspection rawtypes
-//				final Class annotationClass = buildingContext
-//						.getClassLoading()
-//						.classForName( className );
-//				//noinspection unchecked
-//				annotationDescriptorRegistry.resolveDescriptor(
-//						annotationClass,
-//						(t) -> JdkBuilders.buildAnnotationDescriptor( annotationClass, buildingContext )
-//				);
-//			}
-//
-//			classDetailsRegistry.resolveClassDetails(
-//					className,
-//					(name) -> new JandexClassDetails( knownClass, buildingContext )
-//			);
-//		}
-//	}
 
 	private static void processAdditionalMappingContributions(
 			InFlightMetadataCollectorImpl metadataCollector,
@@ -628,6 +595,7 @@ public void contributeManagedClass(ClassDetails classDetails) {
 			additionalClassDetails.add( classDetails );
 			metadataCollector.getSourceModelBuildingContext()
 					.getClassDetailsRegistry()
+					.as( MutableClassDetailsRegistry.class )
 					.addClassDetails( classDetails.getName(), classDetails );
 		}
 

hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/ClassLoaderServiceLoading.java

@@ -7,6 +7,12 @@
 package org.hibernate.boot.models.categorize.internal;
 
 import java.net.URL;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ServiceLoader;
+import java.util.Set;
 
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 import org.hibernate.models.spi.ClassLoading;
@@ -37,4 +43,9 @@ public Package packageForName(String name) {
 	public URL locateResource(String resourceName) {
 		return classLoaderService.locateResource( resourceName );
 	}
+
+	@Override
+	public <S> Collection<S> loadJavaServices(Class<S> serviceType) {
+		return classLoaderService.loadJavaServices( serviceType );
+	}
 }

hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/ManagedResourcesProcessor.java

@@ -31,8 +31,8 @@
 import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
 import org.hibernate.boot.spi.BootstrapContext;
 import org.hibernate.boot.spi.MetadataBuildingOptions;
-import org.hibernate.models.internal.SourceModelBuildingContextImpl;
-import org.hibernate.models.internal.jandex.JandexIndexerHelper;
+import org.hibernate.models.internal.BasicModelBuildingContextImpl;
+import org.hibernate.models.jandex.internal.JandexIndexerHelper;
 import org.hibernate.models.spi.AnnotationDescriptorRegistry;
 import org.hibernate.models.spi.ClassDetails;
 import org.hibernate.models.spi.ClassDetailsRegistry;
@@ -103,9 +103,8 @@ public static CategorizedDomainModel processManagedResources(
 		// At this point we know all managed class names across all sources.
 		// Resolve the Jandex Index and build the SourceModelBuildingContext.
 		final IndexView jandexIndex = resolveJandexIndex( allKnownClassNames, bootstrapContext.getJandexView(), classLoading );
-		final SourceModelBuildingContextImpl sourceModelBuildingContext = new SourceModelBuildingContextImpl(
+		final BasicModelBuildingContextImpl sourceModelBuildingContext = new BasicModelBuildingContextImpl(
 				classLoading,
-				jandexIndex,
 				ModelsHelper::preFillRegistries
 		);
 
@@ -174,16 +173,11 @@ public static CategorizedDomainModel processManagedResources(
 		// OUTPUTS:
 		//		- CategorizedDomainModel
 
-		final ClassDetailsRegistry classDetailsRegistryImmutable = classDetailsRegistry
-				.makeImmutableCopy();
-
-		final AnnotationDescriptorRegistry annotationDescriptorRegistryImmutable = descriptorRegistry
-				.makeImmutableCopy();
 
 		// Collect the entity hierarchies based on the set of `rootEntities`
 		final ModelCategorizationContextImpl mappingBuildingContext = new ModelCategorizationContextImpl(
-				classDetailsRegistryImmutable,
-				annotationDescriptorRegistryImmutable,
+				classDetailsRegistry,
+				descriptorRegistry,
 				globalRegistrations
 		);
 
@@ -212,8 +206,8 @@ public static CategorizedDomainModel processManagedResources(
 		return modelCategorizationCollector.createResult(
 				entityHierarchies,
 				xmlPreProcessingResult.getPersistenceUnitMetadata(),
-				classDetailsRegistryImmutable,
-				annotationDescriptorRegistryImmutable
+				classDetailsRegistry,
+				descriptorRegistry
 		);
 	}
 

hibernate-core/src/main/java/org/hibernate/boot/models/internal/ModelsHelper.java

@@ -7,8 +7,8 @@
 package org.hibernate.boot.models.internal;
 
 import org.hibernate.annotations.TenantId;
-import org.hibernate.models.internal.jandex.JandexClassDetails;
 import org.hibernate.models.internal.jdk.JdkBuilders;
+import org.hibernate.models.jandex.spi.JandexModelBuildingContext;
 import org.hibernate.models.spi.AnnotationDescriptorRegistry;
 import org.hibernate.models.spi.ClassDetailsRegistry;
 import org.hibernate.models.spi.RegistryPrimer;
@@ -26,34 +26,33 @@ public static void preFillRegistries(RegistryPrimer.Contributions contributions,
 
 		buildingContext.getAnnotationDescriptorRegistry().getDescriptor( TenantId.class );
 
-		final IndexView jandexIndex = buildingContext.getJandexIndex();
-		if ( jandexIndex == null ) {
-			return;
-		}
-
-		final ClassDetailsRegistry classDetailsRegistry = buildingContext.getClassDetailsRegistry();
-		final AnnotationDescriptorRegistry annotationDescriptorRegistry = buildingContext.getAnnotationDescriptorRegistry();
-
-		for ( ClassInfo knownClass : jandexIndex.getKnownClasses() ) {
-			final String className = knownClass.name().toString();
-
-			if ( knownClass.isAnnotation() ) {
-				// it is always safe to load the annotation classes - we will never be enhancing them
-				//noinspection rawtypes
-				final Class annotationClass = buildingContext
-						.getClassLoading()
-						.classForName( className );
-				//noinspection unchecked
-				annotationDescriptorRegistry.resolveDescriptor(
-						annotationClass,
-						(t) -> JdkBuilders.buildAnnotationDescriptor( annotationClass, buildingContext )
-				);
+		if ( buildingContext instanceof JandexModelBuildingContext ) {
+			final IndexView jandexIndex = buildingContext.as( JandexModelBuildingContext.class ).getJandexIndex();
+			if ( jandexIndex == null ) {
+				return;
 			}
 
-			classDetailsRegistry.resolveClassDetails(
-					className,
-					(name) -> new JandexClassDetails( knownClass, buildingContext )
-			);
+			final ClassDetailsRegistry classDetailsRegistry = buildingContext.getClassDetailsRegistry();
+			final AnnotationDescriptorRegistry annotationDescriptorRegistry = buildingContext.getAnnotationDescriptorRegistry();
+
+			for ( ClassInfo knownClass : jandexIndex.getKnownClasses() ) {
+				final String className = knownClass.name().toString();
+
+				if ( knownClass.isAnnotation() ) {
+					// it is always safe to load the annotation classes - we will never be enhancing them
+					//noinspection rawtypes
+					final Class annotationClass = buildingContext
+							.getClassLoading()
+							.classForName( className );
+					//noinspection unchecked
+					annotationDescriptorRegistry.resolveDescriptor(
+							annotationClass,
+							(t) -> JdkBuilders.buildAnnotationDescriptor( annotationClass, buildingContext )
+					);
+				}
+
+				classDetailsRegistry.resolveClassDetails( className );
+			}
 		}
 	}
 }

hibernate-core/src/main/java/org/hibernate/boot/models/internal/OrmAnnotationHelper.java

@@ -15,21 +15,20 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 import java.util.function.Consumer;
 
 import org.hibernate.boot.models.DialectOverrideAnnotations;
 import org.hibernate.boot.models.HibernateAnnotations;
 import org.hibernate.boot.models.JpaAnnotations;
 import org.hibernate.boot.models.XmlAnnotations;
 import org.hibernate.models.AnnotationAccessException;
+import org.hibernate.models.jandex.spi.JandexModelBuildingContext;
+import org.hibernate.models.jandex.spi.JandexValueExtractor;
 import org.hibernate.models.spi.AnnotationDescriptor;
 import org.hibernate.models.spi.AttributeDescriptor;
-import org.hibernate.models.spi.JandexValueExtractor;
 import org.hibernate.models.spi.SourceModelBuildingContext;
 
 import org.jboss.jandex.AnnotationInstance;
-import org.jboss.jandex.AnnotationValue;
 
 /**
  * @author Steve Ebersole
@@ -76,7 +75,8 @@ public static <V, A extends Annotation> V extractJdkValue(A jdkAnnotation, Annot
 	}
 
 	public static <V> V extractJandexValue(AnnotationInstance jandexAnnotation, AttributeDescriptor<V> attributeDescriptor, SourceModelBuildingContext modelContext) {
-		final JandexValueExtractor<V> extractor = attributeDescriptor.getTypeDescriptor().createJandexValueExtractor( modelContext );
+		final JandexValueExtractor<V> extractor = modelContext.as( JandexModelBuildingContext.class )
+				.getJandexValueExtractor( attributeDescriptor.getTypeDescriptor() );
 		return extractor.extractValue( jandexAnnotation, attributeDescriptor, modelContext );
 //		final AnnotationValue value = jandexAnnotation.value( attributeDescriptor.getName() );
 //		return attributeDescriptor

hibernate-core/src/main/java/org/hibernate/boot/models/xml/internal/ManagedTypeProcessor.java

@@ -44,9 +44,10 @@
 import org.hibernate.models.internal.ClassTypeDetailsImpl;
 import org.hibernate.models.internal.ModelsClassLogging;
 import org.hibernate.models.internal.ModifierUtils;
-import org.hibernate.models.internal.RenderingCollectorImpl;
 import org.hibernate.models.internal.dynamic.DynamicClassDetails;
 import org.hibernate.models.internal.dynamic.DynamicFieldDetails;
+import org.hibernate.models.rendering.internal.RenderingTargetCollectingImpl;
+import org.hibernate.models.rendering.internal.SimpleRenderer;
 import org.hibernate.models.spi.ClassDetails;
 import org.hibernate.models.spi.ClassDetailsRegistry;
 import org.hibernate.models.spi.FieldDetails;
@@ -99,17 +100,7 @@ public static void processCompleteEntity(
 
 			memberAdjuster = ManagedTypeProcessor::adjustDynamicTypeMember;
 			classAccessType = AccessType.FIELD;
-			classDetails = (MutableClassDetails) classDetailsRegistry.resolveClassDetails(
-					jaxbEntity.getName(),
-					(name) -> new DynamicClassDetails(
-							jaxbEntity.getName(),
-							null,
-							false,
-							null,
-							null,
-							xmlDocumentContext.getModelBuildingContext()
-					)
-			);
+			classDetails = (MutableClassDetails) classDetailsRegistry.resolveClassDetails( jaxbEntity.getName() );
 
 			prepareDynamicClass( classDetails, jaxbEntity, xmlDocumentContext );
 		}
@@ -625,9 +616,10 @@ private static void renderClass(MutableClassDetails classDetails, XmlDocumentCon
 			return;
 		}
 
-		final RenderingCollectorImpl renderingCollector = new RenderingCollectorImpl();
-		classDetails.render( renderingCollector, xmlDocumentContext.getModelBuildingContext() );
-		XML_PROCESS_LOGGER.debugf( "Class annotations from XML for %s:\n%s", classDetails.getName(), renderingCollector.toString() );
+		final RenderingTargetCollectingImpl collectingTarget = new RenderingTargetCollectingImpl();
+		final SimpleRenderer renderer = new SimpleRenderer( collectingTarget );
+		renderer.renderClass( classDetails, xmlDocumentContext.getModelBuildingContext()  );
+		XML_PROCESS_LOGGER.debugf( "Class annotations from XML for %s:\n%s", classDetails.getName(), renderer.toString() );
 	}
 
 	private static void applyAccessAnnotation(
@@ -943,7 +935,7 @@ public static void processCompleteEmbeddable(
 			}
 			// no class == dynamic...
 			classDetails = (MutableClassDetails) classDetailsRegistry
-					.resolveClassDetails( jaxbEmbeddable.getName(), DynamicClassDetails::new );
+					.resolveClassDetails( jaxbEmbeddable.getName() );
 			classAccessType = AccessType.FIELD;
 			memberAdjuster = ManagedTypeProcessor::adjustDynamicTypeMember;