From 459e75746b61004611bb6b1b34eb9dff0ad391a6 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 2 Jul 2020 17:13:34 +0200 Subject: [PATCH] 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 --- .../rfc7950/stmt/deviate/DeviateEffectiveStatementImpl.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 c3589d70f2..b5c378dacb 100644 --- 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 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 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 -- 2.36.6