From f57d43c84dad798dc41e73b8014596766c03f098 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Mon, 2 Jun 2025 12:47:10 +0200 Subject: [PATCH 1/2] Update NeTEx 1.16 --- pom.xml | 4 ++-- .../loader/parser/TimeTableFrameParser.java | 17 ++++------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index 03cb99a..f00cec0 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.entur netex-parser-java - 3.1.73-SNAPSHOT + 4.0.0-SNAPSHOT netex-java-parser Library for parsing NeTEx files and looking up entities in an index. @@ -52,7 +52,7 @@ UTF-8 17 - 2.0.15.2 + 2.0.16-SNAPSHOT 32.1.3-jre 1.6.13 diff --git a/src/main/java/org/entur/netex/loader/parser/TimeTableFrameParser.java b/src/main/java/org/entur/netex/loader/parser/TimeTableFrameParser.java index cdedfcb..db1b177 100644 --- a/src/main/java/org/entur/netex/loader/parser/TimeTableFrameParser.java +++ b/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 { From 54f60050fdb1c20a6fbd6b9486243d0a7568483c Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Mon, 2 Feb 2026 12:33:21 +0100 Subject: [PATCH 2/2] Use Maven Central snapshot repository --- pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pom.xml b/pom.xml index f00cec0..0df76e2 100644 --- a/pom.xml +++ b/pom.xml @@ -342,6 +342,18 @@ + + + maven-snapshots + https://central.sonatype.com/repository/maven-snapshots + + false + + + true + + + sonar