HHH-17941 - Apply incremental categorization to "annotation binding" …

…- managed-type and persistent-attribute metadata
hibernate · Apr 19, 2024 · 3ff8db9 · 3ff8db9
1 parent 827b194
commit 3ff8db9
Show file tree

Hide file tree

Showing 19 changed files with 26 additions and 26 deletions.
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/CategorizedDomainModel.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/CategorizedDomainModel.java
@@ -51,13 +51,13 @@ public interface CategorizedDomainModel extends SourceModelContext {
 	/**
 	 * All entity hierarchies defined in the persistence unit
 	 */
-	EntityHierarchyCollection getEntityHierarchies();
+	EntityHierarchyCollection getEntityHierarchyCollection();
 
 	/**
-	 * Iteration over the {@linkplain #getEntityHierarchies() entity hierarchies}
+	 * Iteration over the {@linkplain #getEntityHierarchyCollection() entity hierarchies}
 	 */
 	default void forEachEntityHierarchy(IndexedConsumer<EntityHierarchy> hierarchyConsumer) {
-		final Collection<EntityHierarchy> entityHierarchies = getEntityHierarchies().getHierarchies();
+		final Collection<EntityHierarchy> entityHierarchies = getEntityHierarchyCollection().getHierarchies();
 		if ( entityHierarchies.isEmpty() ) {
 			return;
 		}

diff --git a/...ate-core/src/test/java/org/hibernate/orm/test/boot/models/CategorizedDomainModelImpl.java b/...ate-core/src/test/java/org/hibernate/orm/test/boot/models/CategorizedDomainModelImpl.java
@@ -66,7 +66,7 @@ public GlobalRegistrations getGlobalRegistrations() {
 	}
 
 	@Override
-	public EntityHierarchyCollection getEntityHierarchies() {
+	public EntityHierarchyCollection getEntityHierarchyCollection() {
 		return entityHierarchies;
 	}
 

diff --git a/...st/java/org/hibernate/orm/test/boot/models/categorize/access/CrossRuntimeAccessTests.java b/...st/java/org/hibernate/orm/test/boot/models/categorize/access/CrossRuntimeAccessTests.java
@@ -45,7 +45,7 @@ void testCategorization(ServiceRegistryScope scope) {
 				CrossRuntimeAccessEntity.class
 		);
 
-		assertThat( categorizedDomainModel.getEntityHierarchies().getHierarchies() ).hasSize( 1 );
+		assertThat( categorizedDomainModel.getEntityHierarchyCollection().getHierarchies() ).hasSize( 1 );
 		categorizedDomainModel.forEachEntityHierarchy( (index, entityHierarchy) -> {
 			final EntityTypeMetadata hierarchyRoot = entityHierarchy.getRoot();
 

diff --git a/...va/org/hibernate/orm/test/boot/models/categorize/access/HierarchyClassIsolationTests.java b/...va/org/hibernate/orm/test/boot/models/categorize/access/HierarchyClassIsolationTests.java
@@ -105,7 +105,7 @@ void testImplicitFieldAccess() {
 	void testCategorization(ServiceRegistryScope scope) {
 		final CategorizedDomainModel categorizedDomainModel = CategorizationTestsHelper.buildCategorizedDomainModel( scope, Root.class, Base.class, Level1.class );
 
-		final EntityHierarchyCollection entityHierarchies = categorizedDomainModel.getEntityHierarchies();
+		final EntityHierarchyCollection entityHierarchies = categorizedDomainModel.getEntityHierarchyCollection();
 		assertThat( entityHierarchies.getHierarchies() ).hasSize( 1 );
 		final EntityHierarchy entityHierarchy = entityHierarchies.getHierarchies().iterator().next();
 		final EntityTypeMetadata rootEntityDescriptor = entityHierarchy.getRoot();

diff --git a/.../src/test/java/org/hibernate/orm/test/boot/models/process/ManagedResourcesSmokeTests.java b/.../src/test/java/org/hibernate/orm/test/boot/models/process/ManagedResourcesSmokeTests.java
@@ -68,7 +68,7 @@ void testCategorization() {
 					bootstrapContext
 			);
 
-			final Collection<EntityHierarchy> entityHierarchies = categorizedDomainModel.getEntityHierarchies().getHierarchies();
+			final Collection<EntityHierarchy> entityHierarchies = categorizedDomainModel.getEntityHierarchyCollection().getHierarchies();
 			assertThat( entityHierarchies ).hasSize( 1 );
 			final EntityHierarchy entityHierarchy = entityHierarchies.iterator().next();
 			final EntityTypeMetadata entityDescriptor = entityHierarchy.getRoot();

diff --git a/...e-core/src/test/java/org/hibernate/orm/test/boot/models/process/SimpleProcessorTests.java b/...e-core/src/test/java/org/hibernate/orm/test/boot/models/process/SimpleProcessorTests.java
@@ -81,8 +81,8 @@ void testSimpleUsage() {
 			final BootstrapContextTesting bootstrapContext = new BootstrapContextTesting( jandexIndex, serviceRegistry, metadataBuildingOptions );
 			final CategorizedDomainModel categorizedDomainModel = ManagedResourcesProcessor.processManagedResources( managedResources, bootstrapContext );
 
-			assertThat( categorizedDomainModel.getEntityHierarchies().getHierarchies() ).hasSize( 2 );
-			final Iterator<EntityHierarchy> hierarchies = categorizedDomainModel.getEntityHierarchies().getHierarchies().iterator();
+			assertThat( categorizedDomainModel.getEntityHierarchyCollection().getHierarchies() ).hasSize( 2 );
+			final Iterator<EntityHierarchy> hierarchies = categorizedDomainModel.getEntityHierarchyCollection().getHierarchies().iterator();
 			final EntityHierarchy one = hierarchies.next();
 			final EntityHierarchy two = hierarchies.next();
 

diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/attr/AnyTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/attr/AnyTests.java
@@ -61,7 +61,7 @@ void testSimpleAnyAttribute(ServiceRegistryScope scope) {
 				bootstrapContext
 		);
 
-		final Collection<EntityHierarchy> hierarchies = categorizedDomainModel.getEntityHierarchies().getHierarchies();
+		final Collection<EntityHierarchy> hierarchies = categorizedDomainModel.getEntityHierarchyCollection().getHierarchies();
 		assertThat( hierarchies ).hasSize( 3 );
 		final EntityHierarchy entity3Hierarchy = hierarchies
 				.stream()

diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/attr/ManyToOneTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/attr/ManyToOneTests.java
@@ -65,7 +65,7 @@ void testSimpleManyToOne(ServiceRegistryScope scope) {
 				bootstrapContext
 		);
 
-		final Collection<EntityHierarchy> hierarchies = categorizedDomainModel.getEntityHierarchies().getHierarchies();
+		final Collection<EntityHierarchy> hierarchies = categorizedDomainModel.getEntityHierarchyCollection().getHierarchies();
 		assertThat( hierarchies ).hasSize( 1 );
 
 		final EntityHierarchy hierarchy = hierarchies.iterator().next();

diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/column/ColumnTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/column/ColumnTests.java
@@ -48,7 +48,7 @@ void testCompleteColumn(ServiceRegistryScope scope) {
 				bootstrapContext
 		);
 
-		final Collection<EntityHierarchy> hierarchies = categorizedDomainModel.getEntityHierarchies().getHierarchies();
+		final Collection<EntityHierarchy> hierarchies = categorizedDomainModel.getEntityHierarchyCollection().getHierarchies();
 		assertThat( hierarchies ).hasSize( 1 );
 
 		final EntityHierarchy hierarchy = hierarchies.iterator().next();
@@ -82,7 +82,7 @@ void testOverrideColumn(ServiceRegistryScope scope) {
 				bootstrapContext
 		);
 
-		final Collection<EntityHierarchy> hierarchies = categorizedDomainModel.getEntityHierarchies().getHierarchies();
+		final Collection<EntityHierarchy> hierarchies = categorizedDomainModel.getEntityHierarchyCollection().getHierarchies();
 		assertThat( hierarchies ).hasSize( 1 );
 
 		final EntityHierarchy hierarchy = hierarchies.iterator().next();

diff --git a/...est/java/org/hibernate/orm/test/boot/models/xml/complete/CompleteXmlInheritanceTests.java b/...est/java/org/hibernate/orm/test/boot/models/xml/complete/CompleteXmlInheritanceTests.java
@@ -56,7 +56,7 @@ void testIt() {
 			);
 			final CategorizedDomainModel categorizedDomainModel = processManagedResources( managedResources, bootstrapContext );
 
-			final Collection<EntityHierarchy> hierarchies = categorizedDomainModel.getEntityHierarchies().getHierarchies();
+			final Collection<EntityHierarchy> hierarchies = categorizedDomainModel.getEntityHierarchyCollection().getHierarchies();
 			assertThat( hierarchies ).hasSize( 1 );
 			final EntityHierarchy hierarchy = hierarchies.iterator().next();
 			assertThat( hierarchy.getInheritanceType() ).isEqualTo( JOINED );

diff --git a/.../java/org/hibernate/orm/test/boot/models/xml/complete/CompleteXmlWithEmbeddableTests.java b/.../java/org/hibernate/orm/test/boot/models/xml/complete/CompleteXmlWithEmbeddableTests.java
@@ -51,7 +51,7 @@ void testIt() {
 					bootstrapContext
 			);
 
-			final Collection<EntityHierarchy> hierarchies = categorizedDomainModel.getEntityHierarchies().getHierarchies();
+			final Collection<EntityHierarchy> hierarchies = categorizedDomainModel.getEntityHierarchyCollection().getHierarchies();
 			assertThat( hierarchies ).hasSize( 1 );
 
 			final EntityHierarchy hierarchy = hierarchies.iterator().next();

diff --git a/...src/test/java/org/hibernate/orm/test/boot/models/xml/complete/DiscriminatorValueTest.java b/...src/test/java/org/hibernate/orm/test/boot/models/xml/complete/DiscriminatorValueTest.java
@@ -46,7 +46,7 @@ void testDiscriminatorValue() {
 					bootstrapContext
 			);
 
-			final Collection<EntityHierarchy> entityHierarchies = categorizedDomainModel.getEntityHierarchies().getHierarchies();
+			final Collection<EntityHierarchy> entityHierarchies = categorizedDomainModel.getEntityHierarchyCollection().getHierarchies();
 			assertThat( entityHierarchies ).hasSize( 3 );
 
 			for ( EntityHierarchy entityHierarchy : entityHierarchies ) {

diff --git a/...src/test/java/org/hibernate/orm/test/boot/models/xml/complete/SimpleCompleteXmlTests.java b/...src/test/java/org/hibernate/orm/test/boot/models/xml/complete/SimpleCompleteXmlTests.java
@@ -57,7 +57,7 @@ void testSimpleCompleteEntity() {
 					bootstrapContext
 			);
 
-			final Collection<EntityHierarchy> hierarchies = categorizedDomainModel.getEntityHierarchies().getHierarchies();
+			final Collection<EntityHierarchy> hierarchies = categorizedDomainModel.getEntityHierarchyCollection().getHierarchies();
 			assertThat( hierarchies ).hasSize( 1 );
 
 			final EntityHierarchy hierarchy = hierarchies.iterator().next();

diff --git a/...-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/DynamicModelTests.java b/...-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/DynamicModelTests.java
@@ -68,7 +68,7 @@ void testSimpleDynamicModel() {
 					bootstrapContext
 			);
 
-			final Collection<EntityHierarchy> hierarchies = categorizedDomainModel.getEntityHierarchies().getHierarchies();
+			final Collection<EntityHierarchy> hierarchies = categorizedDomainModel.getEntityHierarchyCollection().getHierarchies();
 			assertThat( hierarchies ).hasSize( 1 );
 			final EntityHierarchy hierarchy = hierarchies.iterator().next();
 			final EntityTypeMetadata rootEntity = hierarchy.getRoot();
@@ -102,7 +102,7 @@ void testSemiSimpleDynamicModel() {
 					bootstrapContext
 			);
 
-			final Collection<EntityHierarchy> hierarchies = categorizedDomainModel.getEntityHierarchies().getHierarchies();
+			final Collection<EntityHierarchy> hierarchies = categorizedDomainModel.getEntityHierarchyCollection().getHierarchies();
 			assertThat( hierarchies ).hasSize( 1 );
 			final EntityHierarchy hierarchy = hierarchies.iterator().next();
 			final EntityTypeMetadata rootEntity = hierarchy.getRoot();
@@ -157,7 +157,7 @@ void testIdClass() {
 					bootstrapContext
 			);
 
-			final Collection<EntityHierarchy> hierarchies = categorizedDomainModel.getEntityHierarchies().getHierarchies();
+			final Collection<EntityHierarchy> hierarchies = categorizedDomainModel.getEntityHierarchyCollection().getHierarchies();
 			assertThat( hierarchies ).hasSize( 1 );
 			final EntityHierarchy hierarchy = hierarchies.iterator().next();
 			final EntityTypeMetadata rootEntity = hierarchy.getRoot();
@@ -185,7 +185,7 @@ void testOneToMany() {
 					bootstrapContext
 			);
 
-			final Collection<EntityHierarchy> hierarchies = categorizedDomainModel.getEntityHierarchies().getHierarchies();
+			final Collection<EntityHierarchy> hierarchies = categorizedDomainModel.getEntityHierarchyCollection().getHierarchies();
 			assertThat( hierarchies ).hasSize( 1 );
 			final EntityTypeMetadata rootEntity = hierarchies.iterator().next().getRoot();
 			assertThat( rootEntity.getClassDetails().getName() ).isEqualTo( Employee.class.getName() );

diff --git a/...re/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/NamedEntityGraphTest.java b/...re/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/NamedEntityGraphTest.java
@@ -46,7 +46,7 @@ void testNamedEntityGraph() {
 					bootstrapContext
 			);
 
-			final Collection<EntityHierarchy> entityHierarchies = categorizedDomainModel.getEntityHierarchies().getHierarchies();
+			final Collection<EntityHierarchy> entityHierarchies = categorizedDomainModel.getEntityHierarchyCollection().getHierarchies();
 			assertThat( entityHierarchies ).hasSize( 2 );
 
 			entityHierarchies.forEach(

diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/RowIdTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/RowIdTest.java
@@ -41,7 +41,7 @@ void testSimpleDynamicModel() {
 					bootstrapContext
 			);
 
-			final Collection<EntityHierarchy> entityHierarchies = categorizedDomainModel.getEntityHierarchies().getHierarchies();
+			final Collection<EntityHierarchy> entityHierarchies = categorizedDomainModel.getEntityHierarchyCollection().getHierarchies();
 			assertThat( entityHierarchies ).hasSize( 3 );
 
 			entityHierarchies.forEach(

diff --git a/...rnate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/TenantIdTest.java b/...rnate-core/src/test/java/org/hibernate/orm/test/boot/models/xml/dynamic/TenantIdTest.java
@@ -48,7 +48,7 @@ void testSimpleDynamicModel() {
 					bootstrapContext
 			);
 
-			final Collection<EntityHierarchy> entityHierarchies = categorizedDomainModel.getEntityHierarchies().getHierarchies();
+			final Collection<EntityHierarchy> entityHierarchies = categorizedDomainModel.getEntityHierarchyCollection().getHierarchies();
 			assertThat( entityHierarchies ).hasSize( 2 );
 
 			entityHierarchies.forEach(

diff --git a/.../src/test/java/org/hibernate/orm/test/boot/models/xml/lifecycle/EntityLifecycleTests.java b/.../src/test/java/org/hibernate/orm/test/boot/models/xml/lifecycle/EntityLifecycleTests.java
@@ -57,7 +57,7 @@ void testEntityLifecycle() {
 					bootstrapContext
 			);
 
-			final Collection<EntityHierarchy> hierarchies = categorizedDomainModel.getEntityHierarchies().getHierarchies();
+			final Collection<EntityHierarchy> hierarchies = categorizedDomainModel.getEntityHierarchyCollection().getHierarchies();
 			assertThat( hierarchies ).hasSize( 1 );
 			final EntityTypeMetadata rootEntity = hierarchies
 					.iterator()

diff --git a/...src/test/java/org/hibernate/orm/test/boot/models/xml/override/SimpleOverrideXmlTests.java b/...src/test/java/org/hibernate/orm/test/boot/models/xml/override/SimpleOverrideXmlTests.java
@@ -51,7 +51,7 @@ void testSimpleCompleteEntity() {
 					bootstrapContext
 			);
 
-			final Collection<EntityHierarchy> hierarchies = categorizedDomainModel.getEntityHierarchies().getHierarchies();
+			final Collection<EntityHierarchy> hierarchies = categorizedDomainModel.getEntityHierarchyCollection().getHierarchies();
 			assertThat( hierarchies ).hasSize( 1 );
 
 			final EntityHierarchy hierarchy = hierarchies.iterator().next();