Add support to analytics if query params already exist

Author: adimiz1

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

@@ -419,7 +419,9 @@ public String generate(String source) {
             }
         }
         if (AnalyticsUtils.token != null) {
-            url = (new StringBuilder()).append(url).append(AnalyticsUtils.analyticsPrefix).append(AnalyticsUtils.token).toString();
+            if(!AnalyticsUtils.checkIfQueryParamExist(url)) {
+                url = (new StringBuilder()).append(url).append(AnalyticsUtils.analyticsPrefix).append(AnalyticsUtils.token).toString();
+            }
         }
         return url;
     }

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

@@ -1,6 +1,21 @@
 package com.cloudinary.utils;
 
+import java.net.MalformedURLException;
+import java.net.URL;
+
 public class AnalyticsUtils {
     public static String analyticsPrefix = "?_a=";
     public static String token = null;
+
+    public static Boolean checkIfQueryParamExist(String urlString) {
+        try {
+            URL url = new URL(urlString);
+            if (url.getQuery() == null) {
+                return false;
+            }
+        } catch (MalformedURLException e) {
+            return true;
+        }
+        return true;
+    }
 }

cloudinary-core/src/test/java/com/cloudinary/AuthTokenTest.java

@@ -1,5 +1,6 @@
 package com.cloudinary;
 
+import com.cloudinary.utils.AnalyticsUtils;
 import org.hamcrest.Matchers;
 import org.junit.Before;
 import org.junit.Rule;
@@ -92,6 +93,15 @@ public void testAuthenticatedUrl() {
 
     }
 
+    @Test
+    public void testUrlAnalyticsWithQueryParams() {
+        cloudinary.config.privateCdn = true;
+        String url = cloudinary.url().signed(true).type("authenticated").generate("test");
+        assertEquals(url,"http://test123-res.cloudinary.com/image/authenticated/test?__cld_token__=st=11111111~exp=11111411~hmac=735a49389a72ac0b90d1a84ac5d43facd1a9047f153b39e914747ef6ed195e53");
+        AnalyticsUtils.token = null;
+        cloudinary.config.privateCdn = false;
+    }
+
     @Test
     public void testConfiguration() {
         cloudinary = new Cloudinary("cloudinary://a:b@test123?load_strategies=false&auth_token[key]=aabbcc112233&auth_token[duration]=200");

cloudinary-core/src/test/java/com/cloudinary/test/CloudinaryTest.java

@@ -1470,4 +1470,6 @@ public void testUrlWithNoAnalytics() {
         String url = cloudinary.url().generate("test");
         assertEquals(url,"http://res.cloudinary.com/test123/image/upload/test");
     }
+
+
 }