X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FDatastoreSnapshotRestore.java;h=db9acaebcdd3e39316d0cc67abd456f68fc922ea;hb=5dbaf1259ead1904536db204bbc742a3359c1eb1;hp=e736ddae3136ae43a8b7163e4a4941990e8184dd;hpb=057b787289f7b909d7013c22ac73a1c91c860af8;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreSnapshotRestore.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreSnapshotRestore.java
index e736ddae31..db9acaebcd 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreSnapshotRestore.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreSnapshotRestore.java
@@ -16,8 +16,8 @@ import java.io.ObjectInputStream;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicReference;
-import org.opendaylight.controller.cluster.datastore.messages.DatastoreSnapshot;
-import org.opendaylight.controller.cluster.datastore.messages.DatastoreSnapshotList;
+import org.opendaylight.controller.cluster.datastore.persisted.DatastoreSnapshot;
+import org.opendaylight.controller.cluster.datastore.persisted.DatastoreSnapshotList;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory;
  *
  * @author Thomas Pantelis
  */
-public class DatastoreSnapshotRestore {
+public final class DatastoreSnapshotRestore {
     private static final Logger LOG = LoggerFactory.getLogger(DatastoreSnapshotRestore.class);
 
     private static AtomicReference<DatastoreSnapshotRestore> instance = new AtomicReference<>();
@@ -35,12 +35,12 @@ public class DatastoreSnapshotRestore {
     private final String restoreDirectoryPath;
     private final Map<String, DatastoreSnapshot> datastoreSnapshots = new ConcurrentHashMap<>();
 
-    public static DatastoreSnapshotRestore instance(String restoreDirectoryPath) {
+    public static DatastoreSnapshotRestore instance(final String restoreDirectoryPath) {
         instance.compareAndSet(null, new DatastoreSnapshotRestore(restoreDirectoryPath));
         return instance.get();
     }
 
-    private DatastoreSnapshotRestore(String restoreDirectoryPath) {
+    private DatastoreSnapshotRestore(final String restoreDirectoryPath) {
         this.restoreDirectoryPath = Preconditions.checkNotNull(restoreDirectoryPath);
     }
 
@@ -84,14 +84,14 @@ public class DatastoreSnapshotRestore {
         }
     }
 
-    private static DatastoreSnapshotList deserialize(InputStream inputStream)
+    private static DatastoreSnapshotList deserialize(final InputStream inputStream)
             throws IOException, ClassNotFoundException {
         try (ObjectInputStream ois = new ObjectInputStream(inputStream)) {
             return (DatastoreSnapshotList) ois.readObject();
         }
     }
 
-    public DatastoreSnapshot getAndRemove(String datastoreType) {
+    public DatastoreSnapshot getAndRemove(final String datastoreType) {
         initialize();
         return datastoreSnapshots.remove(datastoreType);
     }