From 3a95c3eae0da96297cea3068c75d9f87127b572e Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 5 Jan 2026 14:21:17 +0100 Subject: [PATCH 1/2] Map xs:integer to java.lang.Integer --- bindings.xjb | 1 + .../ojp/util/IntegerXmlAdapter.java | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 src/main/java/org/opentripplanner/ojp/util/IntegerXmlAdapter.java diff --git a/bindings.xjb b/bindings.xjb index 6e05c2a..b43d59b 100644 --- a/bindings.xjb +++ b/bindings.xjb @@ -11,6 +11,7 @@ + diff --git a/src/main/java/org/opentripplanner/ojp/util/IntegerXmlAdapter.java b/src/main/java/org/opentripplanner/ojp/util/IntegerXmlAdapter.java new file mode 100644 index 0000000..ada3b71 --- /dev/null +++ b/src/main/java/org/opentripplanner/ojp/util/IntegerXmlAdapter.java @@ -0,0 +1,20 @@ +package org.opentripplanner.ojp.util; + +import jakarta.xml.bind.annotation.adapters.XmlAdapter; + +/** + * {@code XmlAdapter} mapping xs:integer to Java Integer + * + * @see jakarta.xml.bind.annotation.adapters.XmlAdapter + */ +public class IntegerXmlAdapter extends XmlAdapter { + @Override + public Integer unmarshal(String stringValue) { + return stringValue != null ? Integer.parseInt(stringValue) : null; + } + + @Override + public String marshal(Integer value) { + return value != null ? value.toString() : null; + } +} From 7124d1ecbee39234258d818c1b4a590f18ce7da9 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 5 Jan 2026 14:31:34 +0100 Subject: [PATCH 2/2] Add task to makefile --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4664c47..d9a3acb 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,7 @@ release: git checkout main git pull - mvn release:clean release:prepare release:perform -Dgoals=deploy release:clean \ No newline at end of file + mvn release:clean release:prepare release:perform -Dgoals=deploy release:clean + +pr: + xdg-open "https://github.com/opentripplanner/ojp-java-model/compare/main...`git rev-parse --abbrev-ref HEAD`"