PLANNER-2738 Make FlightAssignment comparator consistent with equals (#…

…2019)
apache · Jun 7, 2022 · 020b2bb · 020b2bb
1 parent 710c8e4
commit 020b2bb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/...r-examples/src/main/java/org/optaplanner/examples/flightcrewscheduling/domain/Flight.java b/...r-examples/src/main/java/org/optaplanner/examples/flightcrewscheduling/domain/Flight.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Red Hat, Inc. and/or its affiliates.
+ * Copyright 2022 Red Hat, Inc. and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,11 +26,11 @@
 
 public class Flight extends AbstractPersistable implements Comparable<Flight> {
 
-    private static final Comparator<Flight> COMPARATOR = Comparator.comparing(Flight::getDepartureUTCDate)
+    private static final Comparator<Flight> COMPARATOR = Comparator.comparing(Flight::getDepartureUTCDateTime)
             .thenComparing(Flight::getDepartureAirport)
-            .thenComparing(Flight::getDepartureUTCDateTime)
+            .thenComparing(Flight::getArrivalUTCDateTime)
             .thenComparing(Flight::getArrivalAirport)
-            .thenComparing(Flight::getArrivalUTCDateTime);
+            .thenComparing(Flight::getFlightNumber);
 
     private String flightNumber;
     private Airport departureAirport;

diff --git a/.../src/main/java/org/optaplanner/examples/flightcrewscheduling/domain/FlightAssignment.java b/.../src/main/java/org/optaplanner/examples/flightcrewscheduling/domain/FlightAssignment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Red Hat, Inc. and/or its affiliates.
+ * Copyright 2022 Red Hat, Inc. and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,9 +25,8 @@
 @PlanningEntity
 public class FlightAssignment extends AbstractPersistable implements Comparable<FlightAssignment> {
 
-    private static final Comparator<FlightAssignment> PILLAR_SEQUENCE_COMPARATOR = Comparator
-            .comparing((FlightAssignment a) -> a.getFlight().getDepartureUTCDateTime())
-            .thenComparing(a -> a.getFlight().getArrivalUTCDateTime())
+    // Needs to be kept consistent with equals on account of Employee's flightAssignmentSet, which is a SortedSet.
+    private static final Comparator<FlightAssignment> COMPARATOR = Comparator.comparing(FlightAssignment::getFlight)
             .thenComparing(FlightAssignment::getIndexInFlight);
 
     private Flight flight;
@@ -87,6 +86,6 @@ public void setEmployee(Employee employee) {
 
     @Override
     public int compareTo(FlightAssignment o) {
-        return PILLAR_SEQUENCE_COMPARATOR.compare(this, o);
+        return COMPARATOR.compare(this, o);
     }
 }