Remove unused references to BindingAwareBroker

Change-Id: I2a6d5e06f9b357737b37779b7e294731f79ba833
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

diff --git a/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/controller/config/yang/netconf/mdsal/notification/NotificationToMdsalWriterTest.java b/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/controller/config/yang/netconf/mdsal/notification/NotificationToMdsalWriterTest.java
index 5c7fdb8b93ebc6de75f0e477cef39970d5402cd3..7529ab4f6caeab5ae3f1fc624473ceda27f37591 100644 (file)
--- a/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/controller/config/yang/netconf/mdsal/notification/NotificationToMdsalWriterTest.java
+++ b/netconf/mdsal-netconf-notification/src/test/java/org/opendaylight/controller/config/yang/netconf/mdsal/notification/NotificationToMdsalWriterTest.java
@@ -23,7 +23,6 @@ import org.mockito.MockitoAnnotations;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.netconf.notifications.NetconfNotificationCollector;
 import org.opendaylight.netconf.notifications.NotificationRegistration;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714.StreamNameType;
@@ -48,11 +47,9 @@ public class NotificationToMdsalWriterTest {
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
         final NetconfNotificationCollector notificationCollector = mock(NetconfNotificationCollector.class);
-        final BindingAwareBroker.ProviderContext session = mock(BindingAwareBroker.ProviderContext.class);
 
         doReturn(notificationRegistration).when(notificationCollector).registerStreamListener(any(
                 NetconfNotificationCollector.NetconfNotificationStreamListener.class));
-        doReturn(dataBroker).when(session).getSALService(DataBroker.class);
 
         WriteTransaction tx = mock(WriteTransaction.class);
         doNothing().when(tx).merge(any(LogicalDatastoreType.class), any(InstanceIdentifier.class),

diff --git a/netconf/mdsal-netconf-yang-library/src/test/java/org/opendaylight/netconf/mdsal/yang/library/SchemaServiceToMdsalWriterTest.java b/netconf/mdsal-netconf-yang-library/src/test/java/org/opendaylight/netconf/mdsal/yang/library/SchemaServiceToMdsalWriterTest.java
index 1b8b6dd6a3cce87fd3438f164c1a4e3326b7209f..dda63840422dc62c4f5ef64152d1341af6343919 100644 (file)
--- a/netconf/mdsal-netconf-yang-library/src/test/java/org/opendaylight/netconf/mdsal/yang/library/SchemaServiceToMdsalWriterTest.java
+++ b/netconf/mdsal-netconf-yang-library/src/test/java/org/opendaylight/netconf/mdsal/yang/library/SchemaServiceToMdsalWriterTest.java
@@ -23,7 +23,6 @@ import org.mockito.MockitoAnnotations;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.controller.sal.core.api.model.SchemaService;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.library.rev160409.ModulesState;
@@ -49,8 +48,6 @@ public class SchemaServiceToMdsalWriterTest {
     @Mock
     private SchemaService schemaService;
     @Mock
-    private BindingAwareBroker.ProviderContext context;
-    @Mock
     private DataBroker dataBroker;
     @Mock
     private WriteTransaction writeTransaction;
@@ -61,7 +58,6 @@ public class SchemaServiceToMdsalWriterTest {
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
-        when(context.getSALService(DataBroker.class)).thenReturn(dataBroker);
         when(dataBroker.newWriteOnlyTransaction()).thenReturn(writeTransaction);
         doNothing().when(writeTransaction).put(eq(LogicalDatastoreType.OPERATIONAL), any(), any());
         when(writeTransaction.submit()).thenReturn(Futures.immediateCheckedFuture(null));
@@ -107,4 +103,4 @@ public class SchemaServiceToMdsalWriterTest {
         return new ModulesStateBuilder().setModuleSetId("0")
                 .setModule(Lists.newArrayList(module)).build();
     }
-}
\ No newline at end of file
+}

diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalProviderTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalProviderTest.java
index bad640f1b3991aac04c6efba6ecb8ab4eb644f93..78c586e66b765cc5891d3693cfaf9304512223dd 100644 (file)
--- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalProviderTest.java
+++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalProviderTest.java
@@ -29,7 +29,6 @@ import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionChainListener;
 import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId;
 
 public class NetconfDeviceSalProviderTest {
@@ -37,8 +36,6 @@ public class NetconfDeviceSalProviderTest {
     @Mock
     private DOMMountPointService mountpointService;
     @Mock
-    private BindingAwareBroker.ProviderContext context;
-    @Mock
     private WriteTransaction tx;
     @Mock
     private DataBroker dataBroker;
@@ -60,7 +57,6 @@ public class NetconfDeviceSalProviderTest {
         doReturn(Futures.immediateCheckedFuture(null)).when(writeTx).submit();
         provider = new NetconfDeviceSalProvider(new RemoteDeviceId("device1",
                 InetSocketAddress.createUnresolved("localhost", 17830)), mountPointService, dataBroker);
-        when(context.getSALService(DataBroker.class)).thenReturn(dataBroker);
         when(chain.newWriteOnlyTransaction()).thenReturn(tx);
         when(tx.submit()).thenReturn(Futures.immediateCheckedFuture(null));
         when(tx.getIdentifier()).thenReturn(tx);