Formatting

Author: triceo

core/src/main/java/ai/timefold/solver/core/impl/score/stream/collector/AbstractToCollectionSlot.java

@@ -5,8 +5,6 @@
 
 import ai.timefold.solver.core.impl.util.ElementAwareArrayList;
 
-import org.jspecify.annotations.Nullable;
-
 public abstract class AbstractToCollectionSlot<Mapped_, Result_ extends Collection<Mapped_>> {
     public static final class State<Mapped_, Collection_ extends Collection<Mapped_>> {
         private final IntFunction<Collection_> collectionFunction;
@@ -28,7 +26,7 @@ public Collection_ result() {
     }
 
     private final State<Mapped_, Result_> state;
-    private ElementAwareArrayList.@Nullable Entry<Mapped_> cachedEntry;
+    private ElementAwareArrayList<Mapped_>.Entry cachedEntry;
 
     public AbstractToCollectionSlot(State<Mapped_, Result_> state) {
         this.state = state;
@@ -43,6 +41,7 @@ protected void updateMapped(Mapped_ mapped) {
     }
 
     protected void removeMapped() {
-        state.list.remove(cachedEntry);
+        cachedEntry.remove();
+        cachedEntry = null;
     }
 }

core/src/main/java/ai/timefold/solver/core/impl/score/stream/collector/AbstractToListSlot.java

@@ -4,8 +4,6 @@
 
 import ai.timefold.solver.core.impl.util.ElementAwareArrayList;
 
-import org.jspecify.annotations.Nullable;
-
 public abstract class AbstractToListSlot<Mapped_> {
     public static final class State<Mapped_> {
         private final ElementAwareArrayList<Mapped_> resultList = new ElementAwareArrayList<>();
@@ -16,7 +14,7 @@ public List<Mapped_> result() {
     }
 
     private final State<Mapped_> state;
-    private ElementAwareArrayList.@Nullable Entry<Mapped_> cachedEntry;
+    private ElementAwareArrayList<Mapped_>.Entry cachedEntry;
 
     public AbstractToListSlot(State<Mapped_> state) {
         this.state = state;
@@ -31,7 +29,7 @@ protected void updateMapped(Mapped_ mapped) {
     }
 
     protected void removeMapped() {
-        state.resultList.remove(cachedEntry);
+        cachedEntry.remove();
         cachedEntry = null;
     }
 }

persistence/jackson/src/test/java/ai/timefold/solver/jackson/api/score/stream/common/SequenceRoundTripTest.java

@@ -33,12 +33,12 @@ private record Item(String id, int index) {
     @Test
     <Ctx_> void roundTrip() throws JacksonException {
         // Prepare the data to be serialized.
-        Item sequence1Item1 = new Item("sequence1Item1", 0);
-        Item sequence1Item2 = new Item("sequence1Item2", 1);
-        Item sequence2Item1 = new Item("sequence2Item1", 3);
-        Item sequence2Item2 = new Item("sequence2Item2", 4);
-        Item sequence2Item3 = new Item("sequence2Item3", 5);
-        Item sequence3Item1 = new Item("sequence3Item1", 7);
+        var sequence1Item1 = new Item("sequence1Item1", 0);
+        var sequence1Item2 = new Item("sequence1Item2", 1);
+        var sequence2Item1 = new Item("sequence2Item1", 3);
+        var sequence2Item2 = new Item("sequence2Item2", 4);
+        var sequence2Item3 = new Item("sequence2Item3", 5);
+        var sequence3Item1 = new Item("sequence3Item1", 7);
         UniConstraintCollector<Item, Ctx_, SequenceChain<Item, Integer>> collector =
                 (UniConstraintCollector) ConstraintCollectors.toConsecutiveSequences(Item::index);
         var context = collector.supplier().get();

quarkus-integration/quarkus-jackson/runtime/src/test/java/ai/timefold/solver/quarkus/jackson/score/stream/common/SequenceRoundTripTest.java

@@ -32,12 +32,12 @@ private record Item(String id, int index) {
     @Test
     <Ctx_> void roundTrip() throws JsonProcessingException {
         // Prepare the data to be serialized.
-        Item sequence1Item1 = new Item("sequence1Item1", 0);
-        Item sequence1Item2 = new Item("sequence1Item2", 1);
-        Item sequence2Item1 = new Item("sequence2Item1", 3);
-        Item sequence2Item2 = new Item("sequence2Item2", 4);
-        Item sequence2Item3 = new Item("sequence2Item3", 5);
-        Item sequence3Item1 = new Item("sequence3Item1", 7);
+        var sequence1Item1 = new Item("sequence1Item1", 0);
+        var sequence1Item2 = new Item("sequence1Item2", 1);
+        var sequence2Item1 = new Item("sequence2Item1", 3);
+        var sequence2Item2 = new Item("sequence2Item2", 4);
+        var sequence2Item3 = new Item("sequence2Item3", 5);
+        var sequence3Item1 = new Item("sequence3Item1", 7);
         UniConstraintCollector<Item, Ctx_, SequenceChain<Item, Integer>> collector =
                 (UniConstraintCollector) ConstraintCollectors.toConsecutiveSequences(Item::index);
         var context = collector.supplier().get();