Skip to content

Commit 11e1aef

Browse files
vpaturetvpaturet
committed
Upgrade to NeTEx 2.0 schema
- 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
1 parent 43827cd commit 11e1aef

11 files changed

Lines changed: 122 additions & 81 deletions

‎bindings.xjb‎

Lines changed: 38 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
xmlns:xs="http://www.w3.org/2001/XMLSchema"
33
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
44
xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc" jxb:version="3.0" jxb:extensionBindingPrefixes="xjc">
5-
5+
66
<jxb:bindings>
77
<jxb:globalBindings underscoreBinding="asCharInWord">
88
<xjc:javaType name="java.time.LocalDateTime" xmlType="xs:dateTime" adapter="org.rutebanken.util.LocalDateTimeISO8601XmlAdapter" />
@@ -14,14 +14,14 @@
1414

1515
<!-- See the script bin/version_updater.sh It updates version in schema locations-->
1616

17-
| <jxb:bindings schemaLocation="./src/main/resources/xsd/1.16/NeTEx_publication.xsd">
17+
| <jxb:bindings schemaLocation="./src/main/resources/xsd/2.0/NeTEx_publication.xsd">
1818
<jxb:schemaBindings>
1919
<jxb:package name="org.rutebanken.netex.model" />
2020
</jxb:schemaBindings>
2121
</jxb:bindings>
2222

2323
<jxb:bindings
24-
schemaLocation="./src/main/resources/xsd/1.16/netex_framework/netex_genericFramework/netex_organisation_version.xsd">
24+
schemaLocation="./src/main/resources/xsd/2.0/netex_framework/netex_genericFramework/netex_organisation_version.xsd">
2525
<jxb:bindings node="//xsd:element[@name = 'Status']">
2626
<jxb:property name="StatusOrganisationGroup" />
2727
</jxb:bindings>
@@ -30,35 +30,28 @@
3030
</jxb:bindings>
3131
</jxb:bindings>
3232
<jxb:bindings
33-
schemaLocation="./src/main/resources/xsd/1.16/netex_part_3/part3_fares/netex_salesOfferPackage_version.xsd">
33+
schemaLocation="./src/main/resources/xsd/2.0/netex_part_3/part3_fares/netex_salesOfferPackage_version.xsd">
3434
<jxb:bindings node="//xsd:element[@ref = 'ResponsibilitySetRef']">
3535
<jxb:property name="ResponsibilitySetRefDistributionByGroup" />
3636
</jxb:bindings>
3737
</jxb:bindings>
3838

3939
<jxb:bindings
40-
schemaLocation="./src/main/resources/xsd/1.16/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version.xsd">
41-
<jxb:bindings node="//xsd:group[@name= 'HeadwayJourneyGroupGroup']/xsd:sequence/xsd:element[@name = 'Description']">
42-
<jxb:property name="DescriptionHeadwayJourneyGroupGroup" />
43-
</jxb:bindings>
44-
</jxb:bindings>
45-
46-
<jxb:bindings
47-
schemaLocation="./src/main/resources/xsd/1.16/netex_part_3/part3_salesTransactions/netex_salesContract_version.xsd">
40+
schemaLocation="./src/main/resources/xsd/2.0/netex_part_3/part3_salesTransactions/netex_salesContract_version.xsd">
4841
<jxb:bindings node="//xsd:element[@name = 'Status']">
4942
<jxb:property name="StatusPassengerContractGroup" />
5043
</jxb:bindings>
5144
</jxb:bindings>
5245

5346
<jxb:bindings
54-
schemaLocation="./src/main/resources/xsd/1.16/netex_part_3/part3_salesTransactions/netex_retailConsortium_version.xsd">
47+
schemaLocation="./src/main/resources/xsd/2.0/netex_part_3/part3_salesTransactions/netex_retailConsortium_version.xsd">
5548
<jxb:bindings node="//xsd:element[@name = 'Status']">
5649
<jxb:property name="StatusRetailDeviceGroup" />
5750
</jxb:bindings>
5851
</jxb:bindings>
5952

6053
<jxb:bindings
61-
schemaLocation="./src/main/resources/xsd/1.16/netex_framework/netex_responsibility/netex_version_support.xsd">
54+
schemaLocation="./src/main/resources/xsd/2.0/netex_framework/netex_responsibility/netex_version_support.xsd">
6255
<jxb:bindings node="//xsd:attributeGroup[@name = 'BasicModificationDetailsGroup']/xsd:attribute[@name = 'status']">
6356
<jxb:property name="status_BasicModificationDetailsGroup" />
6457
</jxb:bindings>
@@ -68,14 +61,43 @@
6861
</jxb:bindings>
6962

7063
<jxb:bindings
71-
schemaLocation="./src/main/resources/xsd/1.16/netex_framework/netex_genericFramework/netex_zone_version.xsd">
72-
<jxb:bindings node="//xsd:complexType[@name = 'tariffZonesInFrame_RelStructure']/xsd:complexContent/xsd:extension[@base = 'containmentAggregationStructure']/xsd:sequence/xsd:element[@ref = 'TariffZone_']">
64+
schemaLocation="./src/main/resources/xsd/2.0/netex_framework/netex_genericFramework/netex_zone_version.xsd">
65+
<jxb:bindings node="//xsd:complexType[@name = 'tariffZonesInFrame_RelStructure']/xsd:complexContent/xsd:extension[@base = 'containmentAggregationStructure']/xsd:sequence/xsd:element[@ref = 'TariffZone_Dummy']">
7366
<jxb:property name="tariffZone" />
7467
</jxb:bindings>
7568
</jxb:bindings>
7669

70+
<!-- NeTEx 2.0: Resolve ObjectFactory collisions for bookingArrangements vs BookingArrangements -->
71+
<jxb:bindings
72+
schemaLocation="./src/main/resources/xsd/2.0/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd">
73+
<jxb:bindings node="//xsd:group[@name = 'StopPointInPatternPropertiesGroup']/xsd:sequence/xsd:choice/xsd:element[@name = 'bookingArrangements']">
74+
<jxb:property name="bookingArrangementsRelStructure" />
75+
</jxb:bindings>
76+
</jxb:bindings>
7777

78+
<jxb:bindings
79+
schemaLocation="./src/main/resources/xsd/2.0/netex_part_5/part5_rc/netex_nm_mobilityService_version.xsd">
80+
<jxb:bindings node="//xsd:group[@name = 'MobilityServiceGroup']/xsd:sequence/xsd:choice/xsd:element[@name = 'serviceBookingArrangements']">
81+
<jxb:property name="serviceBookingArrangementsRelStructure" />
82+
</jxb:bindings>
83+
</jxb:bindings>
7884

85+
<jxb:bindings
86+
schemaLocation="./src/main/resources/xsd/2.0/netex_part_3/part3_fares/netex_usageParameterBooking_version.xsd">
87+
<jxb:bindings node="//xsd:group[@name = 'ReservingGroup']/xsd:sequence/xsd:choice/xsd:element[@name = 'bookingArrangements']">
88+
<jxb:property name="bookingArrangementsRelStructureReserving" />
89+
</jxb:bindings>
90+
<jxb:bindings node="//xsd:group[@name = 'CancellingGroup']/xsd:sequence/xsd:choice/xsd:element[@name = 'bookingArrangements']">
91+
<jxb:property name="bookingArrangementsRelStructureCancelling" />
92+
</jxb:bindings>
93+
</jxb:bindings>
94+
95+
<jxb:bindings
96+
schemaLocation="./src/main/resources/xsd/2.0/netex_part_1/part1_ifopt/netex_assistanceBooking_version.xsd">
97+
<jxb:bindings node="//xsd:group[@name = 'AssistanceBookingServiceGroup']/xsd:sequence/xsd:choice/xsd:element[@name = 'bookingArrangements']">
98+
<jxb:property name="bookingArrangementsRelStructureAssistance" />
99+
</jxb:bindings>
100+
</jxb:bindings>
79101

80102

81103
</jxb:bindings>

‎pom.xml‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<modelVersion>4.0.0</modelVersion>
1818
<groupId>org.entur</groupId>
1919
<artifactId>netex-java-model</artifactId>
20-
<version>2.0.16-SNAPSHOT</version>
20+
<version>3.0.0-SNAPSHOT</version>
2121

2222
<name>netex-java-model</name>
2323
<description>Generates Java model from NeTEx XSDs using JAXB.</description>
@@ -69,9 +69,10 @@
6969
<jdk.version>11</jdk.version>
7070

7171
<netexRepoName>NeTEx</netexRepoName>
72-
<netexBranch>update_dsj</netexBranch>
73-
<netexGithubUrl>https://github.com/entur/${netexRepoName}</netexGithubUrl>
74-
<netexVersion>1.16</netexVersion>
72+
<netexBranch>next</netexBranch>
73+
<cenNetexGithubUrl>https://github.com/NeTEx-CEN/${netexRepoName}</cenNetexGithubUrl>
74+
<enturNetexGithubUrl>https://github.com/entur/${netexRepoName}</enturNetexGithubUrl>
75+
<netexVersion>2.0</netexVersion>
7576

7677
<!-- JAXB components versions -->
7778
<jakarta-xml-bind.version>4.0.4</jakarta-xml-bind.version>
@@ -279,7 +280,7 @@
279280
</goals>
280281
<configuration>
281282
<environmentVariables>
282-
<GITHUB_URL>${netexGithubUrl}/archive/${netexBranch}.zip</GITHUB_URL>
283+
<GITHUB_URL>${cenNetexGithubUrl}/archive/${netexBranch}.zip</GITHUB_URL>
283284
<DESTINATION_PATH>src/main/resources/xsd/${netexVersion}</DESTINATION_PATH>
284285
<ZIP_PATH_TO_EXTRACT>NeTEx-${netexBranch}/xsd/*</ZIP_PATH_TO_EXTRACT>
285286
</environmentVariables>
@@ -310,7 +311,7 @@
310311
</goals>
311312
<configuration>
312313
<environmentVariables>
313-
<GITHUB_URL>${netexGithubUrl}/archive/tags/v1.0.15.zip</GITHUB_URL>
314+
<GITHUB_URL>${enturNetexGithubUrl}/archive/tags/v1.0.15.zip</GITHUB_URL>
314315
<DESTINATION_PATH>src/main/resources/xsd/1.15</DESTINATION_PATH>
315316
<ZIP_PATH_TO_EXTRACT>NeTEx-tags-v1.0.15/xsd/*</ZIP_PATH_TO_EXTRACT>
316317
</environmentVariables>
@@ -326,7 +327,7 @@
326327
</goals>
327328
<configuration>
328329
<environmentVariables>
329-
<GITHUB_URL>${netexGithubUrl}/archive/tags/v1.0.14.zip</GITHUB_URL>
330+
<GITHUB_URL>${enturNetexGithubUrl}/archive/tags/v1.0.14.zip</GITHUB_URL>
330331
<DESTINATION_PATH>src/main/resources/xsd/1.14</DESTINATION_PATH>
331332
<ZIP_PATH_TO_EXTRACT>NeTEx-tags-v1.0.14/xsd/*</ZIP_PATH_TO_EXTRACT>
332333
</environmentVariables>
@@ -342,7 +343,7 @@
342343
</goals>
343344
<configuration>
344345
<environmentVariables>
345-
<GITHUB_URL>${netexGithubUrl}/archive/tags/v1.0.13.zip</GITHUB_URL>
346+
<GITHUB_URL>${enturNetexGithubUrl}/archive/tags/v1.0.13.zip</GITHUB_URL>
346347
<DESTINATION_PATH>src/main/resources/xsd/1.13</DESTINATION_PATH>
347348
<ZIP_PATH_TO_EXTRACT>NeTEx-tags-v1.0.13/xsd/*</ZIP_PATH_TO_EXTRACT>
348349
</environmentVariables>
@@ -358,7 +359,7 @@
358359
</goals>
359360
<configuration>
360361
<environmentVariables>
361-
<GITHUB_URL>${netexGithubUrl}/archive/tags/v1.0.12.zip</GITHUB_URL>
362+
<GITHUB_URL>${enturNetexGithubUrl}/archive/tags/v1.0.12.zip</GITHUB_URL>
362363
<DESTINATION_PATH>src/main/resources/xsd/1.12</DESTINATION_PATH>
363364
<ZIP_PATH_TO_EXTRACT>NeTEx-tags-v1.0.12/xsd/*</ZIP_PATH_TO_EXTRACT>
364365
</environmentVariables>
@@ -374,7 +375,7 @@
374375
</goals>
375376
<configuration>
376377
<environmentVariables>
377-
<GITHUB_URL>${netexGithubUrl}/archive/tags/v1.0.11.zip</GITHUB_URL>
378+
<GITHUB_URL>${enturNetexGithubUrl}/archive/tags/v1.0.11.zip</GITHUB_URL>
378379
<DESTINATION_PATH>src/main/resources/xsd/1.11</DESTINATION_PATH>
379380
<ZIP_PATH_TO_EXTRACT>NeTEx-tags-v1.0.11/xsd/*</ZIP_PATH_TO_EXTRACT>
380381
</environmentVariables>
@@ -390,7 +391,7 @@
390391
</goals>
391392
<configuration>
392393
<environmentVariables>
393-
<GITHUB_URL>${netexGithubUrl}/archive/tags/v1.0.10-entur.zip</GITHUB_URL>
394+
<GITHUB_URL>${enturNetexGithubUrl}/archive/tags/v1.0.10-entur.zip</GITHUB_URL>
394395
<DESTINATION_PATH>src/main/resources/xsd/1.10</DESTINATION_PATH>
395396
<ZIP_PATH_TO_EXTRACT>NeTEx-tags-v1.0.10-entur/xsd/*</ZIP_PATH_TO_EXTRACT>
396397
</environmentVariables>
@@ -406,7 +407,7 @@
406407
</goals>
407408
<configuration>
408409
<environmentVariables>
409-
<GITHUB_URL>${netexGithubUrl}/archive/tags/v1.0.9.zip</GITHUB_URL>
410+
<GITHUB_URL>${enturNetexGithubUrl}/archive/tags/v1.0.9.zip</GITHUB_URL>
410411
<DESTINATION_PATH>src/main/resources/xsd/1.09</DESTINATION_PATH>
411412
<ZIP_PATH_TO_EXTRACT>NeTEx-tags-v1.0.9/xsd/*</ZIP_PATH_TO_EXTRACT>
412413
</environmentVariables>
@@ -422,7 +423,7 @@
422423
</goals>
423424
<configuration>
424425
<environmentVariables>
425-
<GITHUB_URL>${netexGithubUrl}/archive/tags/v1.0.8.zip</GITHUB_URL>
426+
<GITHUB_URL>${enturNetexGithubUrl}/archive/tags/v1.0.8.zip</GITHUB_URL>
426427
<DESTINATION_PATH>src/main/resources/xsd/1.08</DESTINATION_PATH>
427428
<ZIP_PATH_TO_EXTRACT>NeTEx-tags-v1.0.8/xsd/*</ZIP_PATH_TO_EXTRACT>
428429
</environmentVariables>

‎src/main/java/org/rutebanken/netex/validation/NeTExValidator.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ public enum NetexVersion {
4444
v1_13 ("1.13"),
4545
v1_14 ("1.14"),
4646
v1_15 ("1.15"),
47-
v1_16 ("1.16");
47+
v1_16 ("1.16"),
48+
v2_0 ("2.0");
4849

4950
private final String folderName;
5051

@@ -59,7 +60,7 @@ public String toString() {
5960
}
6061
private final Schema neTExSchema;
6162

62-
public static final NetexVersion LATEST = NetexVersion.v1_16;
63+
public static final NetexVersion LATEST = NetexVersion.v2_0;
6364

6465
private static final Map<NetexVersion, NeTExValidator> VALIDATORS_PER_VERSION = new EnumMap<>(NetexVersion.class);
6566

‎src/test/java/org/rutebanken/netex/model/AbstractUnmarshalFrameTest.java‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,20 @@ public static void initContext() throws JAXBException {
3030

3131
}
3232

33-
33+
/**
34+
* Helper method to extract string value from MultilingualString.
35+
* In NeTEx 2.0, MultilingualString uses mixed content instead of a simple value.
36+
*/
37+
protected static String getStringValue(MultilingualString multilingualString) {
38+
if (multilingualString == null || multilingualString.getContent() == null) {
39+
return null;
40+
}
41+
return multilingualString.getContent().stream()
42+
.filter(String.class::isInstance)
43+
.map(String.class::cast)
44+
.findFirst()
45+
.orElse(null);
46+
}
3447

3548

3649
}

0 commit comments

Comments
 (0)