chore: address sonar

Author: zepfred

core/src/main/java/ai/timefold/solver/core/impl/heuristic/selector/list/SubListSelectorFactory.java

@@ -114,7 +114,8 @@ private EntityIndependentValueSelector<Solution_> buildEntityIndependentValueSel
             HeuristicConfigPolicy<Solution_> configPolicy, EntityDescriptor<Solution_> entityDescriptor,
             SelectionCacheType minimumCacheType, SelectionOrder inheritedSelectionOrder) {
         ValueSelectorConfig valueSelectorConfig =
-                Objects.requireNonNullElseGet(config.getValueSelectorConfig(), ValueSelectorConfig::new);
+                config != null && config.getValueSelectorConfig() != null ? config.getValueSelectorConfig()
+                        : new ValueSelectorConfig();
         // Mixed models require that the variable name be set
         if (configPolicy.getSolutionDescriptor().hasBothBasicAndListVariables()
                 && valueSelectorConfig.getVariableName() == null) {

core/src/test/java/ai/timefold/solver/core/impl/heuristic/selector/move/composite/UnionMoveSelectorTest.java

@@ -2,6 +2,7 @@
 
 import static ai.timefold.solver.core.testutil.PlannerAssert.assertAllCodesOfMoveSelector;
 import static ai.timefold.solver.core.testutil.PlannerAssert.verifyPhaseLifecycle;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -11,6 +12,7 @@
 import java.util.Map;
 import java.util.Random;
 
+import ai.timefold.solver.core.config.heuristic.selector.move.composite.UnionMoveSelectorConfig;
 import ai.timefold.solver.core.impl.heuristic.move.DummyMove;
 import ai.timefold.solver.core.impl.heuristic.selector.SelectorTestUtils;
 import ai.timefold.solver.core.impl.heuristic.selector.move.MoveSelector;
@@ -211,4 +213,9 @@ void emptyBiasedRandomSelection() {
         verifyPhaseLifecycle(childMoveSelectorList.get(1), 1, 1, 1);
     }
 
+    @Test
+    void testEnableNearbyMixedModel() {
+        var moveSelectorConfig = new UnionMoveSelectorConfig();
+        assertThat(moveSelectorConfig.canEnableNearbyInMixedModels()).isFalse();
+    }
 }

core/src/test/java/ai/timefold/solver/core/impl/heuristic/selector/move/generic/ChangeMoveTest.java

@@ -9,6 +9,8 @@
 
 import ai.timefold.solver.core.api.score.buildin.simple.SimpleScore;
 import ai.timefold.solver.core.api.score.director.ScoreDirector;
+import ai.timefold.solver.core.config.heuristic.selector.move.generic.ChangeMoveSelectorConfig;
+import ai.timefold.solver.core.config.heuristic.selector.move.generic.SwapMoveSelectorConfig;
 import ai.timefold.solver.core.impl.score.director.easy.EasyScoreDirectorFactory;
 import ai.timefold.solver.core.testdomain.TestdataEntity;
 import ai.timefold.solver.core.testdomain.TestdataSolution;
@@ -168,4 +170,9 @@ void toStringTestMultiVar() {
         assertThat(new ChangeMove<>(variableDescriptor, c, v3)).hasToString("c {v4 -> v3}");
     }
 
+    @Test
+    void testEnableNearbyMixedModel() {
+        var moveSelectorConfig = new ChangeMoveSelectorConfig();
+        assertThat(moveSelectorConfig.canEnableNearbyInMixedModels()).isFalse();
+    }
 }

core/src/test/java/ai/timefold/solver/core/impl/heuristic/selector/move/generic/SwapMoveTest.java

@@ -10,6 +10,7 @@
 
 import ai.timefold.solver.core.api.score.buildin.simple.SimpleScore;
 import ai.timefold.solver.core.api.score.director.ScoreDirector;
+import ai.timefold.solver.core.config.heuristic.selector.move.generic.SwapMoveSelectorConfig;
 import ai.timefold.solver.core.impl.score.director.easy.EasyScoreDirectorFactory;
 import ai.timefold.solver.core.testdomain.TestdataEntity;
 import ai.timefold.solver.core.testdomain.TestdataSolution;
@@ -259,4 +260,9 @@ void toStringTestMultiVar() {
         assertThat(new SwapMove<>(variableDescriptorList, c, b)).hasToString("c {v2, v4, w2} <-> b {v1, v3, w1}");
     }
 
+    @Test
+    void testEnableNearbyMixedModel() {
+        var moveSelectorConfig = new SwapMoveSelectorConfig();
+        assertThat(moveSelectorConfig.canEnableNearbyInMixedModels()).isFalse();
+    }
 }

core/src/test/java/ai/timefold/solver/core/impl/heuristic/selector/move/generic/chained/TailChainSwapMoveTest.java

@@ -8,6 +8,8 @@
 
 import ai.timefold.solver.core.api.score.buildin.simple.SimpleScore;
 import ai.timefold.solver.core.api.score.director.ScoreDirector;
+import ai.timefold.solver.core.config.heuristic.selector.move.generic.SwapMoveSelectorConfig;
+import ai.timefold.solver.core.config.heuristic.selector.move.generic.chained.TailChainSwapMoveSelectorConfig;
 import ai.timefold.solver.core.impl.domain.solution.descriptor.SolutionDescriptor;
 import ai.timefold.solver.core.impl.domain.variable.anchor.AnchorVariableDemand;
 import ai.timefold.solver.core.impl.domain.variable.anchor.AnchorVariableSupply;
@@ -292,4 +294,10 @@ void extractPlanningEntitiesWithRightEntityNull() {
         move.doMoveOnGenuineVariables(innerScoreDirector);
         assertThat(move.getPlanningEntities()).doesNotContainNull();
     }
+
+    @Test
+    void testEnableNearbyMixedModel() {
+        var moveSelectorConfig = new TailChainSwapMoveSelectorConfig();
+        assertThat(moveSelectorConfig.canEnableNearbyInMixedModels()).isFalse();
+    }
 }

core/src/test/java/ai/timefold/solver/core/impl/heuristic/selector/move/generic/list/ListChangeMoveTest.java

@@ -12,6 +12,7 @@
 import java.util.stream.Stream;
 
 import ai.timefold.solver.core.api.score.director.ScoreDirector;
+import ai.timefold.solver.core.config.heuristic.selector.move.generic.list.ListChangeMoveSelectorConfig;
 import ai.timefold.solver.core.impl.domain.variable.descriptor.ListVariableDescriptor;
 import ai.timefold.solver.core.impl.score.director.InnerScoreDirector;
 import ai.timefold.solver.core.testdomain.TestdataObject;
@@ -188,4 +189,10 @@ void toStringTest() {
         assertThat(new ListChangeMove<>(variableDescriptor, e1, 1, e1, 0)).hasToString("2 {e1[1] -> e1[0]}");
         assertThat(new ListChangeMove<>(variableDescriptor, e1, 0, e2, 1)).hasToString("1 {e1[0] -> e2[1]}");
     }
+
+    @Test
+    void testEnableNearbyMixedModel() {
+        var moveSelectorConfig = new ListChangeMoveSelectorConfig();
+        assertThat(moveSelectorConfig.canEnableNearbyInMixedModels()).isTrue();
+    }
 }

core/src/test/java/ai/timefold/solver/core/impl/heuristic/selector/move/generic/list/ListSwapMoveTest.java

@@ -7,6 +7,7 @@
 import static org.mockito.Mockito.verify;
 
 import ai.timefold.solver.core.api.score.director.ScoreDirector;
+import ai.timefold.solver.core.config.heuristic.selector.move.generic.list.ListSwapMoveSelectorConfig;
 import ai.timefold.solver.core.impl.domain.variable.descriptor.ListVariableDescriptor;
 import ai.timefold.solver.core.impl.move.director.MoveDirector;
 import ai.timefold.solver.core.impl.score.director.InnerScoreDirector;
@@ -137,4 +138,10 @@ void toStringTest() {
         assertThat(new ListSwapMove<>(variableDescriptor, e1, 0, e1, 1)).hasToString("1 {e1[0]} <-> 2 {e1[1]}");
         assertThat(new ListSwapMove<>(variableDescriptor, e1, 1, e2, 0)).hasToString("2 {e1[1]} <-> 3 {e2[0]}");
     }
+
+    @Test
+    void testEnableNearbyMixedModel() {
+        var moveSelectorConfig = new ListSwapMoveSelectorConfig();
+        assertThat(moveSelectorConfig.canEnableNearbyInMixedModels()).isTrue();
+    }
 }

core/src/test/java/ai/timefold/solver/core/impl/heuristic/selector/move/generic/list/kopt/KOptListMoveTest.java

@@ -11,6 +11,7 @@
 import java.util.List;
 import java.util.function.Function;
 
+import ai.timefold.solver.core.config.heuristic.selector.move.generic.list.kopt.KOptListMoveSelectorConfig;
 import ai.timefold.solver.core.impl.domain.variable.ListVariableStateDemand;
 import ai.timefold.solver.core.impl.domain.variable.ListVariableStateSupply;
 import ai.timefold.solver.core.impl.domain.variable.descriptor.ListVariableDescriptor;
@@ -548,6 +549,12 @@ void testIsFeasible() {
         assertThat(kOptListMove.isMoveDoable(scoreDirector)).isFalse();
     }
 
+    @Test
+    void testEnableNearbyMixedModel() {
+        var moveSelectorConfig = new KOptListMoveSelectorConfig();
+        assertThat(moveSelectorConfig.canEnableNearbyInMixedModels()).isTrue();
+    }
+
     /**
      * Create a sequential or non-sequential k-opt from the supplied pairs of undirected removed and added edges.
      *