Persistence redesign

common/src/main/java/bisq/common/crypto/KeyStorage.java

@@ -18,7 +18,7 @@
 package bisq.common.crypto;
 
 import bisq.common.config.Config;
-import bisq.common.storage.FileUtil;
+import bisq.common.file.FileUtil;
 
 import com.google.inject.Inject;
 

common/src/main/java/bisq/common/storage/CorruptedDatabaseFilesHandler.java → common/src/main/java/bisq/common/file/CorruptedStorageFileHandler.java

@@ -15,7 +15,7 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.storage;
+package bisq.common.file;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -28,29 +28,29 @@
 
 @Slf4j
 @Singleton
-public class CorruptedDatabaseFilesHandler {
-    private final List<String> corruptedDatabaseFiles = new ArrayList<>();
+public class CorruptedStorageFileHandler {
+    private final List<String> files = new ArrayList<>();
 
     @Inject
-    public CorruptedDatabaseFilesHandler() {
+    public CorruptedStorageFileHandler() {
     }
 
-    public void onFileCorrupted(String fileName) {
-        corruptedDatabaseFiles.add(fileName);
+    public void addFile(String fileName) {
+        files.add(fileName);
     }
 
-    public Optional<List<String>> getCorruptedDatabaseFiles() {
-        if (!corruptedDatabaseFiles.isEmpty()) {
-            if (corruptedDatabaseFiles.size() == 1 && corruptedDatabaseFiles.get(0).equals("ViewPathAsString")) {
-                log.debug("We detected incompatible data base file for Navigation. " +
-                        "That is a minor issue happening with refactoring of UI classes " +
-                        "and we don't display a warning popup to the user.");
-                return Optional.empty();
-            } else {
-                return Optional.of(corruptedDatabaseFiles);
-            }
-        } else {
+    public Optional<List<String>> getFiles() {
+        if (files.isEmpty()) {
             return Optional.empty();
         }
+
+        if (files.size() == 1 && files.get(0).equals("ViewPathAsString")) {
+            log.debug("We detected incompatible data base file for Navigation. " +
+                    "That is a minor issue happening with refactoring of UI classes " +
+                    "and we don't display a warning popup to the user.");
+            return Optional.empty();
+        }
+
+        return Optional.of(files);
     }
 }

common/src/main/java/bisq/common/storage/FileUtil.java → common/src/main/java/bisq/common/file/FileUtil.java

@@ -15,7 +15,7 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.storage;
+package bisq.common.file;
 
 import bisq.common.util.Utilities;
 
@@ -37,14 +37,12 @@
 import java.util.Date;
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
 
 import javax.annotation.Nullable;
 
+@Slf4j
 public class FileUtil {
-    private static final Logger log = LoggerFactory.getLogger(FileUtil.class);
-
     public static void rollingBackup(File dir, String fileName, int numMaxBackupFiles) {
         if (dir.exists()) {
             File backupDir = new File(Paths.get(dir.getAbsolutePath(), "backup").toString());
@@ -203,11 +201,24 @@ public static void copyDirectory(File source, File destination) throws IOExcepti
         FileUtils.copyDirectory(source, destination);
     }
 
-    static File createNewFile(Path path) throws IOException {
+    public static File createNewFile(Path path) throws IOException {
         File file = path.toFile();
         if (!file.createNewFile()) {
             throw new IOException("There already exists a file with path: " + path);
         }
         return file;
     }
+
+    public static void removeAndBackupFile(File dbDir, File storageFile, String fileName, String backupFolderName)
+            throws IOException {
+        File corruptedBackupDir = new File(Paths.get(dbDir.getAbsolutePath(), backupFolderName).toString());
+        if (!corruptedBackupDir.exists() && !corruptedBackupDir.mkdir()) {
+            log.warn("make dir failed");
+        }
+
+        File corruptedFile = new File(Paths.get(dbDir.getAbsolutePath(), backupFolderName, fileName).toString());
+        if (storageFile.exists()) {
+            renameFile(storageFile, corruptedFile);
+        }
+    }
 }

common/src/main/java/bisq/common/storage/JsonFileManager.java → common/src/main/java/bisq/common/file/JsonFileManager.java

@@ -15,9 +15,8 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.storage;
+package bisq.common.file;
 
-import bisq.common.UserThread;
 import bisq.common.util.Utilities;
 
 import java.nio.file.Paths;
@@ -26,13 +25,12 @@
 import java.io.PrintWriter;
 
 import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
 
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 public class JsonFileManager {
-    private final ThreadPoolExecutor executor = Utilities.getThreadPoolExecutor("saveToDiscExecutor", 5, 50, 60);
+    private final ThreadPoolExecutor executor = Utilities.getThreadPoolExecutor("JsonFileManagerExecutor", 5, 50, 60);
     private final File dir;
 
 
@@ -47,18 +45,12 @@ public JsonFileManager(File dir) {
             if (!dir.mkdir())
                 log.warn("make dir failed");
 
-        Runtime.getRuntime().addShutdownHook(new Thread(() -> {
-            UserThread.execute(JsonFileManager.this::shutDown);
-        }, "WriteOnlyFileManager.ShutDownHook"));
+        Runtime.getRuntime().addShutdownHook(new Thread(JsonFileManager.this::shutDown,
+                "JsonFileManager.ShutDownHook"));
     }
 
     public void shutDown() {
         executor.shutdown();
-        try {
-            executor.awaitTermination(5, TimeUnit.SECONDS);
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-        }
     }
 
     public void writeToDisc(String json, String fileName) {

common/src/main/java/bisq/common/storage/ResourceNotFoundException.java → common/src/main/java/bisq/common/file/ResourceNotFoundException.java

@@ -15,7 +15,7 @@
  * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
  */
 
-package bisq.common.storage;
+package bisq.common.file;
 
 public class ResourceNotFoundException extends Exception {
     public ResourceNotFoundException(String path) {