From 894a182798ec4218b84772602271964e939db451 Mon Sep 17 00:00:00 2001
From: Andrea Boriero <andrea@hibernate.org>
Date: Tue, 16 Apr 2024 13:26:22 +0200
Subject: [PATCH] Fix rebase compilation errors

---
 .../hibernate/boot/model/internal/FilterDefBinder.java    | 8 ++++----
 .../boot/models/categorize/spi/FilterDefRegistration.java | 2 +-
 2 files changed, 5 insertions(+), 5 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
index fadec19772..ef2937e6d9 100644
--- 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;
@@ -101,13 +102,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/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/FilterDefRegistration.java b/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/FilterDefRegistration.java
index ea493128f0..0d8e32b3c2 100644
--- a/hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/FilterDefRegistration.java
+++ b/hibernate-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();
 		}