Use new StopTimesHelper

Author: leonardehrenfried

application/src/ext/java/org/opentripplanner/ext/vdv/VdvService.java

@@ -9,13 +9,13 @@
 import org.opentripplanner.framework.geometry.WgsCoordinate;
 import org.opentripplanner.model.FeedInfo;
 import org.opentripplanner.routing.graphfinder.GraphFinder;
-import org.opentripplanner.routing.stoptimes.ArrivalDeparture;
 import org.opentripplanner.transit.api.model.FilterValues;
 import org.opentripplanner.transit.api.request.TripTimeOnDateRequest;
 import org.opentripplanner.transit.model.basic.TransitMode;
 import org.opentripplanner.transit.model.framework.EntityNotFoundException;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
 import org.opentripplanner.transit.model.site.StopLocation;
+import org.opentripplanner.transit.service.ArrivalDeparture;
 import org.opentripplanner.transit.service.TransitService;
 
 public class VdvService {

application/src/ext/java/org/opentripplanner/ext/vdv/ojp/OjpService.java

@@ -33,9 +33,9 @@
 import org.opentripplanner.ext.vdv.ojp.mapping.PtModeMapper;
 import org.opentripplanner.ext.vdv.ojp.mapping.StopEventResponseMapper;
 import org.opentripplanner.framework.geometry.WgsCoordinate;
-import org.opentripplanner.routing.stoptimes.ArrivalDeparture;
 import org.opentripplanner.transit.model.basic.TransitMode;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
+import org.opentripplanner.transit.service.ArrivalDeparture;
 
 public class OjpService {
 

application/src/main/java/org/opentripplanner/transit/api/request/TripTimeOnDateRequest.java

@@ -6,11 +6,11 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
-import org.opentripplanner.routing.stoptimes.ArrivalDeparture;
 import org.opentripplanner.transit.api.model.FilterValues;
 import org.opentripplanner.transit.model.basic.TransitMode;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
 import org.opentripplanner.transit.model.site.StopLocation;
+import org.opentripplanner.transit.service.ArrivalDeparture;
 
 public class TripTimeOnDateRequest {
 

application/src/main/java/org/opentripplanner/transit/api/request/TripTimeOnDateRequestBuilder.java

@@ -3,11 +3,11 @@
 import java.time.Duration;
 import java.time.Instant;
 import java.util.List;
-import org.opentripplanner.routing.stoptimes.ArrivalDeparture;
 import org.opentripplanner.transit.api.model.FilterValues;
 import org.opentripplanner.transit.model.basic.TransitMode;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
 import org.opentripplanner.transit.model.site.StopLocation;
+import org.opentripplanner.transit.service.ArrivalDeparture;
 
 public class TripTimeOnDateRequestBuilder {
 

application/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java

@@ -465,7 +465,7 @@ public List<TripTimeOnDate> findTripTimeOnDate(
 
   @Override
   public List<TripTimeOnDate> findTripTimeOnDate(TripTimeOnDateRequest request) {
-    return StopTimesHelper.findTripTimeOnDate(this, request);
+    return stopTimesHelper.findTripTimeOnDate(request);
   }
 
   /**

application/src/main/java/org/opentripplanner/transit/service/StopTimesHelper.java

@@ -86,17 +86,13 @@ List<StopTimesInPattern> stopTimesForStop(
     return result;
   }
 
-  public static List<TripTimeOnDate> findTripTimeOnDate(
-    TransitService transitService,
-    TripTimeOnDateRequest request
-  ) {
+  public List<TripTimeOnDate> findTripTimeOnDate(TripTimeOnDateRequest request) {
     Matcher<TripTimeOnDate> matcher = TripTimeOnDateMatcherFactory.of(request);
     return request
       .stopLocations()
       .stream()
       .flatMap(stopLocation ->
         stopTimesForStop(
-          transitService,
           stopLocation,
           request.time(),
           request.timeWindow(),

application/src/test/java/org/opentripplanner/routing/stoptimes/TripTimesOnDateTest.java application/src/test/java/org/opentripplanner/transit/service/TripTimesOnDateTest.java

@@ -1,4 +1,4 @@
-package org.opentripplanner.routing.stoptimes;
+package org.opentripplanner.transit.service;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -35,13 +35,11 @@ public class TripTimesOnDateTest implements RealtimeTestConstants {
   @Test
   void onFirstStop() {
     var env = RealtimeTestEnvironment.of().addTrip(TRIP_INPUT1).addTrip(TRIP_INPUT2).build();
-
     var transitService = env.getTransitService();
 
     var instant = instant("12:00");
     {
-      var result = StopTimesHelper.findTripTimeOnDate(
-        transitService,
+      var result = transitService.findTripTimeOnDate(
         TripTimeOnDateRequest.of(List.of(STOP_A1)).withTime(instant).build()
       );
 
@@ -50,8 +48,7 @@ void onFirstStop() {
       assertEquals(instant("12:01"), tt.departure());
     }
     {
-      var result = StopTimesHelper.findTripTimeOnDate(
-        transitService,
+      var result = transitService.findTripTimeOnDate(
         TripTimeOnDateRequest.of(List.of(STOP_B1)).withTime(instant).build()
       );
       assertThat(result).hasSize(1);
@@ -67,9 +64,10 @@ void tooLate() {
       .build()
       .getTransitService();
 
+    var helper = new StopTimesHelper(transitService);
+
     var instant = instant("18:00");
-    var result = StopTimesHelper.findTripTimeOnDate(
-      transitService,
+    var result = transitService.findTripTimeOnDate(
       TripTimeOnDateRequest.of(List.of(STOP_A1)).withTime(instant).build()
     );
     assertThat(result).isEmpty();
@@ -83,8 +81,7 @@ void shortWindow() {
       .getTransitService();
 
     var instant = instant("11:00");
-    var result = StopTimesHelper.findTripTimeOnDate(
-      transitService,
+    var result = transitService.findTripTimeOnDate(
       TripTimeOnDateRequest.of(List.of(STOP_A1))
         .withTime(instant)
         .withTimeWindow(Duration.ofMinutes(59))
@@ -101,8 +98,7 @@ void longerWindow() {
       .getTransitService();
 
     var instant = instant("11:00");
-    var result = StopTimesHelper.findTripTimeOnDate(
-      transitService,
+    var result = transitService.findTripTimeOnDate(
       TripTimeOnDateRequest.of(List.of(STOP_A1))
         .withTime(instant)
         .withTimeWindow(Duration.ofMinutes(60))
@@ -119,8 +115,7 @@ void several() {
       .getTransitService();
 
     var instant = instant("12:10");
-    var result = StopTimesHelper.findTripTimeOnDate(
-      transitService,
+    var result = transitService.findTripTimeOnDate(
       TripTimeOnDateRequest.of(List.of(STOP_F))
         .withTime(instant)
         .withTimeWindow(Duration.ofMinutes(60))