From efc888234fca0e9ca0326d7610ae6d56ef813670 Mon Sep 17 00:00:00 2001
From: Vincent Paturet <vincent.paturet@entur.org>
Date: Mon, 2 Jun 2025 14:04:36 +0200
Subject: [PATCH] Update NeTEx 1.16

---
 pom.xml                                                |  4 ++--
 .../id/ReferenceToValidEntityTypeValidator.java        |  7 +++++++
 .../jaxb/support/DatedServiceJourneyUtils.java         | 10 ++++------
 .../DefaultTimetableFrameValidationTreeFactory.java    |  2 +-
 .../netex/validation/xml/NetexSchemaRepository.java    |  2 ++
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index fbe3734d..d112a9c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,8 +55,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jdk.version>17</jdk.version>
 
-        <netex-java-model.version>2.0.15.2</netex-java-model.version>
-        <netex-parser-java.version>3.1.71</netex-parser-java.version>
+        <netex-java-model.version>2.0.16-SNAPSHOT</netex-java-model.version>
+        <netex-parser-java.version>4.0.0-SNAPSHOT</netex-parser-java.version>
         <saxon.version>12.9</saxon.version>
         <geotools.version>33.0</geotools.version>
         <snakeyaml.version>2.5</snakeyaml.version>
diff --git a/src/main/java/org/entur/netex/validation/validator/id/ReferenceToValidEntityTypeValidator.java b/src/main/java/org/entur/netex/validation/validator/id/ReferenceToValidEntityTypeValidator.java
index 9a122735..11e779f5 100644
--- a/src/main/java/org/entur/netex/validation/validator/id/ReferenceToValidEntityTypeValidator.java
+++ b/src/main/java/org/entur/netex/validation/validator/id/ReferenceToValidEntityTypeValidator.java
@@ -139,6 +139,13 @@ private Map<String, Set<String>> getAllowedSubstitutions() {
     vehicleScheduleJourneyRefSubstitutions.add("DeadRun");
     substitutions.put("VehicleJourneyRef", vehicleScheduleJourneyRefSubstitutions);
 
+    Set<String> datedVehicleJourneyRefSubstitutions = new HashSet<>();
+    datedVehicleJourneyRefSubstitutions.add("DatedServiceJourney");
+    substitutions.put(
+      "DatedVehicleJourneyRef",
+      datedVehicleJourneyRefSubstitutions
+    );
+
     Set<String> serviceJourneyPatternRefSubstitutions = new HashSet<>();
     serviceJourneyPatternRefSubstitutions.add("ServiceJourneyPattern");
     substitutions.put("JourneyPatternRef", serviceJourneyPatternRefSubstitutions);
diff --git a/src/main/java/org/entur/netex/validation/validator/jaxb/support/DatedServiceJourneyUtils.java b/src/main/java/org/entur/netex/validation/validator/jaxb/support/DatedServiceJourneyUtils.java
index c6b35122..d35a0be9 100644
--- a/src/main/java/org/entur/netex/validation/validator/jaxb/support/DatedServiceJourneyUtils.java
+++ b/src/main/java/org/entur/netex/validation/validator/jaxb/support/DatedServiceJourneyUtils.java
@@ -3,8 +3,7 @@
 import jakarta.xml.bind.JAXBElement;
 import javax.annotation.Nullable;
 import org.rutebanken.netex.model.DatedServiceJourney;
-import org.rutebanken.netex.model.DatedServiceJourneyRefStructure;
-import org.rutebanken.netex.model.VersionOfObjectRefStructure;
+import org.rutebanken.netex.model.VehicleJourneyRefStructure;
 
 public class DatedServiceJourneyUtils {
 
@@ -18,12 +17,11 @@ public static String originalDatedServiceJourneyRef(
     DatedServiceJourney datedServiceJourney
   ) {
     return datedServiceJourney
-      .getJourneyRef()
+      .getReplacedJourneys()
+      .getDatedVehicleJourneyRefOrNormalDatedVehicleJourneyRef()
       .stream()
       .map(JAXBElement::getValue)
-      .filter(DatedServiceJourneyRefStructure.class::isInstance)
-      .map(DatedServiceJourneyRefStructure.class::cast)
-      .map(VersionOfObjectRefStructure::getRef)
+      .map(VehicleJourneyRefStructure::getRef)
       .findFirst()
       .orElse(null);
   }
diff --git a/src/main/java/org/entur/netex/validation/validator/xpath/tree/DefaultTimetableFrameValidationTreeFactory.java b/src/main/java/org/entur/netex/validation/validator/xpath/tree/DefaultTimetableFrameValidationTreeFactory.java
index 4c27774f..caf5912a 100644
--- a/src/main/java/org/entur/netex/validation/validator/xpath/tree/DefaultTimetableFrameValidationTreeFactory.java
+++ b/src/main/java/org/entur/netex/validation/validator/xpath/tree/DefaultTimetableFrameValidationTreeFactory.java
@@ -230,7 +230,7 @@ public ValidationTreeBuilder builder() {
       )
       .withRuleForLineFile(
         new ValidateNotExist(
-          "vehicleJourneys/DatedServiceJourney/DatedServiceJourneyRef[@ref = preceding-sibling::DatedServiceJourneyRef/@ref]",
+          "vehicleJourneys/DatedServiceJourney/replacedJourneys/DatedVehicleJourneyRef[@ref = preceding-sibling::DatedVehicleJourneyRef/@ref]",
           CODE_DATED_SERVICE_JOURNEY_5,
           "DatedServiceJourney multiple references to the same DatedServiceJourney",
           "Multiple references from a DatedServiceJourney to the same DatedServiceJourney",
diff --git a/src/main/java/org/entur/netex/validation/xml/NetexSchemaRepository.java b/src/main/java/org/entur/netex/validation/xml/NetexSchemaRepository.java
index d2a998c0..4689fbcb 100644
--- a/src/main/java/org/entur/netex/validation/xml/NetexSchemaRepository.java
+++ b/src/main/java/org/entur/netex/validation/xml/NetexSchemaRepository.java
@@ -82,6 +82,8 @@ public static NeTExValidator.NetexVersion detectNetexSchemaVersion(byte[] conten
           return NeTExValidator.NetexVersion.v1_14;
         case "1.15":
           return NeTExValidator.NetexVersion.v1_15;
+        case "1.16":
+          return NeTExValidator.NetexVersion.v1_16;
         default:
       }
     }