cleanup

constraints/src/main/java/gov/nasa/jpl/aerie/constraints/time/Segment.java

@@ -10,7 +10,6 @@ public static <V> Segment<V> of(final Interval interval, final V value) {
     return new Segment<>(interval, value);
   }
 
-  //private Comparator<Segment<V>> comparator = Comparator.comparing(Segment<V>::interval).thenComparing(Segment::value, ObjectComparator.getInstance());
   @Override
   public int compareTo(final Segment<V> o) {
     final var comparator =

constraints/src/main/java/gov/nasa/jpl/aerie/constraints/time/Windows.java

@@ -636,11 +636,6 @@ public Windows select(final List<Interval> intervals) {
     return new Windows(segments.select(intervals));
   }
 
-//  /** Delegated to {@link IntervalMap#get(int)} */
-//  public Segment<Boolean> get(final int index) {
-//    return segments.get(index);
-//  }
-
   /** Delegated to {@link IntervalMap#size()} */
   public int size() {
     return segments.size();

merlin-sdk/src/main/java/gov/nasa/jpl/aerie/merlin/protocol/types/ObjectComparator.java

@@ -5,6 +5,10 @@
 import java.util.Set;
 import java.util.SortedSet;
 
+/**
+ * A generic comparator to use when you don't have one and need one.  This handles some common Collection types.
+ * There may be some others out there that could simplify or improve on this.
+ */
 public class ObjectComparator implements Comparator<Object> {
   private static gov.nasa.jpl.aerie.merlin.protocol.types.ObjectComparator INSTANCE = null;
 
@@ -56,6 +60,7 @@ public int compare(Object o1, Object o2) {
       int c = compare(((Map.Entry<?, ?>) o1).getKey(), ((Map.Entry<?, ?>) o2).getKey());
       if (c != 0) return c;
       c = compare(((Map.Entry<?, ?>) o1).getValue(), ((Map.Entry<?, ?>) o2).getValue());
+      return c;
     }
 
     // Fallback comparison