X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=apps%2Fnetconf-topology-singleton%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Ftopology%2Fsingleton%2Fimpl%2Futils%2FNetconfTopologySetup.java;h=e6ea772e2eb79ec0973de05aa25766308d2b2e18;hb=493d1f617e491d0c4deb8f49079eecf0864f8d80;hp=4c67fb5c9cf1afb19411252097abb9013f11c2e4;hpb=f87c8b6ee4275825ba7b3bd3c706be9e95f480f4;p=netconf.git

diff --git a/apps/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/utils/NetconfTopologySetup.java b/apps/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/utils/NetconfTopologySetup.java
index 4c67fb5c9c..e6ea772e2e 100644
--- a/apps/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/utils/NetconfTopologySetup.java
+++ b/apps/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/utils/NetconfTopologySetup.java
@@ -12,13 +12,13 @@ import static java.util.Objects.requireNonNull;
 import akka.actor.ActorSystem;
 import io.netty.util.Timer;
 import java.time.Duration;
-import java.util.concurrent.Executor;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider;
 import org.opendaylight.netconf.client.NetconfClientFactory;
 import org.opendaylight.netconf.client.mdsal.NetconfDevice;
 import org.opendaylight.netconf.client.mdsal.api.BaseNetconfSchemas;
+import org.opendaylight.netconf.topology.spi.NetconfTopologySchemaAssembler;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
@@ -28,7 +28,7 @@ public final class NetconfTopologySetup {
     private final InstanceIdentifier<Node> instanceIdentifier;
     private final Node node;
     private final Timer timer;
-    private final Executor processingExecutor;
+    private final NetconfTopologySchemaAssembler schemaAssembler;
     private final ActorSystem actorSystem;
     private final NetconfClientFactory netconfClientFactory;
     private final String topologyId;
@@ -42,7 +42,7 @@ public final class NetconfTopologySetup {
         instanceIdentifier = builder.getInstanceIdentifier();
         node = builder.getNode();
         timer = builder.getTimer();
-        processingExecutor = builder.getProcessingExecutor();
+        schemaAssembler = builder.getSchemaAssembler();
         actorSystem = builder.getActorSystem();
         netconfClientFactory = builder.getNetconfClientFactory();
         topologyId = builder.getTopologyId();
@@ -67,8 +67,8 @@ public final class NetconfTopologySetup {
         return node;
     }
 
-    public Executor getProcessingExecutor() {
-        return processingExecutor;
+    public NetconfTopologySchemaAssembler getSchemaAssembler() {
+        return schemaAssembler;
     }
 
     public Timer getTimer() {
@@ -109,7 +109,7 @@ public final class NetconfTopologySetup {
         private InstanceIdentifier<Node> instanceIdentifier;
         private Node node;
         private Timer timer;
-        private Executor processingExecutor;
+        private NetconfTopologySchemaAssembler schemaAssembler;
         private ActorSystem actorSystem;
         private String topologyId;
         private NetconfClientFactory netconfClientFactory;
@@ -180,12 +180,13 @@ public final class NetconfTopologySetup {
             return this;
         }
 
-        Executor getProcessingExecutor() {
-            return processingExecutor;
+
+        NetconfTopologySchemaAssembler getSchemaAssembler() {
+            return schemaAssembler;
         }
 
-        public Builder setProcessingExecutor(final Executor processingExecutor) {
-            this.processingExecutor = processingExecutor;
+        public Builder setSchemaAssembler(final NetconfTopologySchemaAssembler schemaAssembler) {
+            this.schemaAssembler = schemaAssembler;
             return this;
         }