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
Support Fares v2 FareMedium and update spec implementation #5227
Support Fares v2 FareMedium and update spec implementation #5227
Conversation
Since I merged #5217 you will have to resolve the conflicts but I will leave a few comments nevertheless. |
src/ext/java/org/opentripplanner/ext/fares/model/LegProducts.java
Outdated
Show resolved
Hide resolved
src/ext/java/org/opentripplanner/ext/fares/model/FareTransferRule.java
Outdated
Show resolved
Hide resolved
src/ext/java/org/opentripplanner/ext/fares/model/FareLegRule.java
Outdated
Show resolved
Hide resolved
src/ext-test/java/org/opentripplanner/ext/fares/impl/GtfsFaresV2ServiceTest.java
Outdated
Show resolved
Hide resolved
src/main/java/org/opentripplanner/gtfs/mapping/FareProductMapper.java
Outdated
Show resolved
Hide resolved
src/main/java/org/opentripplanner/gtfs/mapping/FareProductMapper.java
Outdated
Show resolved
Hide resolved
src/ext/java/org/opentripplanner/ext/fares/model/FareLegRule.java
Outdated
Show resolved
Hide resolved
src/ext-test/java/org/opentripplanner/ext/fares/impl/GtfsFaresV2ServiceTest.java
Outdated
Show resolved
Hide resolved
OBA 1.4.4 has been released. I think you can pick this up again. |
e1421e8
to
a6be332
Compare
a6be332
to
6b20b34
Compare
@leonardehrenfried This just includes your own fares v2 relevant changes from ibi-group@1352ddf |
Codecov ReportPatch coverage:
Additional details and impacted files@@ Coverage Diff @@
## dev-2.x #5227 +/- ##
=============================================
+ Coverage 65.92% 65.93% +0.01%
- Complexity 14804 14811 +7
=============================================
Files 1770 1771 +1
Lines 68702 68727 +25
Branches 7283 7284 +1
=============================================
+ Hits 45289 45314 +25
+ Misses 20930 20927 -3
- Partials 2483 2486 +3
☔ View full report in Codecov by Sentry. |
My Flex PR has not been merged at OBA so lets just get this through review and I will take care of the Flex stuff. |
src/main/java/org/opentripplanner/gtfs/mapping/FareLegRuleMapper.java
Outdated
Show resolved
Hide resolved
src/test/java/org/opentripplanner/gtfs/mapping/FareLegRuleMapperTest.java
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have a few requests.
This follows the same format as FareLegRuleBuilder, for the easier creation of new FareProducts in tests.
Add some new test cases for FareLegRules, and update empty/null FareProduct checks in a couple places.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks great - thanks!
BTW, if you want to assert that something throws an exception, you can use Assertions.assertThrows
.
Our regular meetings will start again next week where I will hopefully be able to find a second reviewer. |
@vesameskanen I've taken the liberty to assign you to review. I hope this is ok. |
I looked through the otp main code - looks ok. I will leave the official review to others. |
@EmmaSimon I believe you don't have the permission to merge so I will do it. |
Summary
This updates OTP to support the changes made in OneBusAway/onebusaway-gtfs-modules#221, it isn't complete and only makes the necessary changes to get OTP to compile and build successfully using the onebusaway-gtfs-modules changes.
Issue
Related to OneBusAway/onebusaway-gtfs-modules#220, still need to create an issue in this repo for the changes to OTP
Unit tests