diff --git a/src/main/java/com/hyperwallet/clientsdk/model/HyperwalletBalance.java b/src/main/java/com/hyperwallet/clientsdk/model/HyperwalletBalance.java index 5dd6900d6..cc81d7a4b 100644 --- a/src/main/java/com/hyperwallet/clientsdk/model/HyperwalletBalance.java +++ b/src/main/java/com/hyperwallet/clientsdk/model/HyperwalletBalance.java @@ -8,7 +8,7 @@ @XmlAccessorType(XmlAccessType.FIELD) public class HyperwalletBalance { private String currency; - private Double amount; + private String amount; public HyperwalletBalance() { } @@ -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; } diff --git a/src/main/java/com/hyperwallet/clientsdk/model/HyperwalletPayment.java b/src/main/java/com/hyperwallet/clientsdk/model/HyperwalletPayment.java index d2ec954bc..461244e58 100644 --- a/src/main/java/com/hyperwallet/clientsdk/model/HyperwalletPayment.java +++ b/src/main/java/com/hyperwallet/clientsdk/model/HyperwalletPayment.java @@ -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; @@ -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; diff --git a/src/main/java/com/hyperwallet/clientsdk/model/HyperwalletReceipt.java b/src/main/java/com/hyperwallet/clientsdk/model/HyperwalletReceipt.java index c9d34d121..0ec4458bf 100644 --- a/src/main/java/com/hyperwallet/clientsdk/model/HyperwalletReceipt.java +++ b/src/main/java/com/hyperwallet/clientsdk/model/HyperwalletReceipt.java @@ -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 details = new HashMap(); private List links; @@ -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; } @@ -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; } diff --git a/src/main/java/com/hyperwallet/clientsdk/model/HyperwalletTransfer.java b/src/main/java/com/hyperwallet/clientsdk/model/HyperwalletTransfer.java index 167c0b21f..4d04c971d 100644 --- a/src/main/java/com/hyperwallet/clientsdk/model/HyperwalletTransfer.java +++ b/src/main/java/com/hyperwallet/clientsdk/model/HyperwalletTransfer.java @@ -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; } @@ -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; } @@ -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; } } diff --git a/src/main/java/com/hyperwallet/clientsdk/model/HyperwalletTransferRefund.java b/src/main/java/com/hyperwallet/clientsdk/model/HyperwalletTransferRefund.java index b5d649231..5d71206ce 100644 --- a/src/main/java/com/hyperwallet/clientsdk/model/HyperwalletTransferRefund.java +++ b/src/main/java/com/hyperwallet/clientsdk/model/HyperwalletTransferRefund.java @@ -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 foreignExchanges; private Date createdOn; @@ -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; @@ -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; diff --git a/src/test/java/com/hyperwallet/clientsdk/HyperwalletIT.java b/src/test/java/com/hyperwallet/clientsdk/HyperwalletIT.java index 483018f15..8510c2558 100644 --- a/src/test/java/com/hyperwallet/clientsdk/HyperwalletIT.java +++ b/src/test/java/com/hyperwallet/clientsdk/HyperwalletIT.java @@ -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); @@ -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); @@ -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); @@ -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"))); @@ -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") @@ -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 @@ -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") @@ -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") @@ -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"))); diff --git a/src/test/java/com/hyperwallet/clientsdk/HyperwalletTest.java b/src/test/java/com/hyperwallet/clientsdk/HyperwalletTest.java index 5e4b8ec5e..a548c9847 100644 --- a/src/test/java/com/hyperwallet/clientsdk/HyperwalletTest.java +++ b/src/test/java/com/hyperwallet/clientsdk/HyperwalletTest.java @@ -3189,11 +3189,11 @@ public void testCreateTransfer_noClientTransferId() { @Test public void testCreateTransfer_successful() throws Exception { ForeignExchange foreignExchange = new ForeignExchange(); - foreignExchange.setSourceAmount(200.0); + foreignExchange.setSourceAmount("200.00"); foreignExchange.setSourceCurrency("USD"); - foreignExchange.setDestinationAmount(100.0); + foreignExchange.setDestinationAmount("100.00"); foreignExchange.setDestinationCurrency("CAD"); - foreignExchange.setRate(2.3); + foreignExchange.setRate("2.3"); HyperwalletTransfer transfer = new HyperwalletTransfer(); transfer.setSourceToken("test-source-token"); @@ -3229,22 +3229,22 @@ public void testCreateTransfer_successful() throws Exception { assertThat(apiTransfer.getCreatedOn(), is(nullValue())); assertThat(apiTransfer.getExpiresOn(), is(nullValue())); ForeignExchange foreignExchangeResponse = apiTransfer.getForeignExchanges().get(0); - assertThat(foreignExchange.getSourceAmount(), is(equalTo(200.0))); + assertThat(foreignExchange.getSourceAmount(), is(equalTo("200.00"))); assertThat(foreignExchange.getSourceCurrency(), is(equalTo("USD"))); - assertThat(foreignExchange.getDestinationAmount(), is(equalTo(100.0))); + assertThat(foreignExchange.getDestinationAmount(), is(equalTo("100.00"))); assertThat(foreignExchange.getDestinationCurrency(), is(equalTo("CAD"))); - assertThat(foreignExchange.getRate(), is(equalTo(2.3))); + assertThat(foreignExchange.getRate(), is(equalTo("2.3"))); } @Test public void testCreateTransfer_source_destionation_amounts_more_than_1k_successful() throws Exception { ForeignExchange foreignExchange = new ForeignExchange(); - foreignExchange.setSourceAmount(200.0); + foreignExchange.setSourceAmount("200.00"); foreignExchange.setSourceCurrency("USD"); - foreignExchange.setDestinationAmount(100.0); + foreignExchange.setDestinationAmount("100.00"); foreignExchange.setDestinationCurrency("CAD"); - foreignExchange.setRate(2.3); + foreignExchange.setRate("2.3"); HyperwalletTransfer transfer = new HyperwalletTransfer(); transfer.setSourceToken("test-source-token"); @@ -3286,11 +3286,11 @@ public void testCreateTransfer_source_destionation_amounts_more_than_1k_successf assertThat(apiTransfer.getSourceAmount(), is(equalTo("2,100"))); assertThat(apiTransfer.getDestinationAmount(), is(equalTo("2,100"))); ForeignExchange foreignExchangeResponse = apiTransfer.getForeignExchanges().get(0); - assertThat(foreignExchange.getSourceAmount(), is(equalTo(200.0))); + assertThat(foreignExchange.getSourceAmount(), is(equalTo("200.00"))); assertThat(foreignExchange.getSourceCurrency(), is(equalTo("USD"))); - assertThat(foreignExchange.getDestinationAmount(), is(equalTo(100.0))); + assertThat(foreignExchange.getDestinationAmount(), is(equalTo("100.00"))); assertThat(foreignExchange.getDestinationCurrency(), is(equalTo("CAD"))); - assertThat(foreignExchange.getRate(), is(equalTo(2.3))); + assertThat(foreignExchange.getRate(), is(equalTo("2.3"))); } @Test @@ -8694,16 +8694,16 @@ public void testCreateTransferRefund_noClientRefundId() { @Test public void testCreateTransferRefund_successful() throws Exception { String clientRefundId = "clientRefundId"; - double sourceAmount = 20.0; + String sourceAmount = "20.0"; String notes = "notes"; String memo = "memo"; ForeignExchange foreignExchange = new ForeignExchange(); - foreignExchange.setSourceAmount(200.0); + foreignExchange.setSourceAmount("200.00"); foreignExchange.setSourceCurrency("USD"); - foreignExchange.setDestinationAmount(100.0); + foreignExchange.setDestinationAmount("100.00"); foreignExchange.setDestinationCurrency("CAD"); - foreignExchange.setRate(2.3); + foreignExchange.setRate("2.3"); HyperwalletTransferRefund transferRefund = new HyperwalletTransferRefund(); transferRefund.setClientRefundId(clientRefundId); @@ -8738,11 +8738,11 @@ public void testCreateTransferRefund_successful() throws Exception { assertThat(apiTransfer.getStatus(), is(nullValue())); ForeignExchange foreignExchangeResponse = apiTransfer.getForeignExchanges().get(0); - assertThat(foreignExchange.getSourceAmount(), is(equalTo(200.0))); + assertThat(foreignExchange.getSourceAmount(), is(equalTo("200.00"))); assertThat(foreignExchange.getSourceCurrency(), is(equalTo("USD"))); - assertThat(foreignExchange.getDestinationAmount(), is(equalTo(100.0))); + assertThat(foreignExchange.getDestinationAmount(), is(equalTo("100.00"))); assertThat(foreignExchange.getDestinationCurrency(), is(equalTo("CAD"))); - assertThat(foreignExchange.getRate(), is(equalTo(2.3))); + assertThat(foreignExchange.getRate(), is(equalTo("2.3"))); } @Test diff --git a/src/test/java/com/hyperwallet/clientsdk/model/HyperwalletBalanceTest.java b/src/test/java/com/hyperwallet/clientsdk/model/HyperwalletBalanceTest.java index 4deb22ac0..c15c373fd 100644 --- a/src/test/java/com/hyperwallet/clientsdk/model/HyperwalletBalanceTest.java +++ b/src/test/java/com/hyperwallet/clientsdk/model/HyperwalletBalanceTest.java @@ -7,7 +7,7 @@ public class HyperwalletBalanceTest extends BaseModelTest { protected HyperwalletBalance createBaseModel() { HyperwalletBalance balance = new HyperwalletBalance(); balance - .amount(15.99) + .amount("15.99") .currency("test-currency"); return balance; } diff --git a/src/test/java/com/hyperwallet/clientsdk/model/HyperwalletPaymentTest.java b/src/test/java/com/hyperwallet/clientsdk/model/HyperwalletPaymentTest.java index eef847081..a0a452203 100644 --- a/src/test/java/com/hyperwallet/clientsdk/model/HyperwalletPaymentTest.java +++ b/src/test/java/com/hyperwallet/clientsdk/model/HyperwalletPaymentTest.java @@ -19,7 +19,7 @@ protected HyperwalletPayment createBaseModel() { .token("test-token") .reasonCode("PAYEE_ACCOUNT_LIMITATION") .createdOn(new Date()) - .amount(15.99) + .amount("15.99") .currency("test-currency") .memo("test-memo") .notes("test-note") diff --git a/src/test/java/com/hyperwallet/clientsdk/model/HyperwalletReceiptTest.java b/src/test/java/com/hyperwallet/clientsdk/model/HyperwalletReceiptTest.java index c564b7956..9e17096a4 100644 --- a/src/test/java/com/hyperwallet/clientsdk/model/HyperwalletReceiptTest.java +++ b/src/test/java/com/hyperwallet/clientsdk/model/HyperwalletReceiptTest.java @@ -54,10 +54,10 @@ public void testHyperwalletReceipt() { receipt.setEntry(HyperwalletReceipt.Entry.DEBIT); receipt.setSourceToken("test-source-token"); receipt.setDestinationToken("test-destination-token"); - receipt.setAmount(10.99); - receipt.setFee(1.99); + receipt.setAmount("10.99"); + receipt.setFee("1.99"); receipt.setCurrency("CAD"); - receipt.setForeignExchangeRate(0.99); + receipt.setForeignExchangeRate("0.99"); receipt.setForeignExchangeCurrency("USD"); receipt.setDetails(detailsMap); receipt.setLinks(links); @@ -69,10 +69,10 @@ public void testHyperwalletReceipt() { assertThat(receipt.getEntry(), is(equalTo(HyperwalletReceipt.Entry.DEBIT))); assertThat(receipt.getSourceToken(), is(equalTo("test-source-token"))); assertThat(receipt.getDestinationToken(), is(equalTo("test-destination-token"))); - assertThat(receipt.getAmount(), is(equalTo(10.99))); - assertThat(receipt.getFee(), is(equalTo(1.99))); + assertThat(receipt.getAmount(), is(equalTo("10.99"))); + assertThat(receipt.getFee(), is(equalTo("1.99"))); assertThat(receipt.getCurrency(), is(equalTo("CAD"))); - assertThat(receipt.getForeignExchangeRate(), is(equalTo(0.99))); + assertThat(receipt.getForeignExchangeRate(), is(equalTo("0.99"))); assertThat(receipt.getForeignExchangeCurrency(), is(equalTo("USD"))); assertThat(receipt.getDetails(), is(equalTo(detailsMap))); assertThat(receipt.getLinks().get(0).getHref(), is(equalTo(link.getHref()))); diff --git a/src/test/java/com/hyperwallet/clientsdk/model/HyperwalletTransferRefundTest.java b/src/test/java/com/hyperwallet/clientsdk/model/HyperwalletTransferRefundTest.java index 9b7de9242..3ae3e126e 100644 --- a/src/test/java/com/hyperwallet/clientsdk/model/HyperwalletTransferRefundTest.java +++ b/src/test/java/com/hyperwallet/clientsdk/model/HyperwalletTransferRefundTest.java @@ -16,20 +16,20 @@ protected HyperwalletTransferRefund createBaseModel() { HyperwalletLink hyperwalletLink = new HyperwalletLink(); hyperwalletLinkList.add(hyperwalletLink); ForeignExchange foreignExchange = new ForeignExchange(); - foreignExchange.setSourceAmount(200.0); + foreignExchange.setSourceAmount("200.00"); foreignExchange.setSourceCurrency("USD"); - foreignExchange.setDestinationAmount(100.0); + foreignExchange.setDestinationAmount("100.00"); foreignExchange.setDestinationCurrency("CAD"); - foreignExchange.setRate(2.3); + foreignExchange.setRate("2.3"); HyperwalletTransferRefund transferRefund = new HyperwalletTransferRefund() .token("token") .status(Status.COMPLETED) .clientRefundId("clientRefundId") .sourceToken("sourceToken") - .sourceAmount(20.00) + .sourceAmount("20.00") .sourceCurrency("USD") .destinationToken("destinationToken") - .destinationAmount(20.00) + .destinationAmount("20.00") .destinationCurrency("USD") .createdOn(new Date()) .notes("notes") diff --git a/src/test/java/com/hyperwallet/clientsdk/model/HyperwalletTransferTest.java b/src/test/java/com/hyperwallet/clientsdk/model/HyperwalletTransferTest.java index 528c83a54..cf60b6f68 100644 --- a/src/test/java/com/hyperwallet/clientsdk/model/HyperwalletTransferTest.java +++ b/src/test/java/com/hyperwallet/clientsdk/model/HyperwalletTransferTest.java @@ -9,11 +9,11 @@ public class HyperwalletTransferTest extends BaseModelTest protected HyperwalletTransfer createBaseModel() { HyperwalletTransfer transfer = new HyperwalletTransfer(); HyperwalletTransfer.ForeignExchange foreignExchange = new HyperwalletTransfer.ForeignExchange(); - foreignExchange.setSourceAmount(200.0); + foreignExchange.setSourceAmount("200.00"); foreignExchange.setSourceCurrency("USD"); - foreignExchange.setDestinationAmount(100.0); + foreignExchange.setDestinationAmount("100.00"); foreignExchange.setDestinationCurrency("USD"); - foreignExchange.setRate(2.3); + foreignExchange.setRate("2.3"); List hyperwalletLinkList = new ArrayList<>(); HyperwalletLink hyperwalletLink = new HyperwalletLink(); hyperwalletLinkList.add(hyperwalletLink); diff --git a/src/test/java/com/hyperwallet/clientsdk/util/HyperwalletApiClientTest.java b/src/test/java/com/hyperwallet/clientsdk/util/HyperwalletApiClientTest.java index ae99d99a6..6cc1a199e 100644 --- a/src/test/java/com/hyperwallet/clientsdk/util/HyperwalletApiClientTest.java +++ b/src/test/java/com/hyperwallet/clientsdk/util/HyperwalletApiClientTest.java @@ -1503,11 +1503,11 @@ public void testInvalidJsonResponse() throws Exception { " {\n" + " \"token\" : \"pmt-81aad61a-03ff-4995-a2fc-6a6e2d8911af\",\n" + " \"createdOn\" : \"2016-11-11T21:57:40\",\n" + - " \"amount\" : \"1,707.58\",\n" + + " \"amount\" : \"1707.58\",\n" + " \"currency\" : \"GBP\",\n" + " \"clientPaymentId\" : \"8729\",\n" + " \"memo\" : \"Advance Payment for Oct 2016\",\n" + - " \"purpose\" : \"OTHER\",\n" + + " \"purpose\" : \"OTHER\"\n" + " \"expiresOn\" : \"2017-05-10\",\n" + " \"destinationToken\" : \"usr-332b1efe-3486-407f-b72b-f74f36723e6d\",\n" + " \"programToken\" : \"prg-11f244b9-7ce4-4d8f-a367-614617529b11\",\n" +