Map combiner from DTO instead of hardcoding AND in ParserUtils

gthea · gthea · commit 5b8bc948bf2a · 2026-04-08T14:00:21.000-03:00
Restores original behavior: reads matcherGroup.combiner and maps it
to CombiningMatcher.Combiner via valueOf, consistent with how
DataType is already mapped across the DTO/domain boundary.

Co-Authored-By: Claude Sonnet 4.6 &lt;noreply@anthropic.com&gt;

AI-Session-Id: 588a98fd-ba49-4318-8286-5fb79f9efaca
AI-Tool: claude-code
AI-Model: unknown
diff --git a/client/src/main/java/io/split/engine/experiments/ParserUtils.java b/client/src/main/java/io/split/engine/experiments/ParserUtils.java
@@ -1,6 +1,7 @@
 package io.split.engine.experiments;
 
 import io.split.client.dtos.DataType;
+import io.split.client.dtos.MatcherCombiner;
 import io.split.client.dtos.MatcherType;
 import io.split.client.dtos.Partition;
 import io.split.client.dtos.MatcherGroup;
@@ -81,14 +82,18 @@ public static CombiningMatcher toMatcher(MatcherGroup matcherGroup) {
             toCombine.add(toMatcher(matcher));
         }
 
-        return new CombiningMatcher(CombiningMatcher.Combiner.AND, toCombine);
+        return new CombiningMatcher(toCombiner(matcherGroup.combiner), toCombine);
     }
 
 
     private static io.split.rules.model.DataType toRulesDataType(io.split.client.dtos.DataType dt) {
         return io.split.rules.model.DataType.valueOf(dt.name());
     }
 
+    private static CombiningMatcher.Combiner toCombiner(MatcherCombiner combiner) {
+        return CombiningMatcher.Combiner.valueOf(combiner.name());
+    }
+
     public static AttributeMatcher toMatcher(Matcher matcher) {
         io.split.rules.matchers.Matcher delegate = null;
         switch (matcher.matcherType) {
