Merge pull request #6485 from leonardehrenfried/siri-gtfs-packages

Clean up SIRI and GTFS-RT package structure
opentripplanner · Feb 25, 2025 · b9ebbd3 · b9ebbd3
2 parents 7a060aa + c01a9f9
commit b9ebbd3
Show file tree

Hide file tree

Showing 114 changed files with 239 additions and 215 deletions.
diff --git a/application/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureETUpdater.java b/application/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureETUpdater.java
@@ -15,11 +15,11 @@
 import java.util.function.Consumer;
 import javax.xml.stream.XMLStreamException;
 import org.apache.hc.core5.net.URIBuilder;
-import org.opentripplanner.updater.siri.SiriRealTimeTripUpdateAdapter;
 import org.opentripplanner.updater.spi.ResultLogger;
 import org.opentripplanner.updater.spi.UpdateResult;
 import org.opentripplanner.updater.trip.UpdateIncrementality;
 import org.opentripplanner.updater.trip.metrics.TripUpdateMetrics;
+import org.opentripplanner.updater.trip.siri.SiriRealTimeTripUpdateAdapter;
 import org.rutebanken.siri20.util.SiriXml;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/application/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureSXUpdater.java b/application/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureSXUpdater.java
@@ -19,7 +19,7 @@
 import org.opentripplanner.routing.services.TransitAlertService;
 import org.opentripplanner.transit.service.TimetableRepository;
 import org.opentripplanner.updater.alert.TransitAlertProvider;
-import org.opentripplanner.updater.siri.SiriAlertsUpdateHandler;
+import org.opentripplanner.updater.alert.siri.SiriAlertsUpdateHandler;
 import org.rutebanken.siri20.util.SiriXml;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java b/application/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java
@@ -72,7 +72,7 @@
 import org.opentripplanner.transit.model.timetable.Trip;
 import org.opentripplanner.transit.model.timetable.TripOnServiceDate;
 import org.opentripplanner.transit.service.TransitService;
-import org.opentripplanner.updater.GtfsRealtimeFuzzyTripMatcher;
+import org.opentripplanner.updater.trip.gtfs.GtfsRealtimeFuzzyTripMatcher;
 import org.opentripplanner.utils.time.ServiceDateUtils;
 
 public class QueryTypeImpl implements GraphQLDataFetchers.GraphQLQueryType {

diff --git a/...tion/src/main/java/org/opentripplanner/standalone/config/routerconfig/UpdatersConfig.java b/...tion/src/main/java/org/opentripplanner/standalone/config/routerconfig/UpdatersConfig.java
@@ -44,14 +44,14 @@
 import org.opentripplanner.standalone.config.sandbox.VehicleRentalServiceDirectoryFetcherConfig;
 import org.opentripplanner.updater.TimetableSnapshotParameters;
 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.siri.updater.lite.SiriETLiteUpdaterParameters;
-import org.opentripplanner.updater.siri.updater.lite.SiriSXLiteUpdaterParameters;
-import org.opentripplanner.updater.trip.MqttGtfsRealtimeUpdaterParameters;
-import org.opentripplanner.updater.trip.PollingTripUpdaterParameters;
+import org.opentripplanner.updater.alert.gtfs.GtfsRealtimeAlertsUpdaterParameters;
+import org.opentripplanner.updater.alert.siri.SiriSXUpdaterParameters;
+import org.opentripplanner.updater.alert.siri.lite.SiriSXLiteUpdaterParameters;
+import org.opentripplanner.updater.trip.gtfs.updater.http.PollingTripUpdaterParameters;
+import org.opentripplanner.updater.trip.gtfs.updater.mqtt.MqttGtfsRealtimeUpdaterParameters;
+import org.opentripplanner.updater.trip.siri.updater.SiriETUpdaterParameters;
+import org.opentripplanner.updater.trip.siri.updater.google.SiriETGooglePubsubUpdaterParameters;
+import org.opentripplanner.updater.trip.siri.updater.lite.SiriETLiteUpdaterParameters;
 import org.opentripplanner.updater.vehicle_parking.VehicleParkingUpdaterParameters;
 import org.opentripplanner.updater.vehicle_position.VehiclePositionsUpdaterParameters;
 import org.opentripplanner.updater.vehicle_rental.VehicleRentalUpdaterParameters;

diff --git a/...ntripplanner/standalone/config/routerconfig/updaters/GtfsRealtimeAlertsUpdaterConfig.java b/...ntripplanner/standalone/config/routerconfig/updaters/GtfsRealtimeAlertsUpdaterConfig.java
@@ -5,7 +5,7 @@
 
 import java.time.Duration;
 import org.opentripplanner.standalone.config.framework.json.NodeAdapter;
-import org.opentripplanner.updater.alert.GtfsRealtimeAlertsUpdaterParameters;
+import org.opentripplanner.updater.alert.gtfs.GtfsRealtimeAlertsUpdaterParameters;
 
 public class GtfsRealtimeAlertsUpdaterConfig {
 

diff --git a/...pentripplanner/standalone/config/routerconfig/updaters/MqttGtfsRealtimeUpdaterConfig.java b/...pentripplanner/standalone/config/routerconfig/updaters/MqttGtfsRealtimeUpdaterConfig.java
@@ -4,8 +4,8 @@
 import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_2;
 
 import org.opentripplanner.standalone.config.framework.json.NodeAdapter;
-import org.opentripplanner.updater.trip.BackwardsDelayPropagationType;
-import org.opentripplanner.updater.trip.MqttGtfsRealtimeUpdaterParameters;
+import org.opentripplanner.updater.trip.gtfs.BackwardsDelayPropagationType;
+import org.opentripplanner.updater.trip.gtfs.updater.mqtt.MqttGtfsRealtimeUpdaterParameters;
 
 public class MqttGtfsRealtimeUpdaterConfig {
 

diff --git a/...org/opentripplanner/standalone/config/routerconfig/updaters/PollingTripUpdaterConfig.java b/...org/opentripplanner/standalone/config/routerconfig/updaters/PollingTripUpdaterConfig.java
@@ -6,8 +6,8 @@
 
 import java.time.Duration;
 import org.opentripplanner.standalone.config.framework.json.NodeAdapter;
-import org.opentripplanner.updater.trip.BackwardsDelayPropagationType;
-import org.opentripplanner.updater.trip.PollingTripUpdaterParameters;
+import org.opentripplanner.updater.trip.gtfs.BackwardsDelayPropagationType;
+import org.opentripplanner.updater.trip.gtfs.updater.http.PollingTripUpdaterParameters;
 
 public class PollingTripUpdaterConfig {
 

diff --git a/...ntripplanner/standalone/config/routerconfig/updaters/SiriETGooglePubsubUpdaterConfig.java b/...ntripplanner/standalone/config/routerconfig/updaters/SiriETGooglePubsubUpdaterConfig.java
@@ -2,11 +2,11 @@
 
 import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_1;
 import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_7;
-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 static org.opentripplanner.updater.trip.siri.updater.google.SiriETGooglePubsubUpdaterParameters.INITIAL_GET_DATA_TIMEOUT;
+import static org.opentripplanner.updater.trip.siri.updater.google.SiriETGooglePubsubUpdaterParameters.RECONNECT_PERIOD;
 
 import org.opentripplanner.standalone.config.framework.json.NodeAdapter;
-import org.opentripplanner.updater.siri.updater.google.SiriETGooglePubsubUpdaterParameters;
+import org.opentripplanner.updater.trip.siri.updater.google.SiriETGooglePubsubUpdaterParameters;
 
 public class SiriETGooglePubsubUpdaterConfig {
 

diff --git a/.../org/opentripplanner/standalone/config/routerconfig/updaters/SiriETLiteUpdaterConfig.java b/.../org/opentripplanner/standalone/config/routerconfig/updaters/SiriETLiteUpdaterConfig.java
@@ -4,7 +4,7 @@
 
 import java.time.Duration;
 import org.opentripplanner.standalone.config.framework.json.NodeAdapter;
-import org.opentripplanner.updater.siri.updater.lite.SiriETLiteUpdaterParameters;
+import org.opentripplanner.updater.trip.siri.updater.lite.SiriETLiteUpdaterParameters;
 
 public class SiriETLiteUpdaterConfig {
 

diff --git a/...java/org/opentripplanner/standalone/config/routerconfig/updaters/SiriETUpdaterConfig.java b/...java/org/opentripplanner/standalone/config/routerconfig/updaters/SiriETUpdaterConfig.java
@@ -6,7 +6,7 @@
 
 import java.time.Duration;
 import org.opentripplanner.standalone.config.framework.json.NodeAdapter;
-import org.opentripplanner.updater.siri.updater.SiriETUpdaterParameters;
+import org.opentripplanner.updater.trip.siri.updater.SiriETUpdaterParameters;
 
 public class SiriETUpdaterConfig {
 

diff --git a/.../org/opentripplanner/standalone/config/routerconfig/updaters/SiriSXLiteUpdaterConfig.java b/.../org/opentripplanner/standalone/config/routerconfig/updaters/SiriSXLiteUpdaterConfig.java
@@ -5,7 +5,7 @@
 
 import java.time.Duration;
 import org.opentripplanner.standalone.config.framework.json.NodeAdapter;
-import org.opentripplanner.updater.siri.updater.lite.SiriSXLiteUpdaterParameters;
+import org.opentripplanner.updater.alert.siri.lite.SiriSXLiteUpdaterParameters;
 
 public class SiriSXLiteUpdaterConfig {
 

diff --git a/...java/org/opentripplanner/standalone/config/routerconfig/updaters/SiriSXUpdaterConfig.java b/...java/org/opentripplanner/standalone/config/routerconfig/updaters/SiriSXUpdaterConfig.java
@@ -5,7 +5,7 @@
 
 import java.time.Duration;
 import org.opentripplanner.standalone.config.framework.json.NodeAdapter;
-import org.opentripplanner.updater.siri.updater.SiriSXUpdaterParameters;
+import org.opentripplanner.updater.alert.siri.SiriSXUpdaterParameters;
 
 public class SiriSXUpdaterConfig {
 

diff --git a/application/src/main/java/org/opentripplanner/updater/DefaultRealTimeUpdateContext.java b/application/src/main/java/org/opentripplanner/updater/DefaultRealTimeUpdateContext.java
@@ -5,8 +5,9 @@
 import org.opentripplanner.transit.service.DefaultTransitService;
 import org.opentripplanner.transit.service.TimetableRepository;
 import org.opentripplanner.transit.service.TransitService;
-import org.opentripplanner.updater.siri.EntityResolver;
-import org.opentripplanner.updater.siri.SiriFuzzyTripMatcher;
+import org.opentripplanner.updater.trip.gtfs.GtfsRealtimeFuzzyTripMatcher;
+import org.opentripplanner.updater.trip.siri.EntityResolver;
+import org.opentripplanner.updater.trip.siri.SiriFuzzyTripMatcher;
 
 public class DefaultRealTimeUpdateContext implements RealTimeUpdateContext {
 

diff --git a/application/src/main/java/org/opentripplanner/updater/RealTimeUpdateContext.java b/application/src/main/java/org/opentripplanner/updater/RealTimeUpdateContext.java
@@ -2,8 +2,9 @@
 
 import org.opentripplanner.routing.graph.Graph;
 import org.opentripplanner.transit.service.TransitService;
-import org.opentripplanner.updater.siri.EntityResolver;
-import org.opentripplanner.updater.siri.SiriFuzzyTripMatcher;
+import org.opentripplanner.updater.trip.gtfs.GtfsRealtimeFuzzyTripMatcher;
+import org.opentripplanner.updater.trip.siri.EntityResolver;
+import org.opentripplanner.updater.trip.siri.SiriFuzzyTripMatcher;
 
 /**
  * Give access to the transit data and street model in the context of a real-time updater.

diff --git a/application/src/main/java/org/opentripplanner/updater/UpdatersParameters.java b/application/src/main/java/org/opentripplanner/updater/UpdatersParameters.java
@@ -4,14 +4,14 @@
 import org.opentripplanner.ext.siri.updater.azure.SiriAzureETUpdaterParameters;
 import org.opentripplanner.ext.siri.updater.azure.SiriAzureSXUpdaterParameters;
 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.siri.updater.lite.SiriETLiteUpdaterParameters;
-import org.opentripplanner.updater.siri.updater.lite.SiriSXLiteUpdaterParameters;
-import org.opentripplanner.updater.trip.MqttGtfsRealtimeUpdaterParameters;
-import org.opentripplanner.updater.trip.PollingTripUpdaterParameters;
+import org.opentripplanner.updater.alert.gtfs.GtfsRealtimeAlertsUpdaterParameters;
+import org.opentripplanner.updater.alert.siri.SiriSXUpdaterParameters;
+import org.opentripplanner.updater.alert.siri.lite.SiriSXLiteUpdaterParameters;
+import org.opentripplanner.updater.trip.gtfs.updater.http.PollingTripUpdaterParameters;
+import org.opentripplanner.updater.trip.gtfs.updater.mqtt.MqttGtfsRealtimeUpdaterParameters;
+import org.opentripplanner.updater.trip.siri.updater.SiriETUpdaterParameters;
+import org.opentripplanner.updater.trip.siri.updater.google.SiriETGooglePubsubUpdaterParameters;
+import org.opentripplanner.updater.trip.siri.updater.lite.SiriETLiteUpdaterParameters;
 import org.opentripplanner.updater.vehicle_parking.VehicleParkingUpdaterParameters;
 import org.opentripplanner.updater.vehicle_position.VehiclePositionsUpdaterParameters;
 import org.opentripplanner.updater.vehicle_rental.VehicleRentalUpdaterParameters;

diff --git a/...er/updater/alert/AlertsUpdateHandler.java → ...dater/alert/gtfs/AlertsUpdateHandler.java b/...er/updater/alert/AlertsUpdateHandler.java → ...dater/alert/gtfs/AlertsUpdateHandler.java
@@ -1,8 +1,8 @@
-package org.opentripplanner.updater.alert;
+package org.opentripplanner.updater.alert.gtfs;
 
-import static org.opentripplanner.updater.alert.GtfsRealtimeCauseMapper.getAlertCauseForGtfsRtCause;
-import static org.opentripplanner.updater.alert.GtfsRealtimeEffectMapper.getAlertEffectForGtfsRtEffect;
-import static org.opentripplanner.updater.alert.GtfsRealtimeSeverityMapper.getAlertSeverityForGtfsRtSeverity;
+import static org.opentripplanner.updater.alert.gtfs.mapping.GtfsRealtimeCauseMapper.getAlertCauseForGtfsRtCause;
+import static org.opentripplanner.updater.alert.gtfs.mapping.GtfsRealtimeEffectMapper.getAlertEffectForGtfsRtEffect;
+import static org.opentripplanner.updater.alert.gtfs.mapping.GtfsRealtimeSeverityMapper.getAlertSeverityForGtfsRtSeverity;
 
 import com.google.transit.realtime.GtfsRealtime;
 import com.google.transit.realtime.GtfsRealtime.FeedEntity;
@@ -23,7 +23,7 @@
 import org.opentripplanner.routing.alertpatch.TransitAlertBuilder;
 import org.opentripplanner.routing.services.TransitAlertService;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
-import org.opentripplanner.updater.GtfsRealtimeFuzzyTripMatcher;
+import org.opentripplanner.updater.trip.gtfs.GtfsRealtimeFuzzyTripMatcher;
 
 /**
  * This updater only includes GTFS-Realtime Service Alert feeds.

diff --git a/...ater/alert/GtfsRealtimeAlertsUpdater.java → ...alert/gtfs/GtfsRealtimeAlertsUpdater.java b/...ater/alert/GtfsRealtimeAlertsUpdater.java → ...alert/gtfs/GtfsRealtimeAlertsUpdater.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.updater.alert;
+package org.opentripplanner.updater.alert.gtfs;
 
 import com.google.transit.realtime.GtfsRealtime.FeedMessage;
 import java.net.URI;
@@ -8,9 +8,9 @@
 import org.opentripplanner.routing.impl.TransitAlertServiceImpl;
 import org.opentripplanner.routing.services.TransitAlertService;
 import org.opentripplanner.transit.service.TimetableRepository;
+import org.opentripplanner.updater.alert.TransitAlertProvider;
 import org.opentripplanner.updater.spi.HttpHeaders;
 import org.opentripplanner.updater.spi.PollingGraphUpdater;
-import org.opentripplanner.updater.spi.WriteToGraphCallback;
 import org.opentripplanner.utils.tostring.ToStringBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/.../GtfsRealtimeAlertsUpdaterParameters.java → .../GtfsRealtimeAlertsUpdaterParameters.java b/.../GtfsRealtimeAlertsUpdaterParameters.java → .../GtfsRealtimeAlertsUpdaterParameters.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.updater.alert;
+package org.opentripplanner.updater.alert.gtfs;
 
 import java.time.Duration;
 import org.opentripplanner.updater.spi.HttpHeaders;

diff --git a/...pdater/alert/GtfsRealtimeCauseMapper.java → ...gtfs/mapping/GtfsRealtimeCauseMapper.java b/...pdater/alert/GtfsRealtimeCauseMapper.java → ...gtfs/mapping/GtfsRealtimeCauseMapper.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.updater.alert;
+package org.opentripplanner.updater.alert.gtfs.mapping;
 
 import com.google.transit.realtime.GtfsRealtime.Alert.Cause;
 import org.opentripplanner.routing.alertpatch.AlertCause;

diff --git a/...dater/alert/GtfsRealtimeEffectMapper.java → ...tfs/mapping/GtfsRealtimeEffectMapper.java b/...dater/alert/GtfsRealtimeEffectMapper.java → ...tfs/mapping/GtfsRealtimeEffectMapper.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.updater.alert;
+package org.opentripplanner.updater.alert.gtfs.mapping;
 
 import com.google.transit.realtime.GtfsRealtime.Alert.Effect;
 import org.opentripplanner.routing.alertpatch.AlertEffect;

diff --git a/...ter/alert/GtfsRealtimeSeverityMapper.java → ...s/mapping/GtfsRealtimeSeverityMapper.java b/...ter/alert/GtfsRealtimeSeverityMapper.java → ...s/mapping/GtfsRealtimeSeverityMapper.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.updater.alert;
+package org.opentripplanner.updater.alert.gtfs.mapping;
 
 import com.google.transit.realtime.GtfsRealtime.Alert.SeverityLevel;
 import org.opentripplanner.routing.alertpatch.AlertSeverity;

diff --git a/...updater/siri/SiriAlertsUpdateHandler.java → ...r/alert/siri/SiriAlertsUpdateHandler.java b/...updater/siri/SiriAlertsUpdateHandler.java → ...r/alert/siri/SiriAlertsUpdateHandler.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.updater.siri;
+package org.opentripplanner.updater.alert.siri;
 
 import java.time.Duration;
 import java.time.ZonedDateTime;
@@ -19,8 +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.opentripplanner.updater.alert.siri.mapping.AffectsMapper;
+import org.opentripplanner.updater.alert.siri.mapping.SiriSeverityMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import uk.org.siri.siri20.DefaultedTextStructure;

diff --git a/...r/updater/siri/updater/SiriSXUpdater.java → ...ner/updater/alert/siri/SiriSXUpdater.java b/...r/updater/siri/updater/SiriSXUpdater.java → ...ner/updater/alert/siri/SiriSXUpdater.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.updater.siri.updater;
+package org.opentripplanner.updater.alert.siri;
 
 import java.time.Duration;
 import java.time.ZonedDateTime;
@@ -11,9 +11,9 @@
 import org.opentripplanner.routing.services.TransitAlertService;
 import org.opentripplanner.transit.service.TimetableRepository;
 import org.opentripplanner.updater.alert.TransitAlertProvider;
-import org.opentripplanner.updater.siri.SiriAlertsUpdateHandler;
 import org.opentripplanner.updater.spi.PollingGraphUpdater;
 import org.opentripplanner.updater.spi.PollingGraphUpdaterParameters;
+import org.opentripplanner.updater.support.siri.SiriLoader;
 import org.opentripplanner.updater.trip.UrlUpdaterParameters;
 import org.opentripplanner.utils.tostring.ToStringBuilder;
 import org.slf4j.Logger;

diff --git a/...siri/updater/SiriSXUpdaterParameters.java → ...r/alert/siri/SiriSXUpdaterParameters.java b/...siri/updater/SiriSXUpdaterParameters.java → ...r/alert/siri/SiriSXUpdaterParameters.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.updater.siri.updater;
+package org.opentripplanner.updater.alert.siri;
 
 import java.time.Duration;
 import org.opentripplanner.updater.spi.HttpHeaders;

diff --git a/...siri/updater/lite/SiriLiteHttpLoader.java → ...r/alert/siri/lite/SiriLiteHttpLoader.java b/...siri/updater/lite/SiriLiteHttpLoader.java → ...r/alert/siri/lite/SiriLiteHttpLoader.java
@@ -1,13 +1,13 @@
-package org.opentripplanner.updater.siri.updater.lite;
+package org.opentripplanner.updater.alert.siri.lite;
 
 import java.net.URI;
 import java.time.Duration;
 import java.util.Optional;
 import org.opentripplanner.framework.io.OtpHttpClient;
 import org.opentripplanner.framework.io.OtpHttpClientFactory;
-import org.opentripplanner.updater.siri.updater.SiriHelper;
-import org.opentripplanner.updater.siri.updater.SiriLoader;
 import org.opentripplanner.updater.spi.HttpHeaders;
+import org.opentripplanner.updater.support.siri.SiriHelper;
+import org.opentripplanner.updater.support.siri.SiriLoader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import uk.org.siri.siri20.Siri;

diff --git a/...ter/lite/SiriSXLiteUpdaterParameters.java → ...iri/lite/SiriSXLiteUpdaterParameters.java b/...ter/lite/SiriSXLiteUpdaterParameters.java → ...iri/lite/SiriSXLiteUpdaterParameters.java
@@ -1,8 +1,8 @@
-package org.opentripplanner.updater.siri.updater.lite;
+package org.opentripplanner.updater.alert.siri.lite;
 
 import java.net.URI;
 import java.time.Duration;
-import org.opentripplanner.updater.siri.updater.SiriSXUpdater;
+import org.opentripplanner.updater.alert.siri.SiriSXUpdater;
 import org.opentripplanner.updater.spi.HttpHeaders;
 
 public record SiriSXLiteUpdaterParameters(

diff --git a/...er/updater/siri/mapper/AffectsMapper.java → ...ter/alert/siri/mapping/AffectsMapper.java b/...er/updater/siri/mapper/AffectsMapper.java → ...ter/alert/siri/mapping/AffectsMapper.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.updater.siri.mapper;
+package org.opentripplanner.updater.alert.siri.mapping;
 
 import java.io.Serializable;
 import java.time.LocalDate;
@@ -12,8 +12,8 @@
 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 org.opentripplanner.updater.trip.siri.EntityResolver;
+import org.opentripplanner.updater.trip.siri.SiriFuzzyTripMatcher;
 import uk.org.ifopt.siri20.StopPlaceRef;
 import uk.org.siri.siri20.AffectedLineStructure;
 import uk.org.siri.siri20.AffectedOperatorStructure;

diff --git a/...dater/siri/mapper/SiriSeverityMapper.java → ...lert/siri/mapping/SiriSeverityMapper.java b/...dater/siri/mapper/SiriSeverityMapper.java → ...lert/siri/mapping/SiriSeverityMapper.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.updater.siri.mapper;
+package org.opentripplanner.updater.alert.siri.mapping;
 
 import org.opentripplanner.routing.alertpatch.AlertSeverity;
 import uk.org.siri.siri20.SeverityEnumeration;

diff --git a/.../siri/mapper/SiriTransportModeMapper.java → ...siri/mapping/SiriTransportModeMapper.java b/.../siri/mapper/SiriTransportModeMapper.java → ...siri/mapping/SiriTransportModeMapper.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.updater.siri.mapper;
+package org.opentripplanner.updater.alert.siri.mapping;
 
 import java.util.List;
 import org.opentripplanner.transit.model.basic.TransitMode;

diff --git a/.../updater/configure/SiriUpdaterModule.java → .../updater/configure/SiriUpdaterModule.java b/.../updater/configure/SiriUpdaterModule.java → .../updater/configure/SiriUpdaterModule.java
@@ -1,23 +1,23 @@
-package org.opentripplanner.updater.siri.updater.configure;
+package org.opentripplanner.updater.configure;
 
 import java.util.function.Consumer;
 import org.opentripplanner.transit.service.TimetableRepository;
-import org.opentripplanner.updater.siri.SiriRealTimeTripUpdateAdapter;
-import org.opentripplanner.updater.siri.updater.EstimatedTimetableSource;
-import org.opentripplanner.updater.siri.updater.SiriETHttpTripUpdateSource;
-import org.opentripplanner.updater.siri.updater.SiriETUpdater;
-import org.opentripplanner.updater.siri.updater.SiriETUpdaterParameters;
-import org.opentripplanner.updater.siri.updater.SiriFileLoader;
-import org.opentripplanner.updater.siri.updater.SiriHttpLoader;
-import org.opentripplanner.updater.siri.updater.SiriLoader;
-import org.opentripplanner.updater.siri.updater.SiriSXUpdater;
-import org.opentripplanner.updater.siri.updater.SiriSXUpdaterParameters;
-import org.opentripplanner.updater.siri.updater.lite.SiriETLiteHttpTripUpdateSource;
-import org.opentripplanner.updater.siri.updater.lite.SiriETLiteUpdaterParameters;
-import org.opentripplanner.updater.siri.updater.lite.SiriLiteHttpLoader;
-import org.opentripplanner.updater.siri.updater.lite.SiriSXLiteUpdaterParameters;
+import org.opentripplanner.updater.alert.siri.SiriSXUpdater;
+import org.opentripplanner.updater.alert.siri.SiriSXUpdaterParameters;
+import org.opentripplanner.updater.alert.siri.lite.SiriLiteHttpLoader;
+import org.opentripplanner.updater.alert.siri.lite.SiriSXLiteUpdaterParameters;
 import org.opentripplanner.updater.spi.UpdateResult;
+import org.opentripplanner.updater.support.siri.SiriFileLoader;
+import org.opentripplanner.updater.support.siri.SiriHttpLoader;
+import org.opentripplanner.updater.support.siri.SiriLoader;
 import org.opentripplanner.updater.trip.metrics.TripUpdateMetrics;
+import org.opentripplanner.updater.trip.siri.SiriRealTimeTripUpdateAdapter;
+import org.opentripplanner.updater.trip.siri.updater.EstimatedTimetableSource;
+import org.opentripplanner.updater.trip.siri.updater.SiriETHttpTripUpdateSource;
+import org.opentripplanner.updater.trip.siri.updater.SiriETUpdater;
+import org.opentripplanner.updater.trip.siri.updater.SiriETUpdaterParameters;
+import org.opentripplanner.updater.trip.siri.updater.lite.SiriETLiteHttpTripUpdateSource;
+import org.opentripplanner.updater.trip.siri.updater.lite.SiriETLiteUpdaterParameters;
 
 /**
  * Dependency injection for instantiating SIRI-ET and SX updaters.