Bug 7051 - Refactoring of StmtContextUtils

[yangtools.git] / yang / yang-parser-impl / src / main / java / org / opendaylight / yangtools / yang / parser / stmt / rfc6020 / YangVersionStatementImpl.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangVersionStatementImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangVersionStatementImpl.java
index 3662667cb932ed5824840e5835485a4fe7f96848..59f77ae22b73fe6a6947507d47e2a14c446834bd 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangVersionStatementImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/YangVersionStatementImpl.java
@@ -12,10 +12,10 @@ import org.opendaylight.yangtools.yang.common.YangVersion;
 import org.opendaylight.yangtools.yang.model.api.YangStmtMapping;
 import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.YangVersionStatement;
-import org.opendaylight.yangtools.yang.parser.spi.SubstatementValidator;
 import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractDeclaredStatement;
 import org.opendaylight.yangtools.yang.parser.spi.meta.AbstractStatementSupport;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
+import org.opendaylight.yangtools.yang.parser.spi.meta.SubstatementValidator;
 import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
 import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.YangVersionEffectiveStatementImpl;
 
@@ -37,11 +37,8 @@ public class YangVersionStatementImpl extends AbstractDeclaredStatement<YangVers
 
         @Override
         public YangVersion parseArgumentValue(final StmtContext<?, ?, ?> ctx, final String value) {
-            try {
-                return YangVersion.parse(value);
-            } catch (IllegalArgumentException e) {
-                throw new SourceException("Unsupported YANG version " + value, ctx.getStatementSourceReference(), e);
-            }
+            return SourceException.unwrap(YangVersion.parse(value), ctx.getStatementSourceReference(),
+                "Unsupported YANG version %s", value);
         }
 
         @Override
@@ -61,13 +58,6 @@ public class YangVersionStatementImpl extends AbstractDeclaredStatement<YangVers
             return new YangVersionEffectiveStatementImpl(ctx);
         }
 
-        @Override
-        public void onFullDefinitionDeclared(final StmtContext.Mutable<YangVersion, YangVersionStatement,
-                EffectiveStatement<YangVersion, YangVersionStatement>> stmt) {
-            super.onFullDefinitionDeclared(stmt);
-            getSubstatementValidator().validate(stmt);
-        }
-
         @Override
         protected SubstatementValidator getSubstatementValidator() {
             return SUBSTATEMENT_VALIDATOR;