From 8dc691880fb85c97186dd5859e5388952496e1de Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Thu, 24 Aug 2023 13:11:22 +0200 Subject: [PATCH] Fix handling of parameter for multipart client interfaces --- gen/main/java/testapi/async/reactor/MediatypeApi.java | 5 ++++- .../java/testapi/async/reactor/MediatypeApiClient.java | 5 ++++- gen/main/java/testapi/async/simple/MediatypeApi.java | 5 ++++- .../java/testapi/async/simple/MediatypeApiClient.java | 5 ++++- gen/main/java/testapi/defaults/MediatypeApi.java | 5 ++++- gen/main/java/testapi/defaults/MediatypeApiClient.java | 5 ++++- .../java/testapi/micronaut_java/MediatypeController.java | 4 +++- gen/main/java/testapi/modelsuffix/MediatypeApi.java | 5 ++++- .../java/testapi/modelsuffix/MediatypeApiClient.java | 5 ++++- gen/main/java/testapi/nogeneric/MediatypeApi.java | 5 ++++- gen/main/java/testapi/nogeneric/MediatypeApiClient.java | 5 ++++- gen/main/java/testapi/nooptional/MediatypeApi.java | 5 ++++- gen/main/java/testapi/nooptional/MediatypeApiClient.java | 5 ++++- gen/main/java/testapi/novalidation/MediatypeApi.java | 5 ++++- .../java/testapi/novalidation/MediatypeApiClient.java | 5 ++++- gen/main/java/testapi/packages/api/MediatypeApi.java | 5 ++++- .../java/testapi/packages/api/MediatypeApiClient.java | 5 ++++- gen/main/java/testapi/types/MediatypeApi.java | 5 ++++- gen/main/java/testapi/types/MediatypeApiClient.java | 5 ++++- .../testapi/async/reactor/MediatypeApiTestClient.java | 5 ++++- .../testapi/async/simple/MediatypeApiTestClient.java | 5 ++++- .../java/testapi/defaults/MediatypeApiTestClient.java | 5 ++++- .../java/testapi/modelsuffix/MediatypeApiTestClient.java | 5 ++++- .../java/testapi/nogeneric/MediatypeApiTestClient.java | 5 ++++- .../java/testapi/nooptional/MediatypeApiTestClient.java | 5 ++++- .../testapi/novalidation/MediatypeApiTestClient.java | 5 ++++- .../testapi/packages/api/MediatypeApiTestClient.java | 5 ++++- gen/test/java/testapi/types/MediatypeApiTestClient.java | 5 ++++- .../main/java/codegen/server/MediaTypeController.java | 5 ++++- .../test/java/codegen/client/MediatypeClientTest.java | 2 +- .../main/java/codegen/server/MediaTypeController.java | 5 ++++- .../test/java/codegen/client/MediatypeClientTest.java | 2 +- .../main/java/codegen/server/MediaTypeController.java | 4 +++- .../test/java/codegen/client/MediatypeClientTest.java | 2 +- .../main/java/codegen/server/MediaTypeController.java | 5 ++++- .../test/java/codegen/client/MediatypeClientTest.java | 2 +- .../main/java/codegen/server/MediaTypeController.java | 4 +++- .../test/java/codegen/client/MediatypeClientTest.java | 2 +- .../main/java/codegen/server/MediaTypeController.java | 5 ++++- .../test/java/codegen/client/MediatypeClientTest.java | 2 +- .../main/java/codegen/server/MediaTypeController.java | 5 ++++- .../test/java/codegen/client/MediatypeClientTest.java | 2 +- .../main/java/codegen/server/MediaTypeController.java | 5 ++++- .../test/java/codegen/client/MediatypeClientTest.java | 2 +- .../java/codegen/server/MediatypeControllerTest.java | 2 +- .../openapitools/codegen/languages/MicronautCodegen.java | 5 +++++ src/main/resources/Micronaut/apiClientParams.mustache | 9 +++++---- src/main/resources/Micronaut/testClientParams.mustache | 7 ++++--- src/test/resources/openapi/test-api.yaml | 8 +++++++- 49 files changed, 171 insertions(+), 53 deletions(-) diff --git a/gen/main/java/testapi/async/reactor/MediatypeApi.java b/gen/main/java/testapi/async/reactor/MediatypeApi.java index 0dc285bf..d9ae3b2b 100644 --- a/gen/main/java/testapi/async/reactor/MediatypeApi.java +++ b/gen/main/java/testapi/async/reactor/MediatypeApi.java @@ -6,7 +6,7 @@ public interface MediatypeApi { java.lang.String PATH_MEDIATYPE_CONSUMES_AND_PRODUCES = "/mediatype/consumes-and-produces"; java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD = "/mediatype/consumes-multipart-with-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload"; + java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload/{test_path_parameter}"; java.lang.String PATH_MEDIATYPE_CONSUMES_OCTET_STREAM = "/mediatype/consumes-octet-stream"; java.lang.String PATH_MEDIATYPE_CONSUMES_PLAIN = "/mediatype/consumes-plain"; java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; @@ -38,6 +38,9 @@ reactor.core.publisher.Mono> mediatype @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> mediatypeConsumesMultipartWithoutFileUpload( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.PathVariable(value = "test_path_parameter") + java.lang.String testPathParameter, @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Part(value = "orderId") java.lang.Integer orderId, diff --git a/gen/main/java/testapi/async/reactor/MediatypeApiClient.java b/gen/main/java/testapi/async/reactor/MediatypeApiClient.java index e45762dc..f9ebf3ff 100644 --- a/gen/main/java/testapi/async/reactor/MediatypeApiClient.java +++ b/gen/main/java/testapi/async/reactor/MediatypeApiClient.java @@ -6,7 +6,7 @@ public interface MediatypeApiClient { java.lang.String PATH_MEDIATYPE_CONSUMES_AND_PRODUCES = "/mediatype/consumes-and-produces"; java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD = "/mediatype/consumes-multipart-with-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload"; + java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload/{test_path_parameter}"; java.lang.String PATH_MEDIATYPE_CONSUMES_OCTET_STREAM = "/mediatype/consumes-octet-stream"; java.lang.String PATH_MEDIATYPE_CONSUMES_PLAIN = "/mediatype/consumes-plain"; java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; @@ -32,6 +32,9 @@ reactor.core.publisher.Mono> mediatype @io.micronaut.http.annotation.Produces({ "multipart/form-data" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> mediatypeConsumesMultipartWithoutFileUpload( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.PathVariable(value = "test_path_parameter") + java.lang.String testPathParameter, @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); diff --git a/gen/main/java/testapi/async/simple/MediatypeApi.java b/gen/main/java/testapi/async/simple/MediatypeApi.java index 4b956811..3ee66fe7 100644 --- a/gen/main/java/testapi/async/simple/MediatypeApi.java +++ b/gen/main/java/testapi/async/simple/MediatypeApi.java @@ -6,7 +6,7 @@ public interface MediatypeApi { java.lang.String PATH_MEDIATYPE_CONSUMES_AND_PRODUCES = "/mediatype/consumes-and-produces"; java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD = "/mediatype/consumes-multipart-with-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload"; + java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload/{test_path_parameter}"; java.lang.String PATH_MEDIATYPE_CONSUMES_OCTET_STREAM = "/mediatype/consumes-octet-stream"; java.lang.String PATH_MEDIATYPE_CONSUMES_PLAIN = "/mediatype/consumes-plain"; java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; @@ -41,6 +41,9 @@ reactor.core.publisher.Mono mediatypeConsumesMultipartWithFileUpload( @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono mediatypeConsumesMultipartWithoutFileUpload( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.PathVariable(value = "test_path_parameter") + java.lang.String testPathParameter, @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Part(value = "orderId") java.lang.Integer orderId, diff --git a/gen/main/java/testapi/async/simple/MediatypeApiClient.java b/gen/main/java/testapi/async/simple/MediatypeApiClient.java index 75efd86b..10297945 100644 --- a/gen/main/java/testapi/async/simple/MediatypeApiClient.java +++ b/gen/main/java/testapi/async/simple/MediatypeApiClient.java @@ -6,7 +6,7 @@ public interface MediatypeApiClient { java.lang.String PATH_MEDIATYPE_CONSUMES_AND_PRODUCES = "/mediatype/consumes-and-produces"; java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD = "/mediatype/consumes-multipart-with-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload"; + java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload/{test_path_parameter}"; java.lang.String PATH_MEDIATYPE_CONSUMES_OCTET_STREAM = "/mediatype/consumes-octet-stream"; java.lang.String PATH_MEDIATYPE_CONSUMES_PLAIN = "/mediatype/consumes-plain"; java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; @@ -35,6 +35,9 @@ reactor.core.publisher.Mono mediatypeConsumesMultipartWithFileUpload( @io.micronaut.http.annotation.Produces({ "multipart/form-data" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono mediatypeConsumesMultipartWithoutFileUpload( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.PathVariable(value = "test_path_parameter") + java.lang.String testPathParameter, @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); diff --git a/gen/main/java/testapi/defaults/MediatypeApi.java b/gen/main/java/testapi/defaults/MediatypeApi.java index dca6cf8e..0c68315b 100644 --- a/gen/main/java/testapi/defaults/MediatypeApi.java +++ b/gen/main/java/testapi/defaults/MediatypeApi.java @@ -6,7 +6,7 @@ public interface MediatypeApi { java.lang.String PATH_MEDIATYPE_CONSUMES_AND_PRODUCES = "/mediatype/consumes-and-produces"; java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD = "/mediatype/consumes-multipart-with-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload"; + java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload/{test_path_parameter}"; java.lang.String PATH_MEDIATYPE_CONSUMES_OCTET_STREAM = "/mediatype/consumes-octet-stream"; java.lang.String PATH_MEDIATYPE_CONSUMES_PLAIN = "/mediatype/consumes-plain"; java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; @@ -38,6 +38,9 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUplo @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.PathVariable(value = "test_path_parameter") + java.lang.String testPathParameter, @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Part(value = "orderId") java.lang.Integer orderId, diff --git a/gen/main/java/testapi/defaults/MediatypeApiClient.java b/gen/main/java/testapi/defaults/MediatypeApiClient.java index 18827b85..dbf25b50 100644 --- a/gen/main/java/testapi/defaults/MediatypeApiClient.java +++ b/gen/main/java/testapi/defaults/MediatypeApiClient.java @@ -6,7 +6,7 @@ public interface MediatypeApiClient { java.lang.String PATH_MEDIATYPE_CONSUMES_AND_PRODUCES = "/mediatype/consumes-and-produces"; java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD = "/mediatype/consumes-multipart-with-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload"; + java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload/{test_path_parameter}"; java.lang.String PATH_MEDIATYPE_CONSUMES_OCTET_STREAM = "/mediatype/consumes-octet-stream"; java.lang.String PATH_MEDIATYPE_CONSUMES_PLAIN = "/mediatype/consumes-plain"; java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; @@ -32,6 +32,9 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUplo @io.micronaut.http.annotation.Produces({ "multipart/form-data" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.PathVariable(value = "test_path_parameter") + java.lang.String testPathParameter, @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); diff --git a/gen/main/java/testapi/micronaut_java/MediatypeController.java b/gen/main/java/testapi/micronaut_java/MediatypeController.java index cb8d4527..d42a14b8 100644 --- a/gen/main/java/testapi/micronaut_java/MediatypeController.java +++ b/gen/main/java/testapi/micronaut_java/MediatypeController.java @@ -76,15 +76,17 @@ public Multipart mediatypeConsumesMultipartWithFileUpload( /** * mediatypeConsumesMultipartWithoutFileUpload * + * @param testPathParameter (required) * @param orderId (required) * @param userId (required) * @return Multipart */ - @Post(uri="/mediatype/consumes-multipart-without-fileupload") + @Post(uri="/mediatype/consumes-multipart-without-fileupload/{test_path_parameter}") @Produces(value = {"application/json"}) @Consumes(value = {"multipart/form-data"}) @Secured({SecurityRule.IS_ANONYMOUS}) public Multipart mediatypeConsumesMultipartWithoutFileUpload( + @PathVariable(value="test_path_parameter") @NotNull String testPathParameter, @NotNull Integer orderId, @NotNull Integer userId ) { diff --git a/gen/main/java/testapi/modelsuffix/MediatypeApi.java b/gen/main/java/testapi/modelsuffix/MediatypeApi.java index 55506893..3a2005f0 100644 --- a/gen/main/java/testapi/modelsuffix/MediatypeApi.java +++ b/gen/main/java/testapi/modelsuffix/MediatypeApi.java @@ -6,7 +6,7 @@ public interface MediatypeApi { java.lang.String PATH_MEDIATYPE_CONSUMES_AND_PRODUCES = "/mediatype/consumes-and-produces"; java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD = "/mediatype/consumes-multipart-with-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload"; + java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload/{test_path_parameter}"; java.lang.String PATH_MEDIATYPE_CONSUMES_OCTET_STREAM = "/mediatype/consumes-octet-stream"; java.lang.String PATH_MEDIATYPE_CONSUMES_PLAIN = "/mediatype/consumes-plain"; java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; @@ -38,6 +38,9 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUp @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.PathVariable(value = "test_path_parameter") + java.lang.String testPathParameter, @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Part(value = "orderId") java.lang.Integer orderId, diff --git a/gen/main/java/testapi/modelsuffix/MediatypeApiClient.java b/gen/main/java/testapi/modelsuffix/MediatypeApiClient.java index a2b825e4..d91d5e28 100644 --- a/gen/main/java/testapi/modelsuffix/MediatypeApiClient.java +++ b/gen/main/java/testapi/modelsuffix/MediatypeApiClient.java @@ -6,7 +6,7 @@ public interface MediatypeApiClient { java.lang.String PATH_MEDIATYPE_CONSUMES_AND_PRODUCES = "/mediatype/consumes-and-produces"; java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD = "/mediatype/consumes-multipart-with-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload"; + java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload/{test_path_parameter}"; java.lang.String PATH_MEDIATYPE_CONSUMES_OCTET_STREAM = "/mediatype/consumes-octet-stream"; java.lang.String PATH_MEDIATYPE_CONSUMES_PLAIN = "/mediatype/consumes-plain"; java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; @@ -32,6 +32,9 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUp @io.micronaut.http.annotation.Produces({ "multipart/form-data" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.PathVariable(value = "test_path_parameter") + java.lang.String testPathParameter, @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); diff --git a/gen/main/java/testapi/nogeneric/MediatypeApi.java b/gen/main/java/testapi/nogeneric/MediatypeApi.java index b337b12a..99a72be6 100644 --- a/gen/main/java/testapi/nogeneric/MediatypeApi.java +++ b/gen/main/java/testapi/nogeneric/MediatypeApi.java @@ -6,7 +6,7 @@ public interface MediatypeApi { java.lang.String PATH_MEDIATYPE_CONSUMES_AND_PRODUCES = "/mediatype/consumes-and-produces"; java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD = "/mediatype/consumes-multipart-with-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload"; + java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload/{test_path_parameter}"; java.lang.String PATH_MEDIATYPE_CONSUMES_OCTET_STREAM = "/mediatype/consumes-octet-stream"; java.lang.String PATH_MEDIATYPE_CONSUMES_PLAIN = "/mediatype/consumes-plain"; java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; @@ -41,6 +41,9 @@ Multipart mediatypeConsumesMultipartWithFileUpload( @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) Multipart mediatypeConsumesMultipartWithoutFileUpload( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.PathVariable(value = "test_path_parameter") + java.lang.String testPathParameter, @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Part(value = "orderId") java.lang.Integer orderId, diff --git a/gen/main/java/testapi/nogeneric/MediatypeApiClient.java b/gen/main/java/testapi/nogeneric/MediatypeApiClient.java index 58bc7162..2ffeb09c 100644 --- a/gen/main/java/testapi/nogeneric/MediatypeApiClient.java +++ b/gen/main/java/testapi/nogeneric/MediatypeApiClient.java @@ -6,7 +6,7 @@ public interface MediatypeApiClient { java.lang.String PATH_MEDIATYPE_CONSUMES_AND_PRODUCES = "/mediatype/consumes-and-produces"; java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD = "/mediatype/consumes-multipart-with-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload"; + java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload/{test_path_parameter}"; java.lang.String PATH_MEDIATYPE_CONSUMES_OCTET_STREAM = "/mediatype/consumes-octet-stream"; java.lang.String PATH_MEDIATYPE_CONSUMES_PLAIN = "/mediatype/consumes-plain"; java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; @@ -35,6 +35,9 @@ Multipart mediatypeConsumesMultipartWithFileUpload( @io.micronaut.http.annotation.Produces({ "multipart/form-data" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) Multipart mediatypeConsumesMultipartWithoutFileUpload( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.PathVariable(value = "test_path_parameter") + java.lang.String testPathParameter, @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); diff --git a/gen/main/java/testapi/nooptional/MediatypeApi.java b/gen/main/java/testapi/nooptional/MediatypeApi.java index fdc2a633..8bd9fa83 100644 --- a/gen/main/java/testapi/nooptional/MediatypeApi.java +++ b/gen/main/java/testapi/nooptional/MediatypeApi.java @@ -6,7 +6,7 @@ public interface MediatypeApi { java.lang.String PATH_MEDIATYPE_CONSUMES_AND_PRODUCES = "/mediatype/consumes-and-produces"; java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD = "/mediatype/consumes-multipart-with-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload"; + java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload/{test_path_parameter}"; java.lang.String PATH_MEDIATYPE_CONSUMES_OCTET_STREAM = "/mediatype/consumes-octet-stream"; java.lang.String PATH_MEDIATYPE_CONSUMES_PLAIN = "/mediatype/consumes-plain"; java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; @@ -38,6 +38,9 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUplo @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.PathVariable(value = "test_path_parameter") + java.lang.String testPathParameter, @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Part(value = "orderId") java.lang.Integer orderId, diff --git a/gen/main/java/testapi/nooptional/MediatypeApiClient.java b/gen/main/java/testapi/nooptional/MediatypeApiClient.java index 5aca12ef..0dd9c534 100644 --- a/gen/main/java/testapi/nooptional/MediatypeApiClient.java +++ b/gen/main/java/testapi/nooptional/MediatypeApiClient.java @@ -6,7 +6,7 @@ public interface MediatypeApiClient { java.lang.String PATH_MEDIATYPE_CONSUMES_AND_PRODUCES = "/mediatype/consumes-and-produces"; java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD = "/mediatype/consumes-multipart-with-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload"; + java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload/{test_path_parameter}"; java.lang.String PATH_MEDIATYPE_CONSUMES_OCTET_STREAM = "/mediatype/consumes-octet-stream"; java.lang.String PATH_MEDIATYPE_CONSUMES_PLAIN = "/mediatype/consumes-plain"; java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; @@ -32,6 +32,9 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUplo @io.micronaut.http.annotation.Produces({ "multipart/form-data" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.PathVariable(value = "test_path_parameter") + java.lang.String testPathParameter, @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); diff --git a/gen/main/java/testapi/novalidation/MediatypeApi.java b/gen/main/java/testapi/novalidation/MediatypeApi.java index 2ece9cc7..900e746e 100644 --- a/gen/main/java/testapi/novalidation/MediatypeApi.java +++ b/gen/main/java/testapi/novalidation/MediatypeApi.java @@ -5,7 +5,7 @@ public interface MediatypeApi { java.lang.String PATH_MEDIATYPE_CONSUMES_AND_PRODUCES = "/mediatype/consumes-and-produces"; java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD = "/mediatype/consumes-multipart-with-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload"; + java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload/{test_path_parameter}"; java.lang.String PATH_MEDIATYPE_CONSUMES_OCTET_STREAM = "/mediatype/consumes-octet-stream"; java.lang.String PATH_MEDIATYPE_CONSUMES_PLAIN = "/mediatype/consumes-plain"; java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; @@ -37,6 +37,9 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUplo @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.PathVariable(value = "test_path_parameter") + java.lang.String testPathParameter, @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Part(value = "orderId") java.lang.Integer orderId, diff --git a/gen/main/java/testapi/novalidation/MediatypeApiClient.java b/gen/main/java/testapi/novalidation/MediatypeApiClient.java index 775fee89..89a10040 100644 --- a/gen/main/java/testapi/novalidation/MediatypeApiClient.java +++ b/gen/main/java/testapi/novalidation/MediatypeApiClient.java @@ -6,7 +6,7 @@ public interface MediatypeApiClient { java.lang.String PATH_MEDIATYPE_CONSUMES_AND_PRODUCES = "/mediatype/consumes-and-produces"; java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD = "/mediatype/consumes-multipart-with-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload"; + java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload/{test_path_parameter}"; java.lang.String PATH_MEDIATYPE_CONSUMES_OCTET_STREAM = "/mediatype/consumes-octet-stream"; java.lang.String PATH_MEDIATYPE_CONSUMES_PLAIN = "/mediatype/consumes-plain"; java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; @@ -32,6 +32,9 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUplo @io.micronaut.http.annotation.Produces({ "multipart/form-data" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.PathVariable(value = "test_path_parameter") + java.lang.String testPathParameter, @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); diff --git a/gen/main/java/testapi/packages/api/MediatypeApi.java b/gen/main/java/testapi/packages/api/MediatypeApi.java index a34be2d0..27e143be 100644 --- a/gen/main/java/testapi/packages/api/MediatypeApi.java +++ b/gen/main/java/testapi/packages/api/MediatypeApi.java @@ -8,7 +8,7 @@ public interface MediatypeApi { java.lang.String PATH_MEDIATYPE_CONSUMES_AND_PRODUCES = "/mediatype/consumes-and-produces"; java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD = "/mediatype/consumes-multipart-with-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload"; + java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload/{test_path_parameter}"; java.lang.String PATH_MEDIATYPE_CONSUMES_OCTET_STREAM = "/mediatype/consumes-octet-stream"; java.lang.String PATH_MEDIATYPE_CONSUMES_PLAIN = "/mediatype/consumes-plain"; java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; @@ -40,6 +40,9 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUplo @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.PathVariable(value = "test_path_parameter") + java.lang.String testPathParameter, @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Part(value = "orderId") java.lang.Integer orderId, diff --git a/gen/main/java/testapi/packages/api/MediatypeApiClient.java b/gen/main/java/testapi/packages/api/MediatypeApiClient.java index dc846913..d398dcf7 100644 --- a/gen/main/java/testapi/packages/api/MediatypeApiClient.java +++ b/gen/main/java/testapi/packages/api/MediatypeApiClient.java @@ -8,7 +8,7 @@ public interface MediatypeApiClient { java.lang.String PATH_MEDIATYPE_CONSUMES_AND_PRODUCES = "/mediatype/consumes-and-produces"; java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD = "/mediatype/consumes-multipart-with-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload"; + java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload/{test_path_parameter}"; java.lang.String PATH_MEDIATYPE_CONSUMES_OCTET_STREAM = "/mediatype/consumes-octet-stream"; java.lang.String PATH_MEDIATYPE_CONSUMES_PLAIN = "/mediatype/consumes-plain"; java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; @@ -34,6 +34,9 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUplo @io.micronaut.http.annotation.Produces({ "multipart/form-data" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.PathVariable(value = "test_path_parameter") + java.lang.String testPathParameter, @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); diff --git a/gen/main/java/testapi/types/MediatypeApi.java b/gen/main/java/testapi/types/MediatypeApi.java index 20d94fcc..5eb5136a 100644 --- a/gen/main/java/testapi/types/MediatypeApi.java +++ b/gen/main/java/testapi/types/MediatypeApi.java @@ -5,7 +5,7 @@ public interface MediatypeApi { java.lang.String PATH_MEDIATYPE_CONSUMES_AND_PRODUCES = "/mediatype/consumes-and-produces"; java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD = "/mediatype/consumes-multipart-with-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload"; + java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload/{test_path_parameter}"; java.lang.String PATH_MEDIATYPE_CONSUMES_OCTET_STREAM = "/mediatype/consumes-octet-stream"; java.lang.String PATH_MEDIATYPE_CONSUMES_PLAIN = "/mediatype/consumes-plain"; java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; @@ -37,6 +37,9 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUplo @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.PathVariable(value = "test_path_parameter") + java.lang.String testPathParameter, @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Part(value = "orderId") java.lang.Integer orderId, diff --git a/gen/main/java/testapi/types/MediatypeApiClient.java b/gen/main/java/testapi/types/MediatypeApiClient.java index 777c3879..83c59811 100644 --- a/gen/main/java/testapi/types/MediatypeApiClient.java +++ b/gen/main/java/testapi/types/MediatypeApiClient.java @@ -5,7 +5,7 @@ public interface MediatypeApiClient { java.lang.String PATH_MEDIATYPE_CONSUMES_AND_PRODUCES = "/mediatype/consumes-and-produces"; java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD = "/mediatype/consumes-multipart-with-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload"; + java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload/{test_path_parameter}"; java.lang.String PATH_MEDIATYPE_CONSUMES_OCTET_STREAM = "/mediatype/consumes-octet-stream"; java.lang.String PATH_MEDIATYPE_CONSUMES_PLAIN = "/mediatype/consumes-plain"; java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; @@ -31,6 +31,9 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUplo @io.micronaut.http.annotation.Produces({ "multipart/form-data" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.PathVariable(value = "test_path_parameter") + java.lang.String testPathParameter, @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); diff --git a/gen/test/java/testapi/async/reactor/MediatypeApiTestClient.java b/gen/test/java/testapi/async/reactor/MediatypeApiTestClient.java index 54209d98..2c97b58c 100644 --- a/gen/test/java/testapi/async/reactor/MediatypeApiTestClient.java +++ b/gen/test/java/testapi/async/reactor/MediatypeApiTestClient.java @@ -20,10 +20,13 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUplo @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") + @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload/{test_path_parameter}") @io.micronaut.http.annotation.Produces({ "multipart/form-data" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.PathVariable(value = "test_path_parameter") + java.lang.String testPathParameter, @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); diff --git a/gen/test/java/testapi/async/simple/MediatypeApiTestClient.java b/gen/test/java/testapi/async/simple/MediatypeApiTestClient.java index ceaee45b..9cdfb7fb 100644 --- a/gen/test/java/testapi/async/simple/MediatypeApiTestClient.java +++ b/gen/test/java/testapi/async/simple/MediatypeApiTestClient.java @@ -22,11 +22,14 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUplo @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") + @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload/{test_path_parameter}") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "multipart/form-data" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.PathVariable(value = "test_path_parameter") + java.lang.String testPathParameter, @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); diff --git a/gen/test/java/testapi/defaults/MediatypeApiTestClient.java b/gen/test/java/testapi/defaults/MediatypeApiTestClient.java index 478de35f..5c919111 100644 --- a/gen/test/java/testapi/defaults/MediatypeApiTestClient.java +++ b/gen/test/java/testapi/defaults/MediatypeApiTestClient.java @@ -20,10 +20,13 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUplo @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") + @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload/{test_path_parameter}") @io.micronaut.http.annotation.Produces({ "multipart/form-data" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.PathVariable(value = "test_path_parameter") + java.lang.String testPathParameter, @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); diff --git a/gen/test/java/testapi/modelsuffix/MediatypeApiTestClient.java b/gen/test/java/testapi/modelsuffix/MediatypeApiTestClient.java index 311b88e1..439b9b72 100644 --- a/gen/test/java/testapi/modelsuffix/MediatypeApiTestClient.java +++ b/gen/test/java/testapi/modelsuffix/MediatypeApiTestClient.java @@ -20,10 +20,13 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUp @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") + @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload/{test_path_parameter}") @io.micronaut.http.annotation.Produces({ "multipart/form-data" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.PathVariable(value = "test_path_parameter") + java.lang.String testPathParameter, @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); diff --git a/gen/test/java/testapi/nogeneric/MediatypeApiTestClient.java b/gen/test/java/testapi/nogeneric/MediatypeApiTestClient.java index 5b22ef10..850697c3 100644 --- a/gen/test/java/testapi/nogeneric/MediatypeApiTestClient.java +++ b/gen/test/java/testapi/nogeneric/MediatypeApiTestClient.java @@ -22,11 +22,14 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUplo @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") + @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload/{test_path_parameter}") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "multipart/form-data" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.PathVariable(value = "test_path_parameter") + java.lang.String testPathParameter, @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); diff --git a/gen/test/java/testapi/nooptional/MediatypeApiTestClient.java b/gen/test/java/testapi/nooptional/MediatypeApiTestClient.java index 99ee2590..2af4b121 100644 --- a/gen/test/java/testapi/nooptional/MediatypeApiTestClient.java +++ b/gen/test/java/testapi/nooptional/MediatypeApiTestClient.java @@ -20,10 +20,13 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUplo @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") + @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload/{test_path_parameter}") @io.micronaut.http.annotation.Produces({ "multipart/form-data" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.PathVariable(value = "test_path_parameter") + java.lang.String testPathParameter, @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); diff --git a/gen/test/java/testapi/novalidation/MediatypeApiTestClient.java b/gen/test/java/testapi/novalidation/MediatypeApiTestClient.java index c55cdd00..765f3af9 100644 --- a/gen/test/java/testapi/novalidation/MediatypeApiTestClient.java +++ b/gen/test/java/testapi/novalidation/MediatypeApiTestClient.java @@ -20,10 +20,13 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUplo @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") + @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload/{test_path_parameter}") @io.micronaut.http.annotation.Produces({ "multipart/form-data" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.PathVariable(value = "test_path_parameter") + java.lang.String testPathParameter, @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); diff --git a/gen/test/java/testapi/packages/api/MediatypeApiTestClient.java b/gen/test/java/testapi/packages/api/MediatypeApiTestClient.java index 56dbdc6f..91b1ce1b 100644 --- a/gen/test/java/testapi/packages/api/MediatypeApiTestClient.java +++ b/gen/test/java/testapi/packages/api/MediatypeApiTestClient.java @@ -22,10 +22,13 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUplo @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") + @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload/{test_path_parameter}") @io.micronaut.http.annotation.Produces({ "multipart/form-data" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.PathVariable(value = "test_path_parameter") + java.lang.String testPathParameter, @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); diff --git a/gen/test/java/testapi/types/MediatypeApiTestClient.java b/gen/test/java/testapi/types/MediatypeApiTestClient.java index 086c0aea..fdd1d7b0 100644 --- a/gen/test/java/testapi/types/MediatypeApiTestClient.java +++ b/gen/test/java/testapi/types/MediatypeApiTestClient.java @@ -19,10 +19,13 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUplo @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") + @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload/{test_path_parameter}") @io.micronaut.http.annotation.Produces({ "multipart/form-data" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.PathVariable(value = "test_path_parameter") + java.lang.String testPathParameter, @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); diff --git a/src/it/test-api-async-reactor-generic/src/main/java/codegen/server/MediaTypeController.java b/src/it/test-api-async-reactor-generic/src/main/java/codegen/server/MediaTypeController.java index fd3bc57e..3f0d883a 100644 --- a/src/it/test-api-async-reactor-generic/src/main/java/codegen/server/MediaTypeController.java +++ b/src/it/test-api-async-reactor-generic/src/main/java/codegen/server/MediaTypeController.java @@ -41,7 +41,10 @@ public Mono> mediatypeConsumesMultipartWithFileUpload( } @Override - public Mono> mediatypeConsumesMultipartWithoutFileUpload(Integer orderId, Integer userId) { + public Mono> mediatypeConsumesMultipartWithoutFileUpload( + String path, + Integer orderId, + Integer userId) { return Mono.just(HttpResponse.ok(new Multipart().orderId(orderId).userId(userId))); } diff --git a/src/it/test-api-async-reactor-generic/src/test/java/codegen/client/MediatypeClientTest.java b/src/it/test-api-async-reactor-generic/src/test/java/codegen/client/MediatypeClientTest.java index 5a45a08a..37af356a 100644 --- a/src/it/test-api-async-reactor-generic/src/test/java/codegen/client/MediatypeClientTest.java +++ b/src/it/test-api-async-reactor-generic/src/test/java/codegen/client/MediatypeClientTest.java @@ -51,7 +51,7 @@ public void mediatypeConsumesMultipartWithoutFileUpload200() { .addPart("userId", String.valueOf(expected.getUserId())) .build(); assertEquals(expected, - assert200(() -> client.mediatypeConsumesMultipartWithoutFileUpload(body).block()).body()); + assert200(() -> client.mediatypeConsumesMultipartWithoutFileUpload("p", body).block()).body()); } @Test diff --git a/src/it/test-api-async-reactor-nogeneric/src/main/java/codegen/server/MediaTypeController.java b/src/it/test-api-async-reactor-nogeneric/src/main/java/codegen/server/MediaTypeController.java index 11165a87..c7c2c5fa 100644 --- a/src/it/test-api-async-reactor-nogeneric/src/main/java/codegen/server/MediaTypeController.java +++ b/src/it/test-api-async-reactor-nogeneric/src/main/java/codegen/server/MediaTypeController.java @@ -42,7 +42,10 @@ public Mono mediatypeConsumesMultipartWithFileUpload( } @Override - public Mono mediatypeConsumesMultipartWithoutFileUpload(Integer orderId, Integer userId) { + public Mono mediatypeConsumesMultipartWithoutFileUpload( + String path, + Integer orderId, + Integer userId) { return Mono.just(new Multipart().orderId(orderId).userId(userId)); } diff --git a/src/it/test-api-async-reactor-nogeneric/src/test/java/codegen/client/MediatypeClientTest.java b/src/it/test-api-async-reactor-nogeneric/src/test/java/codegen/client/MediatypeClientTest.java index 7a6cc031..5dd940b2 100644 --- a/src/it/test-api-async-reactor-nogeneric/src/test/java/codegen/client/MediatypeClientTest.java +++ b/src/it/test-api-async-reactor-nogeneric/src/test/java/codegen/client/MediatypeClientTest.java @@ -51,7 +51,7 @@ public void mediatypeConsumesMultipartWithoutFileUpload200() { .addPart("userId", String.valueOf(expected.getUserId())) .build(); assertEquals(expected, - client.mediatypeConsumesMultipartWithoutFileUpload(body).block()); + client.mediatypeConsumesMultipartWithoutFileUpload("p", body).block()); } @Test diff --git a/src/it/test-api-async-rxjava2-generic/src/main/java/codegen/server/MediaTypeController.java b/src/it/test-api-async-rxjava2-generic/src/main/java/codegen/server/MediaTypeController.java index 62d24206..6fbdf644 100644 --- a/src/it/test-api-async-rxjava2-generic/src/main/java/codegen/server/MediaTypeController.java +++ b/src/it/test-api-async-rxjava2-generic/src/main/java/codegen/server/MediaTypeController.java @@ -41,7 +41,9 @@ public Single> mediatypeConsumesMultipartWithFileUpload( } @Override - public Single> mediatypeConsumesMultipartWithoutFileUpload(Integer orderId, + public Single> mediatypeConsumesMultipartWithoutFileUpload( + String path, + Integer orderId, Integer userId) { return Single.just(HttpResponse.ok(new Multipart().orderId(orderId).userId(userId))); } diff --git a/src/it/test-api-async-rxjava2-generic/src/test/java/codegen/client/MediatypeClientTest.java b/src/it/test-api-async-rxjava2-generic/src/test/java/codegen/client/MediatypeClientTest.java index b7807006..18eea226 100644 --- a/src/it/test-api-async-rxjava2-generic/src/test/java/codegen/client/MediatypeClientTest.java +++ b/src/it/test-api-async-rxjava2-generic/src/test/java/codegen/client/MediatypeClientTest.java @@ -52,7 +52,7 @@ public void mediatypeConsumesMultipartWithoutFileUpload200() { .addPart("userId", String.valueOf(expected.getUserId())) .build(); assertEquals(expected, - assert200(() -> client.mediatypeConsumesMultipartWithoutFileUpload(body).blockingGet()).body()); + assert200(() -> client.mediatypeConsumesMultipartWithoutFileUpload("p", body).blockingGet()).body()); } @Test diff --git a/src/it/test-api-async-rxjava2-nogeneric/src/main/java/codegen/server/MediaTypeController.java b/src/it/test-api-async-rxjava2-nogeneric/src/main/java/codegen/server/MediaTypeController.java index 76e2ca13..bac171f7 100644 --- a/src/it/test-api-async-rxjava2-nogeneric/src/main/java/codegen/server/MediaTypeController.java +++ b/src/it/test-api-async-rxjava2-nogeneric/src/main/java/codegen/server/MediaTypeController.java @@ -42,7 +42,10 @@ public Single mediatypeConsumesMultipartWithFileUpload( } @Override - public Single mediatypeConsumesMultipartWithoutFileUpload(Integer orderId, Integer userId) { + public Single mediatypeConsumesMultipartWithoutFileUpload( + String path, + Integer orderId, + Integer userId) { return Single.just(new Multipart().orderId(orderId).userId(userId)); } diff --git a/src/it/test-api-async-rxjava2-nogeneric/src/test/java/codegen/client/MediatypeClientTest.java b/src/it/test-api-async-rxjava2-nogeneric/src/test/java/codegen/client/MediatypeClientTest.java index a850d5b3..cd9d9888 100644 --- a/src/it/test-api-async-rxjava2-nogeneric/src/test/java/codegen/client/MediatypeClientTest.java +++ b/src/it/test-api-async-rxjava2-nogeneric/src/test/java/codegen/client/MediatypeClientTest.java @@ -50,7 +50,7 @@ public void mediatypeConsumesMultipartWithoutFileUpload200() { .addPart("orderId", String.valueOf(expected.getOrderId())) .addPart("userId", String.valueOf(expected.getUserId())) .build(); - assertEquals(expected, client.mediatypeConsumesMultipartWithoutFileUpload(body).blockingGet()); + assertEquals(expected, client.mediatypeConsumesMultipartWithoutFileUpload("p", body).blockingGet()); } @Test diff --git a/src/it/test-api-async-rxjava3-generic/src/main/java/codegen/server/MediaTypeController.java b/src/it/test-api-async-rxjava3-generic/src/main/java/codegen/server/MediaTypeController.java index adcc2726..b162c1e8 100644 --- a/src/it/test-api-async-rxjava3-generic/src/main/java/codegen/server/MediaTypeController.java +++ b/src/it/test-api-async-rxjava3-generic/src/main/java/codegen/server/MediaTypeController.java @@ -41,7 +41,9 @@ public Single> mediatypeConsumesMultipartWithFileUpload( } @Override - public Single> mediatypeConsumesMultipartWithoutFileUpload(Integer orderId, + public Single> mediatypeConsumesMultipartWithoutFileUpload( + String path, + Integer orderId, Integer userId) { return Single.just(HttpResponse.ok(new Multipart().orderId(orderId).userId(userId))); } diff --git a/src/it/test-api-async-rxjava3-generic/src/test/java/codegen/client/MediatypeClientTest.java b/src/it/test-api-async-rxjava3-generic/src/test/java/codegen/client/MediatypeClientTest.java index b7807006..18eea226 100644 --- a/src/it/test-api-async-rxjava3-generic/src/test/java/codegen/client/MediatypeClientTest.java +++ b/src/it/test-api-async-rxjava3-generic/src/test/java/codegen/client/MediatypeClientTest.java @@ -52,7 +52,7 @@ public void mediatypeConsumesMultipartWithoutFileUpload200() { .addPart("userId", String.valueOf(expected.getUserId())) .build(); assertEquals(expected, - assert200(() -> client.mediatypeConsumesMultipartWithoutFileUpload(body).blockingGet()).body()); + assert200(() -> client.mediatypeConsumesMultipartWithoutFileUpload("p", body).blockingGet()).body()); } @Test diff --git a/src/it/test-api-async-rxjava3-nogeneric/src/main/java/codegen/server/MediaTypeController.java b/src/it/test-api-async-rxjava3-nogeneric/src/main/java/codegen/server/MediaTypeController.java index 22b14e2a..1ca3bc77 100644 --- a/src/it/test-api-async-rxjava3-nogeneric/src/main/java/codegen/server/MediaTypeController.java +++ b/src/it/test-api-async-rxjava3-nogeneric/src/main/java/codegen/server/MediaTypeController.java @@ -42,7 +42,10 @@ public Single mediatypeConsumesMultipartWithFileUpload( } @Override - public Single mediatypeConsumesMultipartWithoutFileUpload(Integer orderId, Integer userId) { + public Single mediatypeConsumesMultipartWithoutFileUpload( + String path, + Integer orderId, + Integer userId) { return Single.just(new Multipart().orderId(orderId).userId(userId)); } diff --git a/src/it/test-api-async-rxjava3-nogeneric/src/test/java/codegen/client/MediatypeClientTest.java b/src/it/test-api-async-rxjava3-nogeneric/src/test/java/codegen/client/MediatypeClientTest.java index a850d5b3..cd9d9888 100644 --- a/src/it/test-api-async-rxjava3-nogeneric/src/test/java/codegen/client/MediatypeClientTest.java +++ b/src/it/test-api-async-rxjava3-nogeneric/src/test/java/codegen/client/MediatypeClientTest.java @@ -50,7 +50,7 @@ public void mediatypeConsumesMultipartWithoutFileUpload200() { .addPart("orderId", String.valueOf(expected.getOrderId())) .addPart("userId", String.valueOf(expected.getUserId())) .build(); - assertEquals(expected, client.mediatypeConsumesMultipartWithoutFileUpload(body).blockingGet()); + assertEquals(expected, client.mediatypeConsumesMultipartWithoutFileUpload("p", body).blockingGet()); } @Test diff --git a/src/it/test-api-nogeneric/src/main/java/codegen/server/MediaTypeController.java b/src/it/test-api-nogeneric/src/main/java/codegen/server/MediaTypeController.java index 665deea6..56bf0a50 100644 --- a/src/it/test-api-nogeneric/src/main/java/codegen/server/MediaTypeController.java +++ b/src/it/test-api-nogeneric/src/main/java/codegen/server/MediaTypeController.java @@ -39,7 +39,10 @@ public Multipart mediatypeConsumesMultipartWithFileUpload( } @Override - public Multipart mediatypeConsumesMultipartWithoutFileUpload(Integer orderId, Integer userId) { + public Multipart mediatypeConsumesMultipartWithoutFileUpload( + String path, + Integer orderId, + Integer userId) { return new Multipart().orderId(orderId).userId(userId); } diff --git a/src/it/test-api-nogeneric/src/test/java/codegen/client/MediatypeClientTest.java b/src/it/test-api-nogeneric/src/test/java/codegen/client/MediatypeClientTest.java index 887cade2..7a8803d0 100644 --- a/src/it/test-api-nogeneric/src/test/java/codegen/client/MediatypeClientTest.java +++ b/src/it/test-api-nogeneric/src/test/java/codegen/client/MediatypeClientTest.java @@ -50,7 +50,7 @@ public void mediatypeConsumesMultipartWithoutFileUpload200() { .addPart("orderId", String.valueOf(expected.getOrderId())) .addPart("userId", String.valueOf(expected.getUserId())) .build(); - assertEquals(expected, client.mediatypeConsumesMultipartWithoutFileUpload(body)); + assertEquals(expected, client.mediatypeConsumesMultipartWithoutFileUpload("p", body)); } @Test diff --git a/src/it/test-api/src/main/java/codegen/server/MediaTypeController.java b/src/it/test-api/src/main/java/codegen/server/MediaTypeController.java index 23364d0a..18464011 100644 --- a/src/it/test-api/src/main/java/codegen/server/MediaTypeController.java +++ b/src/it/test-api/src/main/java/codegen/server/MediaTypeController.java @@ -39,7 +39,10 @@ public HttpResponse mediatypeConsumesMultipartWithFileUpload( } @Override - public HttpResponse mediatypeConsumesMultipartWithoutFileUpload(Integer orderId, Integer userId) { + public HttpResponse mediatypeConsumesMultipartWithoutFileUpload( + String path, + Integer orderId, + Integer userId) { return HttpResponse.ok(new Multipart().orderId(orderId).userId(userId)); } diff --git a/src/it/test-api/src/test/java/codegen/client/MediatypeClientTest.java b/src/it/test-api/src/test/java/codegen/client/MediatypeClientTest.java index 863a0944..88f4c999 100644 --- a/src/it/test-api/src/test/java/codegen/client/MediatypeClientTest.java +++ b/src/it/test-api/src/test/java/codegen/client/MediatypeClientTest.java @@ -50,7 +50,7 @@ public void mediatypeConsumesMultipartWithoutFileUpload200() { .addPart("orderId", String.valueOf(expected.getOrderId())) .addPart("userId", String.valueOf(expected.getUserId())) .build(); - assertEquals(expected, assert200(() -> client.mediatypeConsumesMultipartWithoutFileUpload(body)).body()); + assertEquals(expected, assert200(() -> client.mediatypeConsumesMultipartWithoutFileUpload("p", body)).body()); } @Test diff --git a/src/it/test-api/src/test/java/codegen/server/MediatypeControllerTest.java b/src/it/test-api/src/test/java/codegen/server/MediatypeControllerTest.java index 2e583563..25be1674 100644 --- a/src/it/test-api/src/test/java/codegen/server/MediatypeControllerTest.java +++ b/src/it/test-api/src/test/java/codegen/server/MediatypeControllerTest.java @@ -65,7 +65,7 @@ public void mediatypeConsumesMultipartWithoutFileUpload200() { .addPart("orderId", String.valueOf(expected.getOrderId())) .addPart("userId", String.valueOf(expected.getUserId())) .build(); - assertEquals(expected, assert200(() -> client.mediatypeConsumesMultipartWithoutFileUpload(body)).body()); + assertEquals(expected, assert200(() -> client.mediatypeConsumesMultipartWithoutFileUpload("p", body)).body()); } @Test diff --git a/src/main/java/org/openapitools/codegen/languages/MicronautCodegen.java b/src/main/java/org/openapitools/codegen/languages/MicronautCodegen.java index 62a5c729..ffe39066 100644 --- a/src/main/java/org/openapitools/codegen/languages/MicronautCodegen.java +++ b/src/main/java/org/openapitools/codegen/languages/MicronautCodegen.java @@ -399,6 +399,11 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation } extensions.put("serverPath", serverPath); + // helper for mustache: has any non form param this is required + + extensions.put("hasOtherThanMultipart", + operation.allParams.stream().anyMatch(p -> !p.isFormParam && !p.required)); + return operation; } diff --git a/src/main/resources/Micronaut/apiClientParams.mustache b/src/main/resources/Micronaut/apiClientParams.mustache index 0ab0a94e..6b51a56d 100644 --- a/src/main/resources/Micronaut/apiClientParams.mustache +++ b/src/main/resources/Micronaut/apiClientParams.mustache @@ -1,10 +1,11 @@ -{{#isMultipart}} @{{type.Nonnull}} - @io.micronaut.http.annotation.Body - {{type.MultipartBody}} multipart{{/isMultipart}}{{^isMultipart}}{{#allParams}} {{#required}}{{#defaultValue}}@{{type.Nullable}}{{/defaultValue}}{{^defaultValue}}@{{type.Nonnull}}{{/defaultValue}}{{/required}}{{^required}}@{{type.Nullable}}{{/required}} +{{#allParams}}{{^isFormParam}} {{#required}}{{#defaultValue}}@{{type.Nullable}}{{/defaultValue}}{{^defaultValue}}@{{type.Nonnull}}{{/defaultValue}}{{/required}}{{^required}}@{{type.Nullable}}{{/required}} {{#isBodyParam}} @io.micronaut.http.annotation.Body {{/isBodyParam}}{{#isPathParam}} @io.micronaut.http.annotation.PathVariable(value = "{{baseName}}") {{/isPathParam}}{{#isQueryParam}} @io.micronaut.http.annotation.QueryValue(value = "{{baseName}}") {{/isQueryParam}}{{#isCookieParam}} @io.micronaut.http.annotation.CookieValue(value = "{{baseName}}") {{/isCookieParam}}{{#isHeaderParam}} @io.micronaut.http.annotation.Header(value = "{{baseName}}") {{/isHeaderParam}} {{{dataType}}} {{paramName}}{{^-last}}, -{{/-last}}{{/allParams}}{{/isMultipart}} \ No newline at end of file +{{/-last}}{{/isFormParam}}{{/allParams}}{{#isMultipart}}{{#vendorExtensions.hasOtherThanMultipart}}, +{{/vendorExtensions.hasOtherThanMultipart}} @{{type.Nonnull}} + @io.micronaut.http.annotation.Body + {{type.MultipartBody}} multipart{{/isMultipart}} \ No newline at end of file diff --git a/src/main/resources/Micronaut/testClientParams.mustache b/src/main/resources/Micronaut/testClientParams.mustache index d493726f..e1e8b867 100644 --- a/src/main/resources/Micronaut/testClientParams.mustache +++ b/src/main/resources/Micronaut/testClientParams.mustache @@ -1,5 +1,4 @@ -{{#isMultipart}} @io.micronaut.http.annotation.Body - {{type.MultipartBody}} multipart{{/isMultipart}}{{^isMultipart}}{{#allParams}}{{^isPathParam}} @{{type.Nullable}} +{{#allParams}}{{^isFormParam}}{{^isPathParam}} @{{type.Nullable}} {{/isPathParam}}{{#isPathParam}} @{{type.Nonnull}} {{/isPathParam}}{{#isBodyParam}} @io.micronaut.http.annotation.Body {{/isBodyParam}}{{#isPathParam}} @io.micronaut.http.annotation.PathVariable(value = "{{baseName}}") @@ -7,4 +6,6 @@ {{/isQueryParam}}{{#isCookieParam}} @io.micronaut.http.annotation.CookieValue(value = "{{baseName}}") {{/isCookieParam}}{{#isHeaderParam}} @io.micronaut.http.annotation.Header(value = "{{baseName}}") {{/isHeaderParam}} {{{dataType}}} {{paramName}}{{^-last}}, -{{/-last}}{{/allParams}}{{/isMultipart}} \ No newline at end of file +{{/-last}}{{/isFormParam}}{{/allParams}}{{#isMultipart}}{{#vendorExtensions.hasOtherThanMultipart}}, +{{/vendorExtensions.hasOtherThanMultipart}} @io.micronaut.http.annotation.Body + {{type.MultipartBody}} multipart{{/isMultipart}} \ No newline at end of file diff --git a/src/test/resources/openapi/test-api.yaml b/src/test/resources/openapi/test-api.yaml index 19eedf57..e2ea5a3c 100644 --- a/src/test/resources/openapi/test-api.yaml +++ b/src/test/resources/openapi/test-api.yaml @@ -333,7 +333,13 @@ paths: application/json: schema: $ref: "#/components/schemas/Multipart" - /mediatype/consumes-multipart-without-fileupload: + /mediatype/consumes-multipart-without-fileupload/{test_path_parameter}: + parameters: + - name: test_path_parameter + in: path + required: true + schema: + type: string post: # see https://swagger.io/docs/specification/describing-request-body/file-upload/ operationId: mediatypeConsumesMultipartWithoutFileUpload