Remove branding_url from Agency and Route, route_bikes_allowed from Route

.github/workflows/ci.yml

@@ -16,6 +16,7 @@ jobs:
 
     env:
       LANG: ${{ matrix.locale }}
+      MAVEN_ARGS: "--no-transfer-progress -Dstyle.color=always"
 
     steps:
     - uses: actions/checkout@v4
@@ -42,7 +43,8 @@ jobs:
         cache: 'maven'
 
     - name: Test project with Maven
-      run: mvn --no-transfer-progress test package
+      run: |
+        mvn $MAVEN_ARGS test package
 
   cli-integration-tests:
 

onebusaway-gtfs/src/main/java/org/onebusaway/gtfs/model/Agency.java

@@ -47,9 +47,6 @@ public final class Agency extends IdentityBean<String> {
   @CsvField(optional = true)
   private String email;
 
-  @CsvField(optional = true)
-  private String brandingUrl;
-
   public Agency() {
 
   }
@@ -61,7 +58,6 @@ public Agency(Agency a) {
     this.timezone = a.timezone;
     this.lang = a.lang;
     this.phone = a.phone;
-    this.brandingUrl = a.brandingUrl;
     this.email = a.email;
     this.fareUrl = a.fareUrl;
   }
@@ -130,14 +126,6 @@ public void setEmail(String email) {
 	this.email = email;
   }
 
-  public String getBrandingUrl() {
-    return brandingUrl;
-  }
-
-  public void setBrandingUrl(String brandingUrl) {
-    this.brandingUrl = brandingUrl;
-  }
-
   public String toString() {
     return "<Agency " + this.id + ">";
   }

onebusaway-gtfs/src/main/java/org/onebusaway/gtfs/model/Route.java

@@ -58,10 +58,6 @@ public final class Route extends IdentityBean<AgencyAndId> {
 
   @CsvField(name = "eligibility_restricted", optional = true, defaultValue = "-999")
   private int eligibilityRestricted = MISSING_VALUE;
-
-  @Deprecated
-  @CsvField(name="route_bikes_allowed", optional = true, defaultValue = "0")
-  private int routeBikesAllowed = 0;
 
   /**
    * 0 = unknown / unspecified, 1 = bikes allowed, 2 = bikes NOT allowed
@@ -72,9 +68,6 @@ public final class Route extends IdentityBean<AgencyAndId> {
   @CsvField(optional = true)
   private int sortOrder = MISSING_VALUE;
 
-  @CsvField(optional = true)
-  private String brandingUrl;
-
   // Custom extension representing (bus) route accepts regional fare card.
   // That is it has a vending machine on board.
   @CsvField(optional = true, name = "regional_fare_card", defaultValue = "0")
@@ -96,7 +89,6 @@ public Route(Route r) {
     this.textColor = r.textColor;
     this.bikesAllowed = r.bikesAllowed;
     this.sortOrder = r.sortOrder;
-    this.brandingUrl = r.brandingUrl;
     this.eligibilityRestricted = r.eligibilityRestricted;
     this.regionalFareCardAccepted = r.regionalFareCardAccepted;
   }
@@ -172,16 +164,6 @@ public String getTextColor() {
   public void setTextColor(String textColor) {
     this.textColor = textColor;
   }
-
-  @Deprecated
-  public int getRouteBikesAllowed() {
-    return routeBikesAllowed;
-  }
-
-  @Deprecated
-  public void setRouteBikesAllowed(int routeBikesAllowed) {
-    this.routeBikesAllowed = routeBikesAllowed;
-  }
 
   /**
    * @return 0 = unknown / unspecified, 1 = bikes allowed, 2 = bikes NOT allowed
@@ -210,14 +192,6 @@ public void setSortOrder(int sortOrder) {
     this.sortOrder = sortOrder;
   }
 
-  public String getBrandingUrl() {
-    return brandingUrl;
-  }
-
-  public void setBrandingUrl(String brandingUrl) {
-    this.brandingUrl = brandingUrl;
-  }
-
   public boolean hasEligibilityRestricted() {
     return eligibilityRestricted != MISSING_VALUE;
   }

onebusaway-gtfs/src/test/java/org/onebusaway/gtfs/serialization/GtfsReaderTest.java

@@ -193,7 +193,6 @@ public void testAllFields() throws IOException {
     assertEquals("route desc", route.getDesc());
     assertEquals("FF0000", route.getColor());
     assertEquals("0000FF", route.getTextColor());
-    assertEquals(1, route.getRouteBikesAllowed());
     assertEquals(2, route.getBikesAllowed());
     assertEquals("http://agency.gov/route", route.getUrl());
     assertEquals(100, route.getSortOrder());

pom.xml

@@ -196,6 +196,16 @@
             <version>1.3.0</version>
           </dependency>
         </dependencies>
+        <configuration>
+          <reportFormat>plain</reportFormat>
+          <consoleOutputReporter>
+            <disable>true</disable>
+          </consoleOutputReporter>
+          <statelessTestsetInfoReporter
+            implementation="org.apache.maven.plugin.surefire.extensions.junit5.JUnit5StatelessTestsetInfoTreeReporter">
+            <theme>UNICODE</theme>
+          </statelessTestsetInfoReporter>
+        </configuration>
       </plugin>
     </plugins>