WIP evaluator

AI-Session-Id: 095253e8-7e1c-4578-9779-bf96395021cf
AI-Tool: claude-code
AI-Model: unknown

Author: gthea

.gitignore

@@ -9,4 +9,4 @@ target
 .project
 .settings
 .DS_Store
-dependency-reduced-pom.xml
+dependency-reduced-pom.xml

client/pom.xml

@@ -167,6 +167,11 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>io.split.client</groupId>
+            <artifactId>targeting-engine</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>io.split.client</groupId>
             <artifactId>pluggable-storage</artifactId>

client/src/main/java/io/split/client/CacheUpdaterService.java

@@ -1,15 +1,13 @@
 package io.split.client;
 
-import com.google.common.collect.Lists;
 import io.split.client.dtos.ConditionType;
-import io.split.client.dtos.MatcherCombiner;
 import io.split.client.dtos.Partition;
 import io.split.engine.experiments.ParsedCondition;
 import io.split.engine.experiments.ParsedSplit;
-import io.split.engine.matchers.AllKeysMatcher;
-import io.split.engine.matchers.AttributeMatcher;
-import io.split.engine.matchers.CombiningMatcher;
-import io.split.engine.matchers.strings.WhitelistMatcher;
+import io.split.rules.matchers.AllKeysMatcher;
+import io.split.rules.matchers.AttributeMatcher;
+import io.split.rules.matchers.CombiningMatcher;
+import io.split.rules.matchers.WhitelistMatcher;
 import io.split.grammar.Treatments;
 import io.split.storages.SplitCacheProducer;
 
@@ -22,15 +20,15 @@
 import java.util.HashMap;
 import java.util.stream.Collectors;
 
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Objects;
 
 public final  class CacheUpdaterService {
 
     private static String LOCALHOST = "localhost";
     private SplitCacheProducer _splitCacheProducer;
 
     public CacheUpdaterService(SplitCacheProducer splitCacheProducer) {
-        _splitCacheProducer = checkNotNull(splitCacheProducer);
+        _splitCacheProducer = Objects.requireNonNull(splitCacheProducer);
     }
 
     public void updateCache(Map<SplitAndKey, LocalhostSplit> map) {
@@ -78,9 +76,10 @@ private List<ParsedCondition> getConditions(String splitKey, ParsedSplit split,
 
     private ParsedCondition createWhitelistCondition(String splitKey, Partition partition) {
         ParsedCondition parsedCondition = new ParsedCondition(ConditionType.WHITELIST,
-                new CombiningMatcher(MatcherCombiner.AND,
-                        Lists.newArrayList(new AttributeMatcher(null, new WhitelistMatcher(Lists.newArrayList(splitKey)), false))),
-                Lists.newArrayList(partition), splitKey);
+                new CombiningMatcher(CombiningMatcher.Combiner.AND,
+                        new java.util.ArrayList<>(java.util.Arrays.asList(
+                                new AttributeMatcher(null, new WhitelistMatcher(java.util.Arrays.asList(splitKey)), false)))),
+                new java.util.ArrayList<>(java.util.Arrays.asList(partition)), splitKey);
         return parsedCondition;
     }
 
@@ -89,9 +88,9 @@ private ParsedCondition createRolloutCondition(Partition partition) {
         rolloutPartition.treatment = "-";
         rolloutPartition.size = 0;
         ParsedCondition parsedCondition = new ParsedCondition(ConditionType.ROLLOUT,
-                new CombiningMatcher(MatcherCombiner.AND,
-                        Lists.newArrayList(new AttributeMatcher(null,  new AllKeysMatcher(), false))),
-                Lists.newArrayList(partition, rolloutPartition), "LOCAL");
+                new CombiningMatcher(CombiningMatcher.Combiner.AND,
+                        new java.util.ArrayList<>(java.util.Arrays.asList(new AttributeMatcher(null, new AllKeysMatcher(), false)))),
+                new java.util.ArrayList<>(java.util.Arrays.asList(partition, rolloutPartition)), "LOCAL");
 
         return parsedCondition;
     }

client/src/main/java/io/split/client/api/SplitView.java

@@ -11,6 +11,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 
 /**
@@ -51,7 +52,13 @@ public static SplitView fromParsedSplit(ParsedSplit parsedSplit) {
         splitView.configs = parsedSplit.configurations() == null? Collections.<String, String>emptyMap() : parsedSplit.configurations() ;
         splitView.impressionsDisabled = parsedSplit.impressionsDisabled();
         splitView.prerequisites = parsedSplit.prerequisitesMatcher() != null ?
-                parsedSplit.prerequisitesMatcher().getPrerequisites(): new ArrayList<>();
+                parsedSplit.prerequisitesMatcher().getPrerequisites().stream()
+                        .map(p -> {
+                            Prerequisites prereq = new Prerequisites();
+                            prereq.featureFlagName = p.featureFlagName();
+                            prereq.treatments = p.treatments();
+                            return prereq;
+                        }).collect(Collectors.toList()) : new ArrayList<>();
 
         return splitView;
     }

client/src/main/java/io/split/client/impressions/ImpressionHasher.java

@@ -1,6 +1,6 @@
 package io.split.client.impressions;
 
-import io.split.client.utils.MurmurHash3;
+import io.split.rules.bucketing.MurmurHash3;
 
 public class ImpressionHasher {