Merge remote-tracking branch 'upstream/dev-2.x' into wheelchair-debug

ibi-group · Nov 12, 2024 · 18e2d37 · 18e2d37
2 parents 79221b6 + 237cf26
commit 18e2d37
Show file tree

Hide file tree

Showing 88 changed files with 2,586 additions and 1,568 deletions.
diff --git a/.github/workflows/cibuild.yml b/.github/workflows/cibuild.yml
@@ -14,6 +14,12 @@ on:
       - master
       - dev-1.x
       - dev-2.x
+env:
+  # Since version 3.9.0 of Maven it will automatically understand this environment variable.
+  # However, as of 2024-11 the latest versions of Ubuntu and Debian were on 3.8.8 so it will take some
+  # time until we can remove the $MAVEN_ARGS below.
+  MAVEN_ARGS: "--no-transfer-progress -Dstyle.color=always"
+
 jobs:
   build-linux:
     runs-on: ubuntu-latest
@@ -46,22 +52,29 @@ jobs:
         # 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 --batch-mode jacoco:prepare-agent test jacoco:report -P prettierCheck -Dprettier.nodePath=node -Dprettier.npmPath=npm
-          mvn --batch-mode package -Dmaven.test.skip -P prettierSkip
+          mvn $MAVEN_ARGS jacoco:prepare-agent test jacoco:report -P prettierCheck -Dprettier.nodePath=node -Dprettier.npmPath=npm
+          mvn $MAVEN_ARGS package -Dmaven.test.skip -P prettierSkip
 
       - name: Send coverage data to codecov.io
         if: github.repository_owner == 'opentripplanner'
         uses: codecov/codecov-action@v4
         with:
-          files: target/site/jacoco/jacoco.xml
           token: ${{ secrets.CODECOV_TOKEN }}
           verbose: true
 
+      - name: Upload test results to Codecov
+        # always upload test results, even when failed
+        if: ${{ !cancelled() }}
+        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')
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: mvn --batch-mode deploy --settings maven-settings.xml -DskipTests -DGITHUB_REPOSITORY=$GITHUB_REPOSITORY -P prettierSkip -P deployGitHub
+        run: mvn $MAVEN_ARGS deploy --settings maven-settings.xml -DskipTests -DGITHUB_REPOSITORY=$GITHUB_REPOSITORY -P prettierSkip -P deployGitHub
 
   build-windows:
     timeout-minutes: 20
@@ -79,7 +92,7 @@ jobs:
       - name: Configure Windows Pagefile
         uses: al-cheb/[email protected]
       - name: Run tests
-        run: mvn --batch-mode test -P prettierSkip
+        run: mvn $MAVEN_ARGS test -P prettierSkip
 
   docs:
     if: github.repository_owner == 'opentripplanner'
@@ -192,7 +205,7 @@ jobs:
           distribution: temurin
           cache: maven
       - name: Compile Java code
-        run: mvn --batch-mode compile -DskipTests -P prettierSkip
+        run: mvn $MAVEN_ARGS compile -DskipTests -P prettierSkip
 
   container-image:
     if: github.repository_owner == 'opentripplanner' && github.event_name == 'push' && (github.ref == 'refs/heads/dev-2.x' || github.ref == 'refs/heads/master')
@@ -237,4 +250,4 @@ jobs:
           
           MAVEN_SKIP_ARGS="-P prettierSkip -Dmaven.test.skip=true -Dmaven.source.skip=true"
           
-          mvn --batch-mode $MAVEN_SKIP_ARGS package com.google.cloud.tools:jib-maven-plugin:build -Djib.to.tags=latest,$image_version
+          mvn $MAVEN_ARGS $MAVEN_SKIP_ARGS package com.google.cloud.tools:jib-maven-plugin:build -Djib.to.tags=latest,$image_version
diff --git a/application/src/client/index.html b/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 Client</title>
-    <script type="module" crossorigin src="https://cdn.jsdelivr.net/gh/opentripplanner/debug-client-assets@main/2024/11/2024-11-04T12:49/assets/index-DPdUtdaa.js"></script>
-    <link rel="stylesheet" crossorigin href="https://cdn.jsdelivr.net/gh/opentripplanner/debug-client-assets@main/2024/11/2024-11-04T12:49/assets/index-CaBThmWm.css">
+    <script type="module" crossorigin src="https://cdn.jsdelivr.net/gh/opentripplanner/debug-client-assets@main/2024/11/2024-11-12T09:26/assets/index-CKH05Dt9.js"></script>
+    <link rel="stylesheet" crossorigin href="https://cdn.jsdelivr.net/gh/opentripplanner/debug-client-assets@main/2024/11/2024-11-12T09:26/assets/index-CaBThmWm.css">
   </head>
   <body>
     <div id="root"></div>

diff --git a/...ion/src/ext-test/java/org/opentripplanner/ext/restapi/parameter/QualifiedModeSetTest.java b/...ion/src/ext-test/java/org/opentripplanner/ext/restapi/parameter/QualifiedModeSetTest.java
@@ -231,7 +231,7 @@ void carHail() {
   @Test
   void carHailWithTransit() {
     var modeSet = new QualifiedModeSet("CAR_HAIL,BUS,RAIL");
-    assertEquals(Set.of(COACH, BUS, RAIL), Set.copyOf(modeSet.getTransitModes()));
+    assertEquals(Set.of(BUS, RAIL), Set.copyOf(modeSet.getTransitModes()));
 
     assertEquals(WALK, modeSet.getRequestModes().directMode);
     assertEquals(CAR_HAILING, modeSet.getRequestModes().accessMode);

diff --git a/application/src/main/java/org/opentripplanner/api/parameter/ApiRequestMode.java b/application/src/main/java/org/opentripplanner/api/parameter/ApiRequestMode.java
@@ -12,7 +12,8 @@ public enum ApiRequestMode {
   TRAM(TransitMode.TRAM),
   SUBWAY(TransitMode.SUBWAY),
   RAIL(TransitMode.RAIL),
-  BUS(TransitMode.BUS, TransitMode.COACH),
+  BUS(TransitMode.BUS),
+  COACH(TransitMode.COACH),
   FERRY(TransitMode.FERRY),
   CABLE_CAR(TransitMode.CABLE_CAR),
   GONDOLA(TransitMode.GONDOLA),

diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/AlertImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/AlertImpl.java
@@ -23,6 +23,7 @@
 import org.opentripplanner.apis.gtfs.model.StopOnRouteModel;
 import org.opentripplanner.apis.gtfs.model.StopOnTripModel;
 import org.opentripplanner.apis.gtfs.model.UnknownModel;
+import org.opentripplanner.framework.graphql.GraphQLUtils;
 import org.opentripplanner.framework.i18n.I18NString;
 import org.opentripplanner.framework.i18n.TranslatedString;
 import org.opentripplanner.routing.alertpatch.EntitySelector;
@@ -65,11 +66,11 @@ public DataFetcher<GraphQLTypes.GraphQLAlertCauseType> alertCause() {
   public DataFetcher<String> alertDescriptionText() {
     return environment -> {
       var alert = getSource(environment);
-      return alert
-        .descriptionText()
-        .or(alert::headerText)
-        .map(t -> t.toString(environment.getLocale()))
-        .orElse(FALLBACK_EMPTY_STRING);
+      var descriptionText = GraphQLUtils.getTranslation(
+        alert.descriptionText().or(alert::headerText).orElse(null),
+        environment
+      );
+      return descriptionText != null ? descriptionText : FALLBACK_EMPTY_STRING;
     };
   }
 
@@ -103,11 +104,11 @@ public DataFetcher<Integer> alertHash() {
   public DataFetcher<String> alertHeaderText() {
     return environment -> {
       var alert = getSource(environment);
-      return alert
-        .headerText()
-        .or(alert::descriptionText)
-        .map(h -> h.toString(environment.getLocale()))
-        .orElse(FALLBACK_EMPTY_STRING);
+      var headerText = GraphQLUtils.getTranslation(
+        alert.headerText().or(alert::descriptionText).orElse(null),
+        environment
+      );
+      return headerText != null ? headerText : FALLBACK_EMPTY_STRING;
     };
   }
 
@@ -125,7 +126,7 @@ public DataFetcher<GraphQLAlertSeverityLevelType> alertSeverityLevel() {
   @Override
   public DataFetcher<String> alertUrl() {
     return environment ->
-      getSource(environment).url().map(u -> u.toString(environment.getLocale())).orElse(null);
+      GraphQLUtils.getTranslation(getSource(environment).url().orElse(null), environment);
   }
 
   @Override