Skip to content

Evaluation options, prereqs & imp disabled in Android implementation #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Aug 14, 2025
Merged

Evaluation options, prereqs & imp disabled in Android implementation #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
62dfc28
WIP
gthea Aug 12, 2025
ff2a069
Adding evaluation options methods
gthea Aug 12, 2025
091d5e8
Change test names'
gthea Aug 12, 2025
bae5f5d
splitio updates
gthea Aug 12, 2025
b520a67
Add properties to impresion in impression listener
gthea Aug 13, 2025
a77fd23
Prereqs, imp disabled & eval options in Android impl
gthea Aug 13, 2025
446777a
Update test
gthea Aug 13, 2025
8022195
Update splitio_ios test
gthea Aug 13, 2025
6a7f32f
Merge branch 'SDKS-9245_baseline' into FME-8343
gthea Aug 13, 2025
a97b172
Temp value for properties"
gthea Aug 13, 2025
07150cb
Temp properties value
gthea Aug 13, 2025
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
1 change: 1 addition & 0 deletions splitio_android/android/src/main/java/io/split/splitio/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ static class Argument {
static final String SDK_CONFIGURATION = "sdkConfiguration";
static final String SPLIT_NAME = "splitName";
static final String ATTRIBUTES = "attributes";
static final String EVALUATION_OPTIONS = "evaluationOptions";
static final String EVENT_TYPE = "eventType";
static final String TRAFFIC_TYPE = "trafficType";
static final String VALUE = "value";
Expand Down
17 changes: 9 additions & 8 deletions splitio_android/android/src/main/java/io/split/splitio/EvaluationWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,23 @@
import java.util.List;
import java.util.Map;

import io.split.android.client.EvaluationOptions;
import io.split.android.client.SplitResult;

interface EvaluationWrapper {
String getTreatment(String matchingKey, String bucketingKey, String splitName, Map<String, Object> attributes);
String getTreatment(String matchingKey, String bucketingKey, String splitName, Map<String, Object> attributes, EvaluationOptions evaluationOptions);

Map<String, String> getTreatments(String matchingKey, String bucketingKey, List<String> splitNames, Map<String, Object> attributes);
Map<String, String> getTreatments(String matchingKey, String bucketingKey, List<String> splitNames, Map<String, Object> attributes, EvaluationOptions evaluationOptions);

SplitResult getTreatmentWithConfig(String matchingKey, String bucketingKey, String splitName, Map<String, Object> attributes);
SplitResult getTreatmentWithConfig(String matchingKey, String bucketingKey, String splitName, Map<String, Object> attributes, EvaluationOptions evaluationOptions);

Map<String, SplitResult> getTreatmentsWithConfig(String matchingKey, String bucketingKey, List<String> splitNames, Map<String, Object> attributes);
Map<String, SplitResult> getTreatmentsWithConfig(String matchingKey, String bucketingKey, List<String> splitNames, Map<String, Object> attributes, EvaluationOptions evaluationOptions);

Map<String, String> getTreatmentsByFlagSet(String matchingKey, String bucketingKey, String flagSet, Map<String, Object> attributes);
Map<String, String> getTreatmentsByFlagSet(String matchingKey, String bucketingKey, String flagSet, Map<String, Object> attributes, EvaluationOptions evaluationOptions);

Map<String, String> getTreatmentsByFlagSets(String matchingKey, String bucketingKey, List<String> flagSets, Map<String, Object> attributes);
Map<String, String> getTreatmentsByFlagSets(String matchingKey, String bucketingKey, List<String> flagSets, Map<String, Object> attributes, EvaluationOptions evaluationOptions);

Map<String, SplitResult> getTreatmentsWithConfigByFlagSet(String matchingKey, String bucketingKey, String flagSet, Map<String, Object> attributes);
Map<String, SplitResult> getTreatmentsWithConfigByFlagSet(String matchingKey, String bucketingKey, String flagSet, Map<String, Object> attributes, EvaluationOptions evaluationOptions);

Map<String, SplitResult> getTreatmentsWithConfigByFlagSets(String matchingKey, String bucketingKey, List<String> flagSets, Map<String, Object> attributes);
Map<String, SplitResult> getTreatmentsWithConfigByFlagSets(String matchingKey, String bucketingKey, List<String> flagSets, Map<String, Object> attributes, EvaluationOptions evaluationOptions);
}
90 changes: 66 additions & 24 deletions splitio_android/android/src/main/java/io/split/splitio/SplitMethodParserImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import static io.split.splitio.Constants.Argument.ATTRIBUTES;
import static io.split.splitio.Constants.Argument.ATTRIBUTE_NAME;
import static io.split.splitio.Constants.Argument.BUCKETING_KEY;
import static io.split.splitio.Constants.Argument.EVALUATION_OPTIONS;
import static io.split.splitio.Constants.Argument.EVENT_TYPE;
import static io.split.splitio.Constants.Argument.FLAG_SET;
import static io.split.splitio.Constants.Argument.FLAG_SETS;
Expand Down Expand Up @@ -57,9 +58,11 @@
import java.util.Map;

import io.flutter.plugin.common.MethodChannel;
import io.split.android.client.EvaluationOptions;
import io.split.android.client.SplitClient;
import io.split.android.client.SplitResult;
import io.split.android.client.api.SplitView;
import io.split.android.client.dtos.Prerequisite;
import io.split.android.client.events.SplitEvent;
import io.split.android.client.events.SplitEventTask;

Expand Down Expand Up @@ -115,56 +118,64 @@ public void onMethodCall(String methodName, Object arguments, @NonNull MethodCha
mArgumentParser.getStringArgument(MATCHING_KEY, arguments),
mArgumentParser.getStringArgument(BUCKETING_KEY, arguments),
mArgumentParser.getStringArgument(SPLIT_NAME, arguments),
mArgumentParser.getMapArgument(ATTRIBUTES, arguments)));
mArgumentParser.getMapArgument(ATTRIBUTES, arguments),
buildEvaluationOptions(mArgumentParser.getMapArgument(EVALUATION_OPTIONS, arguments))));
break;
case GET_TREATMENTS:
result.success(getTreatments(
mArgumentParser.getStringArgument(MATCHING_KEY, arguments),
mArgumentParser.getStringArgument(BUCKETING_KEY, arguments),
mArgumentParser.getStringListArgument(SPLIT_NAME, arguments),
mArgumentParser.getMapArgument(ATTRIBUTES, arguments)));
mArgumentParser.getMapArgument(ATTRIBUTES, arguments),
buildEvaluationOptions(mArgumentParser.getMapArgument(EVALUATION_OPTIONS, arguments))));
break;
case GET_TREATMENT_WITH_CONFIG:
result.success(getTreatmentWithConfig(
mArgumentParser.getStringArgument(MATCHING_KEY, arguments),
mArgumentParser.getStringArgument(BUCKETING_KEY, arguments),
mArgumentParser.getStringArgument(SPLIT_NAME, arguments),
mArgumentParser.getMapArgument(ATTRIBUTES, arguments)));
mArgumentParser.getMapArgument(ATTRIBUTES, arguments),
buildEvaluationOptions(mArgumentParser.getMapArgument(EVALUATION_OPTIONS, arguments))));
break;
case GET_TREATMENTS_WITH_CONFIG:
result.success(getTreatmentsWithConfig(
mArgumentParser.getStringArgument(MATCHING_KEY, arguments),
mArgumentParser.getStringArgument(BUCKETING_KEY, arguments),
mArgumentParser.getStringListArgument(SPLIT_NAME, arguments),
mArgumentParser.getMapArgument(ATTRIBUTES, arguments)));
mArgumentParser.getMapArgument(ATTRIBUTES, arguments),
buildEvaluationOptions(mArgumentParser.getMapArgument(EVALUATION_OPTIONS, arguments))));
break;
case GET_TREATMENTS_BY_FLAG_SET:
result.success(getTreatmentsByFlagSet(
mArgumentParser.getStringArgument(MATCHING_KEY, arguments),
mArgumentParser.getStringArgument(BUCKETING_KEY, arguments),
mArgumentParser.getStringArgument(FLAG_SET, arguments),
mArgumentParser.getMapArgument(ATTRIBUTES, arguments)));
mArgumentParser.getMapArgument(ATTRIBUTES, arguments),
buildEvaluationOptions(mArgumentParser.getMapArgument(EVALUATION_OPTIONS, arguments))));
break;
case GET_TREATMENTS_BY_FLAG_SETS:
result.success(getTreatmentsByFlagSets(
mArgumentParser.getStringArgument(MATCHING_KEY, arguments),
mArgumentParser.getStringArgument(BUCKETING_KEY, arguments),
mArgumentParser.getStringListArgument(FLAG_SETS, arguments),
mArgumentParser.getMapArgument(ATTRIBUTES, arguments)));
mArgumentParser.getMapArgument(ATTRIBUTES, arguments),
buildEvaluationOptions(mArgumentParser.getMapArgument(EVALUATION_OPTIONS, arguments))));
break;
case GET_TREATMENTS_WITH_CONFIG_BY_FLAG_SET:
result.success(getTreatmentsWithConfigByFlagSet(
mArgumentParser.getStringArgument(MATCHING_KEY, arguments),
mArgumentParser.getStringArgument(BUCKETING_KEY, arguments),
mArgumentParser.getStringArgument(FLAG_SET, arguments),
mArgumentParser.getMapArgument(ATTRIBUTES, arguments)));
mArgumentParser.getMapArgument(ATTRIBUTES, arguments),
buildEvaluationOptions(mArgumentParser.getMapArgument(EVALUATION_OPTIONS, arguments))));
break;
case GET_TREATMENTS_WITH_CONFIG_BY_FLAG_SETS:
result.success(getTreatmentsWithConfigByFlagSets(
mArgumentParser.getStringArgument(MATCHING_KEY, arguments),
mArgumentParser.getStringArgument(BUCKETING_KEY, arguments),
mArgumentParser.getStringListArgument(FLAG_SETS, arguments),
mArgumentParser.getMapArgument(ATTRIBUTES, arguments)));
mArgumentParser.getMapArgument(ATTRIBUTES, arguments),
buildEvaluationOptions(mArgumentParser.getMapArgument(EVALUATION_OPTIONS, arguments))));
break;
case TRACK:
result.success(track(
Expand Down Expand Up @@ -277,23 +288,26 @@ private SplitClient getClient(String matchingKey, String bucketingKey) {
private String getTreatment(String matchingKey,
String bucketingKey,
String splitName,
Map<String, Object> attributes) {
return mSplitWrapper.getTreatment(matchingKey, bucketingKey, splitName, attributes);
Map<String, Object> attributes,
EvaluationOptions evaluationOptions) {
return mSplitWrapper.getTreatment(matchingKey, bucketingKey, splitName, attributes, evaluationOptions);
}

private Map<String, String> getTreatments(String matchingKey,
String bucketingKey,
List<String> splitNames,
Map<String, Object> attributes) {
return mSplitWrapper.getTreatments(matchingKey, bucketingKey, splitNames, attributes);
Map<String, Object> attributes,
EvaluationOptions evaluationOptions) {
return mSplitWrapper.getTreatments(matchingKey, bucketingKey, splitNames, attributes, evaluationOptions);
}

private Map<String, Map<String, String>> getTreatmentWithConfig(
String matchingKey,
String bucketingKey,
String splitName,
Map<String, Object> attributes) {
SplitResult treatment = mSplitWrapper.getTreatmentWithConfig(matchingKey, bucketingKey, splitName, attributes);
Map<String, Object> attributes,
EvaluationOptions evaluationOptions) {
SplitResult treatment = mSplitWrapper.getTreatmentWithConfig(matchingKey, bucketingKey, splitName, attributes, evaluationOptions);

return Collections.singletonMap(splitName, getSplitResultMap(treatment));
}
Expand All @@ -302,42 +316,47 @@ private Map<String, Map<String, String>> getTreatmentsWithConfig(
String matchingKey,
String bucketingKey,
List<String> splitNames,
Map<String, Object> attributes) {
Map<String, SplitResult> treatmentsWithConfig = mSplitWrapper.getTreatmentsWithConfig(matchingKey, bucketingKey, splitNames, attributes);
Map<String, Object> attributes,
EvaluationOptions evaluationOptions) {
Map<String, SplitResult> treatmentsWithConfig = mSplitWrapper.getTreatmentsWithConfig(matchingKey, bucketingKey, splitNames, attributes, evaluationOptions);
return mapToSplitResults(treatmentsWithConfig);
}

private Map<String, String> getTreatmentsByFlagSet(
String matchingKey,
String bucketingKey,
String flagSet,
Map<String, Object> attributes) {
return mSplitWrapper.getTreatmentsByFlagSet(matchingKey, bucketingKey, flagSet, attributes);
Map<String, Object> attributes,
EvaluationOptions evaluationOptions) {
return mSplitWrapper.getTreatmentsByFlagSet(matchingKey, bucketingKey, flagSet, attributes, evaluationOptions);
}

private Map<String, String> getTreatmentsByFlagSets(
String matchingKey,
String bucketingKey,
List<String> flagSets,
Map<String, Object> attributes) {
return mSplitWrapper.getTreatmentsByFlagSets(matchingKey, bucketingKey, flagSets, attributes);
Map<String, Object> attributes,
EvaluationOptions evaluationOptions) {
return mSplitWrapper.getTreatmentsByFlagSets(matchingKey, bucketingKey, flagSets, attributes, evaluationOptions);
}

private Map<String, Map<String, String>> getTreatmentsWithConfigByFlagSet(
String matchingKey,
String bucketingKey,
String flagSet,
Map<String, Object> attributes) {
Map<String, SplitResult> treatmentsWithConfig = mSplitWrapper.getTreatmentsWithConfigByFlagSet(matchingKey, bucketingKey, flagSet, attributes);
Map<String, Object> attributes,
EvaluationOptions evaluationOptions) {
Map<String, SplitResult> treatmentsWithConfig = mSplitWrapper.getTreatmentsWithConfigByFlagSet(matchingKey, bucketingKey, flagSet, attributes, evaluationOptions);
return mapToSplitResults(treatmentsWithConfig);
}

private Map<String, Map<String, String>> getTreatmentsWithConfigByFlagSets(
String matchingKey,
String bucketingKey,
List<String> flagSets,
Map<String, Object> attributes) {
Map<String, SplitResult> treatmentsWithConfig = mSplitWrapper.getTreatmentsWithConfigByFlagSets(matchingKey, bucketingKey, flagSets, attributes);
Map<String, Object> attributes,
EvaluationOptions evaluationOptions) {
Map<String, SplitResult> treatmentsWithConfig = mSplitWrapper.getTreatmentsWithConfigByFlagSets(matchingKey, bucketingKey, flagSets, attributes, evaluationOptions);
return mapToSplitResults(treatmentsWithConfig);
}

Expand Down Expand Up @@ -474,8 +493,31 @@ private static Map<String, Object> getSplitViewAsMap(@Nullable SplitView splitVi
splitViewMap.put("configs", splitView.configs);
splitViewMap.put("defaultTreatment", splitView.defaultTreatment);
splitViewMap.put("sets", splitView.sets);
splitViewMap.put("prerequisites", getPrerequisiteMap(splitView.prerequisites));
splitViewMap.put("impressionsDisabled", splitView.impressionsDisabled);

return splitViewMap;
}

private static List<Map<String, Object>> getPrerequisiteMap(List<Prerequisite> prerequisites) {
List<Map<String, Object>> prerequisiteList = new ArrayList<>();

for (Prerequisite prerequisite : prerequisites) {
Map<String, Object> prerequisiteMap = new HashMap<>();
prerequisiteMap.put("n", prerequisite.getFlagName());
prerequisiteMap.put("t", prerequisite.getTreatments());
prerequisiteList.add(prerequisiteMap);
}

return prerequisiteList;
}

@Nullable
private EvaluationOptions buildEvaluationOptions(Map<String, Object> properties) {
if (properties == null || properties.isEmpty()) {
return null;
}

return new EvaluationOptions(properties);
}
}
Loading
Loading