Simplify isolated leader check

Sonar warns about nested ifs, merge them.

Change-Id: I77fcee90b467bc141b79aa5f8fcccb7f8b4f2fe3
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Leader.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Leader.java
index e58d4f57c6cc426b4ca9808883d7aff1129f3b15..a4ce0da482dbfc16e3d34c97b536f6c1ce02efc8 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Leader.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Leader.java
@@ -60,16 +60,15 @@ public class Leader extends AbstractLeader {
         isolatedLeaderCheck = Stopwatch.createStarted();
     }
 
         isolatedLeaderCheck = Stopwatch.createStarted();
     }
 

-    @Override public RaftActorBehavior handleMessage(ActorRef sender, Object originalMessage) {
+    @Override
+    public RaftActorBehavior handleMessage(ActorRef sender, Object originalMessage) {

         Preconditions.checkNotNull(sender, "sender should not be null");
 
         Preconditions.checkNotNull(sender, "sender should not be null");
 

-        if (ISOLATED_LEADER_CHECK.equals(originalMessage)) {
-            if (isLeaderIsolated()) {
-                LOG.warn("{}: At least {} followers need to be active, Switching {} from Leader to IsolatedLeader",
-                        context.getId(), getMinIsolatedLeaderPeerCount(), leaderId);
+        if (ISOLATED_LEADER_CHECK.equals(originalMessage) && isLeaderIsolated()) {
+            LOG.warn("{}: At least {} followers need to be active, Switching {} from Leader to IsolatedLeader",
+                context.getId(), getMinIsolatedLeaderPeerCount(), leaderId);

 
 

-                return internalSwitchBehavior(RaftState.IsolatedLeader);
-            }
+            return internalSwitchBehavior(RaftState.IsolatedLeader);

         }
 
         return super.handleMessage(sender, originalMessage);
         }
 
         return super.handleMessage(sender, originalMessage);