Merge pull request #7 from opentripplanner/int

Map xs:integer to java.lang.Integer

Author: leonardehrenfried

Makefile

@@ -1,4 +1,7 @@
 release:
 	git checkout main
 	git pull
-	mvn release:clean release:prepare release:perform -Dgoals=deploy release:clean
+	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`"

bindings.xjb

@@ -11,6 +11,7 @@
       <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" />
+      <xjc:javaType name="java.lang.Integer" xmlType="xs:integer" adapter="org.opentripplanner.ojp.util.IntegerXmlAdapter"/>
       <xjc:javaType name="java.lang.Double" xmlType="xs:decimal" adapter="org.opentripplanner.ojp.util.DoubleXmlAdapter" />
     </jxb:globalBindings>
   </jxb:bindings>

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<String, Integer> {
+    @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;
+    }
+}