Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move SIRI to OTP main source tree #6121

Merged
merged 2 commits into from
Oct 8, 2024
Merged

Move SIRI to OTP main source tree #6121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c252e90
Move SIRI to OTP main source tree
vpaturet Oct 8, 2024
57ae55f
Merge branch 'dev-2.x' into move_siri_out_of_sandbox
vpaturet Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureETUpdater.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import java.util.function.Consumer;
import javax.xml.stream.XMLStreamException;
import org.apache.hc.core5.net.URIBuilder;
import org.opentripplanner.ext.siri.SiriTimetableSnapshotSource;
import org.opentripplanner.updater.siri.SiriTimetableSnapshotSource;
import org.opentripplanner.updater.spi.ResultLogger;
import org.opentripplanner.updater.spi.UpdateResult;
import org.opentripplanner.updater.trip.UpdateIncrementality;
Expand Down
2 changes: 1 addition & 1 deletion src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureSXUpdater.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
import java.util.function.Consumer;
import javax.xml.stream.XMLStreamException;
import org.apache.hc.core5.net.URIBuilder;
import org.opentripplanner.ext.siri.SiriAlertsUpdateHandler;
import org.opentripplanner.routing.impl.TransitAlertServiceImpl;
import org.opentripplanner.routing.services.TransitAlertService;
import org.opentripplanner.transit.service.TransitModel;
import org.opentripplanner.updater.alert.TransitAlertProvider;
import org.opentripplanner.updater.siri.SiriAlertsUpdateHandler;
import org.rutebanken.siri20.util.SiriXml;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/opentripplanner/standalone/config/routerconfig/UpdatersConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,8 @@
import java.util.List;
import java.util.function.BiFunction;
import javax.annotation.Nullable;
import org.opentripplanner.ext.siri.updater.SiriETUpdaterParameters;
import org.opentripplanner.ext.siri.updater.SiriSXUpdaterParameters;
import org.opentripplanner.ext.siri.updater.azure.SiriAzureETUpdaterParameters;
import org.opentripplanner.ext.siri.updater.azure.SiriAzureSXUpdaterParameters;
import org.opentripplanner.ext.siri.updater.google.SiriETGooglePubsubUpdaterParameters;
import org.opentripplanner.ext.vehiclerentalservicedirectory.VehicleRentalServiceDirectoryFetcher;
import org.opentripplanner.ext.vehiclerentalservicedirectory.api.VehicleRentalServiceDirectoryFetcherParameters;
import org.opentripplanner.standalone.config.framework.json.NodeAdapter;
Expand All @@ -44,6 +41,9 @@
import org.opentripplanner.updater.TimetableSnapshotSourceParameters;
import org.opentripplanner.updater.UpdatersParameters;
import org.opentripplanner.updater.alert.GtfsRealtimeAlertsUpdaterParameters;
import org.opentripplanner.updater.siri.updater.SiriETUpdaterParameters;
import org.opentripplanner.updater.siri.updater.SiriSXUpdaterParameters;
import org.opentripplanner.updater.siri.updater.google.SiriETGooglePubsubUpdaterParameters;
import org.opentripplanner.updater.trip.MqttGtfsRealtimeUpdaterParameters;
import org.opentripplanner.updater.trip.PollingTripUpdaterParameters;
import org.opentripplanner.updater.vehicle_parking.VehicleParkingUpdaterParameters;
Expand Down
6 changes: 3 additions & 3 deletions ...ntripplanner/standalone/config/routerconfig/updaters/SiriETGooglePubsubUpdaterConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.opentripplanner.standalone.config.routerconfig.updaters;

import static org.opentripplanner.ext.siri.updater.google.SiriETGooglePubsubUpdaterParameters.INITIAL_GET_DATA_TIMEOUT;
import static org.opentripplanner.ext.siri.updater.google.SiriETGooglePubsubUpdaterParameters.RECONNECT_PERIOD;
import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_1;
import static org.opentripplanner.updater.siri.updater.google.SiriETGooglePubsubUpdaterParameters.INITIAL_GET_DATA_TIMEOUT;
import static org.opentripplanner.updater.siri.updater.google.SiriETGooglePubsubUpdaterParameters.RECONNECT_PERIOD;

import org.opentripplanner.ext.siri.updater.google.SiriETGooglePubsubUpdaterParameters;
import org.opentripplanner.standalone.config.framework.json.NodeAdapter;
import org.opentripplanner.updater.siri.updater.google.SiriETGooglePubsubUpdaterParameters;

public class SiriETGooglePubsubUpdaterConfig {

Expand Down
2 changes: 1 addition & 1 deletion ...java/org/opentripplanner/standalone/config/routerconfig/updaters/SiriETUpdaterConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_3;

import java.time.Duration;
import org.opentripplanner.ext.siri.updater.SiriETUpdaterParameters;
import org.opentripplanner.standalone.config.framework.json.NodeAdapter;
import org.opentripplanner.updater.siri.updater.SiriETUpdaterParameters;

public class SiriETUpdaterConfig {

Expand Down
2 changes: 1 addition & 1 deletion ...java/org/opentripplanner/standalone/config/routerconfig/updaters/SiriSXUpdaterConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_3;

import java.time.Duration;
import org.opentripplanner.ext.siri.updater.SiriSXUpdaterParameters;
import org.opentripplanner.standalone.config.framework.json.NodeAdapter;
import org.opentripplanner.updater.siri.updater.SiriSXUpdaterParameters;

public class SiriSXUpdaterConfig {

Expand Down
1 change: 0 additions & 1 deletion ...entripplanner/standalone/config/routerconfig/updaters/azure/SiriAzureETUpdaterConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.opentripplanner.standalone.config.routerconfig.updaters.azure;

import static org.opentripplanner.standalone.config.framework.json.OtpVersion.NA;
import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_2;

import org.opentripplanner.ext.siri.updater.azure.SiriAzureETUpdaterParameters;
Expand Down
1 change: 0 additions & 1 deletion ...entripplanner/standalone/config/routerconfig/updaters/azure/SiriAzureSXUpdaterConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.opentripplanner.standalone.config.routerconfig.updaters.azure;

import static org.opentripplanner.standalone.config.framework.json.OtpVersion.NA;
import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_2;

import org.opentripplanner.ext.siri.updater.azure.SiriAzureSXUpdaterParameters;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/opentripplanner/updater/DefaultRealTimeUpdateContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package org.opentripplanner.updater;

import org.opentripplanner.ext.siri.EntityResolver;
import org.opentripplanner.ext.siri.SiriFuzzyTripMatcher;
import org.opentripplanner.model.TimetableSnapshot;
import org.opentripplanner.routing.graph.Graph;
import org.opentripplanner.transit.service.DefaultTransitService;
import org.opentripplanner.transit.service.TransitModel;
import org.opentripplanner.transit.service.TransitService;
import org.opentripplanner.updater.siri.EntityResolver;
import org.opentripplanner.updater.siri.SiriFuzzyTripMatcher;

public class DefaultRealTimeUpdateContext implements RealTimeUpdateContext {

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/opentripplanner/updater/RealTimeUpdateContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.opentripplanner.updater;

import org.opentripplanner.ext.siri.EntityResolver;
import org.opentripplanner.ext.siri.SiriFuzzyTripMatcher;
import org.opentripplanner.routing.graph.Graph;
import org.opentripplanner.transit.service.TransitService;
import org.opentripplanner.updater.siri.EntityResolver;
import org.opentripplanner.updater.siri.SiriFuzzyTripMatcher;

/**
* Give access to the transit data and street model in the context of a real-time updater.
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/opentripplanner/updater/UpdatersParameters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package org.opentripplanner.updater;

import java.util.List;
import org.opentripplanner.ext.siri.updater.SiriETUpdaterParameters;
import org.opentripplanner.ext.siri.updater.SiriSXUpdaterParameters;
import org.opentripplanner.ext.siri.updater.azure.SiriAzureETUpdaterParameters;
import org.opentripplanner.ext.siri.updater.azure.SiriAzureSXUpdaterParameters;
import org.opentripplanner.ext.siri.updater.google.SiriETGooglePubsubUpdaterParameters;
import org.opentripplanner.ext.vehiclerentalservicedirectory.api.VehicleRentalServiceDirectoryFetcherParameters;
import org.opentripplanner.updater.alert.GtfsRealtimeAlertsUpdaterParameters;
import org.opentripplanner.updater.siri.updater.SiriETUpdaterParameters;
import org.opentripplanner.updater.siri.updater.SiriSXUpdaterParameters;
import org.opentripplanner.updater.siri.updater.google.SiriETGooglePubsubUpdaterParameters;
import org.opentripplanner.updater.trip.MqttGtfsRealtimeUpdaterParameters;
import org.opentripplanner.updater.trip.PollingTripUpdaterParameters;
import org.opentripplanner.updater.vehicle_parking.VehicleParkingUpdaterParameters;
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,8 @@
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
import org.opentripplanner.ext.siri.SiriTimetableSnapshotSource;
import org.opentripplanner.ext.siri.updater.SiriETUpdater;
import org.opentripplanner.ext.siri.updater.SiriSXUpdater;
import org.opentripplanner.ext.siri.updater.azure.SiriAzureETUpdater;
import org.opentripplanner.ext.siri.updater.azure.SiriAzureSXUpdater;
import org.opentripplanner.ext.siri.updater.google.SiriETGooglePubsubUpdater;
import org.opentripplanner.ext.vehiclerentalservicedirectory.VehicleRentalServiceDirectoryFetcher;
import org.opentripplanner.ext.vehiclerentalservicedirectory.api.VehicleRentalServiceDirectoryFetcherParameters;
import org.opentripplanner.framework.io.OtpHttpClientFactory;
Expand All @@ -22,6 +18,10 @@
import org.opentripplanner.updater.GraphUpdaterManager;
import org.opentripplanner.updater.UpdatersParameters;
import org.opentripplanner.updater.alert.GtfsRealtimeAlertsUpdater;
import org.opentripplanner.updater.siri.SiriTimetableSnapshotSource;
import org.opentripplanner.updater.siri.updater.SiriETUpdater;
import org.opentripplanner.updater.siri.updater.SiriSXUpdater;
import org.opentripplanner.updater.siri.updater.google.SiriETGooglePubsubUpdater;
import org.opentripplanner.updater.spi.GraphUpdater;
import org.opentripplanner.updater.spi.TimetableSnapshotFlush;
import org.opentripplanner.updater.trip.MqttGtfsRealtimeUpdater;
Expand Down
6 changes: 3 additions & 3 deletions ...ripplanner/ext/siri/AddedTripBuilder.java → ...lanner/updater/siri/AddedTripBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.opentripplanner.ext.siri;
package org.opentripplanner.updater.siri;

import static java.lang.Boolean.TRUE;
import static org.opentripplanner.ext.siri.mapper.SiriTransportModeMapper.mapTransitMainMode;
import static org.opentripplanner.updater.siri.mapper.SiriTransportModeMapper.mapTransitMainMode;
import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.CANNOT_RESOLVE_AGENCY;
import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.NO_START_DATE;
import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.NO_VALID_STOPS;
Expand All @@ -15,7 +15,6 @@
import java.util.Objects;
import java.util.function.Function;
import javax.annotation.Nullable;
import org.opentripplanner.ext.siri.mapper.PickDropMapper;
import org.opentripplanner.framework.i18n.NonLocalizedString;
import org.opentripplanner.framework.time.ServiceDateUtils;
import org.opentripplanner.model.StopTime;
Expand All @@ -35,6 +34,7 @@
import org.opentripplanner.transit.model.timetable.TripOnServiceDate;
import org.opentripplanner.transit.model.timetable.TripTimesFactory;
import org.opentripplanner.transit.service.TransitEditorService;
import org.opentripplanner.updater.siri.mapper.PickDropMapper;
import org.opentripplanner.updater.spi.DataValidationExceptionMapper;
import org.opentripplanner.updater.spi.UpdateError;
import org.rutebanken.netex.model.BusSubmodeEnumeration;
Expand Down
2 changes: 1 addition & 1 deletion ...opentripplanner/ext/siri/CallWrapper.java → ...tripplanner/updater/siri/CallWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.opentripplanner.ext.siri;
package org.opentripplanner.updater.siri;

import java.time.ZonedDateTime;
import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion ...opentripplanner/ext/siri/DebugString.java → ...tripplanner/updater/siri/DebugString.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.opentripplanner.ext.siri;
package org.opentripplanner.updater.siri;

import org.opentripplanner.framework.tostring.ToStringBuilder;
import uk.org.siri.siri20.DataFrameRefStructure;
Expand Down
7 changes: 1 addition & 6 deletions ...ntripplanner/ext/siri/EntityResolver.java → ...pplanner/updater/siri/EntityResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
package org.opentripplanner.ext.siri;
package org.opentripplanner.updater.siri;

import java.time.Duration;
import java.time.LocalDate;
import java.time.ZonedDateTime;
import java.time.format.DateTimeParseException;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import javax.annotation.Nullable;
import org.opentripplanner.transit.model.framework.FeedScopedId;
import org.opentripplanner.transit.model.network.Route;
Expand All @@ -15,15 +12,13 @@
import org.opentripplanner.transit.model.timetable.Trip;
import org.opentripplanner.transit.model.timetable.TripIdAndServiceDate;
import org.opentripplanner.transit.model.timetable.TripOnServiceDate;
import org.opentripplanner.transit.model.timetable.TripOnServiceDateBuilder;
import org.opentripplanner.transit.service.TransitService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import uk.org.siri.siri20.DatedVehicleJourneyRef;
import uk.org.siri.siri20.EstimatedVehicleJourney;
import uk.org.siri.siri20.FramedVehicleJourneyRefStructure;
import uk.org.siri.siri20.MonitoredVehicleJourneyStructure;
import uk.org.siri.siri20.VehicleJourneyRef;

/**
* This class is responsible for resolving references to various entities in the transit model for
Expand Down
4 changes: 2 additions & 2 deletions ...planner/ext/siri/ModifiedTripBuilder.java → ...ner/updater/siri/ModifiedTripBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.opentripplanner.ext.siri;
package org.opentripplanner.updater.siri;

import static java.lang.Boolean.TRUE;
import static org.opentripplanner.model.PickDrop.NONE;
Expand All @@ -10,7 +10,6 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.opentripplanner.ext.siri.mapper.PickDropMapper;
import org.opentripplanner.framework.time.ServiceDateUtils;
import org.opentripplanner.transit.model.framework.DataValidationException;
import org.opentripplanner.transit.model.framework.Result;
Expand All @@ -21,6 +20,7 @@
import org.opentripplanner.transit.model.timetable.RealTimeState;
import org.opentripplanner.transit.model.timetable.RealTimeTripTimes;
import org.opentripplanner.transit.model.timetable.TripTimes;
import org.opentripplanner.updater.siri.mapper.PickDropMapper;
import org.opentripplanner.updater.spi.DataValidationExceptionMapper;
import org.opentripplanner.updater.spi.UpdateError;
import org.slf4j.Logger;
Expand Down
6 changes: 3 additions & 3 deletions ...ner/ext/siri/SiriAlertsUpdateHandler.java → ...updater/siri/SiriAlertsUpdateHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.opentripplanner.ext.siri;
package org.opentripplanner.updater.siri;

import java.time.Duration;
import java.time.ZonedDateTime;
Expand All @@ -8,8 +8,6 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.opentripplanner.ext.siri.mapper.AffectsMapper;
import org.opentripplanner.ext.siri.mapper.SiriSeverityMapper;
import org.opentripplanner.framework.i18n.I18NString;
import org.opentripplanner.framework.i18n.NonLocalizedString;
import org.opentripplanner.framework.i18n.TranslatedString;
Expand All @@ -21,6 +19,8 @@
import org.opentripplanner.routing.services.TransitAlertService;
import org.opentripplanner.transit.model.framework.FeedScopedId;
import org.opentripplanner.updater.RealTimeUpdateContext;
import org.opentripplanner.updater.siri.mapper.AffectsMapper;
import org.opentripplanner.updater.siri.mapper.SiriSeverityMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import uk.org.siri.siri20.DefaultedTextStructure;
Expand Down
2 changes: 1 addition & 1 deletion ...lanner/ext/siri/SiriFuzzyTripMatcher.java → ...er/updater/siri/SiriFuzzyTripMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.opentripplanner.ext.siri;
package org.opentripplanner.updater.siri;

import java.time.LocalDate;
import java.time.ZonedDateTime;
Expand Down
2 changes: 1 addition & 1 deletion ...ext/siri/SiriTimetableSnapshotSource.java → ...ter/siri/SiriTimetableSnapshotSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.opentripplanner.ext.siri;
package org.opentripplanner.updater.siri;

import static java.lang.Boolean.TRUE;
import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.NOT_MONITORED;
Expand Down
2 changes: 1 addition & 1 deletion ...lanner/ext/siri/SiriTripPatternCache.java → ...er/updater/siri/SiriTripPatternCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.opentripplanner.ext.siri;
package org.opentripplanner.updater.siri;

import java.time.LocalDate;
import java.util.HashMap;
Expand Down
2 changes: 1 addition & 1 deletion .../ext/siri/SiriTripPatternIdGenerator.java → ...ater/siri/SiriTripPatternIdGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.opentripplanner.ext.siri;
package org.opentripplanner.updater.siri;

import java.util.concurrent.atomic.AtomicInteger;
import org.opentripplanner.gtfs.GenerateTripPatternsOperation;
Expand Down
4 changes: 2 additions & 2 deletions ...tripplanner/ext/siri/TimetableHelper.java → ...planner/updater/siri/TimetableHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package org.opentripplanner.ext.siri;
package org.opentripplanner.updater.siri;

import static java.lang.Boolean.TRUE;

import java.time.ZonedDateTime;
import java.util.function.Supplier;
import org.opentripplanner.ext.siri.mapper.OccupancyMapper;
import org.opentripplanner.framework.i18n.NonLocalizedString;
import org.opentripplanner.framework.time.ServiceDateUtils;
import org.opentripplanner.transit.model.timetable.RealTimeTripTimes;
import org.opentripplanner.updater.siri.mapper.OccupancyMapper;
import uk.org.siri.siri20.NaturalLanguageStringStructure;
import uk.org.siri.siri20.OccupancyEnumeration;

Expand Down
2 changes: 1 addition & 1 deletion ...ntripplanner/ext/siri/TripAndPattern.java → ...pplanner/updater/siri/TripAndPattern.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.opentripplanner.ext.siri;
package org.opentripplanner.updater.siri;

import org.opentripplanner.transit.model.network.TripPattern;
import org.opentripplanner.transit.model.timetable.Trip;
Expand Down
2 changes: 1 addition & 1 deletion .../opentripplanner/ext/siri/TripUpdate.java → ...ntripplanner/updater/siri/TripUpdate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.opentripplanner.ext.siri;
package org.opentripplanner.updater.siri;

import java.time.LocalDate;
import java.util.Objects;
Expand Down
6 changes: 3 additions & 3 deletions ...lanner/ext/siri/mapper/AffectsMapper.java → ...er/updater/siri/mapper/AffectsMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
package org.opentripplanner.ext.siri.mapper;
package org.opentripplanner.updater.siri.mapper;

import java.io.Serializable;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.opentripplanner.ext.siri.EntityResolver;
import org.opentripplanner.ext.siri.SiriFuzzyTripMatcher;
import org.opentripplanner.routing.alertpatch.EntitySelector;
import org.opentripplanner.routing.alertpatch.StopCondition;
import org.opentripplanner.transit.model.framework.FeedScopedId;
import org.opentripplanner.transit.model.timetable.Trip;
import org.opentripplanner.transit.model.timetable.TripOnServiceDate;
import org.opentripplanner.transit.service.TransitService;
import org.opentripplanner.updater.siri.EntityResolver;
import org.opentripplanner.updater.siri.SiriFuzzyTripMatcher;
import uk.org.ifopt.siri20.StopPlaceRef;
import uk.org.siri.siri20.AffectedLineStructure;
import uk.org.siri.siri20.AffectedOperatorStructure;
Expand Down
2 changes: 1 addition & 1 deletion ...nner/ext/siri/mapper/OccupancyMapper.java → .../updater/siri/mapper/OccupancyMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.opentripplanner.ext.siri.mapper;
package org.opentripplanner.updater.siri.mapper;

import org.opentripplanner.transit.model.timetable.OccupancyStatus;
import uk.org.siri.siri20.OccupancyEnumeration;
Expand Down
4 changes: 2 additions & 2 deletions ...anner/ext/siri/mapper/PickDropMapper.java → ...r/updater/siri/mapper/PickDropMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package org.opentripplanner.ext.siri.mapper;
package org.opentripplanner.updater.siri.mapper;

import static java.lang.Boolean.TRUE;
import static org.opentripplanner.model.PickDrop.CANCELLED;
import static org.opentripplanner.model.PickDrop.NONE;
import static org.opentripplanner.model.PickDrop.SCHEDULED;

import java.util.Optional;
import org.opentripplanner.ext.siri.CallWrapper;
import org.opentripplanner.model.PickDrop;
import org.opentripplanner.updater.siri.CallWrapper;
import uk.org.siri.siri20.CallStatusEnumeration;

public class PickDropMapper {
Expand Down
2 changes: 1 addition & 1 deletion ...r/ext/siri/mapper/SiriSeverityMapper.java → ...dater/siri/mapper/SiriSeverityMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.opentripplanner.ext.siri.mapper;
package org.opentripplanner.updater.siri.mapper;

import org.opentripplanner.routing.alertpatch.AlertSeverity;
import uk.org.siri.siri20.SeverityEnumeration;
Expand Down
2 changes: 1 addition & 1 deletion .../siri/mapper/SiriTransportModeMapper.java → .../siri/mapper/SiriTransportModeMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.opentripplanner.ext.siri.mapper;
package org.opentripplanner.updater.siri.mapper;

import java.util.List;
import org.opentripplanner.transit.model.basic.TransitMode;
Expand Down
2 changes: 1 addition & 1 deletion ...ter/AsyncEstimatedTimetableProcessor.java → ...ter/AsyncEstimatedTimetableProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.opentripplanner.ext.siri.updater;
package org.opentripplanner.updater.siri.updater;

import java.util.concurrent.Future;
import java.util.function.Consumer;
Expand Down
2 changes: 1 addition & 1 deletion ...pdater/AsyncEstimatedTimetableSource.java → ...pdater/AsyncEstimatedTimetableSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.opentripplanner.ext.siri.updater;
package org.opentripplanner.updater.siri.updater;

import java.util.concurrent.Future;
import java.util.function.Function;
Expand Down
Loading
Loading