Repository: bval Updated Branches: refs/heads/bv2 64b02d8f7 -> 4fd0140fd
remove ueseless conditional logic and deprecated code Project: http://git-wip-us.apache.org/repos/asf/bval/repo Commit: http://git-wip-us.apache.org/repos/asf/bval/commit/72f5248e Tree: http://git-wip-us.apache.org/repos/asf/bval/tree/72f5248e Diff: http://git-wip-us.apache.org/repos/asf/bval/diff/72f5248e Branch: refs/heads/bv2 Commit: 72f5248ec4af83c67bd53edeb8ee271eb5dd7323 Parents: 64b02d8 Author: Matt Benson <[email protected]> Authored: Fri Mar 23 09:48:12 2018 -0500 Committer: Matt Benson <[email protected]> Committed: Fri Mar 23 09:48:12 2018 -0500 ---------------------------------------------------------------------- .../org/apache/bval/jsr/ConstraintCached.java | 51 +------------------- 1 file changed, 2 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bval/blob/72f5248e/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintCached.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintCached.java b/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintCached.java index e412c30..faa9144 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintCached.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintCached.java @@ -105,55 +105,8 @@ public class ConstraintCached { new Lazy<>(this::createValidatorMappingProvider); public void add(ValidatorMappingProvider validatorMappingProvider) { - if (customValidatorMappingProviders.add(validatorMappingProvider)) { - this.validatorMappingProvider.reset(this::createValidatorMappingProvider); - } - } - - /** - * Record the set of validator classes for a given constraint annotation. - * - * @param annotationClass - * @param definitionClasses - */ - @Deprecated - public <A extends Annotation> void putConstraintValidator(Class<A> annotationClass, - Class<? extends ConstraintValidator<A, ?>>[] definitionClasses) { - if (ObjectUtils.isEmpty(definitionClasses)) { - return; - } - Validate.notNull(annotationClass, "annotationClass"); - Stream.of(definitionClasses).map(ConstraintValidatorInfo::new) - .forEach(constraintValidatorInfo.computeIfAbsent(annotationClass, k -> new HashSet<>())::add); - } - - /** - * Learn whether we have cached the validator classes for the requested - * constraint annotation. - * - * @param annotationClass - * to look up - * @return boolean - */ - @Deprecated - public boolean containsConstraintValidator(Class<? extends Annotation> annotationClass) { - return constraintValidatorInfo.containsKey(annotationClass); - } - - /** - * Get the cached validator classes for the requested constraint annotation. - * - * @param constraintType - * to look up - * @return array of {@link ConstraintValidator} implementation types - */ - @SuppressWarnings("unchecked") - @Deprecated - public <A extends Annotation> Class<? extends ConstraintValidator<A, ?>>[] getConstraintValidators( - Class<A> constraintType) { - final Set<ConstraintValidatorInfo<A>> infos = infos(constraintType); - return infos == null ? new Class[0] - : infos.stream().map(ConstraintValidatorInfo::getType).toArray(Class[]::new); + customValidatorMappingProviders.add(validatorMappingProvider); + this.validatorMappingProvider.reset(this::createValidatorMappingProvider); } public <A extends Annotation> List<Class<? extends ConstraintValidator<A, ?>>> getConstraintValidatorClasses(
