feat!: Context Values support, getEvaluationResult
#184
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,7 +12,7 @@ jobs: | |
|
|
||
| strategy: | ||
| matrix: | ||
| java: [ "11", "17", "21" ] | ||
| distribution: [ "zulu", "adopt" ] | ||
|
|
||
| steps: | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| [submodule "src/test/java/com/flagsmith/flagengine/enginetestdata"] | ||
| path = src/test/java/com/flagsmith/flagengine/enginetestdata | ||
| url = [email protected]:Flagsmith/engine-test-data.git | ||
| branch = feat/context-values | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -6,21 +6,16 @@ | |||||
| import com.flagsmith.exceptions.FlagsmithClientError; | ||||||
| import com.flagsmith.exceptions.FlagsmithRuntimeError; | ||||||
| import com.flagsmith.flagengine.Engine; | ||||||
| import com.flagsmith.flagengine.EvaluationContext; | ||||||
| import com.flagsmith.flagengine.EvaluationResult; | ||||||
| import com.flagsmith.interfaces.FlagsmithCache; | ||||||
| import com.flagsmith.interfaces.FlagsmithSdk; | ||||||
| import com.flagsmith.mappers.EngineMappers; | ||||||
| import com.flagsmith.models.BaseFlag; | ||||||
| import com.flagsmith.models.Flags; | ||||||
| import com.flagsmith.models.Segment; | ||||||
| import com.flagsmith.threads.PollingManager; | ||||||
| import com.flagsmith.utils.ModelUtils; | ||||||
| import java.util.HashMap; | ||||||
| import java.util.List; | ||||||
| import java.util.Map; | ||||||
|
|
@@ -39,9 +34,8 @@ public class FlagsmithClient { | |||||
|
|
||||||
| private final FlagsmithLogger logger = new FlagsmithLogger(); | ||||||
| private FlagsmithSdk flagsmithSdk; | ||||||
| private EvaluationContext evaluationContext; | ||||||
| private PollingManager pollingManager; | ||||||
|
|
||||||
| private FlagsmithClient() { | ||||||
| } | ||||||
|
|
@@ -55,22 +49,12 @@ public static FlagsmithClient.Builder newBuilder() { | |||||
| */ | ||||||
| public void updateEnvironment() { | ||||||
| try { | ||||||
| EvaluationContext updatedEvaluationContext = flagsmithSdk.getEvaluationContext(); | ||||||
|
|
||||||
| // if we didn't get an environment from the API, | ||||||
| // then don't overwrite the copy we already have. | ||||||
| if (updatedEvaluationContext != null) { | ||||||
| this.evaluationContext = updatedEvaluationContext; | ||||||
| } else { | ||||||
| logger.error(getEnvironmentUpdateErrorMessage()); | ||||||
| } | ||||||
|
|
@@ -150,13 +134,10 @@ public Flags getIdentityFlags(String identifier, Map<String, Object> traits) | |||||
| public Flags getIdentityFlags(String identifier, Map<String, Object> traits, boolean isTransient) | ||||||
| throws FlagsmithClientError { | ||||||
| if (getShouldUseEnvironmentDocument()) { | ||||||
| return getIdentityFlagsFromDocument(identifier, traits); | ||||||
| } | ||||||
|
|
||||||
| return getIdentityFlagsFromApi(identifier, traits, isTransient); | ||||||
| } | ||||||
|
|
||||||
| /** | ||||||
|
|
@@ -180,20 +161,18 @@ public List<Segment> getIdentitySegments(String identifier) | |||||
| */ | ||||||
| public List<Segment> getIdentitySegments(String identifier, Map<String, Object> traits) | ||||||
| throws FlagsmithClientError { | ||||||
| if (evaluationContext == null) { | ||||||
| throw new FlagsmithClientError("Local evaluation required to obtain identity segments."); | ||||||
| } | ||||||
|
|
||||||
| final EvaluationContext context = EngineMappers.mapContextAndIdentityDataToContext( | ||||||
| evaluationContext, identifier, traits); | ||||||
|
|
||||||
| final EvaluationResult result = Engine.getEvaluationResult(context); | ||||||
|
|
||||||
| return result.getSegments().stream().map((segmentModel) -> { | ||||||
| Segment segment = new Segment(); | ||||||
| segment.setId(Integer.valueOf(segmentModel.getKey())); | ||||||
| segment.setName(segmentModel.getName()); | ||||||
|
|
||||||
| return segment; | ||||||
|
|
@@ -212,37 +191,39 @@ public void close() { | |||||
| } | ||||||
|
|
||||||
| private Flags getEnvironmentFlagsFromDocument() throws FlagsmithClientError { | ||||||
|
||||||
| private Flags getEnvironmentFlagsFromDocument() throws FlagsmithClientError { | |
| private Flags getEnvironmentFlagsFromLocalEvaluationContext() throws FlagsmithClientError { |
There was a problem hiding this comment.
Nice suggestion, done in 988d59b.
Outdated
There was a problem hiding this comment.
Following our discussions, reminder to revert here
There was a problem hiding this comment.
I was referring to dropping the offline handler of the current scope and leaving it read the environment document and return it (no breaking change on that part for users)
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perhaps we should bump v2.0.0 in engine-test-data?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done in bebac37 (the branch is based on latest main).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Making sure we're in the same page here: ultimately this need to be merged as a version tag, since feat/fix branches are ephemeral. If that's correct, I'll keep this thread unresolved as a reminder.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is now done.