From: Robert Varga <robert.varga@pantheon.tech>
Date: Mon, 6 Jul 2020 09:24:27 +0000 (+0200)
Subject: Clean up OpenConfigVersionSupport
X-Git-Tag: v5.0.4~8
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=cae75524154a2916c5cebc504d52aedc47daeb7c;p=yangtools.git

Clean up OpenConfigVersionSupport

Type parameters should be referencign OpenConfigVersionEffectiveStatement,
fix it up.

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

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/OpenConfigVersionSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/OpenConfigVersionSupport.java
index f30a998b54..7a827a7fe2 100644
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/OpenConfigVersionSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/openconfig/stmt/OpenConfigVersionSupport.java
@@ -9,16 +9,16 @@ package org.opendaylight.yangtools.yang.parser.openconfig.stmt;
 
 import org.opendaylight.yangtools.concepts.SemVer;
 import org.opendaylight.yangtools.openconfig.model.api.OpenConfigStatements;
+import org.opendaylight.yangtools.openconfig.model.api.OpenConfigVersionEffectiveStatement;
 import org.opendaylight.yangtools.openconfig.model.api.OpenConfigVersionStatement;
-import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.SemanticVersionNamespace;
 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;
 
-public final class OpenConfigVersionSupport extends AbstractStatementSupport<SemVer, OpenConfigVersionStatement,
-        EffectiveStatement<SemVer, OpenConfigVersionStatement>> {
+public final class OpenConfigVersionSupport
+        extends AbstractStatementSupport<SemVer, OpenConfigVersionStatement, OpenConfigVersionEffectiveStatement> {
     private static final SubstatementValidator SUBSTATEMENT_VALIDATOR = SubstatementValidator.builder(
         OpenConfigStatements.OPENCONFIG_VERSION).build();
     private static final OpenConfigVersionSupport INSTANCE = new OpenConfigVersionSupport();
@@ -37,8 +37,8 @@ public final class OpenConfigVersionSupport extends AbstractStatementSupport<Sem
     }
 
     @Override
-    public void onLinkageDeclared(final Mutable<SemVer, OpenConfigVersionStatement,
-            EffectiveStatement<SemVer, OpenConfigVersionStatement>> stmt) {
+    public void onLinkageDeclared(
+            final Mutable<SemVer, OpenConfigVersionStatement, OpenConfigVersionEffectiveStatement> stmt) {
         stmt.addToNs(SemanticVersionNamespace.class, stmt.getParentContext(), stmt.getStatementArgument());
     }
 
@@ -48,9 +48,8 @@ public final class OpenConfigVersionSupport extends AbstractStatementSupport<Sem
     }
 
     @Override
-    public EffectiveStatement<SemVer, OpenConfigVersionStatement> createEffective(
-            final StmtContext<SemVer, OpenConfigVersionStatement,
-            EffectiveStatement<SemVer, OpenConfigVersionStatement>> ctx) {
+    public OpenConfigVersionEffectiveStatement createEffective(
+            final StmtContext<SemVer, OpenConfigVersionStatement, OpenConfigVersionEffectiveStatement> ctx) {
         return new OpenConfigVersionEffectiveStatementImpl(ctx);
     }