* Global XML binding

* Design doc cleanup

Author: sebersole

design/annotation-xml-coverage-triage.adoc

@@ -21,9 +21,6 @@ current Hibernate ORM annotation binding.
 * `@Parent`
 * `@PartitionKey`
 * `@RowId`
-* `@SecondaryRow`
-* `@SoftDelete`
-* `@TenantId`
 * `@TimeZoneStorage`
 * `@TimeZoneColumn`
 * `@CreationTimestamp`
@@ -70,3 +67,13 @@ ordinary Java annotations.
 whether to repurpose it for XML/dynamic-model use or define a replacement.
 
 
+== Resolved / Covered Locally
+
+These items have local implementation and focused test coverage, so they should
+not be treated as open triage items unless a later parity audit finds a narrower
+gap.
+
+* `@SecondaryRow`
+* `@SoftDelete`
+* `@TenantId`
+

design/new-contributor-model-binding-guide.adoc

@@ -144,9 +144,11 @@ Touchpoint:
 The record has convenience factories for the source forms used by the PoC:
 
 * `AvailableResources.from(PersistenceUnitDescriptor, AvailableResourcesContext)`
+* `AvailableResources.from(PersistenceUnitDescriptor, AvailableResourcesContext, ResolvedBootstrapSettings)`
 * `AvailableResources.from(PersistenceConfiguration, AvailableResourcesContext)`
 * `AvailableResources.from(HibernatePersistenceConfiguration, AvailableResourcesContext)`
 * `AvailableResources.from(HibernatePersistenceConfiguration, AvailableResourcesContext, ResolvedBootstrapSettings)`
+* `AvailableResources.from(BootstrapSourceContributions, AvailableResourcesContext, ResolvedBootstrapSettings)`
 * `AvailableResources.from(MetadataSources, AvailableResourcesContext)`
 
 link:../src/main/java/org/hibernate/boot/models/source/AvailableResourcesContext.java[`AvailableResourcesContext`]

design/orm-bootstrap-direction.adoc

@@ -4,6 +4,16 @@
 This note captures the proposed direction for using this PoC to replace and simplify large parts of ORM bootstrap,
 especially the JPA path through `EntityManagerFactoryBuilderImpl`.
 
+[NOTE]
+====
+This is an early, historical direction note.
+
+The distilled current target is captured in
+link:session-factory-bootstrap-design.adoc[`session-factory-bootstrap-design.adoc`],
+and ongoing implementation status lives in
+link:session-factory-bootstrap-plan.adoc[`session-factory-bootstrap-plan.adoc`].
+====
+
 == Current ORM Shape
 
 From the JPA side, `EntityManagerFactoryBuilderImpl` currently handles several phases inline:
@@ -39,19 +49,18 @@ JpaBootstrapSettings
 BootstrapSourceContributions
 AvailableResources
 CategorizedDomainModel
-BoundMetadata
+ResolvedMetadata
 ----
 
 The intended flow is:
 
 [source]
 ----
 PersistenceUnitDescriptor / HibernatePersistenceConfiguration
-    -> JpaBootstrapSourceCollector
     -> BootstrapSourceContributions
     -> AvailableResources
     -> DomainModelCategorizer
-    -> BindingCoordinator
+    -> BindingCoordinator / MetadataResolver
 ----
 
 == Settings
@@ -83,7 +92,7 @@ Inputs:
 * persistence-unit class names
 * mapping file names
 * standard `META-INF/orm.xml`
-* explicit `HBM_XML_FILES`
+* [.line-through]#explicit `HBM_XML_FILES`#
 * scanner results
 * loaded classes
 * packages
@@ -101,8 +110,11 @@ It should contain:
 * resolved `ClassDetails` for managed classes
 * resolved package-info `ClassDetails`
 * XML bindings
-* dynamic model names/classes if needed
-* possibly extra query imports, either directly or as a sibling object
+
+Dynamic model names/classes are discovered during XML processing rather than
+stored as separate `AvailableResources` buckets.  Extra query imports should be
+represented explicitly by the caller/test infrastructure rather than folded into
+`AvailableResources`.
 
 It should not contain merged settings.
 
@@ -112,16 +124,8 @@ should be source-model oriented and normalized for categorization.
 
 == XML Preprocessing
 
-Move XML preprocessing behind `AvailableResources`.
-
-The short-term adapter is acceptable:
-
-[source]
-----
-AvailableResources -> ManagedResources adapter -> XmlPreProcessor
-----
-
-The intended direction is direct consumption:
+Move XML preprocessing behind `AvailableResources`.  The PoC now uses direct
+consumption:
 
 [source]
 ----
@@ -134,7 +138,7 @@ Categorization should consume normalized resources:
 
 [source]
 ----
-AvailableResources + BootstrapContext -> CategorizedDomainModel
+AvailableResources + MetadataBuildingContext -> CategorizedDomainModel
 ----
 
 This replaces the current ad hoc categorization work in `MetadataBuildingProcess.processManagedResources(...)`.
@@ -240,7 +244,7 @@ This is where the PoC’s DomainModelCategorizer belongs.
 
 [source]
 ----
-(AvailableResources + BootstrapContext) -> CategorizedDomainModel
+(AvailableResources + MetadataBuildingContext) -> CategorizedDomainModel
 ----
 
 This replaces the current ad hoc collection in MetadataBuildingProcess.processManagedResources(...).
@@ -274,23 +278,26 @@ AvailableResources should be normalized:
 * no setting merge concerns
 
 
-== Next PoC Slice
+== Historical PoC Slice
 
-Prototype this chain:
+The original next slice was:
 
 [source]
 ----
 PersistenceUnitDescriptor / HibernatePersistenceConfiguration
-    -> JpaBootstrapSourceCollector
+    -> BootstrapSourceContributions
     -> AvailableResources
     -> DomainModelCategorizer
 ----
 
-Do not wire binding yet.
+That slice is now covered locally and binding has also been wired through
+`MetadataResolver`.  Keep this section only as historical context for how the
+source/categorization work was first isolated.
 
-The test target should be:
+The original test target was:
 
 * Given JPA bootstrap inputs, the PoC derives the same available classes, packages, XML, and global registrations
   that ORM currently derives through `EntityManagerFactoryBuilderImpl` and `ManagedResources`
 
-This establishes a clean replacement boundary before touching binder and persister integration.
+That established the source/categorization replacement boundary before the PoC
+moved on to binder and SessionFactory integration.

design/remaining-binding-gaps.adoc

@@ -107,17 +107,42 @@ Prototype touchpoints:
 
 == Global Registrations and Named Objects
 
+Recently covered:
+
+* XML persistence-unit/global named query collection.
++
+Entity-level XML named queries are processed by ORM's XML model processor into
+annotation usages on the affected `ClassDetails`, and the current categorizer
+collects those annotation usages.  Root-level `<named-query/>`,
+`<named-native-query/>`, and `<named-stored-procedure-query/>` declarations live
+directly under `<entity-mappings/>`; these are now collected into the same
+global named-query registration maps.
+* XML `sql-result-set-mapping` collection.
+* XML HQL import collection from root-level `<import/>`.
+* XML database object collection from root-level `<database-object/>`.
+* XML fetch profile collection from root-level `<fetch-profile/>`.
+* Binding XML `sql-result-set-mapping` registrations into the metadata product.
+* Binding XML database object registrations into the metadata product.
+* Binding XML fetch profile registrations into the metadata product.
+
 Known remaining gaps:
 
-* XML named query collection/binding.
-* XML named entity graph collection/binding.
+* XML entity graph collection/binding should distinguish two cases:
++
+Entity-level XML graphs are processed into annotation usages on `ClassDetails`.
+Those annotation usages are collected, but the collected graph definition still
+uses a placeholder runtime creator.  If XML ever grows root-level graph
+declarations, they would need the same explicit root-level collection path as
+named queries.
 * Runtime graph creator integration for collected named entity graphs.
 
 Prototype touchpoints:
 
 * link:../src/main/java/org/hibernate/boot/models/categorize/internal/DomainModelCategorizationCollector.java[`DomainModelCategorizationCollector`]
 * link:../src/main/java/org/hibernate/boot/models/categorize/spi/GlobalRegistrations.java[`GlobalRegistrations`]
 * link:../src/main/java/org/hibernate/boot/models/categorize/spi/NamedQueryRegistration.java[`NamedQueryRegistration`]
+* link:../src/main/java/org/hibernate/boot/models/bind/spi/BindingCoordinator.java[`BindingCoordinator`]
+* link:../src/main/java/org/hibernate/boot/models/bind/spi/MetadataCollector.java[`MetadataCollector`]
 
 
 == Annotation and XML Coverage Triage

design/session-factory-bootstrap-plan.adoc

@@ -2092,8 +2092,6 @@ ResolvedBootstrapSettings + BootstrapSourceContributions + ServiceRegistry
     -> CategorizedDomainModel (*)
     -> BindingState (*)
     -> MetadataCollector
-    -> order columns
-    -> validate
     -> MetadataImplementor (*)
     -> ResolvedMetadata
 ----
@@ -2112,6 +2110,12 @@ state.  It intentionally does not carry `ResolvedBootstrapSettings`; settings
 remain input to metadata resolution and to later settings resolvers, not part of
 the metadata result.
 
+At the moment `MetadataResolver#finalizeMetadata` builds ORM's finalized
+`MetadataImpl` through `InFlightMetadataCollectorImpl#buildMetadataInstance`.
+Column ordering and validation are exercised by binding tests, but they are not
+yet permanently owned by `MetadataResolver`; that remains one of the follow-up
+questions above.
+
 Later slices should add one resolver per gross target rather than growing a
 single SessionFactory-wide orchestrator.
 

src/main/java/org/hibernate/boot/models/bind/internal/BindingStateImpl.java

@@ -12,6 +12,7 @@
 import org.hibernate.boot.model.IdentifierGeneratorDefinition;
 import org.hibernate.boot.model.NamedEntityGraphDefinition;
 import org.hibernate.boot.model.convert.spi.RegisteredConversion;
+import org.hibernate.boot.model.relational.AuxiliaryDatabaseObject;
 import org.hibernate.boot.model.naming.Identifier;
 import org.hibernate.boot.model.relational.Database;
 import org.hibernate.boot.models.bind.internal.binders.AssociationTableBinding;
@@ -37,6 +38,7 @@
 import org.hibernate.boot.models.categorize.spi.FilterDefRegistration;
 import org.hibernate.boot.models.categorize.spi.IdentifiableTypeMetadata;
 import org.hibernate.boot.models.categorize.spi.ManagedTypeMetadata;
+import org.hibernate.boot.query.NamedResultSetMappingDescriptor;
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.engine.jdbc.spi.JdbcServices;
 import org.hibernate.engine.spi.FilterDefinition;
@@ -46,6 +48,7 @@
 import org.hibernate.metamodel.spi.EmbeddableInstantiator;
 import org.hibernate.metamodel.mapping.JdbcMapping;
 import org.hibernate.mapping.Collection;
+import org.hibernate.mapping.FetchProfile;
 import org.hibernate.mapping.Join;
 import org.hibernate.mapping.MappedSuperclass;
 import org.hibernate.mapping.PersistentClass;
@@ -164,6 +167,26 @@ public void addNamedEntityGraph(NamedEntityGraphDefinition namedEntityGraphDefin
 		metadataCollector.addNamedEntityGraph( namedEntityGraphDefinition );
 	}
 
+	@Override
+	public void addResultSetMapping(NamedResultSetMappingDescriptor resultSetMappingDescriptor) {
+		metadataCollector.addResultSetMapping( resultSetMappingDescriptor );
+	}
+
+	@Override
+	public void addFetchProfile(FetchProfile fetchProfile) {
+		metadataCollector.addFetchProfile( fetchProfile );
+	}
+
+	@Override
+	public FetchProfile getFetchProfile(String name) {
+		return metadataCollector.getFetchProfile( name );
+	}
+
+	@Override
+	public void addAuxiliaryDatabaseObject(AuxiliaryDatabaseObject auxiliaryDatabaseObject) {
+		metadataCollector.addAuxiliaryDatabaseObject( auxiliaryDatabaseObject );
+	}
+
 	@Override
 	public void addAttributeConverter(Class<? extends AttributeConverter<?, ?>> converterClass) {
 		metadataCollector.addAttributeConverter( converterClass );

src/main/java/org/hibernate/boot/models/bind/internal/InFlightMetadataCollectorAdapter.java

@@ -9,10 +9,13 @@
 import org.hibernate.boot.model.IdentifierGeneratorDefinition;
 import org.hibernate.boot.model.NamedEntityGraphDefinition;
 import org.hibernate.boot.model.convert.spi.RegisteredConversion;
+import org.hibernate.boot.model.relational.AuxiliaryDatabaseObject;
 import org.hibernate.boot.models.bind.spi.MetadataCollector;
+import org.hibernate.boot.query.NamedResultSetMappingDescriptor;
 import org.hibernate.boot.spi.InFlightMetadataCollector;
 import org.hibernate.engine.spi.FilterDefinition;
 import org.hibernate.mapping.Collection;
+import org.hibernate.mapping.FetchProfile;
 import org.hibernate.mapping.MappedSuperclass;
 import org.hibernate.mapping.PersistentClass;
 import org.hibernate.metamodel.CollectionClassification;
@@ -74,6 +77,26 @@ public void addNamedEntityGraph(NamedEntityGraphDefinition namedEntityGraphDefin
 		metadataCollector.addNamedEntityGraph( namedEntityGraphDefinition );
 	}
 
+	@Override
+	public void addResultSetMapping(NamedResultSetMappingDescriptor resultSetMappingDescriptor) {
+		metadataCollector.addResultSetMapping( resultSetMappingDescriptor );
+	}
+
+	@Override
+	public void addFetchProfile(FetchProfile fetchProfile) {
+		metadataCollector.addFetchProfile( fetchProfile );
+	}
+
+	@Override
+	public FetchProfile getFetchProfile(String name) {
+		return metadataCollector.getFetchProfile( name );
+	}
+
+	@Override
+	public void addAuxiliaryDatabaseObject(AuxiliaryDatabaseObject auxiliaryDatabaseObject) {
+		metadataCollector.addAuxiliaryDatabaseObject( auxiliaryDatabaseObject );
+	}
+
 	@Override
 	public void addAttributeConverter(Class<? extends AttributeConverter<?, ?>> converterClass) {
 		metadataCollector.addAttributeConverter( converterClass );