Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions bindings.xjb
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@

<jxb:bindings>
<jxb:globalBindings underscoreBinding="asCharInWord">
<xjc:javaType name="org.rutebanken.time.XmlDateTime" xmlType="xs:dateTime" adapter="org.rutebanken.util.XmlDateTimeAdapter" />
<!--<xjc:javaType name="java.time.ZonedDateTime" xmlType="xs:dateTime" adapter="org.rutebanken.util.ZonedDateTimeISO8601XmlAdapter" />-->
<xjc:javaType name="java.time.LocalTime" xmlType="xs:time" adapter="org.rutebanken.util.LocalTimeISO8601XmlAdapter" />
<xjc:javaType name="java.time.LocalDateTime" xmlType="xs:date" adapter="org.rutebanken.util.LocalDateXmlAdapter" />
<xjc:javaType name="java.time.Duration" xmlType="xs:duration" adapter="org.rutebanken.util.DurationXmlAdapter" />
<xjc:javaType name="org.opentripplanner.ojp.time.XmlDateTime" xmlType="xs:dateTime" adapter="org.opentripplanner.ojp.util.XmlDateTimeAdapter" />
<!--<xjc:javaType name="java.time.ZonedDateTime" xmlType="xs:dateTime" adapter="org.opentripplanner.ojp.util.ZonedDateTimeISO8601XmlAdapter" />-->
<xjc:javaType name="java.time.LocalTime" xmlType="xs:time" adapter="org.opentripplanner.ojp.util.LocalTimeISO8601XmlAdapter" />
<xjc:javaType name="java.time.LocalDateTime" xmlType="xs:date" adapter="org.opentripplanner.ojp.util.LocalDateXmlAdapter" />
<xjc:javaType name="java.time.Duration" xmlType="xs:duration" adapter="org.opentripplanner.ojp.util.DurationXmlAdapter" />
</jxb:globalBindings>
</jxb:bindings>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@
<extensionArgs>
<extensionArg>-Xbug986</extensionArg>
<extensionArg>-Xfluent-api</extensionArg>
<extensionArg>-Xts:style:org.rutebanken.netex.OmitNullsToStringStyle.INSTANCE
<extensionArg>-Xts:style:org.opentripplanner.ojp.netex.OmitNullsToStringStyle.INSTANCE
</extensionArg>
</extensionArgs>
</xsdOption>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* limitations under the Licence.
*/

package org.rutebanken.netex;
package org.opentripplanner.ojp.netex;

import org.apache.commons.lang3.builder.ToStringStyle;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.rutebanken.time;
package org.opentripplanner.ojp.time;

import java.time.LocalDateTime;
import java.time.ZoneId;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.rutebanken.util;
package org.opentripplanner.ojp.util;

import jakarta.xml.bind.annotation.adapters.XmlAdapter;
import java.time.Duration;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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<String, XmlDateTime> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.rutebanken.util;
package org.opentripplanner.ojp.util;

import static org.junit.jupiter.api.Assertions.assertTrue;

Expand Down