8000 fix(ForcedDecision): remove config-ready check from forced-decision a… · optimizely/java-sdk@80ab3f0 · GitHub
[go: up one dir, main page]
Skip to content

Commit 80ab3f0

Browse files
The-inside-manThe-inside-man
authored
fix(ForcedDecision): remove config-ready check from forced-decision apis (#454)
## Summary - Remove config-ready check from forced-decision apis ## Test plan - Unit and FSC tests
1 parent 04d379a commit 80ab3f0

File tree

2 files changed

+6
-85
lines changed

2 files changed

+6
-85
lines changed

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -198,10 +198,6 @@ public void trackEvent(@Nonnull String eventName) throws UnknownEventTypeExcepti
198198
*/
199199
public Boolean setForcedDecision(@Nonnull OptimizelyDecisionContext optimizelyDecisionContext,
200200
@Nonnull OptimizelyForcedDecision optimizelyForcedDecision) {
201-
if (optimizely.getOptimizelyConfig() == null) {
202-
logger.error("Optimizely SDK not ready.");
203-
return false;
204-
}
205201
// Check if the forcedDecisionsMap has been initialized yet or not
206202
if (forcedDecisionsMap == null ){
207203
// Thread-safe implementation of HashMap
@@ -219,10 +215,6 @@ public Boolean setForcedDecision(@Nonnull OptimizelyDecisionContext optimizelyDe
219215
*/
220216
@Nullable
221217
public OptimizelyForcedDecision getForcedDecision(@Nonnull OptimizelyDecisionContext optimizelyDecisionContext) {
222-
if (optimizely.getOptimizelyConfig() == null) {
223-
logger.error("Optimizely SDK not ready.");
224-
return null;
225-
}
226218
return findForcedDecision(optimizelyDecisionContext);
227219
}
228220

@@ -247,11 +239,6 @@ public OptimizelyForcedDecision findForcedDecision(@Nonnull OptimizelyDecisionCo
247239
* @return Returns a boolean, true if successfully removed, otherwise false
248240
*/
249241
public boolean removeForcedDecision(@Nonnull OptimizelyDecisionContext optimizelyDecisionContext) {
250-
if (optimizely.getOptimizelyConfig() == null) {
251-
logger.error("Optimizely SDK not ready.");
252-
return false;
253-
}
254-
255242
try {
256243
if (forcedDecisionsMap != null) {
257244
if (forcedDecisionsMap.remove(optimizelyDecisionContext.getKey()) != null) {
@@ -271,10 +258,6 @@ public boolean removeForcedDecision(@Nonnull OptimizelyDecisionContext optimizel
271258
* @return Returns a boolean, True if successfully, otherwise false
272259
*/
273260
public boolean removeAllForcedDecisions() {
274-
if (optimizely.getProjectConfig() == null) {
275-
logger.error("Optimizely SDK not ready.");
276-
return false;
277-
}
278261
// Clear both maps for with and without ruleKey
279262
if (forcedDecisionsMap != null) {
280263
forcedDecisionsMap.clear();

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

Lines changed: 6 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,13 @@ public void optimizelyUserContext_withAttributes() {
8282

8383
@Test
8484
public void optimizelyUserContext_noAttributes() {
85-
OptimizelyUserContext user = new OptimizelyUserContext(optimizely, userId);
85+
OptimizelyUserContext user_1 = new OptimizelyUserContext(optimizely, userId);
86+
OptimizelyUserContext user_2 = new OptimizelyUserContext(optimizely, userId);
8687

87-
assertEquals(user.getOptimizely(), optimizely);
88-
assertEquals(user.getUserId(), userId);
89-
assertTrue(user.getAttributes().isEmpty());
88+
assertEquals(user_1.getOptimizely(), optimizely);
89+
assertEquals(user_1.getUserId(), userId);
90+
assertTrue(user_1.getAttributes().isEmpty());
91+
assertEquals(user_1.hashCode(), user_2.hashCode());
9092
}
9193

9294
@Test
@@ -1263,21 +1265,6 @@ public void setForcedDecisionWithoutRuleKeyTest() {
12631265
}
12641266

12651267

1266-
@Test
1267-
public void setForcedDecisionWithoutRuleKeyTestSdkNotReady() {
1268-
String flagKey = "55555";
1269-
String variationKey = "33333";
1270-
Optimizely optimizely = new Optimizely.Builder().build();
1271-
OptimizelyUserContext optimizelyUserContext = new OptimizelyUserContext(
1272-
optimizely,
1273-
userId,
1274-
Collections.emptyMap());
1275-
1276-
OptimizelyDecisionContext optimizelyDecisionContext = new OptimizelyDecisionContext(flagKey, null);
1277-
OptimizelyForcedDecision optimizelyForcedDecision = new OptimizelyForcedDecision(variationKey);
1278-
assertFalse(optimizelyUserContext.setForcedDecision(optimizelyDecisionContext, optimizelyForcedDecision));
1279-
}
1280-
12811268
@Test
12821269
public void getForcedVariationWithRuleKey() {
12831270
String flagKey = "55555";
@@ -1330,22 +1317,6 @@ public void getForcedVariationWithoutRuleKey() {
13301317
assertEquals(variationKey, optimizelyUserContext.getForcedDecision(optimizelyDecisionContext).getVariationKey());
13311318
}
13321319

1333-
@Test
1334-
public void getForcedVariationWithoutRuleKeySdkNotReady() {
1335-
String flagKey = "55555";
1336-
String variationKey = "33333";
1337-
Optimizely optimizely = new Optimizely.Builder().build();
1338-
OptimizelyUserContext optimizelyUserContext = new OptimizelyUserContext(
1339-
optimizely,
1340-
userId,
1341-
Collections.emptyMap());
1342-
1343-
OptimizelyDecisionContext optimizelyDecisionContext = new OptimizelyDecisionContext(flagKey, null);
1344-
OptimizelyForcedDecision optimizelyForcedDecision = new OptimizelyForcedDecision(variationKey);
1345-
1346-
optimizelyUserContext.setForcedDecision(optimizelyDecisionContext, optimizelyForcedDecision);
1347-
assertNull(optimizelyUserContext.getForcedDecision(optimizelyDecisionContext));
1348-
}
13491320

13501321
@Test
13511322
public void failedGetForcedDecisionWithoutRuleKey() {
@@ -1434,22 +1405,6 @@ public void removeForcedDecisionWithIncorrectFlagKey() {
14341405
assertFalse(optimizelyUserContext.removeForcedDecision(incorrectOptimizelyDecisionContext));
14351406
}
14361407

1437-
@Test
1438-
public void removeForcedDecisionWithoutRuleKeySdkNotReady() {
1439-
String flagKey = "flag2";
1440-
String variationKey = "33333";
1441-
Optimizely optimizely = new Optimizely.Builder().build();
1442-
OptimizelyUserContext optimizelyUserContext = new OptimizelyUserContext(
1443-
optimizely,
1444-
userId,
1445-
Collections.emptyMap());
1446-
1447-
OptimizelyDecisionContext optimizelyDecisionContext = new OptimizelyDecisionContext(flagKey, null);
1448-
OptimizelyForcedDecision optimizelyForcedDecision = new OptimizelyForcedDecision(variationKey);
1449-
1450-
optimizelyUserContext.setForcedDecision(optimizelyDecisionContext, optimizelyForcedDecision);
1451-
assertFalse(optimizelyUserContext.removeForcedDecision(optimizelyDecisionContext));
1452-
}
14531408

14541409
@Test
14551410
public void removeForcedDecisionWithIncorrectFlagKeyButSimilarRuleKey() {
@@ -1487,23 +1442,6 @@ public void removeAllForcedDecisions() {
14871442
assertTrue(optimizelyUserContext.removeAllForcedDecisions());
14881443
}
14891444

1490-
@Test
1491-
public void removeAllForcedDecisionsSdkNotReady() {
1492-
String flagKey = "55555";
1493-
String ruleKey = "77777";
1494-
String variationKey = "33333";
1495-
Optimizely optimizely = new Optimizely.Builder().build();
1496-
OptimizelyUserContext optimizelyUserContext = new OptimizelyUserContext(
1497-
optimizely,
1498-
userId,
1499-
Collections.emptyMap());
1500-
1501-
OptimizelyDecisionContext optimizelyDecisionContext = new OptimizelyDecisionContext(flagKey, ruleKey);
1502-
OptimizelyForcedDecision optimizelyForcedDecision = new OptimizelyForcedDecision(variationKey);
1503-
1504-
optimizelyUserContext.setForcedDecision(optimizelyDecisionContext, optimizelyForcedDecision);
1505-
assertFalse(optimizelyUserContext.removeAllForcedDecisions());
1506-
}
15071445

15081446
@Test
15091447
public void findValidatedForcedDecisionWithRuleKey() {

0 commit comments

Comments
 (0)
0