refactor(exceptions): inline exceptions filtering for For loop

conveyal · Jul 12, 2023 · e51456e · e51456e
1 parent 677ba68
commit e51456e
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/src/main/java/com/conveyal/gtfs/loader/JdbcGtfsExporter.java b/src/main/java/com/conveyal/gtfs/loader/JdbcGtfsExporter.java
@@ -68,6 +68,17 @@ public JdbcGtfsExporter(String feedId, String outFile, DataSource dataSource, bo
         this.fromEditor = fromEditor;
     }
 
+    /**
+     * Utility method to check if an exception uses a specific service.
+     */
+    public Boolean exceptionInvolvesService(ScheduleException ex, String serviceId) {
+        return (
+            ex.addedService.contains(serviceId) ||
+            ex.removedService.contains(serviceId) ||
+            ex.customSchedule.contains(serviceId)
+        );
+    }
+
     /**
      * Export primary entity tables as well as Pattern and PatternStops tables.
      *
@@ -136,12 +147,10 @@ public FeedLoadResult exportTables() {
                     for (Calendar cal : calendars) {
                         Service service = new Service(cal.service_id);
                         service.calendar = cal;
-                        List<ScheduleException> calendarExceptions = exceptions.stream().filter(ex ->
-                            ex.addedService.contains(cal.service_id) ||
-                            ex.removedService.contains(cal.service_id) ||
-                            ex.customSchedule.contains(cal.service_id)
-                        ).collect(Collectors.toList());
-                        for (ScheduleException ex : calendarExceptions) {
+                        for (ScheduleException ex : exceptions.stream()
+                            .filter(ex -> exceptionInvolvesService(ex, cal.service_id))
+                            .collect(Collectors.toList())
+                        ) {
                             if (ex.exemplar.equals(ScheduleException.ExemplarServiceDescriptor.SWAP) &&
                                 (!ex.addedService.contains(cal.service_id) && !ex.removedService.contains(cal.service_id))) {
                                 // Skip swap exception if cal is not referenced by added or removed service.