Improve Follower's Snapshot

[controller.git] / opendaylight / md-sal / sal-akka-raft / src / main / java / org / opendaylight / controller / cluster / raft / behaviors / Follower.java

diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Follower.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Follower.java
index fa28cbf718748e5800da017d5eed69726fcbd1c9..4913d98c36e9090253cf0ea4ece40873a2d655cd 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Follower.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Follower.java
@@ -18,7 +18,6 @@ import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Stopwatch;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
@@ -600,7 +599,7 @@ public class Follower extends AbstractRaftActorBehavior {
                         + "all members {} self member: {}", logName(), unreachable, members, selfMember);
 
         // no unreachable peers means we cannot be isolated
-        if (unreachable.size() == 0) {
+        if (unreachable.isEmpty()) {
             return false;
         }
 
@@ -610,11 +609,7 @@ public class Follower extends AbstractRaftActorBehavior {
         membersToCheck.removeAll(unreachable);
 
         // check if the only member not unreachable is us
-        if (membersToCheck.size() == 1 && membersToCheck.iterator().next().equals(selfMember)) {
-            return true;
-        }
-
-        return false;
+        return membersToCheck.size() == 1 && membersToCheck.iterator().next().equals(selfMember);
     }
 
     private void handleInstallSnapshot(final ActorRef sender, final InstallSnapshot installSnapshot) {
@@ -641,7 +636,7 @@ public class Follower extends AbstractRaftActorBehavior {
 
                 Snapshot snapshot = Snapshot.create(
                         context.getSnapshotManager().convertSnapshot(snapshotTracker.getSnapshotBytes()),
-                        new ArrayList<>(),
+                        List.of(),
                         installSnapshot.getLastIncludedIndex(),
                         installSnapshot.getLastIncludedTerm(),
                         installSnapshot.getLastIncludedIndex(),
@@ -675,8 +670,7 @@ public class Follower extends AbstractRaftActorBehavior {
         } catch (IOException e) {
             log.debug("{}: Exception in InstallSnapshot of follower", logName(), e);
 
-            sender.tell(new InstallSnapshotReply(currentTerm(), context.getId(),
-                    -1, false), actor());
+            sender.tell(new InstallSnapshotReply(currentTerm(), context.getId(), -1, false), actor());
 
             closeSnapshotTracker();
         }