Merge branch 'update_netex_1_16' into 4.x

Author: vpaturet

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>org.entur</groupId>
     <artifactId>netex-parser-java</artifactId>
-    <version>3.1.76-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
 
     <name>netex-java-parser</name>
     <description>Library for parsing NeTEx files and looking up entities in an index.</description>
@@ -52,7 +52,7 @@
         <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-java-model.version>2.0.16-SNAPSHOT</netex-java-model.version>
         <guava.version>32.1.3-jre</guava.version>
 
         <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
@@ -342,6 +342,18 @@
             </plugin>
         </plugins>
     </build>
+    <repositories>
+        <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>
             <id>sonar</id>

src/main/java/org/entur/netex/loader/parser/TimeTableFrameParser.java

@@ -117,19 +117,10 @@ private void parseJourneys(JourneysInFrame_RelStructure element) {
         serviceJourneys.add(serviceJourney);
       } else if (it instanceof DatedServiceJourney datedServiceJourney) {
         datedServiceJourneys.add(datedServiceJourney);
-        datedServiceJourney
-          .getJourneyRef()
-          .stream()
-          .filter(journeyRef ->
-            journeyRef.getValue() instanceof ServiceJourneyRefStructure
-          )
-          .map(journeyRef -> journeyRef.getValue().getRef())
-          .forEach(serviceJourneyId ->
-            datedServiceJourneyByServiceJourneyId.put(
-              serviceJourneyId,
-              datedServiceJourney
-            )
-          );
+        datedServiceJourneyByServiceJourneyId.put(
+          datedServiceJourney.getJourneyRef().getValue().getRef(),
+          datedServiceJourney
+        );
       } else if (it instanceof DeadRun deadRun) {
         deadRuns.add(deadRun);
       } else {