Merge pull request #9761 from swagger-api/fix-resteasy-gradle-date

frantuma · web-flow · commit 38d8d0b0a901 · 2019-10-08T14:29:09.000+02:00
refs swagger-api/swagger-codegen-generators#493 - update resteasy samples
diff --git a/samples/server/petstore/jaxrs-resteasy/default/build.gradle b/samples/server/petstore/jaxrs-resteasy/default/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     compile         'io.swagger.core.v3:swagger-annotations:2.0.0'
     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.4.1'
+    compile         'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.10'
     compile         'joda-time:joda-time:2.7'
     //TODO: swaggerFeature
     compile 'io.swagger.core.v3:swagger-jaxrs2:2.0.0'
diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/StoreApi.java
@@ -78,7 +78,7 @@ public Response getOrderById( @Min(1L) @Max(5L) @PathParam("orderId") Long order
     }
     @POST
     @Path("/order")
-    @Consumes({ "*/*" })
+    @Consumes({ "application/json" })
     @Produces({ "application/xml", "application/json" })
     @Operation(summary = "Place an order for a pet", description = "", tags={ "store" })
     @ApiResponses(value = { 
diff --git a/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/UserApi.java b/samples/server/petstore/jaxrs-resteasy/default/src/gen/java/io/swagger/api/UserApi.java
@@ -36,7 +36,7 @@ public class UserApi  {
 
     @POST
     
-    @Consumes({ "*/*" })
+    @Consumes({ "application/json" })
     
     @Operation(summary = "Create user", description = "This can only be done by the logged in user.", tags={ "user" })
     @ApiResponses(value = { 
@@ -47,7 +47,7 @@ public Response createUser(@Parameter(description = "Created user object" ,requi
     }
     @POST
     @Path("/createWithArray")
-    @Consumes({ "*/*" })
+    @Consumes({ "application/json" })
     
     @Operation(summary = "Creates list of users with given input array", description = "", tags={ "user" })
     @ApiResponses(value = { 
@@ -58,7 +58,7 @@ public Response createUsersWithArrayInput(@Parameter(description = "List of user
     }
     @POST
     @Path("/createWithList")
-    @Consumes({ "*/*" })
+    @Consumes({ "application/json" })
     
     @Operation(summary = "Creates list of users with given input array", description = "", tags={ "user" })
     @ApiResponses(value = { 
diff --git a/samples/server/petstore/jaxrs-resteasy/java8/build.gradle b/samples/server/petstore/jaxrs-resteasy/java8/build.gradle
@@ -18,8 +18,7 @@ dependencies {
     compile         'io.swagger.core.v3:swagger-annotations:2.0.0'
     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.4.1'
-    compile         'joda-time:joda-time:2.7'
+    compile         'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.10'
     //TODO: swaggerFeature
     compile 'io.swagger.core.v3:swagger-jaxrs2:2.0.0'
     
diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/io/swagger/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/io/swagger/api/StoreApi.java
@@ -78,7 +78,7 @@ public Response getOrderById( @Min(1L) @Max(5L) @PathParam("orderId") Long order
     }
     @POST
     @Path("/order")
-    @Consumes({ "*/*" })
+    @Consumes({ "application/json" })
     @Produces({ "application/xml", "application/json" })
     @Operation(summary = "Place an order for a pet", description = "", tags={ "store" })
     @ApiResponses(value = { 
diff --git a/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/io/swagger/api/UserApi.java b/samples/server/petstore/jaxrs-resteasy/java8/src/gen/java/io/swagger/api/UserApi.java
@@ -36,7 +36,7 @@ public class UserApi  {
 
     @POST
     
-    @Consumes({ "*/*" })
+    @Consumes({ "application/json" })
     
     @Operation(summary = "Create user", description = "This can only be done by the logged in user.", tags={ "user" })
     @ApiResponses(value = { 
@@ -47,7 +47,7 @@ public Response createUser(@Parameter(description = "Created user object" ,requi
     }
     @POST
     @Path("/createWithArray")
-    @Consumes({ "*/*" })
+    @Consumes({ "application/json" })
     
     @Operation(summary = "Creates list of users with given input array", description = "", tags={ "user" })
     @ApiResponses(value = { 
@@ -58,7 +58,7 @@ public Response createUsersWithArrayInput(@Parameter(description = "List of user
     }
     @POST
     @Path("/createWithList")
-    @Consumes({ "*/*" })
+    @Consumes({ "application/json" })
     
     @Operation(summary = "Creates list of users with given input array", description = "", tags={ "user" })
     @ApiResponses(value = { 
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/build.gradle b/samples/server/petstore/jaxrs-resteasy/joda/build.gradle
@@ -18,7 +18,7 @@ dependencies {
     compile         'io.swagger.core.v3:swagger-annotations:2.0.0'
     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.4.1'
+    compile         'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.9.10'
     compile         'joda-time:joda-time:2.7'
     //TODO: swaggerFeature
     compile 'io.swagger.core.v3:swagger-jaxrs2:2.0.0'
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/StoreApi.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/StoreApi.java
@@ -78,7 +78,7 @@ public Response getOrderById( @Min(1L) @Max(5L) @PathParam("orderId") Long order
     }
     @POST
     @Path("/order")
-    @Consumes({ "*/*" })
+    @Consumes({ "application/json" })
     @Produces({ "application/xml", "application/json" })
     @Operation(summary = "Place an order for a pet", description = "", tags={ "store" })
     @ApiResponses(value = { 
diff --git a/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/UserApi.java b/samples/server/petstore/jaxrs-resteasy/joda/src/gen/java/io/swagger/api/UserApi.java
@@ -36,7 +36,7 @@ public class UserApi  {
 
     @POST
     
-    @Consumes({ "*/*" })
+    @Consumes({ "application/json" })
     
     @Operation(summary = "Create user", description = "This can only be done by the logged in user.", tags={ "user" })
     @ApiResponses(value = { 
@@ -47,7 +47,7 @@ public Response createUser(@Parameter(description = "Created user object" ,requi
     }
     @POST
     @Path("/createWithArray")
-    @Consumes({ "*/*" })
+    @Consumes({ "application/json" })
     
     @Operation(summary = "Creates list of users with given input array", description = "", tags={ "user" })
     @ApiResponses(value = { 
@@ -58,7 +58,7 @@ public Response createUsersWithArrayInput(@Parameter(description = "List of user
     }
     @POST
     @Path("/createWithList")
-    @Consumes({ "*/*" })
+    @Consumes({ "application/json" })
     
     @Operation(summary = "Creates list of users with given input array", description = "", tags={ "user" })
     @ApiResponses(value = { 

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public Response getOrderById( @Min(1L) @Max(5L) @PathParam("orderId") Long order`
`78`	`78`	`}`
`79`	`79`	`@POST`
`80`	`80`	`@Path("/order")`
`81`		`- @Consumes({ "/" })`
	`81`	`+ @Consumes({ "application/json" })`
`82`	`82`	`@Produces({ "application/xml", "application/json" })`
`83`	`83`	`@Operation(summary = "Place an order for a pet", description = "", tags={ "store" })`
`84`	`84`	`@ApiResponses(value = {`