#50 - Pre-process and categorize id mappings from EntityHierarchy

sebersole · Oct 30, 2023 · f5ccef4 · f5ccef4
1 parent 044ad96
commit f5ccef4
Show file tree

Hide file tree

Showing 46 changed files with 1,223 additions and 646 deletions.
diff --git a/...e-models-orm/src/main/java/org/hibernate/models/orm/bind/internal/BindingContextImpl.java b/...e-models-orm/src/main/java/org/hibernate/models/orm/bind/internal/BindingContextImpl.java
@@ -10,6 +10,7 @@
 import org.hibernate.boot.spi.BootstrapContext;
 import org.hibernate.models.orm.bind.spi.BindingContext;
 import org.hibernate.models.orm.categorize.spi.CategorizedDomainModel;
+import org.hibernate.models.orm.categorize.spi.GlobalRegistrations;
 import org.hibernate.models.source.spi.AnnotationDescriptorRegistry;
 import org.hibernate.models.source.spi.ClassDetailsRegistry;
 
@@ -21,13 +22,15 @@
 public class BindingContextImpl implements BindingContext {
 	private final ClassDetailsRegistry classDetailsRegistry;
 	private final AnnotationDescriptorRegistry annotationDescriptorRegistry;
+	private final GlobalRegistrations globalRegistrations;
 	private final ClassmateContext classmateContext;
 	private final SharedCacheMode sharedCacheMode;
 
 	public BindingContextImpl(CategorizedDomainModel categorizedDomainModel, BootstrapContext bootstrapContext) {
 		this(
 				categorizedDomainModel.getClassDetailsRegistry(),
 				categorizedDomainModel.getAnnotationDescriptorRegistry(),
+				categorizedDomainModel.getGlobalRegistrations(),
 				bootstrapContext.getClassmateContext(),
 				bootstrapContext.getMetadataBuildingOptions().getSharedCacheMode()
 		);
@@ -36,17 +39,20 @@ public BindingContextImpl(CategorizedDomainModel categorizedDomainModel, Bootstr
 	public BindingContextImpl(
 			ClassDetailsRegistry classDetailsRegistry,
 			AnnotationDescriptorRegistry annotationDescriptorRegistry,
+			GlobalRegistrations globalRegistrations,
 			ClassmateContext classmateContext) {
-		this( classDetailsRegistry, annotationDescriptorRegistry, classmateContext, SharedCacheMode.UNSPECIFIED );
+		this( classDetailsRegistry, annotationDescriptorRegistry, globalRegistrations, classmateContext, SharedCacheMode.UNSPECIFIED );
 	}
 
 	public BindingContextImpl(
 			ClassDetailsRegistry classDetailsRegistry,
 			AnnotationDescriptorRegistry annotationDescriptorRegistry,
+			GlobalRegistrations globalRegistrations,
 			ClassmateContext classmateContext,
 			SharedCacheMode sharedCacheMode) {
 		this.classDetailsRegistry = classDetailsRegistry;
 		this.annotationDescriptorRegistry = annotationDescriptorRegistry;
+		this.globalRegistrations = globalRegistrations;
 		this.classmateContext = classmateContext;
 		this.sharedCacheMode = sharedCacheMode;
 	}
@@ -61,6 +67,11 @@ public AnnotationDescriptorRegistry getAnnotationDescriptorRegistry() {
 		return annotationDescriptorRegistry;
 	}
 
+	@Override
+	public GlobalRegistrations getGlobalRegistrations() {
+		return globalRegistrations;
+	}
+
 	@Override
 	public ClassmateContext getClassmateContext() {
 		return classmateContext;

diff --git a/...odels-orm/src/main/java/org/hibernate/models/orm/bind/internal/HierarchyMetadataImpl.java b/...odels-orm/src/main/java/org/hibernate/models/orm/bind/internal/HierarchyMetadataImpl.java
diff --git a/...-orm/src/main/java/org/hibernate/models/orm/bind/internal/HierarchyMetadataProcessor.java b/...-orm/src/main/java/org/hibernate/models/orm/bind/internal/HierarchyMetadataProcessor.java
diff --git a/hibernate-models-orm/src/main/java/org/hibernate/models/orm/bind/spi/BindingContext.java b/hibernate-models-orm/src/main/java/org/hibernate/models/orm/bind/spi/BindingContext.java
@@ -7,6 +7,7 @@
 package org.hibernate.models.orm.bind.spi;
 
 import org.hibernate.boot.internal.ClassmateContext;
+import org.hibernate.models.orm.categorize.spi.GlobalRegistrations;
 import org.hibernate.models.source.spi.AnnotationDescriptorRegistry;
 import org.hibernate.models.source.spi.ClassDetailsRegistry;
 
@@ -24,6 +25,8 @@ public interface BindingContext {
 
 	AnnotationDescriptorRegistry getAnnotationDescriptorRegistry();
 
+	GlobalRegistrations getGlobalRegistrations();
+
 	ClassmateContext getClassmateContext();
 
 	SharedCacheMode getSharedCacheMode();

diff --git a/hibernate-models-orm/src/main/java/org/hibernate/models/orm/bind/spi/BindingCoordinator.java b/hibernate-models-orm/src/main/java/org/hibernate/models/orm/bind/spi/BindingCoordinator.java
@@ -6,8 +6,17 @@
  */
 package org.hibernate.models.orm.bind.spi;
 
-import org.hibernate.models.orm.bind.internal.HierarchyMetadataProcessor;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.hibernate.models.orm.categorize.spi.CategorizedDomainModel;
+import org.hibernate.models.orm.categorize.spi.GlobalRegistrations;
+import org.hibernate.models.orm.categorize.spi.IdentifiableTypeMetadata;
+import org.hibernate.models.orm.categorize.spi.JpaEventListener;
+import org.hibernate.models.source.spi.ClassDetails;
+
+import jakarta.persistence.ExcludeDefaultListeners;
+import jakarta.persistence.ExcludeSuperclassListeners;
 
 /**
  * Responsible for processing {@linkplain org.hibernate.boot.model.process.spi.ManagedResources managed-resources}
@@ -27,7 +36,6 @@ public static void coordinateBinding(
 			CategorizedDomainModel categorizedDomainModel,
 			BindingOptions options,
 			BindingContext bindingContext) {
-		HierarchyMetadataProcessor.preBindHierarchyAttributes( categorizedDomainModel, bindingContext );
 //		Processor.process( managedResources, bindingContext, options );
 	}
 }
diff --git a/hibernate-models-orm/src/main/java/org/hibernate/models/orm/bind/spi/HierarchyMetadata.java b/hibernate-models-orm/src/main/java/org/hibernate/models/orm/bind/spi/HierarchyMetadata.java
diff --git a/...te-models-orm/src/main/java/org/hibernate/models/orm/bind/spi/NonAggregatedIdMapping.java b/...te-models-orm/src/main/java/org/hibernate/models/orm/bind/spi/NonAggregatedIdMapping.java