From: David Suarez Date: Sat, 14 Oct 2017 09:08:20 +0000 (+0200) Subject: Replace deprecated Futures.addCallback by the newer version X-Git-Tag: release/oxygen~68 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=63ea0341c647e2dc4a795d4c48552186c25816bd Replace deprecated Futures.addCallback by the newer version The method addCallback(ListenableFuture future, FutureCallback callback) is deprecated and will be replaced by a new its new version addCallback(ListenableFuture future, FutureCallback callback, Executor executor) in April 2018. Some other minor changes fix checkstyle/sonar issues. Change-Id: Ic6c31424b1dc8d5e4d257a77fb858d6fa47ca814 Signed-off-by: David Suarez --- diff --git a/opendaylight/md-sal/sal-cluster-admin-impl/src/main/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcService.java b/opendaylight/md-sal/sal-cluster-admin-impl/src/main/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcService.java index dcf10c9b39..1bda653fc2 100644 --- a/opendaylight/md-sal/sal-cluster-admin-impl/src/main/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcService.java +++ b/opendaylight/md-sal/sal-cluster-admin-impl/src/main/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcService.java @@ -12,12 +12,14 @@ import akka.actor.Status.Success; import akka.dispatch.OnComplete; import akka.pattern.Patterns; import akka.util.Timeout; + import com.google.common.base.Function; import com.google.common.base.Strings; import com.google.common.base.Throwables; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.SettableFuture; import java.io.FileOutputStream; import java.io.IOException; @@ -139,7 +141,7 @@ public class ClusterAdminRpcService implements ClusterAdminService { onMessageFailure(String.format("Failed to add replica for shard %s", shardName), returnFuture, failure); } - }); + }, MoreExecutors.directExecutor()); return returnFuture; } @@ -178,7 +180,7 @@ public class ClusterAdminRpcService implements ClusterAdminService { onMessageFailure(String.format("Failed to remove replica for shard %s", shardName), returnFuture, failure); } - }); + }, MoreExecutors.directExecutor()); return returnFuture; } @@ -270,7 +272,7 @@ public class ClusterAdminRpcService implements ClusterAdminService { onMessageFailure(String.format("Failed to add replica for shard %s", prefix), returnFuture, failure); } - }); + }, MoreExecutors.directExecutor()); return returnFuture; } @@ -312,7 +314,7 @@ public class ClusterAdminRpcService implements ClusterAdminService { onMessageFailure(String.format("Failed to remove replica for shard %s", prefix), returnFuture, failure); } - }); + }, MoreExecutors.directExecutor()); return returnFuture; } @@ -391,7 +393,7 @@ public class ClusterAdminRpcService implements ClusterAdminService { onMessageFailure(String.format("Failed to change member voting states for shard %s", shardName), returnFuture, failure); } - }); + }, MoreExecutors.directExecutor()); return returnFuture; } @@ -471,7 +473,7 @@ public class ClusterAdminRpcService implements ClusterAdminService { returnFuture.set(ClusterAdminRpcService.newFailedRpcResultBuilder( "Failed to get shard role.", failure).build()); } - }); + }, MoreExecutors.directExecutor()); return returnFuture; } @@ -517,7 +519,7 @@ public class ClusterAdminRpcService implements ClusterAdminService { returnFuture.set(ClusterAdminRpcService.newFailedRpcResultBuilder( "Failed to get shard role.", failure).build()); } - }); + }, MoreExecutors.directExecutor()); return returnFuture; } @@ -542,7 +544,7 @@ public class ClusterAdminRpcService implements ClusterAdminService { public void onFailure(Throwable failure) { onDatastoreBackupFailure(input.getFilePath(), returnFuture, failure); } - }); + }, MoreExecutors.directExecutor()); return returnFuture; } @@ -553,10 +555,7 @@ public class ClusterAdminRpcService implements ClusterAdminService { for (MemberVotingState memberStatus: memberVotingStatus) { serverVotingStatusMap.put(memberStatus.getMemberName(), memberStatus.isVoting()); } - - ChangeShardMembersVotingStatus changeVotingStatus = new ChangeShardMembersVotingStatus(shardName, - serverVotingStatusMap); - return changeVotingStatus; + return new ChangeShardMembersVotingStatus(shardName, serverVotingStatusMap); } private static SettableFuture> waitForShardResults( @@ -596,7 +595,7 @@ public class ClusterAdminRpcService implements ClusterAdminService { returnFuture.set(newSuccessfulResult(resultDataSupplier.apply(shardResults))); } } - }); + }, MoreExecutors.directExecutor()); } return returnFuture; } @@ -611,8 +610,8 @@ public class ClusterAdminRpcService implements ClusterAdminService { LOG.debug("Sending message to all shards {} for data store {}", allShardNames, actorContext.getDataStoreName()); for (String shardName: allShardNames) { - ListenableFuture future = this.ask(actorContext.getShardManager(), messageSupplier.apply(shardName), - SHARD_MGR_TIMEOUT); + ListenableFuture future = this.ask(actorContext.getShardManager(), messageSupplier.apply(shardName), + SHARD_MGR_TIMEOUT); shardResultData.add(new SimpleEntry<>(future, new ShardResultBuilder().setShardName(shardName).setDataStoreType(dataStoreType))); } @@ -691,10 +690,10 @@ public class ClusterAdminRpcService implements ClusterAdminService { } private static RpcResult newSuccessfulResult() { - return newSuccessfulResult((Void)null); + return newSuccessfulResult(null); } private static RpcResult newSuccessfulResult(T data) { - return RpcResultBuilder.success(data).build(); + return RpcResultBuilder.success(data).build(); } } diff --git a/opendaylight/md-sal/sal-cluster-admin-impl/src/test/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcServiceTest.java b/opendaylight/md-sal/sal-cluster-admin-impl/src/test/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcServiceTest.java index d1323d48cd..fa7927ef42 100644 --- a/opendaylight/md-sal/sal-cluster-admin-impl/src/test/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcServiceTest.java +++ b/opendaylight/md-sal/sal-cluster-admin-impl/src/test/java/org/opendaylight/controller/cluster/datastore/admin/ClusterAdminRpcServiceTest.java @@ -693,7 +693,8 @@ public class ClusterAdminRpcServiceTest { .moduleShardsConfig(moduleShardsConfig).waitForShardLeader("cars", "people").build(); ModuleShardConfiguration petsModuleConfig = new ModuleShardConfiguration(URI.create("pets-ns"), "pets-module", - "pets", null, Arrays.asList(MEMBER_1)); + "pets", null, + Collections.singletonList(MEMBER_1)); leaderNode1.configDataStore().getActorContext().getShardManager().tell( new CreateShard(petsModuleConfig, Shard.builder(), null), leaderNode1.kit().getRef()); leaderNode1.kit().expectMsgClass(Success.class); @@ -711,7 +712,9 @@ public class ClusterAdminRpcServiceTest { newReplicaNode2.operDataStore().getActorContext().getShardManager().tell( new CreateShard(new ModuleShardConfiguration(URI.create("no-leader-ns"), "no-leader-module", - "no-leader", null, Arrays.asList(MEMBER_1)), Shard.builder(), null), + "no-leader", null, + Collections.singletonList(MEMBER_1)), + Shard.builder(), null), newReplicaNode2.kit().getRef()); newReplicaNode2.kit().expectMsgClass(Success.class);