FFM-11654 Sort serving rules in cache code

harness · Jun 28, 2024 · 434be3b · 434be3b
1 parent 808bd25
commit 434be3b
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -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

diff --git a/examples/src/main/java/io/harness/ff/examples/GettingStarted.java b/examples/src/main/java/io/harness/ff/examples/GettingStarted.java
@@ -11,19 +11,19 @@
 
 public class GettingStarted {
     // API Key - set this as an env variable
-    private static final String apiKey = getEnvOrDefault("FF_API_KEY", "");
+    private static final String apiKey = getEnvOrDefault("FF_API_KEY", "d04a8a0a-265d-4292-a441-c7de929775e7");
 
     // Flag Identifier
-    private static final String flagName = getEnvOrDefault("FF_FLAG_NAME", "harnessappdemodarkmode");
+    private static final String flagName = getEnvOrDefault("FF_FLAG_NAME", "LargeAuditLogFlag");
 
     private static final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
 
     public static void main(String[] args) {
         System.out.println("Harness SDK Getting Started");
 
         final HarnessConnector connector = new HarnessConnector(apiKey, HarnessConfig.builder()
-                //.configUrl("http://localhost:8000/api/1.0")
-                //.eventUrl("http://localhost:8001/api/1.0")
+                .configUrl("https://config.feature-flags.qa.harness.io/api/1.0")
+                .eventUrl("https://event.feature-flags.qa.harness.io/api/1.0")
                 .build());
 
         // Create a Feature Flag Client
@@ -67,4 +67,4 @@ private static String getEnvOrDefault(String key, String defaultValue) {
         }
         return value;
     }
-}
+}
diff --git a/settings.gradle b/settings.gradle
@@ -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')

diff --git a/src/main/java/io/harness/cf/client/api/Evaluator.java b/src/main/java/io/harness/cf/client/api/Evaluator.java
@@ -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)) {

diff --git a/src/main/java/io/harness/cf/client/api/StorageRepository.java b/src/main/java/io/harness/cf/client/api/StorageRepository.java
@@ -3,13 +3,10 @@
 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 java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
+import io.harness.cf.model.*;
+
+import java.util.*;
+
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 
@@ -131,6 +128,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);
@@ -196,6 +197,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);