very minor changes to collection biding code

gavinking · gavinking · commit 95d5246c90ae · 2024-12-31T00:57:18.000+01:00
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java
@@ -170,7 +170,7 @@
 import static org.hibernate.internal.util.StringHelper.qualify;
 import static org.hibernate.internal.util.collections.CollectionHelper.isEmpty;
 import static org.hibernate.internal.util.collections.CollectionHelper.isNotEmpty;
-import static org.hibernate.mapping.MappingHelper.createCustomTypeBean;
+import static org.hibernate.mapping.MappingHelper.createUserTypeBean;
 
 /**
  * Base class for stateful binders responsible for producing mapping model objects of type {@link Collection}.
@@ -870,17 +870,17 @@ private static CollectionBinder createBinderFromTypeRegistration(
 			MemberDetails property,
 			CollectionClassification classification,
 			CollectionTypeRegistrationDescriptor typeRegistration,
-			MetadataBuildingContext buildingContext) {
+			MetadataBuildingContext context) {
 		return createBinder(
 				property,
-				() -> createCustomTypeBean(
+				() -> createUserTypeBean(
 						property.getDeclaringType().getName() + "#" + property.getName(),
 						typeRegistration.getImplementation(),
 						typeRegistration.getParameters(),
-						buildingContext
+						context.getMetadataCollector()
 				),
 				classification,
-				buildingContext
+				context
 		);
 	}
 
@@ -908,11 +908,11 @@ private static ManagedBean<? extends UserCollectionType> resolveCustomType(
 			MemberDetails property,
 			CollectionType typeAnnotation,
 			MetadataBuildingContext context) {
-		return createCustomTypeBean(
+		return createUserTypeBean(
 				property.getDeclaringType().getName() + "." + property.getName(),
 				typeAnnotation.type(),
 				PropertiesHelper.map( extractParameters( typeAnnotation ) ),
-				context
+				context.getMetadataCollector()
 		);
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java
@@ -2281,16 +2281,16 @@ private BasicType<?> resolveExplicitlyNamedAnyDiscriminatorType(
 			try {
 				final Object typeInstance = typeInstance( typeName, classLoaderService.classForName( typeName ) );
 
-				if ( typeInstance instanceof ParameterizedType ) {
+				if ( typeInstance instanceof ParameterizedType parameterizedType ) {
 					if ( parameters != null ) {
-						Properties properties = new Properties();
+						final Properties properties = new Properties();
 						properties.putAll( parameters );
-						( (ParameterizedType) typeInstance ).setParameterValues( properties );
+						parameterizedType.setParameterValues( properties );
 					}
 				}
 
-				if ( typeInstance instanceof UserType ) {
-					return new CustomType<>( (UserType<?>) typeInstance, typeConfiguration);
+				if ( typeInstance instanceof UserType<?> userType ) {
+					return new CustomType<>( userType, typeConfiguration);
 				}
 
 				return (BasicType<?>) typeInstance;
diff --git a/hibernate-core/src/main/java/org/hibernate/id/ExportableColumn.java b/hibernate-core/src/main/java/org/hibernate/id/ExportableColumn.java
@@ -83,7 +83,7 @@ public List<Column> getColumns() {
 		}
 
 		@Override
-		public Type getType() throws MappingException {
+		public Type getType() {
 			return type;
 		}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Array.java b/hibernate-core/src/main/java/org/hibernate/mapping/Array.java
@@ -65,7 +65,7 @@ public Class<?> getElementClass() throws MappingException {
 	}
 
 	@Override
-	public CollectionType getDefaultCollectionType() throws MappingException {
+	public CollectionType getDefaultCollectionType() {
 		return new ArrayType( getRole(), getReferencedPropertyName(), getElementClass() );
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java b/hibernate-core/src/main/java/org/hibernate/mapping/Collection.java
@@ -5,7 +5,6 @@
 package org.hibernate.mapping;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
@@ -34,6 +33,7 @@
 import org.hibernate.type.MappingContext;
 import org.hibernate.usertype.UserCollectionType;
 
+import static java.util.Collections.emptyList;
 import static org.hibernate.internal.util.collections.ArrayHelper.EMPTY_BOOLEAN_ARRAY;
 import static org.hibernate.engine.spi.ExecuteUpdateResultCheckStyle.expectationConstructor;
 import static org.hibernate.mapping.MappingHelper.classForName;
@@ -191,10 +191,6 @@ public MetadataImplementor getMetadata() {
 		return getBuildingContext().getMetadataCollector();
 	}
 
-//	public TypeConfiguration getTypeConfiguration() {
-//		return getBuildingContext().getBootstrapContext().getTypeConfiguration();
-//	}
-
 	@Override
 	public ServiceRegistry getServiceRegistry() {
 		return getMetadata().getMetadataBuildingOptions().getServiceRegistry();
@@ -260,7 +256,7 @@ public String getRole() {
 		return role;
 	}
 
-	public abstract CollectionType getDefaultCollectionType() throws MappingException;
+	public abstract CollectionType getDefaultCollectionType();
 
 	public boolean isPrimitiveArray() {
 		return false;
@@ -426,12 +422,12 @@ private void checkColumnDuplication() throws MappingException {
 
 	@Override
 	public List<Selectable> getSelectables() {
-		return Collections.emptyList();
+		return emptyList();
 	}
 
 	@Override
 	public List<Column> getColumns() {
-		return Collections.emptyList();
+		return emptyList();
 	}
 
 	@Override
@@ -448,7 +444,6 @@ public CollectionSemantics<?,?> getCollectionSemantics() {
 		if ( cachedCollectionSemantics == null ) {
 			cachedCollectionSemantics = resolveCollectionSemantics();
 		}
-
 		return cachedCollectionSemantics;
 	}
 
@@ -466,25 +461,26 @@ public CollectionSemantics<?,?> getCollectionSemantics() {
 	}
 
 	private CollectionType resolveCollectionType() {
-		final CollectionType collectionType;
 		if ( cachedCollectionType != null ) {
-			collectionType = cachedCollectionType;
+			return cachedCollectionType;
 		}
 		else if ( customTypeBeanResolver != null ) {
-			collectionType = new CustomCollectionType( customTypeBeanResolver.get(), role, referencedPropertyName );
+			return new CustomCollectionType( customTypeBeanResolver.get(), role, referencedPropertyName );
 		}
 		else if ( typeName == null ) {
-			collectionType = getDefaultCollectionType();
+			return getDefaultCollectionType();
 		}
 		else {
-			final MetadataImplementor metadata = getMetadata();
-			final Class<? extends UserCollectionType> clazz =
-					classForName( UserCollectionType.class, typeName, metadata );
-			final ManagedBean<? extends UserCollectionType> userTypeBean =
-					createUserTypeBean( role, clazz, PropertiesHelper.map( typeParameters ), metadata );
-			collectionType = new CustomCollectionType( userTypeBean, role, referencedPropertyName );
+			return new CustomCollectionType( userTypeBean(), role, referencedPropertyName );
 		}
-		return collectionType;
+	}
+
+	private ManagedBean<? extends UserCollectionType> userTypeBean() {
+		final MetadataImplementor metadata = getMetadata();
+		return createUserTypeBean( role,
+				classForName( UserCollectionType.class, typeName, metadata ),
+				PropertiesHelper.map( typeParameters ),
+				metadata );
 	}
 
 	public CollectionType getCollectionType() {
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/List.java b/hibernate-core/src/main/java/org/hibernate/mapping/List.java
@@ -6,7 +6,6 @@
 
 import java.util.function.Supplier;
 
-import org.hibernate.MappingException;
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.resource.beans.spi.ManagedBean;
 import org.hibernate.type.CollectionType;
@@ -51,7 +50,7 @@ public boolean isList() {
 		return true;
 	}
 
-	public CollectionType getDefaultCollectionType() throws MappingException {
+	public CollectionType getDefaultCollectionType() {
 		return new ListType( getRole(), getReferencedPropertyName() );
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Map.java b/hibernate-core/src/main/java/org/hibernate/mapping/Map.java
@@ -57,12 +57,12 @@ public CollectionType getDefaultCollectionType() {
 		if ( isSorted() ) {
 			return new SortedMapType( getRole(), getReferencedPropertyName(), getComparator() );
 		}
-
-		if ( hasOrder() ) {
+		else if ( hasOrder() ) {
 			return new OrderedMapType( getRole(), getReferencedPropertyName() );
 		}
-
-		return new MapType( getRole(), getReferencedPropertyName() );
+		else {
+			return new MapType( getRole(), getReferencedPropertyName() );
+		}
 	}
 
 
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/MappingHelper.java b/hibernate-core/src/main/java/org/hibernate/mapping/MappingHelper.java
@@ -13,7 +13,6 @@
 import org.hibernate.MappingException;
 import org.hibernate.boot.model.internal.DelayedParameterizedTypeBean;
 import org.hibernate.boot.registry.classloading.spi.ClassLoaderService;
-import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.boot.spi.MetadataImplementor;
 import org.hibernate.resource.beans.internal.FallbackBeanInstanceProducer;
 import org.hibernate.resource.beans.spi.ManagedBean;
@@ -44,17 +43,6 @@ public static ManagedBean<? extends UserCollectionType> createUserTypeBean(
 				: createLocalUserTypeBean( role, userCollectionTypeClass, parameters );
 	}
 
-	public static ManagedBean<? extends UserCollectionType> createCustomTypeBean(
-			String role,
-			Class<? extends UserCollectionType> implementation,
-			Map<String, ?> parameters,
-			MetadataBuildingContext context) {
-		// if deferred container access is enabled, we locally create the user-type
-		return context.getBuildingOptions().isAllowExtensionsInCdi()
-				? createSharedUserTypeBean( role, implementation, parameters, context.getMetadataCollector() )
-				: createLocalUserTypeBean( role, implementation, parameters );
-	}
-
 	private static ManagedBean<? extends UserCollectionType> createSharedUserTypeBean(
 			String role,
 			Class<? extends UserCollectionType> userCollectionTypeClass,
diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/Set.java b/hibernate-core/src/main/java/org/hibernate/mapping/Set.java
@@ -73,12 +73,12 @@ public CollectionType getDefaultCollectionType() {
 		if ( isSorted() ) {
 			return new SortedSetType( getRole(), getReferencedPropertyName(), getComparator() );
 		}
-
-		if ( hasOrder() ) {
+		else if ( hasOrder() ) {
 			return new OrderedSetType( getRole(), getReferencedPropertyName() );
 		}
-
-		return new SetType( getRole(), getReferencedPropertyName() );
+		else {
+			return new SetType( getRole(), getReferencedPropertyName() );
+		}
 	}
 
 	void createPrimaryKey() {

Original file line number	Diff line number	Diff line change
`@@ -2281,16 +2281,16 @@ private BasicType<?> resolveExplicitlyNamedAnyDiscriminatorType(`
`2281`	`2281`	`try {`
`2282`	`2282`	`final Object typeInstance = typeInstance( typeName, classLoaderService.classForName( typeName ) );`
`2283`	`2283`
`2284`		`- if ( typeInstance instanceof ParameterizedType ) {`
	`2284`	`+ if ( typeInstance instanceof ParameterizedType parameterizedType ) {`
`2285`	`2285`	`if ( parameters != null ) {`
`2286`		`- Properties properties = new Properties();`
	`2286`	`+ final Properties properties = new Properties();`
`2287`	`2287`	`properties.putAll( parameters );`
`2288`		`- ( (ParameterizedType) typeInstance ).setParameterValues( properties );`
	`2288`	`+ parameterizedType.setParameterValues( properties );`
`2289`	`2289`	`}`
`2290`	`2290`	`}`
`2291`	`2291`
`2292`		`- if ( typeInstance instanceof UserType ) {`
`2293`		`- return new CustomType<>( (UserType<?>) typeInstance, typeConfiguration);`
	`2292`	`+ if ( typeInstance instanceof UserType<?> userType ) {`
	`2293`	`+ return new CustomType<>( userType, typeConfiguration);`
`2294`	`2294`	`}`
`2295`	`2295`
`2296`	`2296`	`return (BasicType<?>) typeInstance;`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public List<Column> getColumns() {`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`@Override`
`86`		`- public Type getType() throws MappingException {`
	`86`	`+ public Type getType() {`
`87`	`87`	`return type;`
`88`	`88`	`}`
`89`	`89`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public Class<?> getElementClass() throws MappingException {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`@Override`
`68`		`- public CollectionType getDefaultCollectionType() throws MappingException {`
	`68`	`+ public CollectionType getDefaultCollectionType() {`
`69`	`69`	`return new ArrayType( getRole(), getReferencedPropertyName(), getElementClass() );`
`70`	`70`	`}`
`71`	`71`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`
`7`	`7`	`import java.util.function.Supplier;`
`8`	`8`
`9`		`-import org.hibernate.MappingException;`
`10`	`9`	`import org.hibernate.boot.spi.MetadataBuildingContext;`
`11`	`10`	`import org.hibernate.resource.beans.spi.ManagedBean;`
`12`	`11`	`import org.hibernate.type.CollectionType;`
`@@ -51,7 +50,7 @@ public boolean isList() {`
`51`	`50`	`return true;`
`52`	`51`	`}`
`53`	`52`
`54`		`- public CollectionType getDefaultCollectionType() throws MappingException {`
	`53`	`+ public CollectionType getDefaultCollectionType() {`
`55`	`54`	`return new ListType( getRole(), getReferencedPropertyName() );`
`56`	`55`	`}`
`57`	`56`
Original file line number	Diff line number	Diff line change
`@@ -57,12 +57,12 @@ public CollectionType getDefaultCollectionType() {`
`57`	`57`	`if ( isSorted() ) {`
`58`	`58`	`return new SortedMapType( getRole(), getReferencedPropertyName(), getComparator() );`
`59`	`59`	`}`
`60`		`-`
`61`		`- if ( hasOrder() ) {`
	`60`	`+ else if ( hasOrder() ) {`
`62`	`61`	`return new OrderedMapType( getRole(), getReferencedPropertyName() );`
`63`	`62`	`}`
`64`		`-`
`65`		`- return new MapType( getRole(), getReferencedPropertyName() );`
	`63`	`+ else {`
	`64`	`+ return new MapType( getRole(), getReferencedPropertyName() );`
	`65`	`+ }`
`66`	`66`	`}`
`67`	`67`
`68`	`68`
Original file line number	Diff line number	Diff line change
`@@ -73,12 +73,12 @@ public CollectionType getDefaultCollectionType() {`
`73`	`73`	`if ( isSorted() ) {`
`74`	`74`	`return new SortedSetType( getRole(), getReferencedPropertyName(), getComparator() );`
`75`	`75`	`}`
`76`		`-`
`77`		`- if ( hasOrder() ) {`
	`76`	`+ else if ( hasOrder() ) {`
`78`	`77`	`return new OrderedSetType( getRole(), getReferencedPropertyName() );`
`79`	`78`	`}`
`80`		`-`
`81`		`- return new SetType( getRole(), getReferencedPropertyName() );`
	`79`	`+ else {`
	`80`	`+ return new SetType( getRole(), getReferencedPropertyName() );`
	`81`	`+ }`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`void createPrimaryKey() {`