Skip to content

Commit df2d21f

Browse files
ArshadfArshadf
committed
Removed unused imports
1 parent 6599086 commit df2d21f

File tree

9 files changed

+86
-116
lines changed

9 files changed

+86
-116
lines changed

‎core-api/src/main/java/com/optimizely/ab/optimizelyconfig/OptimizelyExperiment.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,21 @@ public String getKey() {
4545
public Map<String, OptimizelyVariation> getVariationsMap() {
4646
return variationsMap;
4747
}
48+
49+
@Override
50+
public boolean equals(Object obj) {
51+
if (obj == null || getClass() != obj.getClass()) return false;
52+
if (obj == this) return true;
53+
OptimizelyExperiment optimizelyExperiment = (OptimizelyExperiment) obj;
54+
return id.equals(optimizelyExperiment.getId()) &&
55+
key.equals(optimizelyExperiment.getKey()) &&
56+
variationsMap.equals(optimizelyExperiment.getVariationsMap());
57+
}
58+
59+
@Override
60+
public int hashCode() {
61+
int hash = id.hashCode();
62+
hash = 31 * hash + variationsMap.hashCode();
63+
return hash;
64+
}
4865
}

‎core-api/src/main/java/com/optimizely/ab/optimizelyconfig/OptimizelyFeature.java

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,22 @@ public Map<String, OptimizelyExperiment> getExperimentsMap() {
5555
public Map<String, OptimizelyVariable> getVariablesMap() {
5656
return variablesMap;
5757
}
58+
59+
@Override
60+
public boolean equals(Object obj) {
61+
if (obj == null || getClass() != obj.getClass()) return false;
62+
if (obj == this) return true;
63+
OptimizelyFeature optimizelyFeature = (OptimizelyFeature) obj;
64+
return id.equals(optimizelyFeature.getId()) &&
65+
key.equals(optimizelyFeature.getKey()) &&
66+
experimentsMap.equals(optimizelyFeature.getExperimentsMap()) &&
67+
variablesMap.equals(optimizelyFeature.getVariablesMap());
68+
}
69+
70+
@Override
71+
public int hashCode() {
72+
int result = id.hashCode();
73+
result = 31 * result + experimentsMap.hashCode() + variablesMap.hashCode();
74+
return result;
75+
}
5876
}

‎core-api/src/main/java/com/optimizely/ab/optimizelyconfig/OptimizelyVariable.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,23 @@ public String getType() {
5252
public String getValue() {
5353
return value;
5454
}
55+
56+
@Override
57+
public boolean equals(Object obj) {
58+
if (obj == null || getClass() != obj.getClass()) return false;
59+
if (obj == this) return true;
60+
OptimizelyVariable optimizelyVariable = (OptimizelyVariable) obj;
61+
return id.equals(optimizelyVariable.getId()) &&
62+
value.equals(optimizelyVariable.getValue()) &&
63+
key.equals(optimizelyVariable.getKey()) &&
64+
type.equals(optimizelyVariable.getType()
65+
);
66+
}
67+
68+
@Override
69+
public int hashCode() {
70+
int hash = id.hashCode();
71+
hash = 31 * hash + value.hashCode();
72+
return hash;
73+
}
5574
}

‎core-api/src/main/java/com/optimizely/ab/optimizelyconfig/OptimizelyVariation.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,21 @@ public Boolean getFeatureEnabled() {
5656
public Map<String, OptimizelyVariable> getVariablesMap() {
5757
return variablesMap;
5858
}
59+
60+
@Override
61+
public boolean equals(Object obj) {
62+
if (obj == null || getClass() != obj.getClass()) return false;
63+
if (obj == this) return true;
64+
OptimizelyVariation optimizelyVariation = (OptimizelyVariation) obj;
65+
return id.equals(optimizelyVariation.getId()) &&
66+
key.equals(optimizelyVariation.getKey()) &&
67+
variablesMap.equals(optimizelyVariation.getVariablesMap());
68+
}
69+
70+
@Override
71+
public int hashCode() {
72+
int hash = id.hashCode();
73+
hash = 31 * hash + variablesMap.hashCode();
74+
return hash;
75+
}
5976
}

‎core-api/src/test/java/com/optimizely/ab/optimizelyconfig/OptimizelyConfigServiceTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class OptimizelyConfigServiceTest {
3636

3737
@Before
3838
public void initialize() throws Exception {
39-
projectConfig = generateConfig();
39+
projectConfig = generateOptimizelyConfig();
4040
optimizelyConfigService = new OptimizelyConfigService(projectConfig);
4141
}
4242

@@ -228,7 +228,7 @@ private List<Experiment> getAllExperimentsFromDatafile() {
228228
return experiments;
229229
}
230230

231-
private ProjectConfig generateConfig() {
231+
private ProjectConfig generateOptimizelyConfig() {
232232
return new DatafileProjectConfig(
233233
"2360254204",
234234
true,

‎core-api/src/test/java/com/optimizely/ab/optimizelyconfig/OptimizelyConfigTest.java

Lines changed: 4 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -33,71 +33,15 @@ public void testOptimizelyConfig() {
3333
"101"
3434
);
3535
assertEquals("101", optimizelyConfig.getRevision());
36+
// verify the experiments map
3637
Map<String, OptimizelyExperiment> optimizelyExperimentMap = generateExperimntMap();
3738
assertEquals(optimizelyExperimentMap.size(), optimizelyConfig.getExperimentsMap().size());
38-
// verify the experiments map
39-
optimizelyExperimentMap.forEach((experimentKey, experiment) -> {
40-
OptimizelyExperiment optimizelyExperiment = optimizelyConfig.getExperimentsMap().get(experimentKey);
41-
assertEquals(experiment.getId(), optimizelyExperiment.getId());
42-
assertEquals(experiment.getKey(), optimizelyExperiment.getKey());
43-
assertEquals(experiment.getVariationsMap().size(), optimizelyExperiment.getVariationsMap().size());
44-
// verify the variations map
45-
experiment.getVariationsMap().forEach((variationKey, variation) -> {
46-
OptimizelyVariation optimizelyVariation = optimizelyExperiment.getVariationsMap().get(variationKey);
47-
assertEquals(variation.getId(), optimizelyVariation.getId());
48-
assertEquals(variation.getKey(), optimizelyVariation.getKey());
49-
assertEquals(variation.getFeatureEnabled(), optimizelyVariation.getFeatureEnabled());
50-
assertEquals(variation.getVariablesMap().size(), optimizelyVariation.getVariablesMap().size());
51-
// verify the variables map
52-
variation.getVariablesMap().forEach((variableKey, variable) -> {
53-
OptimizelyVariable optimizelyVariable = optimizelyVariation.getVariablesMap().get(variableKey);
54-
assertEquals(variable.getId(), optimizelyVariable.getId());
55-
assertEquals(variable.getKey(), optimizelyVariable.getKey());
56-
assertEquals(variable.getType(), optimizelyVariable.getType());
57-
assertEquals(variable.getValue(), optimizelyVariable.getValue());
58-
});
59-
});
60-
});
39+
assertEquals(optimizelyExperimentMap, optimizelyConfig.getExperimentsMap());
6140

41+
// verify the features map
6242
Map<String, OptimizelyFeature> optimizelyFeatureMap = generateFeatureMap();
63-
// verifying feature map
6443
assertEquals(optimizelyFeatureMap.size(), optimizelyConfig.getFeaturesMap().size());
65-
optimizelyFeatureMap.forEach((featureKey, feature) -> {
66-
OptimizelyFeature optimizelyFeature = optimizelyConfig.getFeaturesMap().get(featureKey);
67-
assertEquals(feature.getId(), optimizelyFeature.getId());
68-
assertEquals(feature.getKey(), optimizelyFeature.getKey());
69-
// verifying variables map
70-
assertEquals(feature.getVariablesMap().size(), optimizelyFeature.getVariablesMap().size());
71-
feature.getVariablesMap().forEach((variableKey, variable) -> {
72-
OptimizelyVariable optimizelyVariable = optimizelyFeature.getVariablesMap().get(variableKey);
73-
assertEquals(variable.getId(), optimizelyVariable.getId());
74-
assertEquals(variable.getKey(), optimizelyVariable.getKey());
75-
assertEquals(variable.getType(), optimizelyVariable.getType());
76-
assertEquals(variable.getValue(), optimizelyVariable.getValue());
77-
});
78-
// verifying experiment map
79-
assertEquals(feature.getExperimentsMap().size(), optimizelyFeature.getExperimentsMap().size());
80-
feature.getExperimentsMap().forEach((experimentKey, experiment) -> {
81-
OptimizelyExperiment optimizelyExperiment = optimizelyFeature.getExperimentsMap().get(experimentKey);
82-
assertEquals(experiment.getId(), optimizelyExperiment.getId());
83-
assertEquals(experiment.getKey(), optimizelyExperiment.getKey());
84-
// verifying variation map
85-
experiment.getVariationsMap().forEach((variationKey, variation) -> {
86-
OptimizelyVariation optimizelyVariation = optimizelyExperiment.getVariationsMap().get(variationKey);
87-
assertEquals(variation.getId(), optimizelyVariation.getId());
88-
assertEquals(variation.getKey(), optimizelyVariation.getKey());
89-
assertEquals(variation.getFeatureEnabled(), optimizelyVariation.getFeatureEnabled());
90-
// verifying variables map
91-
variation.getVariablesMap().forEach((variableKey, variable) -> {
92-
OptimizelyVariable optimizelyVariable = optimizelyVariation.getVariablesMap().get(variableKey);
93-
assertEquals(variable.getId(), optimizelyVariable.getId());
94-
assertEquals(variable.getKey(), optimizelyVariable.getKey());
95-
assertEquals(variable.getType(), optimizelyVariable.getType());
96-
assertEquals(variable.getType(), optimizelyVariable.getType());
97-
});
98-
});
99-
});
100-
});
44+
assertEquals(optimizelyFeatureMap, optimizelyConfig.getFeaturesMap());
10145
}
10246

10347
private Map<String, OptimizelyExperiment> generateExperimntMap() {

‎core-api/src/test/java/com/optimizely/ab/optimizelyconfig/OptimizelyExperimentTest.java

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,7 @@ public void testOptimizelyExperiment() {
3636
Map<String, OptimizelyVariation> optimizelyVariationMap = generateVariationMap();
3737
assertEquals(optimizelyVariationMap.size(), optimizelyExperiment.getVariationsMap().size());
3838
// verifying the variations
39-
optimizelyVariationMap.forEach((variationKey, variation) -> {
40-
OptimizelyVariation optimizelyVariation = optimizelyExperiment.getVariationsMap().get(variationKey);
41-
assertEquals(variation.getId(), optimizelyVariation.getId());
42-
assertEquals(variation.getFeatureEnabled(), optimizelyVariation.getFeatureEnabled());
43-
// now verifying the variables as well
44-
variation.getVariablesMap().forEach((variableKey, variable) -> {
45-
OptimizelyVariable optimizelyVariable = optimizelyVariation.getVariablesMap().get(variableKey);
46-
assertEquals(variable.getId(), optimizelyVariable.getId());
47-
assertEquals(variable.getType(), optimizelyVariable.getType());
48-
assertEquals(variable.getValue(), optimizelyVariable.getValue());
49-
});
50-
});
51-
39+
assertEquals(optimizelyVariationMap, optimizelyExperiment.getVariationsMap());
5240
}
5341

5442
static Map<String, OptimizelyVariation> generateVariationMap() {

‎core-api/src/test/java/com/optimizely/ab/optimizelyconfig/OptimizelyFeatureTest.java

Lines changed: 4 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -33,43 +33,16 @@ public void testOptimizelyFeature() {
3333
generateExperimentMap(),
3434
generateVariablesMap()
3535
);
36-
// verifying feature
3736
assertEquals("41", optimizelyFeature.getId());
3837
assertEquals("test_feature", optimizelyFeature.getKey());
38+
// verifying experiments map
3939
Map<String, OptimizelyExperiment> optimizelyExperimentMap = generateExperimentMap();
4040
assertEquals(optimizelyExperimentMap.size(), optimizelyFeature.getExperimentsMap().size());
41-
// verifying experiment map
42-
optimizelyExperimentMap.forEach((experimentKey, experiment) -> {
43-
OptimizelyExperiment optimizelyExperiment = optimizelyFeature.getExperimentsMap().get(experimentKey);
44-
assertEquals(experiment.getId(), optimizelyExperiment.getId());
45-
assertEquals(experiment.getKey(), optimizelyExperiment.getKey());
46-
// verifying variation map
47-
experiment.getVariationsMap().forEach((variationKey, variation) -> {
48-
OptimizelyVariation optimizelyVariation = optimizelyExperiment.getVariationsMap().get(variationKey);
49-
assertEquals(variation.getId(), optimizelyVariation.getId());
50-
assertEquals(variation.getKey(), optimizelyVariation.getKey());
51-
assertEquals(variation.getFeatureEnabled(), optimizelyVariation.getFeatureEnabled());
52-
// verifying variables map
53-
variation.getVariablesMap().forEach((variableKey, variable) -> {
54-
OptimizelyVariable optimizelyVariable = optimizelyVariation.getVariablesMap().get(variableKey);
55-
assertEquals(variable.getId(), optimizelyVariable.getId());
56-
assertEquals(variable.getKey(), optimizelyVariable.getKey());
57-
assertEquals(variable.getType(), optimizelyVariable.getType());
58-
assertEquals(variable.getType(), optimizelyVariable.getType());
59-
});
60-
});
61-
});
62-
41+
assertEquals(optimizelyExperimentMap, optimizelyFeature.getExperimentsMap());
42+
// verifying variables map
6343
Map<String, OptimizelyVariable> optimizelyVariableMap = generateVariablesMap();
6444
assertEquals(optimizelyVariableMap.size(), optimizelyFeature.getVariablesMap().size());
65-
optimizelyVariableMap.forEach((variableKey, variable) -> {
66-
OptimizelyVariable optimizelyVariable = optimizelyFeature.getVariablesMap().get(variableKey);
67-
assertEquals(variable.getId(), optimizelyVariable.getId());
68-
assertEquals(variable.getKey(), optimizelyVariable.getKey());
69-
assertEquals(variable.getType(), optimizelyVariable.getType());
70-
assertEquals(variable.getType(), optimizelyVariable.getType());
71-
});
72-
45+
assertEquals(optimizelyVariableMap, optimizelyFeature.getVariablesMap());
7346
}
7447

7548
static Map<String, OptimizelyExperiment> generateExperimentMap() {

‎core-api/src/test/java/com/optimizely/ab/optimizelyconfig/OptimizelyVariationTest.java

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import java.util.HashMap;
2121
import java.util.Map;
22-
2322
import static org.junit.Assert.assertEquals;
2423

2524
public class OptimizelyVariationTest {
@@ -35,15 +34,10 @@ public void testOptimizelyVariation() {
3534
assertEquals("12", optimizelyVariation.getId());
3635
assertEquals("test_var_key", optimizelyVariation.getKey());
3736
assertEquals(false, optimizelyVariation.getFeatureEnabled());
38-
Map<String, OptimizelyVariable> optimizelyVariableMap = generateVariablesMap();
39-
assertEquals(optimizelyVariableMap.size(), optimizelyVariation.getVariablesMap().size());
40-
optimizelyVariableMap.forEach((variableKey, variable) -> {
41-
OptimizelyVariable optimizelyVariable = optimizelyVariation.getVariablesMap().get(variableKey);
42-
assertEquals(variable.getId(), optimizelyVariable.getId());
43-
assertEquals(variable.getKey(), optimizelyVariable.getKey());
44-
assertEquals(variable.getType(), optimizelyVariable.getType());
45-
assertEquals(variable.getValue(), optimizelyVariable.getValue());
46-
});
37+
38+
Map<String, OptimizelyVariable> expectedoptimizelyVariableMap = generateVariablesMap();
39+
assertEquals(expectedoptimizelyVariableMap.size(), optimizelyVariation.getVariablesMap().size());
40+
assertEquals(expectedoptimizelyVariableMap, optimizelyVariation.getVariablesMap());
4741
}
4842

4943
static Map<String, OptimizelyVariable> generateVariablesMap() {

0 commit comments

Comments
 (0)