Add a matcher API for filters in the transit service used for route lookup #6378
+625
−78
Conversation
This file contains 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
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## dev-2.x #6378 +/- ##
=============================================
+ Coverage 69.80% 69.85% +0.04%
- Complexity 17943 17977 +34
=============================================
Files 2046 2051 +5
Lines 76671 76731 +60
Branches 7830 7827 -3
=============================================
+ Hits 53521 53599 +78
+ Misses 20408 20389 -19
- Partials 2742 2743 +1 ☔ View full report in Codecov by Sentry. |
Comment on lines
+200
to
+202
| public Collection<Route> getRoutes(Collection<FeedScopedId> id) { | ||
| return id.stream().map(this::getRoute).filter(Objects::nonNull).toList(); | ||
| } |
There was a problem hiding this comment.
Suggested change
| public Collection<Route> getRoutes(Collection<FeedScopedId> id) { | |
| return id.stream().map(this::getRoute).filter(Objects::nonNull).toList(); | |
| } | |
| public Collection<Route> getRoutes(Collection<FeedScopedId> ids) { | |
| return ids.stream().map(this::getRoute).filter(Objects::nonNull).toList(); | |
| } |
There was a problem hiding this comment.
Sorry was a bit confused by the variable name.
Comment on lines
+39
to
+50
| new I18NString() { | ||
| @Override | ||
| public String toString() { | ||
| return "ROUTE1LONG"; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString(Locale locale) { | ||
| return "ROUTE1LONG"; | ||
| } | ||
| } | ||
| ) |
There was a problem hiding this comment.
Suggested change
| new I18NString() { | |
| @Override | |
| public String toString() { | |
| return "ROUTE1LONG"; | |
| } | |
| @Override | |
| public String toString(Locale locale) { | |
| return "ROUTE1LONG"; | |
| } | |
| } | |
| ) | |
| I28NString.of("ROUTE1") |
What is the reason you went for your own implementation?
Comment on lines
+65
to
+75
| new I18NString() { | ||
| @Override | ||
| public String toString() { | ||
| return "ROUTE2LONG"; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString(Locale locale) { | ||
| return "ROUTE2LONG"; | ||
| } | ||
| } |
Comment on lines
+56
to
+60
| Agency | ||
| .of(new FeedScopedId("otherFeedId", "otherAgencyId")) | ||
| .withName("OTHER_AGENCY") | ||
| .withTimezone("Europe/Oslo") | ||
| .build() |
There was a problem hiding this comment.
You may find TimetableRepositoryForTest.agency useful.
leonardehrenfried
requested changes
Jan 15, 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 change allows for a clean separation of concerns and lays the path for more efficient filtering logic down the line.
The functionality is backwards compatible, though there may be a discussion here that it should not be and that we should instead improve on some of the choices made earlier. For instance whether the longName check should really be a case insensitive prefix match.
Issue
#5630
Unit tests
Added unit tests for each matcher and the new RegularStopMatcherFactory. Also ensured that the API in local runs behaves as expected.
Documentation
Added JavaDoc.