From 8534efd4347934f62bf17164b05026a06ec3ce28 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 11 Nov 2017 12:12:34 +0100 Subject: [PATCH] Move Utils.belongsToTheSameModule() There is only one call site which uses this utility, inline it there. Change-Id: Iec3145336f4050046715fd0754934d5c0bdd284a Signed-off-by: Robert Varga --- .../stmt/augment/AbstractAugmentStatementSupport.java | 5 ++--- .../yangtools/yang/parser/stmt/rfc6020/Utils.java | 4 ---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java index d7a11c77c9..026c808cdf 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/augment/AbstractAugmentStatementSupport.java @@ -290,10 +290,9 @@ abstract class AbstractAugmentStatementSupport extends AbstractStatementSupport< "Argument of augment target statement must be QName."); final QName targetStmtQName = (QName) targetCtx.getStatementArgument(); /* - * If target is from another module, return true and perform - * mandatory nodes validation + * If target is from another module, return true and perform mandatory nodes validation */ - if (!Utils.belongsToTheSameModule(targetStmtQName, sourceStmtQName)) { + if (!targetStmtQName.getModule().equals(sourceStmtQName.getModule())) { return true; } diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/Utils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/Utils.java index de75763e0c..b0e3190e92 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/Utils.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/Utils.java @@ -297,8 +297,4 @@ public final class Utils { return string; } - - public static boolean belongsToTheSameModule(final QName targetStmtQName, final QName sourceStmtQName) { - return targetStmtQName.getModule().equals(sourceStmtQName.getModule()); - } } -- 2.36.6