AB#49889: Add environment variable excludeMetroTrips

Author: thjarvin

src/main/java/fi/hsl/transitdata/pulsarpubtransconnect/PubtransTableHandler.java

@@ -24,12 +24,14 @@ public abstract class PubtransTableHandler {
     final TransitdataProperties.ProtobufSchema schema;
     private Jedis jedis;
     private final String timeZone;
+    private final boolean excludeMetroTrips;
 
     public PubtransTableHandler(PulsarApplicationContext context, TransitdataProperties.ProtobufSchema handlerSchema) {
         lastModifiedTimeStamp = (System.currentTimeMillis() - 5000);
         jedis = context.getJedis();
         producer = context.getSingleProducer();
         timeZone = context.getConfig().getString("pubtrans.timezone");
+        excludeMetroTrips = context.getConfig().getBoolean("pubtrans.excludeMetroTrips");
         schema = handlerSchema;
     }
 
@@ -94,7 +96,7 @@ public Collection<TypedMessageBuilder<byte[]>> handleResultSet(ResultSet resultS
             } else {
                 PubtransTableProtos.DOITripInfo tripInfo = maybeTripInfo.get();
 
-                if (tripInfo.getRouteId().startsWith("31M")) {
+                if (excludeMetroTrips && tripInfo.getRouteId().startsWith("31M")) {
                     metroTripCount++;
                     metroRouteIds.add(tripInfo.getRouteId());
                 } else {

src/main/resources/arrival.conf

@@ -37,4 +37,6 @@ application {
   enableCacheTimestampCheck=${?ENABLE_CACHE_TIMESTAMP_CHECK}
   cacheMaxAgeInMinutes=180
   cacheMaxAgeInMinutes=${?CACHE_MAX_AGE_IN_MINS}
+  excludeMetroTrips=true
+  excludeMetroTrips=${?EXCLUDE_METRO_TRIPS}
 }

src/main/resources/departure.conf

@@ -37,4 +37,6 @@ application {
   enableCacheTimestampCheck=${?ENABLE_CACHE_TIMESTAMP_CHECK}
   cacheMaxAgeInMinutes=180
   cacheMaxAgeInMinutes=${?CACHE_MAX_AGE_IN_MINS}
+  excludeMetroTrips=true
+  excludeMetroTrips=${?EXCLUDE_METRO_TRIPS}
 }