From: Stephen Kitt <skitt@redhat.com>
Date: Tue, 16 May 2017 15:49:25 +0000 (+0200)
Subject: sal-akka-raft: use lambdas
X-Git-Tag: release/nitrogen~223
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=341a9dd5ff4c596aada3a0c1fa58c17c50d7521f

sal-akka-raft: use lambdas

This series of patches uses lambdas instead of anonymous classes for
functional interfaces when possible. Lambdas are replaced with method
references when appropriate.

Change-Id: I1c48105a90efa73c1cb7ae2fba9111f74951fe11
Signed-off-by: Stephen Kitt <skitt@redhat.com>
---

diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/TimedRunnable.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/TimedRunnable.java
index c58d6f90f3..9560665756 100644
--- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/TimedRunnable.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/TimedRunnable.java
@@ -30,7 +30,7 @@ abstract class TimedRunnable implements Runnable {
         Preconditions.checkNotNull(timeout);
         Preconditions.checkNotNull(actor);
         cancelTimer = actor.getContext().system().scheduler().scheduleOnce(timeout, actor.self(),
-                (Runnable) () -> cancel(), actor.getContext().system().dispatcher(), actor.self());
+                (Runnable) this::cancel, actor.getContext().system().dispatcher(), actor.self());
     }
 
     @Override
diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/IsolationScenarioTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/IsolationScenarioTest.java
index 1d7e317c2d..fb810e3aeb 100644
--- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/IsolationScenarioTest.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/IsolationScenarioTest.java
@@ -160,15 +160,13 @@ public class IsolationScenarioTest extends AbstractRaftActorIntegrationTest {
         // Wait for the isolated leader to send AppendEntries to the followers with the new entry with index 1. This
         // message is forwarded to the followers.
 
-        expectFirstMatching(follower1CollectorActor, AppendEntries.class, ae -> {
-            return ae.getEntries().size() == 1 && ae.getEntries().get(0).getIndex() == 1
-                    && ae.getEntries().get(0).getData().equals(payload1);
-        });
+        expectFirstMatching(follower1CollectorActor, AppendEntries.class, ae ->
+                ae.getEntries().size() == 1 && ae.getEntries().get(0).getIndex() == 1
+                        && ae.getEntries().get(0).getData().equals(payload1));
 
-        expectFirstMatching(follower2CollectorActor, AppendEntries.class, ae -> {
-            return ae.getEntries().size() == 1 && ae.getEntries().get(0).getIndex() == 1
-                    && ae.getEntries().get(0).getData().equals(payload1);
-        });
+        expectFirstMatching(follower2CollectorActor, AppendEntries.class, ae ->
+                ae.getEntries().size() == 1 && ae.getEntries().get(0).getIndex() == 1
+                        && ae.getEntries().get(0).getData().equals(payload1));
 
         verifyApplyJournalEntries(leaderCollectorActor, 1);
 
@@ -283,15 +281,13 @@ public class IsolationScenarioTest extends AbstractRaftActorIntegrationTest {
         // Wait for the isolated leader to send AppendEntries to the followers with the new entry with index 1. This
         // message is forwarded to the followers.
 
-        expectFirstMatching(follower1CollectorActor, AppendEntries.class, ae -> {
-            return ae.getEntries().size() == 1 && ae.getEntries().get(0).getIndex() == 1
-                    && ae.getEntries().get(0).getData().equals(payload1);
-        });
+        expectFirstMatching(follower1CollectorActor, AppendEntries.class, ae ->
+                ae.getEntries().size() == 1 && ae.getEntries().get(0).getIndex() == 1
+                        && ae.getEntries().get(0).getData().equals(payload1));
 
-        expectFirstMatching(follower2CollectorActor, AppendEntries.class, ae -> {
-            return ae.getEntries().size() == 1 && ae.getEntries().get(0).getIndex() == 1
-                    && ae.getEntries().get(0).getData().equals(payload1);
-        });
+        expectFirstMatching(follower2CollectorActor, AppendEntries.class, ae ->
+                ae.getEntries().size() == 1 && ae.getEntries().get(0).getIndex() == 1
+                        && ae.getEntries().get(0).getData().equals(payload1));
 
         verifyApplyJournalEntries(leaderCollectorActor, 1);
 
diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/LeaderTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/LeaderTest.java
index c3d33e12ec..a8ecf71c47 100644
--- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/LeaderTest.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/LeaderTest.java
@@ -741,7 +741,7 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
         actorContext.getReplicatedLog().removeFrom(0);
 
         AtomicReference<java.util.Optional<OutputStream>> installSnapshotStream = new AtomicReference<>();
-        actorContext.setCreateSnapshotProcedure(out -> installSnapshotStream.set(out));
+        actorContext.setCreateSnapshotProcedure(installSnapshotStream::set);
 
         leader = new Leader(actorContext);
         actorContext.setCurrentBehavior(leader);