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

Clean up code

Browse source
This commit is contained in:
Christoph Atteneder 2020-11-03 14:51:55 +01:00
parent ecf9d49f65
commit 8fe8261a1e
No known key found for this signature in database
GPG key ID: CD5DC1C529CDFD3B
9 changed files with 87 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
core/src/main/java/bisq/core/payment/AustraliaPayID.java → core/src/main/java/bisq/core/payment/AustraliaPayid.java
View file

@ -17,53 +17,37 @@
package bisq.core.payment;
import bisq.core.payment.payload.AustraliaPayIDPayload;
import bisq.core.locale.FiatCurrency;
import bisq.core.payment.payload.AustraliaPayidPayload;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.payment.payload.PaymentMethod;
import bisq.core.payment.payload.AustraliaPayIDPayload;
import org.jetbrains.annotations.NotNull;
import lombok.Getter;
import lombok.Setter;
import bisq.core.locale.Country;
import bisq.core.locale.FiatCurrency;
import bisq.core.payment.payload.AustraliaPayIDPayload;
public final class AustraliaPayID extends PaymentAccount
{
public AustraliaPayID()
{
public final class AustraliaPayid extends PaymentAccount {
public AustraliaPayid() {
super(PaymentMethod.AUSTRALIA_PAYID);
setSingleTradeCurrency(new FiatCurrency("AUD"));
}
@Override
protected PaymentAccountPayload createPayload()
{
return new AustraliaPayIDPayload(paymentMethod.getId(), id);
protected PaymentAccountPayload createPayload() {
return new AustraliaPayidPayload(paymentMethod.getId(), id);
}
// payid
public String getPayID()
{
return ((AustraliaPayIDPayload) paymentAccountPayload).getPayid();
public String getPayid() {
return ((AustraliaPayidPayload) paymentAccountPayload).getPayid();
}
public void setPayID(String payid)
{
public void setPayid(String payid) {
if (payid == null) payid = "";
((AustraliaPayIDPayload) paymentAccountPayload).setPayid(payid);
((AustraliaPayidPayload) paymentAccountPayload).setPayid(payid);
}
// bankAccount name
public String getBankAccountName()
{
return ((AustraliaPayIDPayload) paymentAccountPayload).getBankAccountName();
public String getBankAccountName() {
return ((AustraliaPayidPayload) paymentAccountPayload).getBankAccountName();
}
public void setBankAccountName(String bankAccountName)
{
public void setBankAccountName(String bankAccountName) {
if (bankAccountName == null) bankAccountName = "";
((AustraliaPayIDPayload) paymentAccountPayload).setBankAccountName(bankAccountName);
((AustraliaPayidPayload) paymentAccountPayload).setBankAccountName(bankAccountName);
}
}

2
core/src/main/java/bisq/core/payment/PaymentAccountFactory.java
View file

@ -47,7 +47,7 @@ public class PaymentAccountFactory {
case PaymentMethod.JAPAN_BANK_ID:
return new JapanBankAccount();
case PaymentMethod.AUSTRALIA_PAYID_ID:
return new AustraliaPayID();
return new AustraliaPayid();
case PaymentMethod.ALI_PAY_ID:
return new AliPayAccount();
case PaymentMethod.WECHAT_PAY_ID:

39
core/src/main/java/bisq/core/payment/payload/AustraliaPayIDPayload.java → core/src/main/java/bisq/core/payment/payload/AustraliaPayidPayload.java
View file

@ -23,7 +23,7 @@ import bisq.common.util.CollectionUtils;
import com.google.protobuf.Message;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
@ -39,12 +39,11 @@ import lombok.extern.slf4j.Slf4j;
@Setter
@Getter
@Slf4j
public final class AustraliaPayIDPayload extends PaymentAccountPayload {
// payid
public final class AustraliaPayidPayload extends PaymentAccountPayload {
private String payid = "";
private String bankAccountName = "";
public AustraliaPayIDPayload(String paymentMethod, String id) {
public AustraliaPayidPayload(String paymentMethod, String id) {
super(paymentMethod, id);
}
@ -53,7 +52,7 @@ public final class AustraliaPayIDPayload extends PaymentAccountPayload {
// PROTO BUFFER
///////////////////////////////////////////////////////////////////////////////////////////
private AustraliaPayIDPayload(String paymentMethod,
private AustraliaPayidPayload(String paymentMethod,
String id,
String payid,
String bankAccountName,
@ -72,18 +71,18 @@ public final class AustraliaPayIDPayload extends PaymentAccountPayload {
public Message toProtoMessage() {
return getPaymentAccountPayloadBuilder()
.setAustraliaPayidPayload(
protobuf.AustraliaPayIDPayload.newBuilder()
.setPayid(payid)
.setBankAccountName(bankAccountName)
protobuf.AustraliaPayidPayload.newBuilder()
.setPayid(payid)
.setBankAccountName(bankAccountName)
).build();
}
public static AustraliaPayIDPayload fromProto(protobuf.PaymentAccountPayload proto) {
protobuf.AustraliaPayIDPayload AustraliaPayIDPayload = proto.getAustraliaPayidPayload();
return new AustraliaPayIDPayload(proto.getPaymentMethodId(),
public static AustraliaPayidPayload fromProto(protobuf.PaymentAccountPayload proto) {
protobuf.AustraliaPayidPayload AustraliaPayidPayload = proto.getAustraliaPayidPayload();
return new AustraliaPayidPayload(proto.getPaymentMethodId(),
proto.getId(),
AustraliaPayIDPayload.getPayid(),
AustraliaPayIDPayload.getBankAccountName(),
AustraliaPayidPayload.getPayid(),
AustraliaPayidPayload.getBankAccountName(),
proto.getMaxTradePeriod(),
CollectionUtils.isEmpty(proto.getExcludeFromJsonDataMap()) ? null : new HashMap<>(proto.getExcludeFromJsonDataMap()));
}
@ -94,23 +93,21 @@ public final class AustraliaPayIDPayload extends PaymentAccountPayload {
///////////////////////////////////////////////////////////////////////////////////////////
@Override
public String getPaymentDetails()
{
public String getPaymentDetails() {
return Res.get(paymentMethodId) + " - " + getPaymentDetailsForTradePopup().replace("\n", ", ");
}
@Override
public String getPaymentDetailsForTradePopup()
{
public String getPaymentDetailsForTradePopup() {
return
Res.get("payment.australia.payid") + ": " + payid + "\n" +
Res.get("payment.account.owner") + ": " + bankAccountName;
}
Res.get("payment.australia.payid") + ": " + payid + "\n" +
Res.get("payment.account.owner") + ": " + bankAccountName;
}
@Override
public byte[] getAgeWitnessInputData() {
String all = this.payid + this.bankAccountName;
return super.getAgeWitnessInputData(all.getBytes(Charset.forName("UTF-8")));
return super.getAgeWitnessInputData(all.getBytes(StandardCharsets.UTF_8));
}
}

4
core/src/main/java/bisq/core/proto/CoreProtoResolver.java
View file

@ -23,6 +23,7 @@ import bisq.core.dao.governance.blindvote.storage.BlindVotePayload;
import bisq.core.dao.governance.proposal.storage.appendonly.ProposalPayload;
import bisq.core.payment.payload.AdvancedCashAccountPayload;
import bisq.core.payment.payload.AliPayAccountPayload;
import bisq.core.payment.payload.AustraliaPayidPayload;
import bisq.core.payment.payload.CashAppAccountPayload;
import bisq.core.payment.payload.CashDepositAccountPayload;
import bisq.core.payment.payload.ChaseQuickPayAccountPayload;
@ -34,7 +35,6 @@ import bisq.core.payment.payload.HalCashAccountPayload;
import bisq.core.payment.payload.InstantCryptoCurrencyPayload;
import bisq.core.payment.payload.InteracETransferAccountPayload;
import bisq.core.payment.payload.JapanBankAccountPayload;
import bisq.core.payment.payload.AustraliaPayIDPayload;
import bisq.core.payment.payload.MoneyBeamAccountPayload;
import bisq.core.payment.payload.MoneyGramAccountPayload;
import bisq.core.payment.payload.NationalBankAccountPayload;
@ -126,7 +126,7 @@ public class CoreProtoResolver implements ProtoResolver {
case JAPAN_BANK_ACCOUNT_PAYLOAD:
return JapanBankAccountPayload.fromProto(proto);
case AUSTRALIA_PAYID_PAYLOAD:
return AustraliaPayIDPayload.fromProto(proto);
return AustraliaPayidPayload.fromProto(proto);
case UPHOLD_ACCOUNT_PAYLOAD:
return UpholdAccountPayload.fromProto(proto);
case MONEY_BEAM_ACCOUNT_PAYLOAD:

53
desktop/src/main/java/bisq/desktop/components/paymentmethods/AustraliaPayIDForm.java → desktop/src/main/java/bisq/desktop/components/paymentmethods/AustraliaPayidForm.java
View file

@ -20,14 +20,14 @@ package bisq.desktop.components.paymentmethods;
import bisq.desktop.components.InputTextField;
import bisq.desktop.util.FormBuilder;
import bisq.desktop.util.Layout;
import bisq.desktop.util.validation.AustraliaPayIDValidator;
import bisq.desktop.util.validation.AustraliaPayidValidator;
import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.locale.Res;
import bisq.core.locale.TradeCurrency;
import bisq.core.payment.AustraliaPayID;
import bisq.core.payment.AustraliaPayid;
import bisq.core.payment.PaymentAccount;
import bisq.core.payment.payload.AustraliaPayIDPayload;
import bisq.core.payment.payload.AustraliaPayidPayload;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.util.coin.CoinFormatter;
import bisq.core.util.validation.InputValidator;
@ -38,24 +38,29 @@ import javafx.scene.layout.GridPane;
import static bisq.desktop.util.FormBuilder.addCompactTopLabelTextField;
import static bisq.desktop.util.FormBuilder.addTopLabelTextField;
public class AustraliaPayIDForm extends PaymentMethodForm {
private final AustraliaPayID australiaPayID;
private final AustraliaPayIDValidator australiaPayIDValidator;
public class AustraliaPayidForm extends PaymentMethodForm {
private final AustraliaPayid australiaPayid;
private final AustraliaPayidValidator australiaPayidValidator;
private InputTextField mobileNrInputTextField;
public static int addFormForBuyer(GridPane gridPane, int gridRow, PaymentAccountPayload paymentAccountPayload) {
addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"),
((AustraliaPayIDPayload) paymentAccountPayload).getBankAccountName());
((AustraliaPayidPayload) paymentAccountPayload).getBankAccountName());
addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.payid"),
((AustraliaPayIDPayload) paymentAccountPayload).getPayid());
((AustraliaPayidPayload) paymentAccountPayload).getPayid());
return gridRow;
}
public AustraliaPayIDForm(PaymentAccount paymentAccount, AccountAgeWitnessService accountAgeWitnessService, AustraliaPayIDValidator australiaPayIDValidator,
InputValidator inputValidator, GridPane gridPane, int gridRow, CoinFormatter formatter) {
public AustraliaPayidForm(PaymentAccount paymentAccount,
AccountAgeWitnessService accountAgeWitnessService,
AustraliaPayidValidator australiaPayidValidator,
InputValidator inputValidator,
GridPane gridPane,
int gridRow,
CoinFormatter formatter) {
super(paymentAccount, accountAgeWitnessService, inputValidator, gridPane, gridRow, formatter);
this.australiaPayID = (AustraliaPayID) paymentAccount;
this.australiaPayIDValidator = australiaPayIDValidator;
this.australiaPayid = (AustraliaPayid) paymentAccount;
this.australiaPayidValidator = australiaPayidValidator;
}
@Override
@ -66,18 +71,18 @@ public class AustraliaPayIDForm extends PaymentMethodForm {
Res.get("payment.account.owner"));
holderNameInputTextField.setValidator(inputValidator);
holderNameInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
australiaPayID.setBankAccountName(newValue);
australiaPayid.setBankAccountName(newValue);
updateFromInputs();
});
mobileNrInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, Res.get("payment.payid"));
mobileNrInputTextField.setValidator(australiaPayIDValidator);
mobileNrInputTextField.setValidator(australiaPayidValidator);
mobileNrInputTextField.textProperty().addListener((ov, oldValue, newValue) -> {
australiaPayID.setPayID(newValue);
australiaPayid.setPayid(newValue);
updateFromInputs();
});
TradeCurrency singleTradeCurrency = australiaPayID.getSingleTradeCurrency();
TradeCurrency singleTradeCurrency = australiaPayid.getSingleTradeCurrency();
String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "null";
addTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"), nameAndCode);
addLimitations(false);
@ -93,15 +98,15 @@ public class AustraliaPayIDForm extends PaymentMethodForm {
public void addFormForDisplayAccount() {
gridRowFrom = gridRow;
addTopLabelTextField(gridPane, gridRow, Res.get("payment.account.name"),
australiaPayID.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE);
australiaPayid.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE);
addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"),
Res.get(australiaPayID.getPaymentMethod().getId()));
Res.get(australiaPayid.getPaymentMethod().getId()));
addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.payid"),
australiaPayID.getPayID());
australiaPayid.getPayid());
TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.account.owner"),
australiaPayID.getBankAccountName()).second;
australiaPayid.getBankAccountName()).second;
field.setMouseTransparent(false);
TradeCurrency singleTradeCurrency = australiaPayID.getSingleTradeCurrency();
TradeCurrency singleTradeCurrency = australiaPayid.getSingleTradeCurrency();
String nameAndCode = singleTradeCurrency != null ? singleTradeCurrency.getNameAndCode() : "null";
addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.currency"), nameAndCode);
addLimitations(true);
@ -110,8 +115,8 @@ public class AustraliaPayIDForm extends PaymentMethodForm {
@Override
public void updateAllInputsValid() {
allInputsValid.set(isAccountNameValid()
&& australiaPayIDValidator.validate(australiaPayID.getPayID()).isValid
&& inputValidator.validate(australiaPayID.getBankAccountName()).isValid
&& australiaPayID.getTradeCurrencies().size() > 0);
&& australiaPayidValidator.validate(australiaPayid.getPayid()).isValid
&& inputValidator.validate(australiaPayid.getBankAccountName()).isValid
&& australiaPayid.getTradeCurrencies().size() > 0);
}
}

27
desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java
View file

@ -21,6 +21,7 @@ import bisq.desktop.common.view.FxmlView;
import bisq.desktop.components.TitledGroupBg;
import bisq.desktop.components.paymentmethods.AdvancedCashForm;
import bisq.desktop.components.paymentmethods.AliPayForm;
import bisq.desktop.components.paymentmethods.AustraliaPayidForm;
import bisq.desktop.components.paymentmethods.CashDepositForm;
import bisq.desktop.components.paymentmethods.ChaseQuickPayForm;
import bisq.desktop.components.paymentmethods.ClearXchangeForm;
@ -29,7 +30,6 @@ import bisq.desktop.components.paymentmethods.FasterPaymentsForm;
import bisq.desktop.components.paymentmethods.HalCashForm;
import bisq.desktop.components.paymentmethods.InteracETransferForm;
import bisq.desktop.components.paymentmethods.JapanBankTransferForm;
import bisq.desktop.components.paymentmethods.AustraliaPayIDForm;
import bisq.desktop.components.paymentmethods.MoneyBeamForm;
import bisq.desktop.components.paymentmethods.MoneyGramForm;
import bisq.desktop.components.paymentmethods.NationalBankForm;
@ -55,7 +55,7 @@ import bisq.desktop.util.GUIUtil;
import bisq.desktop.util.Layout;
import bisq.desktop.util.validation.AdvancedCashValidator;
import bisq.desktop.util.validation.AliPayValidator;
import bisq.desktop.util.validation.AustraliaPayIDValidator;
import bisq.desktop.util.validation.AustraliaPayidValidator;
import bisq.desktop.util.validation.BICValidator;
import bisq.desktop.util.validation.ChaseQuickPayValidator;
import bisq.desktop.util.validation.ClearXchangeValidator;
@ -64,7 +64,6 @@ import bisq.desktop.util.validation.HalCashValidator;
import bisq.desktop.util.validation.IBANValidator;
import bisq.desktop.util.validation.InteracETransferValidator;
import bisq.desktop.util.validation.JapanBankTransferValidator;
import bisq.desktop.util.validation.AustraliaPayIDValidator;
import bisq.desktop.util.validation.MoneyBeamValidator;
import bisq.desktop.util.validation.PerfectMoneyValidator;
import bisq.desktop.util.validation.PopmoneyValidator;
@ -79,7 +78,7 @@ import bisq.desktop.util.validation.WeChatPayValidator;
import bisq.core.account.witness.AccountAgeWitnessService;
import bisq.core.locale.Res;
import bisq.core.offer.OfferRestrictions;
import bisq.core.payment.AustraliaPayID;
import bisq.core.payment.AustraliaPayid;
import bisq.core.payment.CashDepositAccount;
import bisq.core.payment.ClearXchangeAccount;
import bisq.core.payment.F2FAccount;
@ -143,7 +142,7 @@ public class FiatAccountsView extends PaymentAccountsView<GridPane, FiatAccounts
private final ChaseQuickPayValidator chaseQuickPayValidator;
private final InteracETransferValidator interacETransferValidator;
private final JapanBankTransferValidator japanBankTransferValidator;
private final AustraliaPayIDValidator australiapayidValidator;
private final AustraliaPayidValidator australiapayidValidator;
private final USPostalMoneyOrderValidator usPostalMoneyOrderValidator;
private final WeChatPayValidator weChatPayValidator;
private final HalCashValidator halCashValidator;
@ -174,7 +173,7 @@ public class FiatAccountsView extends PaymentAccountsView<GridPane, FiatAccounts
ChaseQuickPayValidator chaseQuickPayValidator,
InteracETransferValidator interacETransferValidator,
JapanBankTransferValidator japanBankTransferValidator,
AustraliaPayIDValidator australiaPayIDValidator,
AustraliaPayidValidator australiaPayIDValidator,
USPostalMoneyOrderValidator usPostalMoneyOrderValidator,
WeChatPayValidator weChatPayValidator,
HalCashValidator halCashValidator,
@ -311,13 +310,13 @@ public class FiatAccountsView extends PaymentAccountsView<GridPane, FiatAccounts
.actionButtonText(Res.get("shared.iUnderstand"))
.onAction(() -> doSaveNewAccount(paymentAccount))
.show();
} else if (paymentAccount instanceof AustraliaPayID) {
new Popup().information(Res.get("payment.payid.info", currencyName, currencyName))
.width(900)
.closeButtonText(Res.get("shared.cancel"))
.actionButtonText(Res.get("shared.iConfirm"))
.onAction(() -> doSaveNewAccount(paymentAccount))
.show();
} else if (paymentAccount instanceof AustraliaPayid) {
new Popup().information(Res.get("payment.payid.info", currencyName, currencyName))
.width(900)
.closeButtonText(Res.get("shared.cancel"))
.actionButtonText(Res.get("shared.iConfirm"))
.onAction(() -> doSaveNewAccount(paymentAccount))
.show();
} else {
doSaveNewAccount(paymentAccount);
}
@ -472,7 +471,7 @@ public class FiatAccountsView extends PaymentAccountsView<GridPane, FiatAccounts
case PaymentMethod.JAPAN_BANK_ID:
return new JapanBankTransferForm(paymentAccount, accountAgeWitnessService, japanBankTransferValidator, inputValidator, root, gridRow, formatter);
case PaymentMethod.AUSTRALIA_PAYID_ID:
return new AustraliaPayIDForm(paymentAccount, accountAgeWitnessService, australiapayidValidator, inputValidator, root, gridRow, formatter);
return new AustraliaPayidForm(paymentAccount, accountAgeWitnessService, australiapayidValidator, inputValidator, root, gridRow, formatter);
case PaymentMethod.ALI_PAY_ID:
return new AliPayForm(paymentAccount, accountAgeWitnessService, aliPayValidator, inputValidator, root, gridRow, formatter);
case PaymentMethod.WECHAT_PAY_ID:

6
desktop/src/main/java/bisq/desktop/util/validation/AustraliaPayidAccountNameValidator.java
View file

@ -19,6 +19,8 @@
package bisq.desktop.util.validation;
import bisq.core.util.validation.InputValidator;
import bisq.core.util.validation.RegexValidator;
import javax.inject.Inject;
public final class AustraliaPayidAccountNameValidator extends InputValidator {
@ -34,8 +36,8 @@ public final class AustraliaPayidAccountNameValidator extends InputValidator {
return result;
}
private LengthValidator lengthValidator;
private RegexValidator regexValidator;
private final LengthValidator lengthValidator;
private final RegexValidator regexValidator;
@Inject
public AustraliaPayidAccountNameValidator(LengthValidator lengthValidator, RegexValidator regexValidator) {

4
desktop/src/main/java/bisq/desktop/util/validation/AustraliaPayIDValidator.java → desktop/src/main/java/bisq/desktop/util/validation/AustraliaPayidValidator.java
View file

@ -19,7 +19,7 @@ package bisq.desktop.util.validation;
import bisq.core.util.validation.InputValidator;
public final class AustraliaPayIDValidator extends InputValidator {
public final class AustraliaPayidValidator extends InputValidator {
private final EmailValidator emailValidator;
@ -27,7 +27,7 @@ public final class AustraliaPayIDValidator extends InputValidator {
// Public methods
///////////////////////////////////////////////////////////////////////////////////////////
public AustraliaPayIDValidator() {
public AustraliaPayidValidator() {
emailValidator = new EmailValidator();
}

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

@ -933,7 +933,7 @@ message PaymentAccountPayload {
InstantCryptoCurrencyAccountPayload instant_crypto_currency_account_payload = 27;
JapanBankAccountPayload japan_bank_account_payload = 28;
TransferwiseAccountPayload Transferwise_account_payload = 29;
AustraliaPayIDPayload australia_payid_payload = 30;
AustraliaPayidPayload australia_payid_payload = 30;
}
map<string, string> exclude_from_json_data = 15;
}
@ -1001,7 +1001,7 @@ message JapanBankAccountPayload {
string bank_account_number = 7;
}
message AustraliaPayIDPayload {
message AustraliaPayidPayload {
string bank_account_name = 1;
string payid = 2;
}