Merge pull request #524 from splitio/imp_track_field_fix

chillaq · web-flow · commit 17a0760e7d55 · 2024-12-18T09:44:57.000-08:00
correct field trackImpressions name
diff --git a/client/src/main/java/io/split/client/api/SplitView.java b/client/src/main/java/io/split/client/api/SplitView.java
@@ -26,7 +26,7 @@ public class SplitView {
     public Map<String, String> configs;
     public List<String> sets;
     public String defaultTreatment;
-    public boolean trackImpression;
+    public boolean trackImpressions;
 
     public static SplitView fromParsedSplit(ParsedSplit parsedSplit) {
         SplitView splitView = new SplitView();
@@ -47,7 +47,7 @@ public static SplitView fromParsedSplit(ParsedSplit parsedSplit) {
 
         splitView.treatments = new ArrayList<String>(treatments);
         splitView.configs = parsedSplit.configurations() == null? Collections.<String, String>emptyMap() : parsedSplit.configurations() ;
-        splitView.trackImpression = parsedSplit.trackImpression();
+        splitView.trackImpressions = parsedSplit.trackImpressions();
 
         return splitView;
     }
diff --git a/client/src/main/java/io/split/client/dtos/Split.java b/client/src/main/java/io/split/client/dtos/Split.java
@@ -18,7 +18,7 @@ public class Split {
     public int algo;
     public Map<String, String> configurations;
     public HashSet<String> sets;
-    public Boolean trackImpression = null;
+    public Boolean trackImpressions = null;
 
     @Override
     public String toString() {
diff --git a/client/src/main/java/io/split/engine/evaluator/EvaluatorImp.java b/client/src/main/java/io/split/engine/evaluator/EvaluatorImp.java
@@ -91,7 +91,7 @@ private TreatmentLabelAndChangeNumber getTreatment(String matchingKey, String bu
                         Labels.KILLED,
                         parsedSplit.changeNumber(),
                         config,
-                        parsedSplit.trackImpression());
+                        parsedSplit.trackImpressions());
             }
 
             /*
@@ -117,7 +117,7 @@ private TreatmentLabelAndChangeNumber getTreatment(String matchingKey, String bu
                             String config = parsedSplit.configurations() != null ?
                                     parsedSplit.configurations().get(parsedSplit.defaultTreatment()) : null;
                             return new TreatmentLabelAndChangeNumber(parsedSplit.defaultTreatment(), Labels.NOT_IN_SPLIT,
-                                    parsedSplit.changeNumber(), config, parsedSplit.trackImpression());
+                                    parsedSplit.changeNumber(), config, parsedSplit.trackImpressions());
                         }
 
                     }
@@ -132,7 +132,7 @@ private TreatmentLabelAndChangeNumber getTreatment(String matchingKey, String bu
                             parsedCondition.label(),
                             parsedSplit.changeNumber(),
                             config,
-                            parsedSplit.trackImpression());
+                            parsedSplit.trackImpressions());
                 }
             }
 
@@ -142,7 +142,7 @@ private TreatmentLabelAndChangeNumber getTreatment(String matchingKey, String bu
                     Labels.DEFAULT_RULE,
                     parsedSplit.changeNumber(),
                     config,
-                    parsedSplit.trackImpression());
+                    parsedSplit.trackImpressions());
         } catch (Exception e) {
             throw new ChangeNumberExceptionWrapper(e, parsedSplit.changeNumber());
         }
diff --git a/client/src/main/java/io/split/engine/experiments/ParsedSplit.java b/client/src/main/java/io/split/engine/experiments/ParsedSplit.java
@@ -32,7 +32,7 @@ public class ParsedSplit {
     private final int _algo;
     private final Map<String, String> _configurations;
     private final HashSet<String> _flagSets;
-    private final boolean _trackImpression;
+    private final boolean _trackImpressions;
 
     public static ParsedSplit createParsedSplitForTests(
             String feature,
@@ -44,7 +44,7 @@ public static ParsedSplit createParsedSplitForTests(
             long changeNumber,
             int algo,
             HashSet<String> flagSets,
-            boolean trackImpression
+            boolean trackImpressions
     ) {
         return new ParsedSplit(
                 feature,
@@ -59,7 +59,7 @@ public static ParsedSplit createParsedSplitForTests(
                 algo,
                 null,
                 flagSets,
-                trackImpression
+                trackImpressions
         );
     }
 
@@ -74,7 +74,7 @@ public static ParsedSplit createParsedSplitForTests(
             int algo,
             Map<String, String> configurations,
             HashSet<String> flagSets,
-            boolean trackImpression
+            boolean trackImpressions
     ) {
         return new ParsedSplit(
                 feature,
@@ -89,7 +89,7 @@ public static ParsedSplit createParsedSplitForTests(
                 algo,
                 configurations,
                 flagSets,
-                trackImpression
+                trackImpressions
         );
     }
 
@@ -106,7 +106,7 @@ public ParsedSplit(
             int algo,
             Map<String, String> configurations,
             HashSet<String> flagSets,
-            boolean trackImpression
+            boolean trackImpressions
     ) {
         _split = feature;
         _seed = seed;
@@ -123,7 +123,7 @@ public ParsedSplit(
         _trafficAllocationSeed = trafficAllocationSeed;
         _configurations = configurations;
         _flagSets = flagSets;
-        _trackImpression = trackImpression;
+        _trackImpressions = trackImpressions;
     }
 
     public String feature() {
@@ -167,8 +167,8 @@ public Map<String, String> configurations() {
         return _configurations;
     }
 
-    public boolean trackImpression() {
-        return _trackImpression;
+    public boolean trackImpressions() {
+        return _trackImpressions;
     }
 
     @Override
@@ -183,7 +183,7 @@ public int hashCode() {
         result = 31 * result + (int)(_changeNumber ^ (_changeNumber >>> 32));
         result = 31 * result + (_algo ^ (_algo >>> 32));
         result = 31 * result + (_configurations == null? 0 : _configurations.hashCode());
-        result = 31 * result + (_trackImpression ? 1 : 0);
+        result = 31 * result + (_trackImpressions ? 1 : 0);
         return result;
     }
 
@@ -204,7 +204,7 @@ public boolean equals(Object obj) {
                 && _changeNumber == other._changeNumber
                 && _algo == other._algo
                 && _configurations == null ? other._configurations == null : _configurations.equals(other._configurations)
-                && _trackImpression == other._trackImpression;
+                && _trackImpressions == other._trackImpressions;
     }
 
     @Override
@@ -228,8 +228,8 @@ public String toString() {
         bldr.append(_algo);
         bldr.append(", config:");
         bldr.append(_configurations);
-        bldr.append(", trackImpression:");
-        bldr.append(_trackImpression);
+        bldr.append(", trackImpressions:");
+        bldr.append(_trackImpressions);
         return bldr.toString();
 
     }
diff --git a/client/src/main/java/io/split/engine/experiments/SplitParser.java b/client/src/main/java/io/split/engine/experiments/SplitParser.java
@@ -66,9 +66,9 @@ public ParsedSplit parse(Split split) {
 
     private ParsedSplit parseWithoutExceptionHandling(Split split) {
         List<ParsedCondition> parsedConditionList = Lists.newArrayList();
-        if (Objects.isNull(split.trackImpression)) {
-            _log.debug("trackImpression field not detected for Feature flag `" + split.name + "`, setting it to `true`.");
-            split.trackImpression = true;
+        if (Objects.isNull(split.trackImpressions)) {
+            _log.debug("trackImpressions field not detected for Feature flag `" + split.name + "`, setting it to `true`.");
+            split.trackImpressions = true;
         }
         for (Condition condition : split.conditions) {
             List<Partition> partitions = condition.partitions;
@@ -95,7 +95,7 @@ private ParsedSplit parseWithoutExceptionHandling(Split split) {
                 split.algo,
                 split.configurations,
                 split.sets,
-                split.trackImpression);
+                split.trackImpressions);
     }
 
     private boolean checkUnsupportedMatcherExist(List<io.split.client.dtos.Matcher> matchers) {
diff --git a/client/src/main/java/io/split/storages/memory/InMemoryCacheImp.java b/client/src/main/java/io/split/storages/memory/InMemoryCacheImp.java
@@ -131,7 +131,7 @@ public void kill(String splitName, String defaultTreatment, long changeNumber) {
                 parsedSplit.algo(),
                 parsedSplit.configurations(),
                 parsedSplit.flagSets(),
-                parsedSplit.trackImpression()
+                parsedSplit.trackImpressions()
                 );
 
         _concurrentMap.put(splitName, updatedSplit);
diff --git a/client/src/test/java/io/split/client/SplitManagerImplTest.java b/client/src/test/java/io/split/client/SplitManagerImplTest.java
@@ -246,10 +246,10 @@ public void ImpressionToggleParseTest() throws IOException {
                 mock(SDKReadinessGates.class), TELEMETRY_STORAGE);
 
         SplitView splitView = splitManager.split("without_impression_toggle");
-        assertTrue(splitView.trackImpression);
+        assertTrue(splitView.trackImpressions);
         splitView = splitManager.split("impression_toggle_on");
-        assertTrue(splitView.trackImpression);
+        assertTrue(splitView.trackImpressions);
         splitView = splitManager.split("impression_toggle_off");
-        assertFalse(splitView.trackImpression);
+        assertFalse(splitView.trackImpressions);
     }
 }
diff --git a/client/src/test/java/io/split/engine/experiments/SplitParserTest.java b/client/src/test/java/io/split/engine/experiments/SplitParserTest.java
@@ -98,6 +98,8 @@ public void works() {
         ParsedSplit expected = ParsedSplit.createParsedSplitForTests("first.name", 123, false, Treatments.OFF, listOfMatcherAndSplits, "user", 1, 1, new HashSet<>(), true);
 
         Assert.assertEquals(actual, expected);
+        assertTrue(expected.hashCode() != 0);
+        assertTrue(expected.equals(expected));
     }
 
     @Test
@@ -650,15 +652,15 @@ public void ImpressionToggleParseTest() throws IOException {
         for (Split split : change.splits) {
             ParsedSplit parsedSplit = parser.parse(split);
             if (split.name.equals("without_impression_toggle")) {
-                assertTrue(parsedSplit.trackImpression());
+                assertTrue(parsedSplit.trackImpressions());
                 check1 = true;
             }
             if (split.name.equals("impression_toggle_on")) {
-                assertTrue(parsedSplit.trackImpression());
+                assertTrue(parsedSplit.trackImpressions());
                 check2 = true;
             }
             if (split.name.equals("impression_toggle_off")) {
-                assertFalse(parsedSplit.trackImpression());
+                assertFalse(parsedSplit.trackImpressions());
                 check3 = true;
             }
         }
diff --git a/client/src/test/resources/splits_imp_toggle.json b/client/src/test/resources/splits_imp_toggle.json
@@ -97,7 +97,7 @@
           "label": "default rule"
         }
       ],
-      "trackImpression": true
+      "trackImpressions": true
     },
     {
       "trafficTypeName": "user",
@@ -147,7 +147,7 @@
           "label": "default rule"
         }
       ],
-      "trackImpression": false
+      "trackImpressions": false
     }
   ],
   "since": -1,

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ private TreatmentLabelAndChangeNumber getTreatment(String matchingKey, String bu`
`91`	`91`	`Labels.KILLED,`
`92`	`92`	`parsedSplit.changeNumber(),`
`93`	`93`	`config,`
`94`		`- parsedSplit.trackImpression());`
	`94`	`+ parsedSplit.trackImpressions());`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`/*`
`@@ -117,7 +117,7 @@ private TreatmentLabelAndChangeNumber getTreatment(String matchingKey, String bu`
`117`	`117`	`String config = parsedSplit.configurations() != null ?`
`118`	`118`	`parsedSplit.configurations().get(parsedSplit.defaultTreatment()) : null;`
`119`	`119`	`return new TreatmentLabelAndChangeNumber(parsedSplit.defaultTreatment(), Labels.NOT_IN_SPLIT,`
`120`		`- parsedSplit.changeNumber(), config, parsedSplit.trackImpression());`
	`120`	`+ parsedSplit.changeNumber(), config, parsedSplit.trackImpressions());`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`}`
`@@ -132,7 +132,7 @@ private TreatmentLabelAndChangeNumber getTreatment(String matchingKey, String bu`
`132`	`132`	`parsedCondition.label(),`
`133`	`133`	`parsedSplit.changeNumber(),`
`134`	`134`	`config,`
`135`		`- parsedSplit.trackImpression());`
	`135`	`+ parsedSplit.trackImpressions());`
`136`	`136`	`}`
`137`	`137`	`}`
`138`	`138`
`@@ -142,7 +142,7 @@ private TreatmentLabelAndChangeNumber getTreatment(String matchingKey, String bu`
`142`	`142`	`Labels.DEFAULT_RULE,`
`143`	`143`	`parsedSplit.changeNumber(),`
`144`	`144`	`config,`
`145`		`- parsedSplit.trackImpression());`
	`145`	`+ parsedSplit.trackImpressions());`
`146`	`146`	`} catch (Exception e) {`
`147`	`147`	`throw new ChangeNumberExceptionWrapper(e, parsedSplit.changeNumber());`
`148`	`148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -246,10 +246,10 @@ public void ImpressionToggleParseTest() throws IOException {`
`246`	`246`	`mock(SDKReadinessGates.class), TELEMETRY_STORAGE);`
`247`	`247`
`248`	`248`	`SplitView splitView = splitManager.split("without_impression_toggle");`
`249`		`- assertTrue(splitView.trackImpression);`
	`249`	`+ assertTrue(splitView.trackImpressions);`
`250`	`250`	`splitView = splitManager.split("impression_toggle_on");`
`251`		`- assertTrue(splitView.trackImpression);`
	`251`	`+ assertTrue(splitView.trackImpressions);`
`252`	`252`	`splitView = splitManager.split("impression_toggle_off");`
`253`		`- assertFalse(splitView.trackImpression);`
	`253`	`+ assertFalse(splitView.trackImpressions);`
`254`	`254`	`}`
`255`	`255`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,8 @@ public void works() {`
`98`	`98`	`ParsedSplit expected = ParsedSplit.createParsedSplitForTests("first.name", 123, false, Treatments.OFF, listOfMatcherAndSplits, "user", 1, 1, new HashSet<>(), true);`
`99`	`99`
`100`	`100`	`Assert.assertEquals(actual, expected);`
	`101`	`+ assertTrue(expected.hashCode() != 0);`
	`102`	`+ assertTrue(expected.equals(expected));`
`101`	`103`	`}`
`102`	`104`
`103`	`105`	`@Test`
`@@ -650,15 +652,15 @@ public void ImpressionToggleParseTest() throws IOException {`
`650`	`652`	`for (Split split : change.splits) {`
`651`	`653`	`ParsedSplit parsedSplit = parser.parse(split);`
`652`	`654`	`if (split.name.equals("without_impression_toggle")) {`
`653`		`- assertTrue(parsedSplit.trackImpression());`
	`655`	`+ assertTrue(parsedSplit.trackImpressions());`
`654`	`656`	`check1 = true;`
`655`	`657`	`}`
`656`	`658`	`if (split.name.equals("impression_toggle_on")) {`
`657`		`- assertTrue(parsedSplit.trackImpression());`
	`659`	`+ assertTrue(parsedSplit.trackImpressions());`
`658`	`660`	`check2 = true;`
`659`	`661`	`}`
`660`	`662`	`if (split.name.equals("impression_toggle_off")) {`
`661`		`- assertFalse(parsedSplit.trackImpression());`
	`663`	`+ assertFalse(parsedSplit.trackImpressions());`
`662`	`664`	`check3 = true;`
`663`	`665`	`}`
`664`	`666`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@`
`97`	`97`	`"label": "default rule"`
`98`	`98`	`}`
`99`	`99`	`],`
`100`		`- "trackImpression": true`
	`100`	`+ "trackImpressions": true`
`101`	`101`	`},`
`102`	`102`	`{`
`103`	`103`	`"trafficTypeName": "user",`
`@@ -147,7 +147,7 @@`
`147`	`147`	`"label": "default rule"`
`148`	`148`	`}`
`149`	`149`	`],`
`150`		`- "trackImpression": false`
	`150`	`+ "trackImpressions": false`
`151`	`151`	`}`
`152`	`152`	`],`
`153`	`153`	`"since": -1,`