Skip to content

Commit 779be88

Browse files
hferentschikhferentschik
committed
HV-925 Renaming ValueContext#typeOfAnnotatedElement to ValueContext#declaredTypeOfValidatedElement
1 parent b39ce7e commit 779be88

File tree

5 files changed

+37
-32
lines changed

5 files changed

+37
-32
lines changed

‎engine/src/main/java/org/hibernate/validator/internal/engine/ValueContext.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ public class ValueContext<T, V> {
6969
private ElementType elementType;
7070

7171
/**
72-
* The type of annotated element.
72+
* The declared type of validated value.
7373
*/
74-
private Type typeOfAnnotatedElement;
74+
private Type declaredTypeOfValidatedElement;
7575

7676
/**
7777
* An optional value unwrapper for the current value
@@ -197,12 +197,12 @@ public final void setElementType(ElementType elementType) {
197197
*
198198
* @return the declared type of the currently validated element
199199
*/
200-
public final Type getTypeOfAnnotatedElement() {
201-
return typeOfAnnotatedElement;
200+
public final Type getDeclaredTypeOfValidatedElement() {
201+
return declaredTypeOfValidatedElement;
202202
}
203203

204-
public final void setTypeOfAnnotatedElement(Type typeOfAnnotatedElement) {
205-
this.typeOfAnnotatedElement = typeOfAnnotatedElement;
204+
public final void setDeclaredTypeOfValidatedElement(Type declaredTypeOfValidatedElement) {
205+
this.declaredTypeOfValidatedElement = declaredTypeOfValidatedElement;
206206
}
207207

208208
@Override
@@ -215,7 +215,7 @@ public String toString() {
215215
sb.append( ", currentGroup=" ).append( currentGroup );
216216
sb.append( ", currentValue=" ).append( currentValue );
217217
sb.append( ", elementType=" ).append( elementType );
218-
sb.append( ", typeOfAnnotatedElement=" ).append( typeOfAnnotatedElement );
218+
sb.append( ", typeOfValidatedValue=" ).append( declaredTypeOfValidatedElement );
219219
sb.append( '}' );
220220
return sb.toString();
221221
}

‎engine/src/main/java/org/hibernate/validator/internal/engine/constraintvalidation/ConstraintTree.java

+15-10
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ public final ConstraintDescriptorImpl<A> getDescriptor() {
8888
return descriptor;
8989
}
9090

91-
public final <T> boolean validateConstraints(ValidationContext<T> executionContext, ValueContext<?, ?> valueContext) {
91+
public final <T> boolean validateConstraints(ValidationContext<T> executionContext,
92+
ValueContext<?, ?> valueContext) {
9293
Set<ConstraintViolation<T>> constraintViolations = newHashSet();
9394
validateConstraints( executionContext, valueContext, constraintViolations );
9495
if ( !constraintViolations.isEmpty() ) {
@@ -99,8 +100,8 @@ public final <T> boolean validateConstraints(ValidationContext<T> executionConte
99100
}
100101

101102
private <T, V> void validateConstraints(ValidationContext<T> validationContext,
102-
ValueContext<?, V> valueContext,
103-
Set<ConstraintViolation<T>> constraintViolations) {
103+
ValueContext<?, V> valueContext,
104+
Set<ConstraintViolation<T>> constraintViolations) {
104105
CompositionResult compositionResult = validateComposingConstraints(
105106
validationContext, valueContext, constraintViolations
106107
);
@@ -124,7 +125,8 @@ private <T, V> void validateConstraints(ValidationContext<T> validationContext,
124125
);
125126

126127
// check for a potential unwrapper
127-
Type validatedValueType = valueContext.getTypeOfAnnotatedElement();
128+
129+
Type validatedValueType = valueContext.getDeclaredTypeOfValidatedElement();
128130
ValidatedValueUnwrapper validatedValueUnwrapper = validationContext.getValidatedValueUnwrapper(
129131
validatedValueType
130132
);
@@ -197,7 +199,10 @@ private <T> boolean mainConstraintNeedsEvaluation(ValidationContext<T> execution
197199
* @param constraintViolations used to accumulate constraint violations
198200
* @param localViolations set of constraint violations of top level constraint
199201
*/
200-
private <T> void prepareFinalConstraintViolations(ValidationContext<T> executionContext, ValueContext<?, ?> valueContext, Set<ConstraintViolation<T>> constraintViolations, Set<ConstraintViolation<T>> localViolations) {
202+
private <T> void prepareFinalConstraintViolations(ValidationContext<T> executionContext,
203+
ValueContext<?, ?> valueContext,
204+
Set<ConstraintViolation<T>> constraintViolations,
205+
Set<ConstraintViolation<T>> localViolations) {
201206
if ( reportAsSingleViolation() ) {
202207
// We clear the current violations list anyway
203208
constraintViolations.clear();
@@ -240,8 +245,8 @@ private <T> void prepareFinalConstraintViolations(ValidationContext<T> execution
240245
* @return Returns an instance of {@code CompositionResult} relevant for boolean composition of constraints
241246
*/
242247
private <T> CompositionResult validateComposingConstraints(ValidationContext<T> executionContext,
243-
ValueContext<?, ?> valueContext,
244-
Set<ConstraintViolation<T>> constraintViolations) {
248+
ValueContext<?, ?> valueContext,
249+
Set<ConstraintViolation<T>> constraintViolations) {
245250
CompositionResult compositionResult = new CompositionResult( true, false );
246251
for ( ConstraintTree<?> tree : getChildren() ) {
247252
Set<ConstraintViolation<T>> tmpViolations = newHashSet();
@@ -288,9 +293,9 @@ private boolean passesCompositionTypeRequirement(Set<?> constraintViolations, Co
288293
}
289294

290295
private <T, V> Set<ConstraintViolation<T>> validateSingleConstraint(ValidationContext<T> executionContext,
291-
ValueContext<?, ?> valueContext,
292-
ConstraintValidatorContextImpl constraintValidatorContext,
293-
ConstraintValidator<A, V> validator) {
296+
ValueContext<?, ?> valueContext,
297+
ConstraintValidatorContextImpl constraintValidatorContext,
298+
ConstraintValidator<A, V> validator) {
294299
boolean isValid;
295300
try {
296301
@SuppressWarnings("unchecked")

‎engine/src/main/java/org/hibernate/validator/internal/engine/constraintvalidation/ConstraintValidatorManager.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public <V, A extends Annotation> ConstraintValidator<A, V> getInitializedValidat
9191
ConstraintDescriptorImpl<A> descriptor,
9292
ConstraintValidatorFactory constraintValidatorFactory) {
9393
Contracts.assertNotNull( valueContext );
94-
Type typeOfValidatedElement = valueContext.getTypeOfAnnotatedElement();
94+
Type typeOfValidatedElement = valueContext.getDeclaredTypeOfValidatedElement();
9595
Contracts.assertNotNull( typeOfValidatedElement );
9696
Contracts.assertNotNull( descriptor );
9797
Contracts.assertNotNull( constraintValidatorFactory );
@@ -208,7 +208,7 @@ public int numberOfCachedConstraintValidatorInstances() {
208208
private <A extends Annotation> Class<? extends ConstraintValidator<A, ?>>
209209
findMatchingValidatorClass(ValueContext<?, ?> valueContext, ConstraintDescriptorImpl<A> descriptor) {
210210
Map<Type, Class<? extends ConstraintValidator<A, ?>>> availableValidatorTypes = descriptor.getAvailableValidatorTypes();
211-
Type typeOfValidatedElement = valueContext.getTypeOfAnnotatedElement();
211+
Type typeOfValidatedElement = valueContext.getDeclaredTypeOfValidatedElement();
212212

213213
// find constraint validator classes which can directly validate the value to validate
214214
List<Type> suitableTypesForValidatedValue = findSuitableValidatorTypes(
@@ -243,7 +243,7 @@ private Type verifyResolveWasUnique(ValueContext<?, ?> valueContext,
243243
ConstraintDescriptorImpl<?> descriptor,
244244
List<Type> constraintValidatorTypesForValidatedValue,
245245
List<Type> constraintValidatorTypesForWrappedValue) {
246-
Type typeOfValidatedElement = valueContext.getTypeOfAnnotatedElement();
246+
Type typeOfValidatedElement = valueContext.getDeclaredTypeOfValidatedElement();
247247
TypeResolutionResult typeResolutionResult = typeResolutionOutcome(
248248
constraintValidatorTypesForValidatedValue,
249249
constraintValidatorTypesForWrappedValue,
@@ -299,7 +299,7 @@ private Type verifyResolveWasUnique(ValueContext<?, ?> valueContext,
299299
}
300300

301301
private Type getValidatedValueTypeForErrorReporting(ValueContext<?, ?> valueContext) {
302-
Type typeOfValidatedElement = valueContext.getTypeOfAnnotatedElement();
302+
Type typeOfValidatedElement = valueContext.getDeclaredTypeOfValidatedElement();
303303

304304
// for the sake of better reporting we unwrap if there is a unwrapper in the context
305305
if ( valueContext.getValidatedValueHandler() != null ) {
@@ -313,7 +313,7 @@ private TypeResolutionResult typeResolutionOutcome(List<Type> constraintValidato
313313
ValueContext<?, ?> valueContext) {
314314
if ( UnwrapMode.UNWRAP.equals( valueContext.getUnwrapMode() )
315315
&& constraintValidatorTypesForWrappedValue.size() == 0 ) {
316-
throw log.getNoUnwrapperFoundForTypeException( valueContext.getTypeOfAnnotatedElement().toString() );
316+
throw log.getNoUnwrapperFoundForTypeException( valueContext.getDeclaredTypeOfValidatedElement().toString() );
317317
}
318318

319319
if ( constraintValidatorTypesForValidatedValue.size() > 0 && constraintValidatorTypesForWrappedValue.size() > 0 ) {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public final ElementType getElementType() {
7878

7979
public boolean validateConstraint(ValidationContext<?> executionContext, ValueContext<?, ?> valueContext) {
8080
valueContext.setElementType( getElementType() );
81-
valueContext.setTypeOfAnnotatedElement( location.getTypeForValidatorResolution() );
81+
valueContext.setDeclaredTypeOfValidatedElement( location.getTypeForValidatorResolution() );
8282

8383
boolean validationResult = constraintTree.validateConstraints( executionContext, valueContext );
8484
executionContext.markConstraintProcessed( valueContext.getCurrentBean(), valueContext.getPropertyPath(), this );

‎engine/src/test/java/org/hibernate/validator/test/internal/engine/constraintvalidation/ConstraintValidatorManagerTest.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public void testGetDefaultConstraintValidatorFactory() {
7474
public void testGetInitializedValidator() {
7575
ConstraintDescriptorImpl<?> constraintDescriptor = getConstraintDescriptorForProperty( "s1" );
7676
ValueContext valueContext = ValueContext.getLocalExecutionContext( new Foo(), null, null );
77-
valueContext.setTypeOfAnnotatedElement( String.class );
77+
valueContext.setDeclaredTypeOfValidatedElement( String.class );
7878

7979
ConstraintValidator<?, ?> constraintValidator = constraintValidatorManager.getInitializedValidator(
8080
valueContext,
@@ -89,7 +89,7 @@ public void testGetInitializedValidator() {
8989
public void testNullValidatedValueThrowsIllegalArgumentException() {
9090
ConstraintDescriptorImpl<?> constraintDescriptor = getConstraintDescriptorForProperty( "s1" );
9191
ValueContext valueContext = ValueContext.getLocalExecutionContext( new Foo(), null, null );
92-
valueContext.setTypeOfAnnotatedElement( null );
92+
valueContext.setDeclaredTypeOfValidatedElement( null );
9393

9494
constraintValidatorManager.getInitializedValidator(
9595
valueContext,
@@ -101,7 +101,7 @@ public void testNullValidatedValueThrowsIllegalArgumentException() {
101101
@Test(expectedExceptions = IllegalArgumentException.class)
102102
public void testNullDescriptorThrowsIllegalArgumentException() {
103103
ValueContext valueContext = ValueContext.getLocalExecutionContext( new Foo(), null, null );
104-
valueContext.setTypeOfAnnotatedElement( String.class );
104+
valueContext.setDeclaredTypeOfValidatedElement( String.class );
105105

106106
constraintValidatorManager.getInitializedValidator(
107107
valueContext,
@@ -114,7 +114,7 @@ public void testNullDescriptorThrowsIllegalArgumentException() {
114114
public void testNullFactoryThrowsIllegalArgumentException() {
115115
ConstraintDescriptorImpl<?> constraintDescriptor = getConstraintDescriptorForProperty( "s1" );
116116
ValueContext valueContext = ValueContext.getLocalExecutionContext( new Foo(), null, null );
117-
valueContext.setTypeOfAnnotatedElement( String.class );
117+
valueContext.setDeclaredTypeOfValidatedElement( String.class );
118118

119119
constraintValidatorManager.getInitializedValidator(
120120
valueContext,
@@ -131,7 +131,7 @@ public void testUnexpectedTypeException() {
131131
ValueContext valueContext = ValueContext.getLocalExecutionContext(
132132
new Foo(), null, PathImpl.createPathFromString( "s2" )
133133
);
134-
valueContext.setTypeOfAnnotatedElement( Object.class );
134+
valueContext.setDeclaredTypeOfValidatedElement( Object.class );
135135

136136
constraintValidatorManager.getInitializedValidator(
137137
valueContext,
@@ -144,7 +144,7 @@ public void testUnexpectedTypeException() {
144144
public void testConstraintValidatorInstancesAreCachedPerFactory() {
145145
ConstraintDescriptorImpl<?> constraintDescriptor = getConstraintDescriptorForProperty( "s1" );
146146
ValueContext valueContext = ValueContext.getLocalExecutionContext( new Foo(), null, null );
147-
valueContext.setTypeOfAnnotatedElement( String.class );
147+
valueContext.setDeclaredTypeOfValidatedElement( String.class );
148148

149149
ConstraintValidator<?, ?> constraintValidator1 = constraintValidatorManager.getInitializedValidator(
150150
valueContext,
@@ -179,7 +179,7 @@ public void testConstraintValidatorInstancesAreCachedPerFactory() {
179179
public void testOnlyTheInstancesForTheLeastRecentlyUsedCustomFactoryAreCached() {
180180
ConstraintDescriptorImpl<?> constraintDescriptor = getConstraintDescriptorForProperty( "s1" );
181181
ValueContext valueContext = ValueContext.getLocalExecutionContext( new Foo(), null, null );
182-
valueContext.setTypeOfAnnotatedElement( String.class );
182+
valueContext.setDeclaredTypeOfValidatedElement( String.class );
183183

184184
for ( int i = 0; i < 10; i++ ) {
185185
constraintValidatorManager.getInitializedValidator(
@@ -215,7 +215,7 @@ public void testValidatorsAreCachedPerConstraint() {
215215
.getValidator();
216216

217217
ValueContext valueContext = ValueContext.getLocalExecutionContext( new User(), null, null );
218-
valueContext.setTypeOfAnnotatedElement( String.class );
218+
valueContext.setDeclaredTypeOfValidatedElement( String.class );
219219

220220
ConstraintDescriptorImpl<?> notNullOnFirstNameDescriptor = getSingleConstraintDescriptorForProperty(
221221
validator, User.class, "firstName"
@@ -251,7 +251,7 @@ public void testValidatorsAreCachedPerConstraintAndAnnotationMembers() {
251251
.getValidator();
252252

253253
ValueContext valueContext = ValueContext.getLocalExecutionContext( new User(), null, null );
254-
valueContext.setTypeOfAnnotatedElement( String.class );
254+
valueContext.setDeclaredTypeOfValidatedElement( String.class );
255255

256256
ConstraintDescriptorImpl<?> sizeOnMiddleNameDescriptor = getSingleConstraintDescriptorForProperty(
257257
validator, User.class, "middleName"

0 commit comments

Comments
 (0)