Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix rebase compilation errors

This commit is contained in:
Andrea Boriero 2024-04-16 13:26:22 +02:00 committed by Steve Ebersole
parent c475e9e746
commit 894a182798
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hibernate-core/src/main/java/org/hibernate/boot/model/internal/FilterDefBinder.java
View File

@ -16,6 +16,7 @@ import org.hibernate.AnnotationException;
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 class FilterDefBinder {
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());
}

2
hibernate-core/src/main/java/org/hibernate/boot/models/categorize/spi/FilterDefRegistration.java
View File

@ -89,7 +89,7 @@ public class FilterDefRegistration {
} );
}
final Map<String, ManagedBean<? extends Supplier>> parameterResolvers;
final Map<String, ManagedBean<? extends Supplier<?>>> parameterResolvers;
if ( CollectionHelper.isEmpty( this.parameterResolvers ) ) {
parameterResolvers = Collections.emptyMap();
}