HONEYCOMB-34: Configurable ConfigDataTree dependency

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

3 files changed, 23 insertions, 27 deletions

diff --git a/v3po/impl/src/main/java/io/fd/honeycomb/v3po/impl/V3poProvider.java b/v3po/impl/src/main/java/io/fd/honeycomb/v3po/impl/V3poProvider.java
index d07c0ffca..bd5141282 100644
--- a/v3po/impl/src/main/java/io/fd/honeycomb/v3po/impl/V3poProvider.java
+++ b/v3po/impl/src/main/java/io/fd/honeycomb/v3po/impl/V3poProvider.java
@@ -20,6 +20,7 @@ import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.CheckedFuture;
 import com.google.common.util.concurrent.Futures;
+import io.fd.honeycomb.v3po.data.ModifiableDataTree;
 import io.fd.honeycomb.v3po.translate.read.ReaderRegistry;
 import io.fd.honeycomb.v3po.translate.write.WriterRegistry;
 import java.util.Collections;
@@ -78,16 +79,19 @@ public class V3poProvider implements BindingAwareProvider, AutoCloseable, Broker
     private DataBroker db;
     VppPollOperDataImpl vppPollOperData;
     private VppDataBrokerInitializationProvider vppDataBrokerInitializationProvider;
+    private final ModifiableDataTree configDataTree;
 
     public V3poProvider(@Nonnull final Broker domBroker, final vppApi vppJapi,
                         @Nonnull final ReaderRegistry readerRegistry,
                         @Nonnull final WriterRegistry writerRegistry,
-                        @Nonnull final BindingNormalizedNodeSerializer serializer) {
+                        @Nonnull final BindingNormalizedNodeSerializer serializer,
+                        @Nonnull final ModifiableDataTree configDataTree) {
         api = vppJapi;
         this.readerRegistry = Preconditions.checkNotNull(readerRegistry, "readerRegistry should not be null");
         this.writerRegistry = Preconditions.checkNotNull(writerRegistry, "writerRegistry should not be null");
         this.domBroker = Preconditions.checkNotNull(domBroker, "domBroker should not be null");
         this.serializer = Preconditions.checkNotNull(serializer, "serializer should not be null");
+        this.configDataTree = Preconditions.checkNotNull(configDataTree, "configDataTree should not be null");
     }
 
     private void initializeVppConfig() {
@@ -198,7 +202,7 @@ public class V3poProvider implements BindingAwareProvider, AutoCloseable, Broker
         startOperationalUpdateTimer();
 
         // TODO make configurable:
-        vppDataBrokerInitializationProvider = new VppDataBrokerInitializationProvider(db, readerRegistry, writerRegistry, serializer);
+        vppDataBrokerInitializationProvider = new VppDataBrokerInitializationProvider(db, readerRegistry, writerRegistry, serializer, configDataTree);
         // TODO pull the registration into Module
         domBroker.registerProvider(vppDataBrokerInitializationProvider);
     }
diff --git a/v3po/impl/src/main/java/io/fd/honeycomb/v3po/impl/VppDataBrokerInitializationProvider.java b/v3po/impl/src/main/java/io/fd/honeycomb/v3po/impl/VppDataBrokerInitializationProvider.java
index b0ee447ba..e0e8c999e 100644
--- a/v3po/impl/src/main/java/io/fd/honeycomb/v3po/impl/VppDataBrokerInitializationProvider.java
+++ b/v3po/impl/src/main/java/io/fd/honeycomb/v3po/impl/VppDataBrokerInitializationProvider.java
@@ -25,7 +25,6 @@ import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import io.fd.honeycomb.v3po.data.ModifiableDataTree;
 import io.fd.honeycomb.v3po.data.ReadableDataTree;
-import io.fd.honeycomb.v3po.data.impl.ConfigDataTree;
 import io.fd.honeycomb.v3po.data.impl.DataBroker;
 import io.fd.honeycomb.v3po.data.impl.OperationalDataTree;
 import io.fd.honeycomb.v3po.translate.Context;
@@ -73,11 +72,8 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailedException;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType;
-import org.opendaylight.yangtools.yang.data.impl.schema.tree.InMemoryDataTreeFactory;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -99,16 +95,19 @@ public final class VppDataBrokerInitializationProvider implements Provider, Auto
     private final BindingNormalizedNodeSerializer serializer;
     private ObjectRegistration<DOMMountPoint> mountPointRegistration;
     private DOMDataBroker broker;
+    private ModifiableDataTree configDataTree;
 
     public VppDataBrokerInitializationProvider(
             @Nonnull final org.opendaylight.controller.md.sal.binding.api.DataBroker bindingBroker,
-            final ReaderRegistry readerRegistry,
-            final WriterRegistry writerRegistry,
-            final BindingNormalizedNodeSerializer serializer) {
+            @Nonnull final ReaderRegistry readerRegistry,
+            @Nonnull final WriterRegistry writerRegistry,
+            @Nonnull final BindingNormalizedNodeSerializer serializer,
+            @Nonnull final ModifiableDataTree configDataTree) {
         this.bindingBroker = checkNotNull(bindingBroker, "bindingBroker should not be null");
         this.readerRegistry = checkNotNull(readerRegistry, "readerRegistry should not be null");
         this.writerRegistry = checkNotNull(writerRegistry, "writerRegistry should not be null");
         this.serializer = checkNotNull(serializer, "serializer should not be null");
+        this.configDataTree = checkNotNull(configDataTree, "configDataTree should not be null");
         this.mountPointPath = getMountPointPath();
     }
 
@@ -136,7 +135,7 @@ public final class VppDataBrokerInitializationProvider implements Provider, Auto
         final DOMMountPointService.DOMMountPointBuilder mountPointBuilder = mountPointService.createMountPoint(path);
         mountPointBuilder.addInitialSchemaContext(globalContext);
 
-        broker = initVppDataBroker(globalContext, serializer);
+        broker = initVppDataBroker(globalContext, serializer, configDataTree);
         mountPointBuilder.addService(DOMDataBroker.class, broker);
 
         mountPointRegistration = mountPointBuilder.register();
@@ -169,16 +168,17 @@ public final class VppDataBrokerInitializationProvider implements Provider, Auto
     }
 
     private DOMDataBroker initVppDataBroker(final SchemaContext globalContext,
-                                            final BindingNormalizedNodeSerializer serializer) {
+                                            final BindingNormalizedNodeSerializer serializer,
+                                            final ModifiableDataTree configDataTree) {
         final ReadableDataTree operationalDataTree =
                 new OperationalDataTree(serializer, globalContext, readerRegistry); // TODO make configurable
 
-        final DataTree dataTree =
-                InMemoryDataTreeFactory.getInstance().create(TreeType.CONFIGURATION); // TODO make configurable
-        dataTree.setSchemaContext(globalContext);
+//        final DataTree dataTree =
+//                InMemoryDataTreeFactory.getInstance().create(TreeType.CONFIGURATION); // TODO make configurable
+//        dataTree.setSchemaContext(globalContext);
 
-        final ModifiableDataTree configDataTree =
-                new ConfigDataTree(serializer, dataTree, writerRegistry); // TODO make configurable
+//        final ModifiableDataTree configDataTree =
+//                new ConfigDataTree(serializer, dataTree, writerRegistry); // TODO make configurable
 
         // init operational data tree before data broker is initialized
 
diff --git a/v3po/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/V3poModule.java b/v3po/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/V3poModule.java
index 406525c19..0078f16fc 100644
--- a/v3po/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/V3poModule.java
+++ b/v3po/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/v3po/impl/rev141210/V3poModule.java
@@ -17,8 +17,6 @@
 package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.impl.rev141210;
 
 import io.fd.honeycomb.v3po.impl.V3poProvider;
-import io.fd.honeycomb.v3po.translate.read.ReaderRegistry;
-import io.fd.honeycomb.v3po.translate.write.WriterRegistry;
 import java.util.Collection;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
@@ -30,7 +28,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.vpp.BridgeDomains;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.vpp.bridge.domains.BridgeDomain;
-import org.opendaylight.yangtools.binding.data.codec.api.BindingNormalizedNodeSerializer;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
@@ -57,17 +54,12 @@ public class V3poModule extends
 
     @Override
     public java.lang.AutoCloseable createInstance() {
-        final ReaderRegistry readerRegistry = getReaderRegistryDependency();
-        final WriterRegistry writerRegistry = getWriterRegistryDependency();
-
         final Broker domBroker = getDomBrokerDependency();
         domBroker.registerProvider(new InitializationProvider());
 
-        final BindingNormalizedNodeSerializer serializer =
-                getBindingNormalizedNodeSerializerDependency();
-
-        final V3poProvider provider =
-                new V3poProvider(domBroker, getVppJapiDependency(), readerRegistry, writerRegistry, serializer);
+        final V3poProvider provider = new V3poProvider(domBroker, getVppJapiDependency(), getReaderRegistryDependency(),
+                getWriterRegistryDependency(), getBindingNormalizedNodeSerializerDependency(),
+                getConfigDataTreeDependency());
         getBrokerDependency().registerProvider(provider);
         return provider;
     }