Change the TripRequest and builder to work with include lists instead of just the FilterValues #6525
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…d of just the FilterValues. Also introduces a NullIsEverything FilterValues which better encapsulates the logic of an include collection (which is that an empty should match nothing, but a null should match everything).
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## dev-2.x #6525 +/- ##
=============================================
+ Coverage 70.17% 70.25% +0.07%
- Complexity 18312 18373 +61
=============================================
Files 2082 2088 +6
Lines 77214 77377 +163
Branches 7831 7839 +8
=============================================
+ Hits 54188 54358 +170
+ Misses 20256 20244 -12
- Partials 2770 2775 +5 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
...n/src/test/java/org/opentripplanner/transit/model/filter/transit/TripMatcherFactoryTest.java
Outdated
Show resolved
Hide resolved
t2gran
previously approved these changes
Mar 13, 2025
leonardehrenfried
previously approved these changes
Mar 13, 2025
leonardehrenfried
approved these changes
Mar 17, 2025
t2gran
pushed a commit
that referenced
this pull request
Mar 17, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This PR changes the behaviour of the ServiceJourneys Transmodel API endpoint so that null or unset values match everything, but empty lists match nothing.
This is different from today's production where arguments set to empty lists match everything, just like null or unset values. For example: https://api.entur.io/graphql-explorer/journey-planner-v3?query=%7BserviceJourneys%28authorities%3Anull%29%7Bid%7D%7D
Today's behaviour where everything is returned causes errors:
While the new behaviour causes empty lists to be returned (because nothing is matched):
Behaviour for null or unset arguments is the same (error because of too many results).
Issue
#5630
Unit tests
Tested with unit tests on the matcher resulting from the TripMatcherFactory, and by running locally.