StatementSupport is not a StatementDefinition

[yangtools.git] / parser / yang-parser-rfc7950 / src / main / java / org / opendaylight / yangtools / yang / parser / rfc7950 / stmt / extension / UnrecognizedStatementSupport.java

diff --git a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/UnrecognizedStatementSupport.java b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/UnrecognizedStatementSupport.java
index c5e09340c2fbd5b1b7c6a8459d55952382aa8c47..b741dd9287f9c0dd8e7931809a8b2644b7a530d5 100644 (file)
--- a/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/UnrecognizedStatementSupport.java
+++ b/parser/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/extension/UnrecognizedStatementSupport.java
@@ -52,13 +52,13 @@ final class UnrecognizedStatementSupport
          * This code wraps statements encountered inside an extension so they do not get confused with regular
          * statements.
          */
-        final QName baseQName = getStatementName();
-        final QName statementName = QName.create(baseQName, childDef.getStatementName().getLocalName());
+        // FIXME: remove this bit?
+        final QName statementName = QName.create(statementName(), childDef.getStatementName().getLocalName());
 
-        final ModelDefinedStatementDefinition def;
+        final StatementDefinition def;
         final Optional<ArgumentDefinition> optArgDef = childDef.getArgumentDefinition();
         if (optArgDef.isPresent()) {
-            final ArgumentDefinition argDef = optArgDef.get();
+            final ArgumentDefinition argDef = optArgDef.orElseThrow();
             def = new ModelDefinedStatementDefinition(statementName, argDef.getArgumentName(), argDef.isYinElement());
         } else {
             def = new ModelDefinedStatementDefinition(statementName);