handle multiple tokens in token request

Author: paul

.gitignore

@@ -0,0 +1,6 @@
+locals/
+*.key
+java-bitpay-client.xml
+java-bitpay-client.properties
+untitled folder/
+.idea/

src/controller/BitPay.java

@@ -60,7 +60,7 @@ public class BitPay {
      * Constructor for use if the keys and SIN are managed by this library.
      * @param clientName - The label for this client.
      * @param envUrl - The target server URL.
-     * @throws BitPayException 
+     * @throws BitPayException
      */
     public BitPay(String clientName, String envUrl) throws BitPayException
     {
@@ -383,7 +383,7 @@ private Hashtable<String, String> responseToTokenCache(HttpResponse response) th
             // we can map to a hashtable.
             json = json.replaceAll("\\[", "");
             json = json.replaceAll("\\]", "");
-
+            json = json.replaceAll("\\},\\{", ",");
             if (json.length() > 0) {
                 _tokenCache = new ObjectMapper().readValue(json, new TypeReference<Hashtable<String,String>>(){});
             }
@@ -497,7 +497,7 @@ private HttpResponse get(String uri) throws BitPayException
         return this.get(uri, null);
     }
 
-    private HttpResponse post(String uri, String json, boolean signatureRequired) throws BitPayException 
+    private HttpResponse post(String uri, String json, boolean signatureRequired) throws BitPayException
     {
         try {            
             HttpPost post = new HttpPost(_baseUrl + uri);
@@ -526,17 +526,17 @@ private HttpResponse post(String uri, String json, boolean signatureRequired) th
         }
     }
 
-    private HttpResponse post(String uri, String json) throws BitPayException 
+    private HttpResponse post(String uri, String json) throws BitPayException
     {
         return this.post(uri, json, false);
     }
 
-    private HttpResponse postWithSignature(String uri, String json) throws BitPayException 
+    private HttpResponse postWithSignature(String uri, String json) throws BitPayException
     {
         return this.post(uri, json, true);
     }
 
-    private String responseToJsonString(HttpResponse response) throws BitPayException 
+    private String responseToJsonString(HttpResponse response) throws BitPayException
     {
         if (response == null) {
             throw new BitPayException("Error: HTTP response is null");

src/test/BitPayTest.java

@@ -2,8 +2,10 @@
 
 import static org.junit.Assert.*;
 
+import java.security.interfaces.ECKey;
 import java.util.List;
 
+import controller.KeyUtils;
 import model.Invoice;
 import model.InvoiceBuyer;
 import model.Rate;
@@ -31,8 +33,9 @@ public void setUp() throws Exception
 	{
         // This scenario qualifies that this (test) client does not have merchant facade access.
 		clientName += " on " + java.net.InetAddress.getLocalHost();
-        bitpay = new BitPay(clientName);
-
+        com.google.bitcoin.core.ECKey key = KeyUtils.createEcKeyFromHexStringFile("locals/key");
+		String testUrl = "https://staging.b-pay.net/";
+        bitpay = new BitPay(key, clientName, testUrl );
         if (!bitpay.clientIsAuthorized(BitPay.FACADE_POS))
         {
             // Get POS facade authorization.