Updated pom.xml to handle custom src and test-src directories

andershedstrom · andershedstrom · commit 6c01817b6932 · 2012-12-19T22:19:03.000+01:00
Updated .gitignore to ignore Eclipse specific stuff

Fixed bug for param with multiple values in Api.callApi.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
 bin
 lib
 target
+.classpath
+.project
+.settings
diff --git a/pom.xml b/pom.xml
@@ -4,6 +4,9 @@
   <artifactId>cloudinary_java</artifactId>
   <version>0.1-SNAPSHOT</version>
   <name>Cloudinary Java Client Library</name>
+  <properties>
+    <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
+  </properties>
   <dependencies>
   	<dependency>
   		<groupId>commons-lang</groupId>
@@ -51,4 +54,8 @@
   		<version>4.10</version>
   	</dependency>
   </dependencies>
+  <build>
+    <sourceDirectory>src</sourceDirectory>
+    <testSourceDirectory>tests</testSourceDirectory>
+  </build>
 </project>
diff --git a/src/com/cloudinary/Api.java b/src/com/cloudinary/Api.java
@@ -12,8 +12,6 @@
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.HttpResponse;
-import org.apache.http.auth.AuthScope;
-import org.apache.http.auth.UsernamePasswordCredentials;
 import org.apache.http.client.methods.HttpDelete;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
@@ -212,9 +210,8 @@ protected Map callApi(HttpMethod method, Iterable<String> uri, Map<String, ? ext
 		URIBuilder apiUrlBuilder = new URIBuilder(apiUrl);
 		for (Map.Entry<String, ? extends Object> param : params.entrySet()) {
 			if (param.getValue() instanceof Iterable) {
-				for (String single : (Iterable<String>) param.getValue()) {
-					apiUrlBuilder.addParameter(param.getKey() + "[]", single);
-				}
+			    String joinedValues = StringUtils.join(((Iterable<String>) param.getValue()).iterator(), ",");
+			    apiUrlBuilder.addParameter(param.getKey(), joinedValues);
 			} else {
 				apiUrlBuilder.addParameter(param.getKey(), Cloudinary.asString(param.getValue()));
 			}  
