Merge pull request #572 from sedouard/fix-array-parameters

Fix flattening of array params

Author: brandur-stripe

Diff for: src/main/java/com/stripe/net/LiveStripeResponseGetter.java

@@ -38,6 +38,7 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.ListIterator;
 import java.util.Map;
 import java.util.Scanner;
 import javax.net.ssl.HttpsURLConnection;
@@ -276,17 +277,16 @@ private static List<Parameter> flattenParams(Map<String, Object> params)
   private static List<Parameter> flattenParamsList(List<Object> params, String keyPrefix)
       throws InvalidRequestException {
     List<Parameter> flatParams = new ArrayList<Parameter>();
-    Iterator<?> it = ((List<?>) params).iterator();
-    String newPrefix = String.format("%s[]", keyPrefix);
-
+    ListIterator<?> it = ((List<?>) params).listIterator();
     // Because application/x-www-form-urlencoded cannot represent an empty
     // list, convention is to take the list parameter and just set it to an
-    // empty string. (e.g. A regular list might look like `a[]=1&b[]=2`.
+    // empty string. (e.g. A regular list might look like `a[0]=1&b[1]=2`.
     // Emptying it would look like `a=`.)
     if (params.isEmpty()) {
       flatParams.add(new Parameter(keyPrefix, ""));
     } else {
       while (it.hasNext()) {
+        String newPrefix = String.format("%s[%d]", keyPrefix, it.nextIndex());
         flatParams.addAll(flattenParamsValue(it.next(), newPrefix));
       }
     }
@@ -297,17 +297,17 @@ private static List<Parameter> flattenParamsList(List<Object> params, String key
   private static List<Parameter> flattenParamsArray(Object[] params, String keyPrefix)
       throws InvalidRequestException {
     List<Parameter> flatParams = new ArrayList<Parameter>();
-    String newPrefix = String.format("%s[]", keyPrefix);
 
     // Because application/x-www-form-urlencoded cannot represent an empty
     // list, convention is to take the list parameter and just set it to an
-    // empty string. (e.g. A regular list might look like `a[]=1&b[]=2`.
+    // empty string. (e.g. A regular list might look like `a[0]=1&b[1]=2`.
     // Emptying it would look like `a=`.)
     if (params.length == 0) {
       flatParams.add(new Parameter(keyPrefix, ""));
     } else {
-      for (Object item : params) {
-        flatParams.addAll(flattenParamsValue(item, newPrefix));
+      for (int i = 0; i < params.length; i++) {
+        String newPrefix = String.format("%s[%d]", keyPrefix, i);
+        flatParams.addAll(flattenParamsValue(params[i], newPrefix));
       }
     }
 
@@ -637,7 +637,7 @@ private static StripeResponse getMultipartStripeResponse(
                   "Must have read permissions on file for key "
                       + key + ".", null, null, null, 0, null);
             }
-            multipartProcessor.addFileField(key, currentFile.getName(), 
+            multipartProcessor.addFileField(key, currentFile.getName(),
                 new FileInputStream(currentFile));
           } else if (value instanceof InputStream) {
             InputStream inputStream = (InputStream) value;

Diff for: src/test/java/com/stripe/net/LiveStripeResponseGetterTest.java

@@ -64,7 +64,7 @@ public void testCreateQueryWithListParams() throws StripeException, UnsupportedE
     params.put("a", "b");
     params.put("c", "d");
 
-    assertEquals("nested[]=A&nested[]=B&nested[]=C&a=b&c=d",
+    assertEquals("nested[0]=A&nested[1]=B&nested[2]=C&a=b&c=d",
         LiveStripeResponseGetter.createQuery(params));
   }
 
@@ -80,7 +80,7 @@ public void testCreateQueryWithArrayParams() throws StripeException,
     params.put("a", "b");
     params.put("c", "d");
 
-    assertEquals("nested[]=A&nested[]=B&nested[]=C&a=b&c=d",
+    assertEquals("nested[0]=A&nested[1]=B&nested[2]=C&a=b&c=d",
         LiveStripeResponseGetter.createQuery(params));
   }
 
@@ -103,7 +103,7 @@ public void testCreateQueryWithListOfHashes() throws StripeException,
     final Map<String, Object> params = new LinkedHashMap<String, Object>();
     params.put("nested", nested);
 
-    assertEquals("nested[][A]=A-1&nested[][B]=B-1&nested[][A]=A-2&nested[][B]=B-2",
+    assertEquals("nested[0][A]=A-1&nested[0][B]=B-1&nested[1][A]=A-2&nested[1][B]=B-2",
         LiveStripeResponseGetter.createQuery(params));
   }
 
@@ -144,7 +144,7 @@ public void testIncorrectAdditionalOwners() throws StripeException, UnsupportedE
     final Map<String, Object> params = new HashMap<String, Object>();
     params.put("legal_entity", legalEntityParams);
 
-    assertEquals("legal_entity[additional_owners][][first_name]=Stripe",
+    assertEquals("legal_entity[additional_owners][0][first_name]=Stripe",
         LiveStripeResponseGetter.createQuery(params));
   }