X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FDatastoreSnapshotRestore.java;h=995401c82c681d9e184c22ee3b45277963da0ed0;hp=e29de0f13f976840b0f90f1cb540bda08351eb76;hb=987e2e706d0b343304142626bc870f3e8c909b51;hpb=2f77e92af7a68b4a97dbfb709c6cc9b11a49878a 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 e29de0f13f..995401c82c 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 @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.cluster.datastore; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -27,7 +28,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 instance = new AtomicReference<>(); @@ -35,13 +36,13 @@ public class DatastoreSnapshotRestore { private final String restoreDirectoryPath; private final Map 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) { - this.restoreDirectoryPath = Preconditions.checkNotNull(restoreDirectoryPath); + private DatastoreSnapshotRestore(final String restoreDirectoryPath) { + this.restoreDirectoryPath = requireNonNull(restoreDirectoryPath); } // synchronize this method so that, in case of concurrent access to getAndRemove(), @@ -84,14 +85,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); }