Better name

Author: triceo

core/src/main/java/ai/timefold/solver/core/impl/move/director/MoveDirector.java

@@ -89,7 +89,7 @@ public final <Entity_, Value_> void changeVariable(PlanningVariableMetaModel<Sol
             PlanningListVariableMetaModel<Solution_, Entity_, Value_> variableMetaModel, Entity_ sourceEntity, int sourceIndex,
             Entity_ destinationEntity, int destinationIndex) {
         if (sourceEntity == destinationEntity) {
-            return swapValues(variableMetaModel, sourceEntity, sourceIndex, destinationIndex);
+            return moveValueInList(variableMetaModel, sourceEntity, sourceIndex, destinationIndex);
         }
         var variableDescriptor = extractVariableDescriptor(variableMetaModel);
         externalScoreDirector.beforeListVariableChanged(variableDescriptor, sourceEntity, sourceIndex, sourceIndex + 1);
@@ -107,13 +107,13 @@ public final <Entity_, Value_> void changeVariable(PlanningVariableMetaModel<Sol
 
     @SuppressWarnings("unchecked")
     @Override
-    public final <Entity_, Value_> @Nullable Value_ swapValues(
+    public final <Entity_, Value_> @Nullable Value_ moveValueInList(
             PlanningListVariableMetaModel<Solution_, Entity_, Value_> variableMetaModel, Entity_ entity, int sourceIndex,
             int destinationIndex) {
         if (sourceIndex == destinationIndex) {
             return null;
         } else if (sourceIndex > destinationIndex) { // Always start from the lower index.
-            return swapValues(variableMetaModel, entity, destinationIndex, sourceIndex);
+            return moveValueInList(variableMetaModel, entity, destinationIndex, sourceIndex);
         }
         var variableDescriptor = extractVariableDescriptor(variableMetaModel);
         var toIndex = destinationIndex + 1;

core/src/main/java/ai/timefold/solver/core/impl/move/streams/maybeapi/generic/move/ListChangeMove.java

@@ -123,7 +123,7 @@ private Value_ getMovedValue() {
     @Override
     public void execute(MutableSolutionView<Solution_> solutionView) {
         if (sourceEntity == destinationEntity) {
-            planningValue = solutionView.swapValues(variableMetaModel, sourceEntity, sourceIndex, destinationIndex);
+            planningValue = solutionView.moveValueInList(variableMetaModel, sourceEntity, sourceIndex, destinationIndex);
         } else {
             planningValue = solutionView.moveValueBetweenLists(variableMetaModel, sourceEntity, sourceIndex, destinationEntity,
                     destinationIndex);

core/src/main/java/ai/timefold/solver/core/preview/api/move/MutableSolutionView.java

@@ -125,7 +125,7 @@ <Entity_, Value_> void changeVariable(PlanningVariableMetaModel<Solution_, Entit
      * @return the value that was moved; null if nothing was moved
      * @throws IndexOutOfBoundsException if the index is out of bounds
      */
-    <Entity_, Value_> @Nullable Value_ swapValues(
+    <Entity_, Value_> @Nullable Value_ moveValueInList(
             PlanningListVariableMetaModel<Solution_, Entity_, Value_> variableMetaModel, Entity_ entity, int sourceIndex,
             int destinationIndex);
 

core/src/test/java/ai/timefold/solver/core/impl/move/director/MoveDirectorTest.java

@@ -120,7 +120,7 @@ void readListVariable() {
     }
 
     @Test
-    void swapValues() {
+    void moveValueInList() {
         var solutionMetaModel = TestdataListSolution.buildSolutionDescriptor()
                 .getMetaModel();
         var variableMetaModel = solutionMetaModel.entity(TestdataListEntity.class)
@@ -137,7 +137,7 @@ void swapValues() {
         // Swap between second and last position.
         var mockScoreDirector = (InnerScoreDirector<TestdataListSolution, ?>) mock(InnerScoreDirector.class);
         var moveDirector = new MoveDirector<>(mockScoreDirector).ephemeral();
-        moveDirector.swapValues(variableMetaModel, entity, 1, 2);
+        moveDirector.moveValueInList(variableMetaModel, entity, 1, 2);
         assertThat(entity.getValueList()).containsExactly(expectedValue1, expectedValue3, expectedValue2);
         verify(mockScoreDirector).beforeListVariableChanged(variableDescriptor, entity, 1, 3);
         verify(mockScoreDirector).afterListVariableChanged(variableDescriptor, entity, 1, 3);
@@ -151,7 +151,7 @@ void swapValues() {
 
         // Do the same in reverse.
         moveDirector = new MoveDirector<>(mockScoreDirector).ephemeral();
-        moveDirector.swapValues(variableMetaModel, entity, 2, 1);
+        moveDirector.moveValueInList(variableMetaModel, entity, 2, 1);
         assertThat(entity.getValueList()).containsExactly(expectedValue1, expectedValue3, expectedValue2);
         verify(mockScoreDirector).beforeListVariableChanged(variableDescriptor, entity, 1, 3);
         verify(mockScoreDirector).afterListVariableChanged(variableDescriptor, entity, 1, 3);