Fix static methods and convert to lambdas

[controller.git] / opendaylight / md-sal / sal-akka-raft / src / test / java / org / opendaylight / controller / cluster / raft / RaftActorServerConfigurationSupportTest.java

diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorServerConfigurationSupportTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorServerConfigurationSupportTest.java
index ec5f0244ecd0f47d323fba2dac10fc07bb63d3de..02ba0153191c7d8fec0dad94ca02729c4b46f24c 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorServerConfigurationSupportTest.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/RaftActorServerConfigurationSupportTest.java
@@ -1186,13 +1186,8 @@ public class RaftActorServerConfigurationSupportTest extends AbstractActorTest {
         final String node1ID = "node1";
         final String node2ID = "node2";
 
-        PeerAddressResolver peerAddressResolver = new PeerAddressResolver() {
-            @Override
-            public String resolve(String peerId) {
-                return peerId.equals(node1ID) ? actorFactory.createTestActorPath(node1ID) :
-                    peerId.equals(node2ID) ? actorFactory.createTestActorPath(node2ID) : null;
-            }
-        };
+        PeerAddressResolver peerAddressResolver = peerId -> peerId.equals(node1ID) ? actorFactory.createTestActorPath(node1ID) :
+            peerId.equals(node2ID) ? actorFactory.createTestActorPath(node2ID) : null;
 
         ServerConfigurationPayload persistedServerConfig = new ServerConfigurationPayload(Arrays.asList(
                 new ServerInfo(node1ID, false), new ServerInfo(node2ID, true)));
@@ -1256,13 +1251,8 @@ public class RaftActorServerConfigurationSupportTest extends AbstractActorTest {
         final String node1ID = "node1";
         final String node2ID = "node2";
 
-        PeerAddressResolver peerAddressResolver = new PeerAddressResolver() {
-            @Override
-            public String resolve(String peerId) {
-                return peerId.equals(node1ID) ? actorFactory.createTestActorPath(node1ID) :
-                    peerId.equals(node2ID) ? actorFactory.createTestActorPath(node2ID) : null;
-            }
-        };
+        PeerAddressResolver peerAddressResolver = peerId -> peerId.equals(node1ID) ? actorFactory.createTestActorPath(node1ID) :
+            peerId.equals(node2ID) ? actorFactory.createTestActorPath(node2ID) : null;
 
         DefaultConfigParamsImpl configParams = new DefaultConfigParamsImpl();
         configParams.setHeartBeatInterval(new FiniteDuration(100, TimeUnit.MILLISECONDS));
@@ -1335,13 +1325,8 @@ public class RaftActorServerConfigurationSupportTest extends AbstractActorTest {
         final String node1ID = "node1";
         final String node2ID = "node2";
 
-        configParams.setPeerAddressResolver(new PeerAddressResolver() {
-            @Override
-            public String resolve(String peerId) {
-                return peerId.equals(node1ID) ? actorFactory.createTestActorPath(node1ID) :
-                    peerId.equals(node2ID) ? actorFactory.createTestActorPath(node2ID) : null;
-            }
-        });
+        configParams.setPeerAddressResolver(peerId -> peerId.equals(node1ID) ? actorFactory.createTestActorPath(node1ID) :
+            peerId.equals(node2ID) ? actorFactory.createTestActorPath(node2ID) : null);
 
         ServerConfigurationPayload persistedServerConfig = new ServerConfigurationPayload(Arrays.asList(
                 new ServerInfo(node1ID, false), new ServerInfo(node2ID, true)));
@@ -1403,7 +1388,7 @@ public class RaftActorServerConfigurationSupportTest extends AbstractActorTest {
         LOG.info("testChangeToVotingWithNoLeaderAndOtherLeaderElected ending");
     }
 
-    private void verifyRaftState(RaftState expState, RaftActor... raftActors) {
+    private static void verifyRaftState(RaftState expState, RaftActor... raftActors) {
         Stopwatch sw = Stopwatch.createStarted();
         while(sw.elapsed(TimeUnit.SECONDS) <= 5) {
             for(RaftActor raftActor: raftActors) {