Bug 6022: Deviation statement is not fully available in the YANG parser output

[yangtools.git] / yang / yang-parser-impl / src / main / java / org / opendaylight / yangtools / yang / parser / stmt / rfc6020 / DeviateStatementImpl.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DeviateStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DeviateStatementImpl.java
index 0e0886f729ee2bb3aaa9d92d24607cf8c1926227..6aaa6fba278a94840cbf6aae0d06c5f894fcab1e 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DeviateStatementImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/DeviateStatementImpl.java
@@ -10,7 +10,7 @@ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020;
 import static org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator.MAX;
 
 import javax.annotation.Nonnull;
-import org.opendaylight.yangtools.yang.model.api.Deviation;
+import org.opendaylight.yangtools.yang.model.api.DeviateKind;
 import org.opendaylight.yangtools.yang.model.api.Rfc6020Mapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.DeviateStatement;
@@ -18,10 +18,9 @@ import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator;
 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.StmtContext;
-import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.DeviateEffectiveStatementImpl;
 
-public class DeviateStatementImpl extends AbstractDeclaredStatement<Deviation.Deviate> implements DeviateStatement {
+public class DeviateStatementImpl extends AbstractDeclaredStatement<DeviateKind> implements DeviateStatement {
     private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(Rfc6020Mapping
             .DEVIATE)
             .add(Rfc6020Mapping.CONFIG, 0, 1)
@@ -35,44 +34,41 @@ public class DeviateStatementImpl extends AbstractDeclaredStatement<Deviation.De
             .add(Rfc6020Mapping.UNITS, 0, 1)
             .build();
 
-    protected DeviateStatementImpl(
-            StmtContext<Deviation.Deviate, DeviateStatement, ?> context) {
+    protected DeviateStatementImpl(StmtContext<DeviateKind, DeviateStatement, ?> context) {
         super(context);
     }
 
-    public static class Definition extends AbstractStatementSupport<Deviation.Deviate, DeviateStatement,
-            EffectiveStatement<Deviation.Deviate, DeviateStatement>> {
+    public static class Definition extends AbstractStatementSupport<DeviateKind, DeviateStatement,
+            EffectiveStatement<DeviateKind, DeviateStatement>> {
 
         public Definition() {
             super(Rfc6020Mapping.DEVIATE);
         }
 
-        @Override public Deviation.Deviate parseArgumentValue(
-                StmtContext<?, ?, ?> ctx, String value) throws SourceException {
+        @Override public DeviateKind parseArgumentValue(StmtContext<?, ?, ?> ctx, String value) {
             return Utils.parseDeviateFromString(ctx, value);
         }
 
-        @Override public DeviateStatement createDeclared(
-                StmtContext<Deviation.Deviate, DeviateStatement, ?> ctx) {
+        @Override public DeviateStatement createDeclared(StmtContext<DeviateKind, DeviateStatement, ?> ctx) {
             return new DeviateStatementImpl(ctx);
         }
 
-        @Override public EffectiveStatement<Deviation.Deviate, DeviateStatement> createEffective(
-                StmtContext<Deviation.Deviate, DeviateStatement, EffectiveStatement<Deviation.Deviate,
+        @Override public EffectiveStatement<DeviateKind, DeviateStatement> createEffective(
+                StmtContext<DeviateKind, DeviateStatement, EffectiveStatement<DeviateKind,
                         DeviateStatement>> ctx) {
             return new DeviateEffectiveStatementImpl(ctx);
         }
 
         @Override
-        public void onFullDefinitionDeclared(StmtContext.Mutable<Deviation.Deviate, DeviateStatement,
-                EffectiveStatement<Deviation.Deviate, DeviateStatement>> stmt) throws SourceException {
+        public void onFullDefinitionDeclared(StmtContext.Mutable<DeviateKind, DeviateStatement,
+                EffectiveStatement<DeviateKind, DeviateStatement>> stmt) {
             super.onFullDefinitionDeclared(stmt);
             SUBSTATEMENT_VALIDATOR.validate(stmt);
         }
     }
 
     @Nonnull @Override
-    public Deviation.Deviate getValue() {
+    public DeviateKind getValue() {
         return argument();
     }
 }