Merge remote-tracking branch 'upstream/dev-2.x' into update-mqtt-lib

Author: jessicaKoehnke

application/pom.xml

@@ -334,7 +334,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents.client5</groupId>
             <artifactId>httpclient5</artifactId>
-            <version>5.4.4</version>
+            <version>5.5.1</version>
         </dependency>
         <dependency>
             <groupId>commons-cli</groupId>
@@ -370,7 +370,7 @@
         <dependency>
             <groupId>com.azure</groupId>
             <artifactId>azure-messaging-servicebus</artifactId>
-            <version>7.17.14</version>
+            <version>7.17.15</version>
         </dependency>
         <dependency>
             <groupId>com.azure</groupId>

application/src/ext-test/java/org/opentripplanner/ext/fares/model/FareProductTest.java

@@ -2,7 +2,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import java.time.Duration;
 import java.time.OffsetDateTime;
 import java.time.ZonedDateTime;
 import java.util.stream.Stream;

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

@@ -163,8 +163,8 @@ void flexDirect() {
 
     // walk, flex
     assertEquals(2, itin.legs().size());
-    assertEquals("2021-12-02T12:52:54-05:00[America/New_York]", itin.startTime().toString());
-    assertEquals(3203, itin.generalizedCost());
+    assertEquals("2021-12-02T12:52:56-05:00[America/New_York]", itin.startTime().toString());
+    assertEquals(3200, itin.generalizedCost());
 
     var walkToFlex = itin.streetLeg(0);
     assertEquals(WALK, walkToFlex.getMode());

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

@@ -42,7 +42,7 @@ public static TestOtpModel cobbOsm() {
 
   private static TestOtpModel buildFlexGraph(File file) {
     var deduplicator = new Deduplicator();
-    var graph = new Graph(deduplicator);
+    var graph = new Graph();
     var timetableRepository = new TimetableRepository(new SiteRepository(), deduplicator);
     GtfsBundle gtfsBundle = GtfsBundle.forTest(file);
     GtfsModule module = GtfsModule.forTest(

application/src/ext-test/java/org/opentripplanner/ext/flex/filter/FilterMapperTest.java

@@ -4,7 +4,6 @@
 import static org.opentripplanner.transit.model._data.TimetableRepositoryForTest.id;
 
 import java.util.List;
-import java.util.Set;
 import org.junit.jupiter.api.Test;
 import org.opentripplanner.routing.api.request.request.filter.AllowAllTransitFilter;
 import org.opentripplanner.routing.api.request.request.filter.SelectRequest;

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

@@ -7,10 +7,8 @@
 
 import java.util.List;
 import org.junit.jupiter.api.Test;
-import org.opentripplanner.ext.flex.FlexStopTimesForTest;
 import org.opentripplanner.ext.flex.FlexTripsMapper;
 import org.opentripplanner.ext.flex.flexpathcalculator.DirectFlexPathCalculator;
-import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore;
 import org.opentripplanner.graph_builder.issue.service.DefaultDataImportIssueStore;
 import org.opentripplanner.model.impl.OtpTransitServiceBuilder;
 import org.opentripplanner.transit.service.SiteRepository;

application/src/ext-test/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureUpdaterTest.java

@@ -14,8 +14,6 @@
 import com.azure.messaging.servicebus.ServiceBusErrorSource;
 import com.azure.messaging.servicebus.ServiceBusException;
 import com.azure.messaging.servicebus.ServiceBusFailureReason;
-import java.io.IOException;
-import java.io.UncheckedIOException;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

application/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopLegBuilderTest.java

@@ -4,7 +4,6 @@
 import static org.opentripplanner.ext.fares.impl._support.FareModelForTest.ANY_FARE_OFFER;
 import static org.opentripplanner.transit.model._data.TimetableRepositoryForTest.id;
 
-import java.time.LocalDate;
 import java.time.ZonedDateTime;
 import java.util.List;
 import java.util.Set;

application/src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java

@@ -7,7 +7,6 @@
 import java.util.Map;
 import java.util.Objects;
 import org.opentripplanner.ext.flex.trip.FlexTrip;
-import org.opentripplanner.routing.api.request.request.filter.TransitFilter;
 import org.opentripplanner.routing.graphfinder.NearbyStop;
 import org.opentripplanner.transit.model.filter.expr.Matcher;
 import org.opentripplanner.transit.model.timetable.Trip;

application/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java

@@ -6,7 +6,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
-import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator;
 import org.opentripplanner.ext.flex.flexpathcalculator.ScheduledFlexPathCalculator;
@@ -15,7 +14,6 @@
 import org.opentripplanner.transit.model.framework.FeedScopedId;
 import org.opentripplanner.transit.model.framework.TransitBuilder;
 import org.opentripplanner.transit.model.site.GroupStop;
-import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.transit.model.site.StopLocation;
 import org.opentripplanner.transit.model.timetable.booking.BookingInfo;