chore: move indictment code for IfExists to IndictmentSource

Author: Christopher-Chianelli

core/src/main/java/ai/timefold/solver/core/impl/bavet/common/AbstractIfExistsNode.java

@@ -1,7 +1,5 @@
 package ai.timefold.solver.core.impl.bavet.common;
 
-import java.util.Objects;
-
 import ai.timefold.solver.core.impl.bavet.common.tuple.InTupleStorePositionTracker;
 import ai.timefold.solver.core.impl.bavet.common.tuple.Tuple;
 import ai.timefold.solver.core.impl.bavet.common.tuple.TupleLifecycle;
@@ -126,15 +124,13 @@ protected void incrementCounterRightUpdatingIndictment(ExistsCounter<LeftTuple_>
                 doRetractCounter(counter);
             }
         } // Else do not even propagate an update
-        counter.getTuple().getIndictmentSupportForNodeId(getId())
-                .add(Objects.requireNonNull(rightTuple.getA()));
+        IndictmentSource.addSupport(getId(), counter.leftTuple, rightTuple);
         counter.countRight++;
     }
 
     protected void decrementCounterRight(ExistsCounter<LeftTuple_> counter) {
         counter.countRight--;
-        counter.getTuple().getIndictmentSupportForNodeId(getId())
-                .remove(Objects.requireNonNull(rightTuple.getA()));
+        IndictmentSource.removeSupport(getId(), counter.leftTuple, rightTuple);
         if (counter.countRight == 0) {
             if (shouldExist) {
                 doRetractCounter(counter);

core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/Tuple.java

@@ -29,7 +29,7 @@ public sealed interface Tuple permits BiTuple, QuadTuple, TriTuple, UniTuple {
 
     void setIndictmentSource(IndictmentSource indictmentSource);
 
-    Set<Object> getIndictmentSupportForNodeId(long nodeId);
+    Set<IndictmentSource> getIndictmentSupportForNodeId(long nodeId);
 
     TupleState getState();
 

core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/UniversalTuple.java

@@ -28,7 +28,7 @@ final class UniversalTuple<A, B, C, D>
     private @Nullable C c;
     private @Nullable D d;
     private IndictmentSource indictmentSource = IndictmentSource.DISABLED;
-    private @Nullable Map<Long, Set<Object>> nodeIdToIndictmentSupport;
+    private @Nullable Map<Long, Set<IndictmentSource>> nodeIdToIndictmentSupport;
     private TupleState state = TupleState.DEAD; // It's the node's job to mark a new tuple as CREATING.
 
     UniversalTuple(int storeSize, int cardinality) {
@@ -123,7 +123,7 @@ public void setIndictmentSource(IndictmentSource indictmentSource) {
     }
 
     @Override
-    public Set<Object> getIndictmentSupportForNodeId(long nodeId) {
+    public Set<IndictmentSource> getIndictmentSupportForNodeId(long nodeId) {
         if (nodeIdToIndictmentSupport == null) {
             nodeIdToIndictmentSupport = new LinkedHashMap<>();
         }

core/src/main/java/ai/timefold/solver/core/impl/bavet/common/tuple/indictment/IndictmentSource.java

@@ -50,18 +50,18 @@ static IndictmentSource removeFromAggregate(Tuple elementTuple, Tuple groupTuple
         }
     }
 
-    static IndictmentSource sourceWithSupport(Tuple carry, Tuple support) {
+    static void addSupport(long nodeId, Tuple carry, Tuple support) {
         if (carry.getIndictmentSource() == DISABLED) {
-            return DISABLED;
+            return;
         }
-        if (carry.getIndictmentSource() instanceof IndictmentSourceWithSupport indictmentSourceWithSupport) {
-            indictmentSourceWithSupport.support.add(support.getIndictmentSource());
-            return indictmentSourceWithSupport;
-        } else {
-            throw new IllegalStateException("Carry tuple (%s) does not have a %s %s; its source is (%s) instead."
-                    .formatted(carry, IndictmentSourceWithSupport.class.getSimpleName(), IndictmentSource.class.getSimpleName(),
-                            support.getIndictmentSource()));
+        carry.getIndictmentSupportForNodeId(nodeId).add(support.getIndictmentSource());
+    }
+
+    static void removeSupport(long nodeId, Tuple carry, Tuple support) {
+        if (carry.getIndictmentSource() == DISABLED) {
+            return;
         }
+        carry.getIndictmentSupportForNodeId(nodeId).remove(support.getIndictmentSource());
     }
 
     record DisabledIndictmentSource() implements IndictmentSource {

core/src/main/java/ai/timefold/solver/core/impl/score/stream/common/inliner/ConstraintMatchSupplier.java

@@ -42,7 +42,6 @@
 public interface ConstraintMatchSupplier<Score_ extends Score<Score_>>
         extends BiFunction<Constraint, Score_, ConstraintMatch<Score_>> {
 
-    @SuppressWarnings("unchecked")
     static List<Object> collectIndictments(Constraint constraint, Tuple tuple) {
         if (tuple.getIndictmentSource() == IndictmentSource.DISABLED) {
             return Collections.emptyList();
@@ -51,7 +50,9 @@ static List<Object> collectIndictments(Constraint constraint, Tuple tuple) {
         tuple.getIndictmentSource().visitSources(out::add);
         var abstractConstraint = (AbstractConstraint<?, ?, ?>) constraint;
         for (var involvedNodeId : Objects.requireNonNull(abstractConstraint.getInvolvedNodeIds())) {
-            out.addAll(tuple.getIndictmentSupportForNodeId(involvedNodeId));
+            for (var indictmentSource : tuple.getIndictmentSupportForNodeId(involvedNodeId)) {
+                indictmentSource.visitSources(out::add);
+            }
         }
         return new ArrayList<>(out);
     }

core/src/test/java/ai/timefold/solver/core/impl/score/stream/common/uni/AbstractUniConstraintStreamTest.java

@@ -481,12 +481,10 @@ public void ifExists_0Joiner0Filter() {
         assertScore(scoreDirector,
                 assertMatch(solution.getFirstValueGroup()).withIndictedObjects(
                         solution.getFirstValueGroup(),
-                        solution.getFirstEntityGroup(),
-                        entityGroup),
+                        solution.getFirstEntityGroup()),
                 assertMatch(valueGroup).withIndictedObjects(
                         valueGroup,
-                        solution.getFirstEntityGroup(),
-                        entityGroup));
+                        solution.getFirstEntityGroup()));
     }
 
     @Override