X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=yang%2Fyang-parser-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fparser%2Fstmt%2Frfc6020%2FAugmentUtils.java;h=c835eb24febd2d5f787dbd73294de9bcb6732515;hb=04fa25a4fe8957f6492618aa9a1e9a4f9af39df4;hp=c873ddbfbc6d6bace69312c57c7a08b571a86428;hpb=15f75b8bb45e6e3e2454fd7dd837b19b945e4c3a;p=yangtools.git 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 c873ddbfbc..c835eb24fe 100644 --- 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 @@ -96,13 +96,11 @@ public final class AugmentUtils { .addAll(sourceCtx.declaredSubstatements()).addAll(sourceCtx.effectiveSubstatements()).build(); for (final StatementContextBase sourceSubStatement : sourceSubStatements) { - if (sourceSubStatement.getPublicDefinition().getDeclaredRepresentationClass() - .equals(MandatoryStatement.class)) { - throw new InferenceException( - String.format( - "An augment cannot add node '%s' because it is mandatory and in module different from target", - sourceCtx.rawStatementArgument()), sourceCtx.getStatementSourceReference()); - } + InferenceException.throwIf(MandatoryStatement.class.equals( + sourceSubStatement.getPublicDefinition().getDeclaredRepresentationClass()), + sourceCtx.getStatementSourceReference(), + "An augment cannot add node '%s' because it is mandatory and in module different from target", + sourceCtx.rawStatementArgument()); } } @@ -115,11 +113,9 @@ public final class AugmentUtils { boolean qNamesEqual = sourceIsDataNode && targetIsDataNode && Objects.equals(sourceCtx.getStatementArgument(), subStatement.getStatementArgument()); - if (qNamesEqual) { - throw new InferenceException(String.format( - "An augment cannot add node named '%s' because this name is already used in target", - sourceCtx.rawStatementArgument()), sourceCtx.getStatementSourceReference()); - } + InferenceException.throwIf(qNamesEqual, sourceCtx.getStatementSourceReference(), + "An augment cannot add node named '%s' because this name is already used in target", + sourceCtx.rawStatementArgument()); } }