Migrate off deprecated APIs, to mdsal.binding.api.DataBroker

[unimgr.git] / ovs-driver / src / main / java / org / opendaylight / unimgr / mef / nrp / ovs / util / MdsalUtilsExt.java

diff --git a/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/util/MdsalUtilsExt.java b/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/util/MdsalUtilsExt.java
index aa49b3bc655c4e25b54d208d6ec43519f5ee8af8..f38249c98f293f9f6130810653283235f9458351 100644 (file)
--- a/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/util/MdsalUtilsExt.java
+++ b/ovs-driver/src/main/java/org/opendaylight/unimgr/mef/nrp/ovs/util/MdsalUtilsExt.java
@@ -1,12 +1,19 @@
+/*
+ * Copyright (c) 2018 Cisco Systems Inc and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
 package org.opendaylight.unimgr.mef.nrp.ovs.util;
 
-import com.google.common.base.Optional;
-import com.google.common.util.concurrent.CheckedFuture;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.ReadTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
+import java.util.Optional;
+import java.util.concurrent.ExecutionException;
 
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.ReadTransaction;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TopologyId;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology;
@@ -15,6 +22,8 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.util.concurrent.FluentFuture;
+
 /**
  * Utility functions.
  * @author bartosz.michalik@amartus.com
@@ -38,14 +47,14 @@ public class MdsalUtilsExt {
                 = InstanceIdentifier.builder(NetworkTopology.class)
                 .child(Topology.class, new TopologyKey(topologyId))
                 .build();
-        final CheckedFuture<Optional<Topology>, ReadFailedException> topologyFuture =
+        final FluentFuture<Optional<Topology>> topologyFuture =
                 read.read(store, topologyInstanceId);
 
         try {
-            return topologyFuture.checkedGet();
-        } catch (final ReadFailedException e) {
+            return topologyFuture.get();
+        } catch (final InterruptedException | ExecutionException e) {
             LOG.info("Unable to read topology with Iid {}", topologyInstanceId, e);
         }
-        return Optional.absent();
+        return Optional.empty();
     }
 }