BUG-6972: Remove GroupingUtils.needToCreateNewQName()

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

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/GroupingUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/GroupingUtils.java
index 1cc2679d1dbad7d25154073337d9d5de5047af97..cff472e33d2b40baf71fad58a5978c5de2520bc4 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/GroupingUtils.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/GroupingUtils.java
@@ -82,28 +82,20 @@ public final class GroupingUtils {
 
     public static QNameModule getNewQNameModule(final StatementContextBase<?, ?, ?> targetCtx,
             final StmtContext<?, ?, ?> stmtContext) {
-        if (needToCreateNewQName(stmtContext.getPublicDefinition())) {
-            if (targetCtx.isRootContext()) {
-                return targetCtx.getFromNamespace(ModuleCtxToModuleQName.class, targetCtx);
-            }
-            if (targetCtx.getPublicDefinition() == Rfc6020Mapping.AUGMENT) {
-                return targetCtx.getFromNamespace(ModuleCtxToModuleQName.class, targetCtx.getRoot());
-            }
+        if (targetCtx.isRootContext()) {
+            return targetCtx.getFromNamespace(ModuleCtxToModuleQName.class, targetCtx);
+        }
+        if (targetCtx.getPublicDefinition() == Rfc6020Mapping.AUGMENT) {
+            return targetCtx.getFromNamespace(ModuleCtxToModuleQName.class, targetCtx.getRoot());
+        }
 
-            final Object targetStmtArgument = targetCtx.getStatementArgument();
-            final Object sourceStmtArgument = stmtContext.getStatementArgument();
-            if (targetStmtArgument instanceof QName && sourceStmtArgument instanceof QName) {
-                return ((QName) targetStmtArgument).getModule();
-            } else {
-                return null;
-            }
-        } else {
-            return null;
+        final Object targetStmtArgument = targetCtx.getStatementArgument();
+        final Object sourceStmtArgument = stmtContext.getStatementArgument();
+        if (targetStmtArgument instanceof QName && sourceStmtArgument instanceof QName) {
+            return ((QName) targetStmtArgument).getModule();
         }
-    }
 
-    public static boolean needToCreateNewQName(final StatementDefinition publicDefinition) {
-        return true;
+        return null;
     }
 
     private static final Set<Rfc6020Mapping> NOCOPY_DEF_SET = ImmutableSet.of(Rfc6020Mapping.USES,