Merge branch 'master' into master

davidgamez · web-flow · commit 97cbf910690d · 2026-02-13T13:05:25.000-05:00
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: gradle/actions/wrapper-validation@v4
   test:
     needs: [ validate_gradle_wrapper ]
     runs-on: ubuntu-latest
@@ -33,9 +33,11 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
           restore-keys: ${{ runner.os }}-gradle
       - name: Run Java tests
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: testAggregateTestReport
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Generate aggregate test report
+        run: ./gradlew testAggregateTestReport
+
       - name: Persist aggregated test reports on failure
         if: ${{ failure() }}
         uses: actions/upload-artifact@v4
diff --git a/.github/workflows/end_to_end.yml b/.github/workflows/end_to_end.yml
@@ -43,7 +43,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: gradle/actions/wrapper-validation@v4
   pack-snapshot:
     needs: validate_gradle_wrapper
     runs-on: ubuntu-latest
@@ -61,9 +61,11 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
           restore-keys: ${{ runner.os }}-gradle
       - name: Package cli app jar with Gradle
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: shadowJar
+        uses: gradle/actions/setup-gradle@v3
+        
+      - name: Builds ShadowJar
+        run: ./gradlew shadowJar
+
       - name: Persist gtfs-validator snapshot jar
         uses: actions/upload-artifact@v4
         with:
diff --git a/.github/workflows/package_installers.yml b/.github/workflows/package_installers.yml
@@ -35,7 +35,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: gradle/wrapper-validation-action@v2
+      - uses: gradle/actions/wrapper-validation@v4
 
   build_push:
     needs: [ validate_gradle_wrapper ]
@@ -81,11 +81,9 @@ jobs:
           security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "${MACOS_CI_KEYCHAIN_PWD}" build.keychain
 
       - name: "Package GUI app installer with Gradle"
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          arguments: |
-            jpackage
-            -Psign-app=${{github.event_name == 'push' || github.event_name == 'release'}}
+        uses: gradle/actions/setup-gradle@v4
+      - name: Run Gradle GUI packaging command on push or release
+        run: ./gradlew jpackage -Psign-app=${{github.event_name == 'push' || github.event_name == 'release'}}
 
       # On MacOS, we now submit the app for "notarization", where Apple will scan the app for
       # malware and other issues.  This step can take a few minutes or more; the action will wait
@@ -142,9 +140,10 @@ jobs:
 
       - name: Package cli and gui app jars with Gradle
         if: ${{ matrix.os == 'ubuntu-latest' }}
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          arguments: shadowJar
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Produce shadowJar
+        run: ./gradlew shadowJar
 
       - name: Persist cli app jar
         if: ${{ matrix.os == 'ubuntu-latest' }}
diff --git a/.github/workflows/test_pack_doc.yml b/.github/workflows/test_pack_doc.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: gradle/actions/wrapper-validation@v4
   test:
     needs: [ validate_gradle_wrapper ]
     runs-on: ${{ matrix.os }}
@@ -35,9 +35,10 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
           restore-keys: ${{ runner.os }}-gradle
       - name: Run tests on Java ${{ matrix.java_version }} and ${{ matrix.os }}
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: testAggregateTestReport --continue
+        uses: gradle/actions/setup-gradle@v4
+      - name: Continue on test report
+        run: ./gradlew testAggregateTestReport --continue
+
       - name: Persist aggregated test reports on failure - Java ${{ matrix.java_version }} on ${{ matrix.os }}
         if: ${{ failure() }}
         uses: actions/upload-artifact@v4
@@ -66,9 +67,10 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
           restore-keys: ${{ runner.os }}-gradle
       - name: Package cli app jar with Gradle
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: shadowJar
+        uses: gradle/actions/setup-gradle@v4
+      - name: Produce shadowJar
+        run: ./gradlew shadowJar
+
       - name: Persist cli app jar
         uses: actions/upload-artifact@v4
         with:
@@ -95,10 +97,10 @@ jobs:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
           restore-keys: ${{ runner.os }}-gradle
+      - name: Setup Javadoc build
+        uses: gradle/actions/setup-gradle@v4
       - name: Build Javadoc
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: aggregateJavadoc
+        run: ./gradlew aggregateJavadoc
       - name: Persist javadoc
         uses: actions/upload-artifact@v4
         with:
diff --git a/build.gradle b/build.gradle
@@ -123,7 +123,7 @@ subprojects {
                             }
                         } else {
                             // For releases, the publish task does not upload to MavenCentral.
-                            // It just the artifacts directory hierarchy on the local disk,
+                            // It just creates the artifacts directory hierarchy on the local disk,
                             // The actual zipping and uploading is done in the publishToMavenCentral task.
                             url = "${buildDir}/local-repo"
                         }
@@ -195,7 +195,7 @@ subprojects {
             }
 
             tasks.register('publishToSnapshotRepository') {
-                // We want to do call the publish task only if the version is a snapshot.
+                // We want to call the publish task only if the version is a snapshot.
                 // Without this conditional, with a release it would do the publish first, then throw the Exception below.
                 // But since the dependsOn is within the conditional, the dependency is not created for release versions
                 // so the publish in that case is never executed.
diff --git a/docs/NEW_RULES.md b/docs/NEW_RULES.md
@@ -143,10 +143,6 @@ Values for `csvRowNumber` and `tripId` will be different for each generated noti
 
 ### c. Implement the validation rule logic (`FileValidator`)
 
-<!--suppress ALL -->
-
-<a name="examples"/>
-
 Here's the fun part - writing the rule. Because this rule `...extends FileValidator`, we need to define what GTFS files we want - in this case the `trips.txt` and `stop_times.txt` tables.
 
 We do that by declaring the two variables at the top of the class `GtfsTripTableContainer tripTable` and `GtfsStopTimeTableContainer stopTimeTable` (similar `...TableContainer` classes exist for all GTFS files).
diff --git a/main/src/main/java/org/mobilitydata/gtfsvalidator/table/GtfsAgencySchema.java b/main/src/main/java/org/mobilitydata/gtfsvalidator/table/GtfsAgencySchema.java
@@ -49,4 +49,6 @@ public interface GtfsAgencySchema extends GtfsEntity {
 
   @FieldType(FieldTypeEnum.EMAIL)
   String agencyEmail();
+
+  GtfsCemvSupport cemvSupport();
 }
diff --git a/main/src/main/java/org/mobilitydata/gtfsvalidator/table/GtfsCarsAllowedEnum.java b/main/src/main/java/org/mobilitydata/gtfsvalidator/table/GtfsCarsAllowedEnum.java
@@ -0,0 +1,15 @@
+package org.mobilitydata.gtfsvalidator.table;
+
+import org.mobilitydata.gtfsvalidator.annotation.GtfsEnumValue;
+
+/**
+ * Enum representing the cars_allowed field values.
+ *
+ * <p>0 or empty: No information available about car access for trips associated with this agency or
+ * route. 1: Cars are allowed for trips associated with this agency or route. 2: Cars are not
+ * allowed for trips associated with this agency or route.
+ */
+@GtfsEnumValue(name = "NO_INFORMATION", value = 0)
+@GtfsEnumValue(name = "ALLOWED", value = 1)
+@GtfsEnumValue(name = "NOT_ALLOWED", value = 2)
+public interface GtfsCarsAllowedEnum {}
diff --git a/main/src/main/java/org/mobilitydata/gtfsvalidator/table/GtfsCemvSupportEnum.java b/main/src/main/java/org/mobilitydata/gtfsvalidator/table/GtfsCemvSupportEnum.java
@@ -0,0 +1,15 @@
+package org.mobilitydata.gtfsvalidator.table;
+
+import org.mobilitydata.gtfsvalidator.annotation.GtfsEnumValue;
+
+/**
+ * Enum representing the cemv_support field values.
+ *
+ * <p>0 or empty: No cEMV information available for trips associated with this agency or route. 1:
+ * Riders may use cEMVs as fare media for trips associated with this agency or route. 2: cEMVs are
+ * not supported as fare media for trips associated with this agency or route.
+ */
+@GtfsEnumValue(name = "NO_INFORMATION", value = 0)
+@GtfsEnumValue(name = "SUPPORTED", value = 1)
+@GtfsEnumValue(name = "NOT_SUPPORTED", value = 2)
+public interface GtfsCemvSupportEnum {}
diff --git a/main/src/main/java/org/mobilitydata/gtfsvalidator/table/GtfsRouteSchema.java b/main/src/main/java/org/mobilitydata/gtfsvalidator/table/GtfsRouteSchema.java
@@ -69,4 +69,6 @@ public interface GtfsRouteSchema extends GtfsEntity {
   @Index
   @ConditionallyRequired
   String networkId();
+
+  GtfsCemvSupport cemvSupport();
 }
diff --git a/main/src/main/java/org/mobilitydata/gtfsvalidator/table/GtfsStopAccessEnum.java b/main/src/main/java/org/mobilitydata/gtfsvalidator/table/GtfsStopAccessEnum.java
@@ -0,0 +1,7 @@
+package org.mobilitydata.gtfsvalidator.table;
+
+import org.mobilitydata.gtfsvalidator.annotation.GtfsEnumValue;
+
+@GtfsEnumValue(name = "ACCESSIBLE_VIA_PATHWAYS", value = 0)
+@GtfsEnumValue(name = "NOT_ACCESSIBLE_VIA_PATHWAYS", value = 1)
+public interface GtfsStopAccessEnum {}
diff --git a/main/src/main/java/org/mobilitydata/gtfsvalidator/table/GtfsStopSchema.java b/main/src/main/java/org/mobilitydata/gtfsvalidator/table/GtfsStopSchema.java
@@ -71,4 +71,6 @@ public interface GtfsStopSchema extends GtfsEntity {
   String levelId();
 
   String platformCode();
+
+  GtfsStopAccess stopAccess();
 }
diff --git a/main/src/main/java/org/mobilitydata/gtfsvalidator/table/GtfsTripSchema.java b/main/src/main/java/org/mobilitydata/gtfsvalidator/table/GtfsTripSchema.java
@@ -58,4 +58,6 @@ public interface GtfsTripSchema extends GtfsEntity {
   GtfsWheelchairBoarding wheelchairAccessible();
 
   GtfsBikesAllowed bikesAllowed();
+
+  GtfsCarsAllowed carsAllowed();
 }
diff --git a/main/src/main/java/org/mobilitydata/gtfsvalidator/validator/OverlappingFrequencyValidator.java b/main/src/main/java/org/mobilitydata/gtfsvalidator/validator/OverlappingFrequencyValidator.java
@@ -68,7 +68,8 @@ public void validate(NoticeContainer noticeContainer) {
    * Trip frequencies overlap.
    *
    * <p>Trip frequencies must not overlap in time. Two entries X and Y are considered to directly
-   * overlap if `X.start_time &lt;= Y.start_time` and `Y.start_time &lt; X.end_time`.
+   * overlap if X.start_time is less than or equal to Y.start_time and Y.start_time is less than
+   * X.end_time.
    */
   @GtfsValidationNotice(severity = ERROR, files = @FileRefs(GtfsFrequencySchema.class))
   static class OverlappingFrequencyNotice extends ValidationNotice {
diff --git a/main/src/main/java/org/mobilitydata/gtfsvalidator/validator/StopAccessValidator.java b/main/src/main/java/org/mobilitydata/gtfsvalidator/validator/StopAccessValidator.java
@@ -0,0 +1,133 @@
+package org.mobilitydata.gtfsvalidator.validator;
+
+import static org.mobilitydata.gtfsvalidator.notice.SeverityLevel.ERROR;
+
+import org.mobilitydata.gtfsvalidator.annotation.GtfsValidationNotice;
+import org.mobilitydata.gtfsvalidator.annotation.GtfsValidator;
+import org.mobilitydata.gtfsvalidator.notice.NoticeContainer;
+import org.mobilitydata.gtfsvalidator.notice.ValidationNotice;
+import org.mobilitydata.gtfsvalidator.table.GtfsLocationType;
+import org.mobilitydata.gtfsvalidator.table.GtfsStop;
+import org.mobilitydata.gtfsvalidator.table.GtfsStopAccess;
+import org.mobilitydata.gtfsvalidator.table.GtfsStopSchema;
+
+/**
+ * Validates {@code stops.stop_access} for a single {@code GtfsStop}.
+ *
+ * <p>Generated notices:
+ *
+ * <ul>
+ *   <li>{@link StopAccessSpecifiedForStopWithNoParentStationNotice}
+ *   <li>{@link StopAccessSpecifiedForIncorrectLocationNotice}
+ * </ul>
+ */
+@GtfsValidator
+public class StopAccessValidator extends SingleEntityValidator<GtfsStop> {
+  @Override
+  public void validate(GtfsStop entity, NoticeContainer noticeContainer) {
+    if (entity.stopAccess() == null) {
+      return;
+    }
+    if (entity.locationType() == GtfsLocationType.STOP) {
+      if (!entity.hasParentStation()) {
+        noticeContainer.addValidationNotice(
+            new StopAccessSpecifiedForStopWithNoParentStationNotice(
+                entity.csvRowNumber(),
+                entity.stopId(),
+                entity.stopName(),
+                entity.stopAccess(),
+                entity.locationType()));
+      }
+    } else {
+      noticeContainer.addValidationNotice(
+          new StopAccessSpecifiedForIncorrectLocationNotice(
+              entity.csvRowNumber(),
+              entity.stopId(),
+              entity.stopName(),
+              entity.stopAccess(),
+              entity.locationType()));
+    }
+  }
+
+  @Override
+  public boolean shouldCallValidate(ColumnInspector header) {
+    return header.hasColumn(GtfsStop.STOP_ACCESS_FIELD_NAME);
+  }
+
+  /**
+   * A stop without a value for parent station has stop_access specified.
+   *
+   * <p>stops.stop_access is forbidden for stops that are not associated with a parent station.
+   */
+  @GtfsValidationNotice(
+      severity = ERROR,
+      files = @GtfsValidationNotice.FileRefs(GtfsStopSchema.class))
+  static class StopAccessSpecifiedForStopWithNoParentStationNotice extends ValidationNotice {
+    /** The row of the faulty record. */
+    private final long csvRowNumber;
+
+    /** The `stops.stop_id` of the faulty record. */
+    private final String stopId;
+
+    /** The 'stops.stop_name' of the faulty record. */
+    private final String stopName;
+
+    /** The `stops.stop_access` of the faulty record. */
+    private final GtfsStopAccess stopAccess;
+
+    /** `stops.location_type` of the faulty record. */
+    private final GtfsLocationType locationType;
+
+    public StopAccessSpecifiedForStopWithNoParentStationNotice(
+        long csvRowNumber,
+        String stopId,
+        String stopName,
+        GtfsStopAccess stopAccess,
+        GtfsLocationType locationType) {
+      this.csvRowNumber = csvRowNumber;
+      this.stopId = stopId;
+      this.stopName = stopName;
+      this.stopAccess = stopAccess;
+      this.locationType = locationType;
+    }
+  }
+
+  /**
+   * A location that is not a stop has stop_access specified.
+   *
+   * <p>Stops.stop_access is forbidden for locations that are stations, entrances, generic nodes or
+   * boarding areas. It can only be specific when a stop is associated with a parent station.
+   */
+  @GtfsValidationNotice(
+      severity = ERROR,
+      files = @GtfsValidationNotice.FileRefs(GtfsStopSchema.class))
+  static class StopAccessSpecifiedForIncorrectLocationNotice extends ValidationNotice {
+    /** The row of the faulty record. */
+    private final long csvRowNumber;
+
+    /** The `stops.stop_id` of the faulty record. */
+    private final String stopId;
+
+    /** The 'stops.stop_name' of the faulty record. */
+    private final String stopName;
+
+    /** The `stops.stop_access` of the faulty record. */
+    private final GtfsStopAccess stopAccess;
+
+    /** `stops.location_type` of the faulty record. */
+    private final GtfsLocationType locationType;
+
+    public StopAccessSpecifiedForIncorrectLocationNotice(
+        long csvRowNumber,
+        String stopId,
+        String stopName,
+        GtfsStopAccess stopAccess,
+        GtfsLocationType locationType) {
+      this.csvRowNumber = csvRowNumber;
+      this.stopId = stopId;
+      this.stopName = stopName;
+      this.stopAccess = stopAccess;
+      this.locationType = locationType;
+    }
+  }
+}
diff --git a/main/src/main/java/org/mobilitydata/gtfsvalidator/validator/TimeframeOverlapValidator.java b/main/src/main/java/org/mobilitydata/gtfsvalidator/validator/TimeframeOverlapValidator.java
@@ -78,8 +78,8 @@ static TimeframeKey create(GtfsTimeframe timeframe) {
    * overlapping time intervals.
    *
    * <p>Timeframes with the same group and service dates must not overlap in time. Two entries X and
-   * Y are considered to directly overlap if `X.start_time &lt;= Y.start_time` and `Y.start_time
-   * &lt; X.end_time`.
+   * Y are considered to directly overlap if X.start_time is less than or equal to Y.start_time and
+   * Y.start_time is less than X.end_time.
    */
   @GtfsValidationNotice(severity = ERROR, files = @FileRefs(GtfsFrequencySchema.class))
   static class TimeframeOverlapNotice extends ValidationNotice {
diff --git a/main/src/test/java/org/mobilitydata/gtfsvalidator/validator/NoticeFieldsTest.java b/main/src/test/java/org/mobilitydata/gtfsvalidator/validator/NoticeFieldsTest.java
@@ -230,7 +230,8 @@ public void testNoticeClassFieldNames() {
             "fareProductId",
             "riderCategoryId1",
             "riderCategoryId2",
-            "currencyCode");
+            "currencyCode",
+            "stopAccess");
   }
 
   private static List<String> discoverValidationNoticeFieldNames() {
diff --git a/main/src/test/java/org/mobilitydata/gtfsvalidator/validator/StopAccessValidatorTest.java b/main/src/test/java/org/mobilitydata/gtfsvalidator/validator/StopAccessValidatorTest.java
diff --git a/scripts/mobility-database-harvester/acceptance_test_feed_list.csv b/scripts/mobility-database-harvester/acceptance_test_feed_list.csv
diff --git a/scripts/mobility-database-harvester/harvest_latest_versions.py b/scripts/mobility-database-harvester/harvest_latest_versions.py

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ subprojects {`
`123`	`123`	`}`
`124`	`124`	`} else {`
`125`	`125`	`// For releases, the publish task does not upload to MavenCentral.`
`126`		`- // It just the artifacts directory hierarchy on the local disk,`
	`126`	`+ // It just creates the artifacts directory hierarchy on the local disk,`
`127`	`127`	`// The actual zipping and uploading is done in the publishToMavenCentral task.`
`128`	`128`	`url = "${buildDir}/local-repo"`
`129`	`129`	`}`
`@@ -195,7 +195,7 @@ subprojects {`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`tasks.register('publishToSnapshotRepository') {`
`198`		`- // We want to do call the publish task only if the version is a snapshot.`
	`198`	`+ // We want to call the publish task only if the version is a snapshot.`
`199`	`199`	`// Without this conditional, with a release it would do the publish first, then throw the Exception below.`
`200`	`200`	`// But since the dependsOn is within the conditional, the dependency is not created for release versions`
`201`	`201`	`// so the publish in that case is never executed.`
Original file line number	Diff line number	Diff line change
`@@ -49,4 +49,6 @@ public interface GtfsAgencySchema extends GtfsEntity {`
`49`	`49`
`50`	`50`	`@FieldType(FieldTypeEnum.EMAIL)`
`51`	`51`	`String agencyEmail();`
	`52`	`+`
	`53`	`+ GtfsCemvSupport cemvSupport();`
`52`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,4 +69,6 @@ public interface GtfsRouteSchema extends GtfsEntity {`
`69`	`69`	`@Index`
`70`	`70`	`@ConditionallyRequired`
`71`	`71`	`String networkId();`
	`72`	`+`
	`73`	`+ GtfsCemvSupport cemvSupport();`
`72`	`74`	`}`