Bug 4540: Yang parser exceptions should follow consistent path

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

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AugmentUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AugmentUtils.java
index bea54a8217a2c50d510ee20b45419dab65e62583..c873ddbfbc6d6bace69312c57c7a08b571a86428 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AugmentUtils.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/AugmentUtils.java
@@ -18,6 +18,7 @@ import org.opendaylight.yangtools.yang.model.api.stmt.DataDefinitionStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.MandatoryStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.UsesStatement;
 import org.opendaylight.yangtools.yang.model.api.stmt.WhenStatement;
+import org.opendaylight.yangtools.yang.parser.spi.meta.InferenceException;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext;
 import org.opendaylight.yangtools.yang.parser.spi.meta.StmtContext.TypeOfCopy;
 import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
@@ -97,10 +98,10 @@ public final class AugmentUtils {
             for (final StatementContextBase<?, ?, ?> sourceSubStatement : sourceSubStatements) {
                 if (sourceSubStatement.getPublicDefinition().getDeclaredRepresentationClass()
                         .equals(MandatoryStatement.class)) {
-                    throw new IllegalArgumentException(
+                    throw new InferenceException(
                             String.format(
                                     "An augment cannot add node '%s' because it is mandatory and in module different from target",
-                                    sourceCtx.rawStatementArgument()));
+                                    sourceCtx.rawStatementArgument()), sourceCtx.getStatementSourceReference());
                 }
             }
         }
@@ -115,9 +116,9 @@ public final class AugmentUtils {
                     && Objects.equals(sourceCtx.getStatementArgument(), subStatement.getStatementArgument());
 
             if (qNamesEqual) {
-                throw new IllegalStateException(String.format(
+                throw new InferenceException(String.format(
                         "An augment cannot add node named '%s' because this name is already used in target",
-                        sourceCtx.rawStatementArgument()));
+                        sourceCtx.rawStatementArgument()), sourceCtx.getStatementSourceReference());
             }
         }
     }