Skip to content

Commit 17a0760

Browse files
chillaqchillaq
authored
Merge pull request #524 from splitio/imp_track_field_fix
correct field trackImpressions name
2 parents 747ca31 + 1064243 commit 17a0760

9 files changed

Lines changed: 35 additions & 33 deletions

File tree

‎client/src/main/java/io/split/client/api/SplitView.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class SplitView {
2626
public Map<String, String> configs;
2727
public List<String> sets;
2828
public String defaultTreatment;
29-
public boolean trackImpression;
29+
public boolean trackImpressions;
3030

3131
public static SplitView fromParsedSplit(ParsedSplit parsedSplit) {
3232
SplitView splitView = new SplitView();
@@ -47,7 +47,7 @@ public static SplitView fromParsedSplit(ParsedSplit parsedSplit) {
4747

4848
splitView.treatments = new ArrayList<String>(treatments);
4949
splitView.configs = parsedSplit.configurations() == null? Collections.<String, String>emptyMap() : parsedSplit.configurations() ;
50-
splitView.trackImpression = parsedSplit.trackImpression();
50+
splitView.trackImpressions = parsedSplit.trackImpressions();
5151

5252
return splitView;
5353
}

‎client/src/main/java/io/split/client/dtos/Split.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class Split {
1818
public int algo;
1919
public Map<String, String> configurations;
2020
public HashSet<String> sets;
21-
public Boolean trackImpression = null;
21+
public Boolean trackImpressions = null;
2222

2323
@Override
2424
public String toString() {

‎client/src/main/java/io/split/engine/evaluator/EvaluatorImp.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ private TreatmentLabelAndChangeNumber getTreatment(String matchingKey, String bu
9191
Labels.KILLED,
9292
parsedSplit.changeNumber(),
9393
config,
94-
parsedSplit.trackImpression());
94+
parsedSplit.trackImpressions());
9595
}
9696

9797
/*
@@ -117,7 +117,7 @@ private TreatmentLabelAndChangeNumber getTreatment(String matchingKey, String bu
117117
String config = parsedSplit.configurations() != null ?
118118
parsedSplit.configurations().get(parsedSplit.defaultTreatment()) : null;
119119
return new TreatmentLabelAndChangeNumber(parsedSplit.defaultTreatment(), Labels.NOT_IN_SPLIT,
120-
parsedSplit.changeNumber(), config, parsedSplit.trackImpression());
120+
parsedSplit.changeNumber(), config, parsedSplit.trackImpressions());
121121
}
122122

123123
}
@@ -132,7 +132,7 @@ private TreatmentLabelAndChangeNumber getTreatment(String matchingKey, String bu
132132
parsedCondition.label(),
133133
parsedSplit.changeNumber(),
134134
config,
135-
parsedSplit.trackImpression());
135+
parsedSplit.trackImpressions());
136136
}
137137
}
138138

@@ -142,7 +142,7 @@ private TreatmentLabelAndChangeNumber getTreatment(String matchingKey, String bu
142142
Labels.DEFAULT_RULE,
143143
parsedSplit.changeNumber(),
144144
config,
145-
parsedSplit.trackImpression());
145+
parsedSplit.trackImpressions());
146146
} catch (Exception e) {
147147
throw new ChangeNumberExceptionWrapper(e, parsedSplit.changeNumber());
148148
}

‎client/src/main/java/io/split/engine/experiments/ParsedSplit.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class ParsedSplit {
3232
private final int _algo;
3333
private final Map<String, String> _configurations;
3434
private final HashSet<String> _flagSets;
35-
private final boolean _trackImpression;
35+
private final boolean _trackImpressions;
3636

3737
public static ParsedSplit createParsedSplitForTests(
3838
String feature,
@@ -44,7 +44,7 @@ public static ParsedSplit createParsedSplitForTests(
4444
long changeNumber,
4545
int algo,
4646
HashSet<String> flagSets,
47-
boolean trackImpression
47+
boolean trackImpressions
4848
) {
4949
return new ParsedSplit(
5050
feature,
@@ -59,7 +59,7 @@ public static ParsedSplit createParsedSplitForTests(
5959
algo,
6060
null,
6161
flagSets,
62-
trackImpression
62+
trackImpressions
6363
);
6464
}
6565

@@ -74,7 +74,7 @@ public static ParsedSplit createParsedSplitForTests(
7474
int algo,
7575
Map<String, String> configurations,
7676
HashSet<String> flagSets,
77-
boolean trackImpression
77+
boolean trackImpressions
7878
) {
7979
return new ParsedSplit(
8080
feature,
@@ -89,7 +89,7 @@ public static ParsedSplit createParsedSplitForTests(
8989
algo,
9090
configurations,
9191
flagSets,
92-
trackImpression
92+
trackImpressions
9393
);
9494
}
9595

@@ -106,7 +106,7 @@ public ParsedSplit(
106106
int algo,
107107
Map<String, String> configurations,
108108
HashSet<String> flagSets,
109-
boolean trackImpression
109+
boolean trackImpressions
110110
) {
111111
_split = feature;
112112
_seed = seed;
@@ -123,7 +123,7 @@ public ParsedSplit(
123123
_trafficAllocationSeed = trafficAllocationSeed;
124124
_configurations = configurations;
125125
_flagSets = flagSets;
126-
_trackImpression = trackImpression;
126+
_trackImpressions = trackImpressions;
127127
}
128128

129129
public String feature() {
@@ -167,8 +167,8 @@ public Map<String, String> configurations() {
167167
return _configurations;
168168
}
169169

170-
public boolean trackImpression() {
171-
return _trackImpression;
170+
public boolean trackImpressions() {
171+
return _trackImpressions;
172172
}
173173

174174
@Override
@@ -183,7 +183,7 @@ public int hashCode() {
183183
result = 31 * result + (int)(_changeNumber ^ (_changeNumber >>> 32));
184184
result = 31 * result + (_algo ^ (_algo >>> 32));
185185
result = 31 * result + (_configurations == null? 0 : _configurations.hashCode());
186-
result = 31 * result + (_trackImpression ? 1 : 0);
186+
result = 31 * result + (_trackImpressions ? 1 : 0);
187187
return result;
188188
}
189189

@@ -204,7 +204,7 @@ public boolean equals(Object obj) {
204204
&& _changeNumber == other._changeNumber
205205
&& _algo == other._algo
206206
&& _configurations == null ? other._configurations == null : _configurations.equals(other._configurations)
207-
&& _trackImpression == other._trackImpression;
207+
&& _trackImpressions == other._trackImpressions;
208208
}
209209

210210
@Override
@@ -228,8 +228,8 @@ public String toString() {
228228
bldr.append(_algo);
229229
bldr.append(", config:");
230230
bldr.append(_configurations);
231-
bldr.append(", trackImpression:");
232-
bldr.append(_trackImpression);
231+
bldr.append(", trackImpressions:");
232+
bldr.append(_trackImpressions);
233233
return bldr.toString();
234234

235235
}

‎client/src/main/java/io/split/engine/experiments/SplitParser.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ public ParsedSplit parse(Split split) {
6666

6767
private ParsedSplit parseWithoutExceptionHandling(Split split) {
6868
List<ParsedCondition> parsedConditionList = Lists.newArrayList();
69-
if (Objects.isNull(split.trackImpression)) {
70-
_log.debug("trackImpression field not detected for Feature flag `" + split.name + "`, setting it to `true`.");
71-
split.trackImpression = true;
69+
if (Objects.isNull(split.trackImpressions)) {
70+
_log.debug("trackImpressions field not detected for Feature flag `" + split.name + "`, setting it to `true`.");
71+
split.trackImpressions = true;
7272
}
7373
for (Condition condition : split.conditions) {
7474
List<Partition> partitions = condition.partitions;
@@ -95,7 +95,7 @@ private ParsedSplit parseWithoutExceptionHandling(Split split) {
9595
split.algo,
9696
split.configurations,
9797
split.sets,
98-
split.trackImpression);
98+
split.trackImpressions);
9999
}
100100

101101
private boolean checkUnsupportedMatcherExist(List<io.split.client.dtos.Matcher> matchers) {

‎client/src/main/java/io/split/storages/memory/InMemoryCacheImp.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public void kill(String splitName, String defaultTreatment, long changeNumber) {
131131
parsedSplit.algo(),
132132
parsedSplit.configurations(),
133133
parsedSplit.flagSets(),
134-
parsedSplit.trackImpression()
134+
parsedSplit.trackImpressions()
135135
);
136136

137137
_concurrentMap.put(splitName, updatedSplit);

‎client/src/test/java/io/split/client/SplitManagerImplTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,10 +246,10 @@ public void ImpressionToggleParseTest() throws IOException {
246246
mock(SDKReadinessGates.class), TELEMETRY_STORAGE);
247247

248248
SplitView splitView = splitManager.split("without_impression_toggle");
249-
assertTrue(splitView.trackImpression);
249+
assertTrue(splitView.trackImpressions);
250250
splitView = splitManager.split("impression_toggle_on");
251-
assertTrue(splitView.trackImpression);
251+
assertTrue(splitView.trackImpressions);
252252
splitView = splitManager.split("impression_toggle_off");
253-
assertFalse(splitView.trackImpression);
253+
assertFalse(splitView.trackImpressions);
254254
}
255255
}

‎client/src/test/java/io/split/engine/experiments/SplitParserTest.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,8 @@ public void works() {
9898
ParsedSplit expected = ParsedSplit.createParsedSplitForTests("first.name", 123, false, Treatments.OFF, listOfMatcherAndSplits, "user", 1, 1, new HashSet<>(), true);
9999

100100
Assert.assertEquals(actual, expected);
101+
assertTrue(expected.hashCode() != 0);
102+
assertTrue(expected.equals(expected));
101103
}
102104

103105
@Test
@@ -650,15 +652,15 @@ public void ImpressionToggleParseTest() throws IOException {
650652
for (Split split : change.splits) {
651653
ParsedSplit parsedSplit = parser.parse(split);
652654
if (split.name.equals("without_impression_toggle")) {
653-
assertTrue(parsedSplit.trackImpression());
655+
assertTrue(parsedSplit.trackImpressions());
654656
check1 = true;
655657
}
656658
if (split.name.equals("impression_toggle_on")) {
657-
assertTrue(parsedSplit.trackImpression());
659+
assertTrue(parsedSplit.trackImpressions());
658660
check2 = true;
659661
}
660662
if (split.name.equals("impression_toggle_off")) {
661-
assertFalse(parsedSplit.trackImpression());
663+
assertFalse(parsedSplit.trackImpressions());
662664
check3 = true;
663665
}
664666
}

‎client/src/test/resources/splits_imp_toggle.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
"label": "default rule"
9898
}
9999
],
100-
"trackImpression": true
100+
"trackImpressions": true
101101
},
102102
{
103103
"trafficTypeName": "user",
@@ -147,7 +147,7 @@
147147
"label": "default rule"
148148
}
149149
],
150-
"trackImpression": false
150+
"trackImpressions": false
151151
}
152152
],
153153
"since": -1,

0 commit comments

Comments
 (0)