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.

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

Use SIRI-ET and GTFS-RT TripUpdates at the same time #6363

Open
wants to merge 26 commits into
base: dev-2.x
Choose a base branch
from

Conversation

leonardehrenfried
Copy link
Member

@leonardehrenfried leonardehrenfried commented Jan 7, 2025

Summary

Previously it was not possible to run SIRI-ET and GTFS-RT TripUpdates in the same instance. This PR changes it by cleaning up the relationships of the various real-time components.

A class diagram to show the new relationships is available in the issue #6348.

Issue

Closes #6348

Unit tests

Some unit tests updated.

Documentation

The new class diagram is available in this PR in doc/dev/diagrams/TimetableSnapshotManager.svg.

Bumping the serialization version id

While no actual entities have changed, but the TimetableRepository has which is serialized into the graph. Therefore we need to bump it.

cc @fahrplaner

@leonardehrenfried leonardehrenfried added Technical Debt Real-Time Update The issue/PR is related to RealTime updates bump serialization id Add this label if you want the serialization id automatically bumped after merging the PR labels Jan 7, 2025
@leonardehrenfried leonardehrenfried requested a review from a team as a code owner January 7, 2025 09:38
Copy link

codecov bot commented Jan 7, 2025

Codecov Report

Attention: Patch coverage is 76.11940% with 16 lines in your changes missing coverage. Please review.

Project coverage is 69.80%. Comparing base (12b5cb6) to head (d8991eb).
Report is 52 commits behind head on dev-2.x.

Files with missing lines Patch % Lines
...entripplanner/transit/configure/TransitModule.java 0.00% 5 Missing ⚠️
...planner/transit/service/DefaultTransitService.java 87.50% 4 Missing ⚠️
...ner/standalone/configure/ConstructApplication.java 0.00% 3 Missing ⚠️
...planner/updater/configure/UpdaterConfigurator.java 70.00% 3 Missing ⚠️
...oradapter/transit/mappers/TransitLayerUpdater.java 85.71% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@              Coverage Diff              @@
##             dev-2.x    #6363      +/-   ##
=============================================
+ Coverage      69.77%   69.80%   +0.02%     
- Complexity     18053    18079      +26     
=============================================
  Files           2060     2064       +4     
  Lines          77122    77154      +32     
  Branches        7856     7846      -10     
=============================================
+ Hits           53814    53858      +44     
+ Misses         20556    20543      -13     
- Partials        2752     2753       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@optionsome optionsome requested a review from vpaturet January 9, 2025 14:42
@leonardehrenfried leonardehrenfried changed the title Use SIRI-ET and GTFS-RT TripUpates at the same time Use SIRI-ET and GTFS-RT TripUpdates at the same time Jan 25, 2025
Copy link
Contributor

@vpaturet vpaturet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good. Just minor comments.

@vpaturet vpaturet self-requested a review January 29, 2025 10:27
Copy link
Contributor

@vpaturet vpaturet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You probably don't need to bump the serialization id since you change only a transient field.

@leonardehrenfried
Copy link
Member Author

So removing fields doesn't count as breaking backwards-compatibility?

@t2gran t2gran added this to the 2.7 (next release) milestone Jan 29, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bump serialization id Add this label if you want the serialization id automatically bumped after merging the PR Real-Time Update The issue/PR is related to RealTime updates Technical Debt
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Using SIRI-ET and GTFS-RT TripUpdates in the same instance
3 participants