mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-03-13 11:09:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Cleanups, add generics, add final, remove unused code/comments/todos,

Browse source
This commit is contained in:
chimp1984 2020-10-01 22:08:09 -05:00
parent 270e89a25a
commit ccfda5b043
No known key found for this signature in database
GPG key ID: 9801B4EC591F90E3
17 changed files with 23 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/src/main/java/bisq/common/taskrunner/TaskRunner.java
View file

@ -28,7 +28,7 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
public class TaskRunner<T extends Model> {
private final Queue<Class<? extends Task>> tasks = new LinkedBlockingQueue<>();
private final Queue<Class<? extends Task<T>>> tasks = new LinkedBlockingQueue<>();
private final T sharedModel;
private final Class<T> sharedModelClass;
private final ResultHandler resultHandler;
@ -36,7 +36,7 @@ public class TaskRunner<T extends Model> {
private boolean failed = false;
private boolean isCanceled;
private Class<? extends Task> currentTask;
private Class<? extends Task<T>> currentTask;
public TaskRunner(T sharedModel, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {

2
core/src/main/java/bisq/core/app/BisqHeadlessApp.java
View file

@ -33,7 +33,6 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
public class BisqHeadlessApp implements HeadlessApp {
private static final long LOG_MEMORY_PERIOD_MIN = 10;
@Getter
private static Runnable shutDownHandler;
@ -96,7 +95,6 @@ public class BisqHeadlessApp implements HeadlessApp {
bisqSetup.setOsxKeyLoggerWarningHandler(() -> log.info("setOsxKeyLoggerWarningHandler"));
bisqSetup.setQubesOSInfoHandler(() -> log.info("setQubesOSInfoHandler"));
//TODO move to bisqSetup
corruptedStorageFileHandler.getFiles().ifPresent(files -> log.warn("getCorruptedDatabaseFiles. files={}", files));
tradeManager.setTakeOfferRequestErrorMessageHandler(errorMessage -> log.error("onTakeOfferRequestErrorMessageHandler"));
}

2
core/src/main/java/bisq/core/app/TorSetup.java
View file

@ -39,7 +39,7 @@ import static bisq.common.util.Preconditions.checkDir;
@Slf4j
@Singleton
public class TorSetup {
private File torDir;
private final File torDir;
@Inject
public TorSetup(@Named(Config.TOR_DIR) File torDir) {

4
core/src/main/java/bisq/core/dao/state/storage/DaoStateStorageService.java
View file

@ -43,6 +43,8 @@ import lombok.extern.slf4j.Slf4j;
*/
@Slf4j
public class DaoStateStorageService extends StoreService<DaoStateStore> {
private static final String FILE_NAME = "DaoStateStore";
private final DaoState daoState;
private final DaoStateMonitoringService daoStateMonitoringService;
@ -71,7 +73,7 @@ public class DaoStateStorageService extends StoreService<DaoStateStore> {
@Override
public String getFileName() {
return "DaoStateStore";
return FILE_NAME;
}
public void persistNow(DaoState daoState, LinkedList<DaoStateHash> daoStateHashChain, Runnable completeHandler) {

2
core/src/main/java/bisq/core/support/dispute/DisputeListService.java
View file

@ -63,7 +63,7 @@ public abstract class DisputeListService<T extends DisputeList<Dispute>> impleme
this.persistenceManager = persistenceManager;
disputeList = getConcreteDisputeList();
this.persistenceManager.initialize(disputeList, PersistenceManager.Priority.HIGH);
this.persistenceManager.initialize(disputeList, getFileName(), PersistenceManager.Priority.HIGH);
}

3
core/src/main/java/bisq/core/support/dispute/arbitration/ArbitrationDisputeList.java
View file

@ -26,7 +26,6 @@ import bisq.common.proto.ProtoUtil;
import com.google.protobuf.Message;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@ -64,7 +63,7 @@ public final class ArbitrationDisputeList extends DisputeList<Dispute> {
forEach(dispute -> checkArgument(dispute.getSupportType().equals(SupportType.ARBITRATION), "Support type has to be ARBITRATION"));
return protobuf.PersistableEnvelope.newBuilder().setArbitrationDisputeList(protobuf.ArbitrationDisputeList.newBuilder()
.addAllDispute(ProtoUtil.collectionToProto(new ArrayList<>(getList()), protobuf.Dispute.class))).build();
.addAllDispute(ProtoUtil.collectionToProto(getList(), protobuf.Dispute.class))).build();
}
public static ArbitrationDisputeList fromProto(protobuf.ArbitrationDisputeList proto,

3
core/src/main/java/bisq/core/support/dispute/mediation/MediationDisputeList.java
View file

@ -26,7 +26,6 @@ import bisq.common.proto.ProtoUtil;
import com.google.protobuf.Message;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@ -59,7 +58,7 @@ public final class MediationDisputeList extends DisputeList<Dispute> {
@Override
public Message toProtoMessage() {
return protobuf.PersistableEnvelope.newBuilder().setMediationDisputeList(protobuf.MediationDisputeList.newBuilder()
.addAllDispute(ProtoUtil.collectionToProto(new ArrayList<>(getList()), protobuf.Dispute.class))).build();
.addAllDispute(ProtoUtil.collectionToProto(getList(), protobuf.Dispute.class))).build();
}
public static MediationDisputeList fromProto(protobuf.MediationDisputeList proto,

3
core/src/main/java/bisq/core/support/dispute/refund/RefundDisputeList.java
View file

@ -26,7 +26,6 @@ import bisq.common.proto.ProtoUtil;
import com.google.protobuf.Message;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@ -63,7 +62,7 @@ public final class RefundDisputeList extends DisputeList<Dispute> {
forEach(dispute -> checkArgument(dispute.getSupportType().equals(SupportType.REFUND), "Support type has to be REFUND"));
return protobuf.PersistableEnvelope.newBuilder().setRefundDisputeList(protobuf.RefundDisputeList.newBuilder()
.addAllDispute(ProtoUtil.collectionToProto(new ArrayList<>(getList()), protobuf.Dispute.class))).build();
.addAllDispute(ProtoUtil.collectionToProto(getList(), protobuf.Dispute.class))).build();
}
public static RefundDisputeList fromProto(protobuf.RefundDisputeList proto,

6
core/src/main/java/bisq/core/trade/closed/ClosedTradableManager.java
View file

@ -54,8 +54,8 @@ public class ClosedTradableManager implements PersistedDataHost {
this.keyRing = keyRing;
this.priceFeedService = priceFeedService;
this.dumpDelayedPayoutTx = dumpDelayedPayoutTx;
this.persistenceManager = persistenceManager;
this.persistenceManager.initialize(closedTradables, "ClosedTrades");
}
@ -66,9 +66,7 @@ public class ClosedTradableManager implements PersistedDataHost {
closedTradables.setAll(persisted.getList());
}
closedTradables.forEach(tradable -> {
tradable.getOffer().setPriceFeedService(priceFeedService);
});
closedTradables.forEach(tradable -> tradable.getOffer().setPriceFeedService(priceFeedService));
dumpDelayedPayoutTx.maybeDumpDelayedPayoutTxs(closedTradables, "delayed_payout_txs_closed");
}

1
core/src/main/java/bisq/core/trade/failed/FailedTradesManager.java
View file

@ -65,6 +65,7 @@ public class FailedTradesManager implements PersistedDataHost {
this.btcWalletService = btcWalletService;
this.dumpDelayedPayoutTx = dumpDelayedPayoutTx;
this.persistenceManager = persistenceManager;
this.persistenceManager.initialize(failedTrades, "FailedTrades");
}

2
core/src/main/java/bisq/core/user/Preferences.java
View file

@ -898,6 +898,8 @@ public final class Preferences implements PersistedDataHost, BridgeAddressProvid
tradeCurrenciesAsObservable.add(change.getAddedSubList().get(0));
else if (change.wasRemoved() && change.getRemovedSize() == 1 && initialReadDone)
tradeCurrenciesAsObservable.remove(change.getRemoved().get(0));
requestPersistence();
}
private boolean blockExplorerExists(ArrayList<BlockChainExplorer> explorers,

6
desktop/src/main/java/bisq/desktop/main/MainViewModel.java
View file

@ -130,14 +130,14 @@ public class MainViewModel implements ViewModel, BisqSetup.BisqSetupListener {
private final CorruptedStorageFileHandler corruptedStorageFileHandler;
@Getter
private BooleanProperty showAppScreen = new SimpleBooleanProperty();
private DoubleProperty combinedSyncProgress = new SimpleDoubleProperty(-1);
private final BooleanProperty showAppScreen = new SimpleBooleanProperty();
private final DoubleProperty combinedSyncProgress = new SimpleDoubleProperty(-1);
private final BooleanProperty isSplashScreenRemoved = new SimpleBooleanProperty();
private Timer checkNumberOfBtcPeersTimer;
private Timer checkNumberOfP2pNetworkPeersTimer;
@SuppressWarnings("FieldCanBeLocal")
private MonadicBinding<Boolean> tradesAndUIReady;
private Queue<Overlay<?>> popupQueue = new PriorityQueue<>(Comparator.comparing(Overlay::getDisplayOrderPriority));
private final Queue<Overlay<?>> popupQueue = new PriorityQueue<>(Comparator.comparing(Overlay::getDisplayOrderPriority));
///////////////////////////////////////////////////////////////////////////////////////////

2
desktop/src/main/java/bisq/desktop/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java
View file

@ -111,7 +111,7 @@ class AltCoinAccountsDataModel extends ActivatableDataModel {
else
preferences.addCryptoCurrency((CryptoCurrency) singleTradeCurrency);
} else if (tradeCurrencies != null && !tradeCurrencies.isEmpty()) {
tradeCurrencies.stream().forEach(tradeCurrency -> {
tradeCurrencies.forEach(tradeCurrency -> {
if (tradeCurrency instanceof FiatCurrency)
preferences.addFiatCurrency((FiatCurrency) tradeCurrency);
else

2
desktop/src/main/java/bisq/desktop/main/overlays/notifications/NotificationCenter.java
View file

@ -112,7 +112,7 @@ public class NotificationCenter {
tradeManager.getTradesAsObservableList().addListener((ListChangeListener<Trade>) change -> {
change.next();
if (change.wasRemoved()) {
change.getRemoved().stream().forEach(trade -> {
change.getRemoved().forEach(trade -> {
String tradeId = trade.getId();
if (disputeStateSubscriptionsMap.containsKey(tradeId)) {
disputeStateSubscriptionsMap.get(tradeId).unsubscribe();

2
desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java
View file

@ -122,7 +122,7 @@ public class PendingTradesDataModel extends ActivatableDataModel {
private ChangeListener<Trade.State> tradeStateChangeListener;
private Trade selectedTrade;
@Getter
private PubKeyRing pubKeyRing;
private final PubKeyRing pubKeyRing;
///////////////////////////////////////////////////////////////////////////////////////////
// Constructor, initialization

2
desktop/src/main/java/bisq/desktop/main/support/dispute/DisputeView.java
View file

@ -168,7 +168,7 @@ public abstract class DisputeView extends ActivatableView<VBox, Void> {
protected InputTextField filterTextField;
private ChangeListener<String> filterTextFieldListener;
protected AutoTooltipButton sigCheckButton, reOpenButton, sendPrivateNotificationButton, reportButton, fullReportButton;
private Map<String, ListChangeListener<ChatMessage>> disputeChatMessagesListeners = new HashMap<>();
private final Map<String, ListChangeListener<ChatMessage>> disputeChatMessagesListeners = new HashMap<>();
@Nullable
private ListChangeListener<Dispute> disputesListener; // Only set in mediation cases
protected Label alertIconLabel;

2
proto/src/main/proto/pb.proto
View file

@ -1401,7 +1401,7 @@ message Trade {
NodeAddress refund_agent_node_address = 33;
PubKeyRing refund_agent_pub_key_ring = 34;
RefundResultState refund_result_state = 35;
int64 last_refresh_request_date = 36;
int64 last_refresh_request_date = 36 [deprecated = true];
string counter_currency_extra_data = 37;
string asset_tx_proof_result = 38; // name of AssetTxProofResult enum
}