mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-23 15:00:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

Return early when field name match fails

Browse source 
Resolves https://github.com/bisq-network/bisq/pull/5685#discussion_r710002786
This commit is contained in:
ghubstan 2021-09-16 09:31:22 -03:00
parent 429e943a36
commit 1a9cdfbdd3
No known key found for this signature in database
GPG key ID: E35592D6800A861E
1 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
core/src/main/java/bisq/core/api/model/PaymentAccountTypeAdapter.java
View file

@ -353,29 +353,29 @@ class PaymentAccountTypeAdapter extends TypeAdapter<PaymentAccount> {
private boolean didReadTradeCurrenciesField(JsonReader in,
PaymentAccount account,
String fieldName) {
if (!fieldName.equals("tradeCurrencies"))
return false;
// The PaymentAccount.tradeCurrencies field is a special case because it has
// no setter, so we add currencies to the List here if the payment account
// supports multiple trade currencies.
if (fieldName.equals("tradeCurrencies")) {
String fieldValue = nextStringOrNull(in);
List<String> currencyCodes = commaDelimitedCodesToList.apply(fieldValue);
Optional<List<TradeCurrency>> tradeCurrencies = getReconciledTradeCurrencies(currencyCodes, account);
if (tradeCurrencies.isPresent()) {
for (TradeCurrency tradeCurrency : tradeCurrencies.get()) {
account.addCurrency(tradeCurrency);
}
} else {
// Log a warning. We should not throw an exception here because the
// gson library will not pass it up to the calling Bisq object exactly as
// it would be defined here (causing confusion). Do a check in a calling
// class to make sure the tradeCurrencies field is populated in the
// PaymentAccount object, if it is required for the payment account method.
log.warn("No trade currencies were found in the {} account form.",
account.getPaymentMethod().getDisplayString());
String fieldValue = nextStringOrNull(in);
List<String> currencyCodes = commaDelimitedCodesToList.apply(fieldValue);
Optional<List<TradeCurrency>> tradeCurrencies = getReconciledTradeCurrencies(currencyCodes, account);
if (tradeCurrencies.isPresent()) {
for (TradeCurrency tradeCurrency : tradeCurrencies.get()) {
account.addCurrency(tradeCurrency);
}
return true;
} else {
// Log a warning. We should not throw an exception here because the
// gson library will not pass it up to the calling Bisq object exactly as
// it would be defined here (causing confusion). Do a check in a calling
// class to make sure the tradeCurrencies field is populated in the
// PaymentAccount object, if it is required for the payment account method.
log.warn("No trade currencies were found in the {} account form.",
account.getPaymentMethod().getDisplayString());
}
return false;
return true;
}
private Optional<List<TradeCurrency>> getReconciledTradeCurrencies(List<String> currencyCodes,
@ -407,22 +407,22 @@ class PaymentAccountTypeAdapter extends TypeAdapter<PaymentAccount> {
private boolean didReadSelectedTradeCurrencyField(JsonReader in,
PaymentAccount account,
String fieldName) {
if (fieldName.equals("selectedTradeCurrency")) {
String fieldValue = nextStringOrNull(in);
if (fieldValue != null && !fieldValue.isEmpty()) {
Optional<TradeCurrency> tradeCurrency = getTradeCurrency(fieldValue.toUpperCase());
if (tradeCurrency.isPresent()) {
account.setSelectedTradeCurrency(tradeCurrency.get());
} else {
// Log an error. We should not throw an exception here because the
// gson library will not pass it up to the calling Bisq object exactly as
// it would be defined here (causing confusion).
log.error("{} is not a valid trade currency code.", fieldValue);
}
if (!fieldName.equals("selectedTradeCurrency"))
return false;
String fieldValue = nextStringOrNull(in);
if (fieldValue != null && !fieldValue.isEmpty()) {
Optional<TradeCurrency> tradeCurrency = getTradeCurrency(fieldValue.toUpperCase());
if (tradeCurrency.isPresent()) {
account.setSelectedTradeCurrency(tradeCurrency.get());
} else {
// Log an error. We should not throw an exception here because the
// gson library will not pass it up to the calling Bisq object exactly as
// it would be defined here (causing confusion).
log.error("{} is not a valid trade currency code.", fieldValue);
}
return true;
}
return false;
return true;
}
private boolean didReadCommonField(JsonReader in,