Repository: bval Updated Branches: refs/heads/master 0e7541f30 -> fdd108fb5
cache constrained container element types Project: http://git-wip-us.apache.org/repos/asf/bval/repo Commit: http://git-wip-us.apache.org/repos/asf/bval/commit/fdd108fb Tree: http://git-wip-us.apache.org/repos/asf/bval/tree/fdd108fb Diff: http://git-wip-us.apache.org/repos/asf/bval/diff/fdd108fb Branch: refs/heads/master Commit: fdd108fb557e42fa3298a8709f67bd6ac0b51994 Parents: 0e7541f Author: Matt Benson <[email protected]> Authored: Thu Feb 7 16:12:00 2019 -0600 Committer: Matt Benson <[email protected]> Committed: Thu Feb 7 16:12:00 2019 -0600 ---------------------------------------------------------------------- .../org/apache/bval/jsr/descriptor/CascadableContainerD.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bval/blob/fdd108fb/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/CascadableContainerD.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/CascadableContainerD.java b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/CascadableContainerD.java index 6894e34..117e870 100644 --- a/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/CascadableContainerD.java +++ b/bval-jsr/src/main/java/org/apache/bval/jsr/descriptor/CascadableContainerD.java @@ -35,13 +35,14 @@ public abstract class CascadableContainerD<P extends ElementD<?, ?>, E extends A private final boolean cascaded; private final Set<GroupConversion> groupConversions; - private final Set<ContainerElementTypeD> containerElementTypes; + private final Set<ContainerElementTypeDescriptor> containerElementTypes; protected CascadableContainerD(MetadataReader.ForContainer<E> reader, P parent) { super(reader, parent); cascaded = reader.isCascaded(); groupConversions = reader.getGroupConversions(); - containerElementTypes = reader.getContainerElementTypes(this); + containerElementTypes = reader.getContainerElementTypes(this).stream().filter(DescriptorManager::isConstrained) + .collect(ToUnmodifiable.set()); } @Override @@ -62,7 +63,6 @@ public abstract class CascadableContainerD<P extends ElementD<?, ?>, E extends A @Override public Set<ContainerElementTypeDescriptor> getConstrainedContainerElementTypes() { - return containerElementTypes.stream().filter(DescriptorManager::isConstrained) - .collect(ToUnmodifiable.set()); + return containerElementTypes; } }
