Use regular double for xs:decimal

Author: leonardehrenfried

.github/workflows/release.yml

@@ -0,0 +1,15 @@
+changelog:
+  categories:
+    - title: Breaking changes
+      labels:
+        - "Breaking change"
+    - title: Bugfixes
+      labels:
+        - bug
+    - title: Dependency upgrades
+      labels:
+        - dependencies
+    - title: Non-breaking changes
+      labels:
+        - "*"
+

bindings.xjb

@@ -8,10 +8,10 @@
   <jxb:bindings>
     <jxb:globalBindings underscoreBinding="asCharInWord">
       <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" />
+      <xjc:javaType name="double" xmlType="xs:decimal" adapter="org.opentripplanner.ojp.util.DoubleXmlAdapter" />
     </jxb:globalBindings>
   </jxb:bindings>
 

pom.xml

@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opentripplanner</groupId>
   <artifactId>ojp-java-model</artifactId>
-  <version>2.0.2</version>
+  <version>2.0.3-SNAPSHOT</version>
 
   <name>ojp-java-model</name>
   <description>Generates Java model from OJP xsds using jaxb.</description>
@@ -372,17 +372,10 @@
         <version>${maven-release-plugin.version}</version>
         <configuration>
           <autoVersionSubmodules>true</autoVersionSubmodules>
-          <useReleaseProfile>false</useReleaseProfile>
-          <releaseProfiles>release,sign,!noPublicDeploy</releaseProfiles>
+          <releaseProfiles>release,sign</releaseProfiles>
           <goals>deploy</goals>
+          <tagNameFormat>@{project.version}</tagNameFormat>
         </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.maven.scm</groupId>
-            <artifactId>maven-scm-provider-gitexe</artifactId>
-            <version>1.9.2</version>
-          </dependency>
-        </dependencies>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

src/main/java/org/opentripplanner/ojp/util/DoubleXmlAdapter.java

@@ -0,0 +1,21 @@
+package org.opentripplanner.ojp.util;
+
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+import java.math.BigDecimal;
+
+/**
+ * {@code XmlAdapter} mapping xs:decimal to Java double
+ *
+ * @see jakarta.xml.bind.annotation.adapters.XmlAdapter
+ */
+public class DoubleXmlAdapter extends XmlAdapter<String, Double> {
+    @Override
+    public Double unmarshal(String stringValue) {
+        return stringValue != null ? Double.parseDouble(stringValue) : null;
+    }
+
+    @Override
+    public String marshal(Double value) {
+        return value != null ? value.toString() : null;
+    }
+}