Move ordering logic out of AbstractSubtreeManagerRegistryBuilderBuilder

Introduces YangDAG that maintains topological order for yang schema
nodes and can be used by other components to read additional graph edges,
e.g. from file (HONEYCOMB-365).

Change-Id: Ia3046d38ffb4ca222412309f6c4391afc9315bd2
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>

3 files changed, 4 insertions, 42 deletions

diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/data/config/WriterRegistryProvider.java b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/data/config/WriterRegistryProvider.java
index e368266b7..6546ba2d2 100644
--- a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/data/config/WriterRegistryProvider.java
+++ b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/data/config/WriterRegistryProvider.java
@@ -19,6 +19,7 @@ package io.fd.honeycomb.infra.distro.data.config;
 import com.google.inject.Inject;
 import io.fd.honeycomb.infra.distro.ProviderTrait;
 import io.fd.honeycomb.translate.impl.write.registry.FlatWriterRegistryBuilder;
+import io.fd.honeycomb.translate.util.YangDAG;
 import io.fd.honeycomb.translate.write.WriterFactory;
 import io.fd.honeycomb.translate.write.registry.WriterRegistry;
 import java.util.HashSet;
@@ -31,7 +32,7 @@ public final class WriterRegistryProvider extends ProviderTrait<WriterRegistry>
 
     @Override
     protected WriterRegistry create() {
-        final FlatWriterRegistryBuilder builder = new FlatWriterRegistryBuilder();
+        final FlatWriterRegistryBuilder builder = new FlatWriterRegistryBuilder(new YangDAG());
         writerFactories
                 .stream()
                 .forEach(it -> it.init(builder));
diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/data/oper/ReaderRegistryBuilderProvider.java b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/data/oper/ReaderRegistryBuilderProvider.java
deleted file mode 100644
index ab967e164..000000000
--- a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/data/oper/ReaderRegistryBuilderProvider.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.fd.honeycomb.infra.distro.data.oper;
-
-import com.google.inject.Inject;
-import io.fd.honeycomb.infra.distro.ProviderTrait;
-import io.fd.honeycomb.translate.read.ReaderFactory;
-import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder;
-import io.fd.honeycomb.translate.impl.read.registry.CompositeReaderRegistryBuilder;
-import java.util.HashSet;
-import java.util.Set;
-
-public final class ReaderRegistryBuilderProvider extends ProviderTrait<ModifiableReaderRegistryBuilder> {
-
-    @Inject(optional = true)
-    private Set<ReaderFactory> readerFactories = new HashSet<>();
-
-    @Override
-    protected CompositeReaderRegistryBuilder create() {
-        final CompositeReaderRegistryBuilder builder = new CompositeReaderRegistryBuilder();
-        readerFactories.stream()
-                .forEach(it -> it.init(builder));
-        return builder;
-    }
-
-}
diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/data/oper/ReaderRegistryProvider.java b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/data/oper/ReaderRegistryProvider.java
index 86a5ff858..8f6bb0e6e 100644
--- a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/data/oper/ReaderRegistryProvider.java
+++ b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/data/oper/ReaderRegistryProvider.java
@@ -21,6 +21,7 @@ import io.fd.honeycomb.infra.distro.ProviderTrait;
 import io.fd.honeycomb.translate.impl.read.registry.CompositeReaderRegistryBuilder;
 import io.fd.honeycomb.translate.read.ReaderFactory;
 import io.fd.honeycomb.translate.read.registry.ReaderRegistry;
+import io.fd.honeycomb.translate.util.YangDAG;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -31,7 +32,7 @@ public final class ReaderRegistryProvider extends ProviderTrait<ReaderRegistry>
 
     @Override
     protected ReaderRegistry create() {
-        final CompositeReaderRegistryBuilder builder = new CompositeReaderRegistryBuilder();
+        final CompositeReaderRegistryBuilder builder = new CompositeReaderRegistryBuilder(new YangDAG());
         readerFactories.stream()
             .forEach(it -> it.init(builder));
         return builder.build();