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

code cleanups around MappingHelper

This commit is contained in:
Gavin King 2024-12-30 22:01:42 +01:00
parent c8b0db9da2
commit eb56902842
5 changed files with 64 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinition.java
View File

@ -145,8 +145,9 @@ public class TypeDefinition implements Serializable {
// support for AttributeConverter would be nice too
if ( isKnownType ) {
final T typeInstance = instantiateType( bootstrapContext.getServiceRegistry(),
context.getBuildingOptions(), name, typeImplementorClass, instanceProducer );
final T typeInstance =
instantiateType( bootstrapContext.getServiceRegistry(), context.getBuildingOptions(),
name, typeImplementorClass, instanceProducer );
if ( typeInstance instanceof TypeConfigurationAware configurationAware ) {
configurationAware.setTypeConfiguration( typeConfiguration );

40
hibernate-core/src/main/java/org/hibernate/boot/model/internal/CollectionBinder.java
View File

@ -110,9 +110,7 @@ import org.hibernate.models.spi.MemberDetails;
import org.hibernate.models.spi.SourceModelBuildingContext;
import org.hibernate.models.spi.TypeDetails;
import org.hibernate.resource.beans.spi.ManagedBean;
import org.hibernate.resource.beans.spi.ManagedBeanRegistry;
import org.hibernate.usertype.CompositeUserType;
import org.hibernate.usertype.ParameterizedType;
import org.hibernate.usertype.UserCollectionType;
@ -174,8 +172,7 @@ import static org.hibernate.internal.util.StringHelper.nullIfEmpty;
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.createLocalUserCollectionTypeBean;
import static org.hibernate.mapping.MappingHelper.throwIgnoredCollectionTypeParameters;
import static org.hibernate.mapping.MappingHelper.createCustomTypeBean;
/**
* Base class for stateful binders responsible for producing mapping model objects of type {@link Collection}.
@ -889,7 +886,7 @@ public abstract class CollectionBinder {
MetadataBuildingContext buildingContext) {
return createBinder(
property,
() -> createCustomType(
() -> createCustomTypeBean(
property.getDeclaringType().getName() + "#" + property.getName(),
typeRegistration.getImplementation(),
typeRegistration.getParameters(),
@ -900,37 +897,6 @@ public abstract class CollectionBinder {
);
}
private static ManagedBean<? extends UserCollectionType> createCustomType(
String role,
Class<? extends UserCollectionType> implementation,
Map<String, ?> parameters,
MetadataBuildingContext buildingContext) {
final boolean hasParameters = isNotEmpty( parameters );
if ( !buildingContext.getBuildingOptions().isAllowExtensionsInCdi() ) {
// if deferred container access is enabled, we locally create the user-type
return createLocalUserCollectionTypeBean( role, implementation, hasParameters, parameters );
}
final ManagedBean<? extends UserCollectionType> managedBean =
buildingContext.getBuildingOptions().getServiceRegistry()
.requireService( ManagedBeanRegistry.class )
.getBean( implementation );
if ( hasParameters ) {
if ( ParameterizedType.class.isAssignableFrom( managedBean.getBeanClass() ) ) {
// create a copy of the parameters and create a bean wrapper to delay injecting
// the parameters, thereby delaying the need to resolve the instance from the
// wrapped bean
final Properties copy = new Properties();
copy.putAll( parameters );
return new DelayedParameterizedTypeBean<>( managedBean, copy );
}
throwIgnoredCollectionTypeParameters( role, implementation );
}
return managedBean;
}
private static CollectionBinder createBinderFromProperty(MemberDetails property, MetadataBuildingContext context) {
final CollectionClassification classification = determineCollectionClassification( property, context );
return createBinder( property, null, classification, context );
@ -955,7 +921,7 @@ public abstract class CollectionBinder {
MemberDetails property,
CollectionType typeAnnotation,
MetadataBuildingContext context) {
return createCustomType(
return createCustomTypeBean(
property.getDeclaringType().getName() + "." + property.getName(),
typeAnnotation.type(),
PropertiesHelper.map( extractParameters( typeAnnotation ) ),

2
hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java
View File

@ -1327,7 +1327,7 @@ public class ModelBinder {
// bind the collection type info
String typeName = source.getTypeInformation().getName();
Map<Object,Object> typeParameters = new HashMap<>();
final Map<String,String> typeParameters = new HashMap<>();
if ( typeName != null ) {
// see if there is a corresponding type-def
final TypeDefinition typeDef = mappingDocument.getMetadataCollector().getTypeDefinition( typeName );

14
hibernate-core/src/main/java/org/hibernate/mapping/Collection.java
View File

@ -760,23 +760,19 @@ public abstract class Collection implements Fetchable, Value, Filterable, SoftDe
this.typeName = typeName;
}
@Deprecated(since = "7.0", forRemoval = true)
public Properties getTypeParameters() {
return typeParameters;
}
@Deprecated(since = "7.0", forRemoval = true)
public void setTypeParameters(Properties parameterMap) {
this.typeParameters = parameterMap;
}
@SuppressWarnings("rawtypes")
public void setTypeParameters(java.util.Map typeParameters) {
if ( typeParameters instanceof Properties properties ) {
this.typeParameters = properties;
}
else {
this.typeParameters = new Properties();
this.typeParameters.putAll( typeParameters );
}
public void setTypeParameters(java.util.Map<String,String> typeParameters) {
this.typeParameters = new Properties();
this.typeParameters.putAll( typeParameters );
}
@Override

98
hibernate-core/src/main/java/org/hibernate/mapping/MappingHelper.java
View File

@ -15,7 +15,6 @@ 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.internal.util.collections.CollectionHelper;
import org.hibernate.metamodel.spi.ImplicitDiscriminatorStrategy;
import org.hibernate.resource.beans.internal.FallbackBeanInstanceProducer;
import org.hibernate.resource.beans.spi.ManagedBean;
@ -33,7 +32,8 @@ import org.hibernate.type.Type;
import org.hibernate.usertype.ParameterizedType;
import org.hibernate.usertype.UserCollectionType;
import static org.hibernate.metamodel.mapping.MappingModelCreationLogging.MAPPING_MODEL_CREATION_MESSAGE_LOGGER;
import static org.hibernate.internal.util.PropertiesHelper.map;
import static org.hibernate.internal.util.collections.CollectionHelper.isNotEmpty;
/**
* @author Steve Ebersole
@ -51,47 +51,59 @@ public final class MappingHelper {
String role,
String propertyRef,
MetadataImplementor metadata) {
final Class<? extends UserCollectionType> userCollectionTypeClass =
metadata.getMetadataBuildingOptions().getServiceRegistry()
.requireService( ClassLoaderService.class )
.classForName( typeName );
final ManagedBean<? extends UserCollectionType> userTypeBean =
createUserTypeBean( role, classForName( typeName, metadata ), map( typeParameters ), metadata );
return new CustomCollectionType( userTypeBean, role, propertyRef );
}
final boolean hasParameters = CollectionHelper.isNotEmpty( typeParameters );
final ManagedBean<? extends UserCollectionType> userTypeBean;
private static ManagedBean<? extends UserCollectionType> createUserTypeBean(
String role,
Class<? extends UserCollectionType> userCollectionTypeClass,
Map<String, ?> parameters,
MetadataImplementor metadata) {
return metadata.getMetadataBuildingOptions().isAllowExtensionsInCdi()
? createSharedUserTypeBean( role, userCollectionTypeClass, parameters, metadata )
: createLocalUserTypeBean( role, userCollectionTypeClass, parameters );
}
if ( !metadata.getMetadataBuildingOptions().isAllowExtensionsInCdi() ) {
//noinspection unchecked,rawtypes
userTypeBean = createLocalUserCollectionTypeBean(
role,
userCollectionTypeClass,
hasParameters,
(Map) typeParameters
);
}
else {
final ManagedBean<? extends UserCollectionType> userCollectionTypeBean =
getManagedBeanRegistry( metadata ).getBean( userCollectionTypeClass );
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 );
}
if ( hasParameters ) {
if ( ParameterizedType.class.isAssignableFrom( userCollectionTypeBean.getBeanClass() ) ) {
// create a copy of the parameters and create a bean wrapper to delay injecting
// the parameters, thereby delaying the need to resolve the instance from the
// wrapped bean
final Properties copy = new Properties();
copy.putAll( typeParameters );
userTypeBean = new DelayedParameterizedTypeBean<>( userCollectionTypeBean, copy );
}
else {
throwIgnoredCollectionTypeParameters( role, userCollectionTypeClass );
userTypeBean = userCollectionTypeBean;
}
private static ManagedBean<? extends UserCollectionType> createSharedUserTypeBean(
String role,
Class<? extends UserCollectionType> userCollectionTypeClass,
Map<String, ?> parameters,
MetadataImplementor metadata) {
final ManagedBean<? extends UserCollectionType> managedBean =
getManagedBeanRegistry( metadata ).getBean( userCollectionTypeClass );
if ( isNotEmpty( parameters ) ) {
if ( ParameterizedType.class.isAssignableFrom( managedBean.getBeanClass() ) ) {
// create a copy of the parameters and create a bean wrapper to delay injecting
// the parameters, thereby delaying the need to resolve the instance from the
// wrapped bean
final Properties copy = new Properties();
copy.putAll( parameters );
return new DelayedParameterizedTypeBean<>( managedBean, copy );
}
else {
userTypeBean = userCollectionTypeBean;
throwIgnoredCollectionTypeParameters( role, userCollectionTypeClass );
}
}
return managedBean;
}
return new CustomCollectionType( userTypeBean, role, propertyRef );
private static Class<UserCollectionType> classForName(String typeName, MetadataImplementor metadata) {
return metadata.getMetadataBuildingOptions().getServiceRegistry()
.requireService( ClassLoaderService.class )
.classForName( typeName );
}
private static ManagedBeanRegistry getManagedBeanRegistry(MetadataImplementor metadata) {
@ -109,11 +121,8 @@ public final class MappingHelper {
parameterizedType.setParameterValues( parameters == null ? EMPTY_PROPERTIES : parameters );
}
else if ( parameters != null && !parameters.isEmpty() ) {
// TODO: should this throw?
MAPPING_MODEL_CREATION_MESSAGE_LOGGER.debugf(
"UserCollectionType impl does not implement ParameterizedType but parameters were present : `%s`",
type.getClass().getName()
);
throw new MappingException( "'UserType' implementation '" + type.getClass().getName()
+ "' does not implement 'ParameterizedType' but parameters were provided" );
}
}
@ -201,16 +210,14 @@ public final class MappingHelper {
);
}
public static ManagedBean<UserCollectionType> createLocalUserCollectionTypeBean(
private static ManagedBean<UserCollectionType> createLocalUserTypeBean(
String role,
Class<? extends UserCollectionType> implementation,
boolean hasParameters,
Map<String, ?> parameters) {
final UserCollectionType userCollectionType =
FallbackBeanInstanceProducer.INSTANCE.produceBeanInstance( implementation );
if ( hasParameters ) {
// `CollectionType declared parameters - inject them
if ( isNotEmpty( parameters ) ) {
// CollectionType declared parameters - inject them
if ( userCollectionType instanceof ParameterizedType parameterizedType ) {
final Properties properties = new Properties();
properties.putAll( parameters );
@ -220,7 +227,6 @@ public final class MappingHelper {
throwIgnoredCollectionTypeParameters( role, implementation );
}
}
return new ProvidedInstanceManagedBeanImpl<>( userCollectionType );
}