From 5ae29a3c8ef0b8c5997c629df7595c22eca59dbd Mon Sep 17 00:00:00 2001 From: sullis Date: Fri, 18 Feb 2022 20:48:51 -0800 Subject: [PATCH] [java] jersey 2.35 --- .../src/main/resources/JavaJaxRS/api.mustache | 2 +- .../src/main/resources/JavaJaxRS/pom.mustache | 2 +- .../server/petstore/jaxrs-datelib-j8/pom.xml | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 30 ++++++++-------- .../api/FakeClassnameTestApi.java | 2 +- .../gen/java/org/openapitools/api/PetApi.java | 16 ++++----- .../java/org/openapitools/api/StoreApi.java | 8 ++--- .../java/org/openapitools/api/UserApi.java | 16 ++++----- samples/server/petstore/jaxrs-jersey/pom.xml | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 36 +++++++++---------- .../api/FakeClassnameTestApi.java | 2 +- .../gen/java/org/openapitools/api/FooApi.java | 2 +- .../gen/java/org/openapitools/api/PetApi.java | 16 ++++----- .../java/org/openapitools/api/StoreApi.java | 8 ++--- .../java/org/openapitools/api/UserApi.java | 16 ++++----- .../petstore/jaxrs/jersey2-useTags/pom.xml | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 28 +++++++-------- .../api/FakeClassnameTags123Api.java | 2 +- .../gen/java/org/openapitools/api/PetApi.java | 18 +++++----- .../java/org/openapitools/api/StoreApi.java | 8 ++--- .../java/org/openapitools/api/UserApi.java | 16 ++++----- samples/server/petstore/jaxrs/jersey2/pom.xml | 2 +- .../org/openapitools/api/AnotherFakeApi.java | 2 +- .../java/org/openapitools/api/FakeApi.java | 30 ++++++++-------- .../api/FakeClassnameTestApi.java | 2 +- .../gen/java/org/openapitools/api/PetApi.java | 16 ++++----- .../java/org/openapitools/api/StoreApi.java | 8 ++--- .../java/org/openapitools/api/UserApi.java | 16 ++++----- 31 files changed, 158 insertions(+), 158 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/api.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/api.mustache index b61de13287be..95e6c810bc6b 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/api.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/api.mustache @@ -60,7 +60,7 @@ public class {{classname}} { } {{#operation}} - @{{httpMethod}} + @javax.ws.rs.{{httpMethod}} {{#subresourceOperation}}@Path("{{{path}}}"){{/subresourceOperation}} {{#hasConsumes}}@Consumes({ {{#consumes}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/consumes}} }){{/hasConsumes}} {{#hasProduces}}@Produces({ {{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}} }){{/hasProduces}} diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/pom.mustache index 99af91a47c01..aeda388be077 100644 --- a/modules/openapi-generator/src/main/resources/JavaJaxRS/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/pom.mustache @@ -206,7 +206,7 @@ 2.0.2 {{/useBeanValidation}} 9.2.9.v20150224 - 2.22.2 + 2.35 2.9.9 4.13.1 1.2.10 diff --git a/samples/server/petstore/jaxrs-datelib-j8/pom.xml b/samples/server/petstore/jaxrs-datelib-j8/pom.xml index b3f3e77a1f58..8b0b4913adc0 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/pom.xml +++ b/samples/server/petstore/jaxrs-datelib-j8/pom.xml @@ -193,7 +193,7 @@ 1.5.18 2.0.2 9.2.9.v20150224 - 2.22.2 + 2.35 2.9.9 4.13.1 1.2.10 diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/AnotherFakeApi.java index 7243aca1894f..ab81f5660277 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/AnotherFakeApi.java @@ -55,7 +55,7 @@ public AnotherFakeApi(@Context ServletConfig servletContext) { this.delegate = delegate; } - @PATCH + @javax.ws.rs.PATCH @Consumes({ "application/json" }) @Produces({ "application/json" }) diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java index efb4711d6d4c..9493b5ecc771 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java @@ -65,7 +65,7 @@ public FakeApi(@Context ServletConfig servletContext) { this.delegate = delegate; } - @POST + @javax.ws.rs.POST @Path("/create_xml_item") @Consumes({ "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" }) @@ -77,7 +77,7 @@ public Response createXmlItem(@ApiParam(value = "XmlItem Body", required = true) throws NotFoundException { return delegate.createXmlItem(xmlItem, securityContext); } - @POST + @javax.ws.rs.POST @Path("/outer/boolean") @Produces({ "*/*" }) @@ -89,7 +89,7 @@ public Response fakeOuterBooleanSerialize(@ApiParam(value = "Input boolean as po throws NotFoundException { return delegate.fakeOuterBooleanSerialize(body, securityContext); } - @POST + @javax.ws.rs.POST @Path("/outer/composite") @Produces({ "*/*" }) @@ -101,7 +101,7 @@ public Response fakeOuterCompositeSerialize(@ApiParam(value = "Input composite a throws NotFoundException { return delegate.fakeOuterCompositeSerialize(body, securityContext); } - @POST + @javax.ws.rs.POST @Path("/outer/number") @Produces({ "*/*" }) @@ -113,7 +113,7 @@ public Response fakeOuterNumberSerialize(@ApiParam(value = "Input number as post throws NotFoundException { return delegate.fakeOuterNumberSerialize(body, securityContext); } - @POST + @javax.ws.rs.POST @Path("/outer/string") @Produces({ "*/*" }) @@ -125,7 +125,7 @@ public Response fakeOuterStringSerialize(@ApiParam(value = "Input string as post throws NotFoundException { return delegate.fakeOuterStringSerialize(body, securityContext); } - @PUT + @javax.ws.rs.PUT @Path("/body-with-file-schema") @Consumes({ "application/json" }) @@ -137,7 +137,7 @@ public Response testBodyWithFileSchema(@ApiParam(value = "", required = true) @N throws NotFoundException { return delegate.testBodyWithFileSchema(body, securityContext); } - @PUT + @javax.ws.rs.PUT @Path("/body-with-query-params") @Consumes({ "application/json" }) @@ -149,7 +149,7 @@ public Response testBodyWithQueryParams(@ApiParam(value = "", required = true) @ throws NotFoundException { return delegate.testBodyWithQueryParams(query, body, securityContext); } - @PATCH + @javax.ws.rs.PATCH @Consumes({ "application/json" }) @Produces({ "application/json" }) @@ -161,7 +161,7 @@ public Response testClientModel(@ApiParam(value = "client model", required = tru throws NotFoundException { return delegate.testClientModel(body, securityContext); } - @POST + @javax.ws.rs.POST @Consumes({ "application/x-www-form-urlencoded" }) @@ -177,7 +177,7 @@ public Response testEndpointParameters(@ApiParam(value = "None", required=true) throws NotFoundException { return delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binaryBodypart, date, dateTime, password, paramCallback, securityContext); } - @GET + @javax.ws.rs.GET @Consumes({ "application/x-www-form-urlencoded" }) @@ -190,7 +190,7 @@ public Response testEnumParameters(@ApiParam(value = "Header parameter enum test throws NotFoundException { return delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, securityContext); } - @DELETE + @javax.ws.rs.DELETE @@ -202,7 +202,7 @@ public Response testGroupParameters(@ApiParam(value = "Required String in group throws NotFoundException { return delegate.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, securityContext); } - @POST + @javax.ws.rs.POST @Path("/inline-additionalProperties") @Consumes({ "application/json" }) @@ -214,7 +214,7 @@ public Response testInlineAdditionalProperties(@ApiParam(value = "request body", throws NotFoundException { return delegate.testInlineAdditionalProperties(param, securityContext); } - @GET + @javax.ws.rs.GET @Path("/jsonFormData") @Consumes({ "application/x-www-form-urlencoded" }) @@ -226,7 +226,7 @@ public Response testJsonFormData(@ApiParam(value = "field1", required=true) @Fo throws NotFoundException { return delegate.testJsonFormData(param, param2, securityContext); } - @PUT + @javax.ws.rs.PUT @Path("/test-query-parameters") @@ -238,7 +238,7 @@ public Response testQueryParameterCollectionFormat(@ApiParam(value = "", require throws NotFoundException { return delegate.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context, securityContext); } - @POST + @javax.ws.rs.POST @Path("/{petId}/uploadImageWithRequiredFile") @Consumes({ "multipart/form-data" }) @Produces({ "application/json" }) diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java index 73c97f612555..041ecec5af25 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java @@ -55,7 +55,7 @@ public FakeClassnameTestApi(@Context ServletConfig servletContext) { this.delegate = delegate; } - @PATCH + @javax.ws.rs.PATCH @Consumes({ "application/json" }) @Produces({ "application/json" }) diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApi.java index 85df879b3384..a0705de623e8 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/PetApi.java @@ -58,7 +58,7 @@ public PetApi(@Context ServletConfig servletContext) { this.delegate = delegate; } - @POST + @javax.ws.rs.POST @Consumes({ "application/json", "application/xml" }) @@ -76,7 +76,7 @@ public Response addPet(@ApiParam(value = "Pet object that needs to be added to t throws NotFoundException { return delegate.addPet(body, securityContext); } - @DELETE + @javax.ws.rs.DELETE @Path("/{petId}") @@ -94,7 +94,7 @@ public Response deletePet(@ApiParam(value = "Pet id to delete", required = true) throws NotFoundException { return delegate.deletePet(petId, apiKey, securityContext); } - @GET + @javax.ws.rs.GET @Path("/findByStatus") @Produces({ "application/xml", "application/json" }) @@ -112,7 +112,7 @@ public Response findPetsByStatus(@ApiParam(value = "Status values that need to b throws NotFoundException { return delegate.findPetsByStatus(status, securityContext); } - @GET + @javax.ws.rs.GET @Path("/findByTags") @Produces({ "application/xml", "application/json" }) @@ -130,7 +130,7 @@ public Response findPetsByTags(@ApiParam(value = "Tags to filter by", required = throws NotFoundException { return delegate.findPetsByTags(tags, securityContext); } - @GET + @javax.ws.rs.GET @Path("/{petId}") @Produces({ "application/xml", "application/json" }) @@ -146,7 +146,7 @@ public Response getPetById(@ApiParam(value = "ID of pet to return", required = t throws NotFoundException { return delegate.getPetById(petId, securityContext); } - @PUT + @javax.ws.rs.PUT @Consumes({ "application/json", "application/xml" }) @@ -166,7 +166,7 @@ public Response updatePet(@ApiParam(value = "Pet object that needs to be added t throws NotFoundException { return delegate.updatePet(body, securityContext); } - @POST + @javax.ws.rs.POST @Path("/{petId}") @Consumes({ "application/x-www-form-urlencoded" }) @@ -183,7 +183,7 @@ public Response updatePetWithForm(@ApiParam(value = "ID of pet that needs to be throws NotFoundException { return delegate.updatePetWithForm(petId, name, status, securityContext); } - @POST + @javax.ws.rs.POST @Path("/{petId}/uploadImage") @Consumes({ "multipart/form-data" }) @Produces({ "application/json" }) diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java index 0a853c97eabf..e2dc45060906 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/StoreApi.java @@ -56,7 +56,7 @@ public StoreApi(@Context ServletConfig servletContext) { this.delegate = delegate; } - @DELETE + @javax.ws.rs.DELETE @Path("/order/{order_id}") @@ -69,7 +69,7 @@ public Response deleteOrder(@ApiParam(value = "ID of the order that needs to be throws NotFoundException { return delegate.deleteOrder(orderId, securityContext); } - @GET + @javax.ws.rs.GET @Path("/inventory") @Produces({ "application/json" }) @@ -83,7 +83,7 @@ public Response getInventory(@Context SecurityContext securityContext) throws NotFoundException { return delegate.getInventory(securityContext); } - @GET + @javax.ws.rs.GET @Path("/order/{order_id}") @Produces({ "application/xml", "application/json" }) @@ -97,7 +97,7 @@ public Response getOrderById(@ApiParam(value = "ID of pet that needs to be fetch throws NotFoundException { return delegate.getOrderById(orderId, securityContext); } - @POST + @javax.ws.rs.POST @Path("/order") @Produces({ "application/xml", "application/json" }) diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/UserApi.java index ac1d5d79c93a..cbf11d458a52 100644 --- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/UserApi.java @@ -57,7 +57,7 @@ public UserApi(@Context ServletConfig servletContext) { this.delegate = delegate; } - @POST + @javax.ws.rs.POST @@ -69,7 +69,7 @@ public Response createUser(@ApiParam(value = "Created user object", required = t throws NotFoundException { return delegate.createUser(body, securityContext); } - @POST + @javax.ws.rs.POST @Path("/createWithArray") @@ -81,7 +81,7 @@ public Response createUsersWithArrayInput(@ApiParam(value = "List of user object throws NotFoundException { return delegate.createUsersWithArrayInput(body, securityContext); } - @POST + @javax.ws.rs.POST @Path("/createWithList") @@ -93,7 +93,7 @@ public Response createUsersWithListInput(@ApiParam(value = "List of user object" throws NotFoundException { return delegate.createUsersWithListInput(body, securityContext); } - @DELETE + @javax.ws.rs.DELETE @Path("/{username}") @@ -106,7 +106,7 @@ public Response deleteUser(@ApiParam(value = "The name that needs to be deleted" throws NotFoundException { return delegate.deleteUser(username, securityContext); } - @GET + @javax.ws.rs.GET @Path("/{username}") @Produces({ "application/xml", "application/json" }) @@ -120,7 +120,7 @@ public Response getUserByName(@ApiParam(value = "The name that needs to be fetch throws NotFoundException { return delegate.getUserByName(username, securityContext); } - @GET + @javax.ws.rs.GET @Path("/login") @Produces({ "application/xml", "application/json" }) @@ -133,7 +133,7 @@ public Response loginUser(@ApiParam(value = "The user name for login", required throws NotFoundException { return delegate.loginUser(username, password, securityContext); } - @GET + @javax.ws.rs.GET @Path("/logout") @@ -145,7 +145,7 @@ public Response logoutUser(@Context SecurityContext securityContext) throws NotFoundException { return delegate.logoutUser(securityContext); } - @PUT + @javax.ws.rs.PUT @Path("/{username}") diff --git a/samples/server/petstore/jaxrs-jersey/pom.xml b/samples/server/petstore/jaxrs-jersey/pom.xml index 9586c6d1305d..6b7e524e917d 100644 --- a/samples/server/petstore/jaxrs-jersey/pom.xml +++ b/samples/server/petstore/jaxrs-jersey/pom.xml @@ -193,7 +193,7 @@ 1.5.18 2.0.2 9.2.9.v20150224 - 2.22.2 + 2.35 2.9.9 4.13.1 1.2.10 diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/AnotherFakeApi.java index 1ea9958f5fda..9d313e3f5236 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/AnotherFakeApi.java @@ -55,7 +55,7 @@ public AnotherFakeApi(@Context ServletConfig servletContext) { this.delegate = delegate; } - @PATCH + @javax.ws.rs.PATCH @Consumes({ "application/json" }) @Produces({ "application/json" }) diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java index 977a1d06f700..3961c0800cb9 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java @@ -66,7 +66,7 @@ public FakeApi(@Context ServletConfig servletContext) { this.delegate = delegate; } - @GET + @javax.ws.rs.GET @Path("/health") @Produces({ "application/json" }) @@ -78,7 +78,7 @@ public Response fakeHealthGet(@Context SecurityContext securityContext) throws NotFoundException { return delegate.fakeHealthGet(securityContext); } - @GET + @javax.ws.rs.GET @Path("/http-signature-test") @Consumes({ "application/json", "application/xml" }) @@ -92,7 +92,7 @@ public Response fakeHttpSignatureTest(@ApiParam(value = "Pet object that needs t throws NotFoundException { return delegate.fakeHttpSignatureTest(pet, query1, header1, securityContext); } - @POST + @javax.ws.rs.POST @Path("/outer/boolean") @Consumes({ "application/json" }) @Produces({ "*/*" }) @@ -104,7 +104,7 @@ public Response fakeOuterBooleanSerialize(@ApiParam(value = "Input boolean as po throws NotFoundException { return delegate.fakeOuterBooleanSerialize(body, securityContext); } - @POST + @javax.ws.rs.POST @Path("/outer/composite") @Consumes({ "application/json" }) @Produces({ "*/*" }) @@ -116,7 +116,7 @@ public Response fakeOuterCompositeSerialize(@ApiParam(value = "Input composite a throws NotFoundException { return delegate.fakeOuterCompositeSerialize(outerComposite, securityContext); } - @POST + @javax.ws.rs.POST @Path("/outer/number") @Consumes({ "application/json" }) @Produces({ "*/*" }) @@ -128,7 +128,7 @@ public Response fakeOuterNumberSerialize(@ApiParam(value = "Input number as post throws NotFoundException { return delegate.fakeOuterNumberSerialize(body, securityContext); } - @POST + @javax.ws.rs.POST @Path("/outer/string") @Consumes({ "application/json" }) @Produces({ "*/*" }) @@ -140,7 +140,7 @@ public Response fakeOuterStringSerialize(@ApiParam(value = "Input string as post throws NotFoundException { return delegate.fakeOuterStringSerialize(body, securityContext); } - @POST + @javax.ws.rs.POST @Path("/property/enum-int") @Consumes({ "application/json" }) @Produces({ "*/*" }) @@ -152,7 +152,7 @@ public Response fakePropertyEnumIntegerSerialize(@ApiParam(value = "Input enum ( throws NotFoundException { return delegate.fakePropertyEnumIntegerSerialize(outerObjectWithEnumProperty, securityContext); } - @PUT + @javax.ws.rs.PUT @Path("/body-with-binary") @Consumes({ "image/png" }) @@ -164,7 +164,7 @@ public Response testBodyWithBinary(@ApiParam(value = "image to upload", required throws NotFoundException { return delegate.testBodyWithBinary(body, securityContext); } - @PUT + @javax.ws.rs.PUT @Path("/body-with-file-schema") @Consumes({ "application/json" }) @@ -176,7 +176,7 @@ public Response testBodyWithFileSchema(@ApiParam(value = "", required = true) @N throws NotFoundException { return delegate.testBodyWithFileSchema(fileSchemaTestClass, securityContext); } - @PUT + @javax.ws.rs.PUT @Path("/body-with-query-params") @Consumes({ "application/json" }) @@ -188,7 +188,7 @@ public Response testBodyWithQueryParams(@ApiParam(value = "", required = true) @ throws NotFoundException { return delegate.testBodyWithQueryParams(query, user, securityContext); } - @PATCH + @javax.ws.rs.PATCH @Consumes({ "application/json" }) @Produces({ "application/json" }) @@ -200,7 +200,7 @@ public Response testClientModel(@ApiParam(value = "client model", required = tru throws NotFoundException { return delegate.testClientModel(client, securityContext); } - @POST + @javax.ws.rs.POST @Consumes({ "application/x-www-form-urlencoded" }) @@ -216,7 +216,7 @@ public Response testEndpointParameters(@ApiParam(value = "None", required=true) throws NotFoundException { return delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binaryBodypart, date, dateTime, password, paramCallback, securityContext); } - @GET + @javax.ws.rs.GET @Consumes({ "application/x-www-form-urlencoded" }) @@ -229,7 +229,7 @@ public Response testEnumParameters(@ApiParam(value = "Header parameter enum test throws NotFoundException { return delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, securityContext); } - @DELETE + @javax.ws.rs.DELETE @@ -243,7 +243,7 @@ public Response testGroupParameters(@ApiParam(value = "Required String in group throws NotFoundException { return delegate.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, securityContext); } - @POST + @javax.ws.rs.POST @Path("/inline-additionalProperties") @Consumes({ "application/json" }) @@ -255,7 +255,7 @@ public Response testInlineAdditionalProperties(@ApiParam(value = "request body", throws NotFoundException { return delegate.testInlineAdditionalProperties(requestBody, securityContext); } - @GET + @javax.ws.rs.GET @Path("/jsonFormData") @Consumes({ "application/x-www-form-urlencoded" }) @@ -267,7 +267,7 @@ public Response testJsonFormData(@ApiParam(value = "field1", required=true) @Fo throws NotFoundException { return delegate.testJsonFormData(param, param2, securityContext); } - @PUT + @javax.ws.rs.PUT @Path("/test-query-parameters") @@ -279,7 +279,7 @@ public Response testQueryParameterCollectionFormat(@ApiParam(value = "", require throws NotFoundException { return delegate.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context, allowEmpty, language, securityContext); } - @POST + @javax.ws.rs.POST @Path("/{petId}/uploadImageWithRequiredFile") @Consumes({ "multipart/form-data" }) @Produces({ "application/json" }) diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java index 1877908e3f0f..70860ff047c9 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java @@ -55,7 +55,7 @@ public FakeClassnameTestApi(@Context ServletConfig servletContext) { this.delegate = delegate; } - @PATCH + @javax.ws.rs.PATCH @Consumes({ "application/json" }) @Produces({ "application/json" }) diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FooApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FooApi.java index 41da9a8d09da..00a9bdddb7ee 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FooApi.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FooApi.java @@ -55,7 +55,7 @@ public FooApi(@Context ServletConfig servletContext) { this.delegate = delegate; } - @GET + @javax.ws.rs.GET @Produces({ "application/json" }) diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java index 5bf2a1ace0c4..75e0bf5a5505 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/PetApi.java @@ -58,7 +58,7 @@ public PetApi(@Context ServletConfig servletContext) { this.delegate = delegate; } - @POST + @javax.ws.rs.POST @Consumes({ "application/json", "application/xml" }) @@ -76,7 +76,7 @@ public Response addPet(@ApiParam(value = "Pet object that needs to be added to t throws NotFoundException { return delegate.addPet(pet, securityContext); } - @DELETE + @javax.ws.rs.DELETE @Path("/{petId}") @@ -94,7 +94,7 @@ public Response deletePet(@ApiParam(value = "Pet id to delete", required = true) throws NotFoundException { return delegate.deletePet(petId, apiKey, securityContext); } - @GET + @javax.ws.rs.GET @Path("/findByStatus") @Produces({ "application/xml", "application/json" }) @@ -112,7 +112,7 @@ public Response findPetsByStatus(@ApiParam(value = "Status values that need to b throws NotFoundException { return delegate.findPetsByStatus(status, securityContext); } - @GET + @javax.ws.rs.GET @Path("/findByTags") @Produces({ "application/xml", "application/json" }) @@ -130,7 +130,7 @@ public Response findPetsByTags(@ApiParam(value = "Tags to filter by", required = throws NotFoundException { return delegate.findPetsByTags(tags, securityContext); } - @GET + @javax.ws.rs.GET @Path("/{petId}") @Produces({ "application/xml", "application/json" }) @@ -146,7 +146,7 @@ public Response getPetById(@ApiParam(value = "ID of pet to return", required = t throws NotFoundException { return delegate.getPetById(petId, securityContext); } - @PUT + @javax.ws.rs.PUT @Consumes({ "application/json", "application/xml" }) @@ -166,7 +166,7 @@ public Response updatePet(@ApiParam(value = "Pet object that needs to be added t throws NotFoundException { return delegate.updatePet(pet, securityContext); } - @POST + @javax.ws.rs.POST @Path("/{petId}") @Consumes({ "application/x-www-form-urlencoded" }) @@ -184,7 +184,7 @@ public Response updatePetWithForm(@ApiParam(value = "ID of pet that needs to be throws NotFoundException { return delegate.updatePetWithForm(petId, name, status, securityContext); } - @POST + @javax.ws.rs.POST @Path("/{petId}/uploadImage") @Consumes({ "multipart/form-data" }) @Produces({ "application/json" }) diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java index 4a4f1c23080f..77d316cfab18 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/StoreApi.java @@ -56,7 +56,7 @@ public StoreApi(@Context ServletConfig servletContext) { this.delegate = delegate; } - @DELETE + @javax.ws.rs.DELETE @Path("/order/{order_id}") @@ -69,7 +69,7 @@ public Response deleteOrder(@ApiParam(value = "ID of the order that needs to be throws NotFoundException { return delegate.deleteOrder(orderId, securityContext); } - @GET + @javax.ws.rs.GET @Path("/inventory") @Produces({ "application/json" }) @@ -83,7 +83,7 @@ public Response getInventory(@Context SecurityContext securityContext) throws NotFoundException { return delegate.getInventory(securityContext); } - @GET + @javax.ws.rs.GET @Path("/order/{order_id}") @Produces({ "application/xml", "application/json" }) @@ -97,7 +97,7 @@ public Response getOrderById(@ApiParam(value = "ID of pet that needs to be fetch throws NotFoundException { return delegate.getOrderById(orderId, securityContext); } - @POST + @javax.ws.rs.POST @Path("/order") @Consumes({ "application/json" }) @Produces({ "application/xml", "application/json" }) diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApi.java index a21940cf1307..9ef9cce8fa07 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/UserApi.java @@ -57,7 +57,7 @@ public UserApi(@Context ServletConfig servletContext) { this.delegate = delegate; } - @POST + @javax.ws.rs.POST @Consumes({ "application/json" }) @@ -69,7 +69,7 @@ public Response createUser(@ApiParam(value = "Created user object", required = t throws NotFoundException { return delegate.createUser(user, securityContext); } - @POST + @javax.ws.rs.POST @Path("/createWithArray") @Consumes({ "application/json" }) @@ -81,7 +81,7 @@ public Response createUsersWithArrayInput(@ApiParam(value = "List of user object throws NotFoundException { return delegate.createUsersWithArrayInput(user, securityContext); } - @POST + @javax.ws.rs.POST @Path("/createWithList") @Consumes({ "application/json" }) @@ -93,7 +93,7 @@ public Response createUsersWithListInput(@ApiParam(value = "List of user object" throws NotFoundException { return delegate.createUsersWithListInput(user, securityContext); } - @DELETE + @javax.ws.rs.DELETE @Path("/{username}") @@ -106,7 +106,7 @@ public Response deleteUser(@ApiParam(value = "The name that needs to be deleted" throws NotFoundException { return delegate.deleteUser(username, securityContext); } - @GET + @javax.ws.rs.GET @Path("/{username}") @Produces({ "application/xml", "application/json" }) @@ -120,7 +120,7 @@ public Response getUserByName(@ApiParam(value = "The name that needs to be fetch throws NotFoundException { return delegate.getUserByName(username, securityContext); } - @GET + @javax.ws.rs.GET @Path("/login") @Produces({ "application/xml", "application/json" }) @@ -133,7 +133,7 @@ public Response loginUser(@ApiParam(value = "The user name for login", required throws NotFoundException { return delegate.loginUser(username, password, securityContext); } - @GET + @javax.ws.rs.GET @Path("/logout") @@ -145,7 +145,7 @@ public Response logoutUser(@Context SecurityContext securityContext) throws NotFoundException { return delegate.logoutUser(securityContext); } - @PUT + @javax.ws.rs.PUT @Path("/{username}") @Consumes({ "application/json" }) diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/pom.xml b/samples/server/petstore/jaxrs/jersey2-useTags/pom.xml index fc64a5939d06..6cf63a1c809f 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/pom.xml +++ b/samples/server/petstore/jaxrs/jersey2-useTags/pom.xml @@ -193,7 +193,7 @@ 1.5.18 2.0.2 9.2.9.v20150224 - 2.22.2 + 2.35 2.9.9 4.13.1 1.2.10 diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/AnotherFakeApi.java index d5f7a8c7e316..d66efe4df886 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/AnotherFakeApi.java @@ -55,7 +55,7 @@ public AnotherFakeApi(@Context ServletConfig servletContext) { this.delegate = delegate; } - @PATCH + @javax.ws.rs.PATCH @Consumes({ "application/json" }) @Produces({ "application/json" }) diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java index 7ac866dd64d4..6b2c8133b982 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java @@ -63,7 +63,7 @@ public FakeApi(@Context ServletConfig servletContext) { this.delegate = delegate; } - @POST + @javax.ws.rs.POST @Path("/create_xml_item") @Consumes({ "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" }) @@ -75,7 +75,7 @@ public Response createXmlItem(@ApiParam(value = "XmlItem Body", required = true) throws NotFoundException { return delegate.createXmlItem(xmlItem, securityContext); } - @POST + @javax.ws.rs.POST @Path("/outer/boolean") @Produces({ "*/*" }) @@ -87,7 +87,7 @@ public Response fakeOuterBooleanSerialize(@ApiParam(value = "Input boolean as po throws NotFoundException { return delegate.fakeOuterBooleanSerialize(body, securityContext); } - @POST + @javax.ws.rs.POST @Path("/outer/composite") @Produces({ "*/*" }) @@ -99,7 +99,7 @@ public Response fakeOuterCompositeSerialize(@ApiParam(value = "Input composite a throws NotFoundException { return delegate.fakeOuterCompositeSerialize(body, securityContext); } - @POST + @javax.ws.rs.POST @Path("/outer/number") @Produces({ "*/*" }) @@ -111,7 +111,7 @@ public Response fakeOuterNumberSerialize(@ApiParam(value = "Input number as post throws NotFoundException { return delegate.fakeOuterNumberSerialize(body, securityContext); } - @POST + @javax.ws.rs.POST @Path("/outer/string") @Produces({ "*/*" }) @@ -123,7 +123,7 @@ public Response fakeOuterStringSerialize(@ApiParam(value = "Input string as post throws NotFoundException { return delegate.fakeOuterStringSerialize(body, securityContext); } - @PUT + @javax.ws.rs.PUT @Path("/body-with-file-schema") @Consumes({ "application/json" }) @@ -135,7 +135,7 @@ public Response testBodyWithFileSchema(@ApiParam(value = "", required = true) @N throws NotFoundException { return delegate.testBodyWithFileSchema(body, securityContext); } - @PUT + @javax.ws.rs.PUT @Path("/body-with-query-params") @Consumes({ "application/json" }) @@ -147,7 +147,7 @@ public Response testBodyWithQueryParams(@ApiParam(value = "", required = true) @ throws NotFoundException { return delegate.testBodyWithQueryParams(query, body, securityContext); } - @PATCH + @javax.ws.rs.PATCH @Consumes({ "application/json" }) @Produces({ "application/json" }) @@ -159,7 +159,7 @@ public Response testClientModel(@ApiParam(value = "client model", required = tru throws NotFoundException { return delegate.testClientModel(body, securityContext); } - @POST + @javax.ws.rs.POST @Consumes({ "application/x-www-form-urlencoded" }) @@ -175,7 +175,7 @@ public Response testEndpointParameters(@ApiParam(value = "None", required=true) throws NotFoundException { return delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binaryBodypart, date, dateTime, password, paramCallback, securityContext); } - @GET + @javax.ws.rs.GET @Consumes({ "application/x-www-form-urlencoded" }) @@ -188,7 +188,7 @@ public Response testEnumParameters(@ApiParam(value = "Header parameter enum test throws NotFoundException { return delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, securityContext); } - @DELETE + @javax.ws.rs.DELETE @@ -200,7 +200,7 @@ public Response testGroupParameters(@ApiParam(value = "Required String in group throws NotFoundException { return delegate.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, securityContext); } - @POST + @javax.ws.rs.POST @Path("/inline-additionalProperties") @Consumes({ "application/json" }) @@ -212,7 +212,7 @@ public Response testInlineAdditionalProperties(@ApiParam(value = "request body", throws NotFoundException { return delegate.testInlineAdditionalProperties(param, securityContext); } - @GET + @javax.ws.rs.GET @Path("/jsonFormData") @Consumes({ "application/x-www-form-urlencoded" }) @@ -224,7 +224,7 @@ public Response testJsonFormData(@ApiParam(value = "field1", required=true) @Fo throws NotFoundException { return delegate.testJsonFormData(param, param2, securityContext); } - @PUT + @javax.ws.rs.PUT @Path("/test-query-parameters") diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java index 2a4bb99d9512..d208f750ed6a 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeClassnameTags123Api.java @@ -55,7 +55,7 @@ public FakeClassnameTags123Api(@Context ServletConfig servletContext) { this.delegate = delegate; } - @PATCH + @javax.ws.rs.PATCH @Consumes({ "application/json" }) @Produces({ "application/json" }) diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApi.java index 42e4d96dc71f..4a091331cc94 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/PetApi.java @@ -58,7 +58,7 @@ public PetApi(@Context ServletConfig servletContext) { this.delegate = delegate; } - @POST + @javax.ws.rs.POST @Path("/pet") @Consumes({ "application/json", "application/xml" }) @@ -76,7 +76,7 @@ public Response addPet(@ApiParam(value = "Pet object that needs to be added to t throws NotFoundException { return delegate.addPet(body, securityContext); } - @DELETE + @javax.ws.rs.DELETE @Path("/pet/{petId}") @@ -94,7 +94,7 @@ public Response deletePet(@ApiParam(value = "Pet id to delete", required = true) throws NotFoundException { return delegate.deletePet(petId, apiKey, securityContext); } - @GET + @javax.ws.rs.GET @Path("/pet/findByStatus") @Produces({ "application/xml", "application/json" }) @@ -112,7 +112,7 @@ public Response findPetsByStatus(@ApiParam(value = "Status values that need to b throws NotFoundException { return delegate.findPetsByStatus(status, securityContext); } - @GET + @javax.ws.rs.GET @Path("/pet/findByTags") @Produces({ "application/xml", "application/json" }) @@ -130,7 +130,7 @@ public Response findPetsByTags(@ApiParam(value = "Tags to filter by", required = throws NotFoundException { return delegate.findPetsByTags(tags, securityContext); } - @GET + @javax.ws.rs.GET @Path("/pet/{petId}") @Produces({ "application/xml", "application/json" }) @@ -146,7 +146,7 @@ public Response getPetById(@ApiParam(value = "ID of pet to return", required = t throws NotFoundException { return delegate.getPetById(petId, securityContext); } - @PUT + @javax.ws.rs.PUT @Path("/pet") @Consumes({ "application/json", "application/xml" }) @@ -166,7 +166,7 @@ public Response updatePet(@ApiParam(value = "Pet object that needs to be added t throws NotFoundException { return delegate.updatePet(body, securityContext); } - @POST + @javax.ws.rs.POST @Path("/pet/{petId}") @Consumes({ "application/x-www-form-urlencoded" }) @@ -183,7 +183,7 @@ public Response updatePetWithForm(@ApiParam(value = "ID of pet that needs to be throws NotFoundException { return delegate.updatePetWithForm(petId, name, status, securityContext); } - @POST + @javax.ws.rs.POST @Path("/pet/{petId}/uploadImage") @Consumes({ "multipart/form-data" }) @Produces({ "application/json" }) @@ -201,7 +201,7 @@ public Response uploadFile(@ApiParam(value = "ID of pet to update", required = t throws NotFoundException { return delegate.uploadFile(petId, additionalMetadata, _fileBodypart, securityContext); } - @POST + @javax.ws.rs.POST @Path("/fake/{petId}/uploadImageWithRequiredFile") @Consumes({ "multipart/form-data" }) @Produces({ "application/json" }) diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java index dc710ad0921e..7e7544d793fe 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/StoreApi.java @@ -56,7 +56,7 @@ public StoreApi(@Context ServletConfig servletContext) { this.delegate = delegate; } - @DELETE + @javax.ws.rs.DELETE @Path("/order/{order_id}") @@ -69,7 +69,7 @@ public Response deleteOrder(@ApiParam(value = "ID of the order that needs to be throws NotFoundException { return delegate.deleteOrder(orderId, securityContext); } - @GET + @javax.ws.rs.GET @Path("/inventory") @Produces({ "application/json" }) @@ -83,7 +83,7 @@ public Response getInventory(@Context SecurityContext securityContext) throws NotFoundException { return delegate.getInventory(securityContext); } - @GET + @javax.ws.rs.GET @Path("/order/{order_id}") @Produces({ "application/xml", "application/json" }) @@ -97,7 +97,7 @@ public Response getOrderById(@ApiParam(value = "ID of pet that needs to be fetch throws NotFoundException { return delegate.getOrderById(orderId, securityContext); } - @POST + @javax.ws.rs.POST @Path("/order") @Produces({ "application/xml", "application/json" }) diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/UserApi.java index ba9ff14767b3..4d1d6526e484 100644 --- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/UserApi.java @@ -57,7 +57,7 @@ public UserApi(@Context ServletConfig servletContext) { this.delegate = delegate; } - @POST + @javax.ws.rs.POST @@ -69,7 +69,7 @@ public Response createUser(@ApiParam(value = "Created user object", required = t throws NotFoundException { return delegate.createUser(body, securityContext); } - @POST + @javax.ws.rs.POST @Path("/createWithArray") @@ -81,7 +81,7 @@ public Response createUsersWithArrayInput(@ApiParam(value = "List of user object throws NotFoundException { return delegate.createUsersWithArrayInput(body, securityContext); } - @POST + @javax.ws.rs.POST @Path("/createWithList") @@ -93,7 +93,7 @@ public Response createUsersWithListInput(@ApiParam(value = "List of user object" throws NotFoundException { return delegate.createUsersWithListInput(body, securityContext); } - @DELETE + @javax.ws.rs.DELETE @Path("/{username}") @@ -106,7 +106,7 @@ public Response deleteUser(@ApiParam(value = "The name that needs to be deleted" throws NotFoundException { return delegate.deleteUser(username, securityContext); } - @GET + @javax.ws.rs.GET @Path("/{username}") @Produces({ "application/xml", "application/json" }) @@ -120,7 +120,7 @@ public Response getUserByName(@ApiParam(value = "The name that needs to be fetch throws NotFoundException { return delegate.getUserByName(username, securityContext); } - @GET + @javax.ws.rs.GET @Path("/login") @Produces({ "application/xml", "application/json" }) @@ -133,7 +133,7 @@ public Response loginUser(@ApiParam(value = "The user name for login", required throws NotFoundException { return delegate.loginUser(username, password, securityContext); } - @GET + @javax.ws.rs.GET @Path("/logout") @@ -145,7 +145,7 @@ public Response logoutUser(@Context SecurityContext securityContext) throws NotFoundException { return delegate.logoutUser(securityContext); } - @PUT + @javax.ws.rs.PUT @Path("/{username}") diff --git a/samples/server/petstore/jaxrs/jersey2/pom.xml b/samples/server/petstore/jaxrs/jersey2/pom.xml index 0f14733938c0..c90cc1e2377b 100644 --- a/samples/server/petstore/jaxrs/jersey2/pom.xml +++ b/samples/server/petstore/jaxrs/jersey2/pom.xml @@ -193,7 +193,7 @@ 1.5.18 2.0.2 9.2.9.v20150224 - 2.22.2 + 2.35 2.9.9 4.13.1 1.2.10 diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/AnotherFakeApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/AnotherFakeApi.java index 7243aca1894f..ab81f5660277 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/AnotherFakeApi.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/AnotherFakeApi.java @@ -55,7 +55,7 @@ public AnotherFakeApi(@Context ServletConfig servletContext) { this.delegate = delegate; } - @PATCH + @javax.ws.rs.PATCH @Consumes({ "application/json" }) @Produces({ "application/json" }) diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java index 0a943c0e96a0..6f1e2384acd4 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java @@ -64,7 +64,7 @@ public FakeApi(@Context ServletConfig servletContext) { this.delegate = delegate; } - @POST + @javax.ws.rs.POST @Path("/create_xml_item") @Consumes({ "application/xml", "application/xml; charset=utf-8", "application/xml; charset=utf-16", "text/xml", "text/xml; charset=utf-8", "text/xml; charset=utf-16" }) @@ -76,7 +76,7 @@ public Response createXmlItem(@ApiParam(value = "XmlItem Body", required = true) throws NotFoundException { return delegate.createXmlItem(xmlItem, securityContext); } - @POST + @javax.ws.rs.POST @Path("/outer/boolean") @Produces({ "*/*" }) @@ -88,7 +88,7 @@ public Response fakeOuterBooleanSerialize(@ApiParam(value = "Input boolean as po throws NotFoundException { return delegate.fakeOuterBooleanSerialize(body, securityContext); } - @POST + @javax.ws.rs.POST @Path("/outer/composite") @Produces({ "*/*" }) @@ -100,7 +100,7 @@ public Response fakeOuterCompositeSerialize(@ApiParam(value = "Input composite a throws NotFoundException { return delegate.fakeOuterCompositeSerialize(body, securityContext); } - @POST + @javax.ws.rs.POST @Path("/outer/number") @Produces({ "*/*" }) @@ -112,7 +112,7 @@ public Response fakeOuterNumberSerialize(@ApiParam(value = "Input number as post throws NotFoundException { return delegate.fakeOuterNumberSerialize(body, securityContext); } - @POST + @javax.ws.rs.POST @Path("/outer/string") @Produces({ "*/*" }) @@ -124,7 +124,7 @@ public Response fakeOuterStringSerialize(@ApiParam(value = "Input string as post throws NotFoundException { return delegate.fakeOuterStringSerialize(body, securityContext); } - @PUT + @javax.ws.rs.PUT @Path("/body-with-file-schema") @Consumes({ "application/json" }) @@ -136,7 +136,7 @@ public Response testBodyWithFileSchema(@ApiParam(value = "", required = true) @N throws NotFoundException { return delegate.testBodyWithFileSchema(body, securityContext); } - @PUT + @javax.ws.rs.PUT @Path("/body-with-query-params") @Consumes({ "application/json" }) @@ -148,7 +148,7 @@ public Response testBodyWithQueryParams(@ApiParam(value = "", required = true) @ throws NotFoundException { return delegate.testBodyWithQueryParams(query, body, securityContext); } - @PATCH + @javax.ws.rs.PATCH @Consumes({ "application/json" }) @Produces({ "application/json" }) @@ -160,7 +160,7 @@ public Response testClientModel(@ApiParam(value = "client model", required = tru throws NotFoundException { return delegate.testClientModel(body, securityContext); } - @POST + @javax.ws.rs.POST @Consumes({ "application/x-www-form-urlencoded" }) @@ -176,7 +176,7 @@ public Response testEndpointParameters(@ApiParam(value = "None", required=true) throws NotFoundException { return delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binaryBodypart, date, dateTime, password, paramCallback, securityContext); } - @GET + @javax.ws.rs.GET @Consumes({ "application/x-www-form-urlencoded" }) @@ -189,7 +189,7 @@ public Response testEnumParameters(@ApiParam(value = "Header parameter enum test throws NotFoundException { return delegate.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, securityContext); } - @DELETE + @javax.ws.rs.DELETE @@ -201,7 +201,7 @@ public Response testGroupParameters(@ApiParam(value = "Required String in group throws NotFoundException { return delegate.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group, securityContext); } - @POST + @javax.ws.rs.POST @Path("/inline-additionalProperties") @Consumes({ "application/json" }) @@ -213,7 +213,7 @@ public Response testInlineAdditionalProperties(@ApiParam(value = "request body", throws NotFoundException { return delegate.testInlineAdditionalProperties(param, securityContext); } - @GET + @javax.ws.rs.GET @Path("/jsonFormData") @Consumes({ "application/x-www-form-urlencoded" }) @@ -225,7 +225,7 @@ public Response testJsonFormData(@ApiParam(value = "field1", required=true) @Fo throws NotFoundException { return delegate.testJsonFormData(param, param2, securityContext); } - @PUT + @javax.ws.rs.PUT @Path("/test-query-parameters") @@ -237,7 +237,7 @@ public Response testQueryParameterCollectionFormat(@ApiParam(value = "", require throws NotFoundException { return delegate.testQueryParameterCollectionFormat(pipe, ioutil, http, url, context, securityContext); } - @POST + @javax.ws.rs.POST @Path("/{petId}/uploadImageWithRequiredFile") @Consumes({ "multipart/form-data" }) @Produces({ "application/json" }) diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java index 73c97f612555..041ecec5af25 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeClassnameTestApi.java @@ -55,7 +55,7 @@ public FakeClassnameTestApi(@Context ServletConfig servletContext) { this.delegate = delegate; } - @PATCH + @javax.ws.rs.PATCH @Consumes({ "application/json" }) @Produces({ "application/json" }) diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApi.java index 85df879b3384..a0705de623e8 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/PetApi.java @@ -58,7 +58,7 @@ public PetApi(@Context ServletConfig servletContext) { this.delegate = delegate; } - @POST + @javax.ws.rs.POST @Consumes({ "application/json", "application/xml" }) @@ -76,7 +76,7 @@ public Response addPet(@ApiParam(value = "Pet object that needs to be added to t throws NotFoundException { return delegate.addPet(body, securityContext); } - @DELETE + @javax.ws.rs.DELETE @Path("/{petId}") @@ -94,7 +94,7 @@ public Response deletePet(@ApiParam(value = "Pet id to delete", required = true) throws NotFoundException { return delegate.deletePet(petId, apiKey, securityContext); } - @GET + @javax.ws.rs.GET @Path("/findByStatus") @Produces({ "application/xml", "application/json" }) @@ -112,7 +112,7 @@ public Response findPetsByStatus(@ApiParam(value = "Status values that need to b throws NotFoundException { return delegate.findPetsByStatus(status, securityContext); } - @GET + @javax.ws.rs.GET @Path("/findByTags") @Produces({ "application/xml", "application/json" }) @@ -130,7 +130,7 @@ public Response findPetsByTags(@ApiParam(value = "Tags to filter by", required = throws NotFoundException { return delegate.findPetsByTags(tags, securityContext); } - @GET + @javax.ws.rs.GET @Path("/{petId}") @Produces({ "application/xml", "application/json" }) @@ -146,7 +146,7 @@ public Response getPetById(@ApiParam(value = "ID of pet to return", required = t throws NotFoundException { return delegate.getPetById(petId, securityContext); } - @PUT + @javax.ws.rs.PUT @Consumes({ "application/json", "application/xml" }) @@ -166,7 +166,7 @@ public Response updatePet(@ApiParam(value = "Pet object that needs to be added t throws NotFoundException { return delegate.updatePet(body, securityContext); } - @POST + @javax.ws.rs.POST @Path("/{petId}") @Consumes({ "application/x-www-form-urlencoded" }) @@ -183,7 +183,7 @@ public Response updatePetWithForm(@ApiParam(value = "ID of pet that needs to be throws NotFoundException { return delegate.updatePetWithForm(petId, name, status, securityContext); } - @POST + @javax.ws.rs.POST @Path("/{petId}/uploadImage") @Consumes({ "multipart/form-data" }) @Produces({ "application/json" }) diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java index 0a853c97eabf..e2dc45060906 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/StoreApi.java @@ -56,7 +56,7 @@ public StoreApi(@Context ServletConfig servletContext) { this.delegate = delegate; } - @DELETE + @javax.ws.rs.DELETE @Path("/order/{order_id}") @@ -69,7 +69,7 @@ public Response deleteOrder(@ApiParam(value = "ID of the order that needs to be throws NotFoundException { return delegate.deleteOrder(orderId, securityContext); } - @GET + @javax.ws.rs.GET @Path("/inventory") @Produces({ "application/json" }) @@ -83,7 +83,7 @@ public Response getInventory(@Context SecurityContext securityContext) throws NotFoundException { return delegate.getInventory(securityContext); } - @GET + @javax.ws.rs.GET @Path("/order/{order_id}") @Produces({ "application/xml", "application/json" }) @@ -97,7 +97,7 @@ public Response getOrderById(@ApiParam(value = "ID of pet that needs to be fetch throws NotFoundException { return delegate.getOrderById(orderId, securityContext); } - @POST + @javax.ws.rs.POST @Path("/order") @Produces({ "application/xml", "application/json" }) diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/UserApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/UserApi.java index 083280808341..a6293f6982c4 100644 --- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/UserApi.java @@ -57,7 +57,7 @@ public UserApi(@Context ServletConfig servletContext) { this.delegate = delegate; } - @POST + @javax.ws.rs.POST @@ -69,7 +69,7 @@ public Response createUser(@ApiParam(value = "Created user object", required = t throws NotFoundException { return delegate.createUser(body, securityContext); } - @POST + @javax.ws.rs.POST @Path("/createWithArray") @@ -81,7 +81,7 @@ public Response createUsersWithArrayInput(@ApiParam(value = "List of user object throws NotFoundException { return delegate.createUsersWithArrayInput(body, securityContext); } - @POST + @javax.ws.rs.POST @Path("/createWithList") @@ -93,7 +93,7 @@ public Response createUsersWithListInput(@ApiParam(value = "List of user object" throws NotFoundException { return delegate.createUsersWithListInput(body, securityContext); } - @DELETE + @javax.ws.rs.DELETE @Path("/{username}") @@ -106,7 +106,7 @@ public Response deleteUser(@ApiParam(value = "The name that needs to be deleted" throws NotFoundException { return delegate.deleteUser(username, securityContext); } - @GET + @javax.ws.rs.GET @Path("/{username}") @Produces({ "application/xml", "application/json" }) @@ -120,7 +120,7 @@ public Response getUserByName(@ApiParam(value = "The name that needs to be fetch throws NotFoundException { return delegate.getUserByName(username, securityContext); } - @GET + @javax.ws.rs.GET @Path("/login") @Produces({ "application/xml", "application/json" }) @@ -133,7 +133,7 @@ public Response loginUser(@ApiParam(value = "The user name for login", required throws NotFoundException { return delegate.loginUser(username, password, securityContext); } - @GET + @javax.ws.rs.GET @Path("/logout") @@ -145,7 +145,7 @@ public Response logoutUser(@Context SecurityContext securityContext) throws NotFoundException { return delegate.logoutUser(securityContext); } - @PUT + @javax.ws.rs.PUT @Path("/{username}")