Fix rebase compilation errors

hibernate · Apr 16, 2024 · 28f9e33 · 28f9e33
1 parent 15b5dd9
commit 28f9e33
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 9 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/boot/model/internal/FilterDefBinder.java b/hibernate-core/src/main/java/org/hibernate/boot/model/internal/FilterDefBinder.java
@@ -16,6 +16,7 @@
 import org.hibernate.MappingException;
 import org.hibernate.annotations.FilterDef;
 import org.hibernate.annotations.ParamDef;
+import org.hibernate.boot.spi.BootstrapContext;
 import org.hibernate.boot.spi.MetadataBuildingContext;
 import org.hibernate.engine.spi.FilterDefinition;
 import org.hibernate.internal.CoreMessageLogger;
@@ -100,13 +101,12 @@ public static void bindFilterDef(AnnotationUsage<FilterDef> filterDef, MetadataB
 		context.getMetadataCollector().addFilterDefinition( filterDefinition );
 	}
 
-	@SuppressWarnings("rawtypes")
-	private static ManagedBean<? extends Supplier> resolveParamResolver(ClassDetails resolverClassDetails, MetadataBuildingContext context) {
+	@SuppressWarnings({"rawtypes", "unchecked"})
+	private static ManagedBean<? extends Supplier<?>> resolveParamResolver(ClassDetails resolverClassDetails, MetadataBuildingContext context) {
 		final Class<? extends Supplier> clazz = resolverClassDetails.toJavaClass();
 		assert clazz != Supplier.class;
 		final BootstrapContext bootstrapContext = context.getBootstrapContext();
-		return (ManagedBean<? extends Supplier<?>>)
-				bootstrapContext.getServiceRegistry()
+		return (ManagedBean<? extends Supplier<?>>) bootstrapContext.getServiceRegistry()
 						.requireService(ManagedBeanRegistry.class)
 						.getBean(clazz, bootstrapContext.getCustomTypeProducer());
 	}

diff --git a/...te-core/src/main/java/org/hibernate/boot/models/categorize/spi/FilterDefRegistration.java b/...te-core/src/main/java/org/hibernate/boot/models/categorize/spi/FilterDefRegistration.java
@@ -89,7 +89,7 @@ public FilterDefinition toFilterDefinition(MetadataBuildingContext buildingConte
 			} );
 		}
 
-		final Map<String, ManagedBean<? extends Supplier>> parameterResolvers;
+		final Map<String, ManagedBean<? extends Supplier<?>>> parameterResolvers;
 		if ( CollectionHelper.isEmpty( this.parameterResolvers ) ) {
 			parameterResolvers = Collections.emptyMap();
 		}

diff --git a/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java b/hibernate-core/src/main/java/org/hibernate/mapping/SimpleValue.java
@@ -48,6 +48,7 @@
 import org.hibernate.internal.util.ReflectHelper;
 import org.hibernate.models.spi.AnnotationUsage;
 import org.hibernate.models.spi.MemberDetails;
+import org.hibernate.models.spi.TypeDetails;
 import org.hibernate.resource.beans.spi.ManagedBeanRegistry;
 import org.hibernate.service.ServiceRegistry;
 import org.hibernate.type.Type;
@@ -59,6 +60,7 @@
 import org.hibernate.type.descriptor.jdbc.LobTypeMappings;
 import org.hibernate.type.descriptor.jdbc.NationalizedTypeMappings;
 import org.hibernate.type.internal.ConvertedBasicTypeImpl;
+import org.hibernate.type.internal.ParameterizedTypeImpl;
 import org.hibernate.type.spi.TypeConfiguration;
 import org.hibernate.usertype.DynamicParameterizedType;
 
@@ -944,7 +946,7 @@ protected void createParameterImpl() {
 							classLoaderService.classForTypeName(
 									typeParameters.getProperty(DynamicParameterizedType.RETURNED_CLASS)
 							),
-							xProperty instanceof JavaXMember ? ((JavaXMember) xProperty ).getJavaType() : null,
+							attributeMember != null ? attributeMember.getType() : null,
 							annotations,
 							table.getCatalog(),
 							table.getSchema(),
@@ -1003,7 +1005,7 @@ public DynamicParameterizedType.ParameterType makeParameterImpl() {
 
 			return new ParameterTypeImpl(
 					classLoaderService.classForTypeName(typeParameters.getProperty(DynamicParameterizedType.RETURNED_CLASS)),
-					xProperty instanceof JavaXMember ? ((JavaXMember) xProperty ).getJavaType() : null,
+					attributeMember != null ? attributeMember.getType() : null,
 					annotations,
 					table.getCatalog(),
 					table.getSchema(),
@@ -1032,7 +1034,7 @@ private static final class ParameterTypeImpl implements DynamicParameterizedType
 
 		private ParameterTypeImpl(
 				Class<?> returnedClass,
-				java.lang.reflect.Type returnedJavaType,
+				TypeDetails returnedTypeDetails,
 				Annotation[] annotationsMethod,
 				String catalog,
 				String schema,
@@ -1041,14 +1043,24 @@ private ParameterTypeImpl(
 				String[] columns,
 				Long[] columnLengths) {
 			this.returnedClass = returnedClass;
-			this.returnedJavaType = returnedJavaType != null ? returnedJavaType : returnedClass;
 			this.annotationsMethod = annotationsMethod;
 			this.catalog = catalog;
 			this.schema = schema;
 			this.table = table;
 			this.primaryKey = primaryKey;
 			this.columns = columns;
 			this.columnLengths = columnLengths;
+			if ( returnedTypeDetails != null ) {
+				if ( returnedTypeDetails.getTypeKind() == TypeDetails.Kind.PARAMETERIZED_TYPE ) {
+					this.returnedJavaType = ParameterizedTypeImpl.from( returnedTypeDetails.asParameterizedType() );
+				}
+				else {
+					this.returnedJavaType = returnedTypeDetails.determineRawClass().toJavaClass();
+				}
+			}
+			else {
+				this.returnedJavaType = null;
+			}
 		}
 
 		@Override