Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor MethodValidationAdapter constructors

Browse Source 
See gh-31082
This commit is contained in:
rstoyanchev
2023-08-22 11:33:26 +03:00
parent ff069de6d7
commit 942800e8ec
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
spring-context/src/main/java/org/springframework/validation/beanvalidation/MethodValidationAdapter.java
View File

@@ -93,10 +93,9 @@ public class MethodValidationAdapter implements MethodValidator {
/**
* Create an instance using a default JSR-303 validator underneath.
*/
@SuppressWarnings("DataFlowIssue")
public MethodValidationAdapter() {
this.validator = SingletonSupplier.of(() -> Validation.buildDefaultValidatorFactory().getValidator());
this.validatorAdapter = SingletonSupplier.of(() -> new SpringValidatorAdapter(this.validator.get()));
this.validatorAdapter = initValidatorAdapter(this.validator);
}
/**
@@ -105,8 +104,14 @@ public class MethodValidationAdapter implements MethodValidator {
*/
@SuppressWarnings("DataFlowIssue")
public MethodValidationAdapter(ValidatorFactory validatorFactory) {
this.validator = SingletonSupplier.of(validatorFactory::getValidator);
this.validatorAdapter = SingletonSupplier.of(() -> new SpringValidatorAdapter(this.validator.get()));
if (validatorFactory instanceof SpringValidatorAdapter adapter) {
this.validator = () -> adapter;
this.validatorAdapter = () -> adapter;
}
else {
this.validator = SingletonSupplier.of(validatorFactory::getValidator);
this.validatorAdapter = SingletonSupplier.of(() -> new SpringValidatorAdapter(this.validator.get()));
}
}
/**
@@ -115,7 +120,7 @@ public class MethodValidationAdapter implements MethodValidator {
*/
public MethodValidationAdapter(Validator validator) {
this.validator = () -> validator;
this.validatorAdapter = () -> new SpringValidatorAdapter(validator);
this.validatorAdapter = initValidatorAdapter(this.validator);
}
/**
@@ -124,7 +129,13 @@ public class MethodValidationAdapter implements MethodValidator {
*/
public MethodValidationAdapter(Supplier<Validator> validator) {
this.validator = validator;
this.validatorAdapter = () -> new SpringValidatorAdapter(this.validator.get());
this.validatorAdapter = initValidatorAdapter(validator);
}
private static Supplier<SpringValidatorAdapter> initValidatorAdapter(Supplier<Validator> validatorSupplier) {
Validator validator = validatorSupplier.get();
return (validator instanceof SpringValidatorAdapter validatorAdapter ?
(() -> validatorAdapter) : SingletonSupplier.of(() -> new SpringValidatorAdapter(validator)));
}