Add analytics feature flag support

adimiz1 · web-flow · commit b4694e7d1f5d · 2024-02-15T15:52:02.000+02:00
diff --git a/cloudinary-core/src/main/java/com/cloudinary/utils/Analytics.java b/cloudinary-core/src/main/java/com/cloudinary/utils/Analytics.java
@@ -16,15 +16,18 @@ public class Analytics {
     public String osType;
     public String osVersion;
 
+    public String featureFlag = "0";
+
     public Analytics() {
-        this("G", Cloudinary.VERSION,System.getProperty("java.version"), "Z", "0.0");
+        this("G", Cloudinary.VERSION,System.getProperty("java.version"), "Z", "0.0", "0");
     }
-    public Analytics(String sdkCode, String sdkVersion, String techVersion, String osType, String osVersion) {
+    public Analytics(String sdkCode, String sdkVersion, String techVersion, String osType, String osVersion, String featureFlag) {
         this.SDKCode = sdkCode;
         this.SDKSemver = sdkVersion;
         this.techVersion = techVersion;
         this.osType = osType;
         this.osVersion = osVersion;
+        this.featureFlag = featureFlag;
     }
 
     public Analytics setSDKCode(String SDKCode) {
@@ -42,13 +45,18 @@ public Analytics setTechVersion(String techVersion) {
         return this;
     }
 
+    public Analytics setFeatureFlag(String flag) {
+        this.featureFlag = flag;
+        return this;
+    }
+
     /**
      * Function turn analytics variables into viable query parameter.
      * @return query param with analytics values.
      */
     public String toQueryParam() {
         try {
-            return sdkTokenQueryKey + sdkQueryDelimiter + getAlgorithmVersion() + prodcut + getSDKType() + getSDKVersion() + getTechVersion() + getOsType() + getOsVersion() + getSDKFeatureCode();
+            return sdkTokenQueryKey + sdkQueryDelimiter + getAlgorithmVersion() + prodcut + getSDKType() + getSDKVersion() + getTechVersion() + getOsType() + getOsVersion() + getSDKFeatureFlag();
         } catch (Exception e) {
             return sdkTokenQueryKey + sdkQueryDelimiter + "E";
         }
@@ -90,8 +98,8 @@ private String getAlgorithmVersion() {
         return algoVersion;
     }
 
-    private String getSDKFeatureCode() {
-        return "0";
+    private String getSDKFeatureFlag() {
+        return featureFlag;
     }
 
     private String getSDKVersion() throws Exception {
diff --git a/cloudinary-core/src/test/java/com/cloudinary/analytics/AnalyticsTest.java b/cloudinary-core/src/test/java/com/cloudinary/analytics/AnalyticsTest.java
@@ -51,19 +51,19 @@ public void testEncodeVersion() {
 
     @Test
     public void testToQueryParam() {
-        Analytics analytics = new Analytics("F", "2.0.0", "1.8.0", "Z", "1.34.0");
+        Analytics analytics = new Analytics("F", "2.0.0", "1.8.0", "Z", "1.34.0", "0");
         String result = analytics.toQueryParam();
         Assert.assertEquals(result, "_a=DAFAACMhZBi0");
 
-        analytics = new Analytics("F", "2.0.0", "1.8.0", "Z", "16.3");
+        analytics = new Analytics("F", "2.0.0", "1.8.0", "Z", "16.3", "0");
         result = analytics.toQueryParam();
         Assert.assertEquals(result, "_a=DAFAACMhZQD0");
     }
 
     @Test
     public void testUrlWithAnalytics() {
         cloudinary.config.analytics = true;
-        cloudinary.setAnalytics(new Analytics("F", "2.0.0", "1.8.0", "Z", "1.34.0"));
+        cloudinary.setAnalytics(new Analytics("F", "2.0.0", "1.8.0", "Z", "1.34.0", "0"));
         String url = cloudinary.url().generate("test");
         Assert.assertEquals(url, "http://res.cloudinary.com/test123/image/upload/test?_a=DAFAACMhZBi0");
     }
@@ -99,15 +99,15 @@ public void testUrlWithNoAnalyticsNullAndTrue() {
     @Test
     public void testMiscAnalyticsObject() {
         cloudinary.config.analytics = true;
-        Analytics analytics = new Analytics("Z", "1.24.0", "12.0.0", "Z", "1.34.0");
+        Analytics analytics = new Analytics("Z", "1.24.0", "12.0.0", "Z", "1.34.0", "0");
         String result = analytics.toQueryParam();
         Assert.assertEquals(result, "_a=DAZAlhAMZBi0");
     }
 
     @Test
     public void testErrorAnalytics() {
         cloudinary.config.analytics = true;
-        Analytics analytics = new Analytics("Z", "1.24.0", "0", "Z", "1.34.0");
+        Analytics analytics = new Analytics("Z", "1.24.0", "0", "Z", "1.34.0", "0");
         String result = analytics.toQueryParam();
         Assert.assertEquals(result, "_a=E");
     }
@@ -120,13 +120,21 @@ public void testUrlNoAnalyticsWithQueryParams() {
         cloudinary.config.cloudName = "test123";
 
         cloudinary.config.analytics = true;
-        cloudinary.setAnalytics(new Analytics("F", "2.0.0", System.getProperty("java.version"), "Z", System.getProperty("os.version")));
+        cloudinary.setAnalytics(new Analytics("F", "2.0.0", System.getProperty("java.version"), "Z", System.getProperty("os.version"), "0"));
         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");
         cloudinary.config.privateCdn = false;
     }
 
+    @Test
+    public void testFeatureFlag() {
+        Analytics analytics = new Analytics("F", "2.0.0", "1.8.0", "Z", "1.34.0", "0");
+        analytics.setFeatureFlag("F");
+        String result = analytics.toQueryParam();
+        Assert.assertEquals(result, "_a=DAFAACMhZBiF");
+    }
+
     @After
     public void tearDown() {
         cloudinary.config.analytics = false;
