allow passing ClientConnectionManager

itaibenari · itaibenari · commit 968b82dcffec · 2014-03-11T09:08:25.000+02:00
diff --git a/cloudinary-core/src/main/java/com/cloudinary/Api.java b/cloudinary-core/src/main/java/com/cloudinary/Api.java
@@ -18,6 +18,7 @@
 import org.apache.http.client.methods.HttpPut;
 import org.apache.http.client.methods.HttpUriRequest;
 import org.apache.http.client.utils.URIBuilder;
+import org.apache.http.conn.ClientConnectionManager;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.json.simple.JSONValue;
 import org.json.simple.parser.ParseException;
@@ -234,6 +235,11 @@ public Map updateTransformation(String transformation, Map updates, Map options)
     public Map createTransformation(String name, String definition, Map options) throws Exception {
         return callApi(HttpMethod.POST, Arrays.asList("transformations", name), Cloudinary.asMap("transformation", definition), options);
     }
+    
+    public Api withConnectionManager(ClientConnectionManager connectionManager) {
+		this.connectionManager = connectionManager;
+		return this;
+	}
 
     protected Map callApi(HttpMethod method, Iterable<String> uri, Map<String, ? extends Object> params, Map options) throws Exception {
         if (options == null) options = Cloudinary.emptyMap();
@@ -263,7 +269,7 @@ protected Map callApi(HttpMethod method, Iterable<String> uri, Map<String, ? ext
                 apiUrlBuilder.addParameter(param.getKey(), Cloudinary.asString(param.getValue()));
             }  
         }
-        DefaultHttpClient client = new DefaultHttpClient();
+        DefaultHttpClient client = new DefaultHttpClient(connectionManager);
         URI apiUri = apiUrlBuilder.build();
         HttpUriRequest request = null;
         switch (method) {
@@ -300,4 +306,6 @@ protected Map callApi(HttpMethod method, Iterable<String> uri, Map<String, ? ext
             throw exceptionConstructor.newInstance(message);
         }
     }
+    
+    private ClientConnectionManager connectionManager = null;
 }
diff --git a/cloudinary-core/src/main/java/com/cloudinary/Cloudinary.java b/cloudinary-core/src/main/java/com/cloudinary/Cloudinary.java
@@ -21,6 +21,7 @@
 import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.client.utils.URIBuilder;
+import org.apache.http.conn.ClientConnectionManager;
 
 @SuppressWarnings({"rawtypes", "unchecked"})
 public class Cloudinary {
@@ -55,11 +56,11 @@ public Url url() {
 	}
 	
 	public Uploader uploader() {
-		return new Uploader(this);
+		return new Uploader(this).withConnectionManager(connectionManager);
 	}
 
 	public Api api() {
-		return new Api(this);
+		return new Api(this).withConnectionManager(connectionManager);
 	}
 	
 	public String cloudinaryApiUrl(String action, Map options) {
@@ -288,4 +289,11 @@ public static String encodeMap(Object arg) {
         }
         return result;
     }
+	
+	public Cloudinary withConnectionManager(ClientConnectionManager connectionManager) {
+		this.connectionManager = connectionManager;
+		return this;
+	}
+	
+	private ClientConnectionManager connectionManager = null;
 }
diff --git a/cloudinary-core/src/main/java/com/cloudinary/Uploader.java b/cloudinary-core/src/main/java/com/cloudinary/Uploader.java
@@ -26,6 +26,7 @@
 import org.apache.http.entity.mime.content.FileBody;
 import org.apache.http.entity.mime.content.StringBody;
 import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.conn.ClientConnectionManager;
 import org.json.simple.JSONObject;
 import org.json.simple.JSONValue;
 import org.json.simple.parser.ParseException;
@@ -276,7 +277,11 @@ public void signRequestParams(Map<String, Object> params, Map options) {
         params.put("timestamp", new Long(System.currentTimeMillis() / 1000L).toString());
         cloudinary.signRequest(params, options);
     }
-
+	
+	public Uploader withConnectionManager(ClientConnectionManager connectionManager) {
+		this.connectionManager = connectionManager;
+		return this;
+	}
 
 	public Map callApi(String action, Map<String, Object> params, Map options, Object file) throws IOException {
         if (options == null) options = Cloudinary.emptyMap();
@@ -285,7 +290,7 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
 
 		String apiUrl = cloudinary.cloudinaryApiUrl(action, options);
 
-		HttpClient client = new DefaultHttpClient();
+		HttpClient client = new DefaultHttpClient(connectionManager);
 
 		HttpPost postMethod = new HttpPost(apiUrl);
 		postMethod.setHeader("User-Agent", Cloudinary.USER_AGENT);
@@ -436,5 +441,7 @@ protected String buildEager(List<? extends Transformation> transformations) {
 		}
 		return StringUtils.join(eager, "|");
 	}
+	
+	private ClientConnectionManager connectionManager = null;
 
 }

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`import org.apache.http.client.methods.HttpPut;`
`19`	`19`	`import org.apache.http.client.methods.HttpUriRequest;`
`20`	`20`	`import org.apache.http.client.utils.URIBuilder;`
	`21`	`+import org.apache.http.conn.ClientConnectionManager;`
`21`	`22`	`import org.apache.http.impl.client.DefaultHttpClient;`
`22`	`23`	`import org.json.simple.JSONValue;`
`23`	`24`	`import org.json.simple.parser.ParseException;`
`@@ -234,6 +235,11 @@ public Map updateTransformation(String transformation, Map updates, Map options)`
`234`	`235`	`public Map createTransformation(String name, String definition, Map options) throws Exception {`
`235`	`236`	`return callApi(HttpMethod.POST, Arrays.asList("transformations", name), Cloudinary.asMap("transformation", definition), options);`
`236`	`237`	`}`
	`238`	`+`
	`239`	`+ public Api withConnectionManager(ClientConnectionManager connectionManager) {`
	`240`	`+ this.connectionManager = connectionManager;`
	`241`	`+ return this;`
	`242`	`+ }`
`237`	`243`
`238`	`244`	`protected Map callApi(HttpMethod method, Iterable<String> uri, Map<String, ? extends Object> params, Map options) throws Exception {`
`239`	`245`	`if (options == null) options = Cloudinary.emptyMap();`
`@@ -263,7 +269,7 @@ protected Map callApi(HttpMethod method, Iterable<String> uri, Map<String, ? ext`
`263`	`269`	`apiUrlBuilder.addParameter(param.getKey(), Cloudinary.asString(param.getValue()));`
`264`	`270`	`}`
`265`	`271`	`}`
`266`		`- DefaultHttpClient client = new DefaultHttpClient();`
	`272`	`+ DefaultHttpClient client = new DefaultHttpClient(connectionManager);`
`267`	`273`	`URI apiUri = apiUrlBuilder.build();`
`268`	`274`	`HttpUriRequest request = null;`
`269`	`275`	`switch (method) {`
`@@ -300,4 +306,6 @@ protected Map callApi(HttpMethod method, Iterable<String> uri, Map<String, ? ext`
`300`	`306`	`throw exceptionConstructor.newInstance(message);`
`301`	`307`	`}`
`302`	`308`	`}`
	`309`	`+`
	`310`	`+ private ClientConnectionManager connectionManager = null;`
`303`	`311`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`import org.apache.commons.codec.binary.Hex;`
`22`	`22`	`import org.apache.commons.lang.StringUtils;`
`23`	`23`	`import org.apache.http.client.utils.URIBuilder;`
	`24`	`+import org.apache.http.conn.ClientConnectionManager;`
`24`	`25`
`25`	`26`	`@SuppressWarnings({"rawtypes", "unchecked"})`
`26`	`27`	`public class Cloudinary {`
`@@ -55,11 +56,11 @@ public Url url() {`
`55`	`56`	`}`
`56`	`57`
`57`	`58`	`public Uploader uploader() {`
`58`		`- return new Uploader(this);`
	`59`	`+ return new Uploader(this).withConnectionManager(connectionManager);`
`59`	`60`	`}`
`60`	`61`
`61`	`62`	`public Api api() {`
`62`		`- return new Api(this);`
	`63`	`+ return new Api(this).withConnectionManager(connectionManager);`
`63`	`64`	`}`
`64`	`65`
`65`	`66`	`public String cloudinaryApiUrl(String action, Map options) {`
`@@ -288,4 +289,11 @@ public static String encodeMap(Object arg) {`
`288`	`289`	`}`
`289`	`290`	`return result;`
`290`	`291`	`}`
	`292`	`+`
	`293`	`+ public Cloudinary withConnectionManager(ClientConnectionManager connectionManager) {`
	`294`	`+ this.connectionManager = connectionManager;`
	`295`	`+ return this;`
	`296`	`+ }`
	`297`	`+`
	`298`	`+ private ClientConnectionManager connectionManager = null;`
`291`	`299`	`}`