From b0dcbf47a14a5ba527888ae23e638c41407730f6 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Wed, 14 May 2025 15:58:35 +0200 Subject: [PATCH 1/2] Move file from rutebanken to opentripplanner --- .../ojp}/netex/OmitNullsToStringStyle.java | 0 .../org/{rutebanken => opentipplanner/ojp}/time/XmlDateTime.java | 0 .../ojp}/util/DurationXmlAdapter.java | 0 .../ojp}/util/LocalDateTimeISO8601XmlAdapter.java | 0 .../ojp}/util/LocalDateXmlAdapter.java | 0 .../ojp}/util/LocalTimeISO8601XmlAdapter.java | 0 .../ojp}/util/XmlDateTimeAdapter.java | 0 .../ojp}/util/ZonedDateTimeISO8601XmlAdapter.java | 0 .../ojp}/util/XmlDateTimeAdapterTest.java | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename src/main/java/org/{rutebanken => opentipplanner/ojp}/netex/OmitNullsToStringStyle.java (100%) rename src/main/java/org/{rutebanken => opentipplanner/ojp}/time/XmlDateTime.java (100%) rename src/main/java/org/{rutebanken => opentipplanner/ojp}/util/DurationXmlAdapter.java (100%) rename src/main/java/org/{rutebanken => opentipplanner/ojp}/util/LocalDateTimeISO8601XmlAdapter.java (100%) rename src/main/java/org/{rutebanken => opentipplanner/ojp}/util/LocalDateXmlAdapter.java (100%) rename src/main/java/org/{rutebanken => opentipplanner/ojp}/util/LocalTimeISO8601XmlAdapter.java (100%) rename src/main/java/org/{rutebanken => opentipplanner/ojp}/util/XmlDateTimeAdapter.java (100%) rename src/main/java/org/{rutebanken => opentipplanner/ojp}/util/ZonedDateTimeISO8601XmlAdapter.java (100%) rename src/test/java/org/{rutebanken => opentripplanner/ojp}/util/XmlDateTimeAdapterTest.java (100%) diff --git a/src/main/java/org/rutebanken/netex/OmitNullsToStringStyle.java b/src/main/java/org/opentipplanner/ojp/netex/OmitNullsToStringStyle.java similarity index 100% rename from src/main/java/org/rutebanken/netex/OmitNullsToStringStyle.java rename to src/main/java/org/opentipplanner/ojp/netex/OmitNullsToStringStyle.java diff --git a/src/main/java/org/rutebanken/time/XmlDateTime.java b/src/main/java/org/opentipplanner/ojp/time/XmlDateTime.java similarity index 100% rename from src/main/java/org/rutebanken/time/XmlDateTime.java rename to src/main/java/org/opentipplanner/ojp/time/XmlDateTime.java diff --git a/src/main/java/org/rutebanken/util/DurationXmlAdapter.java b/src/main/java/org/opentipplanner/ojp/util/DurationXmlAdapter.java similarity index 100% rename from src/main/java/org/rutebanken/util/DurationXmlAdapter.java rename to src/main/java/org/opentipplanner/ojp/util/DurationXmlAdapter.java diff --git a/src/main/java/org/rutebanken/util/LocalDateTimeISO8601XmlAdapter.java b/src/main/java/org/opentipplanner/ojp/util/LocalDateTimeISO8601XmlAdapter.java similarity index 100% rename from src/main/java/org/rutebanken/util/LocalDateTimeISO8601XmlAdapter.java rename to src/main/java/org/opentipplanner/ojp/util/LocalDateTimeISO8601XmlAdapter.java diff --git a/src/main/java/org/rutebanken/util/LocalDateXmlAdapter.java b/src/main/java/org/opentipplanner/ojp/util/LocalDateXmlAdapter.java similarity index 100% rename from src/main/java/org/rutebanken/util/LocalDateXmlAdapter.java rename to src/main/java/org/opentipplanner/ojp/util/LocalDateXmlAdapter.java diff --git a/src/main/java/org/rutebanken/util/LocalTimeISO8601XmlAdapter.java b/src/main/java/org/opentipplanner/ojp/util/LocalTimeISO8601XmlAdapter.java similarity index 100% rename from src/main/java/org/rutebanken/util/LocalTimeISO8601XmlAdapter.java rename to src/main/java/org/opentipplanner/ojp/util/LocalTimeISO8601XmlAdapter.java diff --git a/src/main/java/org/rutebanken/util/XmlDateTimeAdapter.java b/src/main/java/org/opentipplanner/ojp/util/XmlDateTimeAdapter.java similarity index 100% rename from src/main/java/org/rutebanken/util/XmlDateTimeAdapter.java rename to src/main/java/org/opentipplanner/ojp/util/XmlDateTimeAdapter.java diff --git a/src/main/java/org/rutebanken/util/ZonedDateTimeISO8601XmlAdapter.java b/src/main/java/org/opentipplanner/ojp/util/ZonedDateTimeISO8601XmlAdapter.java similarity index 100% rename from src/main/java/org/rutebanken/util/ZonedDateTimeISO8601XmlAdapter.java rename to src/main/java/org/opentipplanner/ojp/util/ZonedDateTimeISO8601XmlAdapter.java diff --git a/src/test/java/org/rutebanken/util/XmlDateTimeAdapterTest.java b/src/test/java/org/opentripplanner/ojp/util/XmlDateTimeAdapterTest.java similarity index 100% rename from src/test/java/org/rutebanken/util/XmlDateTimeAdapterTest.java rename to src/test/java/org/opentripplanner/ojp/util/XmlDateTimeAdapterTest.java From 203f2a8de354f199946eb3e0e5ab89ec6497a57a Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Wed, 14 May 2025 15:59:19 +0200 Subject: [PATCH 2/2] refactor: Rename package rutebanken to opentripplanner --- bindings.xjb | 10 +++++----- pom.xml | 2 +- .../ojp/netex/OmitNullsToStringStyle.java | 2 +- .../java/org/opentipplanner/ojp/time/XmlDateTime.java | 2 +- .../opentipplanner/ojp/util/DurationXmlAdapter.java | 2 +- .../ojp/util/LocalDateTimeISO8601XmlAdapter.java | 2 +- .../opentipplanner/ojp/util/LocalDateXmlAdapter.java | 2 +- .../ojp/util/LocalTimeISO8601XmlAdapter.java | 2 +- .../opentipplanner/ojp/util/XmlDateTimeAdapter.java | 4 ++-- .../ojp/util/ZonedDateTimeISO8601XmlAdapter.java | 2 +- .../ojp/util/XmlDateTimeAdapterTest.java | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/bindings.xjb b/bindings.xjb index 2eac99a..143f004 100644 --- a/bindings.xjb +++ b/bindings.xjb @@ -7,11 +7,11 @@ - - - - - + + + + + diff --git a/pom.xml b/pom.xml index 4ca694d..62d666e 100644 --- a/pom.xml +++ b/pom.xml @@ -304,7 +304,7 @@ -Xbug986 -Xfluent-api - -Xts:style:org.rutebanken.netex.OmitNullsToStringStyle.INSTANCE + -Xts:style:org.opentripplanner.ojp.netex.OmitNullsToStringStyle.INSTANCE diff --git a/src/main/java/org/opentipplanner/ojp/netex/OmitNullsToStringStyle.java b/src/main/java/org/opentipplanner/ojp/netex/OmitNullsToStringStyle.java index 6148a1e..2f18311 100644 --- a/src/main/java/org/opentipplanner/ojp/netex/OmitNullsToStringStyle.java +++ b/src/main/java/org/opentipplanner/ojp/netex/OmitNullsToStringStyle.java @@ -13,7 +13,7 @@ * limitations under the Licence. */ -package org.rutebanken.netex; +package org.opentripplanner.ojp.netex; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/src/main/java/org/opentipplanner/ojp/time/XmlDateTime.java b/src/main/java/org/opentipplanner/ojp/time/XmlDateTime.java index 775b240..5a2377c 100644 --- a/src/main/java/org/opentipplanner/ojp/time/XmlDateTime.java +++ b/src/main/java/org/opentipplanner/ojp/time/XmlDateTime.java @@ -1,4 +1,4 @@ -package org.rutebanken.time; +package org.opentripplanner.ojp.time; import java.time.LocalDateTime; import java.time.ZoneId; diff --git a/src/main/java/org/opentipplanner/ojp/util/DurationXmlAdapter.java b/src/main/java/org/opentipplanner/ojp/util/DurationXmlAdapter.java index 4cc1a9a..9aab3b7 100644 --- a/src/main/java/org/opentipplanner/ojp/util/DurationXmlAdapter.java +++ b/src/main/java/org/opentipplanner/ojp/util/DurationXmlAdapter.java @@ -1,4 +1,4 @@ -package org.rutebanken.util; +package org.opentripplanner.ojp.util; import jakarta.xml.bind.annotation.adapters.XmlAdapter; import java.time.Duration; diff --git a/src/main/java/org/opentipplanner/ojp/util/LocalDateTimeISO8601XmlAdapter.java b/src/main/java/org/opentipplanner/ojp/util/LocalDateTimeISO8601XmlAdapter.java index 433e75f..b799715 100644 --- a/src/main/java/org/opentipplanner/ojp/util/LocalDateTimeISO8601XmlAdapter.java +++ b/src/main/java/org/opentipplanner/ojp/util/LocalDateTimeISO8601XmlAdapter.java @@ -13,7 +13,7 @@ * limitations under the Licence. */ -package org.rutebanken.util; +package org.opentripplanner.ojp.util; import jakarta.xml.bind.annotation.adapters.XmlAdapter; import java.time.LocalDateTime; diff --git a/src/main/java/org/opentipplanner/ojp/util/LocalDateXmlAdapter.java b/src/main/java/org/opentipplanner/ojp/util/LocalDateXmlAdapter.java index 237b464..9590114 100644 --- a/src/main/java/org/opentipplanner/ojp/util/LocalDateXmlAdapter.java +++ b/src/main/java/org/opentipplanner/ojp/util/LocalDateXmlAdapter.java @@ -13,7 +13,7 @@ * limitations under the Licence. */ -package org.rutebanken.util; +package org.opentripplanner.ojp.util; import jakarta.xml.bind.annotation.adapters.XmlAdapter; import java.time.LocalDateTime; diff --git a/src/main/java/org/opentipplanner/ojp/util/LocalTimeISO8601XmlAdapter.java b/src/main/java/org/opentipplanner/ojp/util/LocalTimeISO8601XmlAdapter.java index bc69f25..c1e3101 100644 --- a/src/main/java/org/opentipplanner/ojp/util/LocalTimeISO8601XmlAdapter.java +++ b/src/main/java/org/opentipplanner/ojp/util/LocalTimeISO8601XmlAdapter.java @@ -13,7 +13,7 @@ * limitations under the Licence. */ -package org.rutebanken.util; +package org.opentripplanner.ojp.util; import jakarta.xml.bind.annotation.adapters.XmlAdapter; import java.time.LocalTime; diff --git a/src/main/java/org/opentipplanner/ojp/util/XmlDateTimeAdapter.java b/src/main/java/org/opentipplanner/ojp/util/XmlDateTimeAdapter.java index 6e3ed91..fc3437d 100644 --- a/src/main/java/org/opentipplanner/ojp/util/XmlDateTimeAdapter.java +++ b/src/main/java/org/opentipplanner/ojp/util/XmlDateTimeAdapter.java @@ -13,7 +13,7 @@ * limitations under the Licence. */ -package org.rutebanken.util; +package org.opentripplanner.ojp.util; import jakarta.xml.bind.annotation.adapters.XmlAdapter; import java.time.LocalDateTime; @@ -22,7 +22,7 @@ import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatterBuilder; import java.time.temporal.ChronoField; -import org.rutebanken.time.XmlDateTime; +import org.opentripplanner.ojp.time.XmlDateTime; public class XmlDateTimeAdapter extends XmlAdapter { diff --git a/src/main/java/org/opentipplanner/ojp/util/ZonedDateTimeISO8601XmlAdapter.java b/src/main/java/org/opentipplanner/ojp/util/ZonedDateTimeISO8601XmlAdapter.java index e5408ff..403224b 100644 --- a/src/main/java/org/opentipplanner/ojp/util/ZonedDateTimeISO8601XmlAdapter.java +++ b/src/main/java/org/opentipplanner/ojp/util/ZonedDateTimeISO8601XmlAdapter.java @@ -13,7 +13,7 @@ * limitations under the Licence. */ -package org.rutebanken.util; +package org.opentripplanner.ojp.util; import jakarta.xml.bind.annotation.adapters.XmlAdapter; import java.time.ZonedDateTime; diff --git a/src/test/java/org/opentripplanner/ojp/util/XmlDateTimeAdapterTest.java b/src/test/java/org/opentripplanner/ojp/util/XmlDateTimeAdapterTest.java index 43e51bf..669ab79 100644 --- a/src/test/java/org/opentripplanner/ojp/util/XmlDateTimeAdapterTest.java +++ b/src/test/java/org/opentripplanner/ojp/util/XmlDateTimeAdapterTest.java @@ -1,4 +1,4 @@ -package org.rutebanken.util; +package org.opentripplanner.ojp.util; import static org.junit.jupiter.api.Assertions.assertTrue;