Merge pull request opentripplanner#6249 from leonardehrenfried/naming…

…-conventions

Rename all methods in TransitService according to naming conventions

application/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java

@@ -135,7 +135,7 @@ static void setup() {
         .build();
 
       @Override
-      public List<TransitMode> getModesOfStopLocation(StopLocation stop) {
+      public List<TransitMode> findTransitModes(StopLocation stop) {
         if (stop.getVehicleType() != null) {
           return List.of(stop.getVehicleType());
         } else {
@@ -144,15 +144,15 @@ public List<TransitMode> getModesOfStopLocation(StopLocation stop) {
       }
 
       @Override
-      public Agency getAgencyForId(FeedScopedId id) {
+      public Agency getAgency(FeedScopedId id) {
         if (id.equals(BVG.getId())) {
           return BVG;
         }
         return null;
       }
 
       @Override
-      public Set<Route> getRoutesForStop(StopLocation stop) {
+      public Set<Route> findRoutes(StopLocation stop) {
         return Set.of(TimetableRepositoryForTest.route("route1").withAgency(BVG).build());
       }
 

application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/TestTransitService.java

@@ -15,7 +15,7 @@ public TestTransitService(TimetableRepository timetableRepository) {
   }
 
   @Override
-  public Set<Route> getRoutesForStop(StopLocation stop) {
+  public Set<Route> findRoutes(StopLocation stop) {
     return Set.of(
       TimetableRepositoryForTest.route("1").withMode(TransitMode.RAIL).withGtfsType(100).build()
     );

application/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java

@@ -192,7 +192,7 @@ public TransitStopVertex getStopVertexForStopId(FeedScopedId stopId) {
 
     @Override
     public Collection<PathTransfer> getTransfersFromStop(StopLocation stop) {
-      return transitService.getTransfersByStop(stop);
+      return transitService.findPathTransfers(stop);
     }
 
     @Override
@@ -207,7 +207,7 @@ public Collection<PathTransfer> getTransfersToStop(StopLocation stop) {
 
     @Override
     public boolean isDateActive(FlexServiceDate date, FlexTrip<?, ?> trip) {
-      int serviceCode = transitService.getServiceCodeForId(trip.getTrip().getServiceId());
+      int serviceCode = transitService.getServiceCode(trip.getTrip().getServiceId());
       return date.isTripServiceRunning(serviceCode);
     }
   }

application/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java

@@ -174,7 +174,7 @@ private static Optional<LuceneStopCluster> map(List<StopLocation> stopLocations)
   }
 
   private List<Agency> agenciesForStopLocation(StopLocation stop) {
-    return transitService.getRoutesForStop(stop).stream().map(Route::getAgency).distinct().toList();
+    return transitService.findRoutes(stop).stream().map(Route::getAgency).distinct().toList();
   }
 
   private List<Agency> agenciesForStopLocationsGroup(StopLocationsGroup group) {
@@ -190,7 +190,7 @@ StopCluster.Location toLocation(FeedScopedId id) {
     var loc = transitService.getStopLocation(id);
     if (loc != null) {
       var feedPublisher = toFeedPublisher(transitService.getFeedInfo(id.getFeedId()));
-      var modes = transitService.getModesOfStopLocation(loc).stream().map(Enum::name).toList();
+      var modes = transitService.findTransitModes(loc).stream().map(Enum::name).toList();
       var agencies = agenciesForStopLocation(loc)
         .stream()
         .map(StopClusterMapper::toAgency)
@@ -209,7 +209,7 @@ StopCluster.Location toLocation(FeedScopedId id) {
       var group = transitService.getStopLocationsGroup(id);
       var feedPublisher = toFeedPublisher(transitService.getFeedInfo(id.getFeedId()));
       var modes = transitService
-        .getModesOfStopLocationsGroup(group)
+        .findTransitModes(group)
         .stream()
         .map(Enum::name)
         .toList();

application/src/ext/java/org/opentripplanner/ext/reportapi/model/GraphReportBuilder.java

@@ -41,9 +41,9 @@ public static GraphStats build(OtpServerRequestContext context) {
       new StreetStats(edgeTypes, vertexTypes),
       new TransitStats(
         stopCounts,
-        transitService.getAllTrips().size(),
-        transitService.getAllTripPatterns().size(),
-        transitService.getAllRoutes().size(),
+        transitService.listTrips().size(),
+        transitService.listTripPatterns().size(),
+        transitService.listRoutes().size(),
         constrainedTransferCounts
       )
     );

application/src/ext/java/org/opentripplanner/ext/reportapi/model/TransfersReport.java

@@ -152,7 +152,7 @@ private TxPoint pointInfo(TransferPoint p, boolean boarding) {
     if (p instanceof TripTransferPoint tp) {
       var trip = tp.getTrip();
       var route = trip.getRoute();
-      var ptn = transitService.getPatternForTrip(trip);
+      var ptn = transitService.findPattern(trip);
       r.operator = getName(trip.getOperator());
       r.type = "Trip";
       r.entityId = trip.getId().getId();
@@ -162,7 +162,7 @@ private TxPoint pointInfo(TransferPoint p, boolean boarding) {
       addLocation(r, ptn, stop, trip, boarding);
     } else if (p instanceof RouteStopTransferPoint rp) {
       var route = rp.getRoute();
-      var ptn = transitService.getPatternsForRoute(route).stream().findFirst().orElse(null);
+      var ptn = transitService.findPatterns(route).stream().findFirst().orElse(null);
       r.operator = getName(route.getOperator());
       r.type = "Route";
       r.entityId = route.getId().getId();

application/src/ext/java/org/opentripplanner/ext/reportapi/resource/ReportResource.java

@@ -49,7 +49,7 @@ public String getTransfersAsCsv() {
   @Produces(MediaType.TEXT_PLAIN)
   public String getTransitGroupPriorities() {
     return TransitGroupPriorityReport.build(
-      transitService.getAllTripPatterns(),
+      transitService.listTripPatterns(),
       defaultRequest.journey().transit()
     );
   }

application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiRouterInfo.java

@@ -42,7 +42,7 @@ public ApiRouterInfo(
     this.buildTime = Date.from(graph.buildTime);
     this.transitServiceStarts = transitService.getTransitServiceStarts().toEpochSecond();
     this.transitServiceEnds = transitService.getTransitServiceEnds().toEpochSecond();
-    this.transitModes = ModeMapper.mapToApi(transitService.getTransitModes());
+    this.transitModes = ModeMapper.mapToApi(transitService.listTransitModes());
     this.envelope = envelope;
     this.hasBikeSharing = mapHasBikeSharing(vehicleRentalService);
     this.hasBikePark = mapHasBikePark(vehicleParkingService);

application/src/ext/java/org/opentripplanner/ext/restapi/model/ApiTravelOptionsMaker.java

@@ -34,7 +34,7 @@ public static List<ApiTravelOption> makeOptions(
     TransitService transitService
   ) {
     return makeOptions(
-      transitService.getTransitModes(),
+      transitService.listTransitModes(),
       vehicleRentalService.hasRentalBikes(),
       vehicleParkingService.hasBikeParking(),
       vehicleParkingService.hasCarParking()

application/src/ext/java/org/opentripplanner/ext/restapi/resources/IndexAPI.java

@@ -93,7 +93,7 @@ public IndexAPI(
   @GET
   @Path("/feeds")
   public Collection<String> getFeeds() {
-    return transitService().getFeedIds();
+    return transitService().listFeedIds();
   }
 
   @GET
@@ -108,7 +108,7 @@ public ApiFeedInfo getFeedInfo(@PathParam("feedId") String feedId) {
   @Path("/agencies/{feedId}")
   public Collection<ApiAgency> getAgencies(@PathParam("feedId") String feedId) {
     Collection<Agency> agencies = transitService()
-      .getAgencies()
+      .listAgencies()
       .stream()
       .filter(agency -> agency.getId().getFeedId().equals(feedId))
       .collect(Collectors.toList());
@@ -138,7 +138,7 @@ public Response getAgencyRoutes(
     var agency = agency(feedId, agencyId);
 
     Collection<Route> routes = transitService()
-      .getAllRoutes()
+      .listRoutes()
       .stream()
       .filter(r -> r.getAgency() == agency)
       .collect(Collectors.toList());
@@ -235,7 +235,7 @@ public List<ApiStopShort> getStopsInRadius(
   public List<ApiRouteShort> getRoutesForStop(@PathParam("stopId") String stopId) {
     var stop = stop(stopId);
     return transitService()
-      .getPatternsForStop(stop)
+      .findPatterns(stop)
       .stream()
       .map(TripPattern::getRoute)
       .map(RouteMapper::mapToApiShort)
@@ -247,7 +247,7 @@ public List<ApiRouteShort> getRoutesForStop(@PathParam("stopId") String stopId)
   public List<ApiPatternShort> getPatternsForStop(@PathParam("stopId") String stopId) {
     var stop = stop(stopId);
     return transitService()
-      .getPatternsForStop(stop)
+      .findPatterns(stop)
       .stream()
       .map(TripPatternMapper::mapToApiShort)
       .collect(Collectors.toList());
@@ -275,7 +275,7 @@ public Collection<ApiStopTimesInPattern> getStopTimesForStop(
       : Instant.ofEpochSecond(startTimeSeconds);
 
     return transitService()
-      .stopTimesForStop(
+      .findStopTimesInPattern(
         stop(stopIdString),
         startTime,
         Duration.ofSeconds(timeRange),
@@ -303,7 +303,7 @@ public List<ApiStopTimesInPattern> getStoptimesForStopAndDate(
     var stop = stop(stopId);
     var serviceDate = parseServiceDate("date", date);
     List<StopTimesInPattern> stopTimes = transitService()
-      .getStopTimesForStop(
+      .findStopTimesInPattern(
         stop,
         serviceDate,
         omitNonPickups ? ArrivalDeparture.DEPARTURES : ArrivalDeparture.BOTH,
@@ -322,7 +322,7 @@ public Collection<ApiTransfer> getTransfers(@PathParam("stopId") String stopId)
 
     // get the transfers for the stop
     return transitService()
-      .getTransfersByStop(stop)
+      .findPathTransfers(stop)
       .stream()
       .map(TransferMapper::mapToApi)
       .collect(Collectors.toList());
@@ -344,15 +344,15 @@ public Collection<ApiAlert> getAlertsForStop(@PathParam("stopId") String stopId)
   @GET
   @Path("/routes")
   public List<ApiRouteShort> getRoutes(@QueryParam("hasStop") List<String> stopIds) {
-    Collection<Route> routes = transitService().getAllRoutes();
+    Collection<Route> routes = transitService().listRoutes();
     // Filter routes to include only those that pass through all given stops
     if (stopIds != null) {
       // Protective copy, we are going to calculate the intersection destructively
       routes = new ArrayList<>(routes);
       for (String stopId : stopIds) {
         var stop = stop(stopId);
         Set<Route> routesHere = new HashSet<>();
-        for (TripPattern pattern : transitService().getPatternsForStop(stop)) {
+        for (TripPattern pattern : transitService().findPatterns(stop)) {
           routesHere.add(pattern.getRoute());
         }
         routes.retainAll(routesHere);
@@ -372,7 +372,7 @@ public ApiRoute getRoute(@PathParam("routeId") String routeId) {
   @GET
   @Path("/routes/{routeId}/patterns")
   public List<ApiPatternShort> getPatternsForRoute(@PathParam("routeId") String routeId) {
-    Collection<TripPattern> patterns = transitService().getPatternsForRoute(route(routeId));
+    Collection<TripPattern> patterns = transitService().findPatterns(route(routeId));
     return TripPatternMapper.mapToApiShort(patterns);
   }
 
@@ -383,7 +383,7 @@ public List<ApiStopShort> getStopsForRoute(@PathParam("routeId") String routeId)
     var route = route(routeId);
 
     Set<StopLocation> stops = new HashSet<>();
-    Collection<TripPattern> patterns = transitService().getPatternsForRoute(route);
+    Collection<TripPattern> patterns = transitService().findPatterns(route);
     for (TripPattern pattern : patterns) {
       stops.addAll(pattern.getStops());
     }
@@ -396,7 +396,7 @@ public List<ApiStopShort> getStopsForRoute(@PathParam("routeId") String routeId)
   public List<ApiTripShort> getTripsForRoute(@PathParam("routeId") String routeId) {
     var route = route(routeId);
 
-    var patterns = transitService().getPatternsForRoute(route);
+    var patterns = transitService().findPatterns(route);
     return patterns
       .stream()
       .flatMap(TripPattern::scheduledTripsAsStream)
@@ -445,7 +445,7 @@ public List<ApiTripTimeShort> getStoptimesForTrip(@PathParam("tripId") String tr
     var pattern = tripPattern(trip);
     // Note, we need the updated timetable not the scheduled one (which contains no real-time updates).
     var table = transitService()
-      .getTimetableForTripPattern(pattern, LocalDate.now(transitService().getTimeZone()));
+      .findTimetable(pattern, LocalDate.now(transitService().getTimeZone()));
     var tripTimesOnDate = TripTimeOnDate.fromTripTimes(table, trip);
     return TripTimeMapper.mapToApi(tripTimesOnDate);
   }
@@ -472,7 +472,7 @@ public Collection<ApiAlert> getAlertsForTrip(@PathParam("tripId") String tripId)
   @GET
   @Path("/patterns")
   public List<ApiPatternShort> getPatterns() {
-    Collection<TripPattern> patterns = transitService().getAllTripPatterns();
+    Collection<TripPattern> patterns = transitService().listTripPatterns();
     return TripPatternMapper.mapToApiShort(patterns);
   }
 
@@ -589,7 +589,7 @@ private static NotFoundException notFoundException(String entity, String details
   }
 
   private Agency agency(String feedId, String agencyId) {
-    var agency = transitService().getAgencyForId(new FeedScopedId(feedId, agencyId));
+    var agency = transitService().getAgency(new FeedScopedId(feedId, agencyId));
     if (agency == null) {
       throw notFoundException("Agency", "feedId: " + feedId + ", agencyId: " + agencyId);
     }
@@ -602,18 +602,18 @@ private StopLocation stop(String stopId) {
   }
 
   private Route route(String routeId) {
-    var route = transitService().getRouteForId(createId("routeId", routeId));
+    var route = transitService().getRoute(createId("routeId", routeId));
     return validateExist("Route", route, "routeId", routeId);
   }
 
   private Trip trip(String tripId) {
-    var trip = transitService().getTripForId(createId("tripId", tripId));
+    var trip = transitService().getTrip(createId("tripId", tripId));
     return validateExist("Trip", trip, "tripId", tripId);
   }
 
   private TripPattern tripPattern(String tripPatternId) {
     var id = createId("patternId", tripPatternId);
-    var pattern = transitService().getTripPatternForId(id);
+    var pattern = transitService().getTripPattern(id);
     return validateExist("TripPattern", pattern, "patternId", tripPatternId);
   }
 
@@ -622,7 +622,7 @@ private TripPattern tripPatternForTripId(String tripId) {
   }
 
   private TripPattern tripPattern(Trip trip) {
-    var pattern = transitService().getPatternForTrip(trip);
+    var pattern = transitService().findPattern(trip);
     return validateExist("TripPattern", pattern, "trip", trip.getId());
   }
 

application/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java

@@ -109,7 +109,7 @@ public TileJson getTileJson(
   private List<FeedInfo> getFeedInfos() {
     return serverContext
       .transitService()
-      .getFeedIds()
+      .listFeedIds()
       .stream()
       .map(serverContext.transitService()::getFeedInfo)
       .filter(Predicate.not(Objects::isNull))

application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/LayerFilters.java

@@ -58,7 +58,7 @@ public static Predicate<RegularStop> forType(FilterType type, TransitService tra
     return switch (type) {
       case NONE -> NO_FILTER;
       case SUNDAY_TO_SUNDAY_SERVICE_WEEK -> buildCurrentServiceWeekPredicate(
-        transitService::getPatternsForStop,
+        transitService::findPatterns,
         trip ->
           transitService.getCalendarService().getServiceDatesForServiceId(trip.getServiceId()),
         () -> LocalDate.now(transitService.getTimeZone())

application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopPropertyMapper.java

@@ -28,7 +28,7 @@ protected AreaStopPropertyMapper(
   }
 
   protected static AreaStopPropertyMapper create(TransitService transitService, Locale locale) {
-    return new AreaStopPropertyMapper(transitService::getRoutesForStop, locale);
+    return new AreaStopPropertyMapper(transitService::findRoutes, locale);
   }
 
   @Override

application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapper.java

@@ -44,7 +44,7 @@ public Collection<KeyValue> map(Station station) {
           "type",
           childStops
             .stream()
-            .flatMap(stop -> transitService.getPatternsForStop(stop).stream())
+            .flatMap(stop -> transitService.findPatterns(stop).stream())
             .map(tripPattern -> tripPattern.getMode().name())
             .distinct()
             .collect(Collectors.joining(","))
@@ -60,7 +60,7 @@ public Collection<KeyValue> map(Station station) {
           OBJECT_MAPPER.writeValueAsString(
             childStops
               .stream()
-              .flatMap(stop -> transitService.getRoutesForStop(stop).stream())
+              .flatMap(stop -> transitService.findRoutes(stop).stream())
               .distinct()
               .map(route -> {
                 var obj = OBJECT_MAPPER.createObjectNode();

application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stations/StationsLayerBuilder.java

@@ -40,7 +40,7 @@ public StationsLayerBuilder(
 
   protected List<Geometry> getGeometries(Envelope query) {
     return transitService
-      .getStations()
+      .listStations()
       .stream()
       .map(station -> {
         Coordinate coordinate = station.getCoordinate().asJtsCoordinate();

application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java

@@ -36,7 +36,7 @@ protected Collection<KeyValue> map(RegularStop stop) {
 
     var serviceDate = LocalDate.now(transitService.getTimeZone());
     boolean stopTimesExist = transitService
-      .getStopTimesForStop(stop, serviceDate, ArrivalDeparture.BOTH, true)
+      .findStopTimesInPattern(stop, serviceDate, ArrivalDeparture.BOTH, true)
       .stream()
       .anyMatch(stopTime -> stopTime.times.size() > 0);
 

application/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java

@@ -61,7 +61,7 @@ protected static Collection<KeyValue> getBaseKeyValues(
   protected static String getRoutes(TransitService transitService, RegularStop stop) {
     try {
       var objects = transitService
-        .getRoutesForStop(stop)
+        .findRoutes(stop)
         .stream()
         .map(route -> {
           var routeObject = OBJECT_MAPPER.createObjectNode();
@@ -76,7 +76,7 @@ protected static String getRoutes(TransitService transitService, RegularStop sto
   }
 
   protected static String getType(TransitService transitService, RegularStop stop) {
-    Collection<TripPattern> patternsForStop = transitService.getPatternsForStop(stop);
+    Collection<TripPattern> patternsForStop = transitService.findPatterns(stop);
 
     return patternsForStop
       .stream()