From 1740e536a9327408e3f983cc0492c64b7da48560 Mon Sep 17 00:00:00 2001
From: "v.bychkov" <v.bychkov@betterbits.de>
Date: Thu, 14 Jan 2021 16:46:18 +0100
Subject: [PATCH] dateLibrary java8 does works now with xml
---
.../src/main/resources/Java/libraries/resteasy/pom.mustache | 5 +++++
.../openapi-generator/src/main/resources/Java/model.mustache | 2 ++
.../openapi-generator/src/main/resources/Java/pojo.mustache | 3 +++
3 files changed, 10 insertions(+)
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache
index 738f438da60..ef6ac31f73d 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache
@@ -241,6 +241,11 @@
<artifactId>jackson-dataformat-xml</artifactId>
<version>${jackson-version}</version>
</dependency>
+ <dependency>
+ <groupId>io.github.threeten-jaxb</groupId>
+ <artifactId>threeten-jaxb-core</artifactId>
+ <version>1.2</version>
+ </dependency>
{{/withXml}}
{{^java8}}
diff --git a/modules/openapi-generator/src/main/resources/Java/model.mustache b/modules/openapi-generator/src/main/resources/Java/model.mustache
index d4d1447a1d4..87caa78ac7d 100644
--- a/modules/openapi-generator/src/main/resources/Java/model.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/model.mustache
@@ -27,6 +27,8 @@ import com.fasterxml.jackson.dataformat.xml.annotation.*;
{{/jackson}}
{{#withXml}}
import javax.xml.bind.annotation.*;
+import javax.xml.bind.annotation.adapters.*;
+import io.github.threetenjaxb.core.*;
{{/withXml}}
{{#parcelableModel}}
import android.os.Parcelable;
diff --git a/modules/openapi-generator/src/main/resources/Java/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/pojo.mustache
index 03cf219b760..3574f9eaf85 100644
--- a/modules/openapi-generator/src/main/resources/Java/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/pojo.mustache
@@ -52,6 +52,9 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#vendorE
@XmlElementWrapper({{#xmlNamespace}}namespace="{{xmlNamespace}}", {{/xmlNamespace}}name = "{{#xmlName}}{{xmlName}}{{/xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
{{/isXmlWrapped}}
{{/isContainer}}
+ {{#isDateTime}}
+ @XmlJavaTypeAdapter(OffsetDateTimeXmlAdapter.class)
+ {{/isDateTime}}
{{/isXmlAttribute}}
{{/withXml}}
{{#gson}}
--
GitLab