Skip to content

Commit 3948497

Browse files
author
Bilal Al
committed
renamed trackImpressions field
1 parent 17a0760 commit 3948497

File tree

12 files changed

+120
-120
lines changed

12 files changed

+120
-120
lines changed

‎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 trackImpressions;
29+
public boolean impressionsDisabled;
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.trackImpressions = parsedSplit.trackImpressions();
50+
splitView.impressionsDisabled = parsedSplit.impressionsDisabled();
5151

5252
return splitView;
5353
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44

55
public class DecoratedImpression {
66
private Impression impression;
7-
private boolean track;
7+
private boolean disabled;
88

9-
public DecoratedImpression(Impression impression, boolean track) {
9+
public DecoratedImpression(Impression impression, boolean disabled) {
1010
this.impression = impression;
11-
this.track = track;
11+
this.disabled = disabled;
1212
}
1313

1414
public Impression impression() { return this.impression;}
1515

16-
public boolean track() { return this.track;}
16+
public boolean disabled() { return this.disabled;}
1717
}
1818

‎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 trackImpressions = null;
21+
public Boolean impressionsDisabled = null;
2222

2323
@Override
2424
public String toString() {

‎client/src/main/java/io/split/client/impressions/ImpressionsManagerImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public void track(List<DecoratedImpression> decoratedImpressions) {
132132

133133
for (int i = 0; i < decoratedImpressions.size(); i++) {
134134
ImpressionsResult impressionsResult;
135-
if (decoratedImpressions.get(i).track()) {
135+
if (!decoratedImpressions.get(i).disabled()) {
136136
impressionsResult = _processImpressionStrategy.process(Stream.of(
137137
decoratedImpressions.get(i).impression()).collect(Collectors.toList()));
138138
} else {

‎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.trackImpressions());
94+
parsedSplit.impressionsDisabled());
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.trackImpressions());
120+
parsedSplit.changeNumber(), config, parsedSplit.impressionsDisabled());
121121
}
122122

123123
}
@@ -132,7 +132,7 @@ private TreatmentLabelAndChangeNumber getTreatment(String matchingKey, String bu
132132
parsedCondition.label(),
133133
parsedSplit.changeNumber(),
134134
config,
135-
parsedSplit.trackImpressions());
135+
parsedSplit.impressionsDisabled());
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.trackImpressions());
145+
parsedSplit.impressionsDisabled());
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 _trackImpressions;
35+
private final boolean _impressionsDisabled;
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 trackImpressions
47+
boolean impressionsDisabled
4848
) {
4949
return new ParsedSplit(
5050
feature,
@@ -59,7 +59,7 @@ public static ParsedSplit createParsedSplitForTests(
5959
algo,
6060
null,
6161
flagSets,
62-
trackImpressions
62+
impressionsDisabled
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 trackImpressions
77+
boolean impressionsDisabled
7878
) {
7979
return new ParsedSplit(
8080
feature,
@@ -89,7 +89,7 @@ public static ParsedSplit createParsedSplitForTests(
8989
algo,
9090
configurations,
9191
flagSets,
92-
trackImpressions
92+
impressionsDisabled
9393
);
9494
}
9595

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

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

170-
public boolean trackImpressions() {
171-
return _trackImpressions;
170+
public boolean impressionsDisabled() {
171+
return _impressionsDisabled;
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 + (_trackImpressions ? 1 : 0);
186+
result = 31 * result + (_impressionsDisabled ? 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-
&& _trackImpressions == other._trackImpressions;
207+
&& _impressionsDisabled == other._impressionsDisabled;
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(", trackImpressions:");
232-
bldr.append(_trackImpressions);
231+
bldr.append(", impressionsDisabled:");
232+
bldr.append(_impressionsDisabled);
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.trackImpressions)) {
70-
_log.debug("trackImpressions field not detected for Feature flag `" + split.name + "`, setting it to `true`.");
71-
split.trackImpressions = true;
69+
if (Objects.isNull(split.impressionsDisabled)) {
70+
_log.debug("impressionsDisabled field not detected for Feature flag `" + split.name + "`, setting it to `false`.");
71+
split.impressionsDisabled = false;
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.trackImpressions);
98+
split.impressionsDisabled);
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.trackImpressions()
134+
parsedSplit.impressionsDisabled()
135135
);
136136

137137
_concurrentMap.put(splitName, updatedSplit);

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public void splitCallWithExistentSplit() {
6565
String existent = "existent";
6666

6767
SplitCacheConsumer splitCacheConsumer = mock(SplitCacheConsumer.class);
68-
ParsedSplit response = ParsedSplit.createParsedSplitForTests("FeatureName", 123, true, "off", Lists.newArrayList(getTestCondition("off")), "traffic", 456L, 1, new HashSet<>(), true);
68+
ParsedSplit response = ParsedSplit.createParsedSplitForTests("FeatureName", 123, true, "off", Lists.newArrayList(getTestCondition("off")), "traffic", 456L, 1, new HashSet<>(), false);
6969
when(splitCacheConsumer.get(existent)).thenReturn(response);
7070

7171
SplitManagerImpl splitManager = new SplitManagerImpl(splitCacheConsumer,
@@ -91,7 +91,7 @@ public void splitCallWithExistentSplitAndConfigs() {
9191
Map<String, String> configurations = new HashMap<>();
9292
configurations.put(Treatments.OFF, "{\"size\" : 30}");
9393

94-
ParsedSplit response = ParsedSplit.createParsedSplitForTests("FeatureName", 123, true, "off", Lists.newArrayList(getTestCondition("off")), "traffic", 456L, 1, configurations, new HashSet<>(), true);
94+
ParsedSplit response = ParsedSplit.createParsedSplitForTests("FeatureName", 123, true, "off", Lists.newArrayList(getTestCondition("off")), "traffic", 456L, 1, configurations, new HashSet<>(), false);
9595
when(splitCacheConsumer.get(existent)).thenReturn(response);
9696

9797
SplitManagerImpl splitManager = new SplitManagerImpl(splitCacheConsumer,
@@ -127,7 +127,7 @@ public void splitsCallWithSplit() {
127127
List<ParsedSplit> parsedSplits = Lists.newArrayList();
128128
SDKReadinessGates gates = mock(SDKReadinessGates.class);
129129
when(gates.isSDKReady()).thenReturn(false);
130-
ParsedSplit response = ParsedSplit.createParsedSplitForTests("FeatureName", 123, true, "off", Lists.newArrayList(getTestCondition("off")), "traffic", 456L, 1, new HashSet<>(), true);
130+
ParsedSplit response = ParsedSplit.createParsedSplitForTests("FeatureName", 123, true, "off", Lists.newArrayList(getTestCondition("off")), "traffic", 456L, 1, new HashSet<>(), false);
131131
parsedSplits.add(response);
132132

133133
when(splitCacheConsumer.getAll()).thenReturn(parsedSplits);
@@ -202,7 +202,7 @@ public void splitCallWithExistentSets() {
202202
String existent = "existent";
203203
SplitCacheConsumer splitCacheConsumer = mock(SplitCacheConsumer.class);
204204
ParsedSplit response = ParsedSplit.createParsedSplitForTests("FeatureName", 123, true, "off",
205-
Lists.newArrayList(getTestCondition("off")), "traffic", 456L, 1, new HashSet<>(Arrays.asList("set1", "set2", "set3")), true);
205+
Lists.newArrayList(getTestCondition("off")), "traffic", 456L, 1, new HashSet<>(Arrays.asList("set1", "set2", "set3")), false);
206206
when(splitCacheConsumer.get(existent)).thenReturn(response);
207207

208208
SplitManagerImpl splitManager = new SplitManagerImpl(splitCacheConsumer,
@@ -217,7 +217,7 @@ public void splitCallWithEmptySets() {
217217
String existent = "existent";
218218
SplitCacheConsumer splitCacheConsumer = mock(SplitCacheConsumer.class);
219219
ParsedSplit response = ParsedSplit.createParsedSplitForTests("FeatureName", 123, true, "off",
220-
Lists.newArrayList(getTestCondition("off")), "traffic", 456L, 1, null, true);
220+
Lists.newArrayList(getTestCondition("off")), "traffic", 456L, 1, null, false);
221221
when(splitCacheConsumer.get(existent)).thenReturn(response);
222222

223223
SplitManagerImpl splitManager = new SplitManagerImpl(splitCacheConsumer,
@@ -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.trackImpressions);
249+
assertFalse(splitView.impressionsDisabled);
250250
splitView = splitManager.split("impression_toggle_on");
251-
assertTrue(splitView.trackImpressions);
251+
assertFalse(splitView.impressionsDisabled);
252252
splitView = splitManager.split("impression_toggle_off");
253-
assertFalse(splitView.trackImpressions);
253+
assertTrue(splitView.impressionsDisabled);
254254
}
255255
}

0 commit comments

Comments
 (0)