diff --git a/pom.xml b/pom.xml
index 73875c8c..ea798e25 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
org.entur
netex-validator-java
- 10.1.1-SNAPSHOT
+ 11.0.0-SNAPSHOT
netex-validator-java
Library for validating NeTEx datasets against the Nordic NeTEx Profile.
@@ -54,8 +54,8 @@
UTF-8
17
- 2.0.15
- 3.1.46
+ 2.0.16-SNAPSHOT
+ 4.0.0-SNAPSHOT
12.5
33.0
2.4
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 ef9ec747..7d265257 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
@@ -150,6 +150,13 @@ private Map> getAllowedSubstitutions() {
vehicleScheduleJourneyRefSubstitutions
);
+ Set datedVehicleJourneyRefSubstitutions = new HashSet<>();
+ datedVehicleJourneyRefSubstitutions.add("DatedServiceJourney");
+ substitutions.put(
+ "DatedVehicleJourneyRef",
+ datedVehicleJourneyRefSubstitutions
+ );
+
Set serviceJourneyPatternRefSubstitutions = new HashSet<>();
serviceJourneyPatternRefSubstitutions.add("ServiceJourneyPattern");
substitutions.put(
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 44df87b3..10550ae4 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
@@ -240,7 +240,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 87bf4064..a3bdf279 100644
--- a/src/main/java/org/entur/netex/validation/xml/NetexSchemaRepository.java
+++ b/src/main/java/org/entur/netex/validation/xml/NetexSchemaRepository.java
@@ -86,6 +86,8 @@ public static NeTExValidator.NetexVersion detectNetexSchemaVersion(
return NeTExValidator.NetexVersion.v1_14;
case "1.15":
return NeTExValidator.NetexVersion.v1_15;
+ case "1.16":
+ return NeTExValidator.NetexVersion.v1_16;
default:
}
}