Eliminate DeviateEffectiveStatementImpl.deviateType

We are just duplicating the argument field here, let's get rid
of this.

JIRA: YANGTOOLS-1065
Change-Id: Id8a5855e352cb032b88e9af0ffb30cb64e3653ce
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviate/DeviateEffectiveStatementImpl.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviate/DeviateEffectiveStatementImpl.java
index c3589d70f2da487147247a964170d1a9c4d3b17a..b5c378dacb0b3b7411cb92c8668f70d830567648 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviate/DeviateEffectiveStatementImpl.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/deviate/DeviateEffectiveStatementImpl.java
@@ -32,7 +32,6 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 final class DeviateEffectiveStatementImpl extends DeclaredEffectiveStatementBase<DeviateKind, DeviateStatement>
         implements DeviateDefinition, DeviateEffectiveStatement {
 
-    private final DeviateKind deviateType;
     private final String deviatedDefault;
     private final Integer deviatedMaxElements;
     private final Integer deviatedMinElements;
@@ -47,7 +46,6 @@ final class DeviateEffectiveStatementImpl extends DeclaredEffectiveStatementBase
     DeviateEffectiveStatementImpl(final StmtContext<DeviateKind, DeviateStatement, ?> ctx) {
         super(ctx);
 
-        deviateType = argument();
         deviatedConfig = OptionalBoolean.ofNullable(findFirstEffectiveSubstatementArgument(
             ConfigEffectiveStatement.class).orElse(null));
         deviatedMandatory = OptionalBoolean.ofNullable(findFirstEffectiveSubstatementArgument(
@@ -67,7 +65,7 @@ final class DeviateEffectiveStatementImpl extends DeclaredEffectiveStatementBase
 
     @Override
     public DeviateKind getDeviateType() {
-        return deviateType;
+        return argument();
     }
 
     @Override