Move ProgressCallback to the com.cloudinary package.

Amir Tocker · Amir Tocker · commit 517b9dc16fe6 · 2017-03-30T21:10:23.000+03:00
diff --git a/cloudinary-android-test/src/main/java/com/cloudinary/test/UploaderTest.java b/cloudinary-android-test/src/main/java/com/cloudinary/test/UploaderTest.java
@@ -6,7 +6,7 @@
 import com.cloudinary.Coordinates;
 import com.cloudinary.Transformation;
 import com.cloudinary.android.Utils;
-import com.cloudinary.strategies.ProgressCallback;
+import com.cloudinary.ProgressCallback;
 import com.cloudinary.utils.ObjectUtils;
 import com.cloudinary.utils.Rectangle;
 import org.cloudinary.json.JSONArray;
@@ -17,8 +17,6 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/cloudinary-android/src/main/java/com/cloudinary/android/UploaderStrategy.java b/cloudinary-android/src/main/java/com/cloudinary/android/UploaderStrategy.java
@@ -1,7 +1,7 @@
 package com.cloudinary.android;
 
 import com.cloudinary.strategies.AbstractUploaderStrategy;
-import com.cloudinary.strategies.ProgressCallback;
+import com.cloudinary.ProgressCallback;
 import com.cloudinary.utils.ObjectUtils;
 import com.cloudinary.utils.StringUtils;
 import org.cloudinary.json.JSONException;
diff --git a/cloudinary-core/src/main/java/com/cloudinary/ProgressCallback.java b/cloudinary-core/src/main/java/com/cloudinary/ProgressCallback.java
@@ -0,0 +1,13 @@
+package com.cloudinary;
+
+/**
+ * Defines a callback for network operations.
+ */
+public interface ProgressCallback {
+    /**
+     * Invoked during network operation.
+     * @param bytesUploaded the number of bytes uploaded so far
+     * @param totalBytes the total number of byte to upload - if known
+     */
+    void onProgress(long bytesUploaded, long totalBytes);
+}
diff --git a/cloudinary-core/src/main/java/com/cloudinary/Uploader.java b/cloudinary-core/src/main/java/com/cloudinary/Uploader.java
@@ -10,7 +10,6 @@
 import java.util.List;
 import java.util.Map;
 
-import com.cloudinary.strategies.ProgressCallback;
 import org.cloudinary.json.JSONObject;
 
 import com.cloudinary.strategies.AbstractUploaderStrategy;
@@ -20,6 +19,8 @@
 @SuppressWarnings({"rawtypes", "unchecked"})
 public class Uploader {
 
+    public static final int BUFFER_SIZE = 20000000;
+
     private final class Command {
         final static String add = "add";
         final static String remove = "remove";
@@ -81,11 +82,11 @@ public Map upload(Object file, Map options, final ProgressCallback progressCallb
     }
 
     public Map uploadLargeRaw(Object file, Map options) throws IOException {
-        return uploadLargeRaw(file, options, 20000000, null);
+        return uploadLargeRaw(file, options, BUFFER_SIZE, null);
     }
 
     public Map uploadLargeRaw(Object file, Map options, ProgressCallback progressCallback) throws IOException {
-        return uploadLargeRaw(file, options, 20000000, progressCallback);
+        return uploadLargeRaw(file, options, BUFFER_SIZE, progressCallback);
     }
 
     public Map uploadLargeRaw(Object file, Map options, int bufferSize) throws IOException {
@@ -104,7 +105,7 @@ public Map uploadLarge(Object file, Map options) throws IOException {
     }
 
     public Map uploadLarge(Object file, Map options, ProgressCallback progressCallback) throws IOException {
-        int bufferSize = ObjectUtils.asInteger(options.get("chunk_size"), 20000000);
+        int bufferSize = ObjectUtils.asInteger(options.get("chunk_size"), BUFFER_SIZE);
         return uploadLarge(file, options, bufferSize, progressCallback);
     }
 
diff --git a/cloudinary-core/src/main/java/com/cloudinary/strategies/AbstractUploaderStrategy.java b/cloudinary-core/src/main/java/com/cloudinary/strategies/AbstractUploaderStrategy.java
@@ -4,6 +4,7 @@
 import java.util.Map;
 
 import com.cloudinary.Cloudinary;
+import com.cloudinary.ProgressCallback;
 import com.cloudinary.Uploader;
 
 public abstract class AbstractUploaderStrategy {
diff --git a/cloudinary-core/src/main/java/com/cloudinary/strategies/ProgressCallback.java b/cloudinary-core/src/main/java/com/cloudinary/strategies/ProgressCallback.java
diff --git a/cloudinary-http42/src/main/java/com/cloudinary/http42/UploaderStrategy.java b/cloudinary-http42/src/main/java/com/cloudinary/http42/UploaderStrategy.java
@@ -3,7 +3,7 @@
 import com.cloudinary.Cloudinary;
 import com.cloudinary.Util;
 import com.cloudinary.strategies.AbstractUploaderStrategy;
-import com.cloudinary.strategies.ProgressCallback;
+import com.cloudinary.ProgressCallback;
 import com.cloudinary.utils.ObjectUtils;
 import com.cloudinary.utils.StringUtils;
 import org.apache.http.HttpHost;
diff --git a/cloudinary-http43/src/main/java/com/cloudinary/http43/UploaderStrategy.java b/cloudinary-http43/src/main/java/com/cloudinary/http43/UploaderStrategy.java
@@ -6,7 +6,7 @@
 import java.util.Collection;
 import java.util.Map;
 
-import com.cloudinary.strategies.ProgressCallback;
+import com.cloudinary.ProgressCallback;
 import org.apache.http.HttpHost;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
diff --git a/cloudinary-http44/src/main/java/com/cloudinary/http44/UploaderStrategy.java b/cloudinary-http44/src/main/java/com/cloudinary/http44/UploaderStrategy.java
@@ -6,7 +6,7 @@
 import java.util.Collection;
 import java.util.Map;
 
-import com.cloudinary.strategies.ProgressCallback;
+import com.cloudinary.ProgressCallback;
 import org.apache.http.HttpHost;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`	`import java.util.List;`
`11`	`11`	`import java.util.Map;`
`12`	`12`
`13`		`-import com.cloudinary.strategies.ProgressCallback;`
`14`	`13`	`import org.cloudinary.json.JSONObject;`
`15`	`14`
`16`	`15`	`import com.cloudinary.strategies.AbstractUploaderStrategy;`
`@@ -20,6 +19,8 @@`
`20`	`19`	`@SuppressWarnings({"rawtypes", "unchecked"})`
`21`	`20`	`public class Uploader {`
`22`	`21`
	`22`	`+ public static final int BUFFER_SIZE = 20000000;`
	`23`	`+`
`23`	`24`	`private final class Command {`
`24`	`25`	`final static String add = "add";`
`25`	`26`	`final static String remove = "remove";`
`@@ -81,11 +82,11 @@ public Map upload(Object file, Map options, final ProgressCallback progressCallb`
`81`	`82`	`}`
`82`	`83`
`83`	`84`	`public Map uploadLargeRaw(Object file, Map options) throws IOException {`
`84`		`- return uploadLargeRaw(file, options, 20000000, null);`
	`85`	`+ return uploadLargeRaw(file, options, BUFFER_SIZE, null);`
`85`	`86`	`}`
`86`	`87`
`87`	`88`	`public Map uploadLargeRaw(Object file, Map options, ProgressCallback progressCallback) throws IOException {`
`88`		`- return uploadLargeRaw(file, options, 20000000, progressCallback);`
	`89`	`+ return uploadLargeRaw(file, options, BUFFER_SIZE, progressCallback);`
`89`	`90`	`}`
`90`	`91`
`91`	`92`	`public Map uploadLargeRaw(Object file, Map options, int bufferSize) throws IOException {`
`@@ -104,7 +105,7 @@ public Map uploadLarge(Object file, Map options) throws IOException {`
`104`	`105`	`}`
`105`	`106`
`106`	`107`	`public Map uploadLarge(Object file, Map options, ProgressCallback progressCallback) throws IOException {`
`107`		`- int bufferSize = ObjectUtils.asInteger(options.get("chunk_size"), 20000000);`
	`108`	`+ int bufferSize = ObjectUtils.asInteger(options.get("chunk_size"), BUFFER_SIZE);`
`108`	`109`	`return uploadLarge(file, options, bufferSize, progressCallback);`
`109`	`110`	`}`
`110`	`111`