Inline isServerConfigurationPayload()

We can use an instanceof pattern to improve safety. Inline the check
into its two callers.

Change-Id: Ia3758a754713818587bf3c7cd215764d05c2028b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorRecoverySupport.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorRecoverySupport.java
index 389e8dfd8ff942a090a9201fa5432b944402d9d8..a63ff9a7b73cda00da253419cab2a83abbd78b6b 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorRecoverySupport.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorRecoverySupport.java
@@ -168,8 +168,8 @@ class RaftActorRecoverySupport {
                     logEntry.getIndex(), logEntry.size());
         }
 
-        if (isServerConfigurationPayload(logEntry)) {
-            context.updatePeerIds((ServerConfigurationPayload)logEntry.getData());
+        if (logEntry.getData() instanceof ServerConfigurationPayload payload) {
+            context.updatePeerIds(payload);
         }
 
         if (isMigratedPayload(logEntry)) {
@@ -234,17 +234,20 @@ class RaftActorRecoverySupport {
     private void batchRecoveredLogEntry(final ReplicatedLogEntry logEntry) {
         initRecoveryTimers();
 
+        if (logEntry.getData() instanceof ServerConfigurationPayload) {
+            // FIXME: explain why ServerConfigurationPayload is special
+            return;
+        }
+
         int batchSize = context.getConfigParams().getJournalRecoveryLogBatchSize();
-        if (!isServerConfigurationPayload(logEntry)) {
-            if (currentRecoveryBatchCount == 0) {
-                cohort.startLogRecoveryBatch(batchSize);
-            }
+        if (currentRecoveryBatchCount == 0) {
+            cohort.startLogRecoveryBatch(batchSize);
+        }
 
-            cohort.appendRecoveredLogEntry(logEntry.getData());
+        cohort.appendRecoveredLogEntry(logEntry.getData());
 
-            if (++currentRecoveryBatchCount >= batchSize) {
-                endCurrentLogRecoveryBatch();
-            }
+        if (++currentRecoveryBatchCount >= batchSize) {
+            endCurrentLogRecoveryBatch();
         }
     }
 
@@ -324,10 +327,6 @@ class RaftActorRecoverySupport {
         }
     }
 
-    private static boolean isServerConfigurationPayload(final ReplicatedLogEntry repLogEntry) {
-        return repLogEntry.getData() instanceof ServerConfigurationPayload;
-    }
-
     private static boolean isPersistentPayload(final ReplicatedLogEntry repLogEntry) {
         return repLogEntry.getData() instanceof PersistentPayload;
     }