YANGTOOLS-706: Cleanup Unknown{Effective}StatementImpl

These classes are actually implementing the UnrecognizedStatement
contract, name them accordingly.

Change-Id: Iec5cdd4cc06a99a8252595f043e88efe9ae0efdd
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModelDefinedStatementDefinition.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModelDefinedStatementDefinition.java
index f937bcf5652cf4f85e5afc0ab5710898cc41279d..b943c6b18a862b29d8b50eadb8f6eaaeb4efa051 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModelDefinedStatementDefinition.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModelDefinedStatementDefinition.java
@@ -17,7 +17,8 @@ import org.opendaylight.yangtools.yang.common.QName;
 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.StatementDefinition;
-import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.UnknownEffectiveStatementImpl;
+import org.opendaylight.yangtools.yang.model.api.stmt.UnrecognizedEffectiveStatement;
+import org.opendaylight.yangtools.yang.model.api.stmt.UnrecognizedStatement;
 
 /**
  * Public definition for statements declared by extensions. This class is instantiated for every extension that is seen
@@ -50,13 +51,13 @@ public final class ModelDefinedStatementDefinition implements StatementDefinitio
     @Nonnull
     @Override
     public Class<? extends DeclaredStatement<?>> getDeclaredRepresentationClass() {
-        return UnknownStatementImpl.class;
+        return UnrecognizedStatement.class;
     }
 
     @Nonnull
     @Override
     public Class<? extends EffectiveStatement<?, ?>> getEffectiveRepresentationClass() {
-        return UnknownEffectiveStatementImpl.class;
+        return UnrecognizedEffectiveStatement.class;
     }
 
     @Override

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModelDefinedStatementSupport.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModelDefinedStatementSupport.java
index 2495d4e48c2e335efb396d50d011b779b44a7bfa..5f34bdd7effc8dd8f08daee64fffd938ec4492d8 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModelDefinedStatementSupport.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/ModelDefinedStatementSupport.java
@@ -10,7 +10,7 @@ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020;
 import java.util.Optional;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
-import org.opendaylight.yangtools.yang.model.api.stmt.UnknownStatement;
+import org.opendaylight.yangtools.yang.model.api.stmt.UnrecognizedStatement;
 import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
@@ -18,28 +18,27 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
 
 /**
  * StatementSupport for statements defined via YANG extensions. This is implemented by piggy-backing
- * to a {@link UnknownStatementImpl.Definition}.
+ * to a {@link UnrecognizedStatementImpl.Definition}.
  *
  * @author Robert Varga
  */
 public final class ModelDefinedStatementSupport extends AbstractStatementSupport<String,
-        UnknownStatement<String>, EffectiveStatement<String, UnknownStatement<String>>> {
-    private final UnknownStatementImpl.Definition definition;
+        UnrecognizedStatement, EffectiveStatement<String, UnrecognizedStatement>> {
+    private final UnrecognizedStatementImpl.Definition definition;
 
     ModelDefinedStatementSupport(final ModelDefinedStatementDefinition publicDefinition) {
         super(publicDefinition);
-        this.definition = new UnknownStatementImpl.Definition(publicDefinition);
+        this.definition = new UnrecognizedStatementImpl.Definition(publicDefinition);
     }
 
     @Override
-    public UnknownStatement<String> createDeclared(final StmtContext<String, UnknownStatement<String>, ?> ctx) {
+    public UnrecognizedStatement createDeclared(final StmtContext<String, UnrecognizedStatement, ?> ctx) {
         return definition.createDeclared(ctx);
     }
 
     @Override
-    public EffectiveStatement<String, UnknownStatement<String>> createEffective(
-            final StmtContext<String, UnknownStatement<String>,
-            EffectiveStatement<String, UnknownStatement<String>>> ctx) {
+    public EffectiveStatement<String, UnrecognizedStatement> createEffective(
+            final StmtContext<String, UnrecognizedStatement, EffectiveStatement<String, UnrecognizedStatement>> ctx) {
         return definition.createEffective(ctx);
     }
 

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnknownStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnrecognizedStatementImpl.java
similarity index 74%
rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnknownStatementImpl.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnrecognizedStatementImpl.java
index 7a7d08986fd2fd7d36895aed8cc2fdb94cce6165..dd8ce0d93d9272a7729a4d029e510c142d060bd8 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnknownStatementImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/UnrecognizedStatementImpl.java
@@ -12,23 +12,23 @@ import javax.annotation.Nullable;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.meta.StatementDefinition;
-import org.opendaylight.yangtools.yang.model.api.stmt.UnknownStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.UnrecognizedStatement;
 import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement;
 import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
-import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.UnknownEffectiveStatementImpl;
+import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.UnrecognizedEffectiveStatementImpl;
 
-public class UnknownStatementImpl extends AbstractDeclaredStatement<String> implements UnrecognizedStatement {
+public final class UnrecognizedStatementImpl extends AbstractDeclaredStatement<String>
+        implements UnrecognizedStatement {
 
-    protected UnknownStatementImpl(final StmtContext<String, ?, ?> context) {
+    protected UnrecognizedStatementImpl(final StmtContext<String, ?, ?> context) {
         super(context);
     }
 
-    public static class Definition extends AbstractStatementSupport<String, UnknownStatement<String>,
-            EffectiveStatement<String, UnknownStatement<String>>> {
+    public static class Definition extends AbstractStatementSupport<String, UnrecognizedStatement,
+            EffectiveStatement<String, UnrecognizedStatement>> {
 
         public Definition(final StatementDefinition publicDefinition) {
             super(publicDefinition);
@@ -40,15 +40,15 @@ public class UnknownStatementImpl extends AbstractDeclaredStatement<String> impl
         }
 
         @Override
-        public UnknownStatement<String> createDeclared(final StmtContext<String, UnknownStatement<String>, ?> ctx) {
-            return new UnknownStatementImpl(ctx);
+        public UnrecognizedStatement createDeclared(final StmtContext<String, UnrecognizedStatement, ?> ctx) {
+            return new UnrecognizedStatementImpl(ctx);
         }
 
         @Override
-        public EffectiveStatement<String, UnknownStatement<String>> createEffective(
-                final StmtContext<String, UnknownStatement<String>,
-                EffectiveStatement<String, UnknownStatement<String>>> ctx) {
-            return new UnknownEffectiveStatementImpl(ctx);
+        public EffectiveStatement<String, UnrecognizedStatement> createEffective(
+                final StmtContext<String, UnrecognizedStatement,
+                EffectiveStatement<String, UnrecognizedStatement>> ctx) {
+            return new UnrecognizedEffectiveStatementImpl(ctx);
         }
 
         @Override

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/UnknownEffectiveStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/UnrecognizedEffectiveStatementImpl.java
similarity index 81%
rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/UnknownEffectiveStatementImpl.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/UnrecognizedEffectiveStatementImpl.java
index 2c4a15476714541b76ee92484e6b3935651f6bbc..54bd6c316329fe46573eeb47a35b108628221d4f 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/UnknownEffectiveStatementImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/effective/UnrecognizedEffectiveStatementImpl.java
@@ -13,17 +13,19 @@ import javax.annotation.Nonnull;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
-import org.opendaylight.yangtools.yang.model.api.stmt.UnknownStatement;
+import org.opendaylight.yangtools.yang.model.api.stmt.UnrecognizedEffectiveStatement;
+import org.opendaylight.yangtools.yang.model.api.stmt.UnrecognizedStatement;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContextUtils;
 
-public final class UnknownEffectiveStatementImpl
-        extends UnknownEffectiveStatementBase<String, UnknownStatement<String>> {
+public final class UnrecognizedEffectiveStatementImpl
+        extends UnknownEffectiveStatementBase<String, UnrecognizedStatement>
+        implements UnrecognizedEffectiveStatement {
 
     private final QName maybeQNameArgument;
     private final SchemaPath path;
 
-    public UnknownEffectiveStatementImpl(final StmtContext<String, UnknownStatement<String>, ?> ctx) {
+    public UnrecognizedEffectiveStatementImpl(final StmtContext<String, UnrecognizedStatement, ?> ctx) {
         super(ctx);
 
         // FIXME: Remove following section after fixing 4380
@@ -71,10 +73,10 @@ public final class UnknownEffectiveStatementImpl
         if (this == obj) {
             return true;
         }
-        if (!(obj instanceof UnknownEffectiveStatementImpl)) {
+        if (!(obj instanceof UnrecognizedEffectiveStatementImpl)) {
             return false;
         }
-        UnknownEffectiveStatementImpl other = (UnknownEffectiveStatementImpl) obj;
+        UnrecognizedEffectiveStatementImpl other = (UnrecognizedEffectiveStatementImpl) obj;
         return Objects.equals(maybeQNameArgument, other.maybeQNameArgument) && Objects.equals(path, other.path)
                 && Objects.equals(getNodeType(), other.getNodeType())
                 && Objects.equals(getNodeParameter(), other.getNodeParameter());