From cf25307dc1ed28b11fa154e02d92f7054f70cbf0 Mon Sep 17 00:00:00 2001 From: Andrea Boriero Date: Fri, 13 Sep 2024 16:21:58 +0200 Subject: [PATCH] HHH-18522 Drop hard requirements on Jandex --- .../org/hibernate/boot/MetadataBuilder.java | 3 +- .../boot/internal/BootstrapContextImpl.java | 7 +- .../boot/internal/MetadataBuilderImpl.java | 3 +- .../process/spi/MetadataBuildingProcess.java | 36 ---------- .../annotations/DomainModelSource.java | 9 --- .../internal/CategorizedDomainModelImpl.java | 10 --- .../spi/CategorizedDomainModel.java | 4 -- .../spi/ManagedResourcesProcessor.java | 33 --------- .../DomainModelCategorizationCollector.java | 6 -- .../boot/models/internal/ModelsHelper.java | 70 +++++++++---------- .../models/internal/OrmAnnotationHelper.java | 19 ----- ...tDelegatingMetadataBuilderImplementor.java | 4 +- .../hibernate/boot/spi/BootstrapContext.java | 6 +- .../annotations/xml/ejb3/Ejb3XmlTestCase.java | 1 - .../boot/models/SourceModelTestHelper.java | 1 - .../models/xml/XmlProcessingSmokeTests.java | 1 - .../testing/boot/BootstrapContextImpl.java | 3 +- 17 files changed, 41 insertions(+), 175 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/boot/MetadataBuilder.java b/hibernate-core/src/main/java/org/hibernate/boot/MetadataBuilder.java index 5a58812d24..74a059e4f5 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/MetadataBuilder.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/MetadataBuilder.java @@ -21,7 +21,6 @@ import org.hibernate.query.sqm.function.SqmFunctionDescriptor; import org.hibernate.type.BasicType; import org.hibernate.usertype.UserType; -import org.jboss.jandex.IndexView; import jakarta.persistence.AttributeConverter; import jakarta.persistence.SharedCacheMode; @@ -148,7 +147,7 @@ public interface MetadataBuilder { * * @return {@code this}, for method chaining */ - MetadataBuilder applyIndexView(IndexView jandexView); + MetadataBuilder applyIndexView(Object jandexView); /** * Specify the options to be used in performing scanning. diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java index b76a8f1da3..3377618ac9 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/BootstrapContextImpl.java @@ -38,7 +38,6 @@ import org.hibernate.resource.beans.spi.BeanInstanceProducer; import org.hibernate.type.BasicType; import org.hibernate.type.spi.TypeConfiguration; -import org.jboss.jandex.IndexView; import org.jboss.logging.Logger; /** @@ -66,7 +65,7 @@ public class BootstrapContextImpl implements BootstrapContext { private Object scannerSetting; private ArchiveDescriptorFactory archiveDescriptorFactory; - private IndexView jandexView; + private Object jandexView; private HashMap sqlFunctionMap; private ArrayList auxiliaryDatabaseObjectList; @@ -182,7 +181,7 @@ public class BootstrapContextImpl implements BootstrapContext { } @Override - public IndexView getJandexView() { + public Object getJandexView() { return jandexView; } @@ -300,7 +299,7 @@ public class BootstrapContextImpl implements BootstrapContext { this.archiveDescriptorFactory = factory; } - void injectJandexView(IndexView jandexView) { + void injectJandexView(Object jandexView) { log.debugf( "Injecting Jandex IndexView [%s] into BootstrapContext; was [%s]", jandexView, this.jandexView ); this.jandexView = jandexView; } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java index 68c2adc558..7c0ee8793f 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/internal/MetadataBuilderImpl.java @@ -86,7 +86,6 @@ import org.hibernate.type.spi.TypeConfiguration; import org.hibernate.usertype.CompositeUserType; import org.hibernate.usertype.UserType; -import org.jboss.jandex.IndexView; import jakarta.persistence.AttributeConverter; import jakarta.persistence.ConstraintMode; @@ -213,7 +212,7 @@ public class MetadataBuilderImpl implements MetadataBuilderImplementor, TypeCont } @Override - public MetadataBuilder applyIndexView(IndexView jandexView) { + public MetadataBuilder applyIndexView(Object jandexView) { this.bootstrapContext.injectJandexView( jandexView ); return this; } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/MetadataBuildingProcess.java b/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/MetadataBuildingProcess.java index aea51bfc29..82446f4dd7 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/MetadataBuildingProcess.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/process/spi/MetadataBuildingProcess.java @@ -71,10 +71,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.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; import org.hibernate.models.spi.SourceModelBuildingContext; import org.hibernate.type.BasicType; import org.hibernate.type.BasicTypeRegistry; @@ -95,9 +93,6 @@ import org.hibernate.type.internal.NamedBasicTypeImpl; import org.hibernate.type.spi.TypeConfiguration; import org.hibernate.usertype.CompositeUserType; -import org.jboss.jandex.CompositeIndex; -import org.jboss.jandex.IndexView; -import org.jboss.jandex.Indexer; import jakarta.persistence.AttributeConverter; @@ -398,10 +393,6 @@ public class MetadataBuildingProcess { } ); managedResources.getAnnotatedClassReferences().forEach( (clazz) -> allKnownClassNames.add( clazz.getName() ) ); - // 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(), sourceModelBuildingContext.getClassLoading() ); - // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // - process metadata-complete XML // - collect overlay XML @@ -424,7 +415,6 @@ public class MetadataBuildingProcess { final DomainModelCategorizationCollector modelCategorizationCollector = new DomainModelCategorizationCollector( areIdGeneratorsGlobal, metadataCollector.getGlobalRegistrations(), - jandexIndex, sourceModelBuildingContext ); @@ -458,7 +448,6 @@ public class MetadataBuildingProcess { return new DomainModelSource( classDetailsRegistry, - jandexIndex, allKnownClassNames, modelCategorizationCollector.getGlobalRegistrations(), rootMappingDefaults, @@ -491,31 +480,6 @@ public class MetadataBuildingProcess { } } - public static IndexView resolveJandexIndex( - List allKnownClassNames, - IndexView suppliedJandexIndex, - ClassLoading classLoading) { - // todo : we could build a new Jandex (Composite)Index that includes the `managedResources#getAnnotatedClassNames` - // and all classes from `managedResources#getXmlMappingBindings`. Only really worth it in the case - // of runtime enhancement. This would definitely need to be toggle-able. - // + - // For now, let's not as it does not matter for this PoC - if ( 1 == 1 ) { - return suppliedJandexIndex; - } - - final Indexer jandexIndexer = new Indexer(); - for ( String knownClassName : allKnownClassNames ) { - JandexIndexerHelper.apply( knownClassName, jandexIndexer, classLoading ); - } - - if ( suppliedJandexIndex == null ) { - return jandexIndexer.complete(); - } - - return CompositeIndex.create( suppliedJandexIndex, jandexIndexer.complete() ); - } - private static void processAdditionalMappingContributions( InFlightMetadataCollectorImpl metadataCollector, MetadataBuildingOptions options, diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/DomainModelSource.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/DomainModelSource.java index 10d7c1fbca..36a148c95f 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/DomainModelSource.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/annotations/DomainModelSource.java @@ -14,14 +14,11 @@ import org.hibernate.boot.models.spi.GlobalRegistrations; import org.hibernate.boot.models.xml.spi.PersistenceUnitMetadata; import org.hibernate.models.spi.ClassDetailsRegistry; -import org.jboss.jandex.IndexView; - /** * @author Steve Ebersole */ public class DomainModelSource { private final ClassDetailsRegistry classDetailsRegistry; - private final IndexView jandexIndex; private final GlobalRegistrations globalRegistrations; private final RootMappingDefaults effectiveMappingDefaults; private final PersistenceUnitMetadata persistenceUnitMetadata; @@ -29,13 +26,11 @@ public class DomainModelSource { public DomainModelSource( ClassDetailsRegistry classDetailsRegistry, - IndexView jandexIndex, List allKnownClassNames, GlobalRegistrations globalRegistrations, RootMappingDefaults effectiveMappingDefaults, PersistenceUnitMetadata persistenceUnitMetadata) { this.classDetailsRegistry = classDetailsRegistry; - this.jandexIndex = jandexIndex; this.allKnownClassNames = allKnownClassNames; this.globalRegistrations = globalRegistrations; this.effectiveMappingDefaults = effectiveMappingDefaults; @@ -46,10 +41,6 @@ public class DomainModelSource { return classDetailsRegistry; } - public IndexView getJandexIndex() { - return jandexIndex; - } - public GlobalRegistrations getGlobalRegistrations() { return globalRegistrations; } diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/CategorizedDomainModelImpl.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/CategorizedDomainModelImpl.java index 742fba4124..cd6335c9c9 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/CategorizedDomainModelImpl.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/internal/CategorizedDomainModelImpl.java @@ -15,8 +15,6 @@ import org.hibernate.models.spi.AnnotationDescriptorRegistry; import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.ClassDetailsRegistry; -import org.jboss.jandex.IndexView; - /** * @author Steve Ebersole */ @@ -28,13 +26,11 @@ public class CategorizedDomainModelImpl implements CategorizedDomainModel { private final ClassDetailsRegistry classDetailsRegistry; private final AnnotationDescriptorRegistry annotationDescriptorRegistry; - private final IndexView jandexIndex; private final PersistenceUnitMetadata persistenceUnitMetadata; public CategorizedDomainModelImpl( ClassDetailsRegistry classDetailsRegistry, AnnotationDescriptorRegistry annotationDescriptorRegistry, - IndexView jandexIndex, PersistenceUnitMetadata persistenceUnitMetadata, Set entityHierarchies, Map mappedSuperclasses, @@ -47,7 +43,6 @@ public class CategorizedDomainModelImpl implements CategorizedDomainModel { this.mappedSuperclasses = mappedSuperclasses; this.embeddables = embeddables; this.globalRegistrations = globalRegistrations; - this.jandexIndex = jandexIndex; } @Override @@ -60,11 +55,6 @@ public class CategorizedDomainModelImpl implements CategorizedDomainModel { return annotationDescriptorRegistry; } - @Override - public IndexView getJandexIndex() { - return jandexIndex; - } - @Override public PersistenceUnitMetadata getPersistenceUnitMetadata() { return persistenceUnitMetadata; diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/CategorizedDomainModel.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/CategorizedDomainModel.java index 4103c805c4..626e889310 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/CategorizedDomainModel.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/CategorizedDomainModel.java @@ -15,8 +15,6 @@ import org.hibernate.models.spi.AnnotationDescriptorRegistry; import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.ClassDetailsRegistry; -import org.jboss.jandex.IndexView; - /** * The application's domain model, understood at a very rudimentary level - we know * a class is an entity, a mapped-superclass, ... And we know about persistent attributes, @@ -38,8 +36,6 @@ public interface CategorizedDomainModel { */ AnnotationDescriptorRegistry getAnnotationDescriptorRegistry(); - IndexView getJandexIndex(); - PersistenceUnitMetadata getPersistenceUnitMetadata(); /** diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/ManagedResourcesProcessor.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/ManagedResourcesProcessor.java index b909baf9f7..b00d07e1cd 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/ManagedResourcesProcessor.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/ManagedResourcesProcessor.java @@ -30,15 +30,9 @@ 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.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; -import org.hibernate.models.spi.ClassLoading; - -import org.jboss.jandex.CompositeIndex; -import org.jboss.jandex.IndexView; -import org.jboss.jandex.Indexer; import static org.hibernate.boot.models.categorize.internal.EntityHierarchyBuilder.createEntityHierarchies; import static org.hibernate.internal.util.collections.CollectionHelper.mutableJoin; @@ -100,7 +94,6 @@ public class ManagedResourcesProcessor { // 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 BasicModelBuildingContextImpl sourceModelBuildingContext = new BasicModelBuildingContextImpl( classLoading, ModelsHelper::preFillRegistries @@ -131,7 +124,6 @@ public class ManagedResourcesProcessor { final DomainModelCategorizationCollector modelCategorizationCollector = new DomainModelCategorizationCollector( areIdGeneratorsGlobal, globalRegistrations, - jandexIndex, sourceModelBuildingContext ); @@ -222,31 +214,6 @@ public class ManagedResourcesProcessor { } } - public static IndexView resolveJandexIndex( - List allKnownClassNames, - IndexView suppliedJandexIndex, - ClassLoading classLoading) { - // todo : we could build a new Jandex (Composite)Index that includes the `managedResources#getAnnotatedClassNames` - // and all classes from `managedResources#getXmlMappingBindings`. Only really worth it in the case - // of runtime enhancement. This would definitely need to be toggle-able. - // + - // For now, let's not as it does not matter for this PoC - if ( 1 == 1 ) { - return suppliedJandexIndex; - } - - final Indexer jandexIndexer = new Indexer(); - for ( String knownClassName : allKnownClassNames ) { - JandexIndexerHelper.apply( knownClassName, jandexIndexer, classLoading ); - } - - if ( suppliedJandexIndex == null ) { - return jandexIndexer.complete(); - } - - return CompositeIndex.create( suppliedJandexIndex, jandexIndexer.complete() ); - } - /** * For testing use only */ diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/DomainModelCategorizationCollector.java b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/DomainModelCategorizationCollector.java index eb590b9d89..1448018ae3 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/DomainModelCategorizationCollector.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/DomainModelCategorizationCollector.java @@ -24,8 +24,6 @@ import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.ClassDetailsRegistry; import org.hibernate.models.spi.SourceModelBuildingContext; -import org.jboss.jandex.IndexView; - import jakarta.persistence.AttributeConverter; import jakarta.persistence.Converter; import jakarta.persistence.Embeddable; @@ -40,7 +38,6 @@ import jakarta.persistence.MappedSuperclass; public class DomainModelCategorizationCollector { private final boolean areIdGeneratorsGlobal; - private final IndexView jandexIndex; private final GlobalRegistrationsImpl globalRegistrations; private final SourceModelBuildingContext modelsContext; @@ -52,10 +49,8 @@ public class DomainModelCategorizationCollector { public DomainModelCategorizationCollector( boolean areIdGeneratorsGlobal, GlobalRegistrations globalRegistrations, - IndexView jandexIndex, SourceModelBuildingContext modelsContext) { this.areIdGeneratorsGlobal = areIdGeneratorsGlobal; - this.jandexIndex = jandexIndex; this.globalRegistrations = (GlobalRegistrationsImpl) globalRegistrations; this.modelsContext = modelsContext; } @@ -176,7 +171,6 @@ public class DomainModelCategorizationCollector { return new CategorizedDomainModelImpl( classDetailsRegistry, annotationDescriptorRegistry, - jandexIndex, persistenceUnitMetadata, entityHierarchies, mappedSuperclasses, diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/ModelsHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/ModelsHelper.java index 859f8e2ee5..7825e4a809 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/ModelsHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/ModelsHelper.java @@ -8,17 +8,11 @@ import java.util.function.Supplier; import org.hibernate.annotations.TenantId; import org.hibernate.models.internal.MutableClassDetailsRegistry; -import org.hibernate.models.internal.jdk.JdkBuilders; -import org.hibernate.models.jandex.internal.JandexClassDetails; -import org.hibernate.models.jandex.spi.JandexModelBuildingContext; -import org.hibernate.models.spi.AnnotationDescriptorRegistry; import org.hibernate.models.spi.ClassDetails; import org.hibernate.models.spi.ClassDetailsRegistry; import org.hibernate.models.spi.RegistryPrimer; import org.hibernate.models.spi.SourceModelBuildingContext; -import org.jboss.jandex.ClassInfo; -import org.jboss.jandex.IndexView; /** * @author Steve Ebersole @@ -29,38 +23,38 @@ public class ModelsHelper { buildingContext.getAnnotationDescriptorRegistry().getDescriptor( TenantId.class ); - if ( buildingContext instanceof JandexModelBuildingContext ) { - final IndexView jandexIndex = buildingContext.as( JandexModelBuildingContext.class ).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 ) - ); - } - - resolveClassDetails( - className, - classDetailsRegistry, - () -> new JandexClassDetails( knownClass, buildingContext ) - ); - } - } +// if ( buildingContext instanceof JandexModelBuildingContext ) { +// final IndexView jandexIndex = buildingContext.as( JandexModelBuildingContext.class ).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 ) +// ); +// } +// +// resolveClassDetails( +// className, +// classDetailsRegistry, +// () -> new JandexClassDetails( knownClass, buildingContext ) +// ); +// } +// } } public static ClassDetails resolveClassDetails( diff --git a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/OrmAnnotationHelper.java b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/OrmAnnotationHelper.java index 3930430e4d..8163a47252 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/models/internal/OrmAnnotationHelper.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/models/internal/OrmAnnotationHelper.java @@ -20,13 +20,10 @@ 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.SourceModelBuildingContext; -import org.jboss.jandex.AnnotationInstance; /** * @author Steve Ebersole @@ -72,22 +69,6 @@ public class OrmAnnotationHelper { return extractJdkValue( jdkAnnotation, attributeDescriptor, modelContext ); } - public static V extractJandexValue(AnnotationInstance jandexAnnotation, AttributeDescriptor attributeDescriptor, SourceModelBuildingContext modelContext) { - final JandexValueExtractor extractor = modelContext.as( JandexModelBuildingContext.class ) - .getJandexValueExtractor( attributeDescriptor.getTypeDescriptor() ); - return extractor.extractValue( jandexAnnotation, attributeDescriptor, modelContext ); -// final AnnotationValue value = jandexAnnotation.value( attributeDescriptor.getName() ); -// return attributeDescriptor -// .getTypeDescriptor() -// .createJandexValueConverter( modelContext ) -// .convert( value, modelContext ); - } - - public static V extractJandexValue(AnnotationInstance jandexAnnotation, AnnotationDescriptor annotationDescriptor, String attributeName, SourceModelBuildingContext modelContext) { - final AttributeDescriptor attributeDescriptor = annotationDescriptor.getAttribute( attributeName ); - return extractJandexValue( jandexAnnotation, attributeDescriptor, modelContext ); - } - public static List extractAnnotationTypeAnnotations(Class annotationType) { final ArrayList result = new ArrayList<>(); final Annotation[] annotationTypeAnnotations = annotationType.getAnnotations(); diff --git a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuilderImplementor.java b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuilderImplementor.java index 4f2bbc2753..421dc460f0 100644 --- a/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuilderImplementor.java +++ b/hibernate-core/src/main/java/org/hibernate/boot/spi/AbstractDelegatingMetadataBuilderImplementor.java @@ -23,8 +23,6 @@ import org.hibernate.query.sqm.function.SqmFunctionDescriptor; import org.hibernate.type.BasicType; import org.hibernate.usertype.UserType; -import org.jboss.jandex.IndexView; - import jakarta.persistence.AttributeConverter; import jakarta.persistence.SharedCacheMode; @@ -98,7 +96,7 @@ public abstract class AbstractDelegatingMetadataBuilderImplementorthe roadmap * * @return The Jandex index */ - IndexView getJandexView(); + Object getJandexView(); /** * Access to any SQL functions explicitly registered with the diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTestCase.java b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTestCase.java index 25bf9510cd..3c37b3f654 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTestCase.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/annotations/xml/ejb3/Ejb3XmlTestCase.java @@ -104,7 +104,6 @@ public abstract class Ejb3XmlTestCase extends BaseUnitTestCase { final DomainModelCategorizationCollector modelCategorizationCollector = new DomainModelCategorizationCollector( true, globalRegistrations, - null, modelBuildingContext ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/SourceModelTestHelper.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/SourceModelTestHelper.java index fe26378cbd..93756cc5ad 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/SourceModelTestHelper.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/SourceModelTestHelper.java @@ -297,7 +297,6 @@ public class SourceModelTestHelper { final DomainModelCategorizationCollector modelCategorizationCollector = new DomainModelCategorizationCollector( true, globalRegistrations, - jandexIndex, sourceModelBuildingContext ); diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/XmlProcessingSmokeTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/XmlProcessingSmokeTests.java index 6d691e1d50..49d273f682 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/XmlProcessingSmokeTests.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/XmlProcessingSmokeTests.java @@ -132,7 +132,6 @@ public class XmlProcessingSmokeTests { final DomainModelCategorizationCollector collector = new DomainModelCategorizationCollector( false, new GlobalRegistrationsImpl( buildingContext, new BootstrapContextImpl() ), - null, buildingContext ); collectedXmlResources.getDocuments().forEach( jaxbEntityMappings -> { diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/boot/BootstrapContextImpl.java b/hibernate-testing/src/main/java/org/hibernate/testing/boot/BootstrapContextImpl.java index e8a27766c7..0786040189 100644 --- a/hibernate-testing/src/main/java/org/hibernate/testing/boot/BootstrapContextImpl.java +++ b/hibernate-testing/src/main/java/org/hibernate/testing/boot/BootstrapContextImpl.java @@ -29,7 +29,6 @@ import org.hibernate.resource.beans.spi.BeanInstanceProducer; import org.hibernate.type.BasicType; import org.hibernate.type.spi.TypeConfiguration; -import org.jboss.jandex.IndexView; /** * @author Andrea Boriero @@ -121,7 +120,7 @@ public class BootstrapContextImpl implements BootstrapContext { } @Override - public IndexView getJandexView() { + public Object getJandexView() { return delegate.getJandexView(); }