Repository: bval Updated Branches: refs/heads/bv2 3a30b1607 -> bfc73cda2
simplify Project: http://git-wip-us.apache.org/repos/asf/bval/repo Commit: http://git-wip-us.apache.org/repos/asf/bval/commit/bfc73cda Tree: http://git-wip-us.apache.org/repos/asf/bval/tree/bfc73cda Diff: http://git-wip-us.apache.org/repos/asf/bval/diff/bfc73cda Branch: refs/heads/bv2 Commit: bfc73cda22f4b251136bff8a7df0af4ace25acc4 Parents: 3a30b16 Author: Matt Benson <[email protected]> Authored: Wed Feb 28 11:49:48 2018 -0600 Committer: Matt Benson <[email protected]> Committed: Wed Feb 28 11:49:48 2018 -0600 ---------------------------------------------------------------------- .../java/org/apache/bval/jsr/metadata/HierarchyBuilder.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bval/blob/bfc73cda/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 975a9f4..f3658d6 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 @@ -283,16 +283,11 @@ public class HierarchyBuilder extends CompositeBuilder { final Iterator<Class<?>> hierarchy = Reflection.hierarchy(beanClass, Interfaces.INCLUDE).iterator(); hierarchy.next(); - // filter; map; skip null/empty hierarchy builders, mapping others to BeanDelegate + // filter; map; skip empty hierarchy builders, mapping others to BeanDelegate hierarchy.forEachRemaining(t -> Optional.of(t).filter(this::canValidate).map(getBeanBuilder) .filter(b -> !b.isEmpty()).map(b -> new BeanDelegate(b, t)).ifPresent(delegates::add)); - // if we have nothing but empty builders (which should only happen for - // absent custom metadata), return empty: - if (delegates.stream().allMatch(MetadataBuilder.ForBean::isEmpty)) { - return EmptyBuilder.instance().forBean(); - } - return delegates.stream().collect(compose()); + return delegates.size() == 1 ? delegates.get(0) : delegates.stream().collect(compose()); } @Override
