Repository: bval Updated Branches: refs/heads/bv2 42550a70e -> f28324ea4
small cleanups Project: http://git-wip-us.apache.org/repos/asf/bval/repo Commit: http://git-wip-us.apache.org/repos/asf/bval/commit/f28324ea Tree: http://git-wip-us.apache.org/repos/asf/bval/tree/f28324ea Diff: http://git-wip-us.apache.org/repos/asf/bval/diff/f28324ea Branch: refs/heads/bv2 Commit: f28324ea4f7a0614f1f1f9d1ce35d149cdefc8d7 Parents: 42550a7 Author: Matt Benson <[email protected]> Authored: Wed Feb 28 12:39:19 2018 -0600 Committer: Matt Benson <[email protected]> Committed: Wed Feb 28 12:39:19 2018 -0600 ---------------------------------------------------------------------- .../java/org/apache/bval/jsr/metadata/HierarchyBuilder.java | 6 +++--- .../java/org/apache/bval/jsr/metadata/ReflectionBuilder.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bval/blob/f28324ea/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/HierarchyBuilder.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/HierarchyBuilder.java b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/HierarchyBuilder.java index f3658d6..ea3f7cb 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/HierarchyBuilder.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/HierarchyBuilder.java @@ -55,11 +55,11 @@ import org.apache.commons.weaver.privilizer.Privilizing.CallTo; @Privilizing(@CallTo(Reflection.class)) public class HierarchyBuilder extends CompositeBuilder { - static abstract class HierarchyDelegate<E extends AnnotatedElement, T> { - final T delegate; + static abstract class HierarchyDelegate<E extends AnnotatedElement, D extends HasAnnotationBehavior> { + final D delegate; final Meta<E> hierarchyElement; - HierarchyDelegate(T delegate, Meta<E> hierarchyElement) { + HierarchyDelegate(D delegate, Meta<E> hierarchyElement) { super(); this.delegate = Validate.notNull(delegate, "delegate"); this.hierarchyElement = Validate.notNull(hierarchyElement, "hierarchyElement"); http://git-wip-us.apache.org/repos/asf/bval/blob/f28324ea/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/ReflectionBuilder.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/ReflectionBuilder.java b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/ReflectionBuilder.java index d9722ec..a8a6984 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/ReflectionBuilder.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/metadata/ReflectionBuilder.java @@ -162,7 +162,7 @@ public class ReflectionBuilder { final AnnotatedType[] typeArgs = container.getAnnotatedActualTypeArguments(); for (int i = 0; i < typeArgs.length; i++) { - ContainerElementKey key = new ContainerElementKey(container, i); + final ContainerElementKey key = new ContainerElementKey(container, i); result.put(key, new ReflectionBuilder.ForContainer<>(new Meta.ForContainerElement(meta, key))); } return result;
