From dc800c79cc0e93bd2d0e2a3ecfced9cea48cfd73 Mon Sep 17 00:00:00 2001 From: Ian O'Neill Date: Mon, 17 Jul 2017 14:44:51 +0100 Subject: [PATCH] [JaxrsResteasy] Fix EAP dependencies for Java 8 (#6058) * Depend on Joda by default, like the default JAX-RS server * If Java 8 is specified add Jackson JSR-310 dependency and import in the JacksonConfig. --- .../resteasy/eap/JacksonConfig.mustache | 9 ++- .../JavaJaxRS/resteasy/eap/gradle.mustache | 12 +++- .../JavaJaxRS/resteasy/eap/pom.mustache | 57 +++++++++---------- .../jaxrs-resteasy/eap-joda/build.gradle | 3 +- .../petstore/jaxrs-resteasy/eap-joda/pom.xml | 39 ++++++------- .../petstore/jaxrs-resteasy/eap/build.gradle | 3 + .../petstore/jaxrs-resteasy/eap/pom.xml | 34 +++++------ .../java/io/swagger/api/JacksonConfig.java | 1 + 8 files changed, 82 insertions(+), 76 deletions(-) diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/JacksonConfig.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/JacksonConfig.mustache index ed5de465670..923d26477d9 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/JacksonConfig.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/JacksonConfig.mustache @@ -9,7 +9,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.fasterxml.jackson.databind.ObjectMapper; +{{#java8}} +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +{{/java8}} +{{^java8}} import com.fasterxml.jackson.datatype.joda.JodaModule; +{{/java8}} @Provider @Produces(MediaType.APPLICATION_JSON) @@ -25,9 +30,9 @@ public class JacksonConfig implements ContextResolver { {{#java8}} this.objectMapper.registerModule(new JavaTimeModule()); {{/java8}} -{{#joda}} +{{^java8}} this.objectMapper.registerModule(new JodaModule()); -{{/joda}} +{{/java8}} // sample to convert any DateTime to readable timestamps //this.objectMapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, true); diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/gradle.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/gradle.mustache index ae34de08166..60f4d69117b 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/gradle.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/gradle.mustache @@ -15,10 +15,16 @@ dependencies { providedCompile 'javax.annotation:javax.annotation-api:1.2' providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final' compile 'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final' -{{#joda}} - compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.4.1' +{{#useBeanValidation}} + providedCompile 'javax.validation:validation-api:1.1.0.Final' +{{/useBeanValidation}} +{{^java8}} + compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.6.3' compile 'joda-time:joda-time:2.7' -{{/joda}} +{{/java8}} +{{#java8}} + compile 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.6.3' +{{/java8}} testCompile 'junit:junit:4.12', 'org.hamcrest:hamcrest-core:1.3' } diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache index ce77499a933..cf8d6807e2c 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache @@ -98,16 +98,6 @@ provided - - com.fasterxml.jackson.datatype - jackson-datatype-joda - 2.4.1 - - - joda-time - joda-time - 2.7 - io.swagger swagger-jaxrs @@ -140,27 +130,32 @@ {{#useBeanValidation}} - - - javax.validation - validation-api - 1.1.0.Final - provided - -{{/useBeanValidation}} -{{#joda}} - - com.fasterxml.jackson.datatype - jackson-datatype-joda - 2.1.1 - -{{/joda}} -{{#java8}} - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - 2.6.3 - + + + javax.validation + validation-api + 1.1.0.Final + provided + +{{/useBeanValidation}} +{{^java8}} + + joda-time + joda-time + 2.7 + + + com.fasterxml.jackson.datatype + jackson-datatype-joda + 2.6.3 + +{{/java8}} +{{#java8}} + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + 2.6.3 + {{/java8}} diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/build.gradle b/samples/server/petstore/jaxrs-resteasy/eap-joda/build.gradle index ed888aecd20..e89fc25bec1 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/build.gradle +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/build.gradle @@ -15,7 +15,8 @@ dependencies { providedCompile 'javax.annotation:javax.annotation-api:1.2' providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final' compile 'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final' - compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.4.1' + providedCompile 'javax.validation:validation-api:1.1.0.Final' + compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.6.3' compile 'joda-time:joda-time:2.7' testCompile 'junit:junit:4.12', 'org.hamcrest:hamcrest-core:1.3' diff --git a/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml b/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml index c1da131b556..bb8a728d7e4 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/eap-joda/pom.xml @@ -98,16 +98,6 @@ provided - - com.fasterxml.jackson.datatype - jackson-datatype-joda - 2.4.1 - - - joda-time - joda-time - 2.7 - io.swagger swagger-jaxrs @@ -139,18 +129,23 @@ - - - javax.validation - validation-api - 1.1.0.Final - provided - - - com.fasterxml.jackson.datatype - jackson-datatype-joda - 2.1.1 - + + + javax.validation + validation-api + 1.1.0.Final + provided + + + joda-time + joda-time + 2.7 + + + com.fasterxml.jackson.datatype + jackson-datatype-joda + 2.6.3 + diff --git a/samples/server/petstore/jaxrs-resteasy/eap/build.gradle b/samples/server/petstore/jaxrs-resteasy/eap/build.gradle index 879fe11de18..e89fc25bec1 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/build.gradle +++ b/samples/server/petstore/jaxrs-resteasy/eap/build.gradle @@ -15,6 +15,9 @@ dependencies { providedCompile 'javax.annotation:javax.annotation-api:1.2' providedCompile 'org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:1.0.0.Final' compile 'org.jboss.resteasy:resteasy-jackson2-provider:3.0.11.Final' + providedCompile 'javax.validation:validation-api:1.1.0.Final' + compile 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.6.3' + compile 'joda-time:joda-time:2.7' testCompile 'junit:junit:4.12', 'org.hamcrest:hamcrest-core:1.3' } diff --git a/samples/server/petstore/jaxrs-resteasy/eap/pom.xml b/samples/server/petstore/jaxrs-resteasy/eap/pom.xml index d4f0bc7abc5..05d529c92e0 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/pom.xml +++ b/samples/server/petstore/jaxrs-resteasy/eap/pom.xml @@ -98,16 +98,6 @@ provided - - com.fasterxml.jackson.datatype - jackson-datatype-joda - 2.4.1 - - - joda-time - joda-time - 2.7 - io.swagger swagger-jaxrs @@ -139,13 +129,23 @@ - - - javax.validation - validation-api - 1.1.0.Final - provided - + + + javax.validation + validation-api + 1.1.0.Final + provided + + + joda-time + joda-time + 2.7 + + + com.fasterxml.jackson.datatype + jackson-datatype-joda + 2.6.3 + diff --git a/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/io/swagger/api/JacksonConfig.java b/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/io/swagger/api/JacksonConfig.java index 8b6f49d4345..2cf35d3d1e6 100644 --- a/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/io/swagger/api/JacksonConfig.java +++ b/samples/server/petstore/jaxrs-resteasy/eap/src/main/java/io/swagger/api/JacksonConfig.java @@ -22,6 +22,7 @@ public class JacksonConfig implements ContextResolver { public JacksonConfig() throws Exception { this.objectMapper = new ObjectMapper(); + this.objectMapper.registerModule(new JodaModule()); // sample to convert any DateTime to readable timestamps //this.objectMapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, true);