Skip to content
This repository was archived by the owner on May 30, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
package com.launchdarkly.client;

import com.google.gson.annotations.SerializedName;

class FeatureRequestEvent<E> extends Event {
E value;
@SerializedName("default")
E defaultVal;

FeatureRequestEvent(String key, LDUser user, E value) {
FeatureRequestEvent(String key, LDUser user, E value, E defaultVal) {
super("feature", key, user);
this.value = value;
this.defaultVal = defaultVal;
}
}
12 changes: 6 additions & 6 deletions src/main/java/com/launchdarkly/client/LDClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ public void identify(LDUser user) {
}
}

private void sendFlagRequestEvent(String featureKey, LDUser user, boolean value) {
boolean processed = eventProcessor.sendEvent(new FeatureRequestEvent<Boolean>(featureKey, user, value));
private void sendFlagRequestEvent(String featureKey, LDUser user, boolean value, boolean defaultValue) {
boolean processed = eventProcessor.sendEvent(new FeatureRequestEvent<Boolean>(featureKey, user, value, defaultValue));
if (!processed) {
logger.warn("Exceeded event queue capacity. Increase capacity to avoid dropping events.");
}
Expand Down Expand Up @@ -165,22 +165,22 @@ public boolean toggle(String featureKey, LDUser user, boolean defaultValue) {
}
if (result == null) {
logger.warn("Unknown feature flag " + featureKey + "; returning default value");
sendFlagRequestEvent(featureKey, user, defaultValue);
sendFlagRequestEvent(featureKey, user, defaultValue, defaultValue);
return defaultValue;
}

Boolean val = result.evaluate(user);
if (val == null) {
sendFlagRequestEvent(featureKey, user, defaultValue);
sendFlagRequestEvent(featureKey, user, defaultValue, defaultValue);
return defaultValue;
} else {
boolean value = val.booleanValue();
sendFlagRequestEvent(featureKey, user, value);
sendFlagRequestEvent(featureKey, user, value, defaultValue);
return value;
}
} catch (Exception e) {
logger.error("Encountered exception in LaunchDarkly client", e);
sendFlagRequestEvent(featureKey, user, defaultValue);
sendFlagRequestEvent(featureKey, user, defaultValue, defaultValue);
return defaultValue;
}
}
Expand Down