cloudinary-android/src/main/java/com/cloudinary/android/UploaderStrategy.java

Fix issue with uploading urls with \n. Fix handling of 404 from upload api

Author: TalLevAmi

CHANGELOG.md

@@ -1,3 +1,6 @@
+cloudinary-parent-1.4.4 / 2016-09-15
+====================================
+  * Fix issue when uploading URL with \n
 
 cloudinary-parent-1.4.3 / 2016-09-09
 ====================================

README.md

@@ -28,10 +28,10 @@ The cloudinary_java library is available in [Maven Central](https://repo1.maven.
     <dependency>
         <groupId>com.cloudinary</groupId>
         <artifactId>cloudinary-http44</artifactId>
-        <version>1.4.3</version>
+        <version>1.4.4</version>
     </dependency>
 
-Alternatively, download cloudinary_java from [here](https://repo1.maven.org/maven2/com/cloudinary/cloudinary-core/1.4.3/cloudinary-core-1.4.3.jar) and [here](https://repo1.maven.org/maven2/com/cloudinary/cloudinary-http44/1.4.3/cloudinary-http44-1.4.3.jar)
+Alternatively, download cloudinary_java from [here](https://repo1.maven.org/maven2/com/cloudinary/cloudinary-core/1.4.4/cloudinary-core-1.4.4.jar) and [here](https://repo1.maven.org/maven2/com/cloudinary/cloudinary-http44/1.4.4/cloudinary-http44-1.4.4.jar)
 and see [pom.xml](https://github.com/cloudinary/cloudinary_java/blob/master/cloudinary-http44/pom.xml) for library dependencies.
 
 ## Try it right away

cloudinary-android/src/main/java/com/cloudinary/android/UploaderStrategy.java

@@ -62,7 +62,7 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
             }
         }
 
-        if (file instanceof String && !((String) file).matches("ftp:.*|https?:.*|s3:.*|data:[^;]*;base64,([a-zA-Z0-9/+\n=]+)")) {
+        if (file instanceof String && !((String) file).matches("(?s)ftp:.*|https?:.*|s3:.*|data:[^;]*;base64,([a-zA-Z0-9/+\n=]+)")) {
             file = new File((String) file);
         }
         String filename = (String) options.get("filename");
@@ -91,7 +91,7 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
         String responseData = readFully(responseStream);
         connection.disconnect();
 
-        if (code != 200 && code != 400 && code != 500) {
+        if (code != 200 && code != 400 && code != 404 && code != 500) {
             throw new RuntimeException("Server returned unexpected status code - " + code + " - " + responseData);
         }
 

cloudinary-core/src/main/java/com/cloudinary/Cloudinary.java

@@ -40,7 +40,7 @@ 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.4.3";
+    public final static String VERSION = "1.4.4";
     public final static String USER_AGENT = "CloudinaryJava/" + VERSION;
 
     public final Configuration config;

cloudinary-http42/src/main/java/com/cloudinary/http42/UploaderStrategy.java

@@ -84,7 +84,7 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
             }
         }
 
-        if (file instanceof String && !((String) file).matches("ftp:.*|https?:.*|s3:.*|data:[^;]*;base64,([a-zA-Z0-9/+\n=]+)")) {
+        if (file instanceof String && !((String) file).matches("(?s)ftp:.*|https?:.*|s3:.*|data:[^;]*;base64,([a-zA-Z0-9/+\n=]+)")) {
             file = new File((String) file);
         }
         String filename = (String) options.get("filename");
@@ -107,7 +107,7 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
         InputStream responseStream = response.getEntity().getContent();
         String responseData = StringUtils.read(responseStream);
 
-        if (code != 200 && code != 400 && code != 500) {
+        if (code != 200 && code != 400 && code != 404 && code != 500) {
             throw new RuntimeException("Server returned unexpected status code - " + code + " - " + responseData);
         }
 

cloudinary-http43/src/main/java/com/cloudinary/http43/UploaderStrategy.java

@@ -97,7 +97,7 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
             }
         }
 
-        if (file instanceof String && !((String) file).matches("ftp:.*|https?:.*|s3:.*|data:[^;]*;base64,([a-zA-Z0-9/+\n=]+)")) {
+        if (file instanceof String && !((String) file).matches("(?s)ftp:.*|https?:.*|s3:.*|data:[^;]*;base64,([a-zA-Z0-9/+\n=]+)")) {
             file = new File((String) file);
         }
         String filename = (String) options.get("filename");
@@ -127,7 +127,7 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
             response.close();
         }
 
-        if (code != 200 && code != 400 && code != 500) {
+        if (code != 200 && code != 400 && code != 404 && code != 500) {
             throw new RuntimeException("Server returned unexpected status code - " + code + " - " + responseData);
         }
 

cloudinary-http44/src/main/java/com/cloudinary/http44/UploaderStrategy.java

@@ -99,7 +99,7 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
             }
         }
 
-        if (file instanceof String && !((String) file).matches("ftp:.*|https?:.*|s3:.*|data:[^;]*;base64,([a-zA-Z0-9/+\n=]+)")) {
+        if (file instanceof String && !((String) file).matches("(?s)ftp:.*|https?:.*|s3:.*|data:[^;]*;base64,([a-zA-Z0-9/+\n=]+)")) {
             file = new File((String) file);
         }
         String filename = (String) options.get("filename");
@@ -129,7 +129,7 @@ public Map callApi(String action, Map<String, Object> params, Map options, Objec
             response.close();
         }
 
-        if (code != 200 && code != 400 && code != 500) {
+        if (code != 200 && code != 400 && code != 404 && code != 500) {
             throw new RuntimeException("Server returned unexpected status code - " + code + " - " + responseData);
         }
 

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

@@ -499,5 +499,11 @@ public void testDownloadArchive() throws Exception {
         }
         assertEquals(2, files);
     }
+    
+    @Test
+    public void testUploadInvalidUrl() throws IOException {
+        Map result = cloudinary.uploader().upload(REMOTE_TEST_IMAGE + "\n", ObjectUtils.asMap("return_error", true));
+        assertEquals(result.get("http_code"), 404);
+    }
 
 }