Small tweaks and Sonar

Author: triceo

core/src/main/java/ai/timefold/solver/core/impl/domain/variable/declarative/AbstractVariableReferenceGraph.java

@@ -18,6 +18,7 @@
 
 public abstract sealed class AbstractVariableReferenceGraph<Solution_, ChangeSet_> implements VariableReferenceGraph
         permits DefaultVariableReferenceGraph, FixedVariableReferenceGraph {
+
     // These structures are immutable.
     protected final List<EntityVariablePair<Solution_>> instanceList;
     protected final Map<VariableMetaModel<?, ?, ?>, Map<Object, EntityVariablePair<Solution_>>> variableReferenceToInstanceMap;

core/src/main/java/ai/timefold/solver/core/impl/domain/variable/declarative/DefaultShadowVariableSessionFactory.java

@@ -41,7 +41,6 @@ public DefaultShadowVariableSessionFactory(
         this.graphCreator = graphCreator;
     }
 
-    @SuppressWarnings("unchecked")
     public static <Solution_> VariableReferenceGraph buildGraph(
             SolutionDescriptor<Solution_> solutionDescriptor,
             VariableReferenceGraphBuilder<Solution_> variableReferenceGraphBuilder, Object[] entities,
@@ -76,7 +75,6 @@ static <Solution_> VariableReferenceGraph buildSingleDirectionalParentGraph(
         var topologicalSorter =
                 getTopologicalSorter(solutionDescriptor,
                         Objects.requireNonNull(changedVariableNotifier.innerScoreDirector()),
-                        Objects.requireNonNull(graphStructureAndDirection.parentMetaModel()),
                         Objects.requireNonNull(graphStructureAndDirection.direction()));
 
         return new SingleDirectionalParentVariableReferenceGraph<>(sortedDeclarativeVariables,
@@ -118,9 +116,8 @@ static <Solution_> VariableReferenceGraph buildSingleDirectionalParentGraph(
         return sortedDeclarativeVariables;
     }
 
-    private static <Solution_> TopologicalSorter getTopologicalSorter(
-            SolutionDescriptor<Solution_> solutionDescriptor, InnerScoreDirector<Solution_, ?> scoreDirector,
-            VariableMetaModel<?, ?, ?> parentMetaModel, ParentVariableType parentVariableType) {
+    private static <Solution_> TopologicalSorter getTopologicalSorter(SolutionDescriptor<Solution_> solutionDescriptor,
+            InnerScoreDirector<Solution_, ?> scoreDirector, ParentVariableType parentVariableType) {
         return switch (parentVariableType) {
             case PREVIOUS -> {
                 var listStateSupply = scoreDirector.getListVariableStateSupply(solutionDescriptor.getListVariableDescriptor());
@@ -149,7 +146,7 @@ private static <Solution_> VariableReferenceGraph buildArbitraryGraph(
         var variableIdToUpdater = new HashMap<VariableMetaModel<?, ?, ?>, VariableUpdaterInfo<Solution_>>();
 
         // Create graph node for each entity/declarative shadow variable pair.
-        // Maps a variable id to it source aliases;
+        // Maps a variable id to its source aliases;
         // For instance, "previousVisit.startTime" is a source alias of "startTime"
         // One way to view this concept is "previousVisit.startTime" is a pointer
         // to "startTime" of some visit, and thus alias it.

core/src/main/java/ai/timefold/solver/core/impl/domain/variable/declarative/DefaultVariableReferenceGraph.java

@@ -9,8 +9,7 @@
 
 import org.jspecify.annotations.NonNull;
 
-final class DefaultVariableReferenceGraph<Solution_> extends AbstractVariableReferenceGraph<Solution_, BitSet>
-        implements VariableReferenceGraph {
+final class DefaultVariableReferenceGraph<Solution_> extends AbstractVariableReferenceGraph<Solution_, BitSet> {
     // These structures are mutable.
     private final Consumer<BitSet> affectedEntitiesUpdater;
 

core/src/main/java/ai/timefold/solver/core/impl/domain/variable/declarative/FixedVariableReferenceGraph.java

@@ -8,8 +8,7 @@
 import org.jspecify.annotations.NonNull;
 
 public final class FixedVariableReferenceGraph<Solution_>
-        extends AbstractVariableReferenceGraph<Solution_, PriorityQueue<BaseTopologicalOrderGraph.NodeTopologicalOrder>>
-        implements VariableReferenceGraph {
+        extends AbstractVariableReferenceGraph<Solution_, PriorityQueue<BaseTopologicalOrderGraph.NodeTopologicalOrder>> {
     // These are immutable
     private final ChangedVariableNotifier<Solution_> changedVariableNotifier;
 

core/src/main/java/ai/timefold/solver/core/impl/domain/variable/declarative/SingleDirectionalParentVariableReferenceGraph.java

@@ -6,14 +6,14 @@
 import java.util.HashSet;
 import java.util.IdentityHashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 import java.util.function.UnaryOperator;
 
 import ai.timefold.solver.core.preview.api.domain.metamodel.VariableMetaModel;
 
 public final class SingleDirectionalParentVariableReferenceGraph<Solution_> implements VariableReferenceGraph {
+
     private final Set<VariableMetaModel<?, ?, ?>> monitoredSourceVariableSet;
     private final VariableUpdaterInfo<Solution_>[] sortedVariableUpdaterInfos;
     private final UnaryOperator<Object> successorFunction;
@@ -79,7 +79,7 @@ public SingleDirectionalParentVariableReferenceGraph(
     public void updateChanged() {
         isUpdating = true;
         changedEntities.sort(topologicalOrderComparator);
-        Map<Object, Object> processed = new IdentityHashMap<>();
+        var processed = new IdentityHashMap<>();
         for (var changedEntity : changedEntities) {
             var key = keyFunction.apply(changedEntity);
             var lastProcessed = processed.get(key);

core/src/main/java/ai/timefold/solver/core/impl/domain/variable/declarative/VariableReferenceGraph.java

@@ -3,8 +3,7 @@
 import ai.timefold.solver.core.preview.api.domain.metamodel.VariableMetaModel;
 
 public sealed interface VariableReferenceGraph
-        permits AbstractVariableReferenceGraph, DefaultVariableReferenceGraph, EmptyVariableReferenceGraph,
-        FixedVariableReferenceGraph, SingleDirectionalParentVariableReferenceGraph {
+        permits AbstractVariableReferenceGraph, EmptyVariableReferenceGraph, SingleDirectionalParentVariableReferenceGraph {
 
     void updateChanged();
 

core/src/main/java/ai/timefold/solver/core/impl/domain/variable/declarative/VariableReferenceGraphBuilder.java

@@ -70,12 +70,7 @@ public void addAfterProcessor(GraphChangeType graphChangeType, VariableMetaModel
                 .add(consumer);
     }
 
-    @SuppressWarnings("unchecked")
     public VariableReferenceGraph build(IntFunction<TopologicalOrderGraph> graphCreator) {
-        // TODO empty shows up in VRP example when using it as CVRP, not CVRPTW
-        //  In that case, TimeWindowedCustomer does not exist
-        //  and therefore Customer has no shadow variable.
-        //  Surely there has to be an earlier way to catch this?
         if (instanceList.isEmpty()) {
             return EmptyVariableReferenceGraph.INSTANCE;
         }

core/src/test/java/ai/timefold/solver/core/impl/domain/variable/declarative/SingleDirectionalParentVariableReferenceGraphTest.java

@@ -15,8 +15,9 @@
 import org.mockito.Mockito;
 
 class SingleDirectionalParentVariableReferenceGraphTest {
+
     @Test
-    public void supplierMethodsAreOnlyCalledOnce() {
+    void supplierMethodsAreOnlyCalledOnce() {
         var solutionDescriptor = TestdataCountingSolution.buildSolutionDescriptor();
         var graphStructureAndDirection = GraphStructure.determineGraphStructure(solutionDescriptor);
 
@@ -123,4 +124,5 @@ public void supplierMethodsAreOnlyCalledOnce() {
         assertThat(value4.getCount()).isEqualTo(3);
         assertThat(value5.getCount()).isZero();
     }
+
 }