Add Analytics support

Author: adimiz1

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

@@ -155,9 +155,9 @@ public void setUserAgent(String prefix, String version){
     }
 
     /**
-     * Set the prefix and version for the user agent that will be sent with every API call
+     * Set the analytics object that will be sent with every URL generation call.
      * a userAgent is built from `prefix/version (additional data)`
-     * @param analytics - the analytics objec to set
+     * @param analytics - the analytics object to set
      */
     public void setAnalytics(Analytics analytics) {
         this.analytics = analytics;

cloudinary-core/src/main/java/com/cloudinary/utils/Analytics.java

@@ -4,7 +4,8 @@
 import java.util.List;
 
 public class Analytics {
-    private String sdkTokenQueryKey = "_a="; //sdkTokenQueryKey
+    private String sdkTokenQueryKey = "_a"; //sdkTokenQueryKey
+    private String sdkQueryDelimiter = "=";
     public String algoVersion = "A";
     public String SDKCode = ""; // Java = G, Android = F
     public String SDKSemver = ""; // Calculate the SDK version .
@@ -42,9 +43,9 @@ public Analytics setTechVersion(String techVersion) {
      */
     public String toQueryParam() {
         try {
-            return sdkTokenQueryKey + getAlgorithmVersion() + getSDKType() + getSDKVersion() + getTechVersion() + getSDKFeatureCode();
+            return sdkTokenQueryKey + sdkQueryDelimiter + getAlgorithmVersion() + getSDKType() + getSDKVersion() + getTechVersion() + getSDKFeatureCode();
         } catch (Exception e) {
-            return sdkTokenQueryKey + "E";
+            return sdkTokenQueryKey + sdkQueryDelimiter + "E";
         }
     }
 
@@ -91,7 +92,7 @@ private String getPaddedString(String string) throws Exception {
         }
 
         String result = "";
-        List<String> resultList = StringUtils.usingPattern(paddedBinary,6);
+        List<String> resultList = StringUtils.getAllSubStringWithSize(paddedBinary,6);
         int i = 0;
         while (i < resultList.size()) {
             result = result + Base64Map.values.get(resultList.get(i));

cloudinary-core/src/main/java/com/cloudinary/utils/StringUtils.java

@@ -436,7 +436,7 @@ public static String padStart(String inputString, int length, char paddingCharac
      * @param n Size of group
      * @return List with all strings with group size n.
      */
-    public static List<String> usingPattern(String text, int n) {
+    public static List<String> getAllSubStringWithSize(String text, int n) {
         List<String> results = new ArrayList<>();
 
         Pattern pattern = Pattern.compile(".{1," + n + "}");

cloudinary-core/src/test/java/com/cloudinary/analytics/AnalyticsTest.java

@@ -2,10 +2,7 @@
 
 import com.cloudinary.Cloudinary;
 import com.cloudinary.utils.Analytics;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.*;
 import org.junit.rules.TestName;
 
 public class AnalyticsTest {
@@ -34,34 +31,26 @@ public void testUrlWithAnalytics() {
         cloudinary.setAnalytics(new Analytics("F", "2.0.0", "1.8.0"));
         String url = cloudinary.url().generate("test");
         Assert.assertEquals(url, "http://res.cloudinary.com/test123/image/upload/test?_a=AFAACMh0");
-        cloudinary.config.analytics = false;
-        cloudinary.analytics = null;
     }
 
     @Test
     public void testUrlWithNoAnalytics() {
         String url = cloudinary.url().generate("test");
         Assert.assertEquals(url, "http://res.cloudinary.com/test123/image/upload/test");
-        cloudinary.config.analytics = false;
-        cloudinary.analytics = null;
     }
 
     @Test
     public void testUrlWithNoAnalyticsDefined() {
         cloudinary.config.analytics = false;
         String url = cloudinary.url().generate("test");
         Assert.assertEquals(url, "http://res.cloudinary.com/test123/image/upload/test");
-        cloudinary.config.analytics = false;
-        cloudinary.analytics = null;
     }
 
     @Test
     public void testUrlWithNoAnalyticsNull() {
         cloudinary.analytics = null;
         String url = cloudinary.url().generate("test");
         Assert.assertEquals(url, "http://res.cloudinary.com/test123/image/upload/test");
-        cloudinary.config.analytics = false;
-        cloudinary.analytics = null;
     }
 
     @Test
@@ -70,8 +59,6 @@ public void testUrlWithNoAnalyticsNullAndTrue() {
         cloudinary.analytics = null;
         String url = cloudinary.url().generate("test");
         Assert.assertEquals(url, "http://res.cloudinary.com/test123/image/upload/test");
-        cloudinary.config.analytics = false;
-        cloudinary.analytics = null;
     }
 
     @Test
@@ -90,4 +77,10 @@ public void testErrorAnalytics() {
         Assert.assertEquals(result, "_a=E");
     }
 
+    @After
+    public void tearDown() {
+        cloudinary.config.analytics = false;
+        cloudinary.analytics = null;
+    }
+
 }