Skip to content

Commit 643db8e

Browse files
authored
fix(migration): add missing rewrite scripts
1 parent ccfad2e commit 643db8e

4 files changed

Lines changed: 46 additions & 2 deletions

File tree

tools/migration/src/main/java/ai/timefold/solver/migration/v2/GeneralMethodDeleteInvocationMigrationRecipe.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,11 @@ public List<Recipe> getRecipeList() {
110110
new RemoveMethodInvocations(
111111
"ai.timefold.solver.core.api.score.stream.tri.TriConstraintBuilder indictWith(..)"),
112112
new RemoveMethodInvocations(
113-
"ai.timefold.solver.core.api.score.stream.quad.QuadConstraintBuilder indictWith(..)"));
113+
"ai.timefold.solver.core.api.score.stream.quad.QuadConstraintBuilder indictWith(..)"),
114+
// indictWith in tests
115+
new RemoveMethodInvocations(
116+
"ai.timefold.solver.test.api.score.stream.SingleConstraintAssertion indictsWith(..)"),
117+
new RemoveMethodInvocations(
118+
"ai.timefold.solver.test.api.score.stream.SingleConstraintAssertion indictsWithExactly(..)"));
114119
}
115120
}

tools/migration/src/main/java/ai/timefold/solver/migration/v2/GeneralTypeChangeMigrationRecipe.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ public List<Recipe> getRecipeList() {
5555
"ai.timefold.solver.core.api.score.BendableScore", true),
5656
new ChangeType("ai.timefold.solver.core.api.score.buildin.bendablebigdecimal.BendableBigDecimalScore",
5757
"ai.timefold.solver.core.api.score.BendableBigDecimalScore", true),
58+
// ConstraintRef
59+
new ChangeType("ai.timefold.solver.core.api.score.constraint.ConstraintRef",
60+
"ai.timefold.solver.core.api.score.stream.ConstraintRef", true),
5861
// Problem fact
5962
new ChangeType("ai.timefold.solver.core.api.solver.ProblemFactChange",
6063
"ai.timefold.solver.core.api.solver.change.ProblemChange", true),

tools/migration/src/test/java/ai/timefold/solver/migration/v2/GeneralMethodDeleteInvocationMigrationRecipeTest.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,12 @@ public interface TriConstraintBuilder<A, B, C, Score_> {
112112
package ai.timefold.solver.core.api.score.stream.quad;
113113
public interface QuadConstraintBuilder<A, B, C, D, Score_> {
114114
QuadConstraintBuilder<A, B, C, D, Score_> indictWith(Object indictment);
115+
}""",
116+
"""
117+
package ai.timefold.solver.test.api.score.stream;
118+
public interface SingleConstraintAssertion {
119+
SingleConstraintAssertion indictsWith(Object matcher);
120+
SingleConstraintAssertion indictsWithExactly(Object... matchers);
115121
}"""));
116122
}
117123

@@ -304,18 +310,23 @@ void removeIndictWith() {
304310
import ai.timefold.solver.core.api.score.stream.bi.BiConstraintBuilder;
305311
import ai.timefold.solver.core.api.score.stream.tri.TriConstraintBuilder;
306312
import ai.timefold.solver.core.api.score.stream.quad.QuadConstraintBuilder;
313+
import ai.timefold.solver.test.api.score.stream.SingleConstraintAssertion;
314+
307315
import java.util.function.Function;
308316
309317
public class Test {
310318
UniConstraintBuilder<Object, ?> uni;
311319
BiConstraintBuilder<Object, Object, ?> bi;
312320
TriConstraintBuilder<Object, Object, Object, ?> tri;
313321
QuadConstraintBuilder<Object, Object, Object, Object, ?> quad;
322+
SingleConstraintAssertion assertion;
314323
public void test() {
315324
uni.indictWith(Function.identity());
316325
bi.indictWith((a, b) -> a);
317326
tri.indictWith(null);
318327
quad.indictWith(null);
328+
assertion.indictsWith(null);
329+
assertion.indictsWithExactly(null);
319330
}
320331
}""",
321332
"""
@@ -325,13 +336,16 @@ public void test() {
325336
import ai.timefold.solver.core.api.score.stream.bi.BiConstraintBuilder;
326337
import ai.timefold.solver.core.api.score.stream.tri.TriConstraintBuilder;
327338
import ai.timefold.solver.core.api.score.stream.quad.QuadConstraintBuilder;
339+
import ai.timefold.solver.test.api.score.stream.SingleConstraintAssertion;
340+
328341
import java.util.function.Function;
329342
330343
public class Test {
331344
UniConstraintBuilder<Object, ?> uni;
332345
BiConstraintBuilder<Object, Object, ?> bi;
333346
TriConstraintBuilder<Object, Object, Object, ?> tri;
334347
QuadConstraintBuilder<Object, Object, Object, Object, ?> quad;
348+
SingleConstraintAssertion assertion;
335349
public void test() {
336350
}
337351
}"""));

tools/migration/src/test/java/ai/timefold/solver/migration/v2/GeneralTypeChangeMigrationRecipeTest.java

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,29 @@ public void defaults(RecipeSpec spec) {
6161
"package ai.timefold.solver.core.impl.heuristic.selector.move.generic; public interface PillarChangeMove {}",
6262
"package ai.timefold.solver.core.impl.heuristic.selector.move.generic; public interface PillarSwapMove {}",
6363
"package ai.timefold.solver.core.impl.heuristic.selector.move.generic; public interface RuinRecreateMove {}",
64-
"package ai.timefold.solver.core.impl.heuristic.selector.move.generic; public interface SwapMove {}"));
64+
"package ai.timefold.solver.core.impl.heuristic.selector.move.generic; public interface SwapMove {}",
65+
"package ai.timefold.solver.core.api.score.constraint; public class ConstraintRef {}"));
66+
}
67+
68+
@Test
69+
void migrateConstraintRef() {
70+
rewriteRun(java(
71+
"""
72+
package timefold;
73+
74+
import ai.timefold.solver.core.api.score.constraint.ConstraintRef;
75+
76+
public class Test {
77+
ConstraintRef constraintRef;
78+
}""",
79+
"""
80+
package timefold;
81+
82+
import ai.timefold.solver.core.api.score.stream.ConstraintRef;
83+
84+
public class Test {
85+
ConstraintRef constraintRef;
86+
}"""));
6587
}
6688

6789
@Test

0 commit comments

Comments
 (0)