Skip to content

Conversation

@lassetyr
Copy link
Contributor

Summary

Replaces the usage of proprietary protobuf-format for SIRI ET-data with standard XML.

Issue

The protobuf-solution was very sensitive to changes, and upgrading protobuf-java (e.g. as in #6342) caused OTP to no longer being able to process SIRI ET-data.

@codecov
Copy link

codecov bot commented Jan 28, 2025

Codecov Report

Attention: Patch coverage is 0% with 3 lines in your changes missing coverage. Please review.

Project coverage is 69.79%. Comparing base (47dece2) to head (f3d4028).
Report is 157 commits behind head on dev-2.x.

✅ All tests successful. No failed tests found.

Files with missing lines Patch % Lines
...r/google/GooglePubsubEstimatedTimetableSource.java 0.00% 3 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             dev-2.x    #6409   +/-   ##
==========================================
  Coverage      69.79%   69.79%           
  Complexity     18089    18089           
==========================================
  Files           2064     2064           
  Lines          77209    77208    -1     
  Branches        7859     7859           
==========================================
  Hits           53886    53886           
  Misses         20566    20566           
+ Partials        2757     2756    -1     

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

@t2gran t2gran added this to the 2.7 (next release) milestone Jan 29, 2025
@vpaturet vpaturet marked this pull request as ready for review January 29, 2025 15:00
@vpaturet vpaturet requested a review from a team as a code owner January 29, 2025 15:00
@vpaturet vpaturet added the Entur Test This is currently being tested at Entur label Jan 29, 2025
@vpaturet vpaturet self-requested a review January 29, 2025 15:00
Copy link
Member

@leonardehrenfried leonardehrenfried left a comment

Choose a reason for hiding this comment

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

This doesn't touch the core code at all and seems reasonable, so I approve.

I have not tested that it actually works.

@leonardehrenfried
Copy link
Member

It seems that the new CI workflow is somehow not triggered since this PR was opened beforehand.

Let me know if you want me to admin-merge this.

@vpaturet
Copy link
Contributor

vpaturet commented Feb 7, 2025

@leonardehrenfried yes, please merge.

@leonardehrenfried leonardehrenfried merged commit 1fde037 into dev-2.x Feb 7, 2025
5 checks passed
@leonardehrenfried leonardehrenfried deleted the entur_replace_siri_pbf_with_xml branch February 7, 2025 13:36
t2gran pushed a commit that referenced this pull request Feb 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Entur Test This is currently being tested at Entur

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants