Merge pull request #229 from mwarzybok-sumoheavy/feature/SP-522

Improve create clients

Author: bobbrodie

src/main/java/com/bitpay/sdk/Client.java

@@ -28,8 +28,9 @@
 /**
  * The type Bill client.
  */
-public class BillClient {
+public class BillClient implements ResourceClient {
 
+    private static BillClient instance;
     private final BitPayClient bitPayClient;
     private final TokenContainer accessTokens;
 
@@ -39,11 +40,26 @@ public class BillClient {
      * @param bitPayClient the bit pay client
      * @param accessTokens the access tokens
      */
-    public BillClient(BitPayClient bitPayClient, TokenContainer accessTokens) {
+    private BillClient(BitPayClient bitPayClient, TokenContainer accessTokens) {
         this.bitPayClient = bitPayClient;
         this.accessTokens = accessTokens;
     }
 
+    /**
+     * Factory method for Bill Client.
+     *
+     * @param bitPayClient BitPay Client
+     * @param accessTokens Access Tokens
+     * @return BillClient
+     */
+    public static BillClient getInstance(BitPayClient bitPayClient, TokenContainer accessTokens) {
+        if (Objects.isNull(instance)) {
+            instance = new BillClient(bitPayClient, accessTokens);
+        }
+
+        return instance;
+    }
+
     /**
      * Create a BitPay Bill.
      *

src/main/java/com/bitpay/sdk/client/BillClient.java

@@ -19,8 +19,9 @@
 /**
  * The type Currency client.
  */
-public class CurrencyClient {
+public class CurrencyClient implements ResourceClient {
 
+    private static CurrencyClient instance;
     private final BitPayClient client;
     private List<Map<String, String>> currenciesInfo;
 
@@ -30,13 +31,27 @@ public class CurrencyClient {
      * @param client the client
      * @throws BitPayException the bit pay exception
      */
-    public CurrencyClient(BitPayClient client) throws BitPayException {
+    private CurrencyClient(BitPayClient client) throws BitPayException {
         if (Objects.isNull(client)) {
             throw new BitPayException(null, "failed init Currency Client");
         }
         this.client = client;
     }
 
+    /**
+     * Factory method for Currency Client.
+     *
+     * @param bitPayClient BitPay Client
+     * @return CurrencyClient
+     */
+    public static CurrencyClient getInstance(BitPayClient bitPayClient) throws BitPayException {
+        if (Objects.isNull(instance)) {
+            instance = new CurrencyClient(bitPayClient);
+        }
+
+        return instance;
+    }
+
     /**
      * Gets info for specific currency.
      *

src/main/java/com/bitpay/sdk/client/CurrencyClient.java

@@ -31,8 +31,9 @@
 /**
  * The type Invoice client.
  */
-public class InvoiceClient {
+public class InvoiceClient implements ResourceClient {
 
+    private static InvoiceClient instance;
     private final BitPayClient bitPayClient;
     private final TokenContainer accessTokens;
     private final GuidGenerator guidGenerator;
@@ -44,7 +45,7 @@ public class InvoiceClient {
      * @param accessTokens  the access tokens
      * @param guidGenerator the Guid generator
      */
-    public InvoiceClient(
+    private InvoiceClient(
         BitPayClient bitPayClient,
         TokenContainer accessTokens,
         GuidGenerator guidGenerator
@@ -54,6 +55,26 @@ public InvoiceClient(
         this.guidGenerator = guidGenerator;
     }
 
+    /**
+     * Factory method for Invoice Client.
+     *
+     * @param bitPayClient BitPay Client
+     * @param accessTokens Access Tokens
+     * @param guidGenerator Guid Generator
+     * @return InvoiceClient
+     */
+    public static InvoiceClient getInstance(
+        BitPayClient bitPayClient,
+        TokenContainer accessTokens,
+        GuidGenerator guidGenerator
+    ) {
+        if (Objects.isNull(instance)) {
+            instance = new InvoiceClient(bitPayClient, accessTokens, guidGenerator);
+        }
+
+        return instance;
+    }
+
     /**
      * Create a BitPay invoice.
      *

src/main/java/com/bitpay/sdk/client/InvoiceClient.java

@@ -23,8 +23,9 @@
 /**
  * The type Ledger client.
  */
-public class LedgerClient {
+public class LedgerClient implements ResourceClient {
 
+    private static LedgerClient instance;
     private final BitPayClient bitPayClient;
     private final TokenContainer accessTokens;
 
@@ -34,11 +35,26 @@ public class LedgerClient {
      * @param bitPayClient the bit pay client
      * @param accessTokens the access tokens
      */
-    public LedgerClient(BitPayClient bitPayClient, TokenContainer accessTokens) {
+    private LedgerClient(BitPayClient bitPayClient, TokenContainer accessTokens) {
         this.bitPayClient = bitPayClient;
         this.accessTokens = accessTokens;
     }
 
+    /**
+     * Factory method for Ledger Client.
+     *
+     * @param bitPayClient BitPay Client
+     * @param accessTokens Access Tokens
+     * @return LedgerClient
+     */
+    public static LedgerClient getInstance(BitPayClient bitPayClient, TokenContainer accessTokens) {
+        if (Objects.isNull(instance)) {
+            instance = new LedgerClient(bitPayClient, accessTokens);
+        }
+
+        return instance;
+    }
+
     /**
      * Retrieve a list of ledgers entries by currency and date range using the merchant facade.
      *

src/main/java/com/bitpay/sdk/client/LedgerClient.java

@@ -30,8 +30,9 @@
 /**
  * The type Payout client.
  */
-public class PayoutClient {
+public class PayoutClient implements ResourceClient {
 
+    private static PayoutClient instance;
     private final BitPayClient bitPayClient;
     private final TokenContainer accessTokens;
 
@@ -41,11 +42,26 @@ public class PayoutClient {
      * @param bitPayClient the bit pay client
      * @param accessTokens the access tokens
      */
-    public PayoutClient(BitPayClient bitPayClient, TokenContainer accessTokens) {
+    private PayoutClient(BitPayClient bitPayClient, TokenContainer accessTokens) {
         this.bitPayClient = bitPayClient;
         this.accessTokens = accessTokens;
     }
 
+    /**
+     * Factory method for Bill Client.
+     *
+     * @param bitPayClient BitPay Client
+     * @param accessTokens Access Tokens
+     * @return PayoutClient
+     */
+    public static PayoutClient getInstance(BitPayClient bitPayClient, TokenContainer accessTokens) {
+        if (Objects.isNull(instance)) {
+            instance = new PayoutClient(bitPayClient, accessTokens);
+        }
+
+        return instance;
+    }
+
     /**
      * Submit a BitPay Payout.
      *

src/main/java/com/bitpay/sdk/client/PayoutClient.java

@@ -33,8 +33,9 @@
 /**
  * The type Payout recipients client.
  */
-public class PayoutRecipientsClient {
+public class PayoutRecipientsClient implements ResourceClient {
 
+    private static PayoutRecipientsClient instance;
     private final BitPayClient bitPayClient;
     private final TokenContainer accessTokens;
     private final GuidGenerator guidGenerator;
@@ -46,7 +47,7 @@ public class PayoutRecipientsClient {
      * @param accessTokens  the access tokens
      * @param guidGenerator the Guid generator
      */
-    public PayoutRecipientsClient(
+    private PayoutRecipientsClient(
         BitPayClient bitPayClient,
         TokenContainer accessTokens,
         GuidGenerator guidGenerator
@@ -56,6 +57,26 @@ public PayoutRecipientsClient(
         this.guidGenerator = guidGenerator;
     }
 
+    /**
+     * Factory method for Bill Client.
+     *
+     * @param bitPayClient BitPay Client
+     * @param accessTokens Access Tokens
+     * @param guidGenerator Guid Generator
+     * @return PayoutRecipientsClient
+     */
+    public static PayoutRecipientsClient getInstance(
+        BitPayClient bitPayClient,
+        TokenContainer accessTokens,
+        GuidGenerator guidGenerator
+    ) {
+        if (Objects.isNull(instance)) {
+            instance = new PayoutRecipientsClient(bitPayClient, accessTokens, guidGenerator);
+        }
+
+        return instance;
+    }
+
     /**
      * Submit BitPay Payout Recipients.
      *

src/main/java/com/bitpay/sdk/client/PayoutRecipientsClient.java

@@ -11,24 +11,40 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import org.apache.http.HttpResponse;
 
 /**
  * The type Rate client.
  */
-public class RateClient {
+public class RateClient implements ResourceClient {
 
+    private static RateClient instance;
     private final BitPayClient bitPayClient;
 
     /**
      * Instantiates a new Rate client.
      *
      * @param bitPayClient the bit pay client
      */
-    public RateClient(BitPayClient bitPayClient) {
+    private RateClient(BitPayClient bitPayClient) {
         this.bitPayClient = bitPayClient;
     }
 
+    /**
+     * Factory method for Rate Client.
+     *
+     * @param bitPayClient BitPay Client
+     * @return RateClient
+     */
+    public static RateClient getInstance(BitPayClient bitPayClient) {
+        if (Objects.isNull(instance)) {
+            instance = new RateClient(bitPayClient);
+        }
+
+        return instance;
+    }
+
     /**
      * Retrieve the rates for a cryptocurrency / fiat pair. See https://bitpay.com/bitcoin-exchange-rates.
      *

src/main/java/com/bitpay/sdk/client/RateClient.java

@@ -31,8 +31,9 @@
 /**
  * The type Refund client.
  */
-public class RefundClient {
+public class RefundClient implements ResourceClient {
 
+    private static RefundClient instance;
     private final BitPayClient bitPayClient;
     private final TokenContainer accessTokens;
     private final GuidGenerator guidGenerator;
@@ -44,12 +45,32 @@ public class RefundClient {
      * @param accessTokens the access tokens
      * @param guidGenerator GUID generator
      */
-    public RefundClient(BitPayClient bitPayClient, TokenContainer accessTokens, GuidGenerator guidGenerator) {
+    private RefundClient(BitPayClient bitPayClient, TokenContainer accessTokens, GuidGenerator guidGenerator) {
         this.bitPayClient = bitPayClient;
         this.accessTokens = accessTokens;
         this.guidGenerator = guidGenerator;
     }
 
+    /**
+     * Factory method for Bill Client.
+     *
+     * @param bitPayClient BitPay Client
+     * @param accessTokens Access Tokens
+     * @param guidGenerator Guid generator
+     * @return RefundClient
+     */
+    public static RefundClient getInstance(
+        BitPayClient bitPayClient,
+        TokenContainer accessTokens,
+        GuidGenerator guidGenerator
+    ) {
+        if (Objects.isNull(instance)) {
+            instance = new RefundClient(bitPayClient, accessTokens, guidGenerator);
+        }
+
+        return instance;
+    }
+
     /**
      * Create a refund for a BitPay invoice.
      *

src/main/java/com/bitpay/sdk/client/RefundClient.java

@@ -0,0 +1,4 @@
+package com.bitpay.sdk.client;
+
+public interface ResourceClient {
+}