diff options
author | Jim Hahn <jrh3@att.com> | 2021-01-07 10:03:30 -0500 |
---|---|---|
committer | Jim Hahn <jrh3@att.com> | 2021-01-07 10:04:58 -0500 |
commit | 4fd3271364741062cfc3b84b79425e93e3e3d864 (patch) | |
tree | 840208d1507269767b51e1b63c92f7e2a629a418 /common-parameters/src/main/java/org/onap/policy/common/parameters/BeanValidator.java | |
parent | 8208cc4b1d8855eee3fe59c7a832abccb2a67ed7 (diff) |
Deprecate old validation annotations
Removed @Items and @Entries validation annotations, as they are no
longer needed.
Issue-ID: POLICY-2648
Change-Id: I68b78738d520ad96175567572e3c2f4a845dae44
Signed-off-by: Jim Hahn <jrh3@att.com>
Diffstat (limited to 'common-parameters/src/main/java/org/onap/policy/common/parameters/BeanValidator.java')
-rw-r--r-- | common-parameters/src/main/java/org/onap/policy/common/parameters/BeanValidator.java | 100 |
1 files changed, 0 insertions, 100 deletions
diff --git a/common-parameters/src/main/java/org/onap/policy/common/parameters/BeanValidator.java b/common-parameters/src/main/java/org/onap/policy/common/parameters/BeanValidator.java index 6791c616..68455ac3 100644 --- a/common-parameters/src/main/java/org/onap/policy/common/parameters/BeanValidator.java +++ b/common-parameters/src/main/java/org/onap/policy/common/parameters/BeanValidator.java @@ -20,14 +20,11 @@ package org.onap.policy.common.parameters; -import java.lang.annotation.Annotation; import java.lang.reflect.Field; import java.util.Collection; import java.util.Map; import java.util.Map.Entry; import org.apache.commons.lang3.StringUtils; -import org.onap.policy.common.parameters.annotations.Entries; -import org.onap.policy.common.parameters.annotations.Items; import org.onap.policy.common.parameters.annotations.Max; import org.onap.policy.common.parameters.annotations.Min; import org.onap.policy.common.parameters.annotations.NotBlank; @@ -81,8 +78,6 @@ public class BeanValidator { validator.addAnnotation(Min.class, this::verMin); validator.addAnnotation(Pattern.class, this::verRegex); validator.addAnnotation(Valid.class, this::verCascade); - validator.addAnnotation(Items.class, this::verCollection); - validator.addAnnotation(Entries.class, this::verMap); } /** @@ -277,29 +272,6 @@ public class BeanValidator { * * @param result where to add the validation result * @param fieldName name of the field containing the collection - * @param annot validation annotations for individual items - * @param value value to be verified - * @return {@code true} if the next check should be performed, {@code false} otherwise - */ - public boolean verCollection(BeanValidationResult result, String fieldName, Annotation annot, Object value) { - - if (!(value instanceof Collection)) { - return true; - } - - ItemValidator itemValidator = makeItemValidator(annot); - if (itemValidator.isEmpty()) { - return true; - } - - return verCollection(result, fieldName, itemValidator, value); - } - - /** - * Validates the items in a collection. - * - * @param result where to add the validation result - * @param fieldName name of the field containing the collection * @param itemValidator validator for individual items within the list * @param value value to be verified * @return {@code true} if the next check should be performed, {@code false} otherwise @@ -332,57 +304,6 @@ public class BeanValidator { * * @param result where to add the validation result * @param fieldName name of the field containing the map - * @param annot validation annotations for individual entries - * @param value value to be verified - * @return {@code true} if the next check should be performed, {@code false} otherwise - */ - public boolean verMap(BeanValidationResult result, String fieldName, Entries annot, Object value) { - - if (!(value instanceof Map)) { - return true; - } - - EntryValidator entryValidator = makeEntryValidator(annot.key(), annot.value()); - - return verMap(result, fieldName, entryValidator, value); - } - - /** - * Validates the items in a Map. - * - * @param result where to add the validation result - * @param fieldName name of the field containing the map - * @param entryValidator validator for individual entries within the Map - * @param value value to be verified - * @return {@code true} if the next check should be performed, {@code false} otherwise - */ - public boolean verMap(BeanValidationResult result, String fieldName, EntryValidator entryValidator, Object value) { - - if (!(value instanceof Map) || entryValidator.isEmpty()) { - return true; - } - - Map<?, ?> map = (Map<?, ?>) value; - - BeanValidationResult result2 = new BeanValidationResult(fieldName, value); - - for (Entry<?, ?> entry : map.entrySet()) { - entryValidator.validateEntry(result2, entry); - } - - if (result2.isClean()) { - return true; - } - - result.addResult(result2); - return false; - } - - /** - * Validates the items in a Map. - * - * @param result where to add the validation result - * @param fieldName name of the field containing the map * @param keyValidator validator for an individual key within the Map entry * @param valueValidator validator for an individual value within the Map entry * @param value value to be verified @@ -446,27 +367,6 @@ public class BeanValidator { } /** - * Makes an item validator. - * - * @param annot container for the item annotations - * @return a new item validator - */ - protected ItemValidator makeItemValidator(Annotation annot) { - return new ItemValidator(this, annot); - } - - /** - * Makes an entry validator. - * - * @param keyAnnot container for the annotations associated with the entry key - * @param valueAnnot container for the annotations associated with the entry value - * @return a new entry validator - */ - protected EntryValidator makeEntryValidator(Annotation keyAnnot, Annotation valueAnnot) { - return new EntryValidator(this, keyAnnot, valueAnnot); - } - - /** * Translates a value to something printable, for use by * {@link ObjectValidationResult}. This default method simply returns the original * value. |