From cbcfae037f15c4bff0c1a04f010914f42ead5ddd Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 18 Sep 2020 22:49:04 +0200 Subject: [PATCH] Remove IetfYangSmiv2Namespace This namespace is useless, remove it. JIRA: YANGTOOLS-1134 Change-Id: Ic285d7e68daf090b6a024f38a32de0c8e15414c1 Signed-off-by: Robert Varga (cherry picked from commit 24120d6b7770c2c45e51176f048b98191edd69b7) (cherry picked from commit b3984761684cc2992a026669391d10e3b55c4c16) --- .../rfc6643/parser/AliasStatementSupport.java | 9 +-------- .../parser/DefValEffectiveStatementImpl.java | 8 -------- .../rfc6643/parser/DefValStatementSupport.java | 6 ------ .../DisplayHintEffectiveStatementImpl.java | 6 ------ .../parser/DisplayHintStatementSupport.java | 8 -------- .../rfc6643/parser/IetfYangSmiv2Namespace.java | 17 ----------------- .../parser/ImpliedEffectiveStatementImpl.java | 7 ------- .../rfc6643/parser/ImpliedStatementSupport.java | 6 ------ .../parser/MaxAccessEffectiveStatementImpl.java | 7 ------- .../parser/MaxAccessStatementSupport.java | 8 -------- .../rfc6643/parser/OidStatementSupport.java | 8 -------- .../rfc6643/parser/SubIdStatementSupport.java | 8 -------- .../IetfYangSmiv2ExtensionPluginTest.java | 2 -- .../yang/parser/impl/DefaultReactors.java | 4 ---- 14 files changed, 1 insertion(+), 103 deletions(-) delete mode 100644 yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/IetfYangSmiv2Namespace.java diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/AliasStatementSupport.java b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/AliasStatementSupport.java index 76d34f139c..44d7f25a0b 100644 --- a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/AliasStatementSupport.java +++ b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/AliasStatementSupport.java @@ -14,7 +14,6 @@ import org.opendaylight.yangtools.rfc6643.model.api.IetfYangSmiv2ExtensionsMappi import org.opendaylight.yangtools.yang.model.api.YangStmtMapping; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable; import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator; @Beta @@ -42,12 +41,6 @@ public final class AliasStatementSupport return value; } - @Override - public void onFullDefinitionDeclared(final Mutable stmt) { - stmt.addToNs(IetfYangSmiv2Namespace.class, stmt, "Ietf-yang-smiv2 namespace."); - getSubstatementValidator().validate(stmt); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; @@ -63,4 +56,4 @@ public final class AliasStatementSupport final StmtContext ctx) { return new AliasEffectiveStatementImpl(ctx); } -} \ No newline at end of file +} diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DefValEffectiveStatementImpl.java b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DefValEffectiveStatementImpl.java index e6220a7edf..9312fc3c8b 100644 --- a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DefValEffectiveStatementImpl.java +++ b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DefValEffectiveStatementImpl.java @@ -18,14 +18,11 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; final class DefValEffectiveStatementImpl extends UnknownEffectiveStatementBase implements DefValEffectiveStatement, DefValSchemaNode { - private final SchemaPath path; - private final String valueFromNamespace; DefValEffectiveStatementImpl(final StmtContext ctx) { super(ctx); path = ctx.getParentContext().getSchemaPath().get().createChild(getNodeType()); - valueFromNamespace = ctx.getFromNamespace(IetfYangSmiv2Namespace.class, ctx); } @Override @@ -33,11 +30,6 @@ final class DefValEffectiveStatementImpl extends UnknownEffectiveStatementBase stmt) { - stmt.addToNs(IetfYangSmiv2Namespace.class, stmt, "Ietf-yang-smiv2 namespace."); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DisplayHintEffectiveStatementImpl.java b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DisplayHintEffectiveStatementImpl.java index 1e78fab35c..c9cea7510c 100644 --- a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DisplayHintEffectiveStatementImpl.java +++ b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DisplayHintEffectiveStatementImpl.java @@ -20,16 +20,10 @@ final class DisplayHintEffectiveStatementImpl extends UnknownEffectiveStatementB implements DisplayHintEffectiveStatement, DisplayHintSchemaNode { private final SchemaPath path; - private final String valueFromNamespace; DisplayHintEffectiveStatementImpl(final StmtContext ctx) { super(ctx); path = ctx.getParentContext().getSchemaPath().get().createChild(getNodeType()); - valueFromNamespace = ctx.getFromNamespace(IetfYangSmiv2Namespace.class, ctx); - } - - public String getValueFromNamespace() { - return valueFromNamespace; } @Override diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DisplayHintStatementSupport.java b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DisplayHintStatementSupport.java index 8cb9160c03..79fb1c4ab2 100644 --- a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DisplayHintStatementSupport.java +++ b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DisplayHintStatementSupport.java @@ -13,7 +13,6 @@ import org.opendaylight.yangtools.rfc6643.model.api.DisplayHintStatement; import org.opendaylight.yangtools.rfc6643.model.api.IetfYangSmiv2ExtensionsMapping; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable; import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator; @Beta @@ -36,12 +35,6 @@ public final class DisplayHintStatementSupport return value; } - @Override - public void onFullDefinitionDeclared( - final Mutable stmt) { - stmt.addToNs(IetfYangSmiv2Namespace.class, stmt, "Ietf-yang-smiv2 namespace."); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; @@ -57,5 +50,4 @@ public final class DisplayHintStatementSupport final StmtContext ctx) { return new DisplayHintEffectiveStatementImpl(ctx); } - } \ No newline at end of file diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/IetfYangSmiv2Namespace.java b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/IetfYangSmiv2Namespace.java deleted file mode 100644 index 00d52a6f65..0000000000 --- a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/IetfYangSmiv2Namespace.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2016, 2020 PANTHEON.tech, s.r.o. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yangtools.rfc6643.parser; - -import com.google.common.annotations.Beta; -import org.opendaylight.yangtools.yang.model.api.meta.IdentifierNamespace; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; - -@Beta -public interface IetfYangSmiv2Namespace extends IdentifierNamespace, String> { - -} diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/ImpliedEffectiveStatementImpl.java b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/ImpliedEffectiveStatementImpl.java index 37d40b224f..72632741df 100644 --- a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/ImpliedEffectiveStatementImpl.java +++ b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/ImpliedEffectiveStatementImpl.java @@ -20,12 +20,10 @@ final class ImpliedEffectiveStatementImpl extends UnknownEffectiveStatementBase< implements ImpliedEffectiveStatement, ImpliedSchemaNode { private final SchemaPath path; - private final String valueFromNamespace; ImpliedEffectiveStatementImpl(final StmtContext ctx) { super(ctx); path = ctx.getParentContext().getSchemaPath().get().createChild(getNodeType()); - valueFromNamespace = ctx.getFromNamespace(IetfYangSmiv2Namespace.class, ctx); } @Override @@ -33,11 +31,6 @@ final class ImpliedEffectiveStatementImpl extends UnknownEffectiveStatementBase< return argument(); } - // FIXME: what good is this method? - public String getValueFromNamespace() { - return valueFromNamespace; - } - @Override public QName getQName() { return getNodeType(); diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/ImpliedStatementSupport.java b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/ImpliedStatementSupport.java index 55a20e3aa0..323fcaf1ea 100644 --- a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/ImpliedStatementSupport.java +++ b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/ImpliedStatementSupport.java @@ -13,7 +13,6 @@ import org.opendaylight.yangtools.rfc6643.model.api.ImpliedEffectiveStatement; import org.opendaylight.yangtools.rfc6643.model.api.ImpliedStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable; import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator; @Beta @@ -36,11 +35,6 @@ public final class ImpliedStatementSupport return value; } - @Override - public void onFullDefinitionDeclared(final Mutable stmt) { - stmt.addToNs(IetfYangSmiv2Namespace.class, stmt, "Ietf-yang-smiv2 namespace."); - } - @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/MaxAccessEffectiveStatementImpl.java b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/MaxAccessEffectiveStatementImpl.java index 2c1fb205a2..23af3f295d 100644 --- a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/MaxAccessEffectiveStatementImpl.java +++ b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/MaxAccessEffectiveStatementImpl.java @@ -20,17 +20,10 @@ final class MaxAccessEffectiveStatementImpl extends UnknownEffectiveStatementBas implements MaxAccessEffectiveStatement, MaxAccessSchemaNode { private final SchemaPath path; - private final String valueFromNamespace; MaxAccessEffectiveStatementImpl(final StmtContext ctx) { super(ctx); path = ctx.getParentContext().getSchemaPath().get().createChild(getNodeType()); - valueFromNamespace = ctx.getFromNamespace(IetfYangSmiv2Namespace.class, ctx); - } - - // FIXME: what good is this method? - public String getValueFromNamespace() { - return valueFromNamespace; } @Override diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/MaxAccessStatementSupport.java b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/MaxAccessStatementSupport.java index 3187d0b548..c208acd3ce 100644 --- a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/MaxAccessStatementSupport.java +++ b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/MaxAccessStatementSupport.java @@ -8,13 +8,11 @@ package org.opendaylight.yangtools.rfc6643.parser; import com.google.common.annotations.Beta; -import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.yangtools.rfc6643.model.api.IetfYangSmiv2ExtensionsMapping; import org.opendaylight.yangtools.rfc6643.model.api.MaxAccessEffectiveStatement; import org.opendaylight.yangtools.rfc6643.model.api.MaxAccessStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable; import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator; @Beta @@ -37,12 +35,6 @@ public final class MaxAccessStatementSupport return value; } - @Override - public void onFullDefinitionDeclared(final Mutable stmt) { - stmt.addToNs(IetfYangSmiv2Namespace.class, stmt, "Ietf-yang-smiv2 namespace."); - } - - @Nullable @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/OidStatementSupport.java b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/OidStatementSupport.java index 5997496978..7d6ededcae 100644 --- a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/OidStatementSupport.java +++ b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/OidStatementSupport.java @@ -8,7 +8,6 @@ package org.opendaylight.yangtools.rfc6643.parser; import com.google.common.annotations.Beta; -import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.yangtools.rfc6643.model.api.IetfYangSmiv2ExtensionsMapping; import org.opendaylight.yangtools.rfc6643.model.api.ObjectIdentifier; import org.opendaylight.yangtools.rfc6643.model.api.OidEffectiveStatement; @@ -37,13 +36,6 @@ public final class OidStatementSupport return ObjectIdentifier.forString(value); } - @Override - public void onFullDefinitionDeclared( - final StmtContext.Mutable stmt) { - stmt.addToNs(IetfYangSmiv2Namespace.class, stmt, "Ietf-yang-smiv2 namespace."); - } - - @Nullable @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/SubIdStatementSupport.java b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/SubIdStatementSupport.java index 23adfa2642..4067dd48f9 100644 --- a/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/SubIdStatementSupport.java +++ b/yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/SubIdStatementSupport.java @@ -8,13 +8,11 @@ package org.opendaylight.yangtools.rfc6643.parser; import com.google.common.annotations.Beta; -import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.yangtools.rfc6643.model.api.IetfYangSmiv2ExtensionsMapping; import org.opendaylight.yangtools.rfc6643.model.api.SubIdEffectiveStatement; import org.opendaylight.yangtools.rfc6643.model.api.SubIdStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport; import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext; -import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.Mutable; import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator; @Beta @@ -37,12 +35,6 @@ public final class SubIdStatementSupport return Integer.parseUnsignedInt(value); } - @Override - public void onFullDefinitionDeclared(final Mutable stmt) { - stmt.addToNs(IetfYangSmiv2Namespace.class, stmt, "Ietf-yang-smiv2 namespace."); - } - - @Nullable @Override protected SubstatementValidator getSubstatementValidator() { return SUBSTATEMENT_VALIDATOR; diff --git a/yang/rfc6643-parser-support/src/test/java/org/opendaylight/yangtools/rfc6643/parser/IetfYangSmiv2ExtensionPluginTest.java b/yang/rfc6643-parser-support/src/test/java/org/opendaylight/yangtools/rfc6643/parser/IetfYangSmiv2ExtensionPluginTest.java index eecc69ac1b..b77c2a1f58 100644 --- a/yang/rfc6643-parser-support/src/test/java/org/opendaylight/yangtools/rfc6643/parser/IetfYangSmiv2ExtensionPluginTest.java +++ b/yang/rfc6643-parser-support/src/test/java/org/opendaylight/yangtools/rfc6643/parser/IetfYangSmiv2ExtensionPluginTest.java @@ -9,7 +9,6 @@ package org.opendaylight.yangtools.rfc6643.parser; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.opendaylight.yangtools.yang.parser.spi.meta.NamespaceBehaviour.sourceLocal; import java.io.IOException; import org.junit.AfterClass; @@ -52,7 +51,6 @@ public class IetfYangSmiv2ExtensionPluginTest { .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, AliasStatementSupport.getInstance()) .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, OidStatementSupport.getInstance()) .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, SubIdStatementSupport.getInstance()) - .addNamespaceSupport(ModelProcessingPhase.FULL_DECLARATION, sourceLocal(IetfYangSmiv2Namespace.class)) .build(); } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/DefaultReactors.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/DefaultReactors.java index 8d66a4d04d..1622895dcd 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/DefaultReactors.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/DefaultReactors.java @@ -7,8 +7,6 @@ */ package org.opendaylight.yangtools.yang.parser.impl; -import static org.opendaylight.yangtools.yang.parser.spi.meta.NamespaceBehaviour.sourceLocal; - import com.google.common.annotations.Beta; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.odlext.parser.AnyxmlSchemaLocationNamespace; @@ -22,7 +20,6 @@ import org.opendaylight.yangtools.rfc6536.parser.DefaultDenyWriteStatementSuppor import org.opendaylight.yangtools.rfc6643.parser.AliasStatementSupport; import org.opendaylight.yangtools.rfc6643.parser.DefValStatementSupport; import org.opendaylight.yangtools.rfc6643.parser.DisplayHintStatementSupport; -import org.opendaylight.yangtools.rfc6643.parser.IetfYangSmiv2Namespace; import org.opendaylight.yangtools.rfc6643.parser.ImpliedStatementSupport; import org.opendaylight.yangtools.rfc6643.parser.MaxAccessStatementSupport; import org.opendaylight.yangtools.rfc6643.parser.OidStatementSupport; @@ -99,7 +96,6 @@ public final class DefaultReactors { .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, AliasStatementSupport.getInstance()) .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, OidStatementSupport.getInstance()) .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, SubIdStatementSupport.getInstance()) - .addNamespaceSupport(ModelProcessingPhase.FULL_DECLARATION, sourceLocal(IetfYangSmiv2Namespace.class)) // RFC7952 annotation support .addStatementSupport(ModelProcessingPhase.FULL_DECLARATION, AnnotationStatementSupport.getInstance()) -- 2.36.6