Acquire persistence provider once

We have a few places where we call getPersistenceProvider() twice. Make
things clearer by acquiring it only once.

JIRA: CONTROLLER-2073
Change-Id: Ic4bc681140076396b5d3384b1a7386aa00ee3e8a
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/ReplicatedLogImpl.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/ReplicatedLogImpl.java
index 23cc06867641be309ef59bd5b48d4b59d01777f6..a354ed71723118ff8ed6f0a55be79ddf5c5692cd 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/ReplicatedLogImpl.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/ReplicatedLogImpl.java
@@ -98,20 +98,18 @@ final class ReplicatedLogImpl extends AbstractReplicatedLogImpl {
     @Override
     public boolean appendAndPersist(final ReplicatedLogEntry replicatedLogEntry,
             final Consumer<ReplicatedLogEntry> callback, final boolean doAsync)  {
-
         context.getLogger().debug("{}: Append log entry and persist {} ", context.getId(), replicatedLogEntry);
 
         if (!append(replicatedLogEntry)) {
             return false;
         }
 
+        final var provider = context.getPersistenceProvider();
         if (doAsync) {
-            context.getPersistenceProvider().persistAsync(replicatedLogEntry,
-                entry -> persistCallback(entry, callback));
+            provider.persistAsync(replicatedLogEntry, entry -> persistCallback(entry, callback));
         } else {
-            context.getPersistenceProvider().persist(replicatedLogEntry, entry -> syncPersistCallback(entry, callback));
+            provider.persist(replicatedLogEntry, entry -> syncPersistCallback(entry, callback));
         }
-
         return true;
     }
 

diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/SnapshotManager.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/SnapshotManager.java
index 50e5d2ec1b3ed327d77fad8434883a84c166403f..901fc9adc938a0ff647b699f5eb5cd758cb8965e 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/SnapshotManager.java
+++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/SnapshotManager.java
@@ -267,7 +267,7 @@ public class SnapshotManager implements SnapshotState {
 
         task = persisting;
         log.debug("lastSequenceNumber prior to persisting applied snapshot: {}", lastSeq);
-        context.getPersistenceProvider().saveSnapshot(persisting.snapshot);
+        persistence.saveSnapshot(persisting.snapshot);
     }
 
     @Override