Skip to content
This repository is currently being migrated. It's locked while the migration is in progress.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
@XmlAccessorType(XmlAccessType.FIELD)
public class HyperwalletBalance {
private String currency;
private Double amount;
private String amount;

public HyperwalletBalance() {
}
Expand All @@ -26,15 +26,15 @@ public HyperwalletBalance currency(String currency) {
return this;
}

public Double getAmount() {
public String getAmount() {
return amount;
}

public void setAmount(Double amount) {
public void setAmount(String amount) {
this.amount = amount;
}

public HyperwalletBalance amount(Double amount) {
public HyperwalletBalance amount(String amount) {
this.amount = amount;
return this;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class HyperwalletPayment extends HyperwalletBaseMonitor {
private String status;
private String reasonCode;
private Date createdOn;
private Double amount;
private String amount;
private String currency;
private String notes;
private String memo;
Expand Down Expand Up @@ -136,16 +136,16 @@ public HyperwalletPayment clearCreatedOn() {
return this;
}

public Double getAmount() {
public String getAmount() {
return amount;
}

public void setAmount(Double amount) {
public void setAmount(String amount) {
addField("amount", amount);
this.amount = amount;
}

public HyperwalletPayment amount(Double amount) {
public HyperwalletPayment amount(String amount) {
addField("amount", amount);
this.amount = amount;
return this;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -211,10 +211,10 @@ public String key() {
private Entry entry;
private String sourceToken;
private String destinationToken;
private Double amount;
private Double fee;
private String amount;
private String fee;
private String currency;
private Double foreignExchangeRate;
private String foreignExchangeRate;
private String foreignExchangeCurrency;
private Map<String, String> details = new HashMap<String, String>();
private List<HyperwalletLink> links;
Expand Down Expand Up @@ -275,19 +275,19 @@ public void setDestinationToken(String destinationToken) {
this.destinationToken = destinationToken;
}

public Double getAmount() {
public String getAmount() {
return amount;
}

public void setAmount(Double amount) {
public void setAmount(String amount) {
this.amount = amount;
}

public Double getFee() {
public String getFee() {
return fee;
}

public void setFee(Double fee) {
public void setFee(String fee) {
this.fee = fee;
}

Expand All @@ -299,11 +299,11 @@ public void setCurrency(String currency) {
this.currency = currency;
}

public Double getForeignExchangeRate() {
public String getForeignExchangeRate() {
return foreignExchangeRate;
}

public void setForeignExchangeRate(Double foreignExchangeRate) {
public void setForeignExchangeRate(String foreignExchangeRate) {
this.foreignExchangeRate = foreignExchangeRate;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -393,17 +393,17 @@ public HyperwalletTransfer clearLinks() {

public static class ForeignExchange {

private Double sourceAmount;
private String sourceAmount;
private String sourceCurrency;
private Double destinationAmount;
private String destinationAmount;
private String destinationCurrency;
private Double rate;
private String rate;

public Double getSourceAmount() {
public String getSourceAmount() {
return sourceAmount;
}

public void setSourceAmount(Double sourceAmount) {
public void setSourceAmount(String sourceAmount) {
this.sourceAmount = sourceAmount;
}

Expand All @@ -415,11 +415,11 @@ public void setSourceCurrency(String sourceCurrency) {
this.sourceCurrency = sourceCurrency;
}

public Double getDestinationAmount() {
public String getDestinationAmount() {
return destinationAmount;
}

public void setDestinationAmount(Double destinationAmount) {
public void setDestinationAmount(String destinationAmount) {
this.destinationAmount = destinationAmount;
}

Expand All @@ -431,11 +431,11 @@ public void setDestinationCurrency(String destinationCurrency) {
this.destinationCurrency = destinationCurrency;
}

public Double getRate() {
public String getRate() {
return rate;
}

public void setRate(Double rate) {
public void setRate(String rate) {
this.rate = rate;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ public static enum Status {PENDING, FAILED, COMPLETED}
private Status status;
private String clientRefundId;
private String sourceToken;
private Double sourceAmount;
private String sourceAmount;
private String sourceCurrency;
private String destinationToken;
private Double destinationAmount;
private String destinationAmount;
private String destinationCurrency;
private List<ForeignExchange> foreignExchanges;
private Date createdOn;
Expand Down Expand Up @@ -116,16 +116,16 @@ public HyperwalletTransferRefund clearSourceToken() {
return this;
}

public Double getSourceAmount() {
public String getSourceAmount() {
return sourceAmount;
}

public void setSourceAmount(Double sourceAmount) {
public void setSourceAmount(String sourceAmount) {
addField("sourceAmount", sourceAmount);
this.sourceAmount = sourceAmount;
}

public HyperwalletTransferRefund sourceAmount(Double sourceAmount) {
public HyperwalletTransferRefund sourceAmount(String sourceAmount) {
addField("sourceAmount", sourceAmount);
this.sourceAmount = sourceAmount;
return this;
Expand Down Expand Up @@ -179,16 +179,16 @@ public HyperwalletTransferRefund clearDestinationToken() {
return this;
}

public Double getDestinationAmount() {
public String getDestinationAmount() {
return destinationAmount;
}

public void setDestinationAmount(Double destinationAmount) {
public void setDestinationAmount(String destinationAmount) {
addField("destinationAmount", destinationAmount);
this.destinationAmount = destinationAmount;
}

public HyperwalletTransferRefund destinationAmount(Double destinationAmount) {
public HyperwalletTransferRefund destinationAmount(String destinationAmount) {
addField("destinationAmount", destinationAmount);
this.destinationAmount = destinationAmount;
return this;
Expand Down
46 changes: 23 additions & 23 deletions src/test/java/com/hyperwallet/clientsdk/HyperwalletIT.java
Original file line number Diff line number Diff line change
Expand Up @@ -1216,11 +1216,11 @@ public void testCreateTransfer() throws Exception {
assertThat(returnValue.getExpiresOn(), is(equalTo(dateFormat.parse("2017-10-31T22:32:57 UTC"))));

ForeignExchange foreignExchange = returnValue.getForeignExchanges().get(0);
assertThat(foreignExchange.getSourceAmount(), is(equalTo(100.00)));
assertThat(foreignExchange.getSourceAmount(), is(equalTo("100.00")));
assertThat(foreignExchange.getSourceCurrency(), is(equalTo("USD")));
assertThat(foreignExchange.getDestinationAmount(), is(equalTo(63.49)));
assertThat(foreignExchange.getDestinationAmount(), is(equalTo("63.49")));
assertThat(foreignExchange.getDestinationCurrency(), is(equalTo("CAD")));
assertThat(foreignExchange.getRate(), is(equalTo(0.79)));
assertThat(foreignExchange.getRate(), is(equalTo("0.79")));

HyperwalletLink actualHyperwalletLink = returnValue.getLinks().get(0);
HyperwalletLink expectedHyperwalletLink = hyperwalletLinks.get(0);
Expand Down Expand Up @@ -1317,11 +1317,11 @@ public void testGetTransfer() throws Exception {
assertThat(returnValue.getExpiresOn(), is(equalTo(dateFormat.parse("2017-10-31T22:32:57 UTC"))));

ForeignExchange foreignExchange = returnValue.getForeignExchanges().get(0);
assertThat(foreignExchange.getSourceAmount(), is(equalTo(100.00)));
assertThat(foreignExchange.getSourceAmount(), is(equalTo("100.00")));
assertThat(foreignExchange.getSourceCurrency(), is(equalTo("USD")));
assertThat(foreignExchange.getDestinationAmount(), is(equalTo(63.49)));
assertThat(foreignExchange.getDestinationAmount(), is(equalTo("63.49")));
assertThat(foreignExchange.getDestinationCurrency(), is(equalTo("CAD")));
assertThat(foreignExchange.getRate(), is(equalTo(0.79)));
assertThat(foreignExchange.getRate(), is(equalTo("0.79")));

HyperwalletLink actualHyperwalletLink = returnValue.getLinks().get(0);
HyperwalletLink expectedHyperwalletLink = hyperwalletLinks.get(0);
Expand Down Expand Up @@ -1417,11 +1417,11 @@ public void testListTransfer() throws Exception {
assertThat(hyperwalletTransfer.getExpiresOn(), is(equalTo(dateFormat.parse("2017-10-31T22:32:57 UTC"))));

ForeignExchange foreignExchange = hyperwalletTransfer.getForeignExchanges().get(0);
assertThat(foreignExchange.getSourceAmount(), is(equalTo(100.00)));
assertThat(foreignExchange.getSourceAmount(), is(equalTo("100.00")));
assertThat(foreignExchange.getSourceCurrency(), is(equalTo("USD")));
assertThat(foreignExchange.getDestinationAmount(), is(equalTo(63.49)));
assertThat(foreignExchange.getDestinationAmount(), is(equalTo("63.49")));
assertThat(foreignExchange.getDestinationCurrency(), is(equalTo("CAD")));
assertThat(foreignExchange.getRate(), is(equalTo(0.79)));
assertThat(foreignExchange.getRate(), is(equalTo("0.79")));

HyperwalletLink actualHyperwalletLink = returnValue.getLinks().get(0);
HyperwalletLink expectedHyperwalletLink = hyperwalletLinks.get(0);
Expand Down Expand Up @@ -1460,12 +1460,12 @@ public void testListTransferWithoutForeignExchange() throws Exception {
assertThat(hyperwalletTransfer.getCreatedOn(), is(equalTo(dateFormat.parse("2017-10-31T22:32:57 UTC"))));
assertThat(hyperwalletTransfer.getClientTransferId(), is(equalTo("clientTransferId")));
assertThat(hyperwalletTransfer.getSourceToken(), is(equalTo("usr-c4292f1a-866f-4310-a289-b916853939de")));
assertThat(hyperwalletTransfer.getSourceAmount(), is(equalTo(String.valueOf(2200.4))));
assertThat(hyperwalletTransfer.getSourceFeeAmount(), is(equalTo(String.valueOf(20.3))));
assertThat(hyperwalletTransfer.getSourceAmount(), is(equalTo(String.valueOf("2200.4"))));
assertThat(hyperwalletTransfer.getSourceFeeAmount(), is(equalTo(String.valueOf("20.3"))));
assertThat(hyperwalletTransfer.getSourceCurrency(), is(equalTo("USD")));
assertThat(hyperwalletTransfer.getDestinationToken(), is(equalTo("usr-c4292f1a-866f-4310-a289-b916853939de")));
assertThat(hyperwalletTransfer.getDestinationAmount(), is(equalTo(String.valueOf(100.2))));
assertThat(hyperwalletTransfer.getDestinationFeeAmount(), is(equalTo(String.valueOf(30.5))));
assertThat(hyperwalletTransfer.getDestinationAmount(), is(equalTo(String.valueOf("100.2"))));
assertThat(hyperwalletTransfer.getDestinationFeeAmount(), is(equalTo(String.valueOf("30.5"))));
assertThat(hyperwalletTransfer.getDestinationCurrency(), is(equalTo("USD")));
assertThat(hyperwalletTransfer.getNotes(), is(equalTo("notes")));
assertThat(hyperwalletTransfer.getMemo(), is(equalTo("memo")));
Expand Down Expand Up @@ -1554,10 +1554,10 @@ public void testCreateTransferRefund() throws Exception {
.status(HyperwalletTransferRefund.Status.COMPLETED)
.clientRefundId("clientRefundId")
.sourceToken("act-ba4e8fdd-614b-11e5-af23-0faa28ca7c0f")
.sourceAmount(20.0)
.sourceAmount("20.00")
.sourceCurrency("USD")
.destinationToken("usr-3deb34a0-ffd1-487d-8860-6d69435cea6c")
.destinationAmount(20.0)
.destinationAmount("20.00")
.destinationCurrency("USD")
.notes("Merchant Payment return to Wallet Balance")
.memo("TransferReturn123456")
Expand Down Expand Up @@ -1591,11 +1591,11 @@ private void checkTransferRefund(HyperwalletTransferRefund actual, HyperwalletTr

private void checkForeignExchange(HyperwalletTransferRefund actual, HyperwalletTransferRefund expected) {
ForeignExchange foreignExchange = actual.getForeignExchanges().get(0);
assertThat(foreignExchange.getSourceAmount(), is(equalTo(100.00)));
assertThat(foreignExchange.getSourceAmount(), is(equalTo("100.00")));
assertThat(foreignExchange.getSourceCurrency(), is(equalTo("USD")));
assertThat(foreignExchange.getDestinationAmount(), is(equalTo(63.49)));
assertThat(foreignExchange.getDestinationAmount(), is(equalTo("63.49")));
assertThat(foreignExchange.getDestinationCurrency(), is(equalTo("CAD")));
assertThat(foreignExchange.getRate(), is(equalTo(0.79)));
assertThat(foreignExchange.getRate(), is(equalTo("0.79")));
}

@Test
Expand Down Expand Up @@ -1626,10 +1626,10 @@ public void testGetTransferRefund() throws Exception {
.status(HyperwalletTransferRefund.Status.COMPLETED)
.clientRefundId("1573548663")
.sourceToken("act-ba4e8fdd-614b-11e5-af23-0faa28ca7c0f")
.sourceAmount(50.0)
.sourceAmount("50.00")
.sourceCurrency("USD")
.destinationToken("usr-3deb34a0-ffd1-487d-8860-6d69435cea6c")
.destinationAmount(50.0)
.destinationAmount("50.00")
.destinationCurrency("USD")
.notes("Merchant Payment return to Wallet Balance")
.memo("TransferReturn123456")
Expand Down Expand Up @@ -1666,10 +1666,10 @@ public void testListTransferRefunds() throws Exception {
.status(HyperwalletTransferRefund.Status.COMPLETED)
.clientRefundId("1573566270")
.sourceToken("act-ba4e8fdd-614b-11e5-af23-0faa28ca7c0f")
.sourceAmount(50.0)
.sourceAmount("50.00")
.sourceCurrency("USD")
.destinationToken("usr-3deb34a0-ffd1-487d-8860-6d69435cea6c")
.destinationAmount(50.0)
.destinationAmount("50.00")
.destinationCurrency("USD")
.notes("Merchant Payment return to Wallet Balance")
.memo("TransferReturn123456")
Expand Down Expand Up @@ -2350,7 +2350,7 @@ public void testListPayments() throws Exception {
assertThat(returnValue.getData().get(0).getToken(), is(equalTo("pmt-3ffb5fcc-1c98-48ce-9a6c-e4759933a037")));
assertThat(returnValue.getData().get(0).getStatus(), is(equalTo("SCHEDULED")));
assertThat(returnValue.getData().get(0).getCreatedOn(), is(equalTo(dateFormat.parse("2017-10-06T15:03:13 UTC"))));
assertThat(returnValue.getData().get(0).getAmount(), is(equalTo(50.00)));
assertThat(returnValue.getData().get(0).getAmount(), is(equalTo("50.00")));
assertThat(returnValue.getData().get(0).getCurrency(), is(equalTo("USD")));
assertThat(returnValue.getData().get(0).getClientPaymentId(), is(equalTo("gv47LDuf")));
assertThat(returnValue.getData().get(0).getPurpose(), is(equalTo("OTHER")));
Expand Down
Loading