Upgrade to NeTEx 2.0 schema #270
Open
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
vpaturet
force-pushed
the
upgrade-netex-2.0
branch
2 times, most recently
from
11e1aef to
0e84185
Compare
|
vpaturet
force-pushed
the
upgrade-netex-2.0
branch
from
0e84185 to
e0d9a96
Compare
vpaturet
added a commit
to entur/OpenTripPlanner
that referenced
this pull request
Feb 3, 2026
This update adapts OTP to the breaking changes in netex-java-model 3.0.0-SNAPSHOT based on the NeTEx 2.0 schema. Key changes include: Breaking API changes addressed: - MultilingualString: Uses mixed content model - getContent() returns List<Serializable> instead of getValue() returning String. Added MultilingualStringMapper.getStringValue() helper method. - Enum rename: AllVehicleModesOfTransportEnumeration renamed to AllPublicTransportModesEnumeration. - Collection getter naming: Some methods renamed with _Dummy suffix (e.g., getLine_Dummy(), getRoute_Dummy()). - PublicCode/PrivateCode: Now return structure types requiring .getValue() to get String. - StopPlacesInFrame_RelStructure: Now returns List<StopPlace> directly instead of wrapped JAXBElements. - DatedServiceJourney: getJourneyRef() returns single element instead of List, uses getReplacedJourneys() for replacements. - ServiceAlterationEnumeration: New PROVISIONAL value added, mapped to PLANNED. See: entur/netex-java-model#270
- Update bindings.xjb for NeTEx 2.0 schema changes: - TariffZone_ renamed to TariffZone_Dummy - Remove obsolete HeadwayJourneyGroupGroup/Description binding - Add bindings to resolve ObjectFactory collisions for bookingArrangements - Update tests for NeTEx 2.0 API changes: - MultilingualString now uses mixed content (withContent/getContent) - Collection getters renamed with _Dummy suffix - StopPlacesInFrame returns List<StopPlace> directly - AllVehicleModesOfTransportEnumeration -> AllPublicTransportModesEnumeration - PublicCode/PrivateCode now use structure types - Replace removed DatedCall tests with AvailabilityCondition tests - Add helper method getStringValue() for MultilingualString
vpaturet
force-pushed
the
upgrade-netex-2.0
branch
from
e0d9a96 to
3ba2a76
Compare
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
Upgrade the NeTEx schema from version 1.16 to 2.0.
Changes
JAXB Bindings (bindings.xjb)
TariffZone_→TariffZone_Dummy(renamed in 2.0)HeadwayJourneyGroupGroup/Descriptionbinding (element removed in 2.0)bookingArrangementsvsBookingArrangementsin multiple XSD filesTest Updates
Updated all tests for NeTEx 2.0 API changes:
MultilingualStringnow uses mixed content model (withContent()/getContent()instead ofwithValue()/getValue())_Dummysuffix (e.g.,getLine_()→getLine_Dummy())StopPlacesInFrame_RelStructurenow returnsList<StopPlace>directly instead of wrapped JAXBElementsAllVehicleModesOfTransportEnumerationrenamed toAllPublicTransportModesEnumerationPublicCodeandPrivateCodenow use structure types with.getValue()methodDatedCallclass tests withAvailabilityConditiontestsgetStringValue(MultilingualString)for extracting text from mixed contentTesting
All 18 tests pass with
mvn clean install -Dexec.skip=true