From 034d4e72ffaffc2081a2a6df83ad2ed8a794e2e6 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 29 Nov 2022 10:50:48 +0100 Subject: [PATCH] Use an instanceof pattern We can merge the check and cast here. Change-Id: I95cb4d5574dab43e4f5f06c9c372fe294c131224 Signed-off-by: Robert Varga --- .../controller/cluster/raft/RaftActorRecoverySupport.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 8655257824..2eb343f691 100644 --- 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 @@ -46,7 +46,7 @@ class RaftActorRecoverySupport { RaftActorRecoverySupport(final RaftActorContext context, final RaftActorRecoveryCohort cohort) { this.context = context; this.cohort = cohort; - this.log = context.getLogger(); + log = context.getLogger(); } boolean handleRecoveryMessage(final Object message, final PersistentDataProvider persistentProvider) { @@ -254,7 +254,7 @@ class RaftActorRecoverySupport { final SnapshotManager snapshotManager = context.getSnapshotManager(); if (snapshotManager.capture(logEntry, -1)) { log.info("Capturing snapshot, resetting timer for the next recovery snapshot interval."); - this.recoverySnapshotTimer.reset().start(); + recoverySnapshotTimer.reset().start(); } else { log.info("SnapshotManager is not able to capture snapshot at this time. It will be retried " + "again with the next recovered entry."); @@ -262,7 +262,7 @@ class RaftActorRecoverySupport { } private boolean shouldTakeRecoverySnapshot() { - return this.recoverySnapshotTimer != null && this.recoverySnapshotTimer.elapsed(TimeUnit.SECONDS) + return recoverySnapshotTimer != null && recoverySnapshotTimer.elapsed(TimeUnit.SECONDS) >= context.getConfigParams().getRecoverySnapshotIntervalSeconds(); } @@ -338,6 +338,6 @@ class RaftActorRecoverySupport { } private static boolean isMigratedSerializable(final Object message) { - return message instanceof MigratedSerializable && ((MigratedSerializable)message).isMigrated(); + return message instanceof MigratedSerializable migrated && migrated.isMigrated(); } } -- 2.36.6