Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Optimise/simplify some stream filtering for the REST API #7221

Merged
merged 1 commit into from
Aug 29, 2024
Merged

Optimise/simplify some stream filtering for the REST API #7221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions core/src/main/java/bisq/core/dao/burningman/accounting/balance/BalanceModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import bisq.common.util.DateUtil;

import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.HashMap;
Expand Down Expand Up @@ -54,20 +53,15 @@ public void addReceivedBtcBalanceEntry(ReceivedBtcBalanceEntry balanceEntry) {
receivedBtcBalanceEntries.add(balanceEntry);

Date month = balanceEntry.getMonth();
receivedBtcBalanceEntriesByMonth.putIfAbsent(month, new HashSet<>());
receivedBtcBalanceEntriesByMonth.get(month).add(balanceEntry);
receivedBtcBalanceEntriesByMonth.computeIfAbsent(month, m -> new HashSet<>()).add(balanceEntry);
}

public Set<ReceivedBtcBalanceEntry> getReceivedBtcBalanceEntries() {
return receivedBtcBalanceEntries;
}

public Set<ReceivedBtcBalanceEntry> getReceivedBtcBalanceEntriesByMonth(Date month) {
return receivedBtcBalanceEntriesByMonth.entrySet().stream()
.filter(e -> e.getKey().equals(month))
.map(Map.Entry::getValue)
.flatMap(Collection::stream)
.collect(Collectors.toSet());
return receivedBtcBalanceEntriesByMonth.getOrDefault(month, Set.of());
}

public Stream<BurnedBsqBalanceEntry> getBurnedBsqBalanceEntries(Set<BurnOutputModel> burnOutputModels) {
Expand Down
11 changes: 7 additions & 4 deletions core/src/main/java/bisq/core/trade/statistics/TradeStatisticsManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,15 @@

import bisq.common.config.Config;
import bisq.common.file.JsonFileManager;
import bisq.common.util.RangeUtils;

import com.google.inject.Inject;

import javax.inject.Named;
import javax.inject.Singleton;

import com.google.common.collect.Range;

import javafx.collections.FXCollections;
import javafx.collections.ObservableSet;

Expand Down Expand Up @@ -136,10 +139,10 @@ public ObservableSet<TradeStatistics3> getObservableTradeStatisticsSet() {
}

public List<TradeStatistics3> getTradeStatisticsList(long dateStart, long dateEnd) {
return observableTradeStatisticsSet.stream()
.filter(x -> x.getDateAsLong() > dateStart && x.getDateAsLong() <= dateEnd)
.sorted((o1, o2) -> (Long.compare(o2.getDateAsLong(), o1.getDateAsLong())))
.collect(Collectors.toList());
return new ArrayList<>(RangeUtils.subSet(navigableTradeStatisticsSet)
.withKey(TradeStatistics3::getDateAsLong)
.overRange(Range.openClosed(Math.min(dateStart, dateEnd), dateEnd))
.descendingSet());
}

private void maybeDumpStatistics() {
Expand Down
4 changes: 2 additions & 2 deletions daemon/src/main/java/bisq/daemon/grpc/interceptor/CallRateMeteringInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ private String getDefaultRateExceededError(String methodName,

private Optional<Map.Entry<String, GrpcCallRateMeter>> getRateMeterKV(ServerCall<?, ?> serverCall) {
String rateMeterKey = getRateMeterKey(serverCall);
return serviceCallRateMeters.entrySet().stream()
.filter((e) -> e.getKey().equals(rateMeterKey)).findFirst();
return Optional.ofNullable(serviceCallRateMeters.get(rateMeterKey))
.map(meter -> Map.entry(rateMeterKey, meter));
}

private String getRateMeterKey(ServerCall<?, ?> serverCall) {
Expand Down
8 changes: 2 additions & 6 deletions restapi/src/main/java/bisq/restapi/endpoints/ExplorerTransactionsApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,10 @@
import bisq.core.dao.state.model.blockchain.Tx;
import bisq.core.dao.state.model.blockchain.TxType;

import java.util.Collection;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;

import lombok.extern.slf4j.Slf4j;
Expand Down Expand Up @@ -86,10 +85,7 @@ public List<JsonTx> getBisqTxForAddr(@PathParam("addr") String address) {
address = address.substring(1, address.length());
}
String finalAddress = address;
List<JsonTx> result = daoStateService.getTxIdSetByAddress().entrySet().stream()
.filter(e -> e.getKey().equals(finalAddress))
.map(Map.Entry::getValue)
.flatMap(Collection::stream)
List<JsonTx> result = daoStateService.getTxIdSetByAddress().getOrDefault(finalAddress, Set.of()).stream()
.flatMap(txId -> daoStateService.getTx(txId).stream())
.map(tx -> BlockDataToJsonConverter.getJsonTx(daoStateService, tx))
.collect(Collectors.toList());
Expand Down
Loading