Upgrade to NeTEx 2.0

.github/workflows/push.yml

@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - upgrade_netex_2_0
   pull_request:
     branches:
       - main
@@ -27,7 +28,7 @@ jobs:
           wget https://raw.githubusercontent.com/entur/ror-maven-settings/master/.m2/settings_release_maven_central.xml -O .github/workflows/settings.xml
       - uses: actions/setup-java@v6.0.1
         with:
-          java-version: 17
+          java-version: 21
           distribution: liberica
       - name: Cache Maven dependencies
         uses: actions/cache@v5.1.0
@@ -69,4 +70,13 @@ jobs:
     secrets: inherit
     with:
       push_to_repo: true
-      snapshot: false
+      snapshot: false
+  publish-snapshot:
+    if: github.repository_owner == 'entur' && github.event_name == 'push' && github.ref == 'refs/heads/upgrade_netex_2_0'
+    needs: [maven-package]
+    name: Publish snapshot to maven central
+    uses: entur/gha-maven-central/.github/workflows/maven-publish.yml@v1
+    secrets: inherit
+    with:
+      push_to_repo: true
+      snapshot: true

CLAUDE.md

@@ -28,7 +28,7 @@ mvn prettier:write
 mvn validate -P prettierCheck
 ```
 
-Java 17 is required. The project uses prettier-java for code formatting (runs in the `validate` phase by default). Use `-Dprettier.skip=true` to skip formatting during development.
+Java 21 is required. The project uses prettier-java for code formatting (runs in the `validate` phase by default). Use `-Dprettier.skip=true` to skip formatting during development.
 
 ## Architecture
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.entur</groupId>
     <artifactId>netex-validator-java</artifactId>
-    <version>12.0.12-SNAPSHOT</version>
+    <version>13.0.0-SNAPSHOT</version>
 
     <name>netex-validator-java</name>
     <description>Library for validating NeTEx datasets against the Nordic NeTEx Profile.</description>
@@ -53,10 +53,10 @@
     <properties>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jdk.version>17</jdk.version>
+        <jdk.version>21</jdk.version>
 
-        <netex-java-model.version>2.0.16.2</netex-java-model.version>
-        <netex-parser-java.version>4.0.14</netex-parser-java.version>
+        <netex2-java-model.version>3.0.0-SNAPSHOT</netex2-java-model.version>
+        <netex-parser-java.version>5.0.0-SNAPSHOT</netex-parser-java.version>
         <saxon.version>12.10</saxon.version>
         <geotools.version>33.0</geotools.version>
         <snakeyaml.version>2.7</snakeyaml.version>
@@ -97,8 +97,8 @@
 
         <!-- empty argLine property, the value is set up by Jacoco during unit tests execution -->
         <argLine/>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
 
 
         <!-- GPG configuration for jar signing-->
@@ -110,8 +110,8 @@
     <dependencies>
         <dependency>
             <groupId>org.entur</groupId>
-            <artifactId>netex-java-model</artifactId>
-            <version>${netex-java-model.version}</version>
+            <artifactId>netex2-java-model</artifactId>
+            <version>${netex2-java-model.version}</version>
         </dependency>
         <dependency>
             <groupId>org.entur</groupId>
@@ -481,6 +481,16 @@
             <name>Open Source Geospatial Foundation Repository</name>
             <url>https://repo.osgeo.org/repository/release/</url>
         </repository>
+        <repository>
+            <id>maven-snapshots</id>
+            <url>https://central.sonatype.com/repository/maven-snapshots</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
     </repositories>
     <profiles>
         <profile>
@@ -531,7 +541,7 @@
             </activation>
 
             <properties>
-                <jdk.version>17</jdk.version>
+                <jdk.version>21</jdk.version>
             </properties>
 
             <build>

src/main/java/org/entur/netex/validation/validator/jaxb/JAXBValidationContext.java

@@ -9,7 +9,7 @@
 import org.entur.netex.validation.validator.id.IdVersion;
 import org.entur.netex.validation.validator.jaxb.support.DatedServiceJourneyUtils;
 import org.entur.netex.validation.validator.model.*;
-import org.rutebanken.netex.model.*;
+import org.entur.netex2.model.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -43,7 +43,7 @@
     this.netexEntitiesIndex = netexEntitiesIndex;
     this.commonDataRepository = commonDataRepository;
     if (stopPlaceRepositoryFunction != null) {
       this.stopPlaceRepository = stopPlaceRepositoryFunction.apply(this);
     } else {
       this.stopPlaceRepository = null;
     }
@@ -332,8 +332,7 @@
    */
   @Nullable
   public TransportModeAndSubMode transportModeAndSubMode(ServiceJourney serviceJourney) {
-    AllVehicleModesOfTransportEnumeration transportMode =
-      serviceJourney.getTransportMode();
+    AllPublicTransportModesEnumeration transportMode = serviceJourney.getTransportMode();
 
     TransportSubmodeStructure subModeStructure = serviceJourney.getTransportSubmode();
 

src/main/java/org/entur/netex/validation/validator/jaxb/SiteFrameStopPlaceRepository.java

@@ -2,12 +2,13 @@
 
 import javax.annotation.Nullable;
 import org.entur.netex.index.api.NetexEntitiesIndex;
+import org.entur.netex.validation.validator.model.MultilingualStringValue;
 import org.entur.netex.validation.validator.model.QuayCoordinates;
 import org.entur.netex.validation.validator.model.QuayId;
 import org.entur.netex.validation.validator.model.StopPlaceId;
 import org.entur.netex.validation.validator.model.TransportModeAndSubMode;
-import org.rutebanken.netex.model.Quay;
-import org.rutebanken.netex.model.StopPlace;
+import org.entur.netex2.model.Quay;
+import org.entur.netex2.model.StopPlace;
 
 /**
  * Stop place repository that retrieves stop place data from the SiteFrame in the current file.
@@ -69,10 +70,8 @@ public String getStopPlaceNameForQuayId(QuayId quayId) {
     if (stopPlaceId == null) {
       return null;
     }
-    return netexEntitiesIndex
-      .getStopPlaceIndex()
-      .getLatestVersion(stopPlaceId)
-      .getName()
-      .getValue();
+    return MultilingualStringValue.of(
+      netexEntitiesIndex.getStopPlaceIndex().getLatestVersion(stopPlaceId).getName()
+    );
   }
 }

src/main/java/org/entur/netex/validation/validator/jaxb/support/DatedServiceJourneyUtils.java

@@ -2,8 +2,8 @@
 
 import jakarta.xml.bind.JAXBElement;
 import javax.annotation.Nullable;
-import org.rutebanken.netex.model.DatedServiceJourney;
-import org.rutebanken.netex.model.VehicleJourneyRefStructure;
+import org.entur.netex2.model.DatedServiceJourney;
+import org.entur.netex2.model.VehicleJourneyRefStructure;
 
 public class DatedServiceJourneyUtils {
 
@@ -16,6 +16,9 @@ private DatedServiceJourneyUtils() {}
   public static String originalDatedServiceJourneyRef(
     DatedServiceJourney datedServiceJourney
   ) {
+    if (datedServiceJourney.getReplacedJourneys() == null) {
+      return null;
+    }
     return datedServiceJourney
       .getReplacedJourneys()
       .getDatedVehicleJourneyRefOrNormalDatedVehicleJourneyRef()

src/main/java/org/entur/netex/validation/validator/model/DayTypeId.java

@@ -5,7 +5,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import org.entur.netex.validation.exception.NetexValidationException;
-import org.rutebanken.netex.model.*;
+import org.entur.netex2.model.*;
 
 /**
  * The NeTEx id of DayType.

src/main/java/org/entur/netex/validation/validator/model/FromToScheduledStopPointId.java

@@ -1,7 +1,7 @@
 package org.entur.netex.validation.validator.model;
 
 import org.entur.netex.validation.exception.NetexValidationException;
-import org.rutebanken.netex.model.ServiceLink;
+import org.entur.netex2.model.ServiceLink;
 
 /**
  * The pair of ScheduledStopPoint ids representing the "from" and "to" ends of a ServiceLink.

src/main/java/org/entur/netex/validation/validator/model/MultilingualStringValue.java

@@ -0,0 +1,35 @@
+package org.entur.netex.validation.validator.model;
+
+import java.io.Serializable;
+import java.util.List;
+import javax.annotation.Nullable;
+import org.entur.netex2.model.MultilingualString;
+
+/**
+ * Helper for extracting string values from NeTEx MultilingualString.
+ * In NeTEx 2.0 (netex2-java-model 3.x), MultilingualString uses a mixed content model
+ * where text is stored in getContent() as a List of Serializable objects,
+ * replacing the previous getValue() method.
+ */
+public final class MultilingualStringValue {
+
+  private MultilingualStringValue() {}
+
+  @Nullable
+  public static String of(@Nullable MultilingualString multilingualString) {
+    if (multilingualString == null) {
+      return null;
+    }
+    List<Serializable> content = multilingualString.getContent();
+    if (content == null || content.isEmpty()) {
+      return null;
+    }
+    StringBuilder sb = new StringBuilder();
+    for (Serializable item : content) {
+      if (item instanceof String s) {
+        sb.append(s);
+      }
+    }
+    return sb.isEmpty() ? null : sb.toString();
+  }
+}

src/main/java/org/entur/netex/validation/validator/model/OperatingDayId.java

@@ -4,7 +4,7 @@
 import java.util.Optional;
 import java.util.function.Function;
 import org.entur.netex.validation.exception.NetexValidationException;
-import org.rutebanken.netex.model.*;
+import org.entur.netex2.model.*;
 
 /**
  * The NeTEx id of OperatingDay.

src/main/java/org/entur/netex/validation/validator/model/QuayCoordinates.java

@@ -1,10 +1,10 @@
 package org.entur.netex.validation.validator.model;
 
 import org.entur.netex.validation.exception.NetexValidationException;
+import org.entur.netex2.model.LocationStructure;
+import org.entur.netex2.model.Quay;
+import org.entur.netex2.model.StopPlace;
 import org.locationtech.jts.geom.Coordinate;
-import org.rutebanken.netex.model.LocationStructure;
-import org.rutebanken.netex.model.Quay;
-import org.rutebanken.netex.model.StopPlace;
 
 /**
  * Latitude and longitude of a NeTEx Quay.

src/main/java/org/entur/netex/validation/validator/model/QuayId.java

@@ -3,8 +3,8 @@
 import java.util.Objects;
 import java.util.Optional;
 import org.entur.netex.validation.exception.NetexValidationException;
-import org.rutebanken.netex.model.Quay;
-import org.rutebanken.netex.model.QuayRefStructure;
+import org.entur.netex2.model.Quay;
+import org.entur.netex2.model.QuayRefStructure;
 
 /**
  * The NeTEx id of Quay.

src/main/java/org/entur/netex/validation/validator/model/ScheduledStopPointId.java

@@ -2,8 +2,8 @@
 
 import java.util.Optional;
 import org.entur.netex.validation.exception.NetexValidationException;
-import org.rutebanken.netex.model.ScheduledStopPointRefStructure;
-import org.rutebanken.netex.model.StopPointInJourneyPattern;
+import org.entur.netex2.model.ScheduledStopPointRefStructure;
+import org.entur.netex2.model.StopPointInJourneyPattern;
 
 /**
  * The NeTEx id od a ScheduledStopPoint.

src/main/java/org/entur/netex/validation/validator/model/ServiceJourneyId.java

@@ -5,8 +5,8 @@
 import net.sf.saxon.s9api.XdmItem;
 import net.sf.saxon.s9api.streams.XdmStream;
 import org.entur.netex.validation.exception.NetexValidationException;
-import org.rutebanken.netex.model.ServiceJourney;
-import org.rutebanken.netex.model.VehicleJourneyRefStructure;
+import org.entur.netex2.model.ServiceJourney;
+import org.entur.netex2.model.VehicleJourneyRefStructure;
 
 public record ServiceJourneyId(String id) {
   public ServiceJourneyId {

src/main/java/org/entur/netex/validation/validator/model/ServiceJourneyInterchangeInfo.java

@@ -2,8 +2,8 @@
 
 import java.util.Optional;
 import org.entur.netex.validation.exception.NetexValidationException;
-import org.rutebanken.netex.model.ServiceJourneyInterchange;
-import org.rutebanken.netex.model.VersionOfObjectRefStructure;
+import org.entur.netex2.model.ServiceJourneyInterchange;
+import org.entur.netex2.model.VersionOfObjectRefStructure;
 
 public record ServiceJourneyInterchangeInfo(
   String filename,

src/main/java/org/entur/netex/validation/validator/model/ServiceJourneyStop.java

@@ -3,7 +3,7 @@
 import java.math.BigInteger;
 import java.time.LocalTime;
 import java.util.Optional;
-import org.rutebanken.netex.model.TimetabledPassingTime;
+import org.entur.netex2.model.TimetabledPassingTime;
 
 /**
  * The NeTEx id of ScheduledStopPoint.

src/main/java/org/entur/netex/validation/validator/model/ServiceLinkId.java

@@ -2,9 +2,9 @@
 
 import java.util.Optional;
 import org.entur.netex.validation.exception.NetexValidationException;
-import org.rutebanken.netex.model.LinkInJourneyPattern;
-import org.rutebanken.netex.model.ServiceLink;
-import org.rutebanken.netex.model.VersionOfObjectRefStructure;
+import org.entur.netex2.model.LinkInJourneyPattern;
+import org.entur.netex2.model.ServiceLink;
+import org.entur.netex2.model.VersionOfObjectRefStructure;
 
 /**
  * The NeTEx id of a ServiceLink.

src/main/java/org/entur/netex/validation/validator/model/SimpleLine.java

@@ -3,9 +3,8 @@
 import java.util.Objects;
 import java.util.Optional;
 import org.entur.netex.validation.exception.NetexValidationException;
-import org.rutebanken.netex.model.FlexibleLine;
-import org.rutebanken.netex.model.Line;
-import org.rutebanken.netex.model.MultilingualString;
+import org.entur.netex2.model.FlexibleLine;
+import org.entur.netex2.model.Line;
 
 /**
  * Light-way representation of a NeTEx Line.
@@ -21,7 +20,7 @@ public record SimpleLine(String lineId, String lineName, String fileName) {
   public static SimpleLine of(Line line, String fileName) {
     return new SimpleLine(
       line.getId(),
-      Optional.ofNullable(line.getName()).map(MultilingualString::getValue).orElse(null),
+      Optional.ofNullable(line.getName()).map(MultilingualStringValue::of).orElse(null),
       fileName
     );
   }
@@ -31,7 +30,7 @@ public static SimpleLine of(FlexibleLine flexibleLine, String fileName) {
       flexibleLine.getId(),
       Optional
         .ofNullable(flexibleLine.getName())
-        .map(MultilingualString::getValue)
+        .map(MultilingualStringValue::of)
         .orElse(null),
       fileName
     );

src/main/java/org/entur/netex/validation/validator/model/TransportModeAndSubMode.java

@@ -2,15 +2,15 @@
 
 import java.util.Objects;
 import javax.annotation.Nullable;
-import org.rutebanken.netex.model.AllVehicleModesOfTransportEnumeration;
-import org.rutebanken.netex.model.StopPlace;
-import org.rutebanken.netex.model.TransportSubmodeStructure;
+import org.entur.netex2.model.AllPublicTransportModesEnumeration;
+import org.entur.netex2.model.StopPlace;
+import org.entur.netex2.model.TransportSubmodeStructure;
 
 /**
  * A pair of mode and sub-mode.
  */
 public record TransportModeAndSubMode(
-  AllVehicleModesOfTransportEnumeration mode,
+  AllPublicTransportModesEnumeration mode,
   TransportSubMode subMode
 ) {
   public TransportModeAndSubMode {
@@ -25,7 +25,7 @@ public record TransportModeAndSubMode(
    */
   @Nullable
   public static TransportModeAndSubMode of(StopPlace stopPlace) {
-    AllVehicleModesOfTransportEnumeration transportMode = stopPlace.getTransportMode();
+    AllPublicTransportModesEnumeration transportMode = stopPlace.getTransportMode();
     if (transportMode == null) {
       return null;
     }
@@ -42,7 +42,7 @@ public static TransportModeAndSubMode of(StopPlace stopPlace) {
    */
   @Nullable
   public static TransportModeAndSubMode of(
-    AllVehicleModesOfTransportEnumeration transportMode,
+    AllPublicTransportModesEnumeration transportMode,
     TransportSubmodeStructure submodeStructure
   ) {
     if (transportMode == null) {