Fix/provisioning api params (#195)

Author: nitzanj

.travis.yml

@@ -27,5 +27,5 @@ branches:
   - staging-test
 
 # ciTest is configured to skip the various timeout tests that don't work in travis
-script: ./gradlew clean -DCLOUDINARY_URL=$CLOUDINARY_URL -DCLOUDINARY_ACCOUNT_URL=CLOUDINARY_ACCOUNT_URL ciTest -p cloudinary-${MODULE} -i
+script: ./gradlew clean -DCLOUDINARY_URL=$CLOUDINARY_URL -DCLOUDINARY_ACCOUNT_URL=$CLOUDINARY_ACCOUNT_URL ciTest -p cloudinary-${MODULE} -i
 

cloudinary-core/src/main/java/com/cloudinary/provisioning/Account.java

@@ -2,6 +2,7 @@
 
 import com.cloudinary.Api;
 import com.cloudinary.Cloudinary;
+import com.cloudinary.Util;
 import com.cloudinary.api.ApiResponse;
 import com.cloudinary.utils.ObjectUtils;
 
@@ -73,6 +74,7 @@ private ApiResponse callAccountApi(Api.HttpMethod method, List<String> uri, Map<
             options.put("provisioning_api_secret", secret);
         }
 
+        Util.clearEmpty(params);
         return api.getStrategy().callAccountApi(method, uri, params, options);
     }
 
@@ -308,7 +310,7 @@ public ApiResponse users(Boolean pending, List<String> userIds, String prefix, S
         return callAccountApi(Api.HttpMethod.GET, uri,
                 ObjectUtils.asMap("accountId", accountId,
                         "pending", pending,
-                        "user_ids", userIds,
+                        "ids", userIds,
                         "prefix", prefix,
                         "sub_account_id", subAccountId), options);
     }

cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractAccountApiTest.java

@@ -157,10 +157,20 @@ public void testGetUser() throws Exception {
 
     @Test
     public void testGetUsers() throws Exception {
-        createUser(Account.Role.MASTER_ADMIN);
-        ApiResponse result = account.users(null, null, null, null, null);
+        String id1 = createUser(Account.Role.MASTER_ADMIN).get("id").toString();
+        String id2 = createUser(Account.Role.MASTER_ADMIN).get("id").toString();
+        ApiResponse result = account.users(null, Arrays.asList(id1, id2), null, null, null);
         assertNotNull(result);
-        assertTrue(((ArrayList) result.get("users")).size() >= 1);
+        final ArrayList users = (ArrayList) result.get("users");
+        ArrayList<String> returnedIds = new ArrayList<String>(2);
+
+        assertEquals("Should return two users", 2, users.size());
+
+        returnedIds.add(((Map) users.get(0)).get("id").toString());
+        returnedIds.add(((Map) users.get(1)).get("id").toString());
+
+        assertTrue("User1 id should be in the result set", returnedIds.contains(id1));
+        assertTrue("User2 id should be in the result set", returnedIds.contains(id2));
     }
 
     @Test