Merge branch 'dev-2.x' into graphql-previousLegs

.github/workflows/cibuild.yml

@@ -235,4 +235,6 @@ jobs:
             echo "Maven version ${version_with_snapshot} contains SNAPSHOT, adding date to container image tag"
           fi
           
-          mvn --batch-mode -P prettierSkip compile com.google.cloud.tools:jib-maven-plugin:build -Djib.to.tags=latest,$image_version
+          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

.github/workflows/performance-test.yml

@@ -83,7 +83,7 @@ jobs:
         if: matrix.profile == 'core' || github.ref == 'refs/heads/dev-2.x'
         env:
           MAVEN_OPTS: "-Dmaven.repo.local=/home/lenni/.m2/repository/"
-        run: mvn -DskipTests --batch-mode package -P prettierSkip
+        run: mvn -DskipTests --batch-mode install -P prettierSkip
 
       - name: Build graph
         if: matrix.profile == 'core' || github.ref == 'refs/heads/dev-2.x'
@@ -93,13 +93,12 @@ jobs:
 
       - name: Run speed test
         if: matrix.profile == 'core' || github.ref == 'refs/heads/dev-2.x'
-        working-directory: application
         env:
           PERFORMANCE_INFLUX_DB_PASSWORD: ${{ secrets.PERFORMANCE_INFLUX_DB_PASSWORD }}
           SPEEDTEST_LOCATION: ${{ matrix.location }}
           MAVEN_OPTS: "-Xmx50g -XX:StartFlightRecording=delay=${{ matrix.jfr-delay }},duration=30m,filename=${{ matrix.location}}-speed-test.jfr -Dmaven.repo.local=/home/lenni/.m2/repository/"
         run: |
-          mvn exec:java -Dexec.mainClass="org.opentripplanner.transit.speed_test.SpeedTest" -Dexec.classpathScope=test -Dexec.args="--dir=../test/performance/${{ matrix.location }} -p md -n ${{ matrix.iterations }} -i 3 -0" -P prettierSkip
+          mvn --projects application exec:java -Dexec.mainClass="org.opentripplanner.transit.speed_test.SpeedTest" -Dexec.classpathScope=test -Dexec.args="--dir=test/performance/${{ matrix.location }} -p md -n ${{ matrix.iterations }} -i 3 -0"
 
       - name: Archive travel results file
         if: matrix.profile == 'core' || github.ref == 'refs/heads/dev-2.x'

.github/workflows/prune-container-images.yml

@@ -18,5 +18,5 @@ jobs:
         run: |
           # remove all snapshot container images that have not been pulled for over a year
           # --keep-semver makes sure that any image with a x.y.z version scheme is unaffected by this
-          pip install prune-container-repo==0.0.4 --break-system-packages
+          pip install prune-container-repo==0.0.4
           prune-container-repo -u ${CONTAINER_REGISTRY_USER} -r ${CONTAINER_REPO} --days=365 --keep-semver --activate

application/pom.xml

@@ -12,6 +12,19 @@
     <name>OpenTripPlanner - Application</name>
 
     <dependencies>
+        <!-- project dependencies -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>gtfs-realtime-protobuf</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>otp-utils</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <!-- 3rd party dependencies -->
         <dependency>
             <groupId>net.sf.trove4j</groupId>
             <artifactId>trove4j</artifactId>
@@ -317,7 +330,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents.client5</groupId>
             <artifactId>httpclient5</artifactId>
-            <version>5.4</version>
+            <version>5.4.1</version>
         </dependency>
         <dependency>
             <groupId>commons-cli</groupId>

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/10/2024-10-17T19:27/assets/index-czfEIRbh.js"></script>
-    <link rel="stylesheet" crossorigin href="https://cdn.jsdelivr.net/gh/opentripplanner/debug-client-assets@main/2024/10/2024-10-17T19:27/assets/index-BqgnKsMX.css">
+    <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">
   </head>
   <body>
     <div id="root"></div>

application/src/ext-test/java/org/opentripplanner/ext/flex/FlexStopTimesForTest.java

@@ -3,11 +3,11 @@
 import static org.opentripplanner.model.StopTime.MISSING_VALUE;
 
 import org.opentripplanner._support.geometry.Polygons;
-import org.opentripplanner.framework.time.TimeUtils;
 import org.opentripplanner.model.StopTime;
 import org.opentripplanner.transit.model._data.TimetableRepositoryForTest;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.transit.model.site.StopLocation;
+import org.opentripplanner.utils.time.TimeUtils;
 
 public class FlexStopTimesForTest {
 

application/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java

@@ -6,7 +6,7 @@
 import static org.opentripplanner.ext.flex.template.BoardAlight.ALIGHT_ONLY;
 import static org.opentripplanner.ext.flex.template.BoardAlight.BOARD_AND_ALIGHT;
 import static org.opentripplanner.ext.flex.template.BoardAlight.BOARD_ONLY;
-import static org.opentripplanner.framework.time.TimeUtils.time;
+import static org.opentripplanner.utils.time.TimeUtils.time;
 
 import gnu.trove.set.hash.TIntHashSet;
 import java.time.Duration;

application/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java

@@ -24,7 +24,6 @@
 import org.opentripplanner.framework.application.OTPFeature;
 import org.opentripplanner.framework.geometry.EncodedPolyline;
 import org.opentripplanner.framework.i18n.I18NString;
-import org.opentripplanner.framework.time.ServiceDateUtils;
 import org.opentripplanner.graph_builder.module.ValidateAndInterpolateStopTimesForEachTrip;
 import org.opentripplanner.model.GenericLocation;
 import org.opentripplanner.model.StopTime;
@@ -45,6 +44,7 @@
 import org.opentripplanner.transit.model.site.AreaStop;
 import org.opentripplanner.transit.service.DefaultTransitService;
 import org.opentripplanner.transit.service.TimetableRepository;
+import org.opentripplanner.utils.time.ServiceDateUtils;
 
 /**
  * This tests that the feed for the Cobb County Flex service is processed correctly. This service

application/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java

@@ -17,14 +17,14 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
-import org.opentripplanner.framework.time.DurationUtils;
-import org.opentripplanner.framework.time.TimeUtils;
-import org.opentripplanner.framework.tostring.ToStringBuilder;
 import org.opentripplanner.model.PickDrop;
 import org.opentripplanner.model.StopTime;
 import org.opentripplanner.transit.model._data.TimetableRepositoryForTest;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.transit.model.site.StopLocation;
+import org.opentripplanner.utils.time.DurationUtils;
+import org.opentripplanner.utils.time.TimeUtils;
+import org.opentripplanner.utils.tostring.ToStringBuilder;
 
 class UnscheduledTripTest {
 

application/src/ext-test/java/org/opentripplanner/ext/realtimeresolver/RealtimeResolverTest.java

@@ -3,8 +3,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.opentripplanner.framework.time.TimeUtils.time;
 import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary;
+import static org.opentripplanner.utils.time.TimeUtils.time;
 
 import java.time.LocalDate;
 import java.util.List;

application/src/ext-test/java/org/opentripplanner/ext/vectortiles/VectorTilesConfigDocTest.java

@@ -3,11 +3,11 @@
 import static org.opentripplanner.framework.io.FileUtils.assertFileEquals;
 import static org.opentripplanner.framework.io.FileUtils.readFile;
 import static org.opentripplanner.framework.io.FileUtils.writeFile;
-import static org.opentripplanner.framework.text.MarkdownFormatter.HEADER_4;
 import static org.opentripplanner.generate.doc.framework.DocsTestConstants.TEMPLATE_PATH;
 import static org.opentripplanner.generate.doc.framework.DocsTestConstants.USER_DOC_PATH;
 import static org.opentripplanner.generate.doc.framework.TemplateUtil.replaceSection;
 import static org.opentripplanner.standalone.config.framework.json.JsonSupport.jsonNodeFromPath;
+import static org.opentripplanner.utils.text.MarkdownFormatter.HEADER_4;
 
 import java.io.File;
 import org.junit.jupiter.api.Test;

application/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/RealtimeStopsLayerTest.java

@@ -1,8 +1,8 @@
 package org.opentripplanner.ext.vectortiles.layers.stops;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.opentripplanner.framework.time.TimeUtils.time;
 import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary;
+import static org.opentripplanner.utils.time.TimeUtils.time;
 
 import java.time.ZonedDateTime;
 import java.util.HashMap;

application/src/ext-test/java/org/opentripplanner/ext/vehiclerentalservicedirectory/generatedoc/VehicleRentalServiceDirectoryConfigDocTest.java

@@ -4,13 +4,13 @@
 import static org.opentripplanner.framework.io.FileUtils.assertFileEquals;
 import static org.opentripplanner.framework.io.FileUtils.readFile;
 import static org.opentripplanner.framework.io.FileUtils.writeFile;
-import static org.opentripplanner.framework.text.MarkdownFormatter.HEADER_4;
 import static org.opentripplanner.generate.doc.framework.DocsTestConstants.TEMPLATE_PATH;
 import static org.opentripplanner.generate.doc.framework.DocsTestConstants.USER_DOC_PATH;
 import static org.opentripplanner.generate.doc.framework.TemplateUtil.replaceJsonExample;
 import static org.opentripplanner.generate.doc.framework.TemplateUtil.replaceParametersDetails;
 import static org.opentripplanner.generate.doc.framework.TemplateUtil.replaceParametersTable;
 import static org.opentripplanner.standalone.config.framework.json.JsonSupport.jsonNodeFromResource;
+import static org.opentripplanner.utils.text.MarkdownFormatter.HEADER_4;
 
 import java.io.File;
 import org.junit.jupiter.api.Test;

application/src/ext/java/org/opentripplanner/ext/dataoverlay/api/DataOverlayParameters.java

@@ -6,7 +6,7 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
-import org.opentripplanner.framework.tostring.ToStringBuilder;
+import org.opentripplanner.utils.tostring.ToStringBuilder;
 
 /**
  * The purpose of this class is to hold all parameters and their value in a map. It also contains

application/src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/DataOverlayConfig.java

@@ -2,7 +2,7 @@
 
 import java.io.Serializable;
 import java.util.List;
-import org.opentripplanner.framework.tostring.ToStringBuilder;
+import org.opentripplanner.utils.tostring.ToStringBuilder;
 
 /**
  * POJO class describing expected data-overlay-config.json structure

application/src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/DataOverlayParameterBindings.java

@@ -4,7 +4,7 @@
 import java.util.List;
 import java.util.Optional;
 import org.opentripplanner.ext.dataoverlay.api.ParameterName;
-import org.opentripplanner.framework.tostring.ToStringBuilder;
+import org.opentripplanner.utils.tostring.ToStringBuilder;
 
 public class DataOverlayParameterBindings implements Serializable {
 

application/src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/IndexVariable.java

@@ -1,7 +1,7 @@
 package org.opentripplanner.ext.dataoverlay.configuration;
 
 import java.io.Serializable;
-import org.opentripplanner.framework.tostring.ToStringBuilder;
+import org.opentripplanner.utils.tostring.ToStringBuilder;
 
 /**
  * This class describes the variables for the incoming .nc data file

application/src/ext/java/org/opentripplanner/ext/dataoverlay/configuration/ParameterBinding.java

@@ -3,7 +3,7 @@
 import java.io.Serializable;
 import org.opentripplanner.ext.dataoverlay.api.ParameterName;
 import org.opentripplanner.ext.dataoverlay.routing.Parameter;
-import org.opentripplanner.framework.tostring.ToStringBuilder;
+import org.opentripplanner.utils.tostring.ToStringBuilder;
 
 /**
  * This class describes the expected routing request parameter for the generic data

application/src/ext/java/org/opentripplanner/ext/dataoverlay/routing/Parameter.java

@@ -2,7 +2,7 @@
 
 import org.opentripplanner.ext.dataoverlay.api.ParameterName;
 import org.opentripplanner.ext.dataoverlay.configuration.ParameterBinding;
-import org.opentripplanner.framework.tostring.ToStringBuilder;
+import org.opentripplanner.utils.tostring.ToStringBuilder;
 
 public class Parameter {
 

application/src/ext/java/org/opentripplanner/ext/emissions/Co2EmissionsDataReader.java

@@ -11,10 +11,10 @@
 import java.util.Optional;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
-import org.opentripplanner.framework.lang.Sandbox;
-import org.opentripplanner.framework.lang.StringUtils;
 import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
+import org.opentripplanner.utils.lang.Sandbox;
+import org.opentripplanner.utils.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

application/src/ext/java/org/opentripplanner/ext/emissions/DecorateWithEmission.java

@@ -3,7 +3,6 @@
 import java.util.List;
 import java.util.Optional;
 import org.opentripplanner.ext.flex.FlexibleTransitLeg;
-import org.opentripplanner.framework.lang.Sandbox;
 import org.opentripplanner.framework.model.Grams;
 import org.opentripplanner.model.plan.Emissions;
 import org.opentripplanner.model.plan.Itinerary;
@@ -13,6 +12,7 @@
 import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDecorator;
 import org.opentripplanner.street.search.TraverseMode;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
+import org.opentripplanner.utils.lang.Sandbox;
 
 /**
  * Calculates the emissions for the itineraries and adds them.

application/src/ext/java/org/opentripplanner/ext/emissions/DefaultEmissionsService.java

@@ -2,10 +2,10 @@
 
 import jakarta.inject.Inject;
 import java.util.Optional;
-import org.opentripplanner.framework.lang.Sandbox;
 import org.opentripplanner.framework.model.Grams;
 import org.opentripplanner.model.plan.Emissions;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
+import org.opentripplanner.utils.lang.Sandbox;
 
 @Sandbox
 public class DefaultEmissionsService implements EmissionsService {

application/src/ext/java/org/opentripplanner/ext/emissions/EmissionsService.java

@@ -1,9 +1,9 @@
 package org.opentripplanner.ext.emissions;
 
 import java.util.Optional;
-import org.opentripplanner.framework.lang.Sandbox;
 import org.opentripplanner.model.plan.Emissions;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
+import org.opentripplanner.utils.lang.Sandbox;
 
 /**
  * A service for getting emissions information for routes.

application/src/ext/java/org/opentripplanner/ext/fares/FaresToItineraryMapper.java

@@ -1,9 +1,9 @@
 package org.opentripplanner.ext.fares;
 
-import org.opentripplanner.framework.collection.ListUtils;
 import org.opentripplanner.model.fare.FareProductUse;
 import org.opentripplanner.model.fare.ItineraryFares;
 import org.opentripplanner.model.plan.Itinerary;
+import org.opentripplanner.utils.collection.ListUtils;
 
 /**
  * Takes fares and applies them to the legs of an itinerary.

application/src/ext/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedTransitLeg.java

@@ -7,7 +7,6 @@
 import java.util.Set;
 import javax.annotation.Nullable;
 import org.locationtech.jts.geom.LineString;
-import org.opentripplanner.framework.collection.ListUtils;
 import org.opentripplanner.model.fare.FareProductUse;
 import org.opentripplanner.model.plan.Leg;
 import org.opentripplanner.model.plan.LegTime;
@@ -19,6 +18,7 @@
 import org.opentripplanner.transit.model.organization.Agency;
 import org.opentripplanner.transit.model.site.FareZone;
 import org.opentripplanner.transit.model.timetable.Trip;
+import org.opentripplanner.utils.collection.ListUtils;
 
 /**
  * This is a fake leg that combines two interlined legs for the purpose of fare calculation.

application/src/ext/java/org/opentripplanner/ext/fares/model/Distance.java

@@ -1,6 +1,6 @@
 package org.opentripplanner.ext.fares.model;
 
-import org.opentripplanner.framework.tostring.ValueObjectToStringBuilder;
+import org.opentripplanner.utils.tostring.ValueObjectToStringBuilder;
 
 public class Distance {
 

application/src/ext/java/org/opentripplanner/ext/fares/model/FareRule.java

@@ -2,9 +2,9 @@
 package org.opentripplanner.ext.fares.model;
 
 import java.io.Serializable;
-import org.opentripplanner.framework.tostring.ToStringBuilder;
 import org.opentripplanner.transit.model.framework.AbstractTransitEntity;
 import org.opentripplanner.transit.model.network.Route;
+import org.opentripplanner.utils.tostring.ToStringBuilder;
 
 public final class FareRule implements Serializable {
 

application/src/ext/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapper.java

@@ -6,13 +6,13 @@
 import java.util.stream.Stream;
 import org.locationtech.jts.geom.Point;
 import org.opentripplanner.framework.geometry.GeometryUtils;
-import org.opentripplanner.framework.logging.ProgressTracker;
 import org.opentripplanner.graph_builder.model.GraphBuilderModule;
 import org.opentripplanner.routing.graph.Graph;
 import org.opentripplanner.routing.graph.index.StreetIndex;
 import org.opentripplanner.street.model.vertex.StreetVertex;
 import org.opentripplanner.transit.model.site.AreaStop;
 import org.opentripplanner.transit.service.TimetableRepository;
+import org.opentripplanner.utils.logging.ProgressTracker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

application/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java

@@ -4,10 +4,10 @@
 
 import java.util.Objects;
 import org.opentripplanner.ext.flex.trip.FlexTrip;
-import org.opentripplanner.framework.tostring.ToStringBuilder;
 import org.opentripplanner.street.search.state.State;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfo;
+import org.opentripplanner.utils.tostring.ToStringBuilder;
 
 public final class FlexAccessEgress {
 

application/src/ext/java/org/opentripplanner/ext/flex/FlexPathDurations.java

@@ -1,6 +1,6 @@
 package org.opentripplanner.ext.flex;
 
-import org.opentripplanner.framework.time.DurationUtils;
+import org.opentripplanner.utils.time.DurationUtils;
 
 /**
  * This value-object contains the durations for a Flex access or egress path. The path may also

application/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java

@@ -20,7 +20,6 @@
 import org.opentripplanner.ext.flex.template.FlexServiceDate;
 import org.opentripplanner.ext.flex.trip.FlexTrip;
 import org.opentripplanner.framework.application.OTPRequestTimeoutException;
-import org.opentripplanner.framework.time.ServiceDateUtils;
 import org.opentripplanner.model.PathTransfer;
 import org.opentripplanner.model.plan.Itinerary;
 import org.opentripplanner.routing.algorithm.mapping.GraphPathToItineraryMapper;
@@ -31,6 +30,7 @@
 import org.opentripplanner.transit.model.site.StopLocation;
 import org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfo;
 import org.opentripplanner.transit.service.TransitService;
+import org.opentripplanner.utils.time.ServiceDateUtils;
 
 public class FlexRouter {