From 3c207cf280d5c8ff8a6247ac22fe1223ddf96501 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 3 Aug 2017 11:34:07 +0200 Subject: [PATCH] Fixup static method warnings - a method can be made static - invocation of static methods should not go through an instance Change-Id: I9380a17432340c75fd94bd01c9dc5bb5cdbd8156 Signed-off-by: Robert Varga --- .../cluster/raft/LeadershipTransferIntegrationTest.java | 8 ++++---- .../opendaylight/controller/cluster/datastore/Shard.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/LeadershipTransferIntegrationTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/LeadershipTransferIntegrationTest.java index 1542a3301e..a4a7f555ab 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/LeadershipTransferIntegrationTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/LeadershipTransferIntegrationTest.java @@ -73,7 +73,7 @@ public class LeadershipTransferIntegrationTest extends AbstractRaftActorIntegrat testLog.info("testLeaderTransferOnShutDown ending"); } - private void sendShutDown(ActorRef actor) throws Exception { + private void sendShutDown(final ActorRef actor) throws Exception { testLog.info("sendShutDown for {} starting", actor.path()); FiniteDuration duration = FiniteDuration.create(5, TimeUnit.SECONDS); @@ -199,12 +199,12 @@ public class LeadershipTransferIntegrationTest extends AbstractRaftActorIntegrat testLog.info("createRaftActors starting"); } - private static void verifyRaftState(ActorRef raftActor, final RaftState expState) { + private static void verifyRaftState(final ActorRef raftActor, final RaftState expState) { verifyRaftState(raftActor, rs -> assertEquals("getRaftState", expState.toString(), rs.getRaftState())); } - private void verifyLeaderStateChangedMessages(TestActorRef notifierActor, - String... expLeaderIds) { + private static void verifyLeaderStateChangedMessages(final TestActorRef notifierActor, + final String... expLeaderIds) { List leaderStateChanges = expectMatching(notifierActor, LeaderStateChanged.class, expLeaderIds.length); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java index ebe5498481..50d4e0252f 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java @@ -311,7 +311,7 @@ public class Shard extends RaftActor { if (message instanceof RequestEnvelope) { handleRequestEnvelope((RequestEnvelope)message); - } else if (requestMessageAssembler.isHandledMessage(message)) { + } else if (MessageAssembler.isHandledMessage(message)) { handleRequestAssemblerMessage(message); } else if (message instanceof ConnectClientRequest) { handleConnectClient((ConnectClientRequest)message); @@ -373,7 +373,7 @@ public class Shard extends RaftActor { } } - private void handleRequestAssemblerMessage(Object message) { + private void handleRequestAssemblerMessage(final Object message) { dispatchers.getDispatcher(DispatcherType.Serialization).execute(() -> { JavaSerializer.currentSystem().value_$eq((ExtendedActorSystem) context().system()); requestMessageAssembler.handleMessage(message, self()); -- 2.36.6