Skip to content

Commit 182f0ad

Browse files
gavinkinggavinking
committed
HHH-18998 remove added code which is probably not necessary
(need to check with @sebersole)
1 parent 322b67f commit 182f0ad

File tree

4 files changed

+10
-61
lines changed

4 files changed

+10
-61
lines changed

‎hibernate-core/src/main/java/org/hibernate/boot/model/TypeDefinition.java‎

Lines changed: 6 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,8 @@
55
package org.hibernate.boot.model;
66

77
import java.io.Serializable;
8-
import java.lang.annotation.Annotation;
9-
import java.lang.reflect.Constructor;
10-
import java.lang.reflect.InvocationTargetException;
118
import java.sql.Types;
129
import java.util.Arrays;
13-
import java.util.Collections;
1410
import java.util.Map;
1511
import java.util.Objects;
1612
import java.util.Properties;
@@ -42,6 +38,7 @@
4238
import org.hibernate.type.spi.TypeConfigurationAware;
4339
import org.hibernate.usertype.UserType;
4440

41+
import static java.util.Collections.emptyMap;
4542
import static org.hibernate.boot.model.process.internal.InferredBasicValueResolver.resolveSqlTypeIndicators;
4643
import static org.hibernate.mapping.MappingHelper.injectParameters;
4744

@@ -101,35 +98,32 @@ public Map<String,String> getParameters() {
10198

10299
public BasicValue.Resolution<?> resolve(
103100
Map<?,?> localConfigParameters,
104-
Annotation typeAnnotation,
105101
MutabilityPlan<?> explicitMutabilityPlan,
106102
MetadataBuildingContext context,
107103
JdbcTypeIndicators indicators) {
108104
if ( CollectionHelper.isEmpty( localConfigParameters ) ) {
109105
// we can use the re-usable resolution...
110106
if ( reusableResolution == null ) {
111-
reusableResolution = createResolution( name, Collections.emptyMap(), typeAnnotation, indicators, context );
107+
reusableResolution = createResolution( name, emptyMap(), indicators, context );
112108
}
113109
return reusableResolution;
114110
}
115111
else {
116112
final String name = this.name + ":" + NAME_COUNTER.getAndIncrement();
117-
return createResolution( name, localConfigParameters, typeAnnotation, indicators, context );
113+
return createResolution( name, localConfigParameters, indicators, context );
118114
}
119115
}
120116

121117
private BasicValue.Resolution<?> createResolution(
122118
String name,
123119
Map<?,?> usageSiteProperties,
124-
Annotation typeAnnotation,
125120
JdbcTypeIndicators indicators,
126121
MetadataBuildingContext context) {
127122
return createResolution(
128123
name,
129124
typeImplementorClass,
130125
parameters,
131126
usageSiteProperties,
132-
typeAnnotation,
133127
indicators,
134128
context
135129
);
@@ -140,7 +134,6 @@ private static <T> BasicValue.Resolution<T> createResolution(
140134
Class<T> typeImplementorClass,
141135
Map<?,?> parameters,
142136
Map<?,?> usageSiteProperties,
143-
Annotation typeAnnotation,
144137
JdbcTypeIndicators indicators,
145138
MetadataBuildingContext context) {
146139
final BootstrapContext bootstrapContext = context.getBootstrapContext();
@@ -154,7 +147,8 @@ private static <T> BasicValue.Resolution<T> createResolution(
154147
if ( isKnownType ) {
155148

156149
final T typeInstance =
157-
instantiateType( name, typeImplementorClass, typeAnnotation, context, bootstrapContext );
150+
instantiateType( bootstrapContext.getServiceRegistry(), context.getBuildingOptions(),
151+
name, typeImplementorClass, bootstrapContext.getCustomTypeProducer() );
158152

159153
if ( typeInstance instanceof TypeConfigurationAware configurationAware ) {
160154
configurationAware.setTypeConfiguration( typeConfiguration );
@@ -174,7 +168,7 @@ private static <T> BasicValue.Resolution<T> createResolution(
174168
@SuppressWarnings("unchecked")
175169
final UserType<T> userType = (UserType<T>) typeInstance;
176170
final CustomType<T> customType = new CustomType<>( userType, typeConfiguration );
177-
return new UserTypeResolution<>( customType, null, combinedTypeParameters, typeAnnotation );
171+
return new UserTypeResolution<>( customType, null, combinedTypeParameters );
178172
}
179173

180174
if ( typeInstance instanceof BasicType ) {
@@ -231,28 +225,6 @@ public MutabilityPlan<T> getMutabilityPlan() {
231225
return resolveLegacyCases( typeImplementorClass, indicators, typeConfiguration );
232226
}
233227

234-
private static <T> T instantiateType(
235-
String name, Class<T> typeImplementorClass, Annotation typeAnnotation,
236-
MetadataBuildingContext context, BootstrapContext bootstrapContext) {
237-
if ( typeAnnotation != null ) {
238-
// attempt to instantiate it with the annotation as a constructor argument
239-
try {
240-
final Constructor<T> constructor = typeImplementorClass.getConstructor( typeAnnotation.annotationType() );
241-
constructor.setAccessible( true );
242-
return constructor.newInstance( typeAnnotation );
243-
}
244-
catch ( NoSuchMethodException ignored ) {
245-
// no such constructor, instantiate it the old way
246-
}
247-
catch (InvocationTargetException|InstantiationException|IllegalAccessException e) {
248-
throw new org.hibernate.InstantiationException( "Could not instantiate custom type", typeImplementorClass, e );
249-
}
250-
}
251-
252-
return instantiateType( bootstrapContext.getServiceRegistry(), context.getBuildingOptions(),
253-
name, typeImplementorClass, bootstrapContext.getCustomTypeProducer() );
254-
}
255-
256228
private static <T> BasicValue.Resolution<T> resolveLegacyCases(
257229
Class<T> typeImplementorClass, JdbcTypeIndicators indicators, TypeConfiguration typeConfiguration) {
258230
final BasicType<T> legacyType;
@@ -345,14 +317,12 @@ public static BasicValue.Resolution<?> createLocalResolution(
345317
String name,
346318
Class<?> typeImplementorClass,
347319
Map<?,?> localTypeParams,
348-
Annotation typeAnnotation,
349320
MetadataBuildingContext buildingContext) {
350321
return createResolution(
351322
name + ':' + NAME_COUNTER.getAndIncrement(),
352323
typeImplementorClass,
353324
localTypeParams,
354325
null,
355-
typeAnnotation,
356326
buildingContext.getBootstrapContext().getTypeConfiguration().getCurrentBaseSqlTypeIndicators(),
357327
buildingContext
358328
);

‎hibernate-core/src/main/java/org/hibernate/boot/model/process/internal/UserTypeResolution.java‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*/
55
package org.hibernate.boot.model.process.internal;
66

7-
import java.lang.annotation.Annotation;
87
import java.util.Properties;
98

109
import org.hibernate.mapping.BasicValue;
@@ -28,16 +27,13 @@ public class UserTypeResolution<T> implements BasicValue.Resolution<T> {
2827
* and builds its own :(
2928
*/
3029
private final Properties combinedTypeParameters;
31-
private final Annotation typeAnnotation;
3230

3331
public UserTypeResolution(
3432
CustomType<T> userTypeAdapter,
3533
MutabilityPlan<T> explicitMutabilityPlan,
36-
Properties combinedTypeParameters,
37-
Annotation typeAnnotation) {
34+
Properties combinedTypeParameters) {
3835
this.userTypeAdapter = userTypeAdapter;
3936
this.combinedTypeParameters = combinedTypeParameters;
40-
this.typeAnnotation = typeAnnotation;
4137
this.mutabilityPlan = explicitMutabilityPlan != null
4238
? explicitMutabilityPlan
4339
: new UserTypeMutabilityPlanAdapter<>( userTypeAdapter.getUserType() );
@@ -81,10 +77,6 @@ public Properties getCombinedTypeParameters() {
8177
return combinedTypeParameters;
8278
}
8379

84-
public Annotation getTypeAnnotation() {
85-
return typeAnnotation;
86-
}
87-
8880
@Override
8981
public JdbcMapping getJdbcMapping() {
9082
return userTypeAdapter;

‎hibernate-core/src/main/java/org/hibernate/boot/model/source/internal/hbm/ModelBinder.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2261,7 +2261,6 @@ private BasicType<?> resolveExplicitlyNamedAnyDiscriminatorType(
22612261
final BasicValue.Resolution<?> resolution = typeDefinition.resolve(
22622262
parameters,
22632263
null,
2264-
null,
22652264
metadataBuildingContext,
22662265
typeConfiguration.getCurrentBaseSqlTypeIndicators()
22672266
);

‎hibernate-core/src/main/java/org/hibernate/mapping/BasicValue.java‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -437,9 +437,7 @@ private Resolution<?> buildResolution(Properties typeParameters) {
437437
explicitMutabilityPlanAccess,
438438
getAttributeConverterDescriptor(),
439439
typeParameters,
440-
getTypeAnnotation(),
441440
this::setTypeParameters,
442-
this::setTypeAnnotation,
443441
this,
444442
getBuildingContext()
445443
);
@@ -644,7 +642,7 @@ private Resolution<?> resolution(BasicJavaType explicitJavaType, JavaType<?> jav
644642
context.getTypeDefinitionRegistry().resolveAutoApplied( castType );
645643
if ( autoAppliedTypeDef != null ) {
646644
log.debug("BasicValue resolution matched auto-applied type-definition");
647-
return autoAppliedTypeDef.resolve( getTypeParameters(), null, null, context, this );
645+
return autoAppliedTypeDef.resolve( getTypeParameters(), null, context, this );
648646
}
649647
}
650648

@@ -812,9 +810,7 @@ private static Resolution<?> interpretExplicitlyNamedType(
812810
Function<TypeConfiguration, MutabilityPlan> explicitMutabilityPlanAccess,
813811
ConverterDescriptor converterDescriptor,
814812
Map<Object,Object> localTypeParams,
815-
Annotation typeAnnotation,
816813
Consumer<Properties> combinedParameterConsumer,
817-
Consumer<Annotation> annotationConsumer,
818814
JdbcTypeIndicators stdIndicators,
819815
MetadataBuildingContext context) {
820816

@@ -897,14 +893,12 @@ public TypeConfiguration getTypeConfiguration() {
897893
if ( typeDefinition != null ) {
898894
final Resolution<?> resolution = typeDefinition.resolve(
899895
localTypeParams,
900-
typeAnnotation,
901896
explicitMutabilityPlanAccess != null
902897
? explicitMutabilityPlanAccess.apply( typeConfiguration )
903898
: null,
904899
context,
905900
stdIndicators
906901
);
907-
annotationConsumer.accept( resolution.getTypeAnnotation() );
908902
combinedParameterConsumer.accept( resolution.getCombinedTypeParameters() );
909903
return resolution;
910904
}
@@ -920,7 +914,6 @@ public TypeConfiguration getTypeConfiguration() {
920914
context.getTypeDefinitionRegistry().register( implicitDefinition );
921915
return implicitDefinition.resolve(
922916
localTypeParams,
923-
typeAnnotation,
924917
explicitMutabilityPlanAccess != null
925918
? explicitMutabilityPlanAccess.apply( typeConfiguration )
926919
: null,
@@ -929,7 +922,7 @@ public TypeConfiguration getTypeConfiguration() {
929922
);
930923
}
931924

932-
return TypeDefinition.createLocalResolution( name, typeNamedClass, localTypeParams, typeAnnotation, context );
925+
return TypeDefinition.createLocalResolution( name, typeNamedClass, localTypeParams, context );
933926
}
934927
catch (ClassLoadingException e) {
935928
// allow the exception below to trigger
@@ -1039,8 +1032,7 @@ public void setExplicitCustomType(Class<? extends UserType<?>> explicitCustomTyp
10391032
getTypeConfiguration()
10401033
),
10411034
null,
1042-
typeProperties,
1043-
typeAnnotation
1035+
typeProperties
10441036
);
10451037
}
10461038
}
@@ -1179,10 +1171,6 @@ default Properties getCombinedTypeParameters() {
11791171
return null;
11801172
}
11811173

1182-
default Annotation getTypeAnnotation() {
1183-
return null;
1184-
}
1185-
11861174
JdbcMapping getJdbcMapping();
11871175

11881176
/**

0 commit comments

Comments
 (0)