Upstream merge 2026-09-08

.git-blame-ignore-revs

@@ -40,3 +40,6 @@ beeac076c0b9f0a8aaa1424ef1d6df3a6fa8f6ab
 
 # use prettier to force lf line endings
 7bee4cbeebb91dea4bf438af44509573948e6a56
+
+# update prettier version
+98d5fe7f7cc1d49ec613086b3a15523087daa213

.github/workflows/cibuild.yml

@@ -26,9 +26,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      # nodejs is needed because the dynamic download of it via the prettier maven plugin often
-      # times out
-      # Example: https://github.com/opentripplanner/OpenTripPlanner/actions/runs/4490450225/jobs/7897533439
+      # nodejs is needed because Spotless runs Prettier through node/npm
       - uses: actions/setup-node@v6
         with:
           node-version: 24
@@ -46,9 +44,8 @@ jobs:
         # to Maven Central open which then hang during the package phase because the Azure (Github Actions)
         # NAT drops them
         # https://github.com/actions/runner-images/issues/1499
-        # we set nodePath and npmPath to skip downloading the node binary, which frequently times out
         run: |
-          mvn jacoco:prepare-agent test jacoco:report -P prettierCheck,unit-tests -Dprettier.nodePath=node -Dprettier.npmPath=npm
+          mvn jacoco:prepare-agent test jacoco:report -P prettierCheck,unit-tests
           mvn package -Dmaven.test.skip -P prettierSkip,checkstyleSkip
 
       - name: Send coverage data to codecov.io

CLAUDE.md

@@ -33,11 +33,15 @@ mvn clean -Pclean-test-snapshots
 
 ## Code Formatting & Quality
 
-Quality gates run in the Maven `validate` phase and fail the build on violations:
-
-- **Prettier** auto-formats Java (`.prettierrc.yml`: 100-char width, 2-space indent). CI enforces
-  it; check with `mvn prettier:check`. Skip locally with `-Dps`.
-- **Checkstyle** runs against `checkstyle.xml`. Skip with `-Dcs` (or `-PcheckstyleSkip`).
+Quality gates run in the Maven `validate` / `process-sources` phases and fail the build on
+violations:
+
+- **Prettier**, run through the **Spotless** Maven plugin, auto-formats Java (100-char width,
+  2-space indent; the options are configured in the root `pom.xml`). Spotless also removes unused
+  imports (Javadoc-only references are kept). Requires `node`/`npm` on the `PATH`. CI enforces it;
+  check with `mvn spotless:check`, format with `mvn spotless:apply`. Skip locally with `-Dps`.
+- **Checkstyle** runs against `checkstyle.xml` in the `process-sources` phase (after Spotless). Skip
+  with `-Dcs` (or `-PcheckstyleSkip`).
 
 OpenRewrite (recipes in `openrewrite.yml`, e.g. removing unused imports) does **not** run
 automatically — invoke it explicitly with `mvn validate -Prewrite` (or the `-Drw` shortcut).

application/pom.xml

@@ -294,7 +294,7 @@
         <dependency>
             <groupId>org.onebusaway</groupId>
             <artifactId>onebusaway-gtfs</artifactId>
-            <version>14.2.1</version>
+            <version>14.2.2</version>
         </dependency>
         <!-- Used in DegreeGridNEDTileSource to fetch tiles from Amazon S3 -->
         <dependency>
@@ -343,7 +343,7 @@
         <dependency>
             <groupId>com.hivemq</groupId>
             <artifactId>hivemq-mqtt-client</artifactId>
-            <version>1.3.17</version>
+            <version>1.4.0</version>
         </dependency>
         <dependency>
             <groupId>io.github.ci-cmg</groupId>
@@ -363,12 +363,12 @@
         <dependency>
             <groupId>com.azure</groupId>
             <artifactId>azure-messaging-servicebus</artifactId>
-            <version>7.17.19</version>
+            <version>7.17.20</version>
         </dependency>
         <dependency>
             <groupId>com.azure</groupId>
             <artifactId>azure-identity</artifactId>
-            <version>1.18.4</version>
+            <version>1.18.5</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -503,18 +503,8 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>com.hubspot.maven.plugins</groupId>
-                <artifactId>prettier-maven-plugin</artifactId>
-                <configuration>
-                    <inputGlobs combine.children="append">
-                        <!-- Additional patterns specific to the application module -->
-                        <inputGlob>src/ext/java/**/*.java</inputGlob>
-                        <inputGlob>src/ext-test/java/**/*.java</inputGlob>
-                        <inputGlob>src/**/*.json</inputGlob>
-                        <inputGlob>src/test/resources/org/opentripplanner/apis/**/*.graphql</inputGlob>
-                        <inputGlob>!src/test/resources/org/opentripplanner/apis/vectortiles/style.json</inputGlob>
-                    </inputGlobs>
-                </configuration>
+                <groupId>com.diffplug.spotless</groupId>
+                <artifactId>spotless-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>

application/src/client/index.html

@@ -5,8 +5,8 @@
     <link rel="icon" type="image/svg+xml" href="/img/otp-logo.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>OTP Debug</title>
-    <script type="module" crossorigin src="https://www.opentripplanner.org/debug-client-assets/2026/08/2026-08-24T15:19/assets/index-B1-tE5DO.js"></script>
-    <link rel="stylesheet" crossorigin href="https://www.opentripplanner.org/debug-client-assets/2026/08/2026-08-24T15:19/assets/index-GO7pvg6c.css">
+    <script type="module" crossorigin src="https://www.opentripplanner.org/debug-client-assets/2026/09/2026-09-07T12:25/assets/index-B1VUfEow.js"></script>
+    <link rel="stylesheet" crossorigin href="https://www.opentripplanner.org/debug-client-assets/2026/09/2026-09-07T12:25/assets/index-GO7pvg6c.css">
   </head>
   <body>
     <div id="root"></div>

application/src/ext-test/java/org/opentripplanner/ext/carpooling/service/DefaultCarpoolingServiceTreeLimitTest.java

@@ -50,10 +50,10 @@ void sizesEachLegFromItsDurationAndSmallestDownstreamBudget() {
       stop(Duration.ofMinutes(40))
     );
 
-    var limits = DefaultCarpoolingService.driverLegTreeLimits(
-      trip,
-      new Duration[] { Duration.ofMinutes(60), Duration.ofMinutes(100) }
-    );
+    var limits = DefaultCarpoolingService.driverLegTreeLimits(trip, new Duration[] {
+      Duration.ofMinutes(60),
+      Duration.ofMinutes(100),
+    });
 
     assertEquals(2, limits.length);
     // Leg 0 allowance = min(downstream budgets) = min(5, 40) = 5.
@@ -78,10 +78,10 @@ void sizesShortLegsWellBelowNearbyStopRadius() {
       stop(Duration.ofMinutes(2))
     );
 
-    var limits = DefaultCarpoolingService.driverLegTreeLimits(
-      trip,
-      new Duration[] { Duration.ofMinutes(5), Duration.ofMinutes(5) }
-    );
+    var limits = DefaultCarpoolingService.driverLegTreeLimits(trip, new Duration[] {
+      Duration.ofMinutes(5),
+      Duration.ofMinutes(5),
+    });
 
     var leg = expectedLimit(Duration.ofMinutes(5), Duration.ofMinutes(2));
     assertEquals(leg, limits[0]);
@@ -96,10 +96,9 @@ void sizesShortLegsWellBelowNearbyStopRadius() {
   void twoWaypointTripSizesTheSingleLeg() {
     var trip = trip(stop(BUDGET), stop(BUDGET));
 
-    var limits = DefaultCarpoolingService.driverLegTreeLimits(
-      trip,
-      new Duration[] { Duration.ofMinutes(60) }
-    );
+    var limits = DefaultCarpoolingService.driverLegTreeLimits(trip, new Duration[] {
+      Duration.ofMinutes(60),
+    });
 
     assertEquals(1, limits.length);
     assertEquals(expectedLimit(Duration.ofMinutes(60), BUDGET), limits[0]);
@@ -112,10 +111,9 @@ void capsEachLegLimitAtMaxTripDuration() {
     // request could expand a multi-hour street tree.
     var trip = trip(stop(BUDGET), stop(BUDGET));
 
-    var limits = DefaultCarpoolingService.driverLegTreeLimits(
-      trip,
-      new Duration[] { Duration.ofHours(4) }
-    );
+    var limits = DefaultCarpoolingService.driverLegTreeLimits(trip, new Duration[] {
+      Duration.ofHours(4),
+    });
 
     assertEquals(CarpoolTrip.MAX_TRIP_DURATION, limits[0]);
   }

application/src/ext-test/java/org/opentripplanner/ext/edgenaming/CrosswalkNamerTest.java

@@ -15,9 +15,9 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.opentripplanner.core.model.i18n.I18NString;
 import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore;
-import org.opentripplanner.graph_builder.module.osm.OsmDatabase;
-import org.opentripplanner.graph_builder.module.osm.StreetEdgePair;
-import org.opentripplanner.graph_builder.services.osm.EdgeNamer;
+import org.opentripplanner.graph_builder.module.osm.EdgeNamer;
+import org.opentripplanner.graph_builder.module.osm.model.StreetEdgePair;
+import org.opentripplanner.graph_builder.module.osm.storage.OsmDatabase;
 import org.opentripplanner.osm.TestOsmProvider;
 import org.opentripplanner.osm.model.OsmWay;
 import org.opentripplanner.street.geometry.WgsCoordinate;

application/src/ext-test/java/org/opentripplanner/ext/edgenaming/EdgeNamerTest.java

@@ -3,8 +3,8 @@
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 
 import org.junit.jupiter.api.Test;
-import org.opentripplanner.graph_builder.services.osm.DefaultNamer;
-import org.opentripplanner.graph_builder.services.osm.EdgeNamer.EdgeNamerType;
+import org.opentripplanner.graph_builder.module.osm.EdgeNamer.EdgeNamerType;
+import org.opentripplanner.graph_builder.module.osm.internal.naming.DefaultNamer;
 
 class EdgeNamerTest {
 

application/src/ext-test/java/org/opentripplanner/ext/edgenaming/SidewalkNamerTest.java

@@ -11,9 +11,9 @@
 import org.junit.jupiter.api.Test;
 import org.opentripplanner.core.model.i18n.I18NString;
 import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore;
-import org.opentripplanner.graph_builder.module.osm.OsmDatabase;
-import org.opentripplanner.graph_builder.module.osm.StreetEdgePair;
-import org.opentripplanner.graph_builder.services.osm.EdgeNamer;
+import org.opentripplanner.graph_builder.module.osm.EdgeNamer;
+import org.opentripplanner.graph_builder.module.osm.model.StreetEdgePair;
+import org.opentripplanner.graph_builder.module.osm.storage.OsmDatabase;
 import org.opentripplanner.osm.WayTestData;
 import org.opentripplanner.osm.model.OsmWay;
 import org.opentripplanner.street.geometry.WgsCoordinate;

application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/route/RouteParserTest.java

@@ -11,10 +11,10 @@
 class RouteParserTest {
 
   private static final String DATA = """
-    route_id, avg_co2_per_vehicle_per_km, avg_passenger_count
-    R:1, 2.0, 20.0
-    R:2, 3.0, 24.0
-    """;
+  route_id, avg_co2_per_vehicle_per_km, avg_passenger_count
+  R:1, 2.0, 20.0
+  R:2, 3.0, 24.0
+  """;
 
   @Test
   void test() {

application/src/ext-test/java/org/opentripplanner/ext/emission/internal/csvdata/trip/TripHopsCsvParserTest.java

@@ -11,10 +11,10 @@
 class TripHopsCsvParserTest {
 
   private static final String DATA = """
-    trip_id, from_stop_id, from_stop_sequence, not_used, co2
-    F:1, NSR:Quay:1, 1, xyz, 28.0
-    F:1, NSR:Quay:2, 2, abc, 38.0
-    """;
+  trip_id, from_stop_id, from_stop_sequence, not_used, co2
+  F:1, NSR:Quay:1, 1, xyz, 28.0
+  F:1, NSR:Quay:2, 2, abc, 38.0
+  """;
 
   @Test
   void test() {

application/src/ext-test/java/org/opentripplanner/ext/emission/internal/itinerary/EmissionItineraryDecoratorTest.java

@@ -79,16 +79,16 @@ void setUpItineraries() {
 
     int t0 = START_TIME;
     combinedWithFlex = newItinerary(A)
-      .drive(t0, t0 += 90, C)
-      .rail(4, t0 += 90, t0 += 90, D)
-      .bus(routeA, 20, t0, t0 += 90, E)
+      .drive(t0, (t0 += 90), C)
+      .rail(4, (t0 += 90), (t0 += 90), D)
+      .bus(routeA, 20, t0, (t0 += 90), E)
       .flex(t0 + 90, END_TIME, B)
       .build();
 
     combinedNoFlex = newItinerary(A)
-      .drive(t0, t0 += 90, C)
-      .rail(4, t0 += 90, t0 + 90, D)
-      .bus(routeA, 20, t0, t0 += 90, E)
+      .drive(t0, (t0 += 90), C)
+      .rail(4, (t0 += 90), t0 + 90, D)
+      .bus(routeA, 20, t0, (t0 += 90), E)
       .bus(routeB, 23, t0, END_TIME, B)
       .build();
 

application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/calendar/CalendarCsvParserTest.java

@@ -15,9 +15,9 @@ class CalendarCsvParserTest {
     String.join(", ", CalendarCsvParser.HEADERS) +
     "\n" +
     """
-      WEEKDAYS,1,1,1,1,1,0,0,2025-01-01, 2025-12-31
-      WEEKEND,0,0,0,0,0,1,1,2025-02-03, 2025-11-20
-      """;
+    WEEKDAYS,1,1,1,1,1,0,0,2025-01-01, 2025-12-31
+    WEEKEND,0,0,0,0,0,1,1,2025-02-03, 2025-11-20
+    """;
   private final CalendarCsvParser subject = new CalendarCsvParser(
     DataImportIssueStore.NOOP,
     CsvReader.parse(DEFAUT_INPUT)

application/src/ext-test/java/org/opentripplanner/ext/empiricaldelay/internal/csvinput/delay/TripTimeDelayCsvParserTest.java

@@ -12,10 +12,10 @@
 class TripTimeDelayCsvParserTest {
 
   private static final String DEFAUT_INPUT = """
-    empirical_delay_service_id, trip_id, stop_id, stop_sequence, p50, p90
-    WEEKDAYS, VYG:ServiceJourney:BUS-2280_374435-R, NSR:Quay:1, 1, 2, 8
-    WEEKEND, RUT:ServiceJourney:bc0092f0102605437e3e49cc3a88d0ba, NSR:Quay:10001, 39, 0, 200
-    """;
+  empirical_delay_service_id, trip_id, stop_id, stop_sequence, p50, p90
+  WEEKDAYS, VYG:ServiceJourney:BUS-2280_374435-R, NSR:Quay:1, 1, 2, 8
+  WEEKEND, RUT:ServiceJourney:bc0092f0102605437e3e49cc3a88d0ba, NSR:Quay:10001, 39, 0, 200
+  """;
   private static final String FEED_ID = "F";
 
   private final TripTimeDelayCsvParser subject = new TripTimeDelayCsvParser(

application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/AtlantaFareServiceTest.java

@@ -286,8 +286,8 @@ private static Itinerary createItinerary(String agencyId, String shortName, long
       .withMode(TransitMode.BUS)
       .build();
 
-    int start = (int) (T11_00 + (startTimeMins * 60));
-    int end = (int) (T11_00 + ((startTimeMins + 12) * 60));
+    int start = (int) (T11_00 + startTimeMins * 60);
+    int end = (int) (T11_00 + (startTimeMins + 12) * 60);
     return newItinerary(Place.forStop(firstStop), start)
       .bus(route, 1, start, end, Place.forStop(lastStop))
       .build();

application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HSLFareServiceTest.java

@@ -114,11 +114,12 @@ private static List<Arguments> createTestCases() {
       .withTransferDuration(fiveMinutes)
       .build();
 
-    FareAttribute fareAttributeD = FareAttribute.of(new FeedScopedId(FEED_ID, "D"))
-      .withPrice(D_PRICE)
-      .withTransferDuration(fiveMinutes)
-      //.setAgency(agency1.getId().getId())
-      .build();
+    FareAttribute fareAttributeD =
+      FareAttribute.of(new FeedScopedId(FEED_ID, "D"))
+        .withPrice(D_PRICE)
+        .withTransferDuration(fiveMinutes)
+        //.setAgency(agency1.getId().getId())
+        .build();
 
     FareAttribute fareAttributeABC = FareAttribute.of(new FeedScopedId(FEED_ID, "ABC"))
       .withPrice(ABC_PRICE)

application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/OrcaFareServiceTest.java

@@ -180,7 +180,7 @@ private static void assertLegFareEquals(int fare, Leg leg, ItineraryFare fares,
 
     // Check for transfer status - transfers are when this leg has fare products but pays no additional cost
     // (i.e., fare = 0 for this leg because it's covered by a previous fare product)
-    var hasTransfer = (fare == 0 && !legFareProducts.isEmpty());
+    var hasTransfer = fare == 0 && !legFareProducts.isEmpty();
 
     assertEquals(hasXfer, hasTransfer, "Incorrect transfer leg fare product status.");
   }
@@ -834,8 +834,8 @@ private static Itinerary createItinerary(
       .withGtfsType(transitMode)
       .build();
 
-    int start = (int) (T11_00 + (startTimeMins * 60));
-    int end = (int) (T11_00 + ((startTimeMins + 12) * 60));
+    int start = (int) (T11_00 + startTimeMins * 60);
+    int end = (int) (T11_00 + (startTimeMins + 12) * 60);
     return newItinerary(Place.forStop(firstStop), start)
       .transit(route, tripId, start, end, 5, 7, Place.forStop(lastStop), null, null, null)
       .build();

application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/FreeTransferInNetworkTest.java

@@ -73,10 +73,8 @@ void singleLeg() {
   void severalLegs() {
     var i1 = newItinerary(A, 0).bus(ROUTE, 1, 0, 50, B).bus(ROUTE, 1, 0, 50, C).build();
     var result = service.calculateFares(i1);
-    i1
-      .listTransitLegs()
-      .forEach(l -> {
-        assertThat(result.offersForLeg(l)).containsExactly(FareOffer.of(l.startTime(), REGULAR));
-      });
+    i1.listTransitLegs().forEach(l -> {
+      assertThat(result.offersForLeg(l)).containsExactly(FareOffer.of(l.startTime(), REGULAR));
+    });
   }
 }

application/src/ext-test/java/org/opentripplanner/ext/fares/service/gtfs/v2/WildcardNetworkTransferTest.java

@@ -18,7 +18,9 @@ class WildcardNetworkTransferTest implements FareTestConstants {
   private final GtfsFaresV2Service SERVICE = GtfsFaresV2Service.of()
     .withLegRules(
       // wildcard rule, matches everything
-      FareLegRule.of(id(1), FARE_PRODUCT_A).withLegGroupId(LEG_GROUP_A).build()
+      FareLegRule.of(id(1), FARE_PRODUCT_A)
+        .withLegGroupId(LEG_GROUP_A)
+        .build()
     )
     .withTransferRules(
       // monthly pass with unlimited transfers

application/src/ext-test/java/org/opentripplanner/ext/flex/FlexIndexTest.java

@@ -136,11 +136,9 @@ void routesAtGroup() {
 
     var groupStop = (GroupStop) st1.getStop();
     assertThat(groupStop.getChildLocations()).isNotEmpty();
-    groupStop
-      .getChildLocations()
-      .forEach(child -> {
-        assertThat(index.findRoutes(child)).containsExactly(ROUTE_2);
-        assertThat(index.findRoutes(child)).containsExactly(ROUTE_2);
-      });
+    groupStop.getChildLocations().forEach(child -> {
+      assertThat(index.findRoutes(child)).containsExactly(ROUTE_2);
+      assertThat(index.findRoutes(child)).containsExactly(ROUTE_2);
+    });
   }
 }