From a51869a39cf1df0e21e50382f96076eeb734ad7f Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 19 Sep 2023 18:41:06 +0200 Subject: [PATCH] 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 --- .../yang/model/ri/stmt/EffectiveStatements.java | 5 ++--- .../impl/eff/AugmentEffectiveStatementImpl.java | 14 ++------------ .../augment/AbstractAugmentStatementSupport.java | 9 +++------ 3 files changed, 7 insertions(+), 21 deletions(-) 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 24add861e2..cfafe51912 100644 --- 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> 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 46d4c6dd2b..76b1c4f347 100644 --- 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 - implements AugmentEffectiveStatement, AugmentationSchemaNode, QNameModuleAware, + implements AugmentEffectiveStatement, AugmentationSchemaNode, DocumentedNodeMixin.WithStatus, DataNodeContainerMixin, ActionNodeContainerMixin, NotificationNodeContainerMixin, WhenConditionMixin { 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> substatements) { + final int flags, final ImmutableList> 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 2a70a9929b..e6386c3aff 100644 --- 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); } -- 2.36.6