Skip to content

FFM-11654 Sort serving rules in cache code #192

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
erdirowlands merged 1 commit into from
Jun 28, 2024
Merged

FFM-11654 Sort serving rules in cache code #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,14 @@ Add the following Maven dependency in your project's pom.xml file:
<dependency>
<groupId>io.harness</groupId>
<artifactId>ff-java-server-sdk</artifactId>
<version>1.6.0</version>
<version>1.6.1</version>
</dependency>
```

#### Gradle

```
implementation 'io.harness:ff-java-server-sdk:1.6.0'
implementation 'io.harness:ff-java-server-sdk:1.6.1'
```

### Code Sample
Expand Down
2 changes: 1 addition & 1 deletion examples/src/main/java/io/harness/ff/examples/GettingStarted.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,4 @@ private static String getEnvOrDefault(String key, String defaultValue) {
}
return value;
}
}
}
2 changes: 1 addition & 1 deletion settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dependencyResolutionManagement {
versionCatalogs {
libs {
// main sdk version
version('sdk', '1.6.0');
version('sdk', '1.6.1');

// sdk deps
version('okhttp3', '4.12.0')
Expand Down
1 change: 0 additions & 1 deletion src/main/java/io/harness/cf/client/api/Evaluator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,6 @@ private boolean isTargetIncludedOrExcludedInSegment(List<String> segmentList, Ta
// New style rules, if sent by BE prefer those first
List<GroupServingRule> newServingRules = segment.getServingRules();
if (newServingRules != null && !newServingRules.isEmpty()) {
newServingRules.sort(Comparator.comparing(GroupServingRule::getPriority));

for (GroupServingRule servingRule : newServingRules) {
if (evaluateClausesV2(servingRule.getClauses(), target)) {
Expand Down
16 changes: 12 additions & 4 deletions src/main/java/io/harness/cf/client/api/StorageRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@
import io.harness.cf.client.common.Cache;
import io.harness.cf.client.common.Storage;
import io.harness.cf.client.common.Utils;
import io.harness.cf.model.Clause;
import io.harness.cf.model.FeatureConfig;
import io.harness.cf.model.Segment;
import io.harness.cf.model.ServingRule;
import io.harness.cf.model.*;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Optional;
import lombok.NonNull;
Expand Down Expand Up @@ -131,6 +129,10 @@ public void setSegment(@NonNull String identifier, @NonNull Segment segment) {
log.debug("Segment {} already exists", identifier);
return;
}

// Sort the serving rules before storing the segment
sortSegmentServingRules(segment);

final String segmentKey = formatSegmentKey(identifier);
if (store != null) {
store.set(segmentKey, segment);
Expand Down Expand Up @@ -196,6 +198,12 @@ protected boolean isSegmentOutdated(@NonNull String identifier, @NonNull Segment
return false;
}

private void sortSegmentServingRules(Segment segment) {
if (segment.getServingRules() != null && segment.getServingRules().size() > 1) {
segment.getServingRules().sort(Comparator.comparing(GroupServingRule::getPriority));
}
}

@NonNull
protected String formatFlagKey(@NonNull String identifier) {
return String.format("flags/%s", identifier);
Expand Down