From cfe4af80090c9f389f057ba6de7e20ad8ebb798c Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 4 Jul 2018 16:32:34 +0200 Subject: [PATCH] Remove unneeded use of CheckedFuture These callsites can live with ListenableFuture, so use that to reduce clutter. Change-Id: I4bea70e8f62b06cfdc1d7a3dfa5d7552178fa4c4 Signed-off-by: Robert Varga --- .../topology/singleton/impl/actors/NetconfNodeActor.java | 5 +---- .../topology/singleton/impl/actors/ReadAdapter.java | 9 ++------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/NetconfNodeActor.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/NetconfNodeActor.java index e8415f62fe..f81c7541f1 100644 --- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/NetconfNodeActor.java +++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/NetconfNodeActor.java @@ -5,7 +5,6 @@ * 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.netconf.topology.singleton.impl.actors; import akka.actor.ActorRef; @@ -15,7 +14,6 @@ import akka.actor.Status.Success; import akka.pattern.AskTimeoutException; import akka.util.Timeout; import com.google.common.base.Throwables; -import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -35,7 +33,6 @@ import org.opendaylight.controller.md.sal.dom.api.DOMDataReadOnlyTransaction; import org.opendaylight.controller.md.sal.dom.api.DOMDataReadWriteTransaction; import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction; import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService; -import org.opendaylight.controller.md.sal.dom.api.DOMRpcException; import org.opendaylight.controller.md.sal.dom.api.DOMRpcResult; import org.opendaylight.controller.md.sal.dom.api.DOMRpcService; import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId; @@ -239,7 +236,7 @@ public class NetconfNodeActor extends AbstractUntypedActor { LOG.debug("{}: invokeSlaveRpc for {}, input: {} on rpc service {}", id, schemaPath, normalizedNodeMessage, deviceRpc); - final CheckedFuture rpcResult = deviceRpc.invokeRpc(schemaPath, + final ListenableFuture rpcResult = deviceRpc.invokeRpc(schemaPath, normalizedNodeMessage != null ? normalizedNodeMessage.getNode() : null); Futures.addCallback(rpcResult, new FutureCallback() { diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadAdapter.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadAdapter.java index e3fb37f219..22e60a3cb1 100644 --- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadAdapter.java +++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadAdapter.java @@ -5,19 +5,16 @@ * 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.netconf.topology.singleton.impl.actors; import akka.actor.ActorRef; import akka.actor.Status.Failure; import com.google.common.base.Optional; -import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.MoreExecutors; import javax.annotation.Nonnull; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException; import org.opendaylight.controller.md.sal.dom.api.DOMDataReadTransaction; import org.opendaylight.netconf.topology.singleton.messages.NormalizedNodeMessage; import org.opendaylight.netconf.topology.singleton.messages.transactions.EmptyReadResponse; @@ -53,8 +50,7 @@ class ReadAdapter { private void read(final YangInstanceIdentifier path, final LogicalDatastoreType store, final ActorRef sender, final ActorRef self) { - final CheckedFuture>, ReadFailedException> read = tx.read(store, path); - Futures.addCallback(read, new FutureCallback>>() { + Futures.addCallback(tx.read(store, path), new FutureCallback>>() { @Override public void onSuccess(@Nonnull final Optional> result) { @@ -74,8 +70,7 @@ class ReadAdapter { private void exists(final YangInstanceIdentifier path, final LogicalDatastoreType store, final ActorRef sender, final ActorRef self) { - final CheckedFuture readFuture = tx.exists(store, path); - Futures.addCallback(readFuture, new FutureCallback() { + Futures.addCallback(tx.exists(store, path), new FutureCallback() { @Override public void onSuccess(final Boolean result) { if (result == null) { -- 2.36.6