chore: merge fixes

Author: Christopher-Chianelli

core/src/main/java/ai/timefold/solver/core/api/domain/variable/InconsistentSolutionException.java

@@ -1,18 +1,19 @@
 package ai.timefold.solver.core.api.domain.variable;
 
+import java.util.Collection;
 import java.util.List;
 
 import org.jspecify.annotations.NullMarked;
 
 @NullMarked
 public class InconsistentSolutionException extends RuntimeException {
     private final Object solution;
-    private final List<Object> involvedEntityList;
+    private final Collection<Object> involvedEntityCollection;
 
-    public InconsistentSolutionException(String feature, Object solution, List<Object> involvedEntityList) {
+    public InconsistentSolutionException(String feature, Object solution, Collection<Object> involvedEntityCollection) {
         super("The solution (%s) is inconsistent. %s requires a consistent solution.".formatted(solution, feature));
         this.solution = solution;
-        this.involvedEntityList = involvedEntityList;
+        this.involvedEntityCollection = involvedEntityCollection;
     }
 
     @SuppressWarnings("unchecked")
@@ -21,7 +22,7 @@ public <T> T getSolution() {
     }
 
     @SuppressWarnings("unchecked")
-    public <T> List<T> getInvolvedEntityList() {
-        return (List<T>) involvedEntityList;
+    public <T> List<T> getInvolvedEntityCollection() {
+        return (List<T>) involvedEntityCollection;
     }
 }

core/src/main/java/ai/timefold/solver/core/impl/score/director/AbstractScoreDirector.java

@@ -2,6 +2,7 @@
 
 import static java.util.Objects.requireNonNull;
 
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.IdentityHashMap;
@@ -343,7 +344,7 @@ protected void afterSetWorkingSolution() {
         // Do nothing
     }
 
-    public List<Object> computeInconsistentEntities() {
+    public Collection<Object> computeInconsistentEntities() {
         return shadowVariableSupport.getInconsistentEntities();
     }
 

core/src/test/java/ai/timefold/solver/core/api/solver/SolutionManagerTest.java

@@ -7,6 +7,7 @@
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
 import java.util.function.Function;
 
 import ai.timefold.solver.core.api.domain.variable.InconsistentSolutionException;
@@ -142,7 +143,7 @@ void updateInconsistent(SolutionManagerSource solutionManagerSource) {
                 .hasMessageContainingAll("The solution (",
                         "is inconsistent", "Solution update", "requires a consistent solution")
                 .hasFieldOrPropertyWithValue("solution", inconsistentSolution)
-                .hasFieldOrPropertyWithValue("involvedEntityList", List.of(valueA1, valueA2));
+                .hasFieldOrPropertyWithValue("involvedEntityCollection", Set.of(valueA1, valueA2));
     }
 
     private void assertShadowedListValueAllNull(SoftAssertions softly, TestdataListValueWithShadowHistory current) {
@@ -204,7 +205,7 @@ void updateOnlyShadowVariablesInconsistent(SolutionManagerSource solutionManager
                 .hasMessageContainingAll("The solution (",
                         "is inconsistent", "Solution update", "requires a consistent solution")
                 .hasFieldOrPropertyWithValue("solution", inconsistentSolution)
-                .hasFieldOrPropertyWithValue("involvedEntityList", List.of(valueA1, valueA2));
+                .hasFieldOrPropertyWithValue("involvedEntityCollection", Set.of(valueA1, valueA2));
     }
 
     @ParameterizedTest