Remove IetfYangSmiv2Namespace 91/92491/1
authorRobert Varga <robert.varga@pantheon.tech>
Fri, 18 Sep 2020 20:49:04 +0000 (22:49 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Fri, 18 Sep 2020 21:21:38 +0000 (23:21 +0200)
This namespace is useless, remove it.

JIRA: YANGTOOLS-1134
Change-Id: Ic285d7e68daf090b6a024f38a32de0c8e15414c1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 24120d6b7770c2c45e51176f048b98191edd69b7)
(cherry picked from commit b3984761684cc2992a026669391d10e3b55c4c16)

14 files changed:
yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/AliasStatementSupport.java
yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DefValEffectiveStatementImpl.java
yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DefValStatementSupport.java
yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DisplayHintEffectiveStatementImpl.java
yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/DisplayHintStatementSupport.java
yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/IetfYangSmiv2Namespace.java [deleted file]
yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/ImpliedEffectiveStatementImpl.java
yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/ImpliedStatementSupport.java
yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/MaxAccessEffectiveStatementImpl.java
yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/MaxAccessStatementSupport.java
yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/OidStatementSupport.java
yang/rfc6643-parser-support/src/main/java/org/opendaylight/yangtools/rfc6643/parser/SubIdStatementSupport.java
yang/rfc6643-parser-support/src/test/java/org/opendaylight/yangtools/rfc6643/parser/IetfYangSmiv2ExtensionPluginTest.java
yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/impl/DefaultReactors.java

index 76d34f139c485a3db8715c64511373b9a901c8a1..44d7f25a0b19ad3fedbb4b107ba3a77630e0f4cd 100644 (file)
@@ -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<String, AliasStatement, AliasEffectiveStatement> 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<String, AliasStatement, AliasEffectiveStatement> ctx) {
         return new AliasEffectiveStatementImpl(ctx);
     }
-}
\ No newline at end of file
+}
index e6220a7edfc638d82090ae3a0aa5f318a4d1b7d5..9312fc3c8b54ed0cf1d6d47a35a55814d85af4fd 100644 (file)
@@ -18,14 +18,11 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 
 final class DefValEffectiveStatementImpl extends UnknownEffectiveStatementBase<String, DefValStatement>
         implements DefValEffectiveStatement, DefValSchemaNode {
-
     private final SchemaPath path;
-    private final String valueFromNamespace;
 
     DefValEffectiveStatementImpl(final StmtContext<String, DefValStatement, ?> 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<S
         return argument();
     }
 
-    // FIXME: what good is this method?
-    public String getValueFromNamespace() {
-        return valueFromNamespace;
-    }
-
     @Override
     public QName getQName() {
         return getNodeType();
index 8b4e9066687cbbd848da36f2f5811cfa02e13791..793dbf86b55bfb5ef0eaef75e96e8df7ca3a76d4 100644 (file)
@@ -13,7 +13,6 @@ import org.opendaylight.yangtools.rfc6643.model.api.DefValStatement;
 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,11 +35,6 @@ public final class DefValStatementSupport
         return value;
     }
 
-    @Override
-    public void onFullDefinitionDeclared(final Mutable<String, DefValStatement, DefValEffectiveStatement> stmt) {
-        stmt.addToNs(IetfYangSmiv2Namespace.class, stmt, "Ietf-yang-smiv2 namespace.");
-    }
-
     @Override
     protected SubstatementValidator getSubstatementValidator() {
         return SUBSTATEMENT_VALIDATOR;
index 1e78fab35c89459b6b06d4c45995638fcb73066c..c9cea7510c63c20fe412fba1703ca364e10db1cd 100644 (file)
@@ -20,16 +20,10 @@ final class DisplayHintEffectiveStatementImpl extends UnknownEffectiveStatementB
         implements DisplayHintEffectiveStatement, DisplayHintSchemaNode {
 
     private final SchemaPath path;
-    private final String valueFromNamespace;
 
     DisplayHintEffectiveStatementImpl(final StmtContext<String, DisplayHintStatement, ?> ctx) {
         super(ctx);
         path = ctx.getParentContext().getSchemaPath().get().createChild(getNodeType());
-        valueFromNamespace = ctx.getFromNamespace(IetfYangSmiv2Namespace.class, ctx);
-    }
-
-    public String getValueFromNamespace() {
-        return valueFromNamespace;
     }
 
     @Override
index 8cb9160c039b099c1c117b968d63b3973db39e22..79fb1c4ab268fcde06afb128ce34c5601144f74a 100644 (file)
@@ -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<String, DisplayHintStatement, DisplayHintEffectiveStatement> 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<String, DisplayHintStatement, DisplayHintEffectiveStatement> 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 (file)
index 00d52a6..0000000
+++ /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<StmtContext<?, ?, ?>, String> {
-
-}
index 37d40b224f9cd3bf1680a6eb3539a5f8645c815e..72632741dfd45c9d11406afe0c494230f7798b54 100644 (file)
@@ -20,12 +20,10 @@ final class ImpliedEffectiveStatementImpl extends UnknownEffectiveStatementBase<
         implements ImpliedEffectiveStatement, ImpliedSchemaNode {
 
     private final SchemaPath path;
-    private final String valueFromNamespace;
 
     ImpliedEffectiveStatementImpl(final StmtContext<String, ImpliedStatement, ?> 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();
index 55a20e3aa085ac82299d09a813eeff37921f7a86..323fcaf1eacd1f8647e2c3aefd0e055bf062a1f3 100644 (file)
@@ -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<String, ImpliedStatement, ImpliedEffectiveStatement> stmt) {
-        stmt.addToNs(IetfYangSmiv2Namespace.class, stmt, "Ietf-yang-smiv2 namespace.");
-    }
-
     @Override
     protected SubstatementValidator getSubstatementValidator() {
         return SUBSTATEMENT_VALIDATOR;
index 2c1fb205a2fd8587f4fa19104befec6f8e41c276..23af3f295d73ee65f6397db671b59623f49ce7b3 100644 (file)
@@ -20,17 +20,10 @@ final class MaxAccessEffectiveStatementImpl extends UnknownEffectiveStatementBas
         implements MaxAccessEffectiveStatement, MaxAccessSchemaNode {
 
     private final SchemaPath path;
-    private final String valueFromNamespace;
 
     MaxAccessEffectiveStatementImpl(final StmtContext<String, MaxAccessStatement, ?> 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
index 3187d0b548bcde4b5c9e4a956401812e2361defb..c208acd3ce8905e0e41b04d1f478440d909d7357 100644 (file)
@@ -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<String, MaxAccessStatement, MaxAccessEffectiveStatement> stmt) {
-        stmt.addToNs(IetfYangSmiv2Namespace.class, stmt, "Ietf-yang-smiv2 namespace.");
-    }
-
-    @Nullable
     @Override
     protected SubstatementValidator getSubstatementValidator() {
         return SUBSTATEMENT_VALIDATOR;
index 5997496978889e30741ffb071903921967ea8ca8..7d6ededcaec345f0d9850be9274f1a39127a9451 100644 (file)
@@ -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<ObjectIdentifier, OidStatement, OidEffectiveStatement> stmt) {
-        stmt.addToNs(IetfYangSmiv2Namespace.class, stmt, "Ietf-yang-smiv2 namespace.");
-    }
-
-    @Nullable
     @Override
     protected SubstatementValidator getSubstatementValidator() {
         return SUBSTATEMENT_VALIDATOR;
index 23adfa264296088c278bce69d59a483cbd0e3c79..4067dd48f90a9fa3e20a281b622efb1fd6308645 100644 (file)
@@ -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<Integer, SubIdStatement, SubIdEffectiveStatement> stmt) {
-        stmt.addToNs(IetfYangSmiv2Namespace.class, stmt, "Ietf-yang-smiv2 namespace.");
-    }
-
-    @Nullable
     @Override
     protected SubstatementValidator getSubstatementValidator() {
         return SUBSTATEMENT_VALIDATOR;
index eecc69ac1bff2379541c8728b788655bdce63b9f..b77c2a1f58cd9fbb03b248623c1e9f0e7b42e3e9 100644 (file)
@@ -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();
     }
 
index 8d66a4d04d095770bdf04b8a5f5bf894c28e305e..1622895dcddf81b37df01995fb8836a57d473863 100644 (file)
@@ -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())