merge

.github/workflows/ci.yml

@@ -6,7 +6,7 @@ on:
     branches: [ master ]
 
 jobs:
-  test:
+  build:
 
     runs-on: ubuntu-latest
 
@@ -16,15 +16,25 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v1
       with:
-        java-version: 8
+        java-version: 11
 
     - name: Cache Maven dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
           ${{ runner.os }}-maven-
 
     - name: Test project with Maven
-      run: mvn --no-transfer-progress test verify
+      run: mvn --no-transfer-progress test install
+
+    - name: Build documentation
+      run: mvn --no-transfer-progress site
+
+    - name: Deploy documentation to Github Pages
+      # only deploy after merging to master
+      if: github.repository_owner == 'OneBusAway' && github.event_name == 'push' && github.ref == 'refs/heads/master'
+      uses: JamesIves/github-pages-deploy-action@v4
+      with:
+        folder: target/site/

onebusaway-gtfs-hibernate-cli/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.onebusaway</groupId>
     <artifactId>onebusaway-gtfs-modules</artifactId>
-    <version>1.3.112-openmove-8</version>
+    <version>1.4.15-openmove-1</version>
   </parent>
   <artifactId>onebusaway-gtfs-hibernate-cli</artifactId>
   <name>onebusaway-gtfs-hibernate-cli</name>
@@ -28,7 +28,8 @@
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j_version}</version>
     </dependency>
   </dependencies>
 

onebusaway-gtfs-hibernate-cli/src/main/resources/simplelogger.properties

@@ -0,0 +1,25 @@
+# SLF4J's SimpleLogger configuration file
+# Simple implementation of Logger that sends all enabled log messages, for all defined loggers, to System.err.
+# Default logging detail level for all instances of SimpleLogger.
+# Must be one of ("trace", "debug", "info", "warn", or "error").
+# If not specified, defaults to "info".
+org.slf4j.simpleLogger.defaultLogLevel=info
+# Logging detail level for a SimpleLogger instance named "xxxxx".
+# Must be one of ("trace", "debug", "info", "warn", or "error").
+# If not specified, the default logging detail level is used.
+#org.slf4j.simpleLogger.log.xxxxx=
+# Set to true if you want the current date and time to be included in output messages.
+# Default is false, and will output the number of milliseconds elapsed since startup.
+org.slf4j.simpleLogger.showDateTime=true
+# The date and time format to be used in the output messages.
+# The pattern describing the date and time format is the same that is used in java.text.SimpleDateFormat.
+# If the format is not specified or is invalid, the default format is used.
+# The default format is yyyy-MM-dd HH:mm:ss:SSS Z.
+#org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z
+org.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss
+# Set to true if you want to output the current thread name.
+# Defaults to true.
+org.slf4j.simpleLogger.showThreadName=false
+# Set to true if you want the last component of the name to be included in output messages.
+# Defaults to false.
+org.slf4j.simpleLogger.showShortLogName=true

onebusaway-gtfs-hibernate/pom.xml

@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.onebusaway</groupId>
     <artifactId>onebusaway-gtfs-modules</artifactId>
-    <version>1.3.112-openmove-8</version>
+    <version>1.4.15-openmove-1</version>
   </parent>
 
   <dependencies>
@@ -32,9 +32,9 @@
         <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>mysql</groupId>
-      <artifactId>mysql-connector-java</artifactId>
-      <version>5.1.48</version>
+      <groupId>com.mysql</groupId>
+      <artifactId>mysql-connector-j</artifactId>
+      <version>8.2.0</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -43,8 +43,8 @@
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <scope>test</scope>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j_version}</version>
     </dependency>
     <dependency>
       <groupId>com.sun.xml.bind</groupId>

onebusaway-gtfs-hibernate/src/main/java/org/onebusaway/gtfs/impl/HibernateGtfsRelationalDaoImpl.java

@@ -113,6 +113,16 @@ public List<Route> getAllRoutes() {
     return _ops.find("FROM Route route");
   }
 
+  @Override
+  public List<RouteStop> getAllRouteStops() {
+    return _ops.find("FROM RouteStop routeStop");
+  }
+
+  @Override
+  public List<RouteShape> getAllRouteShapes() {
+    return _ops.find("FROM RouteShape routeShape");
+  }
+
   @Override
   public List<Stop> getAllStops() {
     return _ops.find("FROM Stop");
@@ -151,6 +161,17 @@ public Collection<Transfer> getAllTransfers() {
   @Override
   public Collection<Ridership> getAllRiderships() { return _ops.find("FROM Ridership"); }
 
+
+  @Override
+  public Collection<DirectionEntry> getAllDirectionEntries() {
+    return _ops.find("FROM DirectionEntry");
+  }
+
+  @Override
+  public Collection<WrongWayConcurrency> getAllWrongWayConcurrencies() {
+    return _ops.find("FROM WrongWayConcurrency");
+  }
+
   @Override
   public Agency getAgencyForId(String id) {
     return (Agency) _ops.get(Agency.class, id);
@@ -182,8 +203,8 @@ public FareProduct getFareProductForId(AgencyAndId id) {
   }
 
   @Override
-  public Collection<FareContainer> getAllFareContainers() {
-    return _ops.find("FROM FareContainer");
+  public Collection<FareMedium> getAllFareMedia() {
+    return _ops.find("FROM FareMedium");
   }
 
   @Override
@@ -266,6 +287,7 @@ public Collection<Area> getAllAreas() {
     return _ops.find("from Area");
   }
 
+  @Deprecated
   @Override
   public Collection<LocationGroupElement> getAllLocationGroupElements() {
     Collection<LocationGroup> groups = _ops.find("FROM LocationGroup");
@@ -278,11 +300,25 @@ public Collection<LocationGroupElement> getAllLocationGroupElements() {
     })).collect(Collectors.toList());
   }
 
+  @Override
+  public Collection<StopAreaElement> getAllStopAreaElements() {
+    Collection<StopArea> groups = _ops.find("FROM StopArea");
+    return groups.stream().flatMap(group -> group.getLocations().stream().map(stopLocation -> {
+      var stopAreaElement = new StopAreaElement();
+      stopAreaElement.setId(group.getId());
+      stopAreaElement.setStopLocation(stopLocation);
+      return stopAreaElement;
+    })).collect(Collectors.toList());
+  }
+
   @Override
   public Collection<LocationGroup> getAllLocationGroups() {
     return _ops.find("FROM LocationGroup");
   }
-
+  @Override
+  public Collection<StopArea> getAllStopAreas() {
+    return _ops.find("from StopArea");
+  }
   @Override
   public Collection<Location> getAllLocations() {
     return _ops.find("FROM Location");
@@ -299,8 +335,23 @@ public Collection<Translation> getAllTranslations() {
   }
 
   @Override
-  public Collection<StopArea> getAllStopAreas() {
-    return _ops.find("from StopArea");
+  public List<String> getOptionalMetadataFilenames() {
+    return new ArrayList<>();
+  }
+
+  @Override
+  public boolean hasMetadata(String filename) {
+    return false;
+  }
+
+  @Override
+  public String getMetadata(String filename) {
+    return null;
+  }
+
+  @Override
+  public void addMetadata(String filename, String content) {
+
   }
 
   /****

onebusaway-gtfs-hibernate/src/main/resources/org/onebusaway/gtfs/model/GtfsMapping.hibernate.xml

@@ -83,6 +83,8 @@
         <property name="startDate" type="org.onebusaway.gtfs.impl.ServiceDateUserType" length="8"/>
         <property name="endDate" type="org.onebusaway.gtfs.impl.ServiceDateUserType" length="8"/>
         <property name="version" />
+        <property name="contactEmail" />
+        <property name="contactUrl" />
     </class>
 
     <class name="org.onebusaway.gtfs.model.Frequency" table="gtfs_frequencies">
@@ -206,6 +208,7 @@
             <property name="vehicleType" />
             <property name="wheelchairBoarding" />
             <property name="platformCode" />
+            <property name="ttsStopName"/>
             <many-to-one name="level">
                 <column name="level_agencyId" length="50" />
                 <column name="level_id" />

onebusaway-gtfs-hibernate/src/test/resources/simplelogger.properties

@@ -0,0 +1,25 @@
+# SLF4J's SimpleLogger configuration file
+# Simple implementation of Logger that sends all enabled log messages, for all defined loggers, to System.err.
+# Default logging detail level for all instances of SimpleLogger.
+# Must be one of ("trace", "debug", "info", "warn", or "error").
+# If not specified, defaults to "info".
+org.slf4j.simpleLogger.defaultLogLevel=info
+# Logging detail level for a SimpleLogger instance named "xxxxx".
+# Must be one of ("trace", "debug", "info", "warn", or "error").
+# If not specified, the default logging detail level is used.
+#org.slf4j.simpleLogger.log.xxxxx=
+# Set to true if you want the current date and time to be included in output messages.
+# Default is false, and will output the number of milliseconds elapsed since startup.
+org.slf4j.simpleLogger.showDateTime=true
+# The date and time format to be used in the output messages.
+# The pattern describing the date and time format is the same that is used in java.text.SimpleDateFormat.
+# If the format is not specified or is invalid, the default format is used.
+# The default format is yyyy-MM-dd HH:mm:ss:SSS Z.
+#org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z
+org.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss
+# Set to true if you want to output the current thread name.
+# Defaults to true.
+org.slf4j.simpleLogger.showThreadName=false
+# Set to true if you want the last component of the name to be included in output messages.
+# Defaults to false.
+org.slf4j.simpleLogger.showShortLogName=true

onebusaway-gtfs-merge-cli/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>onebusaway-gtfs-modules</artifactId>
     <groupId>org.onebusaway</groupId>
-    <version>1.3.112-openmove-8</version>
+    <version>1.4.15-openmove-1</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>onebusaway-gtfs-merge-cli</artifactId>
@@ -29,7 +29,8 @@
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j_version}</version>
     </dependency>
   </dependencies>
 

onebusaway-gtfs-merge-cli/src/main/resources/simplelogger.properties

@@ -0,0 +1,25 @@
+# SLF4J's SimpleLogger configuration file
+# Simple implementation of Logger that sends all enabled log messages, for all defined loggers, to System.err.
+# Default logging detail level for all instances of SimpleLogger.
+# Must be one of ("trace", "debug", "info", "warn", or "error").
+# If not specified, defaults to "info".
+org.slf4j.simpleLogger.defaultLogLevel=info
+# Logging detail level for a SimpleLogger instance named "xxxxx".
+# Must be one of ("trace", "debug", "info", "warn", or "error").
+# If not specified, the default logging detail level is used.
+#org.slf4j.simpleLogger.log.xxxxx=
+# Set to true if you want the current date and time to be included in output messages.
+# Default is false, and will output the number of milliseconds elapsed since startup.
+org.slf4j.simpleLogger.showDateTime=true
+# The date and time format to be used in the output messages.
+# The pattern describing the date and time format is the same that is used in java.text.SimpleDateFormat.
+# If the format is not specified or is invalid, the default format is used.
+# The default format is yyyy-MM-dd HH:mm:ss:SSS Z.
+#org.slf4j.simpleLogger.dateTimeFormat=yyyy-MM-dd HH:mm:ss:SSS Z
+org.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss
+# Set to true if you want to output the current thread name.
+# Defaults to true.
+org.slf4j.simpleLogger.showThreadName=false
+# Set to true if you want the last component of the name to be included in output messages.
+# Defaults to false.
+org.slf4j.simpleLogger.showShortLogName=true

onebusaway-gtfs-merge/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>onebusaway-gtfs-modules</artifactId>
     <groupId>org.onebusaway</groupId>
-    <version>1.3.112-openmove-8</version>
+    <version>1.4.15-openmove-1</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>onebusaway-gtfs-merge</artifactId>
@@ -24,8 +24,8 @@
 
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <scope>test</scope>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j_version}</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>