Rework strategy for default time values

leonardehrenfried · leonardehrenfried · commit bf0d9a9ec992 · 2025-12-18T11:50:20.000+01:00
diff --git a/application/pom.xml b/application/pom.xml
@@ -306,7 +306,7 @@
         <dependency>
             <groupId>org.onebusaway</groupId>
             <artifactId>onebusaway-gtfs</artifactId>
-            <version>11.2.0</version>
+            <version>11.2.1</version>
         </dependency>
         <!-- Processing is used for the debug GUI (though we could probably use just Java2D) -->
         <dependency>
diff --git a/application/src/main/java/org/opentripplanner/gtfs/mapping/TimeframeMapper.java b/application/src/main/java/org/opentripplanner/gtfs/mapping/TimeframeMapper.java
@@ -2,7 +2,9 @@
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
+import java.time.LocalTime;
 import java.util.Collection;
+import java.util.Objects;
 import org.opentripplanner.core.model.id.FeedScopedId;
 import org.opentripplanner.ext.fares.model.Timeframe;
 
@@ -22,8 +24,9 @@ public Timeframe map(org.onebusaway.gtfs.model.Timeframe rhs) {
     );
     var t = Timeframe.of()
       .withServiceId(serviceId)
-      .withStart(rhs.getStartTime())
-      .withEnd(rhs.getEndTime())
+      .withStart(Objects.requireNonNullElse(rhs.getStartTime(), LocalTime.MIN))
+      // LocalTime.MAX is 23:59.9999999
+      .withEnd(Objects.requireNonNullElse(rhs.getEndTime(), LocalTime.MAX))
       .build();
     var groupId = idFactory.createId(rhs.getTimeframeGroupId(), "timeframe's group id");
     mappedTimeframes.put(groupId, t);
diff --git a/application/src/test-fixtures/java/org/onebusaway/gtfs/model/AgencyAndIdFactory.java b/application/src/test-fixtures/java/org/onebusaway/gtfs/model/AgencyAndIdFactory.java
@@ -0,0 +1,10 @@
+package org.onebusaway.gtfs.model;
+
+public class AgencyAndIdFactory {
+
+  private static final String AGENCY_ID = "oba";
+
+  public static AgencyAndId obaId(String id) {
+    return new AgencyAndId(AGENCY_ID, id);
+  }
+}
diff --git a/application/src/test/java/org/opentripplanner/gtfs/mapping/TimeframeMapperTest.java b/application/src/test/java/org/opentripplanner/gtfs/mapping/TimeframeMapperTest.java
@@ -1,30 +1,43 @@
 package org.opentripplanner.gtfs.mapping;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.onebusaway.gtfs.model.AgencyAndIdFactory.obaId;
 
 import java.time.LocalTime;
 import org.junit.jupiter.api.Test;
-import org.onebusaway.gtfs.model.AgencyAndId;
 import org.onebusaway.gtfs.model.Timeframe;
 
 class TimeframeMapperTest {
 
-  private static final IdFactory A = new IdFactory("A");
+  private static final IdFactory ID_FACTORY = new IdFactory("A");
   public static final LocalTime START = LocalTime.NOON;
   public static final LocalTime END = START.plusHours(1);
 
   @Test
   void map() {
     var tf = new Timeframe();
-    tf.setTimeframeGroupId(new AgencyAndId("a", "1"));
-    tf.setId(new AgencyAndId("a", "1"));
+    tf.setTimeframeGroupId(obaId("1"));
+    tf.setId(obaId("1"));
     tf.setStartTime(START);
     tf.setEndTime(END);
     tf.setServiceId("s1");
 
-    var mapper = new TimeframeMapper(A);
+    var mapper = new TimeframeMapper(ID_FACTORY);
     var mapped = mapper.map(tf);
     assertEquals(START, mapped.startTime());
     assertEquals(END, mapped.endTime());
   }
+
+  @Test
+  void noValues() {
+    var tf = new Timeframe();
+    tf.setTimeframeGroupId(obaId("1"));
+    tf.setId(obaId("1"));
+    tf.setServiceId("s1");
+
+    var mapper = new TimeframeMapper(ID_FACTORY);
+    var mapped = mapper.map(tf);
+    assertEquals(LocalTime.MIN, mapped.startTime());
+    assertEquals(LocalTime.MAX, mapped.endTime());
+  }
 }
