X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=yang%2Fyang-parser-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Fstmt%2Frfc6020%2Feffective%2FEffectiveStatementBase.java;h=7f55295465c586afec4228f49cc0ee55cf66480e;hb=f6eae2a11c570c1097eb9202debc7e36ce72ef6d;hp=6b6b82169de1c795a5bbce4183a3bfbb05ccc91b;hpb=acb7eceffb4730d12b1bd01a4d586335d65cf898;p=yangtools.git

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/EffectiveStatementBase.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/EffectiveStatementBase.java
index 6b6b82169d..7f55295465 100644
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/EffectiveStatementBase.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/EffectiveStatementBase.java
@@ -8,6 +8,7 @@
 package org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective;
 
 import com.google.common.base.Optional;
+import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.collect.Collections2;
 import com.google.common.collect.ImmutableList;
@@ -21,91 +22,99 @@ import org.opendaylight.yangtools.yang.model.api.SchemaNode;
 import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.IdentifierNamespace;
-import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
-import org.opendaylight.yangtools.yang.model.api.meta.StatementSource;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils;
 import org.opendaylight.yangtools.yang.parser.stmt.reactor.StatementContextBase;
 
 public abstract class EffectiveStatementBase<A, D extends DeclaredStatement<A>> implements EffectiveStatement<A, D> {
 
-    private final List<? extends EffectiveStatement<?, ?>> substatements;
-    private final StatementSource statementSource;
-    private final StatementDefinition statementDefinition;
-    private final A argument;
-    private final D declaredInstance;
-
-    public EffectiveStatementBase(final StmtContext<A, D, ?> ctx) {
-        this.statementDefinition = ctx.getPublicDefinition();
-        this.argument = ctx.getStatementArgument();
-        this.statementSource = ctx.getStatementSource();
+    private static final Predicate<StmtContext<?, ?, ?>> IS_UNKNOWN_STATEMENT_CONTEXT =
+            StmtContextUtils::isUnknownStatement;
+    private static final Predicate<StmtContext<?, ?, ?>> IS_NOT_UNKNOWN_STATEMENT_CONTEXT =
+            Predicates.not(IS_UNKNOWN_STATEMENT_CONTEXT);
 
-        Collection<StatementContextBase<?, ?, ?>> effectiveSubstatements = ctx.effectiveSubstatements();
+    private final List<? extends EffectiveStatement<?, ?>> substatements;
+    private final List<StatementContextBase<?, ?, ?>> unknownSubstatementsToBuild;
 
-        Collection<StatementContextBase<?, ?, ?>> substatementsInit = new ArrayList<>();
+    protected EffectiveStatementBase(final StmtContext<A, D, ?> ctx) {
+        this(ctx, true);
+    }
 
-        for(StatementContextBase<?, ?, ?> declaredSubstatement : ctx.declaredSubstatements()) {
+    /**
+     * Constructor.
+     *
+     * @param ctx
+     *            context of statement.
+     * @param buildUnknownSubstatements
+     *            if it is false, the unknown substatements are omitted from
+     *            build of effective substatements till the call of either
+     *            effectiveSubstatements or getOmittedUnknownSubstatements
+     *            method. The main purpose of this is to allow the build of
+     *            recursive extension definitions.
+     */
+    protected EffectiveStatementBase(final StmtContext<A, D, ?> ctx, final boolean buildUnknownSubstatements) {
+
+        final Collection<StatementContextBase<?, ?, ?>> effectiveSubstatements = ctx.effectiveSubstatements();
+        final Collection<StatementContextBase<?, ?, ?>> substatementsInit = new ArrayList<>();
+
+        final Collection<StatementContextBase<?, ?, ?>> supportedDeclaredSubStmts = Collections2.filter(
+                ctx.declaredSubstatements(), StmtContextUtils::areFeaturesSupported);
+        for (final StatementContextBase<?, ?, ?> declaredSubstatement : supportedDeclaredSubStmts) {
             if (declaredSubstatement.getPublicDefinition().equals(Rfc6020Mapping.USES)) {
                 substatementsInit.add(declaredSubstatement);
                 substatementsInit.addAll(declaredSubstatement.getEffectOfStatement());
-                ((StatementContextBase<?, ?, ?>)ctx).removeStatementsFromEffectiveSubstatements(declaredSubstatement
+                ((StatementContextBase<?, ?, ?>) ctx).removeStatementsFromEffectiveSubstatements(declaredSubstatement
                         .getEffectOfStatement());
             } else {
                 substatementsInit.add(declaredSubstatement);
             }
         }
-
         substatementsInit.addAll(effectiveSubstatements);
 
-        this.substatements = ImmutableList.copyOf(Collections2.transform(
-            Collections2.filter(substatementsInit, StmtContextUtils.IS_SUPPORTED_TO_BUILD_EFFECTIVE),
-                StmtContextUtils.buildEffective()));
-        declaredInstance = ctx.buildDeclared();
-    }
-
-    @Override
-    public StatementDefinition statementDefinition() {
-        return statementDefinition;
-    }
-
-    @Override
-    public A argument() {
-        return argument;
-    }
+        Collection<StatementContextBase<?, ?, ?>> substatementsToBuild = Collections2.filter(substatementsInit,
+            StmtContext::isSupportedToBuildEffective);
+        if (!buildUnknownSubstatements) {
+            this.unknownSubstatementsToBuild = ImmutableList.copyOf(Collections2.filter(substatementsToBuild,
+                    IS_UNKNOWN_STATEMENT_CONTEXT));
+            substatementsToBuild = Collections2.filter(substatementsToBuild, IS_NOT_UNKNOWN_STATEMENT_CONTEXT);
+        } else {
+            this.unknownSubstatementsToBuild = ImmutableList.of();
+        }
 
-    @Override
-    public StatementSource getStatementSource() {
-        return statementSource;
+        this.substatements = ImmutableList.copyOf(Collections2.transform(substatementsToBuild, StatementContextBase::buildEffective));
     }
 
-    @Override
-    public D getDeclared() {
-        return declaredInstance;
+    Collection<EffectiveStatement<?, ?>> getOmittedUnknownSubstatements() {
+        return Collections2.transform(unknownSubstatementsToBuild, StatementContextBase::buildEffective);
     }
 
     @Override
-    public <K, V, N extends IdentifierNamespace<K, V>> V get(final Class<N> namespace, final K identifier) {
+    public final <K, V, N extends IdentifierNamespace<K, V>> V get(final Class<N> namespace, final K identifier) {
         throw new UnsupportedOperationException("Not implemented yet.");
     }
 
     @Override
-    public <K, V, N extends IdentifierNamespace<K, V>> Map<K, V> getAll(final Class<N> namespace) {
+    public final <K, V, N extends IdentifierNamespace<K, V>> Map<K, V> getAll(final Class<N> namespace) {
         throw new UnsupportedOperationException("Not implemented yet.");
     }
 
     @Override
-    public Collection<? extends EffectiveStatement<?, ?>> effectiveSubstatements() {
-        return substatements;
+    public final Collection<? extends EffectiveStatement<?, ?>> effectiveSubstatements() {
+        if (unknownSubstatementsToBuild.isEmpty()) {
+            return substatements;
+        } else {
+            return ImmutableList.copyOf(Iterables.concat(substatements, getOmittedUnknownSubstatements()));
+        }
     }
 
     protected final <S extends EffectiveStatement<?, ?>> S firstEffective(final Class<S> type) {
-        Optional<? extends EffectiveStatement<?, ?>> possible = Iterables.tryFind(substatements,
+        final Optional<? extends EffectiveStatement<?, ?>> possible = Iterables.tryFind(substatements,
                 Predicates.instanceOf(type));
         return possible.isPresent() ? type.cast(possible.get()) : null;
     }
 
     protected final <S extends SchemaNode> S firstSchemaNode(final Class<S> type) {
-        Optional<? extends EffectiveStatement<?, ?>> possible = Iterables.tryFind(substatements,
+        final Optional<? extends EffectiveStatement<?, ?>> possible = Iterables.tryFind(substatements,
                 Predicates.instanceOf(type));
         return possible.isPresent() ? type.cast(possible.get()) : null;
     }
@@ -116,20 +125,18 @@ public abstract class EffectiveStatementBase<A, D extends DeclaredStatement<A>>
     }
 
     protected final <T> T firstSubstatementOfType(final Class<T> type) {
-        Optional<? extends EffectiveStatement<?, ?>> possible = Iterables.tryFind(substatements,
+        final Optional<? extends EffectiveStatement<?, ?>> possible = Iterables.tryFind(substatements,
                 Predicates.instanceOf(type));
         return possible.isPresent() ? type.cast(possible.get()) : null;
     }
 
     protected final <R> R firstSubstatementOfType(final Class<?> type, final Class<R> returnType) {
-        Optional<? extends EffectiveStatement<?, ?>> possible = Iterables.tryFind(substatements,
+        final Optional<? extends EffectiveStatement<?, ?>> possible = Iterables.tryFind(substatements,
                 Predicates.and(Predicates.instanceOf(type), Predicates.instanceOf(returnType)));
         return possible.isPresent() ? returnType.cast(possible.get()) : null;
     }
 
     protected final EffectiveStatement<?, ?> firstEffectiveSubstatementOfType(final Class<?> type) {
-        Optional<? extends EffectiveStatement<?, ?>> possible = Iterables.tryFind(substatements,
-                Predicates.instanceOf(type));
-        return possible.isPresent() ? possible.get() : null;
+        return Iterables.tryFind(substatements, Predicates.instanceOf(type)).orNull();
     }
 }