BUG 1131: untangling package cyclic dependencies in yang-parser-impl

[yangtools.git] / yang / yang-parser-impl / src / main / java / org / opendaylight / yangtools / yang / parser / builder / impl / BuilderUtils.java

diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserUtils.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/BuilderUtils.java
similarity index 93%
rename from yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserUtils.java
rename to yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/BuilderUtils.java
index 9e123e343e63ac64c0abd671355cb6b5048386e7..19daf45e8822afe39d6026c5f99ded4743cf7a92 100644 (file)
--- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/util/ParserUtils.java
+++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/builder/impl/BuilderUtils.java
@@ -5,7 +5,7 @@
  * 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.util;
+package org.opendaylight.yangtools.yang.parser.builder.impl;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -53,20 +53,9 @@ import org.opendaylight.yangtools.yang.parser.builder.api.GroupingMember;
 import org.opendaylight.yangtools.yang.parser.builder.api.SchemaNodeBuilder;
 import org.opendaylight.yangtools.yang.parser.builder.api.TypeDefinitionBuilder;
 import org.opendaylight.yangtools.yang.parser.builder.api.UsesNodeBuilder;
-import org.opendaylight.yangtools.yang.parser.builder.impl.AnyXmlBuilder;
-import org.opendaylight.yangtools.yang.parser.builder.impl.ChoiceBuilder;
-import org.opendaylight.yangtools.yang.parser.builder.impl.ChoiceCaseBuilder;
-import org.opendaylight.yangtools.yang.parser.builder.impl.ContainerSchemaNodeBuilder;
-import org.opendaylight.yangtools.yang.parser.builder.impl.GroupingBuilderImpl;
-import org.opendaylight.yangtools.yang.parser.builder.impl.IdentitySchemaNodeBuilder;
-import org.opendaylight.yangtools.yang.parser.builder.impl.LeafListSchemaNodeBuilder;
-import org.opendaylight.yangtools.yang.parser.builder.impl.LeafSchemaNodeBuilder;
-import org.opendaylight.yangtools.yang.parser.builder.impl.ListSchemaNodeBuilder;
-import org.opendaylight.yangtools.yang.parser.builder.impl.ModuleBuilder;
-import org.opendaylight.yangtools.yang.parser.builder.impl.NotificationBuilder;
-import org.opendaylight.yangtools.yang.parser.builder.impl.RpcDefinitionBuilder;
-import org.opendaylight.yangtools.yang.parser.builder.impl.TypeDefinitionBuilderImpl;
-import org.opendaylight.yangtools.yang.parser.builder.impl.UnknownSchemaNodeBuilder;
+import org.opendaylight.yangtools.yang.parser.util.NamedByteArrayInputStream;
+import org.opendaylight.yangtools.yang.parser.util.NamedFileInputStream;
+import org.opendaylight.yangtools.yang.parser.util.YangParseException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -77,15 +66,15 @@ import com.google.common.base.Splitter;
 import com.google.common.collect.Collections2;
 import com.google.common.io.ByteSource;
 
-public final class ParserUtils {
+public final class BuilderUtils {
 
-    private static final Logger LOG = LoggerFactory.getLogger(ParserUtils.class);
+    private static final Logger LOG = LoggerFactory.getLogger(BuilderUtils.class);
     private static final Splitter SLASH_SPLITTER = Splitter.on('/');
     private static final Splitter COLON_SPLITTER = Splitter.on(':');
     private static final String INPUT = "input";
     private static final String OUTPUT = "output";
 
-    private ParserUtils() {
+    private BuilderUtils() {
     }
 
     public static Collection<ByteSource> streamsToByteSources(final Collection<InputStream> streams) throws IOException {
@@ -255,7 +244,7 @@ public final class ParserUtils {
         }
         TreeMap<Date, Module> modulesByRevision = new TreeMap<>();
 
-        ModuleImport dependentModuleImport = ParserUtils.getModuleImport(currentModule, prefix);
+        ModuleImport dependentModuleImport = BuilderUtils.getModuleImport(currentModule, prefix);
         if (dependentModuleImport == null) {
             throw new YangParseException(currentModule.getName(), line, "No import found with prefix '" + prefix + "'.");
         }
@@ -510,7 +499,7 @@ public final class ParserUtils {
         return currentNode;
     }
 
-    private static Optional<SchemaNodeBuilder> findDataChild(SchemaNodeBuilder parent, QName child) {
+    private static Optional<SchemaNodeBuilder> findDataChild(final SchemaNodeBuilder parent, final QName child) {
         if (parent instanceof DataNodeContainerBuilder) {
             return castOptional(SchemaNodeBuilder.class,
                     findDataChildInDataNodeContainer((DataNodeContainerBuilder) parent, child));
@@ -534,7 +523,7 @@ public final class ParserUtils {
      *            Original value
      * @return
      */
-    private static <T> Optional<T> castOptional(Class<T> cls, Optional<?> optional) {
+    private static <T> Optional<T> castOptional(final Class<T> cls, final Optional<?> optional) {
         if (optional.isPresent()) {
             Object value = optional.get();
             if (cls.isInstance(value)) {
@@ -560,7 +549,7 @@ public final class ParserUtils {
      * @return Optional of input/output if defined and QName is input/output.
      *         Otherwise {@link Optional#absent()}.
      */
-    private static Optional<ContainerSchemaNodeBuilder> findContainerInRpc(RpcDefinitionBuilder parent, QName child) {
+    private static Optional<ContainerSchemaNodeBuilder> findContainerInRpc(final RpcDefinitionBuilder parent, final QName child) {
         if (INPUT.equals(child.getLocalName())) {
             return Optional.of(parent.getInput());
         } else if (OUTPUT.equals(child.getLocalName())) {
@@ -581,7 +570,7 @@ public final class ParserUtils {
      * @return Optional of child if found.
      */
 
-    private static Optional<ChoiceCaseBuilder> findCaseInChoice(ChoiceBuilder parent, QName child) {
+    private static Optional<ChoiceCaseBuilder> findCaseInChoice(final ChoiceBuilder parent, final QName child) {
         for (ChoiceCaseBuilder caze : parent.getCases()) {
             if (caze.getQName().equals(child)) {
                 return Optional.of(caze);
@@ -601,8 +590,8 @@ public final class ParserUtils {
      *            QName of child
      * @return Optional of child if found.
      */
-    private static Optional<DataSchemaNodeBuilder> findDataChildInDataNodeContainer(DataNodeContainerBuilder parent,
-            QName child) {
+    private static Optional<DataSchemaNodeBuilder> findDataChildInDataNodeContainer(final DataNodeContainerBuilder parent,
+            final QName child) {
         for (DataSchemaNodeBuilder childNode : parent.getChildNodeBuilders()) {
             if (childNode.getQName().equals(child)) {
                 return Optional.of(childNode);
@@ -630,7 +619,7 @@ public final class ParserUtils {
      *            ModuleBuilder to start lookup in
      * @return Node Builder if found, {@link Optional#absent()} otherwise.
      */
-    private static Optional<SchemaNodeBuilder> getDataNamespaceChild(ModuleBuilder module, QName child) {
+    private static Optional<SchemaNodeBuilder> getDataNamespaceChild(final ModuleBuilder module, final QName child) {
         /*
          * First we do lookup in data tree, if node is found we return it.
          */
@@ -662,7 +651,7 @@ public final class ParserUtils {
         return Optional.absent();
     }
 
-    private static Optional<SchemaNodeBuilder> getDataChildByQName(DataNodeContainerBuilder builder, QName child) {
+    private static Optional<SchemaNodeBuilder> getDataChildByQName(final DataNodeContainerBuilder builder, final QName child) {
         for (DataSchemaNodeBuilder childNode : builder.getChildNodeBuilders()) {
             if (childNode.getQName().equals(child)) {
                 return Optional.<SchemaNodeBuilder> of(childNode);
@@ -819,16 +808,16 @@ public final class ParserUtils {
         return result;
     }
 
-    public static List<UnknownSchemaNodeBuilder> wrapUnknownNodes(final String moduleName, final int line,
+    public static List<UnknownSchemaNodeBuilderImpl> wrapUnknownNodes(final String moduleName, final int line,
             final List<UnknownSchemaNode> nodes, final SchemaPath parentPath, final URI ns, final Date rev,
             final String pref) {
-        List<UnknownSchemaNodeBuilder> result = new ArrayList<>();
+        List<UnknownSchemaNodeBuilderImpl> result = new ArrayList<>();
         for (UnknownSchemaNode node : nodes) {
             QName qname = new QName(ns, rev, pref, node.getQName().getLocalName());
             List<QName> path = new ArrayList<>(parentPath.getPath());
             path.add(qname);
             SchemaPath schemaPath = SchemaPath.create(path, parentPath.isAbsolute());
-            result.add(new UnknownSchemaNodeBuilder(moduleName, line, qname, schemaPath, node));
+            result.add(new UnknownSchemaNodeBuilderImpl(moduleName, line, qname, schemaPath, node));
         }
         return result;
     }
@@ -837,7 +826,7 @@ public final class ParserUtils {
         private final String toString;
         private final ByteArrayOutputStream output = new ByteArrayOutputStream();
 
-        private ByteSourceImpl(InputStream input) throws IOException {
+        private ByteSourceImpl(final InputStream input) throws IOException {
             toString = input.toString();
             IOUtils.copy(input, output);
         }