HHH-17460 - Ongoing JPA 32 work

HHH-17892 - Remove @Persister
HHH-17893 - Remove MetadataContributor
HHH-17894 - Remove AdditionalJaxbMappingProducer

Author: sebersole

documentation/src/main/asciidoc/userguide/chapters/domain/entity.adoc

@@ -552,34 +552,3 @@ include::{example-dir-proxy}/concrete/AbstractConcreteProxyTest.java[tag=entity-
 include::{extrasdir}/entity/entity-concrete-proxy-reference.sql[]
 ----
 ====
-
-[[entity-persister]]
-==== Define a custom entity persister
-
-The https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/annotations/Persister.html[`@Persister`] annotation is used to specify a custom entity or collection persister.
-
-For entities, the custom persister must implement the https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/persister/entity/EntityPersister.html[`EntityPersister`] interface.
-
-For collections, the custom persister must implement the https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibernate/persister/collection/CollectionPersister.html[`CollectionPersister`] interface.
-
-NOTE: Supplying a custom persister has been allowed historically, but has never been fully supported.
-Hibernate 6 provides better, alternative ways to accomplish the use cases for a custom persister.  As
-of 6.2 `@Persister` has been formally deprecated.
-
-
-[[entity-persister-mapping]]
-.Entity persister mapping
-====
-[source,java]
-----
-include::{example-dir-persister}/Author.java[tag=entity-persister-mapping,indent=0]
-----
-
-[source,java]
-----
-include::{example-dir-persister}/Book.java[tag=entity-persister-mapping,indent=0]
-----
-====
-
-By providing your own `EntityPersister` and `CollectionPersister` implementations,
-you can control how entities and collections are persisted into the database.

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

@@ -59,14 +59,13 @@
 import org.hibernate.boot.registry.StandardServiceRegistry;
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
 import org.hibernate.boot.registry.classloading.spi.ClassLoadingException;
-import org.hibernate.boot.spi.AdditionalJaxbMappingProducer;
 import org.hibernate.boot.spi.AdditionalMappingContributions;
 import org.hibernate.boot.spi.AdditionalMappingContributor;
 import org.hibernate.boot.spi.BootstrapContext;
+import org.hibernate.boot.spi.EffectiveMappingDefaults;
 import org.hibernate.boot.spi.InFlightMetadataCollector;
 import org.hibernate.boot.spi.MappingDefaults;
 import org.hibernate.boot.spi.MetadataBuildingOptions;
-import org.hibernate.boot.spi.MetadataContributor;
 import org.hibernate.boot.spi.MetadataImplementor;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.cfg.MetadataSourceType;
@@ -236,7 +235,6 @@ public static MetadataImplementor complete(
 		);
 
 		processAdditionalMappingContributions( metadataCollector, options, classLoaderService, rootMetadataBuildingContext );
-		processAdditionalJaxbMappingProducer( metadataCollector, options, jandexView, classLoaderService, rootMetadataBuildingContext );
 
 		applyExtraQueryImports( managedResources, metadataCollector );
 
@@ -381,11 +379,6 @@ public void finishUp() {
 
 		processor.processResultSetMappings();
 
-		for ( MetadataContributor contributor : classLoaderService.loadJavaServices( MetadataContributor.class ) ) {
-			log.tracef( "Calling MetadataContributor : %s", contributor );
-			contributor.contribute( metadataCollector, jandexView );
-		}
-
 		metadataCollector.processSecondPasses( rootMetadataBuildingContext );
 
 		// Make sure collections are fully bound before processing named queries as hbm result set mappings require it
@@ -759,6 +752,11 @@ public void contributeAuxiliaryDatabaseObject(AuxiliaryDatabaseObject auxiliaryD
 			metadataCollector.addAuxiliaryDatabaseObject( auxiliaryDatabaseObject );
 		}
 
+		@Override
+		public EffectiveMappingDefaults getEffectiveMappingDefaults() {
+			return rootMetadataBuildingContext.getEffectiveDefaults();
+		}
+
 		public void complete() {
 			// annotations / orm.xml
 			if ( additionalEntityClasses != null || additionalClassDetails != null || additionalJaxbMappings != null ) {
@@ -781,51 +779,6 @@ public void complete() {
 		}
 	}
 
-	private static void processAdditionalJaxbMappingProducer(
-			InFlightMetadataCollectorImpl metadataCollector,
-			MetadataBuildingOptions options,
-			IndexView jandexView,
-			ClassLoaderService classLoaderService,
-			MetadataBuildingContextRootImpl rootMetadataBuildingContext) {
-		if ( options.isXmlMappingEnabled() ) {
-			final Iterable<AdditionalJaxbMappingProducer> producers = classLoaderService.loadJavaServices( AdditionalJaxbMappingProducer.class );
-			if ( producers != null ) {
-				final EntityHierarchyBuilder hierarchyBuilder = new EntityHierarchyBuilder();
-				final MappingBinder mappingBinder = new MappingBinder(
-						classLoaderService,
-						new MappingBinder.Options() {
-							@Override
-							public boolean validateMappings() {
-								return false;
-							}
-
-							@Override
-							public boolean transformHbmMappings() {
-								return false;
-							}
-						}
-				);
-				//noinspection deprecation
-				for ( AdditionalJaxbMappingProducer producer : producers ) {
-					log.tracef( "Calling AdditionalJaxbMappingProducer : %s", producer );
-					Collection<MappingDocument> additionalMappings = producer.produceAdditionalMappings(
-							metadataCollector,
-							jandexView,
-							mappingBinder,
-							rootMetadataBuildingContext
-					);
-					for ( MappingDocument mappingDocument : additionalMappings ) {
-						hierarchyBuilder.indexMappingDocument( mappingDocument );
-					}
-				}
-
-				ModelBinder binder = ModelBinder.prepare( rootMetadataBuildingContext );
-				for ( EntityHierarchySourceImpl entityHierarchySource : hierarchyBuilder.buildHierarchies() ) {
-					binder.bindEntityHierarchy( entityHierarchySource );
-				}
-			}
-		}
-	}
 
 	private static void applyExtraQueryImports(
 			ManagedResources managedResources,

hibernate-core/src/main/java/org/hibernate/boot/models/HibernateAnnotations.java

@@ -140,7 +140,6 @@ public interface HibernateAnnotations {
 	AnnotationDescriptor<Parameter> PARAMETER = createOrmDescriptor( Parameter.class );
 	AnnotationDescriptor<Parent> PARENT = createOrmDescriptor( Parent.class );
 	AnnotationDescriptor<PartitionKey> PARTITION_KEY = createOrmDescriptor( PartitionKey.class );
-	AnnotationDescriptor<Persister> PERSISTER = createOrmDescriptor( Persister.class );
 	AnnotationDescriptor<Polymorphism> POLYMORPHISM = createOrmDescriptor( Polymorphism.class );
 	AnnotationDescriptor<Proxy> PROXY = createOrmDescriptor( Proxy.class );
 	AnnotationDescriptor<RowId> ROW_ID = createOrmDescriptor( RowId.class );

hibernate-core/src/main/java/org/hibernate/boot/spi/AdditionalJaxbMappingProducer.java

@@ -69,4 +69,6 @@ public interface AdditionalMappingContributions {
 	 * Contribute a materialized AuxiliaryDatabaseObject
 	 */
 	void contributeAuxiliaryDatabaseObject(AuxiliaryDatabaseObject auxiliaryDatabaseObject);
+
+	EffectiveMappingDefaults getEffectiveMappingDefaults();
 }