Drop QNameModuleAware from AugmentEffectiveStatementImpl

This interface is not specified and hence should not be used.

JIRA: YANGTOOLS-1409
Change-Id: I5d3d6dc34d85d360e92c05f083f10b475c732b0a
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/EffectiveStatements.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/EffectiveStatements.java
index 24add861e225c69ed7293d3cac505ac0591b2eac..cfafe51912be4ede51055bc51aed42fdc3d829b2 100644 (file)
--- a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/EffectiveStatements.java
+++ b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/EffectiveStatements.java
@@ -15,7 +15,6 @@ import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.ElementCountConstraint;
 import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode;
@@ -343,10 +342,10 @@ public final class EffectiveStatements {
     }
 
     public static AugmentEffectiveStatement createAugment(final AugmentStatement declared,
-            final SchemaNodeIdentifier argument, final int flags, final QNameModule rootModuleQName,
+            final SchemaNodeIdentifier argument, final int flags,
             final ImmutableList<? extends EffectiveStatement<?, ?>> substatements)
                 throws SubstatementIndexingException {
-        return new AugmentEffectiveStatementImpl(declared, argument, flags, rootModuleQName, substatements);
+        return new AugmentEffectiveStatementImpl(declared, argument, flags, substatements);
     }
 
     public static BaseEffectiveStatement createBase(final BaseStatement declared,

diff --git a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AugmentEffectiveStatementImpl.java b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AugmentEffectiveStatementImpl.java
index 46d4c6dd2baaa5b8ff9bb04751c601db37078aef..76b1c4f347d44796a36f71b496edc97fe3e5749b 100644 (file)
--- a/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AugmentEffectiveStatementImpl.java
+++ b/model/yang-model-ri/src/main/java/org/opendaylight/yangtools/yang/model/ri/stmt/impl/eff/AugmentEffectiveStatementImpl.java
@@ -12,10 +12,8 @@ import static java.util.Objects.requireNonNull;
 import com.google.common.collect.ImmutableList;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
-import org.opendaylight.yangtools.yang.model.api.QNameModuleAware;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.AugmentEffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.AugmentStatement;
@@ -29,22 +27,19 @@ import org.opendaylight.yangtools.yang.model.spi.meta.EffectiveStatementMixins.W
 
 public final class AugmentEffectiveStatementImpl
         extends DefaultWithSchemaTree<SchemaNodeIdentifier, AugmentStatement>
-        implements AugmentEffectiveStatement, AugmentationSchemaNode, QNameModuleAware,
+        implements AugmentEffectiveStatement, AugmentationSchemaNode,
             DocumentedNodeMixin.WithStatus<SchemaNodeIdentifier, AugmentStatement>,
             DataNodeContainerMixin<SchemaNodeIdentifier, AugmentStatement>,
             ActionNodeContainerMixin<SchemaNodeIdentifier, AugmentStatement>,
             NotificationNodeContainerMixin<SchemaNodeIdentifier, AugmentStatement>,
             WhenConditionMixin<SchemaNodeIdentifier, AugmentStatement> {
     private final @NonNull SchemaNodeIdentifier argument;
-    private final @NonNull QNameModule rootModuleQName;
     private final int flags;
 
     public AugmentEffectiveStatementImpl(final AugmentStatement declared, final SchemaNodeIdentifier argument,
-            final int flags, final QNameModule rootModuleQName,
-            final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
+            final int flags, final ImmutableList<? extends EffectiveStatement<?, ?>> substatements) {
         super(declared, substatements);
         this.argument = requireNonNull(argument);
-        this.rootModuleQName = requireNonNull(rootModuleQName);
         this.flags = flags;
     }
 
@@ -63,11 +58,6 @@ public final class AugmentEffectiveStatementImpl
         return dataSchemaNode(name);
     }
 
-    @Override
-    public QNameModule getQNameModule() {
-        return rootModuleQName;
-    }
-
     @Override
     public AugmentEffectiveStatement asEffectiveStatement() {
         return this;

diff --git a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java
index 2a70a9929b54ce5c0b2b74fc219999f3dca66fd9..e6386c3affd4f9d2264b4cc08cf0e8152084e781 100644 (file)
--- a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java
+++ b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java
@@ -51,10 +51,8 @@ abstract class AbstractAugmentStatementSupport
 
     AbstractAugmentStatementSupport(final YangParserConfiguration config, final SubstatementValidator validator) {
         super(YangStmtMapping.AUGMENT, StatementPolicy.copyDeclared(
-            (copy, current, substatements) ->
-                copy.getArgument().equals(current.getArgument())
-                && copy.moduleName().getModule().equals(current.moduleName().getModule())
-            ), config, validator);
+            (copy, current, substatements) -> copy.getArgument().equals(current.getArgument())),
+            config, validator);
     }
 
     @Override
@@ -136,8 +134,7 @@ abstract class AbstractAugmentStatementSupport
                 .toFlags();
 
         try {
-            return EffectiveStatements.createAugment(stmt.declared(), stmt.getArgument(), flags,
-                stmt.moduleName().getModule(), substatements);
+            return EffectiveStatements.createAugment(stmt.declared(), stmt.getArgument(), flags, substatements);
         } catch (SubstatementIndexingException e) {
             throw new SourceException(e.getMessage(), stmt, e);
         }