From caa7ca3e22f2da10ddbe9aa4240d6c535e57e70f Mon Sep 17 00:00:00 2001 From: Antonio Buedo Date: Wed, 5 Feb 2020 16:49:26 +0100 Subject: [PATCH] #v4.4.2002.0-rc - Optional proxy addition (#59) * - Optional proxy addition - Sub-version upgrade * - Guide updated * - JavaDoc updated --- GUIDE.md | 7 +- apidocs/allclasses-index.html | 4 +- apidocs/allpackages-index.html | 4 +- apidocs/com/bitpay/sdk/BitPayException.html | 4 +- apidocs/com/bitpay/sdk/Client.html | 30 +++--- apidocs/com/bitpay/sdk/Config.html | 4 +- apidocs/com/bitpay/sdk/Env.Tokens.html | 4 +- apidocs/com/bitpay/sdk/Env.html | 4 +- .../sdk/exceptions/BillCreationException.html | 4 +- .../sdk/exceptions/BillDeliveryException.html | 4 +- .../bitpay/sdk/exceptions/BillException.html | 4 +- .../sdk/exceptions/BillQueryException.html | 4 +- .../sdk/exceptions/BillUpdateException.html | 4 +- .../sdk/exceptions/BitPayException.html | 4 +- .../sdk/exceptions/CurrencyException.html | 4 +- .../exceptions/CurrencyQueryException.html | 4 +- .../exceptions/InvoiceCreationException.html | 4 +- .../sdk/exceptions/InvoiceException.html | 4 +- .../sdk/exceptions/InvoiceQueryException.html | 4 +- .../sdk/exceptions/LedgerException.html | 4 +- .../sdk/exceptions/LedgerQueryException.html | 4 +- .../PayoutCancellationException.html | 4 +- .../exceptions/PayoutCreationException.html | 4 +- .../sdk/exceptions/PayoutException.html | 4 +- .../sdk/exceptions/PayoutQueryException.html | 4 +- .../bitpay/sdk/exceptions/RateException.html | 4 +- .../sdk/exceptions/RateQueryException.html | 4 +- .../RefundCancellationException.html | 4 +- .../exceptions/RefundCreationException.html | 4 +- .../sdk/exceptions/RefundException.html | 4 +- .../sdk/exceptions/RefundQueryException.html | 4 +- .../sdk/exceptions/SettlementException.html | 4 +- .../exceptions/SettlementQueryException.html | 4 +- .../SubscriptionCreationException.html | 4 +- .../sdk/exceptions/SubscriptionException.html | 4 +- .../SubscriptionQueryException.html | 4 +- .../SubscriptionUpdateException.html | 4 +- .../sdk/exceptions/package-summary.html | 4 +- .../bitpay/sdk/exceptions/package-tree.html | 4 +- apidocs/com/bitpay/sdk/model/Bill/Bill.html | 4 +- .../com/bitpay/sdk/model/Bill/BillStatus.html | 4 +- apidocs/com/bitpay/sdk/model/Bill/Item.html | 4 +- .../sdk/model/Bill/package-summary.html | 4 +- .../bitpay/sdk/model/Bill/package-tree.html | 4 +- apidocs/com/bitpay/sdk/model/Currency.html | 4 +- apidocs/com/bitpay/sdk/model/Facade.html | 4 +- .../com/bitpay/sdk/model/Invoice/Buyer.html | 4 +- .../com/bitpay/sdk/model/Invoice/Invoice.html | 4 +- .../Invoice/InvoiceBuyerProvidedInfo.html | 4 +- .../sdk/model/Invoice/InvoiceStatus.html | 4 +- .../sdk/model/Invoice/InvoiceTransaction.html | 4 +- .../bitpay/sdk/model/Invoice/MinerFees.html | 4 +- .../sdk/model/Invoice/MinerFeesItem.html | 4 +- .../bitpay/sdk/model/Invoice/PaymentCode.html | 4 +- .../sdk/model/Invoice/PaymentCodes.html | 4 +- .../sdk/model/Invoice/PaymentTotal.html | 4 +- .../com/bitpay/sdk/model/Invoice/Refund.html | 4 +- .../bitpay/sdk/model/Invoice/RefundInfo.html | 4 +- .../sdk/model/Invoice/RefundParams.html | 4 +- .../sdk/model/Invoice/RefundStatus.html | 4 +- .../com/bitpay/sdk/model/Invoice/Shopper.html | 4 +- .../SupportedTransactionCurrencies.html | 4 +- .../Invoice/SupportedTransactionCurrency.html | 4 +- .../sdk/model/Invoice/package-summary.html | 4 +- .../sdk/model/Invoice/package-tree.html | 4 +- .../com/bitpay/sdk/model/Ledger/Buyer.html | 4 +- .../com/bitpay/sdk/model/Ledger/Ledger.html | 4 +- .../bitpay/sdk/model/Ledger/LedgerEntry.html | 4 +- .../sdk/model/Ledger/package-summary.html | 4 +- .../bitpay/sdk/model/Ledger/package-tree.html | 4 +- .../bitpay/sdk/model/Payout/PayoutBatch.html | 4 +- .../sdk/model/Payout/PayoutInstruction.html | 4 +- .../Payout/PayoutInstructionBtcSummary.html | 4 +- .../Payout/PayoutInstructionTransaction.html | 4 +- .../bitpay/sdk/model/Payout/PayoutStatus.html | 4 +- .../sdk/model/Payout/package-summary.html | 4 +- .../bitpay/sdk/model/Payout/package-tree.html | 4 +- apidocs/com/bitpay/sdk/model/Policy.html | 4 +- apidocs/com/bitpay/sdk/model/Rate/Rate.html | 4 +- apidocs/com/bitpay/sdk/model/Rate/Rates.html | 4 +- .../sdk/model/Rate/package-summary.html | 4 +- .../bitpay/sdk/model/Rate/package-tree.html | 4 +- .../sdk/model/Settlement/InvoiceData.html | 4 +- .../sdk/model/Settlement/PayoutInfo.html | 4 +- .../sdk/model/Settlement/RefundInfo.html | 4 +- .../sdk/model/Settlement/Settlement.html | 4 +- .../Settlement/SettlementLedgerEntry.html | 4 +- .../sdk/model/Settlement/WithHoldings.html | 4 +- .../sdk/model/Settlement/package-summary.html | 4 +- .../sdk/model/Settlement/package-tree.html | 4 +- apidocs/com/bitpay/sdk/model/Token.html | 4 +- .../com/bitpay/sdk/model/package-summary.html | 4 +- .../com/bitpay/sdk/model/package-tree.html | 4 +- apidocs/com/bitpay/sdk/package-summary.html | 4 +- apidocs/com/bitpay/sdk/package-tree.html | 4 +- apidocs/com/bitpay/sdk/util/BitPayLogger.html | 4 +- .../com/bitpay/sdk/util/DateDeserializer.html | 4 +- .../com/bitpay/sdk/util/DateSerializer.html | 4 +- apidocs/com/bitpay/sdk/util/KeyUtils.html | 4 +- ...youtInstructionBtcSummaryDeserializer.html | 4 +- .../com/bitpay/sdk/util/package-summary.html | 4 +- apidocs/com/bitpay/sdk/util/package-tree.html | 4 +- apidocs/constant-values.html | 6 +- apidocs/help-doc.html | 4 +- apidocs/index-files/index-1.html | 4 +- apidocs/index-files/index-10.html | 4 +- apidocs/index-files/index-11.html | 4 +- apidocs/index-files/index-12.html | 4 +- apidocs/index-files/index-13.html | 4 +- apidocs/index-files/index-14.html | 4 +- apidocs/index-files/index-15.html | 4 +- apidocs/index-files/index-16.html | 4 +- apidocs/index-files/index-17.html | 4 +- apidocs/index-files/index-18.html | 4 +- apidocs/index-files/index-19.html | 6 +- apidocs/index-files/index-2.html | 4 +- apidocs/index-files/index-20.html | 4 +- apidocs/index-files/index-21.html | 4 +- apidocs/index-files/index-22.html | 4 +- apidocs/index-files/index-23.html | 4 +- apidocs/index-files/index-24.html | 4 +- apidocs/index-files/index-25.html | 4 +- apidocs/index-files/index-26.html | 4 +- apidocs/index-files/index-27.html | 4 +- apidocs/index-files/index-3.html | 8 +- apidocs/index-files/index-4.html | 4 +- apidocs/index-files/index-5.html | 4 +- apidocs/index-files/index-6.html | 4 +- apidocs/index-files/index-7.html | 4 +- apidocs/index-files/index-8.html | 4 +- apidocs/index-files/index-9.html | 4 +- apidocs/index.html | 4 +- apidocs/member-search-index.js | 2 +- apidocs/member-search-index.zip | Bin 8631 -> 8650 bytes apidocs/overview-summary.html | 4 +- apidocs/overview-tree.html | 4 +- apidocs/package-search-index.zip | Bin 305 -> 305 bytes apidocs/serialized-form.html | 4 +- apidocs/test/BitPayTest.html | 99 +++++++----------- apidocs/test/BitPayTest2.html | 4 +- apidocs/test/BitPayTest3.html | 4 +- apidocs/test/package-summary.html | 4 +- apidocs/test/package-tree.html | 4 +- apidocs/type-search-index.zip | Bin 800 -> 800 bytes pom.xml | 2 +- src/main/java/com/bitpay/sdk/Client.java | 24 +++-- src/main/java/com/bitpay/sdk/Env.java | 2 +- src/setup/java/BitPaySetup.java | 5 +- src/test/java/test/BitPayTest.java | 78 ++++---------- src/test/java/test/BitPayTest2.java | 10 +- src/test/java/test/BitPayTest3.java | 6 +- 151 files changed, 386 insertions(+), 435 deletions(-) diff --git a/GUIDE.md b/GUIDE.md index a52ceaf6..944cdc8f 100644 --- a/GUIDE.md +++ b/GUIDE.md @@ -77,7 +77,7 @@ Once you have the environment file (JSON previously generated) you can initializ ```Java // Provide the full path to the env file which you have previously stored securely. -Client bitpay = new Client("[FULL_PATH_TO_THE_CONFIG_FILE]"); +Client bitpay = new Client("[FULL_PATH_TO_THE_CONFIG_FILE]", null); //as second argument, Pass a HttpHost object for proxy usage or NULL to ignore ``` ```Java @@ -85,12 +85,13 @@ Client bitpay = new Client("[FULL_PATH_TO_THE_CONFIG_FILE]"); Client bitpay = new Client( Env.Test, - "[FULL_PATH_TO_THE_PRIVATE_KEY]", + "[FULL_PATH_TO_THE_PRIVATE_KEY_|OR|_PRIVATE_KEY_AS-PLAIN_TEXT]", new Env.Tokens(){{ pos = "AvJdGrEqTW9HVsJit9zabAnrJabqaQDhWHRacHYgfgxK"; merchant = "2smKkjA1ACPKWUGN7wUEEqdWi3rhXYhDX6AKgG4njKvj"; payroll = "9pJ7fzW1GGeuDQfj32aNATCDnyY6YAacVMcDrs7HHUNo"; - }} + }}, + null //Pass a HttpHost object for proxy usage or NULL to ignore ); ``` diff --git a/apidocs/allclasses-index.html b/apidocs/allclasses-index.html index 49ce54fe..b95651d7 100644 --- a/apidocs/allclasses-index.html +++ b/apidocs/allclasses-index.html @@ -2,10 +2,10 @@ - + All Classes - + diff --git a/apidocs/allpackages-index.html b/apidocs/allpackages-index.html index 3c919cc4..b86f4201 100644 --- a/apidocs/allpackages-index.html +++ b/apidocs/allpackages-index.html @@ -2,10 +2,10 @@ - + All Packages - + diff --git a/apidocs/com/bitpay/sdk/BitPayException.html b/apidocs/com/bitpay/sdk/BitPayException.html index caebb8a5..776a5623 100644 --- a/apidocs/com/bitpay/sdk/BitPayException.html +++ b/apidocs/com/bitpay/sdk/BitPayException.html @@ -2,10 +2,10 @@ - + BitPayException - + diff --git a/apidocs/com/bitpay/sdk/Client.html b/apidocs/com/bitpay/sdk/Client.html index 2c7c03ee..229ee212 100644 --- a/apidocs/com/bitpay/sdk/Client.html +++ b/apidocs/com/bitpay/sdk/Client.html @@ -2,10 +2,10 @@ - + Client - + @@ -118,9 +118,9 @@

Class Client

extends java.lang.Object
Version:
-
4.3.2001 +
4.4.2002 See bitpay.com/api for more information. - date 30.01.2020
+ date 05.02.2020
Author:
Antonio Buedo
@@ -173,15 +173,17 @@

Constructor Summary

-Client​(java.lang.String configFilePath) +Client​(java.lang.String environment, + java.lang.String privateKey, + Env.Tokens tokens, + org.apache.http.HttpHost proxy)
Constructor for use if the keys and SIN are managed by this library.
-Client​(java.lang.String environment, - java.lang.String privateKey, - Env.Tokens tokens) +Client​(java.lang.String configFilePath, + org.apache.http.HttpHost proxy)
Constructor for use if the keys and SIN are managed by this library.
@@ -602,7 +604,7 @@

_currenciesInfo

Constructor Detail

- + - +