fix Databroker deprecated warnings

[transportpce.git] / common / src / main / java / org / opendaylight / transportpce / common / device / DeviceTransactionManagerImpl.java

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransactionManagerImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransactionManagerImpl.java
index cf48fba8741365a14aa54430353b67541297c7b3..9cf55957133e6dc152afdeeff6a30532864656d3 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransactionManagerImpl.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/device/DeviceTransactionManagerImpl.java
@@ -25,10 +25,10 @@ import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.MountPoint;
-import org.opendaylight.controller.md.sal.binding.api.MountPointService;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.MountPoint;
+import org.opendaylight.mdsal.binding.api.MountPointService;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.transportpce.common.InstanceIdentifiers;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
@@ -133,7 +133,7 @@ public class DeviceTransactionManagerImpl implements DeviceTransactionManager {
     private Optional<DataBroker> getDeviceDataBroker(String deviceId) {
         Optional<MountPoint> netconfNode = getDeviceMountPoint(deviceId);
         if (netconfNode.isPresent()) {
-            return netconfNode.get().getService(DataBroker.class).toJavaUtil();
+            return netconfNode.get().getService(DataBroker.class);
         } else {
             LOG.error("Device mount point not found for : {}", deviceId);
             return Optional.empty();
@@ -144,7 +144,7 @@ public class DeviceTransactionManagerImpl implements DeviceTransactionManager {
     public Optional<MountPoint> getDeviceMountPoint(String deviceId) {
         InstanceIdentifier<Node> netconfNodeIID = InstanceIdentifiers.NETCONF_TOPOLOGY_II.child(Node.class,
                 new NodeKey(new NodeId(deviceId)));
-        return mountPointService.getMountPoint(netconfNodeIID).toJavaUtil();
+        return mountPointService.getMountPoint(netconfNodeIID);
     }
 
     @Override
@@ -160,7 +160,7 @@ public class DeviceTransactionManagerImpl implements DeviceTransactionManager {
         if (deviceTxOpt.isPresent()) {
             DeviceTransaction deviceTx = deviceTxOpt.get();
             try {
-                return deviceTx.read(logicalDatastoreType, path).get(timeout, timeUnit).toJavaUtil();
+                return deviceTx.read(logicalDatastoreType, path).get(timeout, timeUnit);
             } catch (InterruptedException | ExecutionException | TimeoutException e) {
                 LOG.error("Exception thrown while reading data from device {}! IID: {}", deviceId, path, e);
             } finally {