Move yang.parser.stmt.rfc6020.Utils

The only user of the leftover methods is rfc7950.repo. Rename this
class and move it into rfc7950 and hide it.

Change-Id: I5a67e1467fb0c15f18c78d543c520eafcd1cd01c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

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/rfc7950/repo/ArgumentContextUtils.java
similarity index 91%
rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/Utils.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/ArgumentContextUtils.java
index cb8d20054639fa6b5ba010ce4aba27ea2ea8355c..0a78be963bcbfa33adae468f3ca8c8d07e687166 100644 (file)
--- 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/rfc7950/repo/ArgumentContextUtils.java
@@ -5,36 +5,35 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.yangtools.yang.parser.stmt.rfc6020;
+package org.opendaylight.yangtools.yang.parser.rfc7950.repo;
 
 import com.google.common.base.CharMatcher;
 import java.util.Collections;
 import java.util.List;
 import java.util.regex.Pattern;
 import org.antlr.v4.runtime.tree.TerminalNode;
-import org.opendaylight.yangtools.antlrv4.code.gen.YangStatementParser;
+import org.opendaylight.yangtools.antlrv4.code.gen.YangStatementParser.ArgumentContext;
 import org.opendaylight.yangtools.yang.common.YangVersion;
 import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
 import org.opendaylight.yangtools.yang.parser.spi.source.StatementSourceReference;
 
-public final class Utils {
+final class ArgumentContextUtils {
     private static final CharMatcher ANYQUOTE_MATCHER = CharMatcher.anyOf("'\"");
     private static final Pattern ESCAPED_DQUOT = Pattern.compile("\\\"", Pattern.LITERAL);
     private static final Pattern ESCAPED_BACKSLASH = Pattern.compile("\\\\", Pattern.LITERAL);
     private static final Pattern ESCAPED_LF = Pattern.compile("\\n", Pattern.LITERAL);
     private static final Pattern ESCAPED_TAB = Pattern.compile("\\t", Pattern.LITERAL);
 
-    private Utils() {
+    private ArgumentContextUtils() {
         throw new UnsupportedOperationException();
     }
 
-    public static String stringFromStringContext(final YangStatementParser.ArgumentContext context,
-            final StatementSourceReference ref) {
+    static String stringFromStringContext(final ArgumentContext context, final StatementSourceReference ref) {
         return stringFromStringContext(context, YangVersion.VERSION_1, ref);
     }
 
-    public static String stringFromStringContext(final YangStatementParser.ArgumentContext context,
-            final YangVersion yangVersion, final StatementSourceReference ref) {
+    static String stringFromStringContext(final ArgumentContext context, final YangVersion yangVersion,
+            final StatementSourceReference ref) {
         final StringBuilder sb = new StringBuilder();
         List<TerminalNode> strings = context.STRING();
         if (strings.isEmpty()) {

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfo.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfo.java
index e691e7f0c2758abe01ccb2915bba38100a74837c..fef331b86d1684b0af668d32b605dc7ef14eb95b 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfo.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangModelDependencyInfo.java
@@ -34,7 +34,6 @@ import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier;
 import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
 import org.opendaylight.yangtools.yang.parser.spi.source.DeclarationInTextSource;
 import org.opendaylight.yangtools.yang.parser.spi.source.StatementSourceReference;
-import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.Utils;
 
 /**
  * Helper transfer object which holds basic and dependency information for YANG
@@ -216,7 +215,8 @@ public abstract class YangModelDependencyInfo {
 
     private static YangModelDependencyInfo parseModuleContext(final StatementContext module,
             final SourceIdentifier source) {
-        final String name = Utils.stringFromStringContext(module.argument(), getReference(source, module));
+        final String name = ArgumentContextUtils.stringFromStringContext(module.argument(), getReference(source,
+            module));
         final String latestRevision = getLatestRevision(module, source);
         final Optional<SemVer> semVer = Optional.ofNullable(findSemanticVersion(module, source));
         final ImmutableSet<ModuleImport> imports = parseImports(module, source);
@@ -231,8 +231,8 @@ public abstract class YangModelDependencyInfo {
         for (final StatementContext subStatementContext : module.statement()) {
             if (IMPORT.equals(subStatementContext.keyword().getText())) {
                 final String revisionDateStr = getRevisionDateString(subStatementContext, source);
-                final String importedModuleName = Utils.stringFromStringContext(subStatementContext.argument(),
-                        getReference(source, subStatementContext));
+                final String importedModuleName = ArgumentContextUtils.stringFromStringContext(
+                    subStatementContext.argument(), getReference(source, subStatementContext));
                 final Revision revisionDate = Revision.ofNullable(revisionDateStr).orElse(null);
                 final SemVer importSemVer = findSemanticVersion(subStatementContext, source);
                 result.add(new ModuleImportImpl(importedModuleName, revisionDate, importSemVer));
@@ -246,7 +246,7 @@ public abstract class YangModelDependencyInfo {
         for (final StatementContext subStatement : statement.statement()) {
             final String subStatementName = trimPrefix(subStatement.keyword().getText());
             if (OPENCONFIG_VERSION.equals(subStatementName)) {
-                semVerString = Utils.stringFromStringContext(subStatement.argument(),
+                semVerString = ArgumentContextUtils.stringFromStringContext(subStatement.argument(),
                         getReference(source, subStatement));
                 break;
             }
@@ -271,8 +271,8 @@ public abstract class YangModelDependencyInfo {
         for (final StatementContext subStatementContext : module.statement()) {
             if (INCLUDE.equals(subStatementContext.keyword().getText())) {
                 final String revisionDateStr = getRevisionDateString(subStatementContext, source);
-                final String IncludeModuleName = Utils.stringFromStringContext(subStatementContext.argument(),
-                        getReference(source, subStatementContext));
+                final String IncludeModuleName = ArgumentContextUtils.stringFromStringContext(
+                    subStatementContext.argument(), getReference(source, subStatementContext));
                 final Revision revisionDate = Revision.ofNullable(revisionDateStr).orElse(null);
                 result.add(new ModuleImportImpl(IncludeModuleName, revisionDate));
             }
@@ -284,7 +284,7 @@ public abstract class YangModelDependencyInfo {
         String revisionDateStr = null;
         for (final StatementContext importSubStatement : importStatement.statement()) {
             if (REVISION_DATE.equals(importSubStatement.keyword().getText())) {
-                revisionDateStr = Utils.stringFromStringContext(importSubStatement.argument(),
+                revisionDateStr = ArgumentContextUtils.stringFromStringContext(importSubStatement.argument(),
                         getReference(source, importSubStatement));
             }
         }
@@ -295,8 +295,8 @@ public abstract class YangModelDependencyInfo {
         String latestRevision = null;
         for (final StatementContext subStatementContext : module.statement()) {
             if (REVISION.equals(subStatementContext.keyword().getText())) {
-                final String currentRevision = Utils.stringFromStringContext(subStatementContext.argument(),
-                        getReference(source, subStatementContext));
+                final String currentRevision = ArgumentContextUtils.stringFromStringContext(
+                    subStatementContext.argument(), getReference(source, subStatementContext));
                 if (latestRevision == null || latestRevision.compareTo(currentRevision) < 0) {
                     latestRevision = currentRevision;
                 }
@@ -307,7 +307,8 @@ public abstract class YangModelDependencyInfo {
 
     private static YangModelDependencyInfo parseSubmoduleContext(final StatementContext submodule,
             final SourceIdentifier source) {
-        final String name = Utils.stringFromStringContext(submodule.argument(), getReference(source, submodule));
+        final String name = ArgumentContextUtils.stringFromStringContext(submodule.argument(),
+            getReference(source, submodule));
         final String belongsTo = parseBelongsTo(submodule, source);
 
         final String latestRevision = getLatestRevision(submodule, source);
@@ -320,7 +321,7 @@ public abstract class YangModelDependencyInfo {
     private static String parseBelongsTo(final StatementContext submodule, final SourceIdentifier source) {
         for (final StatementContext subStatementContext : submodule.statement()) {
             if (BELONGS_TO.equals(subStatementContext.keyword().getText())) {
-                return Utils.stringFromStringContext(subStatementContext.argument(),
+                return ArgumentContextUtils.stringFromStringContext(subStatementContext.argument(),
                     getReference(source, subStatementContext));
             }
         }

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangStatementParserListenerImpl.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangStatementParserListenerImpl.java
index 36cac628e1712ba9cabaf62d911d3e6f82bd4618..e4c9a8450fa15ba8624bd51c4b5a8d71c1cd34a6 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangStatementParserListenerImpl.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/repo/YangStatementParserListenerImpl.java
@@ -28,7 +28,6 @@ import org.opendaylight.yangtools.yang.parser.spi.source.QNameToStatementDefinit
 import org.opendaylight.yangtools.yang.parser.spi.source.SourceException;
 import org.opendaylight.yangtools.yang.parser.spi.source.StatementSourceReference;
 import org.opendaylight.yangtools.yang.parser.spi.source.StatementWriter;
-import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.Utils;
 
 final class YangStatementParserListenerImpl extends YangStatementParserBaseListener {
     private static final class Counter {
@@ -93,8 +92,8 @@ final class YangStatementParserListenerImpl extends YangStatementParserBaseListe
         }
 
         final ArgumentContext argumentCtx = ctx.getChild(ArgumentContext.class, 0);
-        final String argument = argumentCtx != null ? Utils.stringFromStringContext(argumentCtx, yangVersion, ref)
-                : null;
+        final String argument = argumentCtx != null
+                ? ArgumentContextUtils.stringFromStringContext(argumentCtx, yangVersion, ref) : null;
         writer.startStatement(childId, validStatementDefinition, argument, ref);
     }