Merge changes from CEN NeTex repository (#122)

Author: vpaturet

bindings.xjb

@@ -15,14 +15,14 @@
 
 	<!-- See the script bin/version_updater.sh It updates version in schema locations-->
 
-	<jxb:bindings schemaLocation="./src/main/resources/xsd/1.14/NeTEx_publication.xsd">
+	<jxb:bindings schemaLocation="./src/main/resources/xsd/1.15/NeTEx_publication.xsd">
 		<jxb:schemaBindings>
 			<jxb:package name="org.rutebanken.netex.model" />
 		</jxb:schemaBindings>
 	</jxb:bindings>
 
 	<jxb:bindings
-		schemaLocation="./src/main/resources/xsd/1.14/netex_framework/netex_genericFramework/netex_organisation_version.xsd">
+		schemaLocation="./src/main/resources/xsd/1.15/netex_framework/netex_genericFramework/netex_organisation_version.xsd">
 		<jxb:bindings node="//xsd:element[@name = 'Status']">
 			<jxb:property name="StatusOrganisationGroup" />
 		</jxb:bindings>
@@ -31,35 +31,35 @@
 		</jxb:bindings>
 	</jxb:bindings>
 	<jxb:bindings
-		schemaLocation="./src/main/resources/xsd/1.14/netex_part_3/part3_fares/netex_salesOfferPackage_version.xsd">
+		schemaLocation="./src/main/resources/xsd/1.15/netex_part_3/part3_fares/netex_salesOfferPackage_version.xsd">
 		<jxb:bindings node="//xsd:element[@ref = 'ResponsibilitySetRef']">
 			<jxb:property name="ResponsibilitySetRefDistributionByGroup" />
 		</jxb:bindings>
 	</jxb:bindings>
 
 	<jxb:bindings
-		schemaLocation="./src/main/resources/xsd/1.14/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version.xsd">
+		schemaLocation="./src/main/resources/xsd/1.15/netex_part_2/part2_journeyTimes/netex_vehicleJourneyFrequency_version.xsd">
 		<jxb:bindings node="//xsd:group[@name= 'HeadwayJourneyGroupGroup']/xsd:sequence/xsd:element[@name = 'Description']">
 			<jxb:property name="DescriptionHeadwayJourneyGroupGroup" />
 		</jxb:bindings>
 	</jxb:bindings>
 
 	<jxb:bindings
-		schemaLocation="./src/main/resources/xsd/1.14/netex_part_3/part3_salesTransactions/netex_salesContract_version.xsd">
+		schemaLocation="./src/main/resources/xsd/1.15/netex_part_3/part3_salesTransactions/netex_salesContract_version.xsd">
 		<jxb:bindings node="//xsd:element[@name = 'Status']">
 			<jxb:property name="StatusPassengerContractGroup" />
 		</jxb:bindings>
 	</jxb:bindings>
 
 	<jxb:bindings
-		schemaLocation="./src/main/resources/xsd/1.14/netex_part_3/part3_salesTransactions/netex_retailConsortium_version.xsd">
+		schemaLocation="./src/main/resources/xsd/1.15/netex_part_3/part3_salesTransactions/netex_retailConsortium_version.xsd">
 		<jxb:bindings node="//xsd:element[@name = 'Status']">
 			<jxb:property name="StatusRetailDeviceGroup" />
 		</jxb:bindings>
 	</jxb:bindings>
 
 	<jxb:bindings
-		schemaLocation="./src/main/resources/xsd/1.14/netex_framework/netex_responsibility/netex_version_support.xsd">
+		schemaLocation="./src/main/resources/xsd/1.15/netex_framework/netex_responsibility/netex_version_support.xsd">
 		<jxb:bindings node="//xsd:attributeGroup[@name = 'BasicModificationDetailsGroup']/xsd:attribute[@name = 'status']">
 			<jxb:property name="status_BasicModificationDetailsGroup" />
 		</jxb:bindings>
@@ -69,7 +69,7 @@
 	</jxb:bindings>
 
 	<jxb:bindings
-		schemaLocation="./src/main/resources/xsd/1.14/netex_framework/netex_genericFramework/netex_zone_version.xsd">
+		schemaLocation="./src/main/resources/xsd/1.15/netex_framework/netex_genericFramework/netex_zone_version.xsd">
 		<jxb:bindings node="//xsd:complexType[@name = 'tariffZonesInFrame_RelStructure']/xsd:complexContent/xsd:extension[@base = 'containmentAggregationStructure']/xsd:sequence/xsd:element[@ref = 'TariffZone_']">
 			<jxb:property name="tariffZone" />
 		</jxb:bindings>

pom.xml

@@ -69,7 +69,7 @@
         <netexRepoName>NeTEx</netexRepoName>
         <netexBranch>master</netexBranch>
         <netexGithubUrl>https://github.com/entur/${netexRepoName}</netexGithubUrl>
-        <netexVersion>1.14</netexVersion>
+        <netexVersion>1.15</netexVersion>
 
         <!-- JAXB components versions -->
         <jakarta-xml-bind.version>2.3.3</jakarta-xml-bind.version>
@@ -259,6 +259,22 @@
                             </executable>
                         </configuration>
                     </execution>
+                    <execution>
+                        <!-- This downloads 1.14 for validation needs. This is not used to generate the model -->
+                        <id>download-extract-legacy-1.14</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                        <configuration>
+                            <environmentVariables>
+                                <GITHUB_URL>${netexGithubUrl}/archive/tags/v1.0.14.zip</GITHUB_URL>
+                                <DESTINATION_PATH>src/main/resources/xsd/1.14</DESTINATION_PATH>
+                                <ZIP_PATH_TO_EXTRACT>NeTEx-tags-v1.0.14/xsd/*</ZIP_PATH_TO_EXTRACT>
+                            </environmentVariables>
+                            <executable>./bin/netex-download-extract.sh</executable>
+                        </configuration>
+                    </execution>
                     <execution>
                         <!-- This downloads 1.13 for validation needs. This is not used to generate the model -->
                         <id>download-extract-legacy-1.13</id>

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

@@ -42,7 +42,8 @@ public enum NetexVersion {
 		v1_11 ("1.11"),
 		v1_12 ("1.12"),
 		v1_13 ("1.13"),
-		v1_14 ("1.14");
+		v1_14 ("1.14"),
+		v1_15 ("1.15");
 
 		private final String folderName;
 
@@ -57,7 +58,7 @@ public String toString() {
 	}
 	private final Schema neTExSchema;
 
-	public static final NetexVersion LATEST = NetexVersion.v1_14;
+	public static final NetexVersion LATEST = NetexVersion.v1_15;
 
 	private static final Map<NetexVersion, NeTExValidator> VALIDATORS_PER_VERSION = new EnumMap<>(NetexVersion.class);
 

src/test/java/org/rutebanken/netex/model/UnmarshalServiceFrameTest.java

@@ -172,7 +172,7 @@ void unmarshalServiceFrame() throws JAXBException {
         assertEquals("VYG:ServiceLink:KMB-1_ABOe-1_NULL",serviceLinkInJourneyPattern.getServiceLinkRef().getRef());
 
         PassengerStopAssignment passengerStopAssignment = (PassengerStopAssignment) serviceFrame.getStopAssignments().getStopAssignment().get(0).getValue();
-        assertEquals("NSR:Quay:111", passengerStopAssignment.getQuayRef().getRef());
+        assertEquals("NSR:Quay:111", passengerStopAssignment.getQuayRef().getValue().getRef());
         assertEquals("VYG:ScheduledStopPoint:HAL-1", passengerStopAssignment.getScheduledStopPointRef().getValue().getRef());
 
 

src/test/java/org/rutebanken/netex/model/UnmarshalSiteFrameTest.java

@@ -156,21 +156,20 @@ void unmarshalSiteFrame() throws JAXBException {
         PublicationDeliveryStructure publicationDeliveryStructure = jaxbElement.getValue();
         SiteFrame siteFrame = (SiteFrame) publicationDeliveryStructure.getDataObjects().getCompositeFrameOrCommonFrame().get(0).getValue();
 
-        StopPlace stopPlace = siteFrame.getStopPlaces().getStopPlace().get(0);
+        StopPlace stopPlace = (StopPlace) siteFrame.getStopPlaces().getStopPlace_().get(0).getValue();
         assertEquals("Krokstien", stopPlace.getName().getValue());
-        assertEquals(VehicleModeEnumeration.BUS, stopPlace.getTransportMode());
+        assertEquals(AllVehicleModesOfTransportEnumeration.BUS, stopPlace.getTransportMode());
         assertEquals(StopTypeEnumeration.ONSTREET_BUS, stopPlace.getStopPlaceType());
-        assertEquals("BRA:TariffZone:311", stopPlace.getTariffZones().getTariffZoneRef().get(0).getRef());
+        assertEquals("BRA:TariffZone:311", stopPlace.getTariffZones().getTariffZoneRef_().get(0).getValue().getRef());
 
-        Quay quay = (Quay) stopPlace.getQuays().getQuayRefOrQuay().get(0);
+        Quay quay = (Quay) stopPlace.getQuays().getQuayRefOrQuay().get(0).getValue();
         assertEquals(BigDecimal.valueOf(59.910579), quay.getCentroid().getLocation().getLatitude());
-
         TariffZone tariffZone = (TariffZone) siteFrame.getTariffZones().getTariffZone().get(0).getValue();
         assertEquals("1", tariffZone.getName().getValue());
 
         GroupOfStopPlaces groupOfStopPlaces = siteFrame.getGroupsOfStopPlaces().getGroupOfStopPlaces().get(0);
         assertEquals("Lillehammer", groupOfStopPlaces.getName().getValue());
-        assertEquals("NSR:StopPlace:420", groupOfStopPlaces.getMembers().getStopPlaceRef().get(0).getRef());
+        assertEquals("NSR:StopPlace:420", groupOfStopPlaces.getMembers().getStopPlaceRef().get(0).getValue().getRef());