Merge pull request #492 from swagger-api/fix-resteasy

fixes resteasy dateLibrary dependent code
swagger-api · Oct 7, 2019 · ccd7a53 · ccd7a53
2 parents 2ab482a + eec82ba
commit ccd7a53
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/src/main/java/io/swagger/codegen/v3/generators/java/AbstractJavaCodegen.java b/src/main/java/io/swagger/codegen/v3/generators/java/AbstractJavaCodegen.java
@@ -439,7 +439,7 @@ public void processOpts() {
                 importMapping.put("OffsetDateTime", "java.time.OffsetDateTime");
             }
         } else if (dateLibrary.equals("legacy")) {
-            additionalProperties.put("legacyDates", "true");
+            additionalProperties.put("legacyDates", true);
         }
     }
 

diff --git a/src/main/resources/handlebars/JavaJaxRS/resteasy/JacksonConfig.mustache b/src/main/resources/handlebars/JavaJaxRS/resteasy/JacksonConfig.mustache
@@ -26,7 +26,7 @@ public class JacksonConfig implements ContextResolver<ObjectMapper> {
     public JacksonConfig() throws Exception {
 
         objectMapper = new ObjectMapper()
-            .setDateFormat(new RFC3339DateFormat())
+            .setDateFormat(new RFC3339DateFormat()){{#legacyDates}};{{/legacyDates}}
 {{#java8}}
             .registerModule(new JavaTimeModule());
 {{/java8}}

diff --git a/src/main/resources/handlebars/JavaJaxRS/resteasy/pom.mustache b/src/main/resources/handlebars/JavaJaxRS/resteasy/pom.mustache
@@ -126,7 +126,14 @@
             <version>1.2</version>
             <scope>provided</scope>
         </dependency>
-
+{{#java8}}
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>${jackson-version}</version>
+        </dependency>
+{{/java8}}
+{{^java8}}
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-joda</artifactId>
@@ -137,6 +144,7 @@
             <artifactId>joda-time</artifactId>
             <version>2.7</version>
         </dependency>
+{{/java8}}
         {{#useOas2}}
         <dependency>
             <groupId>io.swagger</groupId>
@@ -209,5 +217,6 @@
         <slf4j-version>1.6.3</slf4j-version>
         <junit-version>4.8.1</junit-version>
         <servlet-api-version>2.5</servlet-api-version>
+        {{#java8}}<jackson-version>2.9.10</jackson-version>{{/java8}}
     </properties>
 </project>