X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-binding-broker%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fbinding%2Ftest%2Futil%2FBindingTestContext.java;h=87f7eaaf1355df805ff17165d26f738e57e62651;hb=refs%2Fchanges%2F25%2F58025%2F3;hp=5bd1316504a02f8d5b4aa25a2cc4c911d1d852a8;hpb=db89afdefb3cfa4454dfdc6008e1d54d3ede66fb;p=controller.git

diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java
index 5bd1316504..87f7eaaf13 100644
--- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java
+++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java
@@ -8,6 +8,7 @@
 package org.opendaylight.controller.sal.binding.test.util;
 
 import static com.google.common.base.Preconditions.checkState;
+
 import com.google.common.annotations.Beta;
 import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.collect.ImmutableMap;
@@ -15,13 +16,13 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.MutableClassToInstanceMap;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
+import javassist.ClassPool;
 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;
@@ -44,7 +45,6 @@ import org.opendaylight.controller.md.sal.dom.broker.impl.mount.DOMMountPointSer
 import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStore;
 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.BrokerService;
@@ -59,7 +59,6 @@ import org.opendaylight.yangtools.binding.data.codec.impl.BindingNormalizedNodeC
 import org.opendaylight.yangtools.yang.binding.YangModuleInfo;
 import org.opendaylight.yangtools.yang.binding.util.BindingReflections;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import javassist.ClassPool;
 
 @Beta
 public class BindingTestContext implements AutoCloseable {
@@ -83,9 +82,6 @@ public class BindingTestContext implements AutoCloseable {
 
     private ImmutableMap<LogicalDatastoreType, DOMStore> newDatastores;
 
-    @Deprecated
-    private DataProviderService baData;
-
     private DOMDataBroker newDOMDataBroker;
 
     private final MockSchemaService mockSchemaService = new MockSchemaService();
@@ -153,7 +149,6 @@ public class BindingTestContext implements AutoCloseable {
 
     public void startBindingBroker() {
         checkState(this.executor != null, "Executor needs to be set");
-        checkState(this.baData != null, "Binding Data Broker must be started");
         checkState(this.baNotifyImpl != null, "Notification Service must be started");
 
         this.baConsumerRpc = new BindingDOMRpcServiceAdapter(getDomRpcInvoker(), this.codec);
@@ -165,7 +160,6 @@ public class BindingTestContext implements AutoCloseable {
         this.baBrokerImpl.setMountService(mountService);
         this.baBrokerImpl.setLegacyMountManager(new HydrogenMountProvisionServiceAdapter(mountService));
         this.baBrokerImpl.setRpcBroker(new HeliumRpcProviderRegistry(this.baConsumerRpc, this.baProviderRpc));
-        this.baBrokerImpl.setLegacyDataBroker(this.baData);
         this.baBrokerImpl.setNotificationBroker(this.baNotifyImpl);
         this.baBrokerImpl.start();
     }
@@ -201,7 +195,6 @@ public class BindingTestContext implements AutoCloseable {
         startDomMountPoint();
         startBindingToDomMappingService();
         startNewDataBroker();
-        startNewBindingDataBroker();
         startBindingNotificationBroker();
         startBindingBroker();
 
@@ -211,11 +204,6 @@ public class BindingTestContext implements AutoCloseable {
         }
     }
 
-    public void startNewBindingDataBroker() {
-        final HydrogenDataBrokerAdapter forwarded = new HydrogenDataBrokerAdapter(this.dataBroker);
-        this.baData = forwarded;
-    }
-
     private void startDomMountPoint() {
         this.biMountImpl = new DOMMountPointServiceImpl();
     }
@@ -249,11 +237,6 @@ public class BindingTestContext implements AutoCloseable {
         updateYangSchema(moduleInfos);
     }
 
-    @Deprecated
-    public DataProviderService getBindingDataBroker() {
-        return this.baData;
-    }
-
     public RpcProviderRegistry getBindingRpcRegistry() {
         return this.baBrokerImpl.getRoot();
     }
@@ -275,6 +258,10 @@ public class BindingTestContext implements AutoCloseable {
         return this.baBrokerImpl.getLegacyMount();
     }
 
+    public MountPointService getBindingMountPointService() {
+        return this.baBrokerImpl.getMountService();
+    }
+
     public DOMMountPointService getDomMountProviderService() {
         return this.biMountImpl;
     }