inject CorruptedDataFilesHandler instead of making it static

common/src/main/java/bisq/common/storage/Storage.java

@@ -52,11 +52,7 @@ public class Storage<T extends PersistableEnvelope> {
     private static final Logger log = LoggerFactory.getLogger(Storage.class);
     public static final String STORAGE_DIR = "storageDir";
 
-    private static CorruptedDatabaseFilesHandler corruptedDatabaseFilesHandler;
-
-    public static void setCorruptedDatabaseFilesHandler(CorruptedDatabaseFilesHandler corruptedDatabaseFilesHandler) {
-        Storage.corruptedDatabaseFilesHandler = corruptedDatabaseFilesHandler;
-    }
+    private final CorruptedDatabaseFilesHandler corruptedDatabaseFilesHandler;
 
     private final File dir;
     private FileManager<T> fileManager;
@@ -72,9 +68,12 @@ public static void setCorruptedDatabaseFilesHandler(CorruptedDatabaseFilesHandle
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    public Storage(@Named(STORAGE_DIR) File dir, PersistenceProtoResolver persistenceProtoResolver) {
+    public Storage(@Named(STORAGE_DIR) File dir,
+                   PersistenceProtoResolver persistenceProtoResolver,
+                   CorruptedDatabaseFilesHandler corruptedDatabaseFilesHandler) {
         this.dir = dir;
         this.persistenceProtoResolver = persistenceProtoResolver;
+        this.corruptedDatabaseFilesHandler = corruptedDatabaseFilesHandler;
     }
 
     @Nullable

core/src/main/java/bisq/core/app/BisqExecutable.java

@@ -42,8 +42,6 @@
 import bisq.common.handlers.ResultHandler;
 import bisq.common.proto.persistable.PersistedDataHost;
 import bisq.common.setup.GracefulShutDownHandler;
-import bisq.common.storage.CorruptedDatabaseFilesHandler;
-import bisq.common.storage.Storage;
 
 import org.springframework.core.env.JOptCommandLinePropertySource;
 
@@ -232,8 +230,6 @@ protected Injector getInjector() {
     protected void applyInjector() {
         setupDevEnv();
 
-        setCorruptedDataBaseFilesHandler();
-
         setupPersistedDataHosts(injector);
     }
 
@@ -242,11 +238,6 @@ protected void setupDevEnv() {
         DevEnv.setDaoActivated(BisqEnvironment.isDaoActivated(bisqEnvironment));
     }
 
-    private void setCorruptedDataBaseFilesHandler() {
-        CorruptedDatabaseFilesHandler corruptedDatabaseFilesHandler = injector.getInstance(CorruptedDatabaseFilesHandler.class);
-        Storage.setCorruptedDatabaseFilesHandler(corruptedDatabaseFilesHandler);
-    }
-
     protected void setupPersistedDataHosts(Injector injector) {
         try {
             PersistedDataHost.apply(CorePersistedDataHost.getPersistedDataHosts(injector));

core/src/main/java/bisq/core/arbitration/DisputeManager.java

@@ -56,7 +56,6 @@
 import bisq.common.handlers.ResultHandler;
 import bisq.common.proto.network.NetworkEnvelope;
 import bisq.common.proto.persistable.PersistedDataHost;
-import bisq.common.proto.persistable.PersistenceProtoResolver;
 import bisq.common.storage.Storage;
 import bisq.common.util.Tuple2;
 
@@ -66,8 +65,6 @@
 
 import com.google.inject.Inject;
 
-import javax.inject.Named;
-
 import org.fxmisc.easybind.EasyBind;
 import org.fxmisc.easybind.Subscription;
 
@@ -77,8 +74,6 @@
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 
-import java.io.File;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -136,8 +131,7 @@ public DisputeManager(P2PService p2PService,
                           ClosedTradableManager closedTradableManager,
                           OpenOfferManager openOfferManager,
                           KeyRing keyRing,
-                          PersistenceProtoResolver persistenceProtoResolver,
-                          @Named(Storage.STORAGE_DIR) File storageDir) {
+                          Storage<DisputeList> storage) {
         this.p2PService = p2PService;
         this.tradeWalletService = tradeWalletService;
         this.walletService = walletService;
@@ -147,7 +141,7 @@ public DisputeManager(P2PService p2PService,
         this.openOfferManager = openOfferManager;
         this.keyRing = keyRing;
 
-        disputeStorage = new Storage<>(storageDir, persistenceProtoResolver);
+        disputeStorage = storage;
 
         openDisputes = new HashMap<>();
         closedDisputes = new HashMap<>();
@@ -207,7 +201,8 @@ public void onUpdatedDataReceived() {
         onDisputesChangeListener(disputes.getList(), null);
     }
 
-    private void onDisputesChangeListener(List<? extends Dispute> addedList, @Nullable List<? extends Dispute> removedList) {
+    private void onDisputesChangeListener(List<? extends Dispute> addedList,
+                                          @Nullable List<? extends Dispute> removedList) {
         if (removedList != null) {
             removedList.forEach(dispute -> {
                 String id = dispute.getId();
@@ -295,7 +290,8 @@ private void applyMessages() {
         decryptedMailboxMessageWithPubKeys.clear();
     }
 
-    private void processAckMessage(AckMessage ackMessage, @Nullable DecryptedMessageWithPubKey decryptedMessageWithPubKey) {
+    private void processAckMessage(AckMessage ackMessage,
+                                   @Nullable DecryptedMessageWithPubKey decryptedMessageWithPubKey) {
         if (ackMessage.getSourceType() == AckMessageSourceType.DISPUTE_MESSAGE) {
             if (ackMessage.isSuccess()) {
                 log.info("Received AckMessage for {} with tradeId {} and uid {}",
@@ -339,7 +335,10 @@ else if (message instanceof PeerPublishedDisputePayoutTxMessage)
             log.warn("Unsupported message at dispatchMessage.\nmessage=" + message);
     }
 
-    public void sendOpenNewDisputeMessage(Dispute dispute, boolean reOpen, ResultHandler resultHandler, FaultHandler faultHandler) {
+    public void sendOpenNewDisputeMessage(Dispute dispute,
+                                          boolean reOpen,
+                                          ResultHandler resultHandler,
+                                          FaultHandler faultHandler) {
         if (!disputes.contains(dispute)) {
             final Optional<Dispute> storedDisputeOptional = findDispute(dispute.getTradeId(), dispute.getTraderId());
             if (!storedDisputeOptional.isPresent() || reOpen) {
@@ -433,7 +432,9 @@ public void onFault(String errorMessage) {
     }
 
     // arbitrator sends that to trading peer when he received openDispute request
-    private String sendPeerOpenedDisputeMessage(Dispute disputeFromOpener, Contract contractFromOpener, PubKeyRing pubKeyRing) {
+    private String sendPeerOpenedDisputeMessage(Dispute disputeFromOpener,
+                                                Contract contractFromOpener,
+                                                PubKeyRing pubKeyRing) {
         Dispute dispute = new Dispute(
                 disputeStorage,
                 disputeFromOpener.getTradeId(),
@@ -539,7 +540,9 @@ public void onFault(String errorMessage) {
     }
 
     // traders send msg to the arbitrator or arbitrator to 1 trader (trader to trader is not allowed)
-    public DisputeCommunicationMessage sendDisputeDirectMessage(Dispute dispute, String text, ArrayList<Attachment> attachments) {
+    public DisputeCommunicationMessage sendDisputeDirectMessage(Dispute dispute,
+                                                                String text,
+                                                                ArrayList<Attachment> attachments) {
         DisputeCommunicationMessage message = new DisputeCommunicationMessage(
                 dispute.getTradeId(),
                 dispute.getTraderPubKeyRing().hashCode(),

core/src/main/java/bisq/core/offer/OpenOfferManager.java

@@ -54,18 +54,14 @@
 import bisq.common.handlers.ResultHandler;
 import bisq.common.proto.network.NetworkEnvelope;
 import bisq.common.proto.persistable.PersistedDataHost;
-import bisq.common.proto.persistable.PersistenceProtoResolver;
 import bisq.common.storage.Storage;
 
 import org.bitcoinj.core.Coin;
 
 import javax.inject.Inject;
-import javax.inject.Named;
 
 import javafx.collections.ObservableList;
 
-import java.io.File;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -127,10 +123,9 @@ public OpenOfferManager(KeyRing keyRing,
                             ClosedTradableManager closedTradableManager,
                             PriceFeedService priceFeedService,
                             Preferences preferences,
-                            PersistenceProtoResolver persistenceProtoResolver,
                             TradeStatisticsManager tradeStatisticsManager,
                             ArbitratorManager arbitratorManager,
-                            @Named(Storage.STORAGE_DIR) File storageDir) {
+                            Storage<TradableList<OpenOffer>> storage) {
         this.keyRing = keyRing;
         this.user = user;
         this.p2PService = p2PService;
@@ -144,7 +139,7 @@ public OpenOfferManager(KeyRing keyRing,
         this.tradeStatisticsManager = tradeStatisticsManager;
         this.arbitratorManager = arbitratorManager;
 
-        openOfferTradableListStorage = new Storage<>(storageDir, persistenceProtoResolver);
+        openOfferTradableListStorage = storage;
 
         // In case the app did get killed the shutDown from the modules is not called, so we use a shutdown hook
         Runtime.getRuntime().addShutdownHook(new Thread(() -> {

core/src/main/java/bisq/core/proto/persistable/CorePersistenceProtoResolver.java

@@ -50,6 +50,7 @@
 import bisq.common.proto.persistable.NavigationPath;
 import bisq.common.proto.persistable.PersistableEnvelope;
 import bisq.common.proto.persistable.PersistenceProtoResolver;
+import bisq.common.storage.CorruptedDatabaseFilesHandler;
 import bisq.common.storage.Storage;
 
 import com.google.inject.Provider;
@@ -69,15 +70,18 @@ public class CorePersistenceProtoResolver extends CoreProtoResolver implements P
     private final Provider<BtcWalletService> btcWalletService;
     private final NetworkProtoResolver networkProtoResolver;
     private final File storageDir;
+    private final CorruptedDatabaseFilesHandler corruptedDatabaseFilesHandler;
 
     @Inject
     public CorePersistenceProtoResolver(Provider<BtcWalletService> btcWalletService,
                                         NetworkProtoResolver networkProtoResolver,
-                                        @Named(Storage.STORAGE_DIR) File storageDir) {
+                                        @Named(Storage.STORAGE_DIR) File storageDir,
+                                        CorruptedDatabaseFilesHandler corruptedDatabaseFilesHandler) {
         this.btcWalletService = btcWalletService;
         this.networkProtoResolver = networkProtoResolver;
         this.storageDir = storageDir;
 
+        this.corruptedDatabaseFilesHandler = corruptedDatabaseFilesHandler;
     }
 
     @Override
@@ -93,14 +97,14 @@ public PersistableEnvelope fromProto(protobuf.PersistableEnvelope proto) {
                 case TRADABLE_LIST:
                     return TradableList.fromProto(proto.getTradableList(),
                             this,
-                            new Storage<>(storageDir, this),
+                            new Storage<>(storageDir, this, corruptedDatabaseFilesHandler),
                             btcWalletService.get());
                 case TRADE_STATISTICS_LIST:
                     throw new ProtobufferRuntimeException("TRADE_STATISTICS_LIST is not used anymore");
                 case DISPUTE_LIST:
                     return DisputeList.fromProto(proto.getDisputeList(),
                             this,
-                            new Storage<>(storageDir, this));
+                            new Storage<>(storageDir, this, corruptedDatabaseFilesHandler));
                 case PREFERENCES_PAYLOAD:
                     return PreferencesPayload.fromProto(proto.getPreferencesPayload(), this);
                 case USER_PAYLOAD:

core/src/main/java/bisq/core/trade/TradeManager.java

@@ -55,7 +55,6 @@
 import bisq.common.handlers.ResultHandler;
 import bisq.common.proto.network.NetworkEnvelope;
 import bisq.common.proto.persistable.PersistedDataHost;
-import bisq.common.proto.persistable.PersistenceProtoResolver;
 import bisq.common.storage.Storage;
 
 import org.bitcoinj.core.AddressFormatException;
@@ -64,7 +63,6 @@
 import org.bitcoinj.core.Transaction;
 
 import javax.inject.Inject;
-import javax.inject.Named;
 
 import com.google.common.util.concurrent.FutureCallback;
 
@@ -78,8 +76,6 @@
 
 import org.spongycastle.crypto.params.KeyParameter;
 
-import java.io.File;
-
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -148,11 +144,10 @@ public TradeManager(User user,
                         FilterManager filterManager,
                         TradeStatisticsManager tradeStatisticsManager,
                         ReferralIdService referralIdService,
-                        PersistenceProtoResolver persistenceProtoResolver,
                         AccountAgeWitnessService accountAgeWitnessService,
                         ArbitratorManager arbitratorManager,
                         ClockWatcher clockWatcher,
-                        @Named(Storage.STORAGE_DIR) File storageDir) {
+                        Storage<TradableList<Trade>> storage) {
         this.user = user;
         this.keyRing = keyRing;
         this.btcWalletService = btcWalletService;
@@ -170,7 +165,7 @@ public TradeManager(User user,
         this.arbitratorManager = arbitratorManager;
         this.clockWatcher = clockWatcher;
 
-        tradableListStorage = new Storage<>(storageDir, persistenceProtoResolver);
+        tradableListStorage = storage;
 
         p2PService.addDecryptedDirectMessageListener((decryptedMessageWithPubKey, peerNodeAddress) -> {
             NetworkEnvelope networkEnvelope = decryptedMessageWithPubKey.getNetworkEnvelope();

core/src/main/java/bisq/core/trade/closed/ClosedTradableManager.java

@@ -26,19 +26,14 @@
 
 import bisq.common.crypto.KeyRing;
 import bisq.common.proto.persistable.PersistedDataHost;
-import bisq.common.proto.persistable.PersistenceProtoResolver;
 import bisq.common.storage.Storage;
 
 import com.google.inject.Inject;
 
-import javax.inject.Named;
-
 import com.google.common.collect.ImmutableList;
 
 import javafx.collections.ObservableList;
 
-import java.io.File;
-
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -52,14 +47,14 @@ public class ClosedTradableManager implements PersistedDataHost {
     private final BtcWalletService btcWalletService;
 
     @Inject
-    public ClosedTradableManager(KeyRing keyRing, PriceFeedService priceFeedService,
-                                 PersistenceProtoResolver persistenceProtoResolver,
+    public ClosedTradableManager(KeyRing keyRing,
+                                 PriceFeedService priceFeedService,
                                  BtcWalletService btcWalletService,
-                                 @Named(Storage.STORAGE_DIR) File storageDir) {
+                                 Storage<TradableList<Tradable>> storage) {
         this.keyRing = keyRing;
         this.priceFeedService = priceFeedService;
         this.btcWalletService = btcWalletService;
-        tradableListStorage = new Storage<>(storageDir, persistenceProtoResolver);
+        tradableListStorage = storage;
         // The ClosedTrades object can become a few MB so we don't keep so many backups
         tradableListStorage.setNumMaxBackupFiles(3);
 

core/src/main/java/bisq/core/trade/failed/FailedTradesManager.java

@@ -25,17 +25,12 @@
 
 import bisq.common.crypto.KeyRing;
 import bisq.common.proto.persistable.PersistedDataHost;
-import bisq.common.proto.persistable.PersistenceProtoResolver;
 import bisq.common.storage.Storage;
 
 import com.google.inject.Inject;
 
-import javax.inject.Named;
-
 import javafx.collections.ObservableList;
 
-import java.io.File;
-
 import java.util.Optional;
 import java.util.stream.Stream;
 
@@ -51,14 +46,14 @@ public class FailedTradesManager implements PersistedDataHost {
     private final Storage<TradableList<Trade>> tradableListStorage;
 
     @Inject
-    public FailedTradesManager(KeyRing keyRing, PriceFeedService priceFeedService,
-                               PersistenceProtoResolver persistenceProtoResolver,
+    public FailedTradesManager(KeyRing keyRing,
+                               PriceFeedService priceFeedService,
                                BtcWalletService btcWalletService,
-                               @Named(Storage.STORAGE_DIR) File storageDir) {
+                               Storage<TradableList<Trade>> storage) {
         this.keyRing = keyRing;
         this.priceFeedService = priceFeedService;
         this.btcWalletService = btcWalletService;
-        tradableListStorage = new Storage<>(storageDir, persistenceProtoResolver);
+        tradableListStorage = storage;
 
     }