HHH-17460 - Ongoing JPA 32 work

Author: sebersole

hibernate-core/hibernate-core.gradle

@@ -31,7 +31,6 @@ dependencies {
     implementation libs.jandex
     implementation libs.classmate
     implementation libs.byteBuddy
-    implementation libs.hcann
 
     implementation jakartaLibs.jaxbApi
     implementation jakartaLibs.jaxb

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

@@ -13,8 +13,6 @@
 import java.util.Map;
 
 import org.hibernate.AssertionFailure;
-import org.hibernate.annotations.common.reflection.ReflectionManager;
-import org.hibernate.annotations.common.reflection.java.JavaReflectionManager;
 import org.hibernate.boot.CacheRegionDefinition;
 import org.hibernate.boot.archive.scan.internal.StandardScanOptions;
 import org.hibernate.boot.archive.scan.spi.ScanEnvironment;
@@ -23,7 +21,6 @@
 import org.hibernate.boot.archive.spi.ArchiveDescriptorFactory;
 import org.hibernate.boot.model.TypeBeanInstanceProducer;
 import org.hibernate.boot.model.convert.spi.ConverterDescriptor;
-import org.hibernate.boot.model.internal.JPAXMLOverriddenMetadataProvider;
 import org.hibernate.boot.model.relational.AuxiliaryDatabaseObject;
 import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
@@ -64,7 +61,6 @@ public class BootstrapContextImpl implements BootstrapContext {
 
 	private boolean isJpaBootstrap;
 
-	private final JavaReflectionManager hcannReflectionManager;
 	private final ClassmateContext classmateContext;
 
 	private ScanOptions scanOptions;
@@ -88,7 +84,6 @@ public BootstrapContextImpl(
 		this.metadataBuildingOptions = metadataBuildingOptions;
 
 		this.classLoaderAccess = new ClassLoaderAccessImpl( serviceRegistry.getService( ClassLoaderService.class ) );
-		this.hcannReflectionManager = generateHcannReflectionManager();
 
 		final StrategySelector strategySelector = serviceRegistry.requireService( StrategySelector.class );
 		final ConfigurationService configService = serviceRegistry.requireService( ConfigurationService.class );
@@ -188,11 +183,6 @@ public Object getScanner() {
 		return scannerSetting;
 	}
 
-	@Override
-	public ReflectionManager getReflectionManager() {
-		return hcannReflectionManager;
-	}
-
 	@Override
 	public IndexView getJandexView() {
 		return jandexView;
@@ -338,11 +328,4 @@ public void addCacheRegionDefinition(CacheRegionDefinition cacheRegionDefinition
 		}
 		cacheRegionDefinitions.add( cacheRegionDefinition );
 	}
-
-	private JavaReflectionManager generateHcannReflectionManager() {
-		final JavaReflectionManager reflectionManager = new JavaReflectionManager();
-		reflectionManager.setMetadataProvider( new JPAXMLOverriddenMetadataProvider( this ) );
-		return reflectionManager;
-	}
-
 }

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

@@ -29,7 +29,6 @@
 import org.hibernate.annotations.CollectionTypeRegistration;
 import org.hibernate.annotations.Imported;
 import org.hibernate.annotations.Parameter;
-import org.hibernate.annotations.common.reflection.XClass;
 import org.hibernate.boot.CacheRegionDefinition;
 import org.hibernate.boot.SessionFactoryBuilder;
 import org.hibernate.boot.model.IdentifierGeneratorDefinition;
@@ -1318,7 +1317,7 @@ public void addAuxiliaryDatabaseObject(AuxiliaryDatabaseObject auxiliaryDatabase
 	private final Map<String,AnnotatedClassType> annotatedClassTypeMap = new HashMap<>();
 
 	@Override
-	public AnnotatedClassType getClassType(XClass clazz) {
+	public AnnotatedClassType getClassType(ClassDetails clazz) {
 		AnnotatedClassType type = annotatedClassTypeMap.get( clazz.getName() );
 		if ( type == null ) {
 			return addClassType( clazz );
@@ -1329,13 +1328,13 @@ public AnnotatedClassType getClassType(XClass clazz) {
 	}
 
 	@Override
-	public AnnotatedClassType addClassType(XClass clazz) {
+	public AnnotatedClassType addClassType(ClassDetails clazz) {
 		final AnnotatedClassType type = getAnnotatedClassType(clazz);
 		annotatedClassTypeMap.put( clazz.getName(), type );
 		return type;
 	}
 
-	private static AnnotatedClassType getAnnotatedClassType(XClass clazz) {
+	private static AnnotatedClassType getAnnotatedClassType(ClassDetails clazz) {
 		if ( clazz.isAnnotationPresent( Entity.class ) ) {
 			if ( clazz.isAnnotationPresent( Embeddable.class ) ) {
 				throw new AnnotationException( "Invalid class annotated both '@Entity' and '@Embeddable': '" + clazz.getName() + "'" );

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

@@ -11,7 +11,6 @@
 import java.util.Map;
 
 import org.hibernate.HibernateException;
-import org.hibernate.annotations.common.reflection.XProperty;
 import org.hibernate.boot.model.convert.spi.AutoApplicableConverterDescriptor;
 import org.hibernate.boot.model.convert.spi.ConverterDescriptor;
 import org.hibernate.boot.spi.MetadataBuildingContext;

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

@@ -79,8 +79,6 @@ public final class AnnotationBinder {
 	private AnnotationBinder() {}
 
 	public static void bindDefaults(MetadataBuildingContext context) {
-		// todo (jpa32) - remove this.  left for now for easy debugging
-		final Map<?,?> defaults = context.getBootstrapContext().getReflectionManager().getDefaults();
 		final GlobalRegistrations globalRegistrations = context.getMetadataCollector().getGlobalRegistrations();
 
 		// id generators ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

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

@@ -75,7 +75,6 @@
 import org.hibernate.annotations.Synchronize;
 import org.hibernate.annotations.Where;
 import org.hibernate.annotations.WhereJoinTable;
-import org.hibernate.annotations.common.reflection.ReflectionManager;
 import org.hibernate.boot.BootLogging;
 import org.hibernate.boot.model.IdentifierGeneratorDefinition;
 import org.hibernate.boot.model.TypeDefinition;
@@ -500,7 +499,6 @@ private static String handleTargetEntity(
 					+ "' is annotated both '@OneToMany' and '@ManyToMany'" );
 		}
 		final String mappedBy;
-		final ReflectionManager reflectionManager = context.getBootstrapContext().getReflectionManager();
 		if ( oneToManyAnn != null ) {
 			if ( joinColumns.isSecondary() ) {
 				throw new AnnotationException( "Collection '" + getPath( propertyHolder, inferredData )