Skip to content

Commit 7a7d410

Browse files
jhoellerjhoeller
committed
Polishing
1 parent 53ebbb2 commit 7a7d410

File tree

2 files changed

+32
-32
lines changed

2 files changed

+32
-32
lines changed

‎spring-context-support/src/test/java/org/springframework/validation/beanvalidation2/SpringValidatorAdapterTests.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@
1717
package org.springframework.validation.beanvalidation2;
1818

1919
import java.lang.annotation.Documented;
20+
import java.lang.annotation.ElementType;
2021
import java.lang.annotation.Inherited;
2122
import java.lang.annotation.Repeatable;
2223
import java.lang.annotation.Retention;
24+
import java.lang.annotation.RetentionPolicy;
2325
import java.lang.annotation.Target;
2426
import java.lang.reflect.Field;
2527
import java.util.ArrayList;
@@ -55,8 +57,6 @@
5557
import org.springframework.validation.FieldError;
5658
import org.springframework.validation.beanvalidation.SpringValidatorAdapter;
5759

58-
import static java.lang.annotation.ElementType.*;
59-
import static java.lang.annotation.RetentionPolicy.*;
6060
import static org.hamcrest.core.Is.*;
6161
import static org.hamcrest.core.StringContains.*;
6262
import static org.junit.Assert.*;
@@ -327,8 +327,8 @@ public void setConfirmEmail(String confirmEmail) {
327327

328328
@Documented
329329
@Constraint(validatedBy = {SameValidator.class})
330-
@Target({TYPE, ANNOTATION_TYPE})
331-
@Retention(RUNTIME)
330+
@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
331+
@Retention(RetentionPolicy.RUNTIME)
332332
@Repeatable(SameGroup.class)
333333
@interface Same {
334334

@@ -342,8 +342,8 @@ public void setConfirmEmail(String confirmEmail) {
342342

343343
String comparingField();
344344

345-
@Target({TYPE, ANNOTATION_TYPE})
346-
@Retention(RUNTIME)
345+
@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
346+
@Retention(RetentionPolicy.RUNTIME)
347347
@Documented
348348
@interface List {
349349
Same[] value();
@@ -353,8 +353,8 @@ public void setConfirmEmail(String confirmEmail) {
353353

354354
@Documented
355355
@Inherited
356-
@Retention(RUNTIME)
357-
@Target({TYPE, ANNOTATION_TYPE})
356+
@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
357+
@Retention(RetentionPolicy.RUNTIME)
358358
@interface SameGroup {
359359

360360
Same[] value();
@@ -490,7 +490,7 @@ public void setParent(Parent parent) {
490490

491491

492492
@Constraint(validatedBy = AnythingValidator.class)
493-
@Retention(RUNTIME)
493+
@Retention(RetentionPolicy.RUNTIME)
494494
public @interface AnythingValid {
495495

496496
String message() default "{AnythingValid.message}";
@@ -511,22 +511,22 @@ public void initialize(AnythingValid constraintAnnotation) {
511511

512512
@Override
513513
public boolean isValid(Object value, ConstraintValidatorContext context) {
514-
List<Field> fieldsErros = new ArrayList<>();
515-
Arrays.asList(value.getClass().getDeclaredFields()).forEach(f -> {
516-
f.setAccessible(true);
514+
List<Field> fieldsErrors = new ArrayList<>();
515+
Arrays.asList(value.getClass().getDeclaredFields()).forEach(field -> {
516+
field.setAccessible(true);
517517
try {
518-
if (!f.getName().equals(ID) && f.get(value) == null) {
519-
fieldsErros.add(f);
518+
if (!field.getName().equals(ID) && field.get(value) == null) {
519+
fieldsErrors.add(field);
520520
context.buildConstraintViolationWithTemplate(context.getDefaultConstraintMessageTemplate())
521-
.addPropertyNode(f.getName())
521+
.addPropertyNode(field.getName())
522522
.addConstraintViolation();
523523
}
524524
}
525525
catch (IllegalAccessException ex) {
526526
throw new IllegalStateException(ex);
527527
}
528528
});
529-
return fieldsErros.isEmpty();
529+
return fieldsErrors.isEmpty();
530530
}
531531
}
532532

‎spring-context/src/test/java/org/springframework/validation/beanvalidation/SpringValidatorAdapterTests.java

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@
1717
package org.springframework.validation.beanvalidation;
1818

1919
import java.lang.annotation.Documented;
20+
import java.lang.annotation.ElementType;
2021
import java.lang.annotation.Inherited;
2122
import java.lang.annotation.Repeatable;
2223
import java.lang.annotation.Retention;
24+
import java.lang.annotation.RetentionPolicy;
2325
import java.lang.annotation.Target;
2426
import java.lang.reflect.Field;
2527
import java.util.ArrayList;
@@ -52,8 +54,6 @@
5254
import org.springframework.validation.BeanPropertyBindingResult;
5355
import org.springframework.validation.FieldError;
5456

55-
import static java.lang.annotation.ElementType.*;
56-
import static java.lang.annotation.RetentionPolicy.*;
5757
import static org.hamcrest.core.Is.*;
5858
import static org.hamcrest.core.StringContains.*;
5959
import static org.junit.Assert.*;
@@ -282,8 +282,8 @@ public void setConfirmEmail(String confirmEmail) {
282282

283283
@Documented
284284
@Constraint(validatedBy = {SameValidator.class})
285-
@Target({TYPE, ANNOTATION_TYPE})
286-
@Retention(RUNTIME)
285+
@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
286+
@Retention(RetentionPolicy.RUNTIME)
287287
@Repeatable(SameGroup.class)
288288
@interface Same {
289289

@@ -297,8 +297,8 @@ public void setConfirmEmail(String confirmEmail) {
297297

298298
String comparingField();
299299

300-
@Target({TYPE, ANNOTATION_TYPE})
301-
@Retention(RUNTIME)
300+
@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
301+
@Retention(RetentionPolicy.RUNTIME)
302302
@Documented
303303
@interface List {
304304
Same[] value();
@@ -308,8 +308,8 @@ public void setConfirmEmail(String confirmEmail) {
308308

309309
@Documented
310310
@Inherited
311-
@Retention(RUNTIME)
312-
@Target({TYPE, ANNOTATION_TYPE})
311+
@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE})
312+
@Retention(RetentionPolicy.RUNTIME)
313313
@interface SameGroup {
314314

315315
Same[] value();
@@ -445,7 +445,7 @@ public void setParent(Parent parent) {
445445

446446

447447
@Constraint(validatedBy = AnythingValidator.class)
448-
@Retention(RUNTIME)
448+
@Retention(RetentionPolicy.RUNTIME)
449449
public @interface AnythingValid {
450450

451451
String message() default "{AnythingValid.message}";
@@ -466,22 +466,22 @@ public void initialize(AnythingValid constraintAnnotation) {
466466

467467
@Override
468468
public boolean isValid(Object value, ConstraintValidatorContext context) {
469-
List<Field> fieldsErros = new ArrayList<>();
470-
Arrays.asList(value.getClass().getDeclaredFields()).forEach(f -> {
471-
f.setAccessible(true);
469+
List<Field> fieldsErrors = new ArrayList<>();
470+
Arrays.asList(value.getClass().getDeclaredFields()).forEach(field -> {
471+
field.setAccessible(true);
472472
try {
473-
if (!f.getName().equals(ID) && f.get(value) == null) {
474-
fieldsErros.add(f);
473+
if (!field.getName().equals(ID) && field.get(value) == null) {
474+
fieldsErrors.add(field);
475475
context.buildConstraintViolationWithTemplate(context.getDefaultConstraintMessageTemplate())
476-
.addPropertyNode(f.getName())
476+
.addPropertyNode(field.getName())
477477
.addConstraintViolation();
478478
}
479479
}
480480
catch (IllegalAccessException ex) {
481481
throw new IllegalStateException(ex);
482482
}
483483
});
484-
return fieldsErros.isEmpty();
484+
return fieldsErrors.isEmpty();
485485
}
486486
}
487487

0 commit comments

Comments
 (0)