From fa684eababf09ddb35f564390e6862c051bcad53 Mon Sep 17 00:00:00 2001
From: CalDescent <caldescent@protonmail.com>
Date: Sat, 14 Aug 2021 15:51:16 +0100
Subject: [PATCH] Removed ArbitraryDataPatches class

This was essentially just a wrapper for a single method.
---
 .../arbitrary/ArbitraryDataBuilder.java       | 29 ++++++--
 .../arbitrary/ArbitraryDataPatches.java       | 67 -------------------
 2 files changed, 25 insertions(+), 71 deletions(-)
 delete mode 100644 src/main/java/org/qortal/arbitrary/ArbitraryDataPatches.java

diff --git a/src/main/java/org/qortal/arbitrary/ArbitraryDataBuilder.java b/src/main/java/org/qortal/arbitrary/ArbitraryDataBuilder.java
index 7d9984f1..d90ef43c 100644
--- a/src/main/java/org/qortal/arbitrary/ArbitraryDataBuilder.java
+++ b/src/main/java/org/qortal/arbitrary/ArbitraryDataBuilder.java
@@ -40,6 +40,7 @@ public class ArbitraryDataBuilder {
         this.fetchTransactions();
         this.validateTransactions();
         this.processTransactions();
+        this.validatePaths();
         this.buildLatestState();
     }
 
@@ -118,10 +119,30 @@ public class ArbitraryDataBuilder {
         }
     }
 
-    private void buildLatestState() throws IOException, DataException {
-        ArbitraryDataPatches arbitraryDataPatches = new ArbitraryDataPatches(this.paths);
-        arbitraryDataPatches.applyPatches();
-        this.finalPath = arbitraryDataPatches.getFinalPath();
+    private void validatePaths() {
+        if (this.paths == null || this.paths.isEmpty()) {
+            throw new IllegalStateException(String.format("No paths available from which to build latest state"));
+        }
+    }
+
+    private void buildLatestState() throws IOException {
+        if (this.paths.size() == 1) {
+            // No patching needed
+            this.finalPath = this.paths.get(0);
+            return;
+        }
+
+        Path pathBefore = this.paths.get(0);
+
+        // Loop from the second path onwards
+        for (int i=1; i<paths.size(); i++) {
+            Path pathAfter = this.paths.get(i);
+            ArbitraryDataCombiner combiner = new ArbitraryDataCombiner(pathBefore, pathAfter);
+            combiner.combine();
+            combiner.cleanup();
+            pathBefore = combiner.getFinalPath();
+        }
+        this.finalPath = pathBefore;
     }
 
     public Path getFinalPath() {
diff --git a/src/main/java/org/qortal/arbitrary/ArbitraryDataPatches.java b/src/main/java/org/qortal/arbitrary/ArbitraryDataPatches.java
deleted file mode 100644
index f8882e78..00000000
--- a/src/main/java/org/qortal/arbitrary/ArbitraryDataPatches.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.qortal.arbitrary;
-
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import org.qortal.repository.DataException;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.List;
-
-public class ArbitraryDataPatches {
-
-    private static final Logger LOGGER = LogManager.getLogger(ArbitraryDataPatches.class);
-
-    private List<Path> paths;
-    private Path finalPath;
-
-    public ArbitraryDataPatches(List<Path> paths) {
-        this.paths = paths;
-    }
-
-    public void applyPatches() throws DataException, IOException {
-        try {
-            this.preExecute();
-            this.process();
-
-        } finally {
-            this.postExecute();
-        }
-    }
-
-    private void preExecute() {
-        if (this.paths == null || this.paths.isEmpty()) {
-            throw new IllegalStateException(String.format("No paths available to build latest state"));
-        }
-    }
-
-    private void postExecute() {
-
-    }
-
-    private void process() throws IOException {
-        if (this.paths.size() == 1) {
-            // No patching needed
-            this.finalPath = this.paths.get(0);
-            return;
-        }
-
-        Path pathBefore = this.paths.get(0);
-
-        // Loop from the second path onwards
-        for (int i=1; i<paths.size(); i++) {
-            Path pathAfter = this.paths.get(i);
-            ArbitraryDataCombiner combiner = new ArbitraryDataCombiner(pathBefore, pathAfter);
-            combiner.combine();
-            combiner.cleanup();
-            pathBefore = combiner.getFinalPath();
-        }
-        this.finalPath = pathBefore;
-    }
-
-    public Path getFinalPath() {
-        return this.finalPath;
-    }
-
-}