fix: sonar issues

Author: Christopher-Chianelli

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

@@ -1,13 +1,14 @@
 package ai.timefold.solver.core.impl.bavet.common;
 
-import org.jspecify.annotations.Nullable;
+import org.jspecify.annotations.NullMarked;
 
+@NullMarked
 public interface TupleSourceRoot<A> {
-    void insert(@Nullable A a);
+    void insert(A a);
 
-    void update(@Nullable A a);
+    void update(A a);
 
-    void retract(@Nullable A a);
+    void retract(A a);
 
     boolean allowsInstancesOf(Class<?> clazz);
 

core/src/main/java/ai/timefold/solver/core/impl/bavet/uni/StaticDataUniNode.java

@@ -64,17 +64,19 @@ public Propagator getPropagator() {
         return propagationQueue;
     }
 
-    public void insert(@Nullable Object a) {
+    @Override
+    public void insert(Object a) {
         if (tupleMap.containsKey(a)) {
             return;
         }
-        tupleMap.values().stream().flatMap(List::stream).forEach(this::retractExisting);
+        invalidateCache();
         tupleMap.put(a, new ArrayList<>());
         insertIntoNodeNetwork(a);
         recalculateTuples();
     }
 
-    public void update(@Nullable Object a) {
+    @Override
+    public void update(Object a) {
         for (var mappedTuple : tupleMap.get(a)) {
             updateExisting(a, mappedTuple);
         }
@@ -93,11 +95,12 @@ private void updateExisting(@Nullable Object a, UniTuple<A> tuple) {
         }
     }
 
-    public void retract(@Nullable Object a) {
+    @Override
+    public void retract(Object a) {
         if (!tupleMap.containsKey(a)) {
             return;
         }
-        tupleMap.values().stream().flatMap(List::stream).forEach(this::retractExisting);
+        invalidateCache();
         tupleMap.remove(a);
         retractFromNodeNetwork(a);
         recalculateTuples();
@@ -125,29 +128,30 @@ private void retractExisting(UniTuple<A> tuple) {
     }
 
     private void insertIntoNodeNetwork(Object toInsert) {
-        nodeNetwork.getTupleSourceRootNodes(toInsert.getClass()).forEach(node -> {
-            ((AbstractForEachUniNode) node).insert(toInsert);
-        });
+        nodeNetwork.getTupleSourceRootNodes(toInsert.getClass())
+                .forEach(node -> ((AbstractForEachUniNode) node).insert(toInsert));
     }
 
     private void retractFromNodeNetwork(Object toRetract) {
-        nodeNetwork.getTupleSourceRootNodes(toRetract.getClass()).forEach(node -> {
-            ((AbstractForEachUniNode) node).retract(toRetract);
-        });
+        nodeNetwork.getTupleSourceRootNodes(toRetract.getClass())
+                .forEach(node -> ((AbstractForEachUniNode) node).retract(toRetract));
+    }
+
+    private void invalidateCache() {
+        tupleMap.values().stream().flatMap(List::stream).forEach(this::retractExisting);
+        recordingTupleNode.getTupleRecorder().reset();
     }
 
     private void recalculateTuples() {
         var recorder = recordingTupleNode.getTupleRecorder();
-        recorder.reset();
         for (var mappedTupleEntry : tupleMap.entrySet()) {
             mappedTupleEntry.getValue().clear();
             var invalidated = mappedTupleEntry.getKey();
             recorder.recordingInto(mappedTupleEntry.getValue(), this::remapTuple, () -> {
                 // Do an update on the object and settle the network; this will update precisely the
                 // tuples mapped to this node, which will then be recorded
-                nodeNetwork.getTupleSourceRootNodes(invalidated.getClass()).forEach(node -> {
-                    ((AbstractForEachUniNode) node).update(invalidated);
-                });
+                nodeNetwork.getTupleSourceRootNodes(invalidated.getClass())
+                        .forEach(node -> ((AbstractForEachUniNode) node).update(invalidated));
                 nodeNetwork.settle();
             });
         }

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

@@ -180,9 +180,11 @@ public void afterProblemFactAdded(Object problemFact) {
         super.afterProblemFactAdded(problemFact);
     }
 
+    @Override
     public void beforeProblemPropertyChanged(Object problemFactOrEntity) {
         // Since this is called when a fact (not a variable changes),
         // we need to retract and reinsert to update cached static data
+        super.beforeProblemPropertyChanged(problemFactOrEntity);
         session.retract(problemFactOrEntity);
     }