Merge remote-tracking branch 'upstream/dev-2.x' into move-trailing-comments

Author: optionsome

.github/workflows/cibuild.yml

@@ -3,16 +3,19 @@ name: OTP CI Build
 # But triggering on push only will miss pull requests from outside authors.
 # The push event's ref is the name of the pushed branch;
 # The pull_request event's branch name is the merge target branch.
+# The merge_group event's branch name is the merge target branch.
 on:
   push:
     branches:
       - master
-      - dev-1.x
       - dev-2.x
   pull_request:
     branches:
       - master
-      - dev-1.x
+      - dev-2.x
+  merge_group:
+    branches:
+      - master
       - dev-2.x
 env:
   # maven default arguments to make the log quieter and colourful
@@ -54,22 +57,22 @@ jobs:
           mvn package -Dmaven.test.skip -P prettierSkip,checkstyleSkip
 
       - name: Send coverage data to codecov.io
-        if: github.repository_owner == 'opentripplanner'
+        if: github.repository_owner == 'opentripplanner' && github.event_name != 'merge_group'
         uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           verbose: true
 
       - name: Upload test results to Codecov
         # always upload test results, even when failed
-        if: ${{ !cancelled() }}
+        if: ${{ !cancelled() }} && github.event_name != 'merge_group'
         uses: codecov/test-results-action@v1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: "*TEST-*.xml"
 
       - name: Deploy to Github Package Registry
-        if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev-1.x' || github.ref == 'refs/heads/dev-2.x')
+        if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev-2.x')
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: mvn deploy --settings maven-settings.xml -DskipTests -DGITHUB_REPOSITORY=$GITHUB_REPOSITORY -P prettierSkip,checkstyleSkip,deployGitHub
@@ -116,14 +119,14 @@ jobs:
 
       - uses: actions/checkout@v4
         # for a simple PR where we don't push, we don't need any credentials
-        if: github.event_name == 'pull_request'
+        if: github.event_name != 'push'
 
       - name: Install Python dependencies
         run: pip install -r doc/user/requirements.txt
 
 
       - name: Build main documentation
-        if: github.event_name == 'pull_request'
+        if: github.event_name != 'push'
         run: mkdocs build
 
       - uses: actions/setup-node@v4

.github/workflows/debug-client.yml

@@ -13,6 +13,10 @@ on:
     paths:
       - 'client/**'
       - 'application/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql'
+  merge_group:
+    branches:
+      - dev-2.x
+    # path filtering not supported https://github.com/orgs/community/discussions/45899
   workflow_dispatch:
 
 # to avoid conflicts, make sure that only one workflow pushes to Github at the same time
@@ -35,7 +39,7 @@ jobs:
 
       # for a simple PR where we don't push, we don't need any credentials
       - uses: actions/checkout@v4
-        if: github.event_name == 'pull_request'
+        if: github.event_name == 'pull_request' || github.event_name == 'merge_group'
 
       - uses: actions/setup-node@v4
         with:

.github/workflows/schema-validation.yml

@@ -4,10 +4,14 @@ on:
   pull_request:
     branches:
       - dev-2.x
+  # We have to run this on merge_group despite it doing nothing since otherwise this required check isn't "successful"
+  merge_group:
+    branches:
+      - dev-2.x
 
 jobs:
   validate-gtfs-schema:
-    if: github.repository_owner == 'opentripplanner'
+    if: github.repository_owner == 'opentripplanner' && github.event_name == 'pull_request'
     name: Validate GTFS GraphQL schema changes
     runs-on: ubuntu-latest
 
@@ -32,7 +36,7 @@ jobs:
           graphql-inspector diff 'git:origin/dev-2.x:application/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls' 'application/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls'
 
   validate-transmodel-schema:
-    if: github.repository_owner == 'opentripplanner'
+    if: github.repository_owner == 'opentripplanner' && github.event_name == 'pull_request'
     name: Validate Transmodel GraphQL schema changes
     runs-on: ubuntu-latest
 

application/pom.xml

@@ -183,7 +183,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>5.20.0</version>
+            <version>5.21.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -467,6 +467,7 @@
                             <sources>
                                 <source>src/main/java</source>
                                 <source>src/ext/java</source>
+                                <source>${project.build.directory}/generated-sources/annotations</source>
                             </sources>
                         </configuration>
                     </execution>

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/2025/12/2025-12-09T10:25/assets/index-B-lQDPEB.js"></script>
-    <link rel="stylesheet" crossorigin href="https://www.opentripplanner.org/debug-client-assets/2025/12/2025-12-09T10:25/assets/index-BXH2cJLw.css">
+    <script type="module" crossorigin src="https://www.opentripplanner.org/debug-client-assets/2025/12/2025-12-16T13:55/assets/index-CwrhLyfM.js"></script>
+    <link rel="stylesheet" crossorigin href="https://www.opentripplanner.org/debug-client-assets/2025/12/2025-12-16T13:55/assets/index-BXH2cJLw.css">
   </head>
   <body>
     <div id="root"></div>

application/src/ext-test/java/org/opentripplanner/ext/flex/trip/FlexTripsMapperTest.java

@@ -10,14 +10,14 @@
 import org.opentripplanner.ext.flex.FlexTripsMapper;
 import org.opentripplanner.ext.flex.flexpathcalculator.DirectFlexPathCalculator;
 import org.opentripplanner.graph_builder.issue.service.DefaultDataImportIssueStore;
-import org.opentripplanner.model.impl.OtpTransitServiceBuilder;
+import org.opentripplanner.model.impl.TransitDataImportBuilder;
 import org.opentripplanner.transit.service.SiteRepository;
 
 class FlexTripsMapperTest {
 
   @Test
   void defaultTimePenalty() {
-    var builder = new OtpTransitServiceBuilder(SiteRepository.of().build(), NOOP);
+    var builder = new TransitDataImportBuilder(SiteRepository.of().build(), NOOP);
     builder
       .getStopTimesSortedByTrip()
       .addAll(List.of(area("10:00", "18:00"), area("10:00", "18:00")));
@@ -34,7 +34,7 @@ void defaultTimePenalty() {
   @Test
   void tooFewStopTimes() {
     var issueStore = new DefaultDataImportIssueStore();
-    var builder = new OtpTransitServiceBuilder(SiteRepository.of().build(), issueStore);
+    var builder = new TransitDataImportBuilder(SiteRepository.of().build(), issueStore);
     builder.getStopTimesSortedByTrip().addAll(List.of(area("10:00", "18:00")));
     var trips = FlexTripsMapper.createFlexTrips(builder, issueStore);
     assertEquals(0, trips.size());

application/src/ext/java/org/opentripplanner/ext/fares/service/NoopFareServiceFactory.java

@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import org.opentripplanner.ext.fares.model.FareRulesData;
-import org.opentripplanner.model.OtpTransitService;
 import org.opentripplanner.model.fare.ItineraryFare;
 import org.opentripplanner.model.plan.Itinerary;
 import org.opentripplanner.routing.fares.FareService;
@@ -20,7 +19,7 @@ public FareService makeFareService() {
   }
 
   @Override
-  public void processGtfs(FareRulesData a, OtpTransitService b) {}
+  public void processGtfs(FareRulesData a) {}
 
   @Override
   public void configure(JsonNode config) {}

application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/DefaultFareServiceFactory.java

@@ -17,7 +17,6 @@
 import org.opentripplanner.ext.fares.model.FareTransferRule;
 import org.opentripplanner.ext.fares.service.gtfs.GtfsFaresService;
 import org.opentripplanner.ext.fares.service.gtfs.v2.GtfsFaresV2Service;
-import org.opentripplanner.model.OtpTransitService;
 import org.opentripplanner.routing.core.FareType;
 import org.opentripplanner.routing.fares.FareService;
 import org.opentripplanner.routing.fares.FareServiceFactory;
@@ -52,7 +51,7 @@ public FareService makeFareService() {
   }
 
   @Override
-  public void processGtfs(FareRulesData fareRulesData, OtpTransitService transitService) {
+  public void processGtfs(FareRulesData fareRulesData) {
     fillFareRules(fareRulesData.fareAttributes(), fareRulesData.fareRules(), regularFareRules);
     this.fareLegRules.addAll(fareRulesData.fareLegRules());
     this.fareTransferRules.addAll(fareRulesData.fareTransferRules());

application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/AtlantaFareServiceFactory.java

@@ -7,7 +7,6 @@
 import org.opentripplanner.ext.fares.model.FareRuleSet;
 import org.opentripplanner.ext.fares.model.FareRulesData;
 import org.opentripplanner.ext.fares.service.gtfs.v1.DefaultFareServiceFactory;
-import org.opentripplanner.model.OtpTransitService;
 import org.opentripplanner.routing.fares.FareService;
 
 public class AtlantaFareServiceFactory extends DefaultFareServiceFactory {
@@ -23,7 +22,7 @@ public FareService makeFareService() {
    * This step ensures that the fares in the source GTFS data are accounted for correctly.
    */
   @Override
-  public void processGtfs(FareRulesData fareRuleService, OtpTransitService transitService) {
+  public void processGtfs(FareRulesData fareRuleService) {
     fillFareRules(fareRuleService.fareAttributes(), fareRuleService.fareRules(), regularFareRules);
   }
 

application/src/ext/java/org/opentripplanner/ext/fares/service/gtfs/v1/custom/HighestFareInFreeTransferWindowFareServiceFactory.java

@@ -10,7 +10,6 @@
 import org.opentripplanner.ext.fares.model.FareRuleSet;
 import org.opentripplanner.ext.fares.model.FareRulesData;
 import org.opentripplanner.ext.fares.service.gtfs.v1.DefaultFareServiceFactory;
-import org.opentripplanner.model.OtpTransitService;
 import org.opentripplanner.routing.fares.FareService;
 import org.opentripplanner.standalone.config.framework.json.NodeAdapter;
 
@@ -48,7 +47,7 @@ public FareService makeFareService() {
    * This step ensures that the fares in the source GTFS data are accounted for correctly.
    */
   @Override
-  public void processGtfs(FareRulesData fareRulesData, OtpTransitService transitService) {
+  public void processGtfs(FareRulesData fareRulesData) {
     fillFareRules(fareRulesData.fareAttributes(), fareRulesData.fareRules(), regularFareRules);
   }