From d7ddcda9da77aceeb5ffb4a13e6857e8825553bf Mon Sep 17 00:00:00 2001
From: CalDescent <caldescent@protonmail.com>
Date: Wed, 3 Nov 2021 21:39:02 +0000
Subject: [PATCH] Refactor to simplify some duplicated code

---
 .../ArbitraryDataCleanupManager.java          | 19 +++++--------------
 .../arbitrary/ArbitraryDataManager.java       | 14 +++-----------
 .../ArbitraryDataStorageManager.java          |  6 +++++-
 3 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataCleanupManager.java b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataCleanupManager.java
index 2cef289d..eaea3adb 100644
--- a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataCleanupManager.java
+++ b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataCleanupManager.java
@@ -138,20 +138,11 @@ public class ArbitraryDataCleanupManager extends Thread {
 
 
 						// Check to see if we should be hosting data for this transaction at all
-						if (arbitraryTransactionData.getName() != null) {
-							if (!storageManager.shouldStoreDataForName(arbitraryTransactionData.getName())) {
-								LOGGER.info("Deleting transaction {} because we are no longer storing data for name {}",
-										Base58.encode(arbitraryTransactionData.getSignature()), arbitraryTransactionData.getName());
-								ArbitraryTransactionUtils.deleteCompleteFileAndChunks(arbitraryTransactionData);
-								continue;
-							}
-						}
-						else {
-							// Transaction has no name associated with it
-							if (!storageManager.shouldStoreDataWithoutName()) {
-								ArbitraryTransactionUtils.deleteCompleteFileAndChunks(arbitraryTransactionData);
-								continue;
-							}
+						if (!storageManager.shouldStoreDataForName(arbitraryTransactionData.getName())) {
+							LOGGER.info("Deleting transaction {} because we are no longer storing data for name {}",
+									Base58.encode(arbitraryTransactionData.getSignature()), arbitraryTransactionData.getName());
+							ArbitraryTransactionUtils.deleteCompleteFileAndChunks(arbitraryTransactionData);
+							continue;
 						}
 
 						// Check to see if we have had a more recent PUT
diff --git a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataManager.java b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataManager.java
index 7f842591..0f88149c 100644
--- a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataManager.java
+++ b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataManager.java
@@ -182,17 +182,9 @@ public class ArbitraryDataManager extends Thread {
 					ArbitraryTransactionData arbitraryTransactionData = (ArbitraryTransactionData) arbitraryTransaction.getTransactionData();
 
 					// Skip transactions that we don't need to store data for
-					if (arbitraryTransactionData.getName() != null) {
-						if (!storageManager.shouldStoreDataForName(arbitraryTransactionData.getName())) {
-							iterator.remove();
-							continue;
-						}
-					} else {
-						// Transaction has no name associated with it
-						if (!storageManager.shouldStoreDataWithoutName()) {
-							iterator.remove();
-							continue;
-						}
+					if (!storageManager.shouldStoreDataForName(arbitraryTransactionData.getName())) {
+						iterator.remove();
+						continue;
 					}
 
 					// Remove transactions that we already have local data for
diff --git a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataStorageManager.java b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataStorageManager.java
index ce90f001..6e27febe 100644
--- a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataStorageManager.java
+++ b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataStorageManager.java
@@ -26,6 +26,10 @@ public class ArbitraryDataStorageManager {
     }
 
     public boolean shouldStoreDataForName(String name) {
+        if (name == null) {
+            return this.shouldStoreDataWithoutName();
+        }
+
         switch (Settings.getInstance().getStoragePolicy()) {
             case FOLLOWED:
             case FOLLOWED_AND_VIEWED:
@@ -41,7 +45,7 @@ public class ArbitraryDataStorageManager {
         }
     }
 
-    public boolean shouldStoreDataWithoutName() {
+    private boolean shouldStoreDataWithoutName() {
         switch (Settings.getInstance().getStoragePolicy()) {
             case ALL:
                 return true;