diff --git a/java/bed-allocation/src/main/java/org/acme/bedallocation/domain/Bed.java b/java/bed-allocation/src/main/java/org/acme/bedallocation/domain/Bed.java index 266ffb5b8b..feacdf6f8e 100644 --- a/java/bed-allocation/src/main/java/org/acme/bedallocation/domain/Bed.java +++ b/java/bed-allocation/src/main/java/org/acme/bedallocation/domain/Bed.java @@ -2,7 +2,7 @@ import java.util.Objects; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.ObjectIdGenerators; diff --git a/java/bed-allocation/src/main/java/org/acme/bedallocation/domain/Department.java b/java/bed-allocation/src/main/java/org/acme/bedallocation/domain/Department.java index c83e0b9f8d..eba246a72f 100644 --- a/java/bed-allocation/src/main/java/org/acme/bedallocation/domain/Department.java +++ b/java/bed-allocation/src/main/java/org/acme/bedallocation/domain/Department.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.Objects; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.ObjectIdGenerators; diff --git a/java/bed-allocation/src/main/java/org/acme/bedallocation/domain/Room.java b/java/bed-allocation/src/main/java/org/acme/bedallocation/domain/Room.java index 366afedf44..5a51be8fe1 100644 --- a/java/bed-allocation/src/main/java/org/acme/bedallocation/domain/Room.java +++ b/java/bed-allocation/src/main/java/org/acme/bedallocation/domain/Room.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Objects; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.ObjectIdGenerators; diff --git a/java/bed-allocation/src/main/java/org/acme/bedallocation/domain/Stay.java b/java/bed-allocation/src/main/java/org/acme/bedallocation/domain/Stay.java index 89ca71437c..850fc09f39 100644 --- a/java/bed-allocation/src/main/java/org/acme/bedallocation/domain/Stay.java +++ b/java/bed-allocation/src/main/java/org/acme/bedallocation/domain/Stay.java @@ -7,7 +7,7 @@ import java.util.List; import ai.timefold.solver.core.api.domain.entity.PlanningEntity; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import ai.timefold.solver.core.api.domain.variable.PlanningVariable; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/java/conference-scheduling/src/main/java/org/acme/conferencescheduling/domain/Room.java b/java/conference-scheduling/src/main/java/org/acme/conferencescheduling/domain/Room.java index 62881e9098..7a7661c795 100644 --- a/java/conference-scheduling/src/main/java/org/acme/conferencescheduling/domain/Room.java +++ b/java/conference-scheduling/src/main/java/org/acme/conferencescheduling/domain/Room.java @@ -5,7 +5,7 @@ import java.util.Objects; import java.util.Set; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; public class Room { diff --git a/java/conference-scheduling/src/main/java/org/acme/conferencescheduling/domain/Talk.java b/java/conference-scheduling/src/main/java/org/acme/conferencescheduling/domain/Talk.java index 46cd9b2709..4aa60b2a66 100644 --- a/java/conference-scheduling/src/main/java/org/acme/conferencescheduling/domain/Talk.java +++ b/java/conference-scheduling/src/main/java/org/acme/conferencescheduling/domain/Talk.java @@ -8,7 +8,7 @@ import java.util.Set; import ai.timefold.solver.core.api.domain.entity.PlanningEntity; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import ai.timefold.solver.core.api.domain.valuerange.ValueRangeProvider; import ai.timefold.solver.core.api.domain.variable.PlanningVariable; diff --git a/java/conference-scheduling/src/main/java/org/acme/conferencescheduling/domain/Timeslot.java b/java/conference-scheduling/src/main/java/org/acme/conferencescheduling/domain/Timeslot.java index 87c19d0ec1..df9360937b 100644 --- a/java/conference-scheduling/src/main/java/org/acme/conferencescheduling/domain/Timeslot.java +++ b/java/conference-scheduling/src/main/java/org/acme/conferencescheduling/domain/Timeslot.java @@ -5,7 +5,7 @@ import java.util.Objects; import java.util.Set; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; public class Timeslot { diff --git a/java/employee-scheduling/src/main/java/org/acme/employeescheduling/domain/Employee.java b/java/employee-scheduling/src/main/java/org/acme/employeescheduling/domain/Employee.java index 0f2ff5d6d3..017ce372de 100644 --- a/java/employee-scheduling/src/main/java/org/acme/employeescheduling/domain/Employee.java +++ b/java/employee-scheduling/src/main/java/org/acme/employeescheduling/domain/Employee.java @@ -4,7 +4,7 @@ import java.util.Objects; import java.util.Set; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; public class Employee { @PlanningId diff --git a/java/employee-scheduling/src/main/java/org/acme/employeescheduling/domain/Shift.java b/java/employee-scheduling/src/main/java/org/acme/employeescheduling/domain/Shift.java index 74cb018844..cec6361ee7 100644 --- a/java/employee-scheduling/src/main/java/org/acme/employeescheduling/domain/Shift.java +++ b/java/employee-scheduling/src/main/java/org/acme/employeescheduling/domain/Shift.java @@ -7,7 +7,7 @@ import java.util.Objects; import ai.timefold.solver.core.api.domain.entity.PlanningEntity; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import ai.timefold.solver.core.api.domain.variable.PlanningVariable; @PlanningEntity diff --git a/java/facility-location/src/main/java/org/acme/facilitylocation/domain/Consumer.java b/java/facility-location/src/main/java/org/acme/facilitylocation/domain/Consumer.java index 610d875061..dc0f6a55c9 100644 --- a/java/facility-location/src/main/java/org/acme/facilitylocation/domain/Consumer.java +++ b/java/facility-location/src/main/java/org/acme/facilitylocation/domain/Consumer.java @@ -1,6 +1,6 @@ package org.acme.facilitylocation.domain; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import org.acme.facilitylocation.solver.FacilityLocationConstraintProvider; import ai.timefold.solver.core.api.domain.entity.PlanningEntity; import ai.timefold.solver.core.api.domain.variable.PlanningVariable; diff --git a/java/facility-location/src/main/java/org/acme/facilitylocation/domain/Facility.java b/java/facility-location/src/main/java/org/acme/facilitylocation/domain/Facility.java index 87769b1772..859b063038 100644 --- a/java/facility-location/src/main/java/org/acme/facilitylocation/domain/Facility.java +++ b/java/facility-location/src/main/java/org/acme/facilitylocation/domain/Facility.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import org.acme.facilitylocation.solver.FacilityLocationConstraintProvider; import ai.timefold.solver.core.api.domain.entity.PlanningEntity; import ai.timefold.solver.core.api.domain.variable.InverseRelationShadowVariable; diff --git a/java/flight-crew-scheduling/src/main/java/org/acme/flighcrewscheduling/domain/Airport.java b/java/flight-crew-scheduling/src/main/java/org/acme/flighcrewscheduling/domain/Airport.java index 07ee8b5a54..bfe98e5288 100644 --- a/java/flight-crew-scheduling/src/main/java/org/acme/flighcrewscheduling/domain/Airport.java +++ b/java/flight-crew-scheduling/src/main/java/org/acme/flighcrewscheduling/domain/Airport.java @@ -3,7 +3,7 @@ import java.util.Map; import java.util.Objects; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.ObjectIdGenerators; diff --git a/java/flight-crew-scheduling/src/main/java/org/acme/flighcrewscheduling/domain/Employee.java b/java/flight-crew-scheduling/src/main/java/org/acme/flighcrewscheduling/domain/Employee.java index 3e3963f30f..0cde26e100 100644 --- a/java/flight-crew-scheduling/src/main/java/org/acme/flighcrewscheduling/domain/Employee.java +++ b/java/flight-crew-scheduling/src/main/java/org/acme/flighcrewscheduling/domain/Employee.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Objects; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/java/flight-crew-scheduling/src/main/java/org/acme/flighcrewscheduling/domain/Flight.java b/java/flight-crew-scheduling/src/main/java/org/acme/flighcrewscheduling/domain/Flight.java index 77ffe0efb9..19194a256e 100644 --- a/java/flight-crew-scheduling/src/main/java/org/acme/flighcrewscheduling/domain/Flight.java +++ b/java/flight-crew-scheduling/src/main/java/org/acme/flighcrewscheduling/domain/Flight.java @@ -5,7 +5,7 @@ import java.util.Comparator; import java.util.Objects; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/java/flight-crew-scheduling/src/main/java/org/acme/flighcrewscheduling/domain/FlightAssignment.java b/java/flight-crew-scheduling/src/main/java/org/acme/flighcrewscheduling/domain/FlightAssignment.java index e286059e67..2e0e9556e8 100644 --- a/java/flight-crew-scheduling/src/main/java/org/acme/flighcrewscheduling/domain/FlightAssignment.java +++ b/java/flight-crew-scheduling/src/main/java/org/acme/flighcrewscheduling/domain/FlightAssignment.java @@ -4,7 +4,7 @@ import java.util.Objects; import ai.timefold.solver.core.api.domain.entity.PlanningEntity; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import ai.timefold.solver.core.api.domain.variable.PlanningVariable; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/java/food-packaging/src/main/java/org/acme/foodpackaging/domain/Job.java b/java/food-packaging/src/main/java/org/acme/foodpackaging/domain/Job.java index a74a34af5c..760ee85fb8 100644 --- a/java/food-packaging/src/main/java/org/acme/foodpackaging/domain/Job.java +++ b/java/food-packaging/src/main/java/org/acme/foodpackaging/domain/Job.java @@ -2,18 +2,16 @@ import ai.timefold.solver.core.api.domain.entity.PlanningEntity; import ai.timefold.solver.core.api.domain.entity.PlanningPin; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import ai.timefold.solver.core.api.domain.variable.InverseRelationShadowVariable; import ai.timefold.solver.core.api.domain.variable.NextElementShadowVariable; import ai.timefold.solver.core.api.domain.variable.PreviousElementShadowVariable; import ai.timefold.solver.core.api.domain.variable.ShadowSources; import ai.timefold.solver.core.api.domain.variable.ShadowVariable; -import ai.timefold.solver.core.api.domain.variable.ShadowVariablesInconsistent; import com.fasterxml.jackson.annotation.JsonIgnore; import java.time.Duration; -import java.time.LocalDate; import java.time.LocalDateTime; @PlanningEntity diff --git a/java/food-packaging/src/main/java/org/acme/foodpackaging/domain/Line.java b/java/food-packaging/src/main/java/org/acme/foodpackaging/domain/Line.java index ba7004eff8..7af1a932a2 100644 --- a/java/food-packaging/src/main/java/org/acme/foodpackaging/domain/Line.java +++ b/java/food-packaging/src/main/java/org/acme/foodpackaging/domain/Line.java @@ -1,7 +1,7 @@ package org.acme.foodpackaging.domain; import ai.timefold.solver.core.api.domain.entity.PlanningEntity; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import ai.timefold.solver.core.api.domain.variable.PlanningListVariable; import ai.timefold.solver.core.api.domain.variable.PlanningVariable; import com.fasterxml.jackson.annotation.JsonIdentityInfo; diff --git a/java/food-packaging/src/main/java/org/acme/foodpackaging/domain/Operator.java b/java/food-packaging/src/main/java/org/acme/foodpackaging/domain/Operator.java index 806b41381a..c59633fe55 100644 --- a/java/food-packaging/src/main/java/org/acme/foodpackaging/domain/Operator.java +++ b/java/food-packaging/src/main/java/org/acme/foodpackaging/domain/Operator.java @@ -1,7 +1,7 @@ package org.acme.foodpackaging.domain; import ai.timefold.solver.core.api.domain.entity.PlanningEntity; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import ai.timefold.solver.core.api.domain.variable.InverseRelationShadowVariable; import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.JsonIdentityReference; diff --git a/java/food-packaging/src/main/java/org/acme/foodpackaging/domain/Product.java b/java/food-packaging/src/main/java/org/acme/foodpackaging/domain/Product.java index 7d8425424b..5b10387595 100644 --- a/java/food-packaging/src/main/java/org/acme/foodpackaging/domain/Product.java +++ b/java/food-packaging/src/main/java/org/acme/foodpackaging/domain/Product.java @@ -1,6 +1,6 @@ package org.acme.foodpackaging.domain; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import java.time.Duration; import java.util.Map; diff --git a/java/hello-world/src/main/java/org/acme/schooltimetabling/domain/Lesson.java b/java/hello-world/src/main/java/org/acme/schooltimetabling/domain/Lesson.java index 38a023144b..16b7225f7c 100644 --- a/java/hello-world/src/main/java/org/acme/schooltimetabling/domain/Lesson.java +++ b/java/hello-world/src/main/java/org/acme/schooltimetabling/domain/Lesson.java @@ -1,7 +1,7 @@ package org.acme.schooltimetabling.domain; import ai.timefold.solver.core.api.domain.entity.PlanningEntity; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import ai.timefold.solver.core.api.domain.variable.PlanningVariable; @PlanningEntity diff --git a/java/hello-world/src/main/java/org/acme/schooltimetabling/domain/Room.java b/java/hello-world/src/main/java/org/acme/schooltimetabling/domain/Room.java index 3db4d5207f..e66d7a5ab9 100644 --- a/java/hello-world/src/main/java/org/acme/schooltimetabling/domain/Room.java +++ b/java/hello-world/src/main/java/org/acme/schooltimetabling/domain/Room.java @@ -1,6 +1,6 @@ package org.acme.schooltimetabling.domain; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; public class Room { diff --git a/java/hello-world/src/main/java/org/acme/schooltimetabling/domain/Timeslot.java b/java/hello-world/src/main/java/org/acme/schooltimetabling/domain/Timeslot.java index 57842ba278..06bfaf19e2 100644 --- a/java/hello-world/src/main/java/org/acme/schooltimetabling/domain/Timeslot.java +++ b/java/hello-world/src/main/java/org/acme/schooltimetabling/domain/Timeslot.java @@ -1,6 +1,6 @@ package org.acme.schooltimetabling.domain; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import java.time.DayOfWeek; import java.time.LocalTime; diff --git a/java/maintenance-scheduling/src/main/java/org/acme/maintenancescheduling/domain/Crew.java b/java/maintenance-scheduling/src/main/java/org/acme/maintenancescheduling/domain/Crew.java index ff6937172b..a6a0590331 100644 --- a/java/maintenance-scheduling/src/main/java/org/acme/maintenancescheduling/domain/Crew.java +++ b/java/maintenance-scheduling/src/main/java/org/acme/maintenancescheduling/domain/Crew.java @@ -2,7 +2,7 @@ import java.util.Objects; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; public class Crew { diff --git a/java/maintenance-scheduling/src/main/java/org/acme/maintenancescheduling/domain/Job.java b/java/maintenance-scheduling/src/main/java/org/acme/maintenancescheduling/domain/Job.java index d4f240f6e6..25e836e458 100644 --- a/java/maintenance-scheduling/src/main/java/org/acme/maintenancescheduling/domain/Job.java +++ b/java/maintenance-scheduling/src/main/java/org/acme/maintenancescheduling/domain/Job.java @@ -6,7 +6,7 @@ import java.util.function.Predicate; import ai.timefold.solver.core.api.domain.entity.PlanningEntity; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import ai.timefold.solver.core.api.domain.variable.PlanningVariable; import ai.timefold.solver.core.api.domain.variable.ShadowSources; import ai.timefold.solver.core.api.domain.variable.ShadowVariable; diff --git a/java/maintenance-scheduling/src/main/java/org/acme/maintenancescheduling/domain/WorkCalendar.java b/java/maintenance-scheduling/src/main/java/org/acme/maintenancescheduling/domain/WorkCalendar.java index bb0c039e28..a95d1f38ed 100644 --- a/java/maintenance-scheduling/src/main/java/org/acme/maintenancescheduling/domain/WorkCalendar.java +++ b/java/maintenance-scheduling/src/main/java/org/acme/maintenancescheduling/domain/WorkCalendar.java @@ -2,7 +2,7 @@ import java.time.LocalDate; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; public class WorkCalendar { diff --git a/java/meeting-scheduling/src/main/java/org/acme/meetingschedule/domain/Attendance.java b/java/meeting-scheduling/src/main/java/org/acme/meetingschedule/domain/Attendance.java index fb42f32766..fd996987bd 100644 --- a/java/meeting-scheduling/src/main/java/org/acme/meetingschedule/domain/Attendance.java +++ b/java/meeting-scheduling/src/main/java/org/acme/meetingschedule/domain/Attendance.java @@ -1,6 +1,6 @@ package org.acme.meetingschedule.domain; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; public abstract class Attendance { diff --git a/java/meeting-scheduling/src/main/java/org/acme/meetingschedule/domain/MeetingAssignment.java b/java/meeting-scheduling/src/main/java/org/acme/meetingschedule/domain/MeetingAssignment.java index e97fce66d4..8c71c9d129 100644 --- a/java/meeting-scheduling/src/main/java/org/acme/meetingschedule/domain/MeetingAssignment.java +++ b/java/meeting-scheduling/src/main/java/org/acme/meetingschedule/domain/MeetingAssignment.java @@ -4,7 +4,7 @@ import ai.timefold.solver.core.api.domain.entity.PlanningEntity; import ai.timefold.solver.core.api.domain.entity.PlanningPin; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import ai.timefold.solver.core.api.domain.variable.PlanningVariable; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/java/meeting-scheduling/src/main/java/org/acme/meetingschedule/domain/Room.java b/java/meeting-scheduling/src/main/java/org/acme/meetingschedule/domain/Room.java index a43440d780..b37218bdf4 100644 --- a/java/meeting-scheduling/src/main/java/org/acme/meetingschedule/domain/Room.java +++ b/java/meeting-scheduling/src/main/java/org/acme/meetingschedule/domain/Room.java @@ -2,7 +2,7 @@ import java.util.Objects; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.ObjectIdGenerators; diff --git a/java/meeting-scheduling/src/main/java/org/acme/meetingschedule/domain/TimeGrain.java b/java/meeting-scheduling/src/main/java/org/acme/meetingschedule/domain/TimeGrain.java index 5794f8eab4..5ddd99f8cd 100644 --- a/java/meeting-scheduling/src/main/java/org/acme/meetingschedule/domain/TimeGrain.java +++ b/java/meeting-scheduling/src/main/java/org/acme/meetingschedule/domain/TimeGrain.java @@ -3,7 +3,7 @@ import java.util.Comparator; import java.util.Objects; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.ObjectIdGenerators; diff --git a/java/order-picking/src/main/java/org/acme/orderpicking/domain/PickTask.java b/java/order-picking/src/main/java/org/acme/orderpicking/domain/PickTask.java index f24e0ecfe0..2f003695ed 100644 --- a/java/order-picking/src/main/java/org/acme/orderpicking/domain/PickTask.java +++ b/java/order-picking/src/main/java/org/acme/orderpicking/domain/PickTask.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import ai.timefold.solver.core.api.domain.entity.PlanningEntity; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import ai.timefold.solver.core.api.domain.variable.InverseRelationShadowVariable; import ai.timefold.solver.core.api.domain.variable.NextElementShadowVariable; import ai.timefold.solver.core.api.domain.variable.PreviousElementShadowVariable; diff --git a/java/order-picking/src/main/java/org/acme/orderpicking/domain/Trolley.java b/java/order-picking/src/main/java/org/acme/orderpicking/domain/Trolley.java index dabfaca898..615e97c0fe 100644 --- a/java/order-picking/src/main/java/org/acme/orderpicking/domain/Trolley.java +++ b/java/order-picking/src/main/java/org/acme/orderpicking/domain/Trolley.java @@ -4,7 +4,7 @@ import java.util.List; import ai.timefold.solver.core.api.domain.entity.PlanningEntity; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import ai.timefold.solver.core.api.domain.variable.PlanningListVariable; /** diff --git a/java/project-job-scheduling/src/main/java/org/acme/projectjobschedule/domain/Allocation.java b/java/project-job-scheduling/src/main/java/org/acme/projectjobschedule/domain/Allocation.java index 77e593f4d7..9f5e1e1333 100644 --- a/java/project-job-scheduling/src/main/java/org/acme/projectjobschedule/domain/Allocation.java +++ b/java/project-job-scheduling/src/main/java/org/acme/projectjobschedule/domain/Allocation.java @@ -1,8 +1,13 @@ package org.acme.projectjobschedule.domain; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; +import java.util.stream.IntStream; + import ai.timefold.solver.core.api.domain.entity.PlanningEntity; import ai.timefold.solver.core.api.domain.entity.PlanningPin; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import ai.timefold.solver.core.api.domain.valuerange.ValueRangeProvider; import ai.timefold.solver.core.api.domain.variable.PlanningVariable; import ai.timefold.solver.core.api.domain.variable.ShadowSources; @@ -13,11 +18,6 @@ import com.fasterxml.jackson.annotation.ObjectIdGenerators; import org.acme.projectjobschedule.domain.solver.DelayStrengthComparator; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; -import java.util.stream.IntStream; - @PlanningEntity @JsonIdentityInfo(scope = Allocation.class, generator = ObjectIdGenerators.PropertyGenerator.class, property = "id") public class Allocation { @@ -42,7 +42,7 @@ public class Allocation { // Planning variables: changes during planning, between score calculations. @PlanningVariable private ExecutionMode executionMode; - @PlanningVariable(strengthComparatorClass = DelayStrengthComparator.class) + @PlanningVariable(comparatorClass = DelayStrengthComparator.class) private Integer delay; // In days // Shadow variables diff --git a/java/project-job-scheduling/src/main/java/org/acme/projectjobschedule/domain/ExecutionMode.java b/java/project-job-scheduling/src/main/java/org/acme/projectjobschedule/domain/ExecutionMode.java index c822fd9091..f0db4ac50b 100644 --- a/java/project-job-scheduling/src/main/java/org/acme/projectjobschedule/domain/ExecutionMode.java +++ b/java/project-job-scheduling/src/main/java/org/acme/projectjobschedule/domain/ExecutionMode.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Objects; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.ObjectIdGenerators; diff --git a/java/school-timetabling/src/main/java/org/acme/schooltimetabling/domain/Lesson.java b/java/school-timetabling/src/main/java/org/acme/schooltimetabling/domain/Lesson.java index 65f599214d..576b77c5fc 100644 --- a/java/school-timetabling/src/main/java/org/acme/schooltimetabling/domain/Lesson.java +++ b/java/school-timetabling/src/main/java/org/acme/schooltimetabling/domain/Lesson.java @@ -1,7 +1,7 @@ package org.acme.schooltimetabling.domain; import ai.timefold.solver.core.api.domain.entity.PlanningEntity; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import ai.timefold.solver.core.api.domain.variable.PlanningVariable; import com.fasterxml.jackson.annotation.JsonIdentityReference; diff --git a/java/school-timetabling/src/main/java/org/acme/schooltimetabling/domain/Room.java b/java/school-timetabling/src/main/java/org/acme/schooltimetabling/domain/Room.java index 1c5fb83a9b..f58d338578 100644 --- a/java/school-timetabling/src/main/java/org/acme/schooltimetabling/domain/Room.java +++ b/java/school-timetabling/src/main/java/org/acme/schooltimetabling/domain/Room.java @@ -1,6 +1,6 @@ package org.acme.schooltimetabling.domain; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.ObjectIdGenerators; diff --git a/java/school-timetabling/src/main/java/org/acme/schooltimetabling/domain/Timeslot.java b/java/school-timetabling/src/main/java/org/acme/schooltimetabling/domain/Timeslot.java index b67c7a418a..47210138f3 100644 --- a/java/school-timetabling/src/main/java/org/acme/schooltimetabling/domain/Timeslot.java +++ b/java/school-timetabling/src/main/java/org/acme/schooltimetabling/domain/Timeslot.java @@ -3,7 +3,7 @@ import java.time.DayOfWeek; import java.time.LocalTime; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.ObjectIdGenerators; diff --git a/java/sports-league-scheduling/src/main/java/org/acme/sportsleagueschedule/domain/Match.java b/java/sports-league-scheduling/src/main/java/org/acme/sportsleagueschedule/domain/Match.java index 7e0961b351..317cd97205 100644 --- a/java/sports-league-scheduling/src/main/java/org/acme/sportsleagueschedule/domain/Match.java +++ b/java/sports-league-scheduling/src/main/java/org/acme/sportsleagueschedule/domain/Match.java @@ -3,7 +3,7 @@ import java.util.Objects; import ai.timefold.solver.core.api.domain.entity.PlanningEntity; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import ai.timefold.solver.core.api.domain.variable.PlanningVariable; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/java/sports-league-scheduling/src/main/java/org/acme/sportsleagueschedule/domain/Round.java b/java/sports-league-scheduling/src/main/java/org/acme/sportsleagueschedule/domain/Round.java index cc8d38032c..8df9ae0fec 100644 --- a/java/sports-league-scheduling/src/main/java/org/acme/sportsleagueschedule/domain/Round.java +++ b/java/sports-league-scheduling/src/main/java/org/acme/sportsleagueschedule/domain/Round.java @@ -1,6 +1,6 @@ package org.acme.sportsleagueschedule.domain; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.ObjectIdGenerators; diff --git a/java/spring-boot-integration/src/main/java/org/acme/schooltimetabling/domain/Lesson.java b/java/spring-boot-integration/src/main/java/org/acme/schooltimetabling/domain/Lesson.java index 65f599214d..576b77c5fc 100644 --- a/java/spring-boot-integration/src/main/java/org/acme/schooltimetabling/domain/Lesson.java +++ b/java/spring-boot-integration/src/main/java/org/acme/schooltimetabling/domain/Lesson.java @@ -1,7 +1,7 @@ package org.acme.schooltimetabling.domain; import ai.timefold.solver.core.api.domain.entity.PlanningEntity; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import ai.timefold.solver.core.api.domain.variable.PlanningVariable; import com.fasterxml.jackson.annotation.JsonIdentityReference; diff --git a/java/spring-boot-integration/src/main/java/org/acme/schooltimetabling/domain/Room.java b/java/spring-boot-integration/src/main/java/org/acme/schooltimetabling/domain/Room.java index 1c5fb83a9b..f58d338578 100644 --- a/java/spring-boot-integration/src/main/java/org/acme/schooltimetabling/domain/Room.java +++ b/java/spring-boot-integration/src/main/java/org/acme/schooltimetabling/domain/Room.java @@ -1,6 +1,6 @@ package org.acme.schooltimetabling.domain; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.ObjectIdGenerators; diff --git a/java/spring-boot-integration/src/main/java/org/acme/schooltimetabling/domain/Timeslot.java b/java/spring-boot-integration/src/main/java/org/acme/schooltimetabling/domain/Timeslot.java index 8c5d995ddb..baf947dc9d 100644 --- a/java/spring-boot-integration/src/main/java/org/acme/schooltimetabling/domain/Timeslot.java +++ b/java/spring-boot-integration/src/main/java/org/acme/schooltimetabling/domain/Timeslot.java @@ -1,6 +1,6 @@ package org.acme.schooltimetabling.domain; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.ObjectIdGenerators; diff --git a/java/task-assigning/src/main/java/org/acme/taskassigning/domain/Employee.java b/java/task-assigning/src/main/java/org/acme/taskassigning/domain/Employee.java index 1b226b671b..b89e05dc74 100644 --- a/java/task-assigning/src/main/java/org/acme/taskassigning/domain/Employee.java +++ b/java/task-assigning/src/main/java/org/acme/taskassigning/domain/Employee.java @@ -6,7 +6,7 @@ import java.util.Map; import ai.timefold.solver.core.api.domain.entity.PlanningEntity; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import ai.timefold.solver.core.api.domain.variable.PlanningListVariable; import com.fasterxml.jackson.annotation.JsonIdentityInfo; diff --git a/java/task-assigning/src/main/java/org/acme/taskassigning/domain/Task.java b/java/task-assigning/src/main/java/org/acme/taskassigning/domain/Task.java index 509fddedfa..42dadcc90e 100644 --- a/java/task-assigning/src/main/java/org/acme/taskassigning/domain/Task.java +++ b/java/task-assigning/src/main/java/org/acme/taskassigning/domain/Task.java @@ -1,12 +1,11 @@ package org.acme.taskassigning.domain; import ai.timefold.solver.core.api.domain.entity.PlanningEntity; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import ai.timefold.solver.core.api.domain.variable.InverseRelationShadowVariable; import ai.timefold.solver.core.api.domain.variable.PreviousElementShadowVariable; import ai.timefold.solver.core.api.domain.variable.ShadowSources; import ai.timefold.solver.core.api.domain.variable.ShadowVariable; -import ai.timefold.solver.core.api.domain.variable.ShadowVariablesInconsistent; import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/java/tournament-scheduling/src/main/java/org/acme/tournamentschedule/domain/Team.java b/java/tournament-scheduling/src/main/java/org/acme/tournamentschedule/domain/Team.java index 832320a8b4..b6ea122ac2 100644 --- a/java/tournament-scheduling/src/main/java/org/acme/tournamentschedule/domain/Team.java +++ b/java/tournament-scheduling/src/main/java/org/acme/tournamentschedule/domain/Team.java @@ -2,7 +2,7 @@ import java.util.Objects; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.ObjectIdGenerators; diff --git a/java/tournament-scheduling/src/main/java/org/acme/tournamentschedule/domain/TeamAssignment.java b/java/tournament-scheduling/src/main/java/org/acme/tournamentschedule/domain/TeamAssignment.java index b77e7d5e42..25b0341ca8 100644 --- a/java/tournament-scheduling/src/main/java/org/acme/tournamentschedule/domain/TeamAssignment.java +++ b/java/tournament-scheduling/src/main/java/org/acme/tournamentschedule/domain/TeamAssignment.java @@ -2,7 +2,7 @@ import ai.timefold.solver.core.api.domain.entity.PlanningEntity; import ai.timefold.solver.core.api.domain.entity.PlanningPin; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import ai.timefold.solver.core.api.domain.variable.PlanningVariable; @PlanningEntity diff --git a/java/vehicle-routing/src/main/java/org/acme/vehiclerouting/domain/Vehicle.java b/java/vehicle-routing/src/main/java/org/acme/vehiclerouting/domain/Vehicle.java index 878564bfdb..a2911f25b8 100644 --- a/java/vehicle-routing/src/main/java/org/acme/vehiclerouting/domain/Vehicle.java +++ b/java/vehicle-routing/src/main/java/org/acme/vehiclerouting/domain/Vehicle.java @@ -5,7 +5,7 @@ import java.util.List; import ai.timefold.solver.core.api.domain.entity.PlanningEntity; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import ai.timefold.solver.core.api.domain.variable.PlanningListVariable; import com.fasterxml.jackson.annotation.JsonIdentityInfo; diff --git a/java/vehicle-routing/src/main/java/org/acme/vehiclerouting/domain/Visit.java b/java/vehicle-routing/src/main/java/org/acme/vehiclerouting/domain/Visit.java index 6fd1be9b88..bc3d7aba9a 100644 --- a/java/vehicle-routing/src/main/java/org/acme/vehiclerouting/domain/Visit.java +++ b/java/vehicle-routing/src/main/java/org/acme/vehiclerouting/domain/Visit.java @@ -5,12 +5,11 @@ import java.time.temporal.ChronoUnit; import ai.timefold.solver.core.api.domain.entity.PlanningEntity; -import ai.timefold.solver.core.api.domain.lookup.PlanningId; +import ai.timefold.solver.core.api.domain.common.PlanningId; import ai.timefold.solver.core.api.domain.variable.InverseRelationShadowVariable; import ai.timefold.solver.core.api.domain.variable.PreviousElementShadowVariable; import ai.timefold.solver.core.api.domain.variable.ShadowSources; import ai.timefold.solver.core.api.domain.variable.ShadowVariable; -import ai.timefold.solver.core.api.domain.variable.ShadowVariablesInconsistent; import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.JsonIdentityReference; diff --git a/kotlin/school-timetabling/src/main/kotlin/org/acme/kotlin/schooltimetabling/domain/Lesson.kt b/kotlin/school-timetabling/src/main/kotlin/org/acme/kotlin/schooltimetabling/domain/Lesson.kt index c7b52334f1..96c438a423 100644 --- a/kotlin/school-timetabling/src/main/kotlin/org/acme/kotlin/schooltimetabling/domain/Lesson.kt +++ b/kotlin/school-timetabling/src/main/kotlin/org/acme/kotlin/schooltimetabling/domain/Lesson.kt @@ -1,7 +1,7 @@ package org.acme.kotlin.schooltimetabling.domain import ai.timefold.solver.core.api.domain.entity.PlanningEntity -import ai.timefold.solver.core.api.domain.lookup.PlanningId +import ai.timefold.solver.core.api.domain.common.PlanningId import ai.timefold.solver.core.api.domain.variable.PlanningVariable import com.fasterxml.jackson.annotation.JsonIdentityReference diff --git a/kotlin/school-timetabling/src/main/kotlin/org/acme/kotlin/schooltimetabling/domain/Room.kt b/kotlin/school-timetabling/src/main/kotlin/org/acme/kotlin/schooltimetabling/domain/Room.kt index 25bb665a34..b6d558e1cd 100644 --- a/kotlin/school-timetabling/src/main/kotlin/org/acme/kotlin/schooltimetabling/domain/Room.kt +++ b/kotlin/school-timetabling/src/main/kotlin/org/acme/kotlin/schooltimetabling/domain/Room.kt @@ -1,6 +1,6 @@ package org.acme.kotlin.schooltimetabling.domain -import ai.timefold.solver.core.api.domain.lookup.PlanningId +import ai.timefold.solver.core.api.domain.common.PlanningId import com.fasterxml.jackson.annotation.JsonIdentityInfo import com.fasterxml.jackson.annotation.ObjectIdGenerators diff --git a/kotlin/school-timetabling/src/main/kotlin/org/acme/kotlin/schooltimetabling/domain/Timeslot.kt b/kotlin/school-timetabling/src/main/kotlin/org/acme/kotlin/schooltimetabling/domain/Timeslot.kt index 91db0681af..cd1aa0e274 100644 --- a/kotlin/school-timetabling/src/main/kotlin/org/acme/kotlin/schooltimetabling/domain/Timeslot.kt +++ b/kotlin/school-timetabling/src/main/kotlin/org/acme/kotlin/schooltimetabling/domain/Timeslot.kt @@ -1,6 +1,6 @@ package org.acme.kotlin.schooltimetabling.domain -import ai.timefold.solver.core.api.domain.lookup.PlanningId +import ai.timefold.solver.core.api.domain.common.PlanningId import com.fasterxml.jackson.annotation.JsonIdentityInfo import com.fasterxml.jackson.annotation.ObjectIdGenerators import java.time.DayOfWeek