From dc986c2ba6d545d91a704f446c66ed9e5f551967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Petrovick=C3=BD?= Date: Sun, 1 Mar 2026 11:58:15 +0100 Subject: [PATCH] chore: adapt to JPMS --- .../examples/cloudbalancing/app/CloudBalancingApp.java | 2 +- .../cloudbalancing/persistence/CloudBalancingGenerator.java | 2 +- .../solver/benchmarks/examples/common/app/CommonApp.java | 2 +- .../examples/common/persistence/SolutionConverter.java | 2 +- .../conferencescheduling/app/ConferenceSchedulingApp.java | 2 +- .../persistence/ConferenceSchedulingGenerator.java | 2 +- .../examples/curriculumcourse/app/CurriculumCourseApp.java | 2 +- .../persistence/CurriculumCourseGenerator.java | 2 +- .../benchmarks/examples/examination/app/ExaminationApp.java | 2 +- .../solver/benchmarks/examples/flowshop/app/FlowShopApp.java | 2 +- .../machinereassignment/app/MachineReassignmentApp.java | 2 +- .../examples/meetingscheduling/app/MeetingSchedulingApp.java | 2 +- .../persistence/MeetingSchedulingGenerator.java | 2 +- .../examples/nurserostering/app/NurseRosteringApp.java | 2 +- .../examples/pas/app/PatientAdmissionScheduleApp.java | 2 +- .../examples/taskassigning/app/TaskAssigningApp.java | 2 +- .../taskassigning/persistence/TaskAssigningGenerator.java | 3 +-- .../travelingtournament/app/TravelingTournamentApp.java | 2 +- .../ai/timefold/solver/benchmarks/examples/tsp/app/TspApp.java | 2 +- .../examples/vehiclerouting/app/VehicleRoutingApp.java | 2 +- .../micro/scoredirector/problems/AbstractProblem.java | 2 +- .../micro/scoredirector/problems/CloudBalancingProblem.java | 2 +- .../scoredirector/problems/ConferenceSchedulingProblem.java | 2 +- .../micro/scoredirector/problems/CurriculumCourseProblem.java | 2 +- .../micro/scoredirector/problems/ExaminationProblem.java | 2 +- .../scoredirector/problems/MachineReassignmentProblem.java | 2 +- .../micro/scoredirector/problems/MeetingSchedulingProblem.java | 2 +- .../micro/scoredirector/problems/NurseRosteringProblem.java | 2 +- .../problems/PatientAdmissionSchedulingProblem.java | 2 +- .../micro/scoredirector/problems/TaskAssigningProblem.java | 2 +- .../scoredirector/problems/TravelingTournamentProblem.java | 2 +- .../benchmarks/micro/scoredirector/problems/TspProblem.java | 2 +- .../micro/scoredirector/problems/VehicleRoutingProblem.java | 2 +- .../solver/benchmarks/examples/common/app/SolverSmokeTest.java | 2 +- .../examples/common/app/UnsolvedDirSolveAllTurtleTest.java | 2 +- .../examples/common/persistence/OpenDataFilesTest.java | 2 +- 36 files changed, 36 insertions(+), 37 deletions(-) diff --git a/src/main/java/ai/timefold/solver/benchmarks/examples/cloudbalancing/app/CloudBalancingApp.java b/src/main/java/ai/timefold/solver/benchmarks/examples/cloudbalancing/app/CloudBalancingApp.java index f16f40e3..b601215a 100644 --- a/src/main/java/ai/timefold/solver/benchmarks/examples/cloudbalancing/app/CloudBalancingApp.java +++ b/src/main/java/ai/timefold/solver/benchmarks/examples/cloudbalancing/app/CloudBalancingApp.java @@ -3,7 +3,7 @@ import ai.timefold.solver.benchmarks.examples.cloudbalancing.domain.CloudBalance; import ai.timefold.solver.benchmarks.examples.cloudbalancing.persistence.CloudBalanceSolutionFileIO; import ai.timefold.solver.benchmarks.examples.common.app.CommonApp; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; public class CloudBalancingApp extends CommonApp { diff --git a/src/main/java/ai/timefold/solver/benchmarks/examples/cloudbalancing/persistence/CloudBalancingGenerator.java b/src/main/java/ai/timefold/solver/benchmarks/examples/cloudbalancing/persistence/CloudBalancingGenerator.java index e339175b..2119cd72 100644 --- a/src/main/java/ai/timefold/solver/benchmarks/examples/cloudbalancing/persistence/CloudBalancingGenerator.java +++ b/src/main/java/ai/timefold/solver/benchmarks/examples/cloudbalancing/persistence/CloudBalancingGenerator.java @@ -13,7 +13,7 @@ import ai.timefold.solver.benchmarks.examples.common.app.CommonApp; import ai.timefold.solver.benchmarks.examples.common.app.LoggingMain; import ai.timefold.solver.benchmarks.examples.common.persistence.AbstractSolutionImporter; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; public class CloudBalancingGenerator extends LoggingMain { diff --git a/src/main/java/ai/timefold/solver/benchmarks/examples/common/app/CommonApp.java b/src/main/java/ai/timefold/solver/benchmarks/examples/common/app/CommonApp.java index 97ef1f28..2e955503 100644 --- a/src/main/java/ai/timefold/solver/benchmarks/examples/common/app/CommonApp.java +++ b/src/main/java/ai/timefold/solver/benchmarks/examples/common/app/CommonApp.java @@ -7,10 +7,10 @@ import ai.timefold.solver.benchmarks.examples.common.persistence.AbstractSolutionImporter; import ai.timefold.solver.core.api.domain.solution.PlanningSolution; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; import ai.timefold.solver.core.api.solver.SolverConfigOverride; import ai.timefold.solver.core.api.solver.SolverFactory; import ai.timefold.solver.core.config.solver.termination.TerminationConfig; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; /** * @param the solution type, the class with the {@link PlanningSolution} annotation diff --git a/src/main/java/ai/timefold/solver/benchmarks/examples/common/persistence/SolutionConverter.java b/src/main/java/ai/timefold/solver/benchmarks/examples/common/persistence/SolutionConverter.java index 6302f192..393ebde9 100644 --- a/src/main/java/ai/timefold/solver/benchmarks/examples/common/persistence/SolutionConverter.java +++ b/src/main/java/ai/timefold/solver/benchmarks/examples/common/persistence/SolutionConverter.java @@ -8,7 +8,7 @@ import ai.timefold.solver.benchmarks.examples.common.app.LoggingMain; import ai.timefold.solver.benchmarks.examples.common.business.ProblemFileComparator; import ai.timefold.solver.core.api.domain.solution.PlanningSolution; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; /** * @param the solution type, the class with the {@link PlanningSolution} annotation diff --git a/src/main/java/ai/timefold/solver/benchmarks/examples/conferencescheduling/app/ConferenceSchedulingApp.java b/src/main/java/ai/timefold/solver/benchmarks/examples/conferencescheduling/app/ConferenceSchedulingApp.java index d3f341b2..f5470474 100644 --- a/src/main/java/ai/timefold/solver/benchmarks/examples/conferencescheduling/app/ConferenceSchedulingApp.java +++ b/src/main/java/ai/timefold/solver/benchmarks/examples/conferencescheduling/app/ConferenceSchedulingApp.java @@ -6,7 +6,7 @@ import ai.timefold.solver.benchmarks.examples.common.app.CommonApp; import ai.timefold.solver.benchmarks.examples.conferencescheduling.domain.ConferenceSolution; import ai.timefold.solver.benchmarks.examples.conferencescheduling.persistence.ConferenceSchedulingSolutionFileIO; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; public class ConferenceSchedulingApp extends CommonApp { diff --git a/src/main/java/ai/timefold/solver/benchmarks/examples/conferencescheduling/persistence/ConferenceSchedulingGenerator.java b/src/main/java/ai/timefold/solver/benchmarks/examples/conferencescheduling/persistence/ConferenceSchedulingGenerator.java index 5d742134..97e8ab16 100644 --- a/src/main/java/ai/timefold/solver/benchmarks/examples/conferencescheduling/persistence/ConferenceSchedulingGenerator.java +++ b/src/main/java/ai/timefold/solver/benchmarks/examples/conferencescheduling/persistence/ConferenceSchedulingGenerator.java @@ -29,7 +29,7 @@ import ai.timefold.solver.benchmarks.examples.conferencescheduling.domain.TalkType; import ai.timefold.solver.benchmarks.examples.conferencescheduling.domain.Timeslot; import ai.timefold.solver.core.api.domain.solution.ConstraintWeightOverrides; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; public class ConferenceSchedulingGenerator extends LoggingMain { diff --git a/src/main/java/ai/timefold/solver/benchmarks/examples/curriculumcourse/app/CurriculumCourseApp.java b/src/main/java/ai/timefold/solver/benchmarks/examples/curriculumcourse/app/CurriculumCourseApp.java index f0ac2834..a70090fb 100644 --- a/src/main/java/ai/timefold/solver/benchmarks/examples/curriculumcourse/app/CurriculumCourseApp.java +++ b/src/main/java/ai/timefold/solver/benchmarks/examples/curriculumcourse/app/CurriculumCourseApp.java @@ -8,7 +8,7 @@ import ai.timefold.solver.benchmarks.examples.curriculumcourse.domain.CourseSchedule; import ai.timefold.solver.benchmarks.examples.curriculumcourse.persistence.CurriculumCourseImporter; import ai.timefold.solver.benchmarks.examples.curriculumcourse.persistence.CurriculumCourseSolutionFileIO; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; public class CurriculumCourseApp extends CommonApp { diff --git a/src/main/java/ai/timefold/solver/benchmarks/examples/curriculumcourse/persistence/CurriculumCourseGenerator.java b/src/main/java/ai/timefold/solver/benchmarks/examples/curriculumcourse/persistence/CurriculumCourseGenerator.java index ecf9b57a..01329a00 100644 --- a/src/main/java/ai/timefold/solver/benchmarks/examples/curriculumcourse/persistence/CurriculumCourseGenerator.java +++ b/src/main/java/ai/timefold/solver/benchmarks/examples/curriculumcourse/persistence/CurriculumCourseGenerator.java @@ -26,7 +26,7 @@ import ai.timefold.solver.benchmarks.examples.curriculumcourse.domain.Teacher; import ai.timefold.solver.benchmarks.examples.curriculumcourse.domain.Timeslot; import ai.timefold.solver.benchmarks.examples.curriculumcourse.domain.UnavailablePeriodPenalty; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; public class CurriculumCourseGenerator extends LoggingMain { diff --git a/src/main/java/ai/timefold/solver/benchmarks/examples/examination/app/ExaminationApp.java b/src/main/java/ai/timefold/solver/benchmarks/examples/examination/app/ExaminationApp.java index 3c07b87e..03781075 100644 --- a/src/main/java/ai/timefold/solver/benchmarks/examples/examination/app/ExaminationApp.java +++ b/src/main/java/ai/timefold/solver/benchmarks/examples/examination/app/ExaminationApp.java @@ -9,7 +9,7 @@ import ai.timefold.solver.benchmarks.examples.examination.domain.Examination; import ai.timefold.solver.benchmarks.examples.examination.persistence.ExaminationImporter; import ai.timefold.solver.benchmarks.examples.examination.persistence.ExaminationSolutionFileIO; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; /** * Examination is super optimized and a bit complex. diff --git a/src/main/java/ai/timefold/solver/benchmarks/examples/flowshop/app/FlowShopApp.java b/src/main/java/ai/timefold/solver/benchmarks/examples/flowshop/app/FlowShopApp.java index 63d1a656..8330bb9b 100644 --- a/src/main/java/ai/timefold/solver/benchmarks/examples/flowshop/app/FlowShopApp.java +++ b/src/main/java/ai/timefold/solver/benchmarks/examples/flowshop/app/FlowShopApp.java @@ -8,7 +8,7 @@ import ai.timefold.solver.benchmarks.examples.flowshop.domain.JobScheduleSolution; import ai.timefold.solver.benchmarks.examples.flowshop.persistence.FlowShopSolutionFileIO; import ai.timefold.solver.benchmarks.examples.flowshop.persistence.TaillardImporter; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; public class FlowShopApp extends CommonApp { diff --git a/src/main/java/ai/timefold/solver/benchmarks/examples/machinereassignment/app/MachineReassignmentApp.java b/src/main/java/ai/timefold/solver/benchmarks/examples/machinereassignment/app/MachineReassignmentApp.java index adde4302..2d2d036c 100644 --- a/src/main/java/ai/timefold/solver/benchmarks/examples/machinereassignment/app/MachineReassignmentApp.java +++ b/src/main/java/ai/timefold/solver/benchmarks/examples/machinereassignment/app/MachineReassignmentApp.java @@ -8,7 +8,7 @@ import ai.timefold.solver.benchmarks.examples.machinereassignment.domain.MachineReassignment; import ai.timefold.solver.benchmarks.examples.machinereassignment.persistence.MachineReassignmentImporter; import ai.timefold.solver.benchmarks.examples.machinereassignment.persistence.MachineReassignmentSolutionFileIO; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; public class MachineReassignmentApp extends CommonApp { diff --git a/src/main/java/ai/timefold/solver/benchmarks/examples/meetingscheduling/app/MeetingSchedulingApp.java b/src/main/java/ai/timefold/solver/benchmarks/examples/meetingscheduling/app/MeetingSchedulingApp.java index 270d4fcd..749e733c 100644 --- a/src/main/java/ai/timefold/solver/benchmarks/examples/meetingscheduling/app/MeetingSchedulingApp.java +++ b/src/main/java/ai/timefold/solver/benchmarks/examples/meetingscheduling/app/MeetingSchedulingApp.java @@ -3,7 +3,7 @@ import ai.timefold.solver.benchmarks.examples.common.app.CommonApp; import ai.timefold.solver.benchmarks.examples.meetingscheduling.domain.MeetingSchedule; import ai.timefold.solver.benchmarks.examples.meetingscheduling.persistence.MeetingSchedulingSolutionFileIO; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; public class MeetingSchedulingApp extends CommonApp { diff --git a/src/main/java/ai/timefold/solver/benchmarks/examples/meetingscheduling/persistence/MeetingSchedulingGenerator.java b/src/main/java/ai/timefold/solver/benchmarks/examples/meetingscheduling/persistence/MeetingSchedulingGenerator.java index c8c982fa..f6f68c64 100644 --- a/src/main/java/ai/timefold/solver/benchmarks/examples/meetingscheduling/persistence/MeetingSchedulingGenerator.java +++ b/src/main/java/ai/timefold/solver/benchmarks/examples/meetingscheduling/persistence/MeetingSchedulingGenerator.java @@ -21,7 +21,7 @@ import ai.timefold.solver.benchmarks.examples.meetingscheduling.domain.Room; import ai.timefold.solver.benchmarks.examples.meetingscheduling.domain.TimeGrain; import ai.timefold.solver.core.api.domain.solution.ConstraintWeightOverrides; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; public class MeetingSchedulingGenerator extends LoggingMain { diff --git a/src/main/java/ai/timefold/solver/benchmarks/examples/nurserostering/app/NurseRosteringApp.java b/src/main/java/ai/timefold/solver/benchmarks/examples/nurserostering/app/NurseRosteringApp.java index 72bbee01..35488a47 100644 --- a/src/main/java/ai/timefold/solver/benchmarks/examples/nurserostering/app/NurseRosteringApp.java +++ b/src/main/java/ai/timefold/solver/benchmarks/examples/nurserostering/app/NurseRosteringApp.java @@ -9,7 +9,7 @@ import ai.timefold.solver.benchmarks.examples.nurserostering.domain.NurseRoster; import ai.timefold.solver.benchmarks.examples.nurserostering.persistence.NurseRosterSolutionFileIO; import ai.timefold.solver.benchmarks.examples.nurserostering.persistence.NurseRosteringImporter; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; public class NurseRosteringApp extends CommonApp { diff --git a/src/main/java/ai/timefold/solver/benchmarks/examples/pas/app/PatientAdmissionScheduleApp.java b/src/main/java/ai/timefold/solver/benchmarks/examples/pas/app/PatientAdmissionScheduleApp.java index d47c6130..92049549 100644 --- a/src/main/java/ai/timefold/solver/benchmarks/examples/pas/app/PatientAdmissionScheduleApp.java +++ b/src/main/java/ai/timefold/solver/benchmarks/examples/pas/app/PatientAdmissionScheduleApp.java @@ -8,7 +8,7 @@ import ai.timefold.solver.benchmarks.examples.pas.domain.PatientAdmissionSchedule; import ai.timefold.solver.benchmarks.examples.pas.persistence.PatientAdmissionScheduleImporter; import ai.timefold.solver.benchmarks.examples.pas.persistence.PatientAdmissionScheduleSolutionFileIO; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; public class PatientAdmissionScheduleApp extends CommonApp { diff --git a/src/main/java/ai/timefold/solver/benchmarks/examples/taskassigning/app/TaskAssigningApp.java b/src/main/java/ai/timefold/solver/benchmarks/examples/taskassigning/app/TaskAssigningApp.java index 792b4c4c..e767b317 100644 --- a/src/main/java/ai/timefold/solver/benchmarks/examples/taskassigning/app/TaskAssigningApp.java +++ b/src/main/java/ai/timefold/solver/benchmarks/examples/taskassigning/app/TaskAssigningApp.java @@ -3,7 +3,7 @@ import ai.timefold.solver.benchmarks.examples.common.app.CommonApp; import ai.timefold.solver.benchmarks.examples.taskassigning.domain.TaskAssigningSolution; import ai.timefold.solver.benchmarks.examples.taskassigning.persistence.TaskAssigningSolutionFileIO; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; public class TaskAssigningApp extends CommonApp { diff --git a/src/main/java/ai/timefold/solver/benchmarks/examples/taskassigning/persistence/TaskAssigningGenerator.java b/src/main/java/ai/timefold/solver/benchmarks/examples/taskassigning/persistence/TaskAssigningGenerator.java index b1ad3770..08db9cce 100644 --- a/src/main/java/ai/timefold/solver/benchmarks/examples/taskassigning/persistence/TaskAssigningGenerator.java +++ b/src/main/java/ai/timefold/solver/benchmarks/examples/taskassigning/persistence/TaskAssigningGenerator.java @@ -24,13 +24,12 @@ import ai.timefold.solver.benchmarks.examples.taskassigning.domain.Task; import ai.timefold.solver.benchmarks.examples.taskassigning.domain.TaskAssigningSolution; import ai.timefold.solver.benchmarks.examples.taskassigning.domain.TaskType; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; public class TaskAssigningGenerator extends LoggingMain { public static final int BASE_DURATION_MINIMUM = 30; public static final int BASE_DURATION_MAXIMUM = 90; - public static final int BASE_DURATION_AVERAGE = BASE_DURATION_MINIMUM + BASE_DURATION_MAXIMUM / 2; private static final int SKILL_SET_SIZE_MINIMUM = 2; private static final int SKILL_SET_SIZE_MAXIMUM = 4; diff --git a/src/main/java/ai/timefold/solver/benchmarks/examples/travelingtournament/app/TravelingTournamentApp.java b/src/main/java/ai/timefold/solver/benchmarks/examples/travelingtournament/app/TravelingTournamentApp.java index 31846ff0..58ee25aa 100644 --- a/src/main/java/ai/timefold/solver/benchmarks/examples/travelingtournament/app/TravelingTournamentApp.java +++ b/src/main/java/ai/timefold/solver/benchmarks/examples/travelingtournament/app/TravelingTournamentApp.java @@ -8,7 +8,7 @@ import ai.timefold.solver.benchmarks.examples.travelingtournament.domain.TravelingTournament; import ai.timefold.solver.benchmarks.examples.travelingtournament.persistence.TravelingTournamentImporter; import ai.timefold.solver.benchmarks.examples.travelingtournament.persistence.TravelingTournamentSolutionFileIO; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; /** * WARNING: This is an old, complex, tailored example. You're probably better off with one of the other examples. diff --git a/src/main/java/ai/timefold/solver/benchmarks/examples/tsp/app/TspApp.java b/src/main/java/ai/timefold/solver/benchmarks/examples/tsp/app/TspApp.java index b99a3e79..39e5b1b9 100644 --- a/src/main/java/ai/timefold/solver/benchmarks/examples/tsp/app/TspApp.java +++ b/src/main/java/ai/timefold/solver/benchmarks/examples/tsp/app/TspApp.java @@ -8,7 +8,7 @@ import ai.timefold.solver.benchmarks.examples.tsp.domain.TspSolution; import ai.timefold.solver.benchmarks.examples.tsp.persistence.TspImporter; import ai.timefold.solver.benchmarks.examples.tsp.persistence.TspSolutionFileIO; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; public class TspApp extends CommonApp { diff --git a/src/main/java/ai/timefold/solver/benchmarks/examples/vehiclerouting/app/VehicleRoutingApp.java b/src/main/java/ai/timefold/solver/benchmarks/examples/vehiclerouting/app/VehicleRoutingApp.java index 705d7ea8..3fd6b4f7 100644 --- a/src/main/java/ai/timefold/solver/benchmarks/examples/vehiclerouting/app/VehicleRoutingApp.java +++ b/src/main/java/ai/timefold/solver/benchmarks/examples/vehiclerouting/app/VehicleRoutingApp.java @@ -8,7 +8,7 @@ import ai.timefold.solver.benchmarks.examples.vehiclerouting.domain.VehicleRoutingSolution; import ai.timefold.solver.benchmarks.examples.vehiclerouting.persistence.VehicleRoutingImporter; import ai.timefold.solver.benchmarks.examples.vehiclerouting.persistence.VehicleRoutingSolutionFileIO; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; public class VehicleRoutingApp extends CommonApp { diff --git a/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/AbstractProblem.java b/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/AbstractProblem.java index f7d7de78..15918af3 100644 --- a/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/AbstractProblem.java +++ b/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/AbstractProblem.java @@ -8,6 +8,7 @@ import ai.timefold.solver.benchmarks.micro.scoredirector.Example; import ai.timefold.solver.benchmarks.micro.scoredirector.ScoreDirectorType; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; import ai.timefold.solver.core.api.score.SimpleScore; import ai.timefold.solver.core.api.score.calculator.EasyScoreCalculator; import ai.timefold.solver.core.api.solver.SolverFactory; @@ -26,7 +27,6 @@ import ai.timefold.solver.core.impl.solver.DefaultSolver; import ai.timefold.solver.core.impl.solver.scope.SolverScope; import ai.timefold.solver.core.preview.api.move.Move; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/CloudBalancingProblem.java b/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/CloudBalancingProblem.java index d09deae6..1e6c16ed 100644 --- a/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/CloudBalancingProblem.java +++ b/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/CloudBalancingProblem.java @@ -8,9 +8,9 @@ import ai.timefold.solver.benchmarks.examples.cloudbalancing.score.CloudBalancingConstraintProvider; import ai.timefold.solver.benchmarks.micro.scoredirector.Example; import ai.timefold.solver.benchmarks.micro.scoredirector.ScoreDirectorType; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; import ai.timefold.solver.core.config.score.director.ScoreDirectorFactoryConfig; import ai.timefold.solver.core.impl.domain.solution.descriptor.SolutionDescriptor; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; public final class CloudBalancingProblem extends AbstractProblem { diff --git a/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/ConferenceSchedulingProblem.java b/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/ConferenceSchedulingProblem.java index 62672872..3363d3fd 100644 --- a/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/ConferenceSchedulingProblem.java +++ b/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/ConferenceSchedulingProblem.java @@ -8,9 +8,9 @@ import ai.timefold.solver.benchmarks.examples.conferencescheduling.score.ConferenceSchedulingConstraintProvider; import ai.timefold.solver.benchmarks.micro.scoredirector.Example; import ai.timefold.solver.benchmarks.micro.scoredirector.ScoreDirectorType; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; import ai.timefold.solver.core.config.score.director.ScoreDirectorFactoryConfig; import ai.timefold.solver.core.impl.domain.solution.descriptor.SolutionDescriptor; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; public final class ConferenceSchedulingProblem extends AbstractProblem { diff --git a/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/CurriculumCourseProblem.java b/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/CurriculumCourseProblem.java index 3b06b77a..a50bc1b3 100644 --- a/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/CurriculumCourseProblem.java +++ b/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/CurriculumCourseProblem.java @@ -8,9 +8,9 @@ import ai.timefold.solver.benchmarks.examples.curriculumcourse.score.CurriculumCourseConstraintProvider; import ai.timefold.solver.benchmarks.micro.scoredirector.Example; import ai.timefold.solver.benchmarks.micro.scoredirector.ScoreDirectorType; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; import ai.timefold.solver.core.config.score.director.ScoreDirectorFactoryConfig; import ai.timefold.solver.core.impl.domain.solution.descriptor.SolutionDescriptor; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; public final class CurriculumCourseProblem extends AbstractProblem { diff --git a/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/ExaminationProblem.java b/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/ExaminationProblem.java index 33cc1922..5682292e 100644 --- a/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/ExaminationProblem.java +++ b/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/ExaminationProblem.java @@ -10,9 +10,9 @@ import ai.timefold.solver.benchmarks.examples.examination.score.ExaminationConstraintProvider; import ai.timefold.solver.benchmarks.micro.scoredirector.Example; import ai.timefold.solver.benchmarks.micro.scoredirector.ScoreDirectorType; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; import ai.timefold.solver.core.config.score.director.ScoreDirectorFactoryConfig; import ai.timefold.solver.core.impl.domain.solution.descriptor.SolutionDescriptor; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; public final class ExaminationProblem extends AbstractProblem { diff --git a/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/MachineReassignmentProblem.java b/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/MachineReassignmentProblem.java index aaf49fed..9318e8e2 100644 --- a/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/MachineReassignmentProblem.java +++ b/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/MachineReassignmentProblem.java @@ -7,9 +7,9 @@ import ai.timefold.solver.benchmarks.examples.machinereassignment.score.MachineReassignmentConstraintProvider; import ai.timefold.solver.benchmarks.micro.scoredirector.Example; import ai.timefold.solver.benchmarks.micro.scoredirector.ScoreDirectorType; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; import ai.timefold.solver.core.config.score.director.ScoreDirectorFactoryConfig; import ai.timefold.solver.core.impl.domain.solution.descriptor.SolutionDescriptor; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; public final class MachineReassignmentProblem extends AbstractProblem { diff --git a/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/MeetingSchedulingProblem.java b/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/MeetingSchedulingProblem.java index 0b9d66cd..1c3a9dc8 100644 --- a/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/MeetingSchedulingProblem.java +++ b/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/MeetingSchedulingProblem.java @@ -8,9 +8,9 @@ import ai.timefold.solver.benchmarks.examples.meetingscheduling.score.MeetingSchedulingConstraintProvider; import ai.timefold.solver.benchmarks.micro.scoredirector.Example; import ai.timefold.solver.benchmarks.micro.scoredirector.ScoreDirectorType; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; import ai.timefold.solver.core.config.score.director.ScoreDirectorFactoryConfig; import ai.timefold.solver.core.impl.domain.solution.descriptor.SolutionDescriptor; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; public final class MeetingSchedulingProblem extends AbstractProblem { diff --git a/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/NurseRosteringProblem.java b/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/NurseRosteringProblem.java index 0da45bd9..2aeb12f4 100644 --- a/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/NurseRosteringProblem.java +++ b/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/NurseRosteringProblem.java @@ -8,9 +8,9 @@ import ai.timefold.solver.benchmarks.examples.nurserostering.score.NurseRosteringConstraintProvider; import ai.timefold.solver.benchmarks.micro.scoredirector.Example; import ai.timefold.solver.benchmarks.micro.scoredirector.ScoreDirectorType; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; import ai.timefold.solver.core.config.score.director.ScoreDirectorFactoryConfig; import ai.timefold.solver.core.impl.domain.solution.descriptor.SolutionDescriptor; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; public final class NurseRosteringProblem extends AbstractProblem { diff --git a/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/PatientAdmissionSchedulingProblem.java b/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/PatientAdmissionSchedulingProblem.java index 15b607a9..421c2c37 100644 --- a/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/PatientAdmissionSchedulingProblem.java +++ b/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/PatientAdmissionSchedulingProblem.java @@ -8,9 +8,9 @@ import ai.timefold.solver.benchmarks.examples.pas.score.PatientAdmissionScheduleConstraintProvider; import ai.timefold.solver.benchmarks.micro.scoredirector.Example; import ai.timefold.solver.benchmarks.micro.scoredirector.ScoreDirectorType; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; import ai.timefold.solver.core.config.score.director.ScoreDirectorFactoryConfig; import ai.timefold.solver.core.impl.domain.solution.descriptor.SolutionDescriptor; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; public final class PatientAdmissionSchedulingProblem extends AbstractProblem { diff --git a/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/TaskAssigningProblem.java b/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/TaskAssigningProblem.java index 1152d069..f013f01a 100644 --- a/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/TaskAssigningProblem.java +++ b/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/TaskAssigningProblem.java @@ -9,9 +9,9 @@ import ai.timefold.solver.benchmarks.examples.taskassigning.score.TaskAssigningConstraintProvider; import ai.timefold.solver.benchmarks.micro.scoredirector.Example; import ai.timefold.solver.benchmarks.micro.scoredirector.ScoreDirectorType; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; import ai.timefold.solver.core.config.score.director.ScoreDirectorFactoryConfig; import ai.timefold.solver.core.impl.domain.solution.descriptor.SolutionDescriptor; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; public final class TaskAssigningProblem extends AbstractProblem { diff --git a/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/TravelingTournamentProblem.java b/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/TravelingTournamentProblem.java index ede246b7..5b182b2a 100644 --- a/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/TravelingTournamentProblem.java +++ b/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/TravelingTournamentProblem.java @@ -8,9 +8,9 @@ import ai.timefold.solver.benchmarks.examples.travelingtournament.score.TravelingTournamentConstraintProvider; import ai.timefold.solver.benchmarks.micro.scoredirector.Example; import ai.timefold.solver.benchmarks.micro.scoredirector.ScoreDirectorType; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; import ai.timefold.solver.core.config.score.director.ScoreDirectorFactoryConfig; import ai.timefold.solver.core.impl.domain.solution.descriptor.SolutionDescriptor; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; public final class TravelingTournamentProblem extends AbstractProblem { diff --git a/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/TspProblem.java b/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/TspProblem.java index fa58dd3c..bd5395b5 100644 --- a/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/TspProblem.java +++ b/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/TspProblem.java @@ -9,9 +9,9 @@ import ai.timefold.solver.benchmarks.examples.tsp.score.TspConstraintProvider; import ai.timefold.solver.benchmarks.micro.scoredirector.Example; import ai.timefold.solver.benchmarks.micro.scoredirector.ScoreDirectorType; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; import ai.timefold.solver.core.config.score.director.ScoreDirectorFactoryConfig; import ai.timefold.solver.core.impl.domain.solution.descriptor.SolutionDescriptor; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; public final class TspProblem extends AbstractProblem { diff --git a/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/VehicleRoutingProblem.java b/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/VehicleRoutingProblem.java index 5520508b..114ca3e3 100644 --- a/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/VehicleRoutingProblem.java +++ b/src/main/java/ai/timefold/solver/benchmarks/micro/scoredirector/problems/VehicleRoutingProblem.java @@ -10,9 +10,9 @@ import ai.timefold.solver.benchmarks.examples.vehiclerouting.score.VehicleRoutingConstraintProvider; import ai.timefold.solver.benchmarks.micro.scoredirector.Example; import ai.timefold.solver.benchmarks.micro.scoredirector.ScoreDirectorType; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; import ai.timefold.solver.core.config.score.director.ScoreDirectorFactoryConfig; import ai.timefold.solver.core.impl.domain.solution.descriptor.SolutionDescriptor; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; public final class VehicleRoutingProblem extends AbstractProblem { diff --git a/src/test/java/ai/timefold/solver/benchmarks/examples/common/app/SolverSmokeTest.java b/src/test/java/ai/timefold/solver/benchmarks/examples/common/app/SolverSmokeTest.java index b105d31b..6bf4cd5b 100644 --- a/src/test/java/ai/timefold/solver/benchmarks/examples/common/app/SolverSmokeTest.java +++ b/src/test/java/ai/timefold/solver/benchmarks/examples/common/app/SolverSmokeTest.java @@ -13,6 +13,7 @@ import ai.timefold.solver.benchmarks.examples.common.TestSystemProperties; import ai.timefold.solver.core.api.domain.solution.PlanningSolution; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; import ai.timefold.solver.core.api.score.Score; import ai.timefold.solver.core.api.score.ScoreExplanation; import ai.timefold.solver.core.api.score.constraint.ConstraintMatchTotal; @@ -23,7 +24,6 @@ import ai.timefold.solver.core.config.solver.EnvironmentMode; import ai.timefold.solver.core.config.solver.SolverConfig; import ai.timefold.solver.core.config.solver.termination.TerminationConfig; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/ai/timefold/solver/benchmarks/examples/common/app/UnsolvedDirSolveAllTurtleTest.java b/src/test/java/ai/timefold/solver/benchmarks/examples/common/app/UnsolvedDirSolveAllTurtleTest.java index 5c709f68..2d952afa 100644 --- a/src/test/java/ai/timefold/solver/benchmarks/examples/common/app/UnsolvedDirSolveAllTurtleTest.java +++ b/src/test/java/ai/timefold/solver/benchmarks/examples/common/app/UnsolvedDirSolveAllTurtleTest.java @@ -4,7 +4,7 @@ import java.util.List; import ai.timefold.solver.core.api.domain.solution.PlanningSolution; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; /** * @param the solution type, the class with the {@link PlanningSolution} annotation diff --git a/src/test/java/ai/timefold/solver/benchmarks/examples/common/persistence/OpenDataFilesTest.java b/src/test/java/ai/timefold/solver/benchmarks/examples/common/persistence/OpenDataFilesTest.java index 836da227..d5d2e237 100644 --- a/src/test/java/ai/timefold/solver/benchmarks/examples/common/persistence/OpenDataFilesTest.java +++ b/src/test/java/ai/timefold/solver/benchmarks/examples/common/persistence/OpenDataFilesTest.java @@ -12,10 +12,10 @@ import ai.timefold.solver.benchmarks.examples.common.app.LoggingTest; import ai.timefold.solver.benchmarks.examples.common.business.ProblemFileComparator; import ai.timefold.solver.core.api.domain.solution.PlanningSolution; +import ai.timefold.solver.core.api.domain.solution.SolutionFileIO; import ai.timefold.solver.core.api.score.Score; import ai.timefold.solver.core.api.solver.SolutionManager; import ai.timefold.solver.core.api.solver.SolverFactory; -import ai.timefold.solver.persistence.common.api.domain.solution.SolutionFileIO; import org.junit.jupiter.api.DynamicTest; import org.junit.jupiter.api.TestFactory;