Fix declaration of extension-related supports

We should properly specialize these to UnrecognizedEffectiveStatement,
not just any old statement.

Change-Id: I4a09dd9d25040bf62142444566ca39c61b6c57fc
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/extension/ModelDefinedStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ModelDefinedStatementSupport.java
index 3c8a75a45f75fe5271893fa60268011354bd4170..8bc5139bad5092af87ffdb1621a8a496e1376f4c 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ModelDefinedStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/ModelDefinedStatementSupport.java
@@ -8,8 +8,8 @@
 package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.extension;
 
 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.UnrecognizedEffectiveStatement;
 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;
@@ -22,8 +22,8 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
  *
  * @author Robert Varga
  */
-final class ModelDefinedStatementSupport extends AbstractStatementSupport<String,
-        UnrecognizedStatement, EffectiveStatement<String, UnrecognizedStatement>> {
+final class ModelDefinedStatementSupport
+        extends AbstractStatementSupport<String, UnrecognizedStatement, UnrecognizedEffectiveStatement> {
     private final UnrecognizedStatementSupport definition;
 
     ModelDefinedStatementSupport(final ModelDefinedStatementDefinition publicDefinition) {
@@ -37,8 +37,8 @@ final class ModelDefinedStatementSupport extends AbstractStatementSupport<String
     }
 
     @Override
-    public EffectiveStatement<String, UnrecognizedStatement> createEffective(
-            final StmtContext<String, UnrecognizedStatement, EffectiveStatement<String, UnrecognizedStatement>> ctx) {
+    public UnrecognizedEffectiveStatement createEffective(
+            final StmtContext<String, UnrecognizedStatement, UnrecognizedEffectiveStatement> ctx) {
         return definition.createEffective(ctx);
     }
 

diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/UnrecognizedStatementSupport.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/UnrecognizedStatementSupport.java
index ad17d614d3e38720a5933495d146351d44842386..d493f3442d7df54351dceaafa2fb73cee78b75cf 100644 (file)
--- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/UnrecognizedStatementSupport.java
+++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/UnrecognizedStatementSupport.java
@@ -10,16 +10,16 @@ package org.opendaylight.yangtools.yang.parser.rfc7950.stmt.extension;
 import java.util.Optional;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.meta.ArgumentDefinition;
-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.UnrecognizedEffectiveStatement;
 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;
 import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
 
-final class UnrecognizedStatementSupport extends AbstractStatementSupport<String, UnrecognizedStatement,
-        EffectiveStatement<String, UnrecognizedStatement>> {
+final class UnrecognizedStatementSupport
+        extends AbstractStatementSupport<String, UnrecognizedStatement, UnrecognizedEffectiveStatement> {
     UnrecognizedStatementSupport(final StatementDefinition publicDefinition) {
         super(publicDefinition);
     }
@@ -35,9 +35,8 @@ final class UnrecognizedStatementSupport extends AbstractStatementSupport<String
     }
 
     @Override
-    public EffectiveStatement<String, UnrecognizedStatement> createEffective(
-            final StmtContext<String, UnrecognizedStatement,
-            EffectiveStatement<String, UnrecognizedStatement>> ctx) {
+    public UnrecognizedEffectiveStatement createEffective(
+            final StmtContext<String, UnrecognizedStatement, UnrecognizedEffectiveStatement> ctx) {
         return new UnrecognizedEffectiveStatementImpl(ctx);
     }