Repository: bval Updated Branches: refs/heads/bv2 36920e87f -> f8da02117
executable descriptor cleanup Project: http://git-wip-us.apache.org/repos/asf/bval/repo Commit: http://git-wip-us.apache.org/repos/asf/bval/commit/433e42b2 Tree: http://git-wip-us.apache.org/repos/asf/bval/tree/433e42b2 Diff: http://git-wip-us.apache.org/repos/asf/bval/diff/433e42b2 Branch: refs/heads/bv2 Commit: 433e42b2ed1d7799053031b8bd0866501e032c4b Parents: 36920e8 Author: Matt Benson <[email protected]> Authored: Thu Mar 15 15:21:25 2018 -0500 Committer: Matt Benson <[email protected]> Committed: Thu Mar 15 15:21:25 2018 -0500 ---------------------------------------------------------------------- .../java/org/apache/bval/jsr/descriptor/ConstructorD.java | 5 ----- .../org/apache/bval/jsr/descriptor/DescriptorManager.java | 9 +++++++-- .../java/org/apache/bval/jsr/descriptor/ExecutableD.java | 10 ++-------- .../main/java/org/apache/bval/jsr/descriptor/MethodD.java | 5 ----- 4 files changed, 9 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bval/blob/433e42b2/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ConstructorD.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ConstructorD.java b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ConstructorD.java index 2385384..f917d35 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ConstructorD.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ConstructorD.java @@ -33,9 +33,4 @@ public class ConstructorD<T> extends ExecutableD<Constructor<? extends T>, Metad public Class<?> getElementClass() { return getParent().getElementClass(); } - - @Override - protected String nameOf(Constructor<? extends T> e) { - return e.getDeclaringClass().getSimpleName(); - } } http://git-wip-us.apache.org/repos/asf/bval/blob/433e42b2/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/DescriptorManager.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/DescriptorManager.java b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/DescriptorManager.java index 3c7365e..8f1e22f 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/DescriptorManager.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/DescriptorManager.java @@ -25,6 +25,7 @@ import javax.validation.metadata.BeanDescriptor; import javax.validation.metadata.CascadableDescriptor; import javax.validation.metadata.ContainerDescriptor; import javax.validation.metadata.ElementDescriptor; +import javax.validation.metadata.ExecutableDescriptor; import org.apache.bval.jsr.ApacheValidatorFactory; import org.apache.bval.jsr.metadata.AnnotationBehaviorMergeStrategy; @@ -38,8 +39,12 @@ import org.apache.bval.util.Validate; public class DescriptorManager { public static <D extends ElementDescriptor & CascadableDescriptor & ContainerDescriptor> boolean isConstrained( D descriptor) { - return descriptor.hasConstraints() || descriptor.isCascaded() - || !descriptor.getConstrainedContainerElementTypes().isEmpty(); + return descriptor != null && (descriptor.hasConstraints() || descriptor.isCascaded() + || !descriptor.getConstrainedContainerElementTypes().isEmpty()); + } + + public static <E extends ExecutableDescriptor> boolean isConstrained(E descriptor) { + return descriptor != null && (descriptor.hasConstrainedParameters() || descriptor.hasConstrainedReturnValue()); } private final ApacheValidatorFactory validatorFactory; http://git-wip-us.apache.org/repos/asf/bval/blob/433e42b2/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ExecutableD.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ExecutableD.java b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ExecutableD.java index 4cbb22f..eab7a9a 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ExecutableD.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/ExecutableD.java @@ -68,17 +68,11 @@ public abstract class ExecutableD<E extends Executable, R extends MetadataReader @Override public final boolean hasConstrainedParameters() { - return parameters.stream().anyMatch(this::isConstrained); + return parameters.stream().anyMatch(DescriptorManager::isConstrained) || getCrossParameterDescriptor().hasConstraints(); } @Override public final boolean hasConstrainedReturnValue() { - return isConstrained(returnValue); - } - - protected abstract String nameOf(E e); - - private boolean isConstrained(CascadableContainerD<?, ?> child) { - return child.isCascaded() || child.hasConstraints(); + return DescriptorManager.isConstrained(returnValue); } } http://git-wip-us.apache.org/repos/asf/bval/blob/433e42b2/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/MethodD.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/MethodD.java b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/MethodD.java index 73585b5..04ff63e 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/MethodD.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/MethodD.java @@ -41,9 +41,4 @@ class MethodD extends ExecutableD<Method, MetadataReader.ForMethod, MethodD> imp MethodType getMethodType() { return methodType; } - - @Override - protected String nameOf(Method e) { - return e.getName(); - } }
