From 9d48ffddd3e11efc5806efcc5895d5b5e997f5b2 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 30 Dec 2023 22:46:02 +0100 Subject: [PATCH] Do not use static import for Patterns.ask() Improve call site visibility by explicitly referencing this method as Patterns.ask(). Change-Id: I94f21ba9a5e2d0a2e3de89f6826896ea98a24641 Signed-off-by: Robert Varga --- .../raft/AbstractRaftActorIntegrationTest.java | 4 ++-- .../actors/dds/ModuleShardBackendResolver.java | 7 ++++--- .../datastore/shardmanager/ShardManager.java | 13 ++++++------- .../cluster/datastore/utils/ActorUtils.java | 6 ++---- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/AbstractRaftActorIntegrationTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/AbstractRaftActorIntegrationTest.java index 5e32a99f27..7b5ecc2d3b 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/AbstractRaftActorIntegrationTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/AbstractRaftActorIntegrationTest.java @@ -7,7 +7,6 @@ */ package org.opendaylight.controller.cluster.raft; -import static akka.pattern.Patterns.ask; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -17,6 +16,7 @@ import akka.actor.PoisonPill; import akka.actor.Terminated; import akka.dispatch.Dispatchers; import akka.dispatch.Mailboxes; +import akka.pattern.Patterns; import akka.testkit.TestActorRef; import akka.testkit.javadsl.TestKit; import akka.util.Timeout; @@ -419,7 +419,7 @@ public abstract class AbstractRaftActorIntegrationTest extends AbstractActorTest Stopwatch sw = Stopwatch.createStarted(); while (sw.elapsed(TimeUnit.SECONDS) <= 5) { try { - OnDemandRaftState raftState = (OnDemandRaftState)Await.result(ask(raftActor, + OnDemandRaftState raftState = (OnDemandRaftState)Await.result(Patterns.ask(raftActor, GetOnDemandRaftState.INSTANCE, timeout), timeout.duration()); verifier.accept(raftState); return; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ModuleShardBackendResolver.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ModuleShardBackendResolver.java index ee887b00fa..6ab566e2fa 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ModuleShardBackendResolver.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/ModuleShardBackendResolver.java @@ -7,11 +7,11 @@ */ package org.opendaylight.controller.cluster.databroker.actors.dds; -import static akka.pattern.Patterns.ask; import static com.google.common.base.Verify.verifyNotNull; import akka.dispatch.ExecutionContexts; import akka.dispatch.OnComplete; +import akka.pattern.Patterns; import akka.util.Timeout; import com.google.common.collect.ImmutableBiMap; import java.util.concurrent.CompletionStage; @@ -58,8 +58,9 @@ final class ModuleShardBackendResolver extends AbstractShardBackendResolver { ModuleShardBackendResolver(final ClientIdentifier clientId, final ActorUtils actorUtils) { super(clientId, actorUtils); - shardAvailabilityChangesRegFuture = ask(actorUtils.getShardManager(), new RegisterForShardAvailabilityChanges( - this::onShardAvailabilityChange), Timeout.apply(60, TimeUnit.MINUTES)) + shardAvailabilityChangesRegFuture = Patterns.ask(actorUtils.getShardManager(), + new RegisterForShardAvailabilityChanges(this::onShardAvailabilityChange), + Timeout.apply(60, TimeUnit.MINUTES)) .map(reply -> (Registration)reply, ExecutionContexts.global()); shardAvailabilityChangesRegFuture.onComplete(new OnComplete() { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManager.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManager.java index 79110786b4..99f8922be5 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManager.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManager.java @@ -7,7 +7,6 @@ */ package org.opendaylight.controller.cluster.datastore.shardmanager; -import static akka.pattern.Patterns.ask; import static java.util.Objects.requireNonNull; import akka.actor.ActorRef; @@ -399,7 +398,7 @@ class ShardManager extends AbstractUntypedPersistentActorWithMetering { primaryPath, shardId); Timeout removeServerTimeout = new Timeout(datastoreContext.getShardLeaderElectionTimeout().duration()); - Future futureObj = ask(getContext().actorSelection(primaryPath), + Future futureObj = Patterns.ask(getContext().actorSelection(primaryPath), new RemoveServer(shardId.toString()), removeServerTimeout); futureObj.onComplete(new OnComplete<>() { @@ -1064,7 +1063,7 @@ class ShardManager extends AbstractUntypedPersistentActorWithMetering { Timeout findPrimaryTimeout = new Timeout(datastoreContextFactory.getBaseDatastoreContext() .getShardInitializationTimeout().duration().$times(2)); - Future futureObj = ask(getSelf(), new FindPrimary(shardName, true), findPrimaryTimeout); + Future futureObj = Patterns.ask(getSelf(), new FindPrimary(shardName, true), findPrimaryTimeout); futureObj.onComplete(new OnComplete<>() { @Override public void onComplete(final Throwable failure, final Object response) { @@ -1281,7 +1280,7 @@ class ShardManager extends AbstractUntypedPersistentActorWithMetering { final Timeout addServerTimeout = new Timeout(shardInfo.getDatastoreContext() .getShardLeaderElectionTimeout().duration()); - final Future futureObj = ask(getContext().actorSelection(response.getPrimaryPath()), + final Future futureObj = Patterns.ask(getContext().actorSelection(response.getPrimaryPath()), new AddServer(shardInfo.getShardId().toString(), localShardAddress, true), addServerTimeout); futureObj.onComplete(new OnComplete<>() { @@ -1457,7 +1456,7 @@ class ShardManager extends AbstractUntypedPersistentActorWithMetering { ActorRef sender = getSender(); final String shardName = flipMembersVotingStatus.getShardName(); findLocalShard(shardName, sender, localShardFound -> { - Future future = ask(localShardFound.getPath(), GetOnDemandRaftState.INSTANCE, + Future future = Patterns.ask(localShardFound.getPath(), GetOnDemandRaftState.INSTANCE, Timeout.apply(30, TimeUnit.SECONDS)); future.onComplete(new OnComplete<>() { @@ -1508,7 +1507,7 @@ class ShardManager extends AbstractUntypedPersistentActorWithMetering { Timeout findLocalTimeout = new Timeout(datastoreContextFactory.getBaseDatastoreContext() .getShardInitializationTimeout().duration().$times(2)); - Future futureObj = ask(getSelf(), new FindLocalShard(shardName, true), findLocalTimeout); + Future futureObj = Patterns.ask(getSelf(), new FindLocalShard(shardName, true), findLocalTimeout); futureObj.onComplete(new OnComplete<>() { @Override public void onComplete(final Throwable failure, final Object response) { @@ -1553,7 +1552,7 @@ class ShardManager extends AbstractUntypedPersistentActorWithMetering { changeServersVotingStatus, shardActorRef.path()); Timeout timeout = new Timeout(datastoreContext.getShardLeaderElectionTimeout().duration().$times(2)); - Future futureObj = ask(shardActorRef, changeServersVotingStatus, timeout); + Future futureObj = Patterns.ask(shardActorRef, changeServersVotingStatus, timeout); futureObj.onComplete(new OnComplete<>() { @Override diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/ActorUtils.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/ActorUtils.java index ba3f9c5c7e..8e61c569fa 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/ActorUtils.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/utils/ActorUtils.java @@ -7,8 +7,6 @@ */ package org.opendaylight.controller.cluster.datastore.utils; -import static akka.pattern.Patterns.ask; - import akka.actor.ActorPath; import akka.actor.ActorRef; import akka.actor.ActorSelection; @@ -557,11 +555,11 @@ public class ActorUtils { } protected Future doAsk(final ActorRef actorRef, final Object message, final Timeout timeout) { - return ask(actorRef, message, timeout); + return Patterns.ask(actorRef, message, timeout); } protected Future doAsk(final ActorSelection actorRef, final Object message, final Timeout timeout) { - final var ret = ask(actorRef, message, timeout); + final var ret = Patterns.ask(actorRef, message, timeout); ret.onComplete(askTimeoutCounter, askTimeoutCounter); return ret; } -- 2.36.6