Skip to content

Commit cd4cb7f

Browse files
gsmetgsmet
committed
HV-1339 Rename extractedType to containerType in
ValueExtractorDescriptor
1 parent e576e17 commit cd4cb7f

File tree

4 files changed

+31
-31
lines changed

4 files changed

+31
-31
lines changed

‎engine/src/main/java/org/hibernate/validator/internal/engine/cascading/ValueExtractorDescriptor.java‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class ValueExtractorDescriptor {
4040

4141
public ValueExtractorDescriptor(ValueExtractor<?> valueExtractor) {
4242
this.key = new Key(
43-
getExtractedType( valueExtractor.getClass() ),
43+
getContainerType( valueExtractor.getClass() ),
4444
getExtractedTypeParameter( valueExtractor.getClass() )
4545
);
4646
this.valueExtractor = valueExtractor;
@@ -50,30 +50,30 @@ public ValueExtractorDescriptor(ValueExtractor<?> valueExtractor) {
5050
@SuppressWarnings("rawtypes")
5151
private static TypeVariable<?> getExtractedTypeParameter(Class<? extends ValueExtractor> extractorImplementationType) {
5252
AnnotatedParameterizedType valueExtractorDefinition = getValueExtractorDefinition( extractorImplementationType );
53-
AnnotatedType extractedType = valueExtractorDefinition.getAnnotatedActualTypeArguments()[0];
54-
Class<?> extractedTypeRaw = (Class<?>) TypeHelper.getErasedType( extractedType.getType() );
53+
AnnotatedType containerType = valueExtractorDefinition.getAnnotatedActualTypeArguments()[0];
54+
Class<?> containerTypeRaw = (Class<?>) TypeHelper.getErasedType( containerType.getType() );
5555

5656
TypeVariable<?> extractedTypeParameter = null;
5757

58-
if ( extractedType.isAnnotationPresent( ExtractedValue.class ) ) {
59-
if ( extractedType instanceof AnnotatedArrayType ) {
60-
extractedTypeParameter = new ArrayElement( (AnnotatedArrayType) extractedType );
58+
if ( containerType.isAnnotationPresent( ExtractedValue.class ) ) {
59+
if ( containerType instanceof AnnotatedArrayType ) {
60+
extractedTypeParameter = new ArrayElement( (AnnotatedArrayType) containerType );
6161
}
6262
else {
6363
extractedTypeParameter = AnnotatedObject.INSTANCE;
6464
}
6565
}
6666

67-
if ( extractedType instanceof AnnotatedParameterizedType ) {
68-
AnnotatedParameterizedType parameterizedExtractedType = (AnnotatedParameterizedType) extractedType;
67+
if ( containerType instanceof AnnotatedParameterizedType ) {
68+
AnnotatedParameterizedType parameterizedExtractedType = (AnnotatedParameterizedType) containerType;
6969
int i = 0;
7070
for ( AnnotatedType typeArgument : parameterizedExtractedType.getAnnotatedActualTypeArguments() ) {
7171
if ( typeArgument.isAnnotationPresent( ExtractedValue.class ) ) {
7272
if ( extractedTypeParameter != null ) {
7373
throw LOG.getValueExtractorDeclaresExtractedValueMultipleTimesException( extractorImplementationType );
7474
}
7575

76-
extractedTypeParameter = extractedTypeRaw.getTypeParameters()[i];
76+
extractedTypeParameter = containerTypeRaw.getTypeParameters()[i];
7777
}
7878
i++;
7979
}
@@ -87,10 +87,10 @@ private static TypeVariable<?> getExtractedTypeParameter(Class<? extends ValueEx
8787
}
8888

8989
@SuppressWarnings("rawtypes")
90-
private static Class<?> getExtractedType(Class<? extends ValueExtractor> extractorImplementationType) {
90+
private static Class<?> getContainerType(Class<? extends ValueExtractor> extractorImplementationType) {
9191
AnnotatedParameterizedType genericInterface = getValueExtractorDefinition( extractorImplementationType );
92-
AnnotatedType extractedType = genericInterface.getAnnotatedActualTypeArguments()[0];
93-
return TypeHelper.getErasedReferenceType( extractedType.getType() );
92+
AnnotatedType containerType = genericInterface.getAnnotatedActualTypeArguments()[0];
93+
return TypeHelper.getErasedReferenceType( containerType.getType() );
9494
}
9595

9696
private static AnnotatedParameterizedType getValueExtractorDefinition(Class<?> extractorImplementationType) {
@@ -138,8 +138,8 @@ public Key getKey() {
138138
return key;
139139
}
140140

141-
public Class<?> getExtractedType() {
142-
return key.extractedType;
141+
public Class<?> getContainerType() {
142+
return key.containerType;
143143
}
144144

145145
public TypeVariable<?> getExtractedTypeParameter() {
@@ -161,20 +161,20 @@ public String toString() {
161161

162162
public static class Key {
163163

164-
private final Class<?> extractedType;
164+
private final Class<?> containerType;
165165
private final TypeVariable<?> extractedTypeParameter;
166166
private final int hashCode;
167167

168-
public Key(Class<?> extractedType, TypeVariable<?> extractedTypeParameter) {
169-
this.extractedType = extractedType;
168+
public Key(Class<?> containerType, TypeVariable<?> extractedTypeParameter) {
169+
this.containerType = containerType;
170170
this.extractedTypeParameter = extractedTypeParameter;
171-
this.hashCode = buildHashCode( extractedType, extractedTypeParameter );
171+
this.hashCode = buildHashCode( containerType, extractedTypeParameter );
172172
}
173173

174-
private static int buildHashCode(Type extractedType, TypeVariable<?> extractedTypeParameter) {
174+
private static int buildHashCode(Type containerType, TypeVariable<?> extractedTypeParameter) {
175175
final int prime = 31;
176176
int result = 1;
177-
result = prime * result + extractedType.hashCode();
177+
result = prime * result + containerType.hashCode();
178178
result = prime * result + extractedTypeParameter.hashCode();
179179
return result;
180180
}
@@ -197,13 +197,13 @@ public boolean equals(Object obj) {
197197
}
198198
Key other = (Key) obj;
199199

200-
return extractedType.equals( other.extractedType ) &&
200+
return containerType.equals( other.containerType ) &&
201201
extractedTypeParameter.equals( other.extractedTypeParameter );
202202
}
203203

204204
@Override
205205
public String toString() {
206-
return "Key [extractedType=" + StringHelper.toShortString( extractedType ) + ", extractedTypeParameter=" + extractedTypeParameter + "]";
206+
return "Key [containerType=" + StringHelper.toShortString( containerType ) + ", extractedTypeParameter=" + extractedTypeParameter + "]";
207207
}
208208
}
209209
}

‎engine/src/main/java/org/hibernate/validator/internal/engine/cascading/ValueExtractorManager.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public static Set<ValueExtractor<?>> getDefaultValueExtractors() {
126126
public ValueExtractorDescriptor getValueExtractor(Class<?> valueType) {
127127
List<ValueExtractorDescriptor> typeCompatibleExtractors = valueExtractors.values()
128128
.stream()
129-
.filter( e -> TypeHelper.isAssignable( TypeHelper.getErasedReferenceType( e.getExtractedType() ), valueType ) )
129+
.filter( e -> TypeHelper.isAssignable( TypeHelper.getErasedReferenceType( e.getContainerType() ), valueType ) )
130130
.collect( Collectors.toList() );
131131

132132
return getMostSpecific( valueType, typeCompatibleExtractors );
@@ -142,7 +142,7 @@ public ValueExtractorDescriptor getValueExtractor(Class<?> valueType, TypeVariab
142142

143143
List<ValueExtractorDescriptor> typeCompatibleExtractors = valueExtractors.values()
144144
.stream()
145-
.filter( e -> TypeHelper.isAssignable( e.getExtractedType(), valueType ) )
145+
.filter( e -> TypeHelper.isAssignable( e.getContainerType(), valueType ) )
146146
.collect( Collectors.toList() );
147147

148148
List<ValueExtractorDescriptor> typeParameterCompatibleExtractors = new ArrayList<>();
@@ -151,7 +151,7 @@ public ValueExtractorDescriptor getValueExtractor(Class<?> valueType, TypeVariab
151151
TypeVariable<?> typeParameterBoundToExtractorType;
152152

153153
if ( !isInternal ) {
154-
Map<TypeVariable<?>, TypeVariable<?>> bindingsForExtractorType = allBindings.get( extractorDescriptor.getExtractedType() );
154+
Map<TypeVariable<?>, TypeVariable<?>> bindingsForExtractorType = allBindings.get( extractorDescriptor.getContainerType() );
155155
typeParameterBoundToExtractorType = bind( typeParameter, bindingsForExtractorType );
156156
}
157157
else {
@@ -178,10 +178,10 @@ private ValueExtractorDescriptor getMostSpecific(Class<?> valueType, List<ValueE
178178
boolean isNewRoot = true;
179179
while ( candidatesIterator.hasNext() ) {
180180
ValueExtractorDescriptor candidate = candidatesIterator.next();
181-
if ( TypeHelper.isAssignable( candidate.getExtractedType(), descriptor.getExtractedType() ) ) {
181+
if ( TypeHelper.isAssignable( candidate.getContainerType(), descriptor.getContainerType() ) ) {
182182
candidatesIterator.remove();
183183
}
184-
else if ( TypeHelper.isAssignable( descriptor.getExtractedType(), candidate.getExtractedType() ) ) {
184+
else if ( TypeHelper.isAssignable( descriptor.getContainerType(), candidate.getContainerType() ) ) {
185185
isNewRoot = false;
186186
}
187187
}

‎engine/src/main/java/org/hibernate/validator/internal/metadata/core/MetaConstraints.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ private static <A extends Annotation> Type addValueExtractorDescriptorForWrapped
8888

8989
return getSingleTypeParameterBind( typeResolutionHelper,
9090
location.getTypeForValidatorResolution(),
91-
valueExtractorDescriptorCandidate.getExtractedType() );
91+
valueExtractorDescriptorCandidate.getContainerType() );
9292
}
9393
}
9494

‎engine/src/test/java/org/hibernate/validator/test/internal/engine/cascaded/CustomValueExtractorTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ public void canObtainDefaultExtractors() {
191191

192192
Set<TypeVariable<?>> mapExtractors = defaultExtractors.stream()
193193
.filter( e -> {
194-
return TypeHelper.getErasedReferenceType( new ValueExtractorDescriptor( e ).getExtractedType() ) == Map.class;
194+
return TypeHelper.getErasedReferenceType( new ValueExtractorDescriptor( e ).getContainerType() ) == Map.class;
195195
} )
196196
.map( e -> new ValueExtractorDescriptor( e ).getExtractedTypeParameter() )
197197
.collect( Collectors.toSet() );
@@ -201,7 +201,7 @@ public void canObtainDefaultExtractors() {
201201

202202
Set<TypeVariable<?>> optionalExtractors = defaultExtractors.stream()
203203
.filter( e -> {
204-
return TypeHelper.getErasedReferenceType( new ValueExtractorDescriptor( e ).getExtractedType() ) == java.util.Optional.class;
204+
return TypeHelper.getErasedReferenceType( new ValueExtractorDescriptor( e ).getContainerType() ) == java.util.Optional.class;
205205
} )
206206
.map( e -> new ValueExtractorDescriptor( e ).getExtractedTypeParameter() )
207207
.collect( Collectors.toSet() );
@@ -212,7 +212,7 @@ public void canObtainDefaultExtractors() {
212212

213213
Set<TypeVariable<?>> guavaOptionalExtractors = defaultExtractors.stream()
214214
.filter( e -> {
215-
return TypeHelper.getErasedReferenceType( new ValueExtractorDescriptor( e ).getExtractedType() ) == Optional.class;
215+
return TypeHelper.getErasedReferenceType( new ValueExtractorDescriptor( e ).getContainerType() ) == Optional.class;
216216
} )
217217
.map( e -> new ValueExtractorDescriptor( e ).getExtractedTypeParameter() )
218218
.collect( Collectors.toSet() );

0 commit comments

Comments
 (0)