diff --git a/CHANGELOG.md b/CHANGELOG.md index 06994d595..39a2db33b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ Changelog ========= +1.9.7 +------------------- +- Deprecate Double to String +------------------- 1.9.6 ------------------- - Added support to CREDIT, PREPAID, FIS, UNKNOWN bank card types. diff --git a/pom.xml b/pom.xml index cd3cef328..b937a42bb 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.hyperwallet sdk - 1.9.7-SNAPSHOT + 1.9.7 jar hyperwallet-java-sdk diff --git a/src/main/java/com/hyperwallet/clientsdk/model/HyperwalletPayment.java b/src/main/java/com/hyperwallet/clientsdk/model/HyperwalletPayment.java index 96a59ef73..2d9a2fc4f 100644 --- a/src/main/java/com/hyperwallet/clientsdk/model/HyperwalletPayment.java +++ b/src/main/java/com/hyperwallet/clientsdk/model/HyperwalletPayment.java @@ -17,7 +17,7 @@ public class HyperwalletPayment extends HyperwalletBaseMonitor { private String status; private String transition; private Date createdOn; - private Double amount; + private String amount; private String currency; private String notes; private String memo; @@ -134,16 +134,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 022327c69..80ec1d893 100644 --- a/src/main/java/com/hyperwallet/clientsdk/model/HyperwalletReceipt.java +++ b/src/main/java/com/hyperwallet/clientsdk/model/HyperwalletReceipt.java @@ -212,13 +212,13 @@ public String key() { private String destinationToken; - private Double amount; + private String amount; - private Double fee; + private String fee; private String currency; - private Double foreignExchangeRate; + private String foreignExchangeRate; private String foreignExchangeCurrency; @@ -272,19 +272,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; } @@ -296,11 +296,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 f133fdd73..0b478c74a 100644 --- a/src/main/java/com/hyperwallet/clientsdk/model/HyperwalletTransfer.java +++ b/src/main/java/com/hyperwallet/clientsdk/model/HyperwalletTransfer.java @@ -22,12 +22,12 @@ public static enum Status {QUOTED, SCHEDULED, IN_PROGRESS, VERIFICATION_REQUIRED private Date createdOn; private String clientTransferId; private String sourceToken; - private Double sourceAmount; - private Double sourceFeeAmount; + private String sourceAmount; + private String sourceFeeAmount; private String sourceCurrency; private String destinationToken; - private Double destinationAmount; - private Double destinationFeeAmount; + private String destinationAmount; + private String destinationFeeAmount; private String destinationCurrency; private List foreignExchanges; private String notes; @@ -139,16 +139,16 @@ public HyperwalletTransfer 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 HyperwalletTransfer sourceAmount(Double sourceAmount) { + public HyperwalletTransfer sourceAmount(String sourceAmount) { addField("sourceAmount", sourceAmount); this.sourceAmount = sourceAmount; return this; @@ -160,16 +160,16 @@ public HyperwalletTransfer clearSourceAmount() { return this; } - public Double getSourceFeeAmount() { + public String getSourceFeeAmount() { return sourceFeeAmount; } - public void setSourceFeeAmount(Double sourceFeeAmount) { + public void setSourceFeeAmount(String sourceFeeAmount) { addField("sourceFeeAmount", sourceFeeAmount); this.sourceFeeAmount = sourceFeeAmount; } - public HyperwalletTransfer sourceFeeAmount(Double sourceFeeAmount) { + public HyperwalletTransfer sourceFeeAmount(String sourceFeeAmount) { addField("sourceFeeAmount", sourceFeeAmount); this.sourceFeeAmount = sourceFeeAmount; return this; @@ -223,16 +223,16 @@ public HyperwalletTransfer 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 HyperwalletTransfer destinationAmount(Double destinationAmount) { + public HyperwalletTransfer destinationAmount(String destinationAmount) { addField("destinationAmount", destinationAmount); this.destinationAmount = destinationAmount; return this; @@ -244,16 +244,16 @@ public HyperwalletTransfer clearDestinationAmount() { return this; } - public Double getDestinationFeeAmount() { + public String getDestinationFeeAmount() { return destinationFeeAmount; } - public void setDestinationFeeAmount(Double destinationFeeAmount) { + public void setDestinationFeeAmount(String destinationFeeAmount) { addField("destinationFeeAmount", destinationFeeAmount); this.destinationFeeAmount = destinationFeeAmount; } - public HyperwalletTransfer destinationFeeAmount(Double destinationFeeAmount) { + public HyperwalletTransfer destinationFeeAmount(String destinationFeeAmount) { addField("destinationFeeAmount", destinationFeeAmount); this.destinationFeeAmount = destinationFeeAmount; return this; @@ -371,17 +371,17 @@ public HyperwalletTransfer clearForeignExchanges() { } 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; } @@ -393,11 +393,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; } @@ -409,11 +409,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 ba5521744..7a886e13c 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; @@ -115,16 +115,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; @@ -178,16 +178,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 b5ea35a27..15f55aae2 100644 --- a/src/test/java/com/hyperwallet/clientsdk/HyperwalletIT.java +++ b/src/test/java/com/hyperwallet/clientsdk/HyperwalletIT.java @@ -842,21 +842,21 @@ public void testCreateTransfer() throws Exception { assertThat(returnValue.getCreatedOn(), is(equalTo(dateFormat.parse("2017-10-31T22:32:57 UTC")))); assertThat(returnValue.getClientTransferId(), is(equalTo("clientTransferId"))); assertThat(returnValue.getSourceToken(), is(equalTo("usr-c4292f1a-866f-4310-a289-b916853939de"))); - assertThat(returnValue.getSourceAmount(), is(equalTo(200.4))); - assertThat(returnValue.getSourceFeeAmount(), is(equalTo(20.3))); + assertThat(returnValue.getSourceAmount(), is(equalTo("200.4"))); + assertThat(returnValue.getSourceFeeAmount(), is(equalTo("20.3"))); assertThat(returnValue.getSourceCurrency(), is(equalTo("USD"))); assertThat(returnValue.getDestinationToken(), is(equalTo("usr-c4292f1a-866f-4310-a289-b916853939de"))); - assertThat(returnValue.getDestinationAmount(), is(equalTo(100.2))); - assertThat(returnValue.getDestinationFeeAmount(), is(equalTo(30.5))); + assertThat(returnValue.getDestinationAmount(), is(equalTo("100.2"))); + assertThat(returnValue.getDestinationFeeAmount(), is(equalTo("30.5"))); assertThat(returnValue.getDestinationCurrency(), is(equalTo("USD"))); assertThat(returnValue.getNotes(), is(equalTo("notes"))); assertThat(returnValue.getMemo(), is(equalTo("memo"))); assertThat(returnValue.getExpiresOn(), is(equalTo(dateFormat.parse("2017-10-31T22:32:57 UTC")))); - assertThat(returnValue.getForeignExchanges().get(0).getSourceAmount(), is(equalTo(100.00))); + assertThat(returnValue.getForeignExchanges().get(0).getSourceAmount(), is(equalTo("100.00"))); assertThat(returnValue.getForeignExchanges().get(0).getSourceCurrency(), is(equalTo("USD"))); - assertThat(returnValue.getForeignExchanges().get(0).getDestinationAmount(), is(equalTo(63.49))); + assertThat(returnValue.getForeignExchanges().get(0).getDestinationAmount(), is(equalTo("63.49"))); assertThat(returnValue.getForeignExchanges().get(0).getDestinationCurrency(), is(equalTo("USD"))); - assertThat(returnValue.getForeignExchanges().get(0).getRate(), is(equalTo(0.79))); + assertThat(returnValue.getForeignExchanges().get(0).getRate(), is(equalTo("0.79"))); } @Test @@ -877,21 +877,21 @@ public void testGetTransfer() throws Exception { assertThat(returnValue.getCreatedOn(), is(equalTo(dateFormat.parse("2017-10-31T22:32:57 UTC")))); assertThat(returnValue.getClientTransferId(), is(equalTo("clientTransferId"))); assertThat(returnValue.getSourceToken(), is(equalTo("usr-c4292f1a-866f-4310-a289-b916853939de"))); - assertThat(returnValue.getSourceAmount(), is(equalTo(200.4))); - assertThat(returnValue.getSourceFeeAmount(), is(equalTo(20.3))); + assertThat(returnValue.getSourceAmount(), is(equalTo("200.4"))); + assertThat(returnValue.getSourceFeeAmount(), is(equalTo("20.3"))); assertThat(returnValue.getSourceCurrency(), is(equalTo("USD"))); assertThat(returnValue.getDestinationToken(), is(equalTo("usr-c4292f1a-866f-4310-a289-b916853939de"))); - assertThat(returnValue.getDestinationAmount(), is(equalTo(100.2))); - assertThat(returnValue.getDestinationFeeAmount(), is(equalTo(30.5))); + assertThat(returnValue.getDestinationAmount(), is(equalTo("100.2"))); + assertThat(returnValue.getDestinationFeeAmount(), is(equalTo("30.5"))); assertThat(returnValue.getDestinationCurrency(), is(equalTo("USD"))); assertThat(returnValue.getNotes(), is(equalTo("notes"))); assertThat(returnValue.getMemo(), is(equalTo("memo"))); assertThat(returnValue.getExpiresOn(), is(equalTo(dateFormat.parse("2017-10-31T22:32:57 UTC")))); - assertThat(returnValue.getForeignExchanges().get(0).getSourceAmount(), is(equalTo(100.00))); + assertThat(returnValue.getForeignExchanges().get(0).getSourceAmount(), is(equalTo("100.00"))); assertThat(returnValue.getForeignExchanges().get(0).getSourceCurrency(), is(equalTo("USD"))); - assertThat(returnValue.getForeignExchanges().get(0).getDestinationAmount(), is(equalTo(63.49))); + assertThat(returnValue.getForeignExchanges().get(0).getDestinationAmount(), is(equalTo("63.49"))); assertThat(returnValue.getForeignExchanges().get(0).getDestinationCurrency(), is(equalTo("USD"))); - assertThat(returnValue.getForeignExchanges().get(0).getRate(), is(equalTo(0.79))); + assertThat(returnValue.getForeignExchanges().get(0).getRate(), is(equalTo("0.79"))); } @Test @@ -913,21 +913,21 @@ public void testListTransfer() throws Exception { assertThat(returnValue.getData().get(0).getCreatedOn(), is(equalTo(dateFormat.parse("2017-10-31T22:32:57 UTC")))); assertThat(returnValue.getData().get(0).getClientTransferId(), is(equalTo("clientTransferId"))); assertThat(returnValue.getData().get(0).getSourceToken(), is(equalTo("usr-c4292f1a-866f-4310-a289-b916853939de"))); - assertThat(returnValue.getData().get(0).getSourceAmount(), is(equalTo(200.4))); - assertThat(returnValue.getData().get(0).getSourceFeeAmount(), is(equalTo(20.3))); + assertThat(returnValue.getData().get(0).getSourceAmount(), is(equalTo("200.4"))); + assertThat(returnValue.getData().get(0).getSourceFeeAmount(), is(equalTo("20.3"))); assertThat(returnValue.getData().get(0).getSourceCurrency(), is(equalTo("USD"))); assertThat(returnValue.getData().get(0).getDestinationToken(), is(equalTo("usr-c4292f1a-866f-4310-a289-b916853939de"))); - assertThat(returnValue.getData().get(0).getDestinationAmount(), is(equalTo(100.2))); - assertThat(returnValue.getData().get(0).getDestinationFeeAmount(), is(equalTo(30.5))); + assertThat(returnValue.getData().get(0).getDestinationAmount(), is(equalTo("100.2"))); + assertThat(returnValue.getData().get(0).getDestinationFeeAmount(), is(equalTo("30.5"))); assertThat(returnValue.getData().get(0).getDestinationCurrency(), is(equalTo("USD"))); assertThat(returnValue.getData().get(0).getNotes(), is(equalTo("notes"))); assertThat(returnValue.getData().get(0).getMemo(), is(equalTo("memo"))); assertThat(returnValue.getData().get(0).getExpiresOn(), is(equalTo(dateFormat.parse("2017-10-31T22:32:57 UTC")))); - assertThat(returnValue.getData().get(0).getForeignExchanges().get(0).getSourceAmount(), is(equalTo(100.00))); + assertThat(returnValue.getData().get(0).getForeignExchanges().get(0).getSourceAmount(), is(equalTo("100.00"))); assertThat(returnValue.getData().get(0).getForeignExchanges().get(0).getSourceCurrency(), is(equalTo("USD"))); - assertThat(returnValue.getData().get(0).getForeignExchanges().get(0).getDestinationAmount(), is(equalTo(63.49))); + assertThat(returnValue.getData().get(0).getForeignExchanges().get(0).getDestinationAmount(), is(equalTo("63.49"))); assertThat(returnValue.getData().get(0).getForeignExchanges().get(0).getDestinationCurrency(), is(equalTo("USD"))); - assertThat(returnValue.getData().get(0).getForeignExchanges().get(0).getRate(), is(equalTo(0.79))); + assertThat(returnValue.getData().get(0).getForeignExchanges().get(0).getRate(), is(equalTo("0.79"))); } // @@ -1413,7 +1413,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"))); @@ -1632,10 +1632,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") @@ -1662,11 +1662,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 @@ -1686,10 +1686,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") @@ -1717,10 +1717,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") diff --git a/src/test/java/com/hyperwallet/clientsdk/HyperwalletTest.java b/src/test/java/com/hyperwallet/clientsdk/HyperwalletTest.java index 8b6a71a51..148038682 100644 --- a/src/test/java/com/hyperwallet/clientsdk/HyperwalletTest.java +++ b/src/test/java/com/hyperwallet/clientsdk/HyperwalletTest.java @@ -7510,16 +7510,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.0"); foreignExchange.setSourceCurrency("USD"); - foreignExchange.setDestinationAmount(100.0); + foreignExchange.setDestinationAmount("100.0"); foreignExchange.setDestinationCurrency("CAD"); - foreignExchange.setRate(2.3); + foreignExchange.setRate("2.3"); HyperwalletTransferRefund transferRefund = new HyperwalletTransferRefund(); transferRefund.setClientRefundId(clientRefundId); @@ -7552,11 +7552,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.0"))); assertThat(foreignExchange.getSourceCurrency(), is(equalTo("USD"))); - assertThat(foreignExchange.getDestinationAmount(), is(equalTo(100.0))); + assertThat(foreignExchange.getDestinationAmount(), is(equalTo("100.0"))); 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/HyperwalletPaymentTest.java b/src/test/java/com/hyperwallet/clientsdk/model/HyperwalletPaymentTest.java index f78532403..e9bd9692f 100644 --- a/src/test/java/com/hyperwallet/clientsdk/model/HyperwalletPaymentTest.java +++ b/src/test/java/com/hyperwallet/clientsdk/model/HyperwalletPaymentTest.java @@ -13,7 +13,7 @@ protected HyperwalletPayment createBaseModel() { .transition("LOCKED") .token("test-token") .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 36a9a6639..9cc898512 100644 --- a/src/test/java/com/hyperwallet/clientsdk/model/HyperwalletReceiptTest.java +++ b/src/test/java/com/hyperwallet/clientsdk/model/HyperwalletReceiptTest.java @@ -42,10 +42,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); @@ -55,10 +55,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))); } diff --git a/src/test/java/com/hyperwallet/clientsdk/model/HyperwalletTransferRefundTest.java b/src/test/java/com/hyperwallet/clientsdk/model/HyperwalletTransferRefundTest.java index a579a01f4..9083f2448 100644 --- a/src/test/java/com/hyperwallet/clientsdk/model/HyperwalletTransferRefundTest.java +++ b/src/test/java/com/hyperwallet/clientsdk/model/HyperwalletTransferRefundTest.java @@ -12,20 +12,20 @@ public class HyperwalletTransferRefundTest extends BaseModelTest protected HyperwalletTransfer createBaseModel() { HyperwalletTransfer transfer = new HyperwalletTransfer(); HyperwalletTransfer.ForeignExchange foreignExchange = new HyperwalletTransfer.ForeignExchange(); - foreignExchange.setSourceAmount(200.0); + foreignExchange.setSourceAmount("200.0"); foreignExchange.setSourceCurrency("USD"); - foreignExchange.setDestinationAmount(100.0); + foreignExchange.setDestinationAmount("100.0"); foreignExchange.setDestinationCurrency("USD"); - foreignExchange.setRate(2.3); + foreignExchange.setRate("2.3"); transfer .token("test-token") .status(HyperwalletTransfer.Status.QUOTED) .createdOn(new Date()) .clientTransferId("client-transfer-id") .sourceToken("source-token") - .sourceAmount(200.0) - .sourceFeeAmount(1.4) + .sourceAmount("200.0") + .sourceFeeAmount("1.4") .sourceCurrency("source-currency") .destinationToken("destination-token") - .destinationAmount(100.0) - .destinationFeeAmount(2.3) + .destinationAmount("100.0") + .destinationFeeAmount("2.3") .destinationCurrency("USD") .notes("notes") .memo("memo") diff --git a/src/test/java/com/hyperwallet/clientsdk/util/HyperwalletApiClientTest.java b/src/test/java/com/hyperwallet/clientsdk/util/HyperwalletApiClientTest.java index 99129b00c..245262771 100644 --- a/src/test/java/com/hyperwallet/clientsdk/util/HyperwalletApiClientTest.java +++ b/src/test/java/com/hyperwallet/clientsdk/util/HyperwalletApiClientTest.java @@ -1765,11 +1765,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" +