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

HHH-13103 - Allow Hibernate Types to get access to the current configuration properties using constructor injection

This commit is contained in:
Steve Ebersole 2020-02-18 15:21:29 -06:00
parent c346171b23
commit 1042f23bee
2 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hibernate-core/src/main/java/org/hibernate/type/TypeFactory.java
View File

@ -16,7 +16,6 @@ import org.hibernate.MappingException;
import org.hibernate.classic.Lifecycle;
import org.hibernate.engine.config.spi.ConfigurationService;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.internal.util.ReflectHelper;
import org.hibernate.tuple.component.ComponentMetamodel;
import org.hibernate.type.spi.TypeBootstrapContext;
@ -26,8 +25,6 @@ import org.hibernate.usertype.CompositeUserType;
import org.hibernate.usertype.ParameterizedType;
import org.hibernate.usertype.UserType;
import static org.hibernate.internal.CoreLogging.messageLogger;
/**
* Used internally to build instances of {@link Type}, specifically it builds instances of
* <p/>
@ -42,9 +39,7 @@ import static org.hibernate.internal.CoreLogging.messageLogger;
*/
@Deprecated
@SuppressWarnings({"unchecked"})
public final class TypeFactory implements Serializable {
private static final CoreMessageLogger LOG = messageLogger( TypeFactory.class );
public final class TypeFactory implements Serializable, TypeBootstrapContext {
/**
* @deprecated Use {@link TypeConfiguration}/{@link TypeConfiguration.Scope} instead
*/
@ -61,6 +56,11 @@ public final class TypeFactory implements Serializable {
this.typeScope = (TypeScope) () -> typeConfiguration;
}
@Override
public Map<String, Object> getConfigurationSettings() {
return typeConfiguration.getServiceRegistry().getService( ConfigurationService.class ).getSettings();
}
public SessionFactoryImplementor resolveSessionFactory() {
return typeConfiguration.getSessionFactory();
}
@ -92,25 +92,21 @@ public final class TypeFactory implements Serializable {
public Type type(Class<Type> typeClass, Properties parameters) {
try {
Type type;
final Type type;
Constructor<Type> bootstrapContextAwareTypeConstructor = ReflectHelper.getConstructor(
final Constructor<Type> bootstrapContextAwareTypeConstructor = ReflectHelper.getConstructor(
typeClass,
TypeBootstrapContext.class
);
if ( bootstrapContextAwareTypeConstructor != null ) {
ConfigurationService configurationService = typeConfiguration.getServiceRegistry().getService(
ConfigurationService.class );
Map<String, Object> configurationSettings = configurationService.getSettings();
type = bootstrapContextAwareTypeConstructor.newInstance( new TypeBootstrapContext(
configurationSettings
) );
type = bootstrapContextAwareTypeConstructor.newInstance( this );
}
else {
type = typeClass.newInstance();
}
injectParameters( type, parameters );
return type;
}
catch (Exception e) {
@ -143,7 +139,6 @@ public final class TypeFactory implements Serializable {
* @deprecated Only for use temporary use by {@link org.hibernate.Hibernate}
*/
@Deprecated
@SuppressWarnings({"JavaDoc"})
public static CompositeCustomType customComponent(
Class<CompositeUserType> typeClass,
Properties parameters,

13
hibernate-core/src/main/java/org/hibernate/type/spi/TypeBootstrapContext.java
View File

@ -19,15 +19,6 @@ import java.util.Map;
*
* @since 5.4
*/
public class TypeBootstrapContext {
private final Map<String, Object> configurationSettings;
public TypeBootstrapContext(Map<String, Object> configurationSettings) {
this.configurationSettings = configurationSettings;
}
public Map<String, Object> getConfigurationSettings() {
return configurationSettings;
}
public interface TypeBootstrapContext {
Map<String, Object> getConfigurationSettings();
}