add user agent. fix api test

itaibenari · itaibenari · commit 2d609bc11be0 · 2014-01-10T08:55:43.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
@@ -256,6 +256,8 @@ protected Map callApi(HttpMethod method, Iterable<String> uri, Map<String, ? ext
         case DELETE: request = new HttpDelete(apiUri); break;
         }
         request.setHeader("Authorization", "Basic " + Base64.encodeBase64String((apiKey + ":" + apiSecret).getBytes()));
+        request.setHeader("User-Agent", Cloudinary.USER_AGENT);
+        
         HttpResponse response = client.execute(request);
 
         int code = response.getStatusLine().getStatusCode();
diff --git a/cloudinary-core/src/main/java/com/cloudinary/Cloudinary.java b/cloudinary-core/src/main/java/com/cloudinary/Cloudinary.java
@@ -29,6 +29,9 @@ public class Cloudinary {
 	public final static String AKAMAI_SHARED_CDN = "res.cloudinary.com";
 	public final static String SHARED_CDN = AKAMAI_SHARED_CDN;
 	
+	public final static String VERSION = "1.0.8";
+	public final static String USER_AGENT = "cld-java-" + VERSION;
+	
 	private final Map config = new HashMap();
 	
 	public Cloudinary(Map config) {
diff --git a/cloudinary-core/src/main/java/com/cloudinary/Uploader.java b/cloudinary-core/src/main/java/com/cloudinary/Uploader.java
@@ -223,6 +223,8 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
 		HttpClient client = new DefaultHttpClient();
 
 		HttpPost postMethod = new HttpPost(apiUrl);
+		postMethod.setHeader("User-Agent", Cloudinary.USER_AGENT);
+		
 		MultipartEntity multipart = new MultipartEntity(HttpMultipartMode.BROWSER_COMPATIBLE);
 		// Remove blank parameters
 		for (Map.Entry<String, Object> param : params.entrySet()) {
diff --git a/cloudinary-core/src/test/java/com/cloudinary/test/ApiTest.java b/cloudinary-core/src/test/java/com/cloudinary/test/ApiTest.java
@@ -37,7 +37,7 @@ public static void setUpClass() throws IOException {
         }
         Api api = cloudinary.api();
         try {
-            api.deleteResources(Arrays.asList("api_test", "api_test1", "api_test2", "api_test3"), Cloudinary.emptyMap());
+            api.deleteResources(Arrays.asList("api_test", "api_test1", "api_test2", "api_test3", "api_test5"), Cloudinary.emptyMap());
         } catch (Exception e) {
         }
         try {

Original file line number	Diff line number	Diff line change
`@@ -256,6 +256,8 @@ protected Map callApi(HttpMethod method, Iterable<String> uri, Map<String, ? ext`
`256`	`256`	`case DELETE: request = new HttpDelete(apiUri); break;`
`257`	`257`	`}`
`258`	`258`	`request.setHeader("Authorization", "Basic " + Base64.encodeBase64String((apiKey + ":" + apiSecret).getBytes()));`
	`259`	`+ request.setHeader("User-Agent", Cloudinary.USER_AGENT);`
	`260`	`+`
`259`	`261`	`HttpResponse response = client.execute(request);`
`260`	`262`
`261`	`263`	`int code = response.getStatusLine().getStatusCode();`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public static void setUpClass() throws IOException {`
`37`	`37`	`}`
`38`	`38`	`Api api = cloudinary.api();`
`39`	`39`	`try {`
`40`		`- api.deleteResources(Arrays.asList("api_test", "api_test1", "api_test2", "api_test3"), Cloudinary.emptyMap());`
	`40`	`+ api.deleteResources(Arrays.asList("api_test", "api_test1", "api_test2", "api_test3", "api_test5"), Cloudinary.emptyMap());`
`41`	`41`	`} catch (Exception e) {`
`42`	`42`	`}`
`43`	`43`	`try {`