Move transit test environment into test-fixtures

application/src/ext-test/java/org/opentripplanner/ext/carpooling/CarpoolItineraryTestData.java

@@ -12,7 +12,7 @@
 import java.time.ZonedDateTime;
 import org.opentripplanner.model.plan.Itinerary;
 import org.opentripplanner.model.plan.Place;
-import org.opentripplanner.transit.model._data.TransitTestEnvironment;
+import org.opentripplanner.transit.model.TransitTestEnvironment;
 
 /**
  * Standard itinerary data for carpooling filter tests.

application/src/ext-test/java/org/opentripplanner/ext/emission/internal/itinerary/EmissionItineraryDecoratorTest.java

@@ -21,8 +21,8 @@
 import org.opentripplanner.model.plan.Place;
 import org.opentripplanner.model.plan.PlanTestConstants;
 import org.opentripplanner.street.geometry.WgsCoordinate;
-import org.opentripplanner.transit.model._data.TransitTestEnvironment;
-import org.opentripplanner.transit.model._data.TransitTestEnvironmentBuilder;
+import org.opentripplanner.transit.model.TransitTestEnvironment;
+import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
 
 class EmissionItineraryDecoratorTest implements PlanTestConstants {
 

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

@@ -20,8 +20,8 @@
 import org.opentripplanner.service.streetdetails.internal.DefaultStreetDetailsService;
 import org.opentripplanner.street.graph.Graph;
 import org.opentripplanner.transit.api.request.TripRequest;
-import org.opentripplanner.transit.model._data.TransitTestEnvironment;
-import org.opentripplanner.transit.model._data.TripInput;
+import org.opentripplanner.transit.model.TransitTestEnvironment;
+import org.opentripplanner.transit.model.TripInput;
 
 class FlexRouterTest {
 

application/src/ext-test/java/org/opentripplanner/ext/ojp/service/CallAtStopServiceTest.java

@@ -21,9 +21,9 @@
 import org.opentripplanner.street.model.StreetMode;
 import org.opentripplanner.street.model.vertex.Vertex;
 import org.opentripplanner.street.search.state.TestStateBuilder;
-import org.opentripplanner.transit.model._data.TransitTestEnvironment;
-import org.opentripplanner.transit.model._data.TransitTestEnvironmentBuilder;
-import org.opentripplanner.transit.model._data.TripInput;
+import org.opentripplanner.transit.model.TransitTestEnvironment;
+import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
+import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.framework.EntityNotFoundException;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.transit.service.ArrivalDeparture;

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

@@ -15,10 +15,10 @@
 import org.opentripplanner.model.plan.leg.ScheduledTransitLeg;
 import org.opentripplanner.model.plan.leg.ScheduledTransitLegBuilder;
 import org.opentripplanner.routing.alertpatch.TransitAlert;
-import org.opentripplanner.transit.model._data.TransitTestEnvironment;
-import org.opentripplanner.transit.model._data.TransitTestEnvironmentBuilder;
-import org.opentripplanner.transit.model._data.TripInput;
-import org.opentripplanner.transit.model._data.TripOnDateDataFetcher;
+import org.opentripplanner.transit.model.TransitTestEnvironment;
+import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
+import org.opentripplanner.transit.model.TripInput;
+import org.opentripplanner.transit.model.TripOnDateDataFetcher;
 import org.opentripplanner.transit.model.network.TripPattern;
 import org.opentripplanner.transit.model.timetable.TripTimes;
 

application/src/test/java/org/opentripplanner/transit/model/_data/RaptorTransitDataFetcher.java → application/src/test-fixtures/java/org/opentripplanner/transit/model/RaptorTransitDataFetcher.java

@@ -1,4 +1,4 @@
-package org.opentripplanner.transit.model._data;
+package org.opentripplanner.transit.model;
 
 import java.time.LocalDate;
 import java.util.Collection;

application/src/test/java/org/opentripplanner/transit/model/_data/SiteRepositoryTestBuilder.java → application/src/test-fixtures/java/org/opentripplanner/transit/model/SiteRepositoryTestBuilder.java

@@ -1,4 +1,4 @@
-package org.opentripplanner.transit.model._data;
+package org.opentripplanner.transit.model;
 
 import static org.opentripplanner.core.model.id.FeedScopedIdForTestFactory.id;
 

application/src/test/java/org/opentripplanner/transit/model/_data/TestTransitTuningParameters.java → application/src/test-fixtures/java/org/opentripplanner/transit/model/TestTransitTuningParameters.java

@@ -1,4 +1,4 @@
-package org.opentripplanner.transit.model._data;
+package org.opentripplanner.transit.model;
 
 import java.time.Duration;
 import java.util.List;

application/src/test/java/org/opentripplanner/transit/model/_data/TimetableRepositoryTestBuilder.java → application/src/test-fixtures/java/org/opentripplanner/transit/model/TimetableRepositoryTestBuilder.java

@@ -1,4 +1,4 @@
-package org.opentripplanner.transit.model._data;
+package org.opentripplanner.transit.model;
 
 import static org.opentripplanner.core.model.id.FeedScopedIdForTestFactory.id;
 

application/src/test/java/org/opentripplanner/transit/model/_data/TransitTestEnvironment.java → application/src/test-fixtures/java/org/opentripplanner/transit/model/TransitTestEnvironment.java

@@ -1,4 +1,4 @@
-package org.opentripplanner.transit.model._data;
+package org.opentripplanner.transit.model;
 
 import static org.opentripplanner.core.model.id.FeedScopedIdForTestFactory.id;
 

application/src/test/java/org/opentripplanner/transit/model/_data/TransitTestEnvironmentBuilder.java → application/src/test-fixtures/java/org/opentripplanner/transit/model/TransitTestEnvironmentBuilder.java

@@ -1,4 +1,4 @@
-package org.opentripplanner.transit.model._data;
+package org.opentripplanner.transit.model;
 
 import java.time.LocalDate;
 import java.time.ZoneId;

application/src/test/java/org/opentripplanner/transit/model/_data/TripInput.java → application/src/test-fixtures/java/org/opentripplanner/transit/model/TripInput.java

@@ -1,4 +1,4 @@
-package org.opentripplanner.transit.model._data;
+package org.opentripplanner.transit.model;
 
 import java.time.LocalDate;
 import java.util.ArrayList;

application/src/test/java/org/opentripplanner/transit/model/_data/TripOnDateDataFetcher.java → application/src/test-fixtures/java/org/opentripplanner/transit/model/TripOnDateDataFetcher.java

@@ -1,4 +1,4 @@
-package org.opentripplanner.transit.model._data;
+package org.opentripplanner.transit.model;
 
 import java.time.LocalDate;
 import org.opentripplanner.core.model.id.FeedScopedId;

application/src/test/java/org/opentripplanner/transit/model/_data/TripTimesStateDecoder.java → application/src/test-fixtures/java/org/opentripplanner/transit/model/TripTimesStateDecoder.java

@@ -1,4 +1,4 @@
-package org.opentripplanner.transit.model._data;
+package org.opentripplanner.transit.model;
 
 import org.opentripplanner.transit.model.timetable.TripTimes;
 

application/src/test/java/org/opentripplanner/transit/model/_data/TripTimesStringBuilder.java → application/src/test-fixtures/java/org/opentripplanner/transit/model/TripTimesStringBuilder.java

@@ -1,4 +1,4 @@
-package org.opentripplanner.transit.model._data;
+package org.opentripplanner.transit.model;
 
 import java.util.ArrayList;
 import org.opentripplanner.transit.model.network.TripPattern;

application/src/test/java/org/opentripplanner/updater/trip/GtfsRtTestHelper.java → application/src/test-fixtures/java/org/opentripplanner/updater/trip/gtfs/GtfsRtTestHelper.java

@@ -1,16 +1,14 @@
-package org.opentripplanner.updater.trip;
+package org.opentripplanner.updater.trip.gtfs;
 
 import static org.opentripplanner.updater.trip.UpdateIncrementality.FULL_DATASET;
 
 import com.google.transit.realtime.GtfsRealtime;
 import java.time.LocalDate;
 import java.util.List;
 import org.opentripplanner.core.framework.deduplicator.DeduplicatorService;
-import org.opentripplanner.transit.model._data.TransitTestEnvironment;
+import org.opentripplanner.transit.model.TransitTestEnvironment;
 import org.opentripplanner.updater.spi.UpdateResult;
-import org.opentripplanner.updater.trip.gtfs.BackwardsDelayPropagationType;
-import org.opentripplanner.updater.trip.gtfs.ForwardsDelayPropagationType;
-import org.opentripplanner.updater.trip.gtfs.GtfsRealTimeTripUpdateAdapter;
+import org.opentripplanner.updater.trip.UpdateIncrementality;
 
 public class GtfsRtTestHelper {
 

application/src/test/java/org/opentripplanner/updater/trip/TripUpdateBuilder.java → application/src/test-fixtures/java/org/opentripplanner/updater/trip/gtfs/TripUpdateBuilder.java

@@ -1,4 +1,4 @@
-package org.opentripplanner.updater.trip;
+package org.opentripplanner.updater.trip.gtfs;
 
 import com.google.transit.realtime.GtfsRealtime;
 import com.google.transit.realtime.GtfsRealtime.TripUpdate.StopTimeUpdate;

application/src/test/java/org/opentripplanner/updater/trip/SiriTestHelper.java → application/src/test-fixtures/java/org/opentripplanner/updater/trip/siri/SiriTestHelper.java

@@ -1,15 +1,13 @@
-package org.opentripplanner.updater.trip;
+package org.opentripplanner.updater.trip.siri;
 
 import static org.opentripplanner.updater.trip.UpdateIncrementality.DIFFERENTIAL;
 
 import java.util.List;
 import org.opentripplanner.core.framework.deduplicator.DeduplicatorService;
 import org.opentripplanner.street.graph.Graph;
-import org.opentripplanner.transit.model._data.TransitTestEnvironment;
+import org.opentripplanner.transit.model.TransitTestEnvironment;
 import org.opentripplanner.updater.DefaultRealTimeUpdateContext;
 import org.opentripplanner.updater.spi.UpdateResult;
-import org.opentripplanner.updater.trip.siri.SiriEtBuilder;
-import org.opentripplanner.updater.trip.siri.SiriRealTimeTripUpdateAdapter;
 import org.opentripplanner.updater.trip.siri.updater.EstimatedTimetableHandler;
 import uk.org.siri.siri21.EstimatedTimetableDeliveryStructure;
 

application/src/test/java/org/opentripplanner/apis/gtfs/datafetchers/StopCallImplTest.java

@@ -14,9 +14,9 @@
 import org.opentripplanner.apis.support.graphql.DataFetchingSupport;
 import org.opentripplanner.framework.application.OTPFeature;
 import org.opentripplanner.model.TripTimeOnDate;
-import org.opentripplanner.transit.model._data.TransitTestEnvironment;
-import org.opentripplanner.transit.model._data.TransitTestEnvironmentBuilder;
-import org.opentripplanner.transit.model._data.TripInput;
+import org.opentripplanner.transit.model.TransitTestEnvironment;
+import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
+import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.site.AreaStop;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.utils.time.ServiceDateUtils;

application/src/test/java/org/opentripplanner/apis/gtfs/datafetchers/TripImplTest.java

@@ -7,9 +7,9 @@
 import java.util.Map;
 import org.junit.jupiter.api.Test;
 import org.opentripplanner.apis.support.graphql.DataFetchingSupport;
-import org.opentripplanner.transit.model._data.TransitTestEnvironment;
-import org.opentripplanner.transit.model._data.TransitTestEnvironmentBuilder;
-import org.opentripplanner.transit.model._data.TripInput;
+import org.opentripplanner.transit.model.TransitTestEnvironment;
+import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
+import org.opentripplanner.transit.model.TripInput;
 
 class TripImplTest {
 

application/src/test/java/org/opentripplanner/apis/gtfs/service/ApiTransitServiceTest.java

@@ -19,13 +19,13 @@
 import org.opentripplanner.model.plan.leg.ScheduledTransitLegBuilder;
 import org.opentripplanner.model.plan.leg.StreetLeg;
 import org.opentripplanner.street.search.TraverseMode;
-import org.opentripplanner.transit.model._data.TransitTestEnvironment;
-import org.opentripplanner.transit.model._data.TransitTestEnvironmentBuilder;
-import org.opentripplanner.transit.model._data.TripInput;
+import org.opentripplanner.transit.model.TransitTestEnvironment;
+import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
+import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.transit.service.ArrivalDeparture;
-import org.opentripplanner.updater.trip.GtfsRtTestHelper;
-import org.opentripplanner.updater.trip.TripUpdateBuilder;
+import org.opentripplanner.updater.trip.gtfs.GtfsRtTestHelper;
+import org.opentripplanner.updater.trip.gtfs.TripUpdateBuilder;
 
 /**
  * This test uses the real-time test environment to establish the condition under test.

application/src/test/java/org/opentripplanner/model/plan/leg/ScheduledTransitLegTest.java

@@ -20,10 +20,10 @@
 import org.opentripplanner.model.fare.FareProduct;
 import org.opentripplanner.model.plan.Emission;
 import org.opentripplanner.routing.alertpatch.TransitAlert;
-import org.opentripplanner.transit.model._data.TransitTestEnvironment;
-import org.opentripplanner.transit.model._data.TransitTestEnvironmentBuilder;
-import org.opentripplanner.transit.model._data.TripInput;
-import org.opentripplanner.transit.model._data.TripOnDateDataFetcher;
+import org.opentripplanner.transit.model.TransitTestEnvironment;
+import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
+import org.opentripplanner.transit.model.TripInput;
+import org.opentripplanner.transit.model.TripOnDateDataFetcher;
 import org.opentripplanner.transit.model.basic.Money;
 import org.opentripplanner.transit.model.network.TripPattern;
 import org.opentripplanner.transit.model.site.RegularStop;

application/src/test/java/org/opentripplanner/place/nearbystopfinder/NearbyStopFinderVisitorTest.java

@@ -15,8 +15,8 @@
 import org.opentripplanner.street.search.request.StreetSearchRequest;
 import org.opentripplanner.street.search.state.State;
 import org.opentripplanner.street.search.state.TestStateBuilder;
-import org.opentripplanner.transit.model._data.TransitTestEnvironment;
-import org.opentripplanner.transit.model._data.TransitTestEnvironmentBuilder;
+import org.opentripplanner.transit.model.TransitTestEnvironment;
+import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
 import org.opentripplanner.transit.model.site.RegularStop;
 
 class NearbyStopFinderVisitorTest {

application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainTest.java

@@ -31,8 +31,8 @@
 import org.opentripplanner.routing.api.response.RoutingError;
 import org.opentripplanner.routing.api.response.RoutingErrorCode;
 import org.opentripplanner.routing.services.TransitAlertService;
-import org.opentripplanner.transit.model._data.TransitTestEnvironment;
-import org.opentripplanner.transit.model._data.TransitTestEnvironmentBuilder;
+import org.opentripplanner.transit.model.TransitTestEnvironment;
+import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
 import org.opentripplanner.utils.lang.Box;
 
 /**

application/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByDistanceTest.java

@@ -15,8 +15,8 @@
 import org.opentripplanner.model.plan.Leg;
 import org.opentripplanner.model.plan.Place;
 import org.opentripplanner.model.plan.PlanTestConstants;
-import org.opentripplanner.transit.model._data.TransitTestEnvironment;
-import org.opentripplanner.transit.model._data.TransitTestEnvironmentBuilder;
+import org.opentripplanner.transit.model.TransitTestEnvironment;
+import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
 
 public class GroupByDistanceTest implements PlanTestConstants {
 

application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/startonboardaccess/TripAndServiceDateResolverTest.java

@@ -9,9 +9,9 @@
 import org.junit.jupiter.api.Test;
 import org.opentripplanner.routing.api.request.TripOnDateReference;
 import org.opentripplanner.routing.error.InvalidRoutingInputException;
-import org.opentripplanner.transit.model._data.TransitTestEnvironment;
-import org.opentripplanner.transit.model._data.TransitTestEnvironmentBuilder;
-import org.opentripplanner.transit.model._data.TripInput;
+import org.opentripplanner.transit.model.TransitTestEnvironment;
+import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
+import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.transit.model.timetable.TripAlteration;
 import org.opentripplanner.transit.model.timetable.TripOnServiceDate;

application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/startonboardaccess/TripLocationResolverTest.java

@@ -11,9 +11,9 @@
 import org.junit.jupiter.api.Test;
 import org.opentripplanner.routing.error.InvalidRoutingInputException;
 import org.opentripplanner.routing.error.RoutingValidationException;
-import org.opentripplanner.transit.model._data.TransitTestEnvironment;
-import org.opentripplanner.transit.model._data.TransitTestEnvironmentBuilder;
-import org.opentripplanner.transit.model._data.TripInput;
+import org.opentripplanner.transit.model.TransitTestEnvironment;
+import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
+import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.site.RegularStop;
 
 class TripLocationResolverTest {

application/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/startonboardaccess/TripScheduleIndexResolverTest.java

@@ -9,9 +9,9 @@
 import org.junit.jupiter.api.Test;
 import org.opentripplanner.model.PickDrop;
 import org.opentripplanner.routing.error.InvalidRoutingInputException;
-import org.opentripplanner.transit.model._data.TransitTestEnvironment;
-import org.opentripplanner.transit.model._data.TransitTestEnvironmentBuilder;
-import org.opentripplanner.transit.model._data.TripInput;
+import org.opentripplanner.transit.model.TransitTestEnvironment;
+import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
+import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.site.RegularStop;
 
 class TripScheduleIndexResolverTest {

application/src/test/java/org/opentripplanner/routing/refetch/RefetchItineraryServiceTest.java

@@ -35,9 +35,9 @@
 import org.opentripplanner.transfer.regular.RegularTransferService;
 import org.opentripplanner.transfer.regular.TransferServiceTestFactory;
 import org.opentripplanner.transfer.regular.model.PathTransfer;
-import org.opentripplanner.transit.model._data.TransitTestEnvironment;
-import org.opentripplanner.transit.model._data.TransitTestEnvironmentBuilder;
-import org.opentripplanner.transit.model._data.TripInput;
+import org.opentripplanner.transit.model.TransitTestEnvironment;
+import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
+import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.transit.model.site.Station;
 import org.opentripplanner.transit.model.site.StopLocation;

application/src/test/java/org/opentripplanner/transit/model/_data/TimetableRepositoryForTest.java

@@ -23,6 +23,7 @@
 import org.opentripplanner.model.plan.leg.ViaLocationType;
 import org.opentripplanner.street.geometry.GeometryUtils;
 import org.opentripplanner.street.geometry.WgsCoordinate;
+import org.opentripplanner.transit.model.TransitTestEnvironment;
 import org.opentripplanner.transit.model.basic.TransitMode;
 import org.opentripplanner.transit.model.network.GroupOfRoutes;
 import org.opentripplanner.transit.model.network.GroupOfRoutesBuilder;

application/src/test/java/org/opentripplanner/transit/model/network/TripPatternGeometryTest.java

@@ -12,8 +12,8 @@
 import org.opentripplanner.model.PickDrop;
 import org.opentripplanner.street.geometry.CompactLineStringSequence;
 import org.opentripplanner.street.geometry.SphericalDistanceLibrary;
-import org.opentripplanner.transit.model._data.TransitTestEnvironment;
-import org.opentripplanner.transit.model._data.TransitTestEnvironmentBuilder;
+import org.opentripplanner.transit.model.TransitTestEnvironment;
+import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.transit.model.site.StopLocation;
 

application/src/test/java/org/opentripplanner/transit/model/timetable/TimetableTest.java

@@ -8,9 +8,9 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
-import org.opentripplanner.transit.model._data.TransitTestEnvironment;
-import org.opentripplanner.transit.model._data.TransitTestEnvironmentBuilder;
-import org.opentripplanner.transit.model._data.TripInput;
+import org.opentripplanner.transit.model.TransitTestEnvironment;
+import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
+import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.site.RegularStop;
 
 class TimetableTest {

application/src/test/java/org/opentripplanner/transit/service/ReplacementHelperTest.java

@@ -10,16 +10,16 @@
 
 import java.util.stream.StreamSupport;
 import org.junit.jupiter.api.Test;
-import org.opentripplanner.transit.model._data.TransitTestEnvironment;
-import org.opentripplanner.transit.model._data.TransitTestEnvironmentBuilder;
-import org.opentripplanner.transit.model._data.TripInput;
+import org.opentripplanner.transit.model.TransitTestEnvironment;
+import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
+import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.network.ReplacedByRelation;
 import org.opentripplanner.transit.model.network.ReplacementForRelation;
 import org.opentripplanner.transit.model.network.Route;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.transit.model.timetable.TripOnServiceDate;
 import org.opentripplanner.updater.trip.RealtimeTestConstants;
-import org.opentripplanner.updater.trip.SiriTestHelper;
+import org.opentripplanner.updater.trip.siri.SiriTestHelper;
 
 public class ReplacementHelperTest implements RealtimeTestConstants {
 

application/src/test/java/org/opentripplanner/transit/service/TripTimesOnDateTest.java

@@ -8,9 +8,9 @@
 import java.util.List;
 import org.junit.jupiter.api.Test;
 import org.opentripplanner.transit.api.request.TripTimeOnDateRequest;
-import org.opentripplanner.transit.model._data.TransitTestEnvironment;
-import org.opentripplanner.transit.model._data.TransitTestEnvironmentBuilder;
-import org.opentripplanner.transit.model._data.TripInput;
+import org.opentripplanner.transit.model.TransitTestEnvironment;
+import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
+import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.basic.TransitMode;
 import org.opentripplanner.transit.model.site.RegularStop;
 

application/src/test/java/org/opentripplanner/updater/GtfsRealtimeFuzzyTripMatcherTest.java

@@ -8,9 +8,9 @@
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.opentripplanner.core.model.id.FeedScopedIdForTestFactory;
-import org.opentripplanner.transit.model._data.TransitTestEnvironment;
-import org.opentripplanner.transit.model._data.TransitTestEnvironmentBuilder;
-import org.opentripplanner.transit.model._data.TripInput;
+import org.opentripplanner.transit.model.TransitTestEnvironment;
+import org.opentripplanner.transit.model.TransitTestEnvironmentBuilder;
+import org.opentripplanner.transit.model.TripInput;
 import org.opentripplanner.transit.model.network.Route;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.updater.trip.gtfs.GtfsRealtimeFuzzyTripMatcher;

application/src/test/java/org/opentripplanner/updater/trip/gtfs/TripTimesUpdaterTest.java

@@ -39,7 +39,6 @@
 import org.opentripplanner.transit.model.timetable.TripTimes;
 import org.opentripplanner.transit.service.TimetableRepository;
 import org.opentripplanner.updater.spi.UpdateErrorType;
-import org.opentripplanner.updater.trip.TripUpdateBuilder;
 import org.opentripplanner.updater.trip.gtfs.model.TripUpdate;
 import org.opentripplanner.utils.time.TimeUtils;