Moved binding MD-SAL APIs to binding folder

[mdsal.git] / binding / mdsal-binding-dom-adapter / src / test / java / org / opendaylight / controller / sal / binding / test / util / BindingTestContext.java

diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java
similarity index 85%
rename from opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java
rename to binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java
index 5ca041a3e60a4b40fb043fa9045e4dd4995c9171..dbea6b57eeaac0b7de13a1af2721725f41d4c5da 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java
+++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java
@@ -22,10 +22,6 @@ import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.MountPointService;
 import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
 import org.opendaylight.controller.md.sal.binding.api.NotificationService;
-import org.opendaylight.controller.md.sal.binding.compat.HeliumNotificationProviderServiceAdapter;
-import org.opendaylight.controller.md.sal.binding.compat.HeliumRpcProviderRegistry;
-import org.opendaylight.controller.md.sal.binding.compat.HydrogenDataBrokerAdapter;
-import org.opendaylight.controller.md.sal.binding.compat.HydrogenMountProvisionServiceAdapter;
 import org.opendaylight.controller.md.sal.binding.impl.BindingDOMDataBrokerAdapter;
 import org.opendaylight.controller.md.sal.binding.impl.BindingDOMMountPointServiceAdapter;
 import org.opendaylight.controller.md.sal.binding.impl.BindingDOMNotificationPublishServiceAdapter;
@@ -45,10 +41,9 @@ import org.opendaylight.controller.md.sal.dom.broker.impl.DOMRpcRouter;
 import org.opendaylight.controller.md.sal.dom.broker.impl.SerializedDOMDataBroker;
 import org.opendaylight.controller.md.sal.dom.broker.impl.mount.DOMMountPointServiceImpl;
 import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStore;
+import org.opendaylight.controller.sal.binding.api.BindingAwareService;
 import org.opendaylight.controller.sal.binding.api.RpcConsumerRegistry;
 import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
-import org.opendaylight.controller.sal.binding.api.data.DataProviderService;
-import org.opendaylight.controller.sal.binding.api.mount.MountProviderService;
 import org.opendaylight.controller.sal.binding.impl.RootBindingAwareBroker;
 import org.opendaylight.controller.sal.core.api.Broker.ProviderSession;
 import org.opendaylight.controller.sal.core.api.BrokerService;
@@ -72,9 +67,6 @@ public class BindingTestContext implements AutoCloseable {
 
     private RootBindingAwareBroker baBrokerImpl;
 
-    private HeliumNotificationProviderServiceAdapter baNotifyImpl;
-
-
     private BrokerImpl biBrokerImpl;
 
     private final ListeningExecutorService executor;
@@ -86,9 +78,6 @@ public class BindingTestContext implements AutoCloseable {
 
     private ImmutableMap<LogicalDatastoreType, DOMStore> newDatastores;
 
-    @Deprecated
-    private DataProviderService baData;
-
     private DOMDataBroker newDOMDataBroker;
 
     private final MockSchemaService mockSchemaService = new MockSchemaService();
@@ -154,21 +143,16 @@ public class BindingTestContext implements AutoCloseable {
 
     public void startBindingBroker() {
         checkState(executor != null, "Executor needs to be set");
-        checkState(baData != null, "Binding Data Broker must be started");
-        checkState(baNotifyImpl != null, "Notification Service must be started");
 
         baConsumerRpc = new BindingDOMRpcServiceAdapter(getDomRpcInvoker(), codec);
         baProviderRpc = new BindingDOMRpcProviderServiceAdapter(getDomRpcRegistry(), codec);
-
-        baBrokerImpl = new RootBindingAwareBroker("test");
-
         final MountPointService mountService = new BindingDOMMountPointServiceAdapter(biMountImpl, codec);
-        baBrokerImpl.setMountService(mountService);
-        baBrokerImpl.setLegacyMountManager(new HydrogenMountProvisionServiceAdapter(mountService));
-        baBrokerImpl.setRpcBroker(new HeliumRpcProviderRegistry(baConsumerRpc, baProviderRpc));
-        baBrokerImpl.setLegacyDataBroker(baData);
-        baBrokerImpl.setNotificationBroker(baNotifyImpl);
-        baBrokerImpl.start();
+
+        final ImmutableClassToInstanceMap<BindingAwareService> consumerServices =
+                ImmutableClassToInstanceMap.<BindingAwareService>builder().build();
+        final ImmutableClassToInstanceMap<BindingAwareService> providerServices =
+                ImmutableClassToInstanceMap.<BindingAwareService>builder().build();;
+        baBrokerImpl = new RootBindingAwareBroker("test", consumerServices, providerServices);
     }
 
     public void startForwarding() {
@@ -229,7 +213,6 @@ public class BindingTestContext implements AutoCloseable {
         startDomMountPoint();
         startBindingToDomMappingService();
         startNewDataBroker();
-        startNewBindingDataBroker();
         startBindingNotificationBroker();
         startBindingBroker();
 
@@ -239,11 +222,6 @@ public class BindingTestContext implements AutoCloseable {
         }
     }
 
-    public void startNewBindingDataBroker() {
-        final HydrogenDataBrokerAdapter forwarded = new HydrogenDataBrokerAdapter(dataBroker);
-        baData = forwarded;
-    }
-
     private void startDomMountPoint() {
         biMountImpl = new DOMMountPointServiceImpl();
     }
@@ -268,7 +246,6 @@ public class BindingTestContext implements AutoCloseable {
         domListenService = router;
         publishService = new BindingDOMNotificationPublishServiceAdapter(codec, domPublishService);
         listenService = new BindingDOMNotificationServiceAdapter(codec, domListenService);
-        baNotifyImpl = new HeliumNotificationProviderServiceAdapter(publishService,listenService);
 
     }
 
@@ -277,13 +254,10 @@ public class BindingTestContext implements AutoCloseable {
         updateYangSchema(moduleInfos);
     }
 
-    @Deprecated
-    public DataProviderService getBindingDataBroker() {
-        return baData;
-    }
+
 
     public RpcProviderRegistry getBindingRpcRegistry() {
-        return baBrokerImpl.getRoot();
+        return baBrokerImpl.getRpcProviderRegistry();
     }
 
     public DOMRpcProviderService getDomRpcRegistry() {
@@ -299,10 +273,6 @@ public class BindingTestContext implements AutoCloseable {
 
     }
 
-    public MountProviderService getBindingMountProviderService() {
-        return baBrokerImpl.getLegacyMount();
-    }
-
     public DOMMountPointService getDomMountProviderService() {
         return biMountImpl;
     }