Merge pull request #841 from NASA-AMMOS/refactor/remove-vestigal-clas…

…ses-merlin-server

Cleanup Merlin Code

merlin-driver/src/main/java/gov/nasa/jpl/aerie/merlin/driver/engine/JobSchedule.java

@@ -11,7 +11,7 @@
 import java.util.PriorityQueue;
 import java.util.Set;
 
-public final class JobSchedule<JobRef, TimeRef extends DurationLike & Comparable<TimeRef>> {
+public final class JobSchedule<JobRef, TimeRef extends SchedulingInstant> {
   /** The scheduled time for each upcoming job. */
   private final Map<JobRef, TimeRef> scheduledJobs = new HashMap<>();
 

merlin-driver/src/main/java/gov/nasa/jpl/aerie/merlin/driver/engine/SchedulingInstant.java

@@ -3,9 +3,8 @@
 import gov.nasa.jpl.aerie.merlin.protocol.types.Duration;
 
 public record SchedulingInstant(Duration offsetFromStart, SubInstant priority)
-    implements DurationLike, Comparable<SchedulingInstant>
+    implements Comparable<SchedulingInstant>
 {
-  @Override
   public Duration project() {
     return this.offsetFromStart;
   }
@@ -14,10 +13,6 @@ public Duration project() {
   public int compareTo(final SchedulingInstant o) {
     final var x = this.offsetFromStart.compareTo(o.offsetFromStart);
     if (x != 0) return x;
-
-    final var y = this.priority.compareTo(o.priority);
-    if (y != 0) return y;
-
-    return 0;
+    return this.priority.compareTo(o.priority);
   }
 }

merlin-driver/src/main/java/gov/nasa/jpl/aerie/merlin/driver/timeline/EffectExpressionDisplay.java

@@ -3,7 +3,6 @@
 import gov.nasa.jpl.aerie.merlin.protocol.model.EffectTrait;
 
 import java.util.Objects;
-import java.util.Optional;
 import java.util.function.Function;
 
 /**