X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-parser-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Fspi%2Fmeta%2FSubstatementValidator.java;h=2bacaa40af0f585a1f65b60d43c4b92872a7c950;hb=16db760aab4b98e1980877bc6adb971b413af198;hp=654d68599366d27b41d67ea7116c4eb407d14a95;hpb=0c39d30a237a61b7a7eb0fecb066004ff561e1a9;p=yangtools.git

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SubstatementValidator.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SubstatementValidator.java
index 654d685993..2bacaa40af 100644
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SubstatementValidator.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/spi/meta/SubstatementValidator.java
@@ -10,7 +10,6 @@ package org.opendaylight.yangtools.yang.parser.spi.meta;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;
 import java.util.HashMap;
 import java.util.Map;
@@ -117,7 +116,7 @@ public final class SubstatementValidator {
             MissingSubstatementException {
 
         final Map<StatementDefinition, Counter> stmtCounts = new HashMap<>();
-        for (StmtContext<?, ?, ?> stmtCtx : Iterables.concat(ctx.declaredSubstatements(), ctx.effectiveSubstatements())) {
+        for (StmtContext<?, ?, ?> stmtCtx : ctx.allSubstatements()) {
             stmtCounts.computeIfAbsent(stmtCtx.getPublicDefinition(), key -> new Counter()).increment();
         }