From ab9cdfbcffb68a7a7908f1da14e7759780a48845 Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Thu, 17 Aug 2023 11:47:01 +0200 Subject: [PATCH] Maintenance: reviewed api/client/testclient mustache --- README.md | 2 +- .../testapi/async/reactor/MediatypeApi.java | 16 +-- .../async/reactor/MediatypeApiClient.java | 14 +-- .../testapi/async/reactor/ParameterApi.java | 78 ++++++------- .../async/reactor/ParameterApiClient.java | 62 +++++------ .../testapi/async/reactor/RequestApi.java | 4 +- .../async/reactor/RequestApiClient.java | 2 +- .../testapi/async/reactor/ResponseApi.java | 32 +++--- .../async/reactor/ResponseApiClient.java | 30 ++--- .../testapi/async/reactor/ValidationApi.java | 44 ++++---- .../async/reactor/ValidationApiClient.java | 48 ++++---- .../testapi/async/simple/MediatypeApi.java | 16 +-- .../async/simple/MediatypeApiClient.java | 14 +-- .../testapi/async/simple/ParameterApi.java | 78 ++++++------- .../async/simple/ParameterApiClient.java | 62 +++++------ .../java/testapi/async/simple/RequestApi.java | 4 +- .../async/simple/RequestApiClient.java | 2 +- .../testapi/async/simple/ResponseApi.java | 32 +++--- .../async/simple/ResponseApiClient.java | 30 ++--- .../testapi/async/simple/ValidationApi.java | 44 ++++---- .../async/simple/ValidationApiClient.java | 48 ++++---- .../java/testapi/defaults/MediatypeApi.java | 16 +-- .../testapi/defaults/MediatypeApiClient.java | 14 +-- .../java/testapi/defaults/ParameterApi.java | 78 ++++++------- .../testapi/defaults/ParameterApiClient.java | 62 +++++------ .../java/testapi/defaults/RequestApi.java | 4 +- .../testapi/defaults/RequestApiClient.java | 2 +- .../java/testapi/defaults/ResponseApi.java | 32 +++--- .../testapi/defaults/ResponseApiClient.java | 30 ++--- .../java/testapi/defaults/ValidationApi.java | 44 ++++---- .../testapi/defaults/ValidationApiClient.java | 48 ++++---- .../testapi/modelsuffix/MediatypeApi.java | 16 +-- .../modelsuffix/MediatypeApiClient.java | 14 +-- .../testapi/modelsuffix/ParameterApi.java | 78 ++++++------- .../modelsuffix/ParameterApiClient.java | 62 +++++------ .../java/testapi/modelsuffix/RequestApi.java | 4 +- .../testapi/modelsuffix/RequestApiClient.java | 2 +- .../java/testapi/modelsuffix/ResponseApi.java | 32 +++--- .../modelsuffix/ResponseApiClient.java | 30 ++--- .../testapi/modelsuffix/ValidationApi.java | 44 ++++---- .../modelsuffix/ValidationApiClient.java | 48 ++++---- .../java/testapi/nogeneric/MediatypeApi.java | 16 +-- .../testapi/nogeneric/MediatypeApiClient.java | 14 +-- .../java/testapi/nogeneric/ParameterApi.java | 78 ++++++------- .../testapi/nogeneric/ParameterApiClient.java | 62 +++++------ .../java/testapi/nogeneric/RequestApi.java | 4 +- .../testapi/nogeneric/RequestApiClient.java | 2 +- .../java/testapi/nogeneric/ResponseApi.java | 32 +++--- .../testapi/nogeneric/ResponseApiClient.java | 30 ++--- .../java/testapi/nogeneric/ValidationApi.java | 44 ++++---- .../nogeneric/ValidationApiClient.java | 48 ++++---- .../java/testapi/nooptional/MediatypeApi.java | 16 +-- .../nooptional/MediatypeApiClient.java | 14 +-- .../java/testapi/nooptional/ParameterApi.java | 78 ++++++------- .../nooptional/ParameterApiClient.java | 62 +++++------ .../java/testapi/nooptional/RequestApi.java | 4 +- .../testapi/nooptional/RequestApiClient.java | 2 +- .../java/testapi/nooptional/ResponseApi.java | 32 +++--- .../testapi/nooptional/ResponseApiClient.java | 30 ++--- .../testapi/nooptional/ValidationApi.java | 44 ++++---- .../nooptional/ValidationApiClient.java | 48 ++++---- .../testapi/novalidation/MediatypeApi.java | 16 +-- .../novalidation/MediatypeApiClient.java | 14 +-- .../testapi/novalidation/ParameterApi.java | 78 ++++++------- .../novalidation/ParameterApiClient.java | 62 +++++------ .../java/testapi/novalidation/RequestApi.java | 4 +- .../novalidation/RequestApiClient.java | 2 +- .../testapi/novalidation/ResponseApi.java | 32 +++--- .../novalidation/ResponseApiClient.java | 30 ++--- .../testapi/novalidation/ValidationApi.java | 44 ++++---- .../novalidation/ValidationApiClient.java | 48 ++++---- .../testapi/packages/api/MediatypeApi.java | 16 +-- .../packages/api/MediatypeApiClient.java | 14 +-- .../testapi/packages/api/ParameterApi.java | 78 ++++++------- .../packages/api/ParameterApiClient.java | 62 +++++------ .../java/testapi/packages/api/RequestApi.java | 4 +- .../packages/api/RequestApiClient.java | 2 +- .../testapi/packages/api/ResponseApi.java | 32 +++--- .../packages/api/ResponseApiClient.java | 30 ++--- .../testapi/packages/api/ValidationApi.java | 44 ++++---- .../packages/api/ValidationApiClient.java | 48 ++++---- gen/main/java/testapi/types/MediatypeApi.java | 16 +-- .../testapi/types/MediatypeApiClient.java | 14 +-- gen/main/java/testapi/types/ParameterApi.java | 78 ++++++------- .../testapi/types/ParameterApiClient.java | 62 +++++------ gen/main/java/testapi/types/RequestApi.java | 4 +- .../java/testapi/types/RequestApiClient.java | 2 +- gen/main/java/testapi/types/ResponseApi.java | 32 +++--- .../java/testapi/types/ResponseApiClient.java | 30 ++--- .../java/testapi/types/ValidationApi.java | 44 ++++---- .../testapi/types/ValidationApiClient.java | 48 ++++---- .../InheritanceExtendedAllOf.java | 103 ------------------ .../InheritanceWithEnumType1AllOf.java | 102 ----------------- .../InheritanceWithEnumType2AllOf.java | 102 ----------------- .../InheritanceWithStringType1AllOf.java | 102 ----------------- .../InheritanceWithStringType2AllOf.java | 102 ----------------- .../InheritanceWithoutType1AllOf.java | 102 ----------------- .../InheritanceWithoutType2AllOf.java | 102 ----------------- .../auth/{ => client}/SecurityApiClient.java | 23 +--- .../auth/{ => server}/SecurityApi.java | 10 +- .../server}/SecurityApiClient.java | 23 +--- .../defaults/client/SecurityApiClient.java | 22 ++++ .../defaults/{ => server}/SecurityApi.java | 10 +- .../defaults/server/SecurityApiClient.java | 22 ++++ .../java/testsecurity/types/SecurityApi.java | 8 +- .../testsecurity/types/SecurityApiClient.java | 21 +--- .../{ => server}/SecurityApiTestClient.java | 13 +-- .../{ => server}/SecurityApiTestSpec.java | 2 +- .../{ => server}/SecurityApiTestClient.java | 13 +-- .../{ => server}/SecurityApiTestSpec.java | 2 +- .../types/SecurityApiTestClient.java | 11 +- src/it/test-security/pom.xml | 16 ++- .../resources/Micronaut/apiClient.mustache | 23 ++-- .../resources/Micronaut/apiServer.mustache | 8 +- .../resources/Micronaut/testClient.mustache | 16 +-- .../languages/MicronautCodegenTest.java | 27 ++++- 116 files changed, 1624 insertions(+), 2333 deletions(-) delete mode 100644 gen/main/java/testmodel/micronaut_java/InheritanceExtendedAllOf.java delete mode 100644 gen/main/java/testmodel/micronaut_java/InheritanceWithEnumType1AllOf.java delete mode 100644 gen/main/java/testmodel/micronaut_java/InheritanceWithEnumType2AllOf.java delete mode 100644 gen/main/java/testmodel/micronaut_java/InheritanceWithStringType1AllOf.java delete mode 100644 gen/main/java/testmodel/micronaut_java/InheritanceWithStringType2AllOf.java delete mode 100644 gen/main/java/testmodel/micronaut_java/InheritanceWithoutType1AllOf.java delete mode 100644 gen/main/java/testmodel/micronaut_java/InheritanceWithoutType2AllOf.java rename gen/main/java/testsecurity/auth/{ => client}/SecurityApiClient.java (59%) rename gen/main/java/testsecurity/auth/{ => server}/SecurityApi.java (78%) rename gen/main/java/testsecurity/{defaults => auth/server}/SecurityApiClient.java (59%) create mode 100644 gen/main/java/testsecurity/defaults/client/SecurityApiClient.java rename gen/main/java/testsecurity/defaults/{ => server}/SecurityApi.java (75%) create mode 100644 gen/main/java/testsecurity/defaults/server/SecurityApiClient.java rename gen/test/java/testsecurity/auth/{ => server}/SecurityApiTestClient.java (68%) rename gen/test/java/testsecurity/auth/{ => server}/SecurityApiTestSpec.java (94%) rename gen/test/java/testsecurity/defaults/{ => server}/SecurityApiTestClient.java (68%) rename gen/test/java/testsecurity/defaults/{ => server}/SecurityApiTestSpec.java (93%) diff --git a/README.md b/README.md index 25f90acf..a795cbed 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ Include in your `pom.xml`: * supportAsync: use reactivex return types, see [Reactive HTTP Request Processing](https://docs.micronaut.io/latest/guide/index.html#reactiveServer) * pagable: generate provider for pagable (default `false`) * generateExamples: generate example objects for the model, based on example and default values (default `false`) -* generateAuthentication: generate Àuthentication into controller interfaces if responsecode 401 is present (default `false`) +* generateAuthentication: generate Àuthentication into controller interfaces if response code 401 is present (default `false`) For examples see [integration tests](src/it). diff --git a/gen/main/java/testapi/async/reactor/MediatypeApi.java b/gen/main/java/testapi/async/reactor/MediatypeApi.java index 93bf02ac..0dc285bf 100644 --- a/gen/main/java/testapi/async/reactor/MediatypeApi.java +++ b/gen/main/java/testapi/async/reactor/MediatypeApi.java @@ -12,7 +12,7 @@ public interface MediatypeApi { java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; java.lang.String PATH_MEDIATYPE_PRODUCES_SAME_MODEL = "/mediatype/produces-with-same-model"; - @io.micronaut.http.annotation.Post("/mediatype/consumes-and-produces") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_AND_PRODUCES) @io.micronaut.http.annotation.Consumes({ "application/octet-stream" }) @io.micronaut.http.annotation.Produces({ "application/xml" }) reactor.core.publisher.Mono> mediatypeConsumesAndProduces( @@ -20,7 +20,7 @@ reactor.core.publisher.Mono> mediaty @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-with-fileupload") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD) @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> mediatypeConsumesMultipartWithFileUpload( @@ -34,7 +34,7 @@ reactor.core.publisher.Mono> mediatype @io.micronaut.http.annotation.Part(value = "file") io.micronaut.http.multipart.StreamingFileUpload file); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD) @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> mediatypeConsumesMultipartWithoutFileUpload( @@ -45,7 +45,7 @@ reactor.core.publisher.Mono> mediatype @io.micronaut.http.annotation.Part(value = "userId") java.lang.Integer userId); - @io.micronaut.http.annotation.Post("/mediatype/consumes-octet-stream") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_OCTET_STREAM) @io.micronaut.http.annotation.Consumes({ "application/octet-stream" }) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> mediatypeConsumesOctetStream( @@ -53,7 +53,7 @@ reactor.core.publisher.Mono> mediaty @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-plain") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_PLAIN) @io.micronaut.http.annotation.Consumes({ "text/plain" }) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> mediatypeConsumesPlain( @@ -61,7 +61,7 @@ reactor.core.publisher.Mono> mediaty @io.micronaut.http.annotation.Body java.lang.String body); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-different-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL) @io.micronaut.http.annotation.Produces({ "application/json", "text/plain" }) reactor.core.publisher.Mono> mediatypeProducesDifferentModel( @io.micronaut.core.annotation.NonNull @@ -71,10 +71,10 @@ reactor.core.publisher.Mono> mediatypePro @io.micronaut.http.annotation.QueryValue(value = "plain") java.lang.Boolean plain); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-same-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_SAME_MODEL) @io.micronaut.http.annotation.Produces({ "application/json", "application/xml" }) reactor.core.publisher.Mono> mediatypeProducesSameModel( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "value") java.lang.String value); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/async/reactor/MediatypeApiClient.java b/gen/main/java/testapi/async/reactor/MediatypeApiClient.java index ec9bc34f..e45762dc 100644 --- a/gen/main/java/testapi/async/reactor/MediatypeApiClient.java +++ b/gen/main/java/testapi/async/reactor/MediatypeApiClient.java @@ -12,7 +12,7 @@ public interface MediatypeApiClient { java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; java.lang.String PATH_MEDIATYPE_PRODUCES_SAME_MODEL = "/mediatype/produces-with-same-model"; - @io.micronaut.http.annotation.Post("/mediatype/consumes-and-produces") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_AND_PRODUCES) @io.micronaut.http.annotation.Produces({ "application/octet-stream" }) @io.micronaut.http.annotation.Consumes({ "application/xml" }) reactor.core.publisher.Mono> mediatypeConsumesAndProduces( @@ -20,7 +20,7 @@ reactor.core.publisher.Mono> mediaty @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-with-fileupload") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD) @io.micronaut.http.annotation.Produces({ "multipart/form-data" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> mediatypeConsumesMultipartWithFileUpload( @@ -28,7 +28,7 @@ reactor.core.publisher.Mono> mediatype @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(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD) @io.micronaut.http.annotation.Produces({ "multipart/form-data" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> mediatypeConsumesMultipartWithoutFileUpload( @@ -36,7 +36,7 @@ reactor.core.publisher.Mono> mediatype @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); - @io.micronaut.http.annotation.Post("/mediatype/consumes-octet-stream") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_OCTET_STREAM) @io.micronaut.http.annotation.Produces({ "application/octet-stream" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> mediatypeConsumesOctetStream( @@ -44,7 +44,7 @@ reactor.core.publisher.Mono> mediaty @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-plain") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_PLAIN) @io.micronaut.http.annotation.Produces({ "text/plain" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> mediatypeConsumesPlain( @@ -52,7 +52,7 @@ reactor.core.publisher.Mono> mediaty @io.micronaut.http.annotation.Body java.lang.String body); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-different-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL) @io.micronaut.http.annotation.Consumes({ "application/json", "text/plain" }) reactor.core.publisher.Mono> mediatypeProducesDifferentModel( @io.micronaut.core.annotation.NonNull @@ -62,7 +62,7 @@ reactor.core.publisher.Mono> mediatypePro @io.micronaut.http.annotation.QueryValue(value = "plain") java.lang.Boolean plain); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-same-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_SAME_MODEL) @io.micronaut.http.annotation.Consumes({ "application/json", "application/xml" }) reactor.core.publisher.Mono> mediatypeProducesSameModel( @io.micronaut.core.annotation.NonNull diff --git a/gen/main/java/testapi/async/reactor/ParameterApi.java b/gen/main/java/testapi/async/reactor/ParameterApi.java index 0bc3ef64..3105f8f7 100644 --- a/gen/main/java/testapi/async/reactor/ParameterApi.java +++ b/gen/main/java/testapi/async/reactor/ParameterApi.java @@ -15,16 +15,16 @@ public interface ParameterApi { java.lang.String PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT = "/param/header/optionalWithoutDefault"; java.lang.String PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT = "/param/header/requiredWithDefault"; java.lang.String PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT = "/param/header/requiredWithoutDefault"; - java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_STRING = "/param/path/overlay/{string}"; - java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_UUID = "/param/path/overlay/{uuid}"; + java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_STRING = "/param/path/overlay/{string:10}"; + java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_UUID = "/param/path/overlay/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}"; java.lang.String PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT = "/param/path/requiredWithDefault/{string}"; java.lang.String PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT = "/param/path/requiredWithoutDefault/{string}"; - java.lang.String PATH_PARAM_PATH_WITH_BOOLEAN = "/param/path/with-bool/{bool}"; - java.lang.String PATH_PARAM_PATH_WITH_INTEGER = "/param/path/with-integer/{integer}"; - java.lang.String PATH_PARAM_PATH_WITH_LONG = "/param/path/with-long/{long}"; - java.lang.String PATH_PARAM_PATH_WITH_MAX_LENGTH = "/param/path/with-max-length/{string}"; - java.lang.String PATH_PARAM_PATH_WITH_PATTERN = "/param/path/with-pattern/{string}"; - java.lang.String PATH_PARAM_PATH_WITH_UUID = "/param/path/with-uuid/{uuid}"; + java.lang.String PATH_PARAM_PATH_WITH_BOOLEAN = "/param/path/with-bool/{bool:true|false}"; + java.lang.String PATH_PARAM_PATH_WITH_INTEGER = "/param/path/with-integer/{integer:\\-?[0-9]+}"; + java.lang.String PATH_PARAM_PATH_WITH_LONG = "/param/path/with-long/{long:\\-?[0-9]+}"; + java.lang.String PATH_PARAM_PATH_WITH_MAX_LENGTH = "/param/path/with-max-length/{string:5}"; + java.lang.String PATH_PARAM_PATH_WITH_PATTERN = "/param/path/with-pattern/{string:[0-9][a-z]}"; + java.lang.String PATH_PARAM_PATH_WITH_UUID = "/param/path/with-uuid/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}"; java.lang.String PATH_PARAM_QUERY_DATE = "/param/query/date"; java.lang.String PATH_PARAM_QUERY_DATE_TIME = "/param/query/date-time"; java.lang.String PATH_PARAM_QUERY_MULTIPLE_LISTS = "/param/query/multiple-lists"; @@ -35,7 +35,7 @@ public interface ParameterApi { java.lang.String PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT = "/param/query/requiredWithoutDefault"; java.lang.String PATH_PARAM_QUERY_UUID = "/param/query/uuid"; - @io.micronaut.http.annotation.Get("/param/all/{path}") + @io.micronaut.http.annotation.Get(PATH_PARAM_ALL) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramAll( @io.micronaut.core.annotation.NonNull @@ -51,7 +51,7 @@ reactor.core.publisher.Mono> para @io.micronaut.http.annotation.Header(value = "integer") java.util.Optional integer); - @io.micronaut.http.annotation.Post("/param/body/optional") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_OPTIONAL) @io.micronaut.http.annotation.Consumes({ "application/json" }) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramBodyOptional( @@ -60,7 +60,7 @@ reactor.core.publisher.Mono> para @javax.validation.Valid java.util.Optional parameterModel); - @io.micronaut.http.annotation.Post("/param/body/required") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_REQUIRED) @io.micronaut.http.annotation.Consumes({ "application/json" }) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramBodyRequired( @@ -69,63 +69,63 @@ reactor.core.publisher.Mono> para @javax.validation.Valid ParameterModel parameterModel); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramCookieOptionalWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.CookieValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramCookieOptionalWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.CookieValue(value = "string") java.util.Optional string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramCookieRequiredWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.CookieValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramCookieRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramHeaderOptionalWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Header(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramHeaderOptionalWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Header(value = "string") java.util.Optional string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramHeaderRequiredWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Header(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramHeaderRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{string:10}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_STRING) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramPathOverlayWithString( @io.micronaut.core.annotation.NonNull @@ -133,49 +133,49 @@ reactor.core.publisher.Mono> para @javax.validation.constraints.Size(max = 10) java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_UUID) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramPathOverlayWithUuid( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/path/requiredWithDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramPathRequiredWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/requiredWithoutDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramPathRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-bool/{bool:true|false}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_BOOLEAN) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramPathWithBoolean( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "bool") java.lang.Boolean bool); - @io.micronaut.http.annotation.Get("/param/path/with-integer/{integer:\\-?[0-9]+}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_INTEGER) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramPathWithInteger( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/param/path/with-long/{long:\\-?[0-9]+}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_LONG) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramPathWithLong( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "long") java.lang.Long _long); - @io.micronaut.http.annotation.Get("/param/path/with-max-length/{string:5}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_MAX_LENGTH) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramPathWithMaxLength( @io.micronaut.core.annotation.NonNull @@ -183,7 +183,7 @@ reactor.core.publisher.Mono> para @javax.validation.constraints.Size(max = 5) java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-pattern/{string:[0-9][a-z]}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_PATTERN) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramPathWithPattern( @io.micronaut.core.annotation.NonNull @@ -191,28 +191,28 @@ reactor.core.publisher.Mono> para @javax.validation.constraints.Pattern(regexp = "[0-9][a-z]") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-uuid/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_UUID) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramPathWithUuid( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/query/date") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramQueryDate( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "date") java.util.Optional date); - @io.micronaut.http.annotation.Get("/param/query/date-time") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE_TIME) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramQueryDateTime( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "date") java.util.Optional date); - @io.micronaut.http.annotation.Get("/param/query/multiple-lists") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_MULTIPLE_LISTS) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramQueryMultipleLists( @io.micronaut.core.annotation.NonNull @@ -225,45 +225,45 @@ reactor.core.publisher.Mono> para @io.micronaut.http.annotation.QueryValue java.util.Optional> c); - @io.micronaut.http.annotation.Get("/param/query/number") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_NUMBER) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramQueryNumber( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "date") java.util.Optional date); - @io.micronaut.http.annotation.Get("/param/query/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramQueryOptionalWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramQueryOptionalWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.util.Optional string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramQueryRequiredWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramQueryRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/uuid") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_UUID) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramQueryUuid( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "date") java.util.Optional date); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/async/reactor/ParameterApiClient.java b/gen/main/java/testapi/async/reactor/ParameterApiClient.java index 00fc10d4..fd694912 100644 --- a/gen/main/java/testapi/async/reactor/ParameterApiClient.java +++ b/gen/main/java/testapi/async/reactor/ParameterApiClient.java @@ -27,7 +27,7 @@ public interface ParameterApiClient { java.lang.String PATH_PARAM_PATH_WITH_UUID = "/param/path/with-uuid/{uuid}"; java.lang.String PATH_PARAM_QUERY_DATE = "/param/query/date"; java.lang.String PATH_PARAM_QUERY_DATE_TIME = "/param/query/date-time"; - java.lang.String PATH_PARAM_QUERY_MULTIPLE_LISTS = "/param/query/multiple-lists"; + java.lang.String PATH_PARAM_QUERY_MULTIPLE_LISTS = "/param/query/multiple-lists?{&a*}{&b*}{&c*}"; java.lang.String PATH_PARAM_QUERY_NUMBER = "/param/query/number"; java.lang.String PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT = "/param/query/optionalWithDefault"; java.lang.String PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT = "/param/query/optionalWithoutDefault"; @@ -35,7 +35,7 @@ public interface ParameterApiClient { java.lang.String PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT = "/param/query/requiredWithoutDefault"; java.lang.String PATH_PARAM_QUERY_UUID = "/param/query/uuid"; - @io.micronaut.http.annotation.Get("/param/all/{path}") + @io.micronaut.http.annotation.Get(PATH_PARAM_ALL) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> paramAll( @io.micronaut.core.annotation.NonNull @@ -51,7 +51,7 @@ reactor.core.publisher.Mono> para @io.micronaut.http.annotation.Header(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Post("/param/body/optional") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_OPTIONAL) @io.micronaut.http.annotation.Produces({ "application/json" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> paramBodyOptional( @@ -59,7 +59,7 @@ reactor.core.publisher.Mono> para @io.micronaut.http.annotation.Body ParameterModel parameterModel); - @io.micronaut.http.annotation.Post("/param/body/required") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_REQUIRED) @io.micronaut.http.annotation.Produces({ "application/json" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> paramBodyRequired( @@ -67,147 +67,147 @@ reactor.core.publisher.Mono> para @io.micronaut.http.annotation.Body ParameterModel parameterModel); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> paramCookieOptionalWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> paramCookieOptionalWithoutDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> paramCookieRequiredWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> paramCookieRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> paramHeaderOptionalWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> paramHeaderOptionalWithoutDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> paramHeaderRequiredWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> paramHeaderRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_STRING) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> paramPathOverlayWithString( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{uuid}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_UUID) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> paramPathOverlayWithUuid( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/path/requiredWithDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> paramPathRequiredWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/requiredWithoutDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> paramPathRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-bool/{bool}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_BOOLEAN) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> paramPathWithBoolean( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "bool") java.lang.Boolean bool); - @io.micronaut.http.annotation.Get("/param/path/with-integer/{integer}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_INTEGER) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> paramPathWithInteger( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/param/path/with-long/{long}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_LONG) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> paramPathWithLong( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "long") java.lang.Long _long); - @io.micronaut.http.annotation.Get("/param/path/with-max-length/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_MAX_LENGTH) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> paramPathWithMaxLength( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-pattern/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_PATTERN) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> paramPathWithPattern( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-uuid/{uuid}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_UUID) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> paramPathWithUuid( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/query/date") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> paramQueryDate( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "date") java.time.LocalDate date); - @io.micronaut.http.annotation.Get("/param/query/date-time") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE_TIME) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> paramQueryDateTime( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "date") java.time.Instant date); - @io.micronaut.http.annotation.Get("/param/query/multiple-lists?{&a*}{&b*}{&c*}") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_MULTIPLE_LISTS) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> paramQueryMultipleLists( @io.micronaut.core.annotation.Nullable @@ -220,42 +220,42 @@ reactor.core.publisher.Mono> para @io.micronaut.http.annotation.QueryValue(value = "c") java.util.List c); - @io.micronaut.http.annotation.Get("/param/query/number") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_NUMBER) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> paramQueryNumber( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "date") java.lang.Double date); - @io.micronaut.http.annotation.Get("/param/query/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> paramQueryOptionalWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> paramQueryOptionalWithoutDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> paramQueryRequiredWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> paramQueryRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/uuid") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_UUID) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> paramQueryUuid( @io.micronaut.core.annotation.Nullable diff --git a/gen/main/java/testapi/async/reactor/RequestApi.java b/gen/main/java/testapi/async/reactor/RequestApi.java index 15bc8723..136699e8 100644 --- a/gen/main/java/testapi/async/reactor/RequestApi.java +++ b/gen/main/java/testapi/async/reactor/RequestApi.java @@ -6,6 +6,6 @@ public interface RequestApi { java.lang.String PATH_NO_OPERATION_ID_GET = "/no-operation-id"; - @io.micronaut.http.annotation.Get("/no-operation-id") + @io.micronaut.http.annotation.Get(PATH_NO_OPERATION_ID_GET) reactor.core.publisher.Mono> noOperationIdGet(); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/async/reactor/RequestApiClient.java b/gen/main/java/testapi/async/reactor/RequestApiClient.java index 425ebbca..437cae3f 100644 --- a/gen/main/java/testapi/async/reactor/RequestApiClient.java +++ b/gen/main/java/testapi/async/reactor/RequestApiClient.java @@ -6,6 +6,6 @@ public interface RequestApiClient { java.lang.String PATH_NO_OPERATION_ID_GET = "/no-operation-id"; - @io.micronaut.http.annotation.Get("/no-operation-id") + @io.micronaut.http.annotation.Get(PATH_NO_OPERATION_ID_GET) reactor.core.publisher.Mono> noOperationIdGet(); } diff --git a/gen/main/java/testapi/async/reactor/ResponseApi.java b/gen/main/java/testapi/async/reactor/ResponseApi.java index 62ebd88f..6a0bad15 100644 --- a/gen/main/java/testapi/async/reactor/ResponseApi.java +++ b/gen/main/java/testapi/async/reactor/ResponseApi.java @@ -20,43 +20,43 @@ public interface ResponseApi { java.lang.String PATH_VOID_NOT_FOUND = "/response/void-not-found"; java.lang.String PATH_WITH_DEFAULT = "/response/default"; - @io.micronaut.http.annotation.Get("/response/array-complex") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono>> arrayComplex(); - @io.micronaut.http.annotation.Get("/response/array-complex-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX_NOT_FOUND) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono>> arrayComplexNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/array-simple") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono>> arraySimple(); - @io.micronaut.http.annotation.Get("/response/array-simple-empty") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_EMPTY) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono>> arraySimpleEmpty(); - @io.micronaut.http.annotation.Get("/response/array-simple-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_NOT_FOUND) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono>> arraySimpleNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/header") + @io.micronaut.http.annotation.Get(PATH_HEADER) reactor.core.publisher.Mono> header(); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> multipleDataTypes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES_NOT_FOUND) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> multipleDataTypesNotFound( @io.micronaut.core.annotation.NonNull @@ -66,14 +66,14 @@ reactor.core.publisher.Mono> multipleData @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> multipleResponseCodes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> multipleResponseCodesNotFound( @io.micronaut.core.annotation.NonNull @@ -83,26 +83,26 @@ reactor.core.publisher.Mono> multipl @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/optional") + @io.micronaut.http.annotation.Get(PATH_OPTIONAL) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> optional( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/single") + @io.micronaut.http.annotation.Get(PATH_SINGLE) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> single(); - @io.micronaut.http.annotation.Get("/response/void") + @io.micronaut.http.annotation.Get(PATH_VOID_FOUND) reactor.core.publisher.Mono> voidFound(); - @io.micronaut.http.annotation.Get("/response/void-not-found") + @io.micronaut.http.annotation.Get(PATH_VOID_NOT_FOUND) reactor.core.publisher.Mono> voidNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/default") + @io.micronaut.http.annotation.Get(PATH_WITH_DEFAULT) reactor.core.publisher.Mono> withDefault(); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/async/reactor/ResponseApiClient.java b/gen/main/java/testapi/async/reactor/ResponseApiClient.java index f19e053e..7ee94f6b 100644 --- a/gen/main/java/testapi/async/reactor/ResponseApiClient.java +++ b/gen/main/java/testapi/async/reactor/ResponseApiClient.java @@ -20,43 +20,43 @@ public interface ResponseApiClient { java.lang.String PATH_VOID_NOT_FOUND = "/response/void-not-found"; java.lang.String PATH_WITH_DEFAULT = "/response/default"; - @io.micronaut.http.annotation.Get("/response/array-complex") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono>> arrayComplex(); - @io.micronaut.http.annotation.Get("/response/array-complex-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX_NOT_FOUND) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono>> arrayComplexNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/array-simple") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono>> arraySimple(); - @io.micronaut.http.annotation.Get("/response/array-simple-empty") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_EMPTY) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono>> arraySimpleEmpty(); - @io.micronaut.http.annotation.Get("/response/array-simple-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_NOT_FOUND) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono>> arraySimpleNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/header") + @io.micronaut.http.annotation.Get(PATH_HEADER) reactor.core.publisher.Mono> header(); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> multipleDataTypes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES_NOT_FOUND) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> multipleDataTypesNotFound( @io.micronaut.core.annotation.NonNull @@ -66,14 +66,14 @@ reactor.core.publisher.Mono> multipleData @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> multipleResponseCodes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> multipleResponseCodesNotFound( @io.micronaut.core.annotation.NonNull @@ -83,26 +83,26 @@ reactor.core.publisher.Mono> multipl @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/optional") + @io.micronaut.http.annotation.Get(PATH_OPTIONAL) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> optional( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/single") + @io.micronaut.http.annotation.Get(PATH_SINGLE) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> single(); - @io.micronaut.http.annotation.Get("/response/void") + @io.micronaut.http.annotation.Get(PATH_VOID_FOUND) reactor.core.publisher.Mono> voidFound(); - @io.micronaut.http.annotation.Get("/response/void-not-found") + @io.micronaut.http.annotation.Get(PATH_VOID_NOT_FOUND) reactor.core.publisher.Mono> voidNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/default") + @io.micronaut.http.annotation.Get(PATH_WITH_DEFAULT) reactor.core.publisher.Mono> withDefault(); } diff --git a/gen/main/java/testapi/async/reactor/ValidationApi.java b/gen/main/java/testapi/async/reactor/ValidationApi.java index f27a7309..0a55b740 100644 --- a/gen/main/java/testapi/async/reactor/ValidationApi.java +++ b/gen/main/java/testapi/async/reactor/ValidationApi.java @@ -26,21 +26,21 @@ public interface ValidationApi { java.lang.String PATH_VALIDATION_STRING_PATTERN = "/validation/string/pattern"; java.lang.String PATH_VALIDATION_STRING_RANGE = "/validation/string/range"; - @io.micronaut.http.annotation.Get("/validation/double/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MAX) reactor.core.publisher.Mono> validationDoubleMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @javax.validation.constraints.DecimalMax(value = "4", inclusive = false) java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/double/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MIN) reactor.core.publisher.Mono> validationDoubleMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @javax.validation.constraints.DecimalMin(value = "3", inclusive = false) java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/double/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_RANGE) reactor.core.publisher.Mono> validationDoubleRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @@ -48,21 +48,21 @@ reactor.core.publisher.Mono> validationDo @javax.validation.constraints.DecimalMax(value = "4", inclusive = true) java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/float/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MAX) reactor.core.publisher.Mono> validationFloatMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @javax.validation.constraints.DecimalMax(value = "4", inclusive = false) java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MIN) reactor.core.publisher.Mono> validationFloatMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @javax.validation.constraints.DecimalMin(value = "3", inclusive = false) java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_RANGE) reactor.core.publisher.Mono> validationFloatRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @@ -70,21 +70,21 @@ reactor.core.publisher.Mono> validationFl @javax.validation.constraints.DecimalMax(value = "4", inclusive = true) java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/integer/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MAX) reactor.core.publisher.Mono> validationIntegerMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @javax.validation.constraints.Max(4) java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MIN) reactor.core.publisher.Mono> validationIntegerMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @javax.validation.constraints.Min(3) java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_RANGE) reactor.core.publisher.Mono> validationIntegerRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @@ -92,21 +92,21 @@ reactor.core.publisher.Mono> validationIn @javax.validation.constraints.Max(4) java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/list/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MAX) reactor.core.publisher.Mono> validationListMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @javax.validation.constraints.Size(max = 4) java.util.List list); - @io.micronaut.http.annotation.Get("/validation/list/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MIN) reactor.core.publisher.Mono> validationListMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @javax.validation.constraints.Size(min = 3) java.util.List list); - @io.micronaut.http.annotation.Post("/validation/list/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_MODEL) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> validationListModel( @io.micronaut.core.annotation.NonNull @@ -114,28 +114,28 @@ reactor.core.publisher.Mono> validationLi @javax.validation.Valid java.util.List stringModel); - @io.micronaut.http.annotation.Post("/validation/list/range") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_RANGE) reactor.core.publisher.Mono> validationListRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @javax.validation.constraints.Size(min = 3, max = 4) java.util.List list); - @io.micronaut.http.annotation.Get("/validation/long/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MAX) reactor.core.publisher.Mono> validationLongMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @javax.validation.constraints.Max(4) java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MIN) reactor.core.publisher.Mono> validationLongMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @javax.validation.constraints.Min(3) java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_RANGE) reactor.core.publisher.Mono> validationLongRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @@ -143,7 +143,7 @@ reactor.core.publisher.Mono> validationLo @javax.validation.constraints.Max(4) java.lang.Long integer); - @io.micronaut.http.annotation.Post("/validation/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_MODEL) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> validationModel( @io.micronaut.core.annotation.NonNull @@ -151,31 +151,31 @@ reactor.core.publisher.Mono> validationMo @javax.validation.Valid StringModel stringModel); - @io.micronaut.http.annotation.Get("/validation/string/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MAX) reactor.core.publisher.Mono> validationStringMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @javax.validation.constraints.Size(max = 4) java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MIN) reactor.core.publisher.Mono> validationStringMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @javax.validation.constraints.Size(min = 3) java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/pattern") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_PATTERN) reactor.core.publisher.Mono> validationStringPattern( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @javax.validation.constraints.Pattern(regexp = "[a-z]{3,5}") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_RANGE) reactor.core.publisher.Mono> validationStringRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @javax.validation.constraints.Size(min = 3, max = 4) java.lang.String string); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/async/reactor/ValidationApiClient.java b/gen/main/java/testapi/async/reactor/ValidationApiClient.java index 8572a5f1..00a2f8b3 100644 --- a/gen/main/java/testapi/async/reactor/ValidationApiClient.java +++ b/gen/main/java/testapi/async/reactor/ValidationApiClient.java @@ -13,10 +13,10 @@ public interface ValidationApiClient { java.lang.String PATH_VALIDATION_INTEGER_MAX = "/validation/integer/max"; java.lang.String PATH_VALIDATION_INTEGER_MIN = "/validation/integer/min"; java.lang.String PATH_VALIDATION_INTEGER_RANGE = "/validation/integer/range"; - java.lang.String PATH_VALIDATION_LIST_MAX = "/validation/list/max"; - java.lang.String PATH_VALIDATION_LIST_MIN = "/validation/list/min"; + java.lang.String PATH_VALIDATION_LIST_MAX = "/validation/list/max?{&list*}"; + java.lang.String PATH_VALIDATION_LIST_MIN = "/validation/list/min?{&list*}"; java.lang.String PATH_VALIDATION_LIST_MODEL = "/validation/list/model"; - java.lang.String PATH_VALIDATION_LIST_RANGE = "/validation/list/range"; + java.lang.String PATH_VALIDATION_LIST_RANGE = "/validation/list/range?{&list*}"; java.lang.String PATH_VALIDATION_LONG_MAX = "/validation/long/max"; java.lang.String PATH_VALIDATION_LONG_MIN = "/validation/long/min"; java.lang.String PATH_VALIDATION_LONG_RANGE = "/validation/long/range"; @@ -26,129 +26,129 @@ public interface ValidationApiClient { java.lang.String PATH_VALIDATION_STRING_PATTERN = "/validation/string/pattern"; java.lang.String PATH_VALIDATION_STRING_RANGE = "/validation/string/range"; - @io.micronaut.http.annotation.Get("/validation/double/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MAX) reactor.core.publisher.Mono> validationDoubleMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/double/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MIN) reactor.core.publisher.Mono> validationDoubleMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/double/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_RANGE) reactor.core.publisher.Mono> validationDoubleRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/float/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MAX) reactor.core.publisher.Mono> validationFloatMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MIN) reactor.core.publisher.Mono> validationFloatMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_RANGE) reactor.core.publisher.Mono> validationFloatRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/integer/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MAX) reactor.core.publisher.Mono> validationIntegerMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MIN) reactor.core.publisher.Mono> validationIntegerMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_RANGE) reactor.core.publisher.Mono> validationIntegerRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/list/max?{&list*}") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MAX) reactor.core.publisher.Mono> validationListMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "list") java.util.List list); - @io.micronaut.http.annotation.Get("/validation/list/min?{&list*}") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MIN) reactor.core.publisher.Mono> validationListMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "list") java.util.List list); - @io.micronaut.http.annotation.Post("/validation/list/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_MODEL) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> validationListModel( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Body java.util.List stringModel); - @io.micronaut.http.annotation.Post("/validation/list/range?{&list*}") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_RANGE) reactor.core.publisher.Mono> validationListRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "list") java.util.List list); - @io.micronaut.http.annotation.Get("/validation/long/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MAX) reactor.core.publisher.Mono> validationLongMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MIN) reactor.core.publisher.Mono> validationLongMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_RANGE) reactor.core.publisher.Mono> validationLongRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Long integer); - @io.micronaut.http.annotation.Post("/validation/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_MODEL) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> validationModel( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Body StringModel stringModel); - @io.micronaut.http.annotation.Get("/validation/string/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MAX) reactor.core.publisher.Mono> validationStringMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MIN) reactor.core.publisher.Mono> validationStringMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/pattern") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_PATTERN) reactor.core.publisher.Mono> validationStringPattern( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_RANGE) reactor.core.publisher.Mono> validationStringRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") diff --git a/gen/main/java/testapi/async/simple/MediatypeApi.java b/gen/main/java/testapi/async/simple/MediatypeApi.java index 3de91cee..4b956811 100644 --- a/gen/main/java/testapi/async/simple/MediatypeApi.java +++ b/gen/main/java/testapi/async/simple/MediatypeApi.java @@ -12,7 +12,7 @@ public interface MediatypeApi { java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; java.lang.String PATH_MEDIATYPE_PRODUCES_SAME_MODEL = "/mediatype/produces-with-same-model"; - @io.micronaut.http.annotation.Post("/mediatype/consumes-and-produces") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_AND_PRODUCES) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/octet-stream" }) @io.micronaut.http.annotation.Produces({ "application/xml" }) @@ -21,7 +21,7 @@ reactor.core.publisher.Mono mediatypeConsumesAndProduces( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-with-fileupload") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) @@ -36,7 +36,7 @@ reactor.core.publisher.Mono mediatypeConsumesMultipartWithFileUpload( @io.micronaut.http.annotation.Part(value = "file") io.micronaut.http.multipart.StreamingFileUpload file); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) @@ -48,7 +48,7 @@ reactor.core.publisher.Mono mediatypeConsumesMultipartWithoutFileUplo @io.micronaut.http.annotation.Part(value = "userId") java.lang.Integer userId); - @io.micronaut.http.annotation.Post("/mediatype/consumes-octet-stream") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_OCTET_STREAM) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/octet-stream" }) @io.micronaut.http.annotation.Produces({ "application/json" }) @@ -57,7 +57,7 @@ reactor.core.publisher.Mono mediatypeConsumesOctetStream( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-plain") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_PLAIN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "text/plain" }) @io.micronaut.http.annotation.Produces({ "application/json" }) @@ -66,7 +66,7 @@ reactor.core.publisher.Mono mediatypeConsumesPlain( @io.micronaut.http.annotation.Body java.lang.String body); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-different-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL) @io.micronaut.http.annotation.Produces({ "application/json", "text/plain" }) reactor.core.publisher.Mono> mediatypeProducesDifferentModel( @io.micronaut.core.annotation.NonNull @@ -76,11 +76,11 @@ reactor.core.publisher.Mono> mediatypePro @io.micronaut.http.annotation.QueryValue(value = "plain") java.lang.Boolean plain); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-same-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_SAME_MODEL) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json", "application/xml" }) reactor.core.publisher.Mono mediatypeProducesSameModel( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "value") java.lang.String value); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/async/simple/MediatypeApiClient.java b/gen/main/java/testapi/async/simple/MediatypeApiClient.java index bb081df1..75efd86b 100644 --- a/gen/main/java/testapi/async/simple/MediatypeApiClient.java +++ b/gen/main/java/testapi/async/simple/MediatypeApiClient.java @@ -12,7 +12,7 @@ public interface MediatypeApiClient { java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; java.lang.String PATH_MEDIATYPE_PRODUCES_SAME_MODEL = "/mediatype/produces-with-same-model"; - @io.micronaut.http.annotation.Post("/mediatype/consumes-and-produces") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_AND_PRODUCES) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/octet-stream" }) @io.micronaut.http.annotation.Consumes({ "application/xml" }) @@ -21,7 +21,7 @@ reactor.core.publisher.Mono mediatypeConsumesAndProduces( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-with-fileupload") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD) @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" }) @@ -30,7 +30,7 @@ reactor.core.publisher.Mono mediatypeConsumesMultipartWithFileUpload( @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(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD) @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" }) @@ -39,7 +39,7 @@ reactor.core.publisher.Mono mediatypeConsumesMultipartWithoutFileUplo @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); - @io.micronaut.http.annotation.Post("/mediatype/consumes-octet-stream") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_OCTET_STREAM) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/octet-stream" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) @@ -48,7 +48,7 @@ reactor.core.publisher.Mono mediatypeConsumesOctetStream( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-plain") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_PLAIN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "text/plain" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) @@ -57,7 +57,7 @@ reactor.core.publisher.Mono mediatypeConsumesPlain( @io.micronaut.http.annotation.Body java.lang.String body); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-different-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL) @io.micronaut.http.annotation.Consumes({ "application/json", "text/plain" }) reactor.core.publisher.Mono> mediatypeProducesDifferentModel( @io.micronaut.core.annotation.NonNull @@ -67,7 +67,7 @@ reactor.core.publisher.Mono> mediatypePro @io.micronaut.http.annotation.QueryValue(value = "plain") java.lang.Boolean plain); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-same-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_SAME_MODEL) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json", "application/xml" }) reactor.core.publisher.Mono mediatypeProducesSameModel( diff --git a/gen/main/java/testapi/async/simple/ParameterApi.java b/gen/main/java/testapi/async/simple/ParameterApi.java index 91288ef8..74919439 100644 --- a/gen/main/java/testapi/async/simple/ParameterApi.java +++ b/gen/main/java/testapi/async/simple/ParameterApi.java @@ -15,16 +15,16 @@ public interface ParameterApi { java.lang.String PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT = "/param/header/optionalWithoutDefault"; java.lang.String PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT = "/param/header/requiredWithDefault"; java.lang.String PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT = "/param/header/requiredWithoutDefault"; - java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_STRING = "/param/path/overlay/{string}"; - java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_UUID = "/param/path/overlay/{uuid}"; + java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_STRING = "/param/path/overlay/{string:10}"; + java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_UUID = "/param/path/overlay/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}"; java.lang.String PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT = "/param/path/requiredWithDefault/{string}"; java.lang.String PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT = "/param/path/requiredWithoutDefault/{string}"; - java.lang.String PATH_PARAM_PATH_WITH_BOOLEAN = "/param/path/with-bool/{bool}"; - java.lang.String PATH_PARAM_PATH_WITH_INTEGER = "/param/path/with-integer/{integer}"; - java.lang.String PATH_PARAM_PATH_WITH_LONG = "/param/path/with-long/{long}"; - java.lang.String PATH_PARAM_PATH_WITH_MAX_LENGTH = "/param/path/with-max-length/{string}"; - java.lang.String PATH_PARAM_PATH_WITH_PATTERN = "/param/path/with-pattern/{string}"; - java.lang.String PATH_PARAM_PATH_WITH_UUID = "/param/path/with-uuid/{uuid}"; + java.lang.String PATH_PARAM_PATH_WITH_BOOLEAN = "/param/path/with-bool/{bool:true|false}"; + java.lang.String PATH_PARAM_PATH_WITH_INTEGER = "/param/path/with-integer/{integer:\\-?[0-9]+}"; + java.lang.String PATH_PARAM_PATH_WITH_LONG = "/param/path/with-long/{long:\\-?[0-9]+}"; + java.lang.String PATH_PARAM_PATH_WITH_MAX_LENGTH = "/param/path/with-max-length/{string:5}"; + java.lang.String PATH_PARAM_PATH_WITH_PATTERN = "/param/path/with-pattern/{string:[0-9][a-z]}"; + java.lang.String PATH_PARAM_PATH_WITH_UUID = "/param/path/with-uuid/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}"; java.lang.String PATH_PARAM_QUERY_DATE = "/param/query/date"; java.lang.String PATH_PARAM_QUERY_DATE_TIME = "/param/query/date-time"; java.lang.String PATH_PARAM_QUERY_MULTIPLE_LISTS = "/param/query/multiple-lists"; @@ -35,7 +35,7 @@ public interface ParameterApi { java.lang.String PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT = "/param/query/requiredWithoutDefault"; java.lang.String PATH_PARAM_QUERY_UUID = "/param/query/uuid"; - @io.micronaut.http.annotation.Get("/param/all/{path}") + @io.micronaut.http.annotation.Get(PATH_PARAM_ALL) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramAll( @@ -52,7 +52,7 @@ reactor.core.publisher.Mono paramAll( @io.micronaut.http.annotation.Header(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Post("/param/body/optional") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_OPTIONAL) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) @io.micronaut.http.annotation.Produces({ "application/json" }) @@ -62,7 +62,7 @@ reactor.core.publisher.Mono paramBodyOptional( @javax.validation.Valid ParameterModel parameterModel); - @io.micronaut.http.annotation.Post("/param/body/required") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_REQUIRED) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) @io.micronaut.http.annotation.Produces({ "application/json" }) @@ -72,7 +72,7 @@ reactor.core.publisher.Mono paramBodyRequired( @javax.validation.Valid ParameterModel parameterModel); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramCookieOptionalWithDefault( @@ -80,7 +80,7 @@ reactor.core.publisher.Mono paramCookieOptionalWithDefault( @io.micronaut.http.annotation.CookieValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramCookieOptionalWithoutDefault( @@ -88,7 +88,7 @@ reactor.core.publisher.Mono paramCookieOptionalWithoutDefault( @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramCookieRequiredWithDefault( @@ -96,7 +96,7 @@ reactor.core.publisher.Mono paramCookieRequiredWithDefault( @io.micronaut.http.annotation.CookieValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramCookieRequiredWithoutDefault( @@ -104,7 +104,7 @@ reactor.core.publisher.Mono paramCookieRequiredWithoutDefault( @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramHeaderOptionalWithDefault( @@ -112,7 +112,7 @@ reactor.core.publisher.Mono paramHeaderOptionalWithDefault( @io.micronaut.http.annotation.Header(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramHeaderOptionalWithoutDefault( @@ -120,7 +120,7 @@ reactor.core.publisher.Mono paramHeaderOptionalWithoutDefault( @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramHeaderRequiredWithDefault( @@ -128,7 +128,7 @@ reactor.core.publisher.Mono paramHeaderRequiredWithDefault( @io.micronaut.http.annotation.Header(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramHeaderRequiredWithoutDefault( @@ -136,7 +136,7 @@ reactor.core.publisher.Mono paramHeaderRequiredWithoutDefault( @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{string:10}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_STRING) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramPathOverlayWithString( @@ -145,7 +145,7 @@ reactor.core.publisher.Mono paramPathOverlayWithString( @javax.validation.constraints.Size(max = 10) java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_UUID) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramPathOverlayWithUuid( @@ -153,7 +153,7 @@ reactor.core.publisher.Mono paramPathOverlayWithUuid( @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/path/requiredWithDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramPathRequiredWithDefault( @@ -161,7 +161,7 @@ reactor.core.publisher.Mono paramPathRequiredWithDefault( @io.micronaut.http.annotation.PathVariable(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/requiredWithoutDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramPathRequiredWithoutDefault( @@ -169,7 +169,7 @@ reactor.core.publisher.Mono paramPathRequiredWithoutDefault( @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-bool/{bool:true|false}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_BOOLEAN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramPathWithBoolean( @@ -177,7 +177,7 @@ reactor.core.publisher.Mono paramPathWithBoolean( @io.micronaut.http.annotation.PathVariable(value = "bool") java.lang.Boolean bool); - @io.micronaut.http.annotation.Get("/param/path/with-integer/{integer:\\-?[0-9]+}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_INTEGER) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramPathWithInteger( @@ -185,7 +185,7 @@ reactor.core.publisher.Mono paramPathWithInteger( @io.micronaut.http.annotation.PathVariable(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/param/path/with-long/{long:\\-?[0-9]+}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_LONG) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramPathWithLong( @@ -193,7 +193,7 @@ reactor.core.publisher.Mono paramPathWithLong( @io.micronaut.http.annotation.PathVariable(value = "long") java.lang.Long _long); - @io.micronaut.http.annotation.Get("/param/path/with-max-length/{string:5}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_MAX_LENGTH) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramPathWithMaxLength( @@ -202,7 +202,7 @@ reactor.core.publisher.Mono paramPathWithMaxLength( @javax.validation.constraints.Size(max = 5) java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-pattern/{string:[0-9][a-z]}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_PATTERN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramPathWithPattern( @@ -211,7 +211,7 @@ reactor.core.publisher.Mono paramPathWithPattern( @javax.validation.constraints.Pattern(regexp = "[0-9][a-z]") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-uuid/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_UUID) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramPathWithUuid( @@ -219,7 +219,7 @@ reactor.core.publisher.Mono paramPathWithUuid( @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/query/date") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramQueryDate( @@ -227,7 +227,7 @@ reactor.core.publisher.Mono paramQueryDate( @io.micronaut.http.annotation.QueryValue(value = "date") java.time.LocalDate date); - @io.micronaut.http.annotation.Get("/param/query/date-time") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE_TIME) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramQueryDateTime( @@ -235,7 +235,7 @@ reactor.core.publisher.Mono paramQueryDateTime( @io.micronaut.http.annotation.QueryValue(value = "date") java.time.Instant date); - @io.micronaut.http.annotation.Get("/param/query/multiple-lists") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_MULTIPLE_LISTS) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramQueryMultipleLists( @@ -249,7 +249,7 @@ reactor.core.publisher.Mono paramQueryMultipleLists( @io.micronaut.http.annotation.QueryValue java.util.List c); - @io.micronaut.http.annotation.Get("/param/query/number") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_NUMBER) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramQueryNumber( @@ -257,7 +257,7 @@ reactor.core.publisher.Mono paramQueryNumber( @io.micronaut.http.annotation.QueryValue(value = "date") java.lang.Double date); - @io.micronaut.http.annotation.Get("/param/query/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramQueryOptionalWithDefault( @@ -265,7 +265,7 @@ reactor.core.publisher.Mono paramQueryOptionalWithDefault( @io.micronaut.http.annotation.QueryValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramQueryOptionalWithoutDefault( @@ -273,7 +273,7 @@ reactor.core.publisher.Mono paramQueryOptionalWithoutDefault( @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramQueryRequiredWithDefault( @@ -281,7 +281,7 @@ reactor.core.publisher.Mono paramQueryRequiredWithDefault( @io.micronaut.http.annotation.QueryValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramQueryRequiredWithoutDefault( @@ -289,11 +289,11 @@ reactor.core.publisher.Mono paramQueryRequiredWithoutDefault( @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/uuid") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_UUID) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramQueryUuid( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "date") java.util.UUID date); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/async/simple/ParameterApiClient.java b/gen/main/java/testapi/async/simple/ParameterApiClient.java index 9fb5c1e8..4d5520a9 100644 --- a/gen/main/java/testapi/async/simple/ParameterApiClient.java +++ b/gen/main/java/testapi/async/simple/ParameterApiClient.java @@ -27,7 +27,7 @@ public interface ParameterApiClient { java.lang.String PATH_PARAM_PATH_WITH_UUID = "/param/path/with-uuid/{uuid}"; java.lang.String PATH_PARAM_QUERY_DATE = "/param/query/date"; java.lang.String PATH_PARAM_QUERY_DATE_TIME = "/param/query/date-time"; - java.lang.String PATH_PARAM_QUERY_MULTIPLE_LISTS = "/param/query/multiple-lists"; + java.lang.String PATH_PARAM_QUERY_MULTIPLE_LISTS = "/param/query/multiple-lists?{&a*}{&b*}{&c*}"; java.lang.String PATH_PARAM_QUERY_NUMBER = "/param/query/number"; java.lang.String PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT = "/param/query/optionalWithDefault"; java.lang.String PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT = "/param/query/optionalWithoutDefault"; @@ -35,7 +35,7 @@ public interface ParameterApiClient { java.lang.String PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT = "/param/query/requiredWithoutDefault"; java.lang.String PATH_PARAM_QUERY_UUID = "/param/query/uuid"; - @io.micronaut.http.annotation.Get("/param/all/{path}") + @io.micronaut.http.annotation.Get(PATH_PARAM_ALL) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono paramAll( @@ -52,7 +52,7 @@ reactor.core.publisher.Mono paramAll( @io.micronaut.http.annotation.Header(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Post("/param/body/optional") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_OPTIONAL) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) @@ -61,7 +61,7 @@ reactor.core.publisher.Mono paramBodyOptional( @io.micronaut.http.annotation.Body ParameterModel parameterModel); - @io.micronaut.http.annotation.Post("/param/body/required") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_REQUIRED) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) @@ -70,7 +70,7 @@ reactor.core.publisher.Mono paramBodyRequired( @io.micronaut.http.annotation.Body ParameterModel parameterModel); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono paramCookieOptionalWithDefault( @@ -78,7 +78,7 @@ reactor.core.publisher.Mono paramCookieOptionalWithDefault( @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono paramCookieOptionalWithoutDefault( @@ -86,7 +86,7 @@ reactor.core.publisher.Mono paramCookieOptionalWithoutDefault( @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono paramCookieRequiredWithDefault( @@ -94,7 +94,7 @@ reactor.core.publisher.Mono paramCookieRequiredWithDefault( @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono paramCookieRequiredWithoutDefault( @@ -102,7 +102,7 @@ reactor.core.publisher.Mono paramCookieRequiredWithoutDefault( @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono paramHeaderOptionalWithDefault( @@ -110,7 +110,7 @@ reactor.core.publisher.Mono paramHeaderOptionalWithDefault( @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono paramHeaderOptionalWithoutDefault( @@ -118,7 +118,7 @@ reactor.core.publisher.Mono paramHeaderOptionalWithoutDefault( @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono paramHeaderRequiredWithDefault( @@ -126,7 +126,7 @@ reactor.core.publisher.Mono paramHeaderRequiredWithDefault( @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono paramHeaderRequiredWithoutDefault( @@ -134,7 +134,7 @@ reactor.core.publisher.Mono paramHeaderRequiredWithoutDefault( @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_STRING) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono paramPathOverlayWithString( @@ -142,7 +142,7 @@ reactor.core.publisher.Mono paramPathOverlayWithString( @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{uuid}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_UUID) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono paramPathOverlayWithUuid( @@ -150,7 +150,7 @@ reactor.core.publisher.Mono paramPathOverlayWithUuid( @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/path/requiredWithDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono paramPathRequiredWithDefault( @@ -158,7 +158,7 @@ reactor.core.publisher.Mono paramPathRequiredWithDefault( @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/requiredWithoutDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono paramPathRequiredWithoutDefault( @@ -166,7 +166,7 @@ reactor.core.publisher.Mono paramPathRequiredWithoutDefault( @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-bool/{bool}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_BOOLEAN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono paramPathWithBoolean( @@ -174,7 +174,7 @@ reactor.core.publisher.Mono paramPathWithBoolean( @io.micronaut.http.annotation.PathVariable(value = "bool") java.lang.Boolean bool); - @io.micronaut.http.annotation.Get("/param/path/with-integer/{integer}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_INTEGER) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono paramPathWithInteger( @@ -182,7 +182,7 @@ reactor.core.publisher.Mono paramPathWithInteger( @io.micronaut.http.annotation.PathVariable(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/param/path/with-long/{long}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_LONG) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono paramPathWithLong( @@ -190,7 +190,7 @@ reactor.core.publisher.Mono paramPathWithLong( @io.micronaut.http.annotation.PathVariable(value = "long") java.lang.Long _long); - @io.micronaut.http.annotation.Get("/param/path/with-max-length/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_MAX_LENGTH) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono paramPathWithMaxLength( @@ -198,7 +198,7 @@ reactor.core.publisher.Mono paramPathWithMaxLength( @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-pattern/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_PATTERN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono paramPathWithPattern( @@ -206,7 +206,7 @@ reactor.core.publisher.Mono paramPathWithPattern( @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-uuid/{uuid}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_UUID) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono paramPathWithUuid( @@ -214,7 +214,7 @@ reactor.core.publisher.Mono paramPathWithUuid( @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/query/date") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono paramQueryDate( @@ -222,7 +222,7 @@ reactor.core.publisher.Mono paramQueryDate( @io.micronaut.http.annotation.QueryValue(value = "date") java.time.LocalDate date); - @io.micronaut.http.annotation.Get("/param/query/date-time") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE_TIME) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono paramQueryDateTime( @@ -230,7 +230,7 @@ reactor.core.publisher.Mono paramQueryDateTime( @io.micronaut.http.annotation.QueryValue(value = "date") java.time.Instant date); - @io.micronaut.http.annotation.Get("/param/query/multiple-lists?{&a*}{&b*}{&c*}") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_MULTIPLE_LISTS) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono paramQueryMultipleLists( @@ -244,7 +244,7 @@ reactor.core.publisher.Mono paramQueryMultipleLists( @io.micronaut.http.annotation.QueryValue(value = "c") java.util.List c); - @io.micronaut.http.annotation.Get("/param/query/number") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_NUMBER) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono paramQueryNumber( @@ -252,7 +252,7 @@ reactor.core.publisher.Mono paramQueryNumber( @io.micronaut.http.annotation.QueryValue(value = "date") java.lang.Double date); - @io.micronaut.http.annotation.Get("/param/query/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono paramQueryOptionalWithDefault( @@ -260,7 +260,7 @@ reactor.core.publisher.Mono paramQueryOptionalWithDefault( @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono paramQueryOptionalWithoutDefault( @@ -268,7 +268,7 @@ reactor.core.publisher.Mono paramQueryOptionalWithoutDefault( @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono paramQueryRequiredWithDefault( @@ -276,7 +276,7 @@ reactor.core.publisher.Mono paramQueryRequiredWithDefault( @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono paramQueryRequiredWithoutDefault( @@ -284,7 +284,7 @@ reactor.core.publisher.Mono paramQueryRequiredWithoutDefault( @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/uuid") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_UUID) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono paramQueryUuid( diff --git a/gen/main/java/testapi/async/simple/RequestApi.java b/gen/main/java/testapi/async/simple/RequestApi.java index ffbc7d9b..2a762a79 100644 --- a/gen/main/java/testapi/async/simple/RequestApi.java +++ b/gen/main/java/testapi/async/simple/RequestApi.java @@ -6,7 +6,7 @@ public interface RequestApi { java.lang.String PATH_NO_OPERATION_ID_GET = "/no-operation-id"; - @io.micronaut.http.annotation.Get("/no-operation-id") + @io.micronaut.http.annotation.Get(PATH_NO_OPERATION_ID_GET) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono noOperationIdGet(); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/async/simple/RequestApiClient.java b/gen/main/java/testapi/async/simple/RequestApiClient.java index 26a637e8..ad282ed8 100644 --- a/gen/main/java/testapi/async/simple/RequestApiClient.java +++ b/gen/main/java/testapi/async/simple/RequestApiClient.java @@ -6,7 +6,7 @@ public interface RequestApiClient { java.lang.String PATH_NO_OPERATION_ID_GET = "/no-operation-id"; - @io.micronaut.http.annotation.Get("/no-operation-id") + @io.micronaut.http.annotation.Get(PATH_NO_OPERATION_ID_GET) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono noOperationIdGet(); } diff --git a/gen/main/java/testapi/async/simple/ResponseApi.java b/gen/main/java/testapi/async/simple/ResponseApi.java index 0708ea1c..0766264b 100644 --- a/gen/main/java/testapi/async/simple/ResponseApi.java +++ b/gen/main/java/testapi/async/simple/ResponseApi.java @@ -20,12 +20,12 @@ public interface ResponseApi { java.lang.String PATH_VOID_NOT_FOUND = "/response/void-not-found"; java.lang.String PATH_WITH_DEFAULT = "/response/default"; - @io.micronaut.http.annotation.Get("/response/array-complex") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> arrayComplex(); - @io.micronaut.http.annotation.Get("/response/array-complex-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX_NOT_FOUND) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> arrayComplexNotFound( @@ -33,17 +33,17 @@ reactor.core.publisher.Mono> arrayComplexNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/array-simple") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> arraySimple(); - @io.micronaut.http.annotation.Get("/response/array-simple-empty") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_EMPTY) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> arraySimpleEmpty(); - @io.micronaut.http.annotation.Get("/response/array-simple-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_NOT_FOUND) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> arraySimpleNotFound( @@ -51,17 +51,17 @@ reactor.core.publisher.Mono> arraySimpleNotFoun @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/header") + @io.micronaut.http.annotation.Get(PATH_HEADER) reactor.core.publisher.Mono> header(); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> multipleDataTypes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES_NOT_FOUND) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> multipleDataTypesNotFound( @io.micronaut.core.annotation.NonNull @@ -71,14 +71,14 @@ reactor.core.publisher.Mono> multipleData @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> multipleResponseCodes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> multipleResponseCodesNotFound( @io.micronaut.core.annotation.NonNull @@ -88,7 +88,7 @@ reactor.core.publisher.Mono> multipl @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/optional") + @io.micronaut.http.annotation.Get(PATH_OPTIONAL) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono optional( @@ -96,23 +96,23 @@ reactor.core.publisher.Mono optional( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/single") + @io.micronaut.http.annotation.Get(PATH_SINGLE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono single(); - @io.micronaut.http.annotation.Get("/response/void") + @io.micronaut.http.annotation.Get(PATH_VOID_FOUND) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono voidFound(); - @io.micronaut.http.annotation.Get("/response/void-not-found") + @io.micronaut.http.annotation.Get(PATH_VOID_NOT_FOUND) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono voidNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/default") + @io.micronaut.http.annotation.Get(PATH_WITH_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono withDefault(); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/async/simple/ResponseApiClient.java b/gen/main/java/testapi/async/simple/ResponseApiClient.java index 9aa36f1f..b505f53b 100644 --- a/gen/main/java/testapi/async/simple/ResponseApiClient.java +++ b/gen/main/java/testapi/async/simple/ResponseApiClient.java @@ -20,12 +20,12 @@ public interface ResponseApiClient { java.lang.String PATH_VOID_NOT_FOUND = "/response/void-not-found"; java.lang.String PATH_WITH_DEFAULT = "/response/default"; - @io.micronaut.http.annotation.Get("/response/array-complex") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> arrayComplex(); - @io.micronaut.http.annotation.Get("/response/array-complex-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX_NOT_FOUND) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> arrayComplexNotFound( @@ -33,17 +33,17 @@ reactor.core.publisher.Mono> arrayComplexNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/array-simple") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> arraySimple(); - @io.micronaut.http.annotation.Get("/response/array-simple-empty") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_EMPTY) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> arraySimpleEmpty(); - @io.micronaut.http.annotation.Get("/response/array-simple-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_NOT_FOUND) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> arraySimpleNotFound( @@ -51,17 +51,17 @@ reactor.core.publisher.Mono> arraySimpleNotFoun @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/header") + @io.micronaut.http.annotation.Get(PATH_HEADER) reactor.core.publisher.Mono> header(); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> multipleDataTypes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES_NOT_FOUND) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> multipleDataTypesNotFound( @io.micronaut.core.annotation.NonNull @@ -71,14 +71,14 @@ reactor.core.publisher.Mono> multipleData @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> multipleResponseCodes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> multipleResponseCodesNotFound( @io.micronaut.core.annotation.NonNull @@ -88,7 +88,7 @@ reactor.core.publisher.Mono> multipl @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/optional") + @io.micronaut.http.annotation.Get(PATH_OPTIONAL) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono optional( @@ -96,23 +96,23 @@ reactor.core.publisher.Mono optional( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/single") + @io.micronaut.http.annotation.Get(PATH_SINGLE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono single(); - @io.micronaut.http.annotation.Get("/response/void") + @io.micronaut.http.annotation.Get(PATH_VOID_FOUND) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono voidFound(); - @io.micronaut.http.annotation.Get("/response/void-not-found") + @io.micronaut.http.annotation.Get(PATH_VOID_NOT_FOUND) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono voidNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/default") + @io.micronaut.http.annotation.Get(PATH_WITH_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono withDefault(); } diff --git a/gen/main/java/testapi/async/simple/ValidationApi.java b/gen/main/java/testapi/async/simple/ValidationApi.java index a6893ccc..57644d5e 100644 --- a/gen/main/java/testapi/async/simple/ValidationApi.java +++ b/gen/main/java/testapi/async/simple/ValidationApi.java @@ -26,7 +26,7 @@ public interface ValidationApi { java.lang.String PATH_VALIDATION_STRING_PATTERN = "/validation/string/pattern"; java.lang.String PATH_VALIDATION_STRING_RANGE = "/validation/string/range"; - @io.micronaut.http.annotation.Get("/validation/double/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MAX) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationDoubleMax( @io.micronaut.core.annotation.NonNull @@ -34,7 +34,7 @@ reactor.core.publisher.Mono validationDoubleMax( @javax.validation.constraints.DecimalMax(value = "4", inclusive = false) java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/double/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MIN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationDoubleMin( @io.micronaut.core.annotation.NonNull @@ -42,7 +42,7 @@ reactor.core.publisher.Mono validationDoubleMin( @javax.validation.constraints.DecimalMin(value = "3", inclusive = false) java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/double/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_RANGE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationDoubleRange( @io.micronaut.core.annotation.NonNull @@ -51,7 +51,7 @@ reactor.core.publisher.Mono validationDoubleRange( @javax.validation.constraints.DecimalMax(value = "4", inclusive = true) java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/float/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MAX) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationFloatMax( @io.micronaut.core.annotation.NonNull @@ -59,7 +59,7 @@ reactor.core.publisher.Mono validationFloatMax( @javax.validation.constraints.DecimalMax(value = "4", inclusive = false) java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MIN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationFloatMin( @io.micronaut.core.annotation.NonNull @@ -67,7 +67,7 @@ reactor.core.publisher.Mono validationFloatMin( @javax.validation.constraints.DecimalMin(value = "3", inclusive = false) java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_RANGE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationFloatRange( @io.micronaut.core.annotation.NonNull @@ -76,7 +76,7 @@ reactor.core.publisher.Mono validationFloatRange( @javax.validation.constraints.DecimalMax(value = "4", inclusive = true) java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/integer/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MAX) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationIntegerMax( @io.micronaut.core.annotation.NonNull @@ -84,7 +84,7 @@ reactor.core.publisher.Mono validationIntegerMax( @javax.validation.constraints.Max(4) java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MIN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationIntegerMin( @io.micronaut.core.annotation.NonNull @@ -92,7 +92,7 @@ reactor.core.publisher.Mono validationIntegerMin( @javax.validation.constraints.Min(3) java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_RANGE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationIntegerRange( @io.micronaut.core.annotation.NonNull @@ -101,7 +101,7 @@ reactor.core.publisher.Mono validationIntegerRange( @javax.validation.constraints.Max(4) java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/list/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MAX) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationListMax( @io.micronaut.core.annotation.NonNull @@ -109,7 +109,7 @@ reactor.core.publisher.Mono validationListMax( @javax.validation.constraints.Size(max = 4) java.util.List list); - @io.micronaut.http.annotation.Get("/validation/list/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MIN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationListMin( @io.micronaut.core.annotation.NonNull @@ -117,7 +117,7 @@ reactor.core.publisher.Mono validationListMin( @javax.validation.constraints.Size(min = 3) java.util.List list); - @io.micronaut.http.annotation.Post("/validation/list/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_MODEL) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono validationListModel( @@ -126,7 +126,7 @@ reactor.core.publisher.Mono validationListModel( @javax.validation.Valid java.util.List stringModel); - @io.micronaut.http.annotation.Post("/validation/list/range") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_RANGE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationListRange( @io.micronaut.core.annotation.NonNull @@ -134,7 +134,7 @@ reactor.core.publisher.Mono validationListRange( @javax.validation.constraints.Size(min = 3, max = 4) java.util.List list); - @io.micronaut.http.annotation.Get("/validation/long/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MAX) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationLongMax( @io.micronaut.core.annotation.NonNull @@ -142,7 +142,7 @@ reactor.core.publisher.Mono validationLongMax( @javax.validation.constraints.Max(4) java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MIN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationLongMin( @io.micronaut.core.annotation.NonNull @@ -150,7 +150,7 @@ reactor.core.publisher.Mono validationLongMin( @javax.validation.constraints.Min(3) java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_RANGE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationLongRange( @io.micronaut.core.annotation.NonNull @@ -159,7 +159,7 @@ reactor.core.publisher.Mono validationLongRange( @javax.validation.constraints.Max(4) java.lang.Long integer); - @io.micronaut.http.annotation.Post("/validation/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_MODEL) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono validationModel( @@ -168,7 +168,7 @@ reactor.core.publisher.Mono validationModel( @javax.validation.Valid StringModel stringModel); - @io.micronaut.http.annotation.Get("/validation/string/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MAX) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationStringMax( @io.micronaut.core.annotation.NonNull @@ -176,7 +176,7 @@ reactor.core.publisher.Mono validationStringMax( @javax.validation.constraints.Size(max = 4) java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MIN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationStringMin( @io.micronaut.core.annotation.NonNull @@ -184,7 +184,7 @@ reactor.core.publisher.Mono validationStringMin( @javax.validation.constraints.Size(min = 3) java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/pattern") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_PATTERN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationStringPattern( @io.micronaut.core.annotation.NonNull @@ -192,11 +192,11 @@ reactor.core.publisher.Mono validationStringPattern( @javax.validation.constraints.Pattern(regexp = "[a-z]{3,5}") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_RANGE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationStringRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @javax.validation.constraints.Size(min = 3, max = 4) java.lang.String string); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/async/simple/ValidationApiClient.java b/gen/main/java/testapi/async/simple/ValidationApiClient.java index 1f59b756..47d7b460 100644 --- a/gen/main/java/testapi/async/simple/ValidationApiClient.java +++ b/gen/main/java/testapi/async/simple/ValidationApiClient.java @@ -13,10 +13,10 @@ public interface ValidationApiClient { java.lang.String PATH_VALIDATION_INTEGER_MAX = "/validation/integer/max"; java.lang.String PATH_VALIDATION_INTEGER_MIN = "/validation/integer/min"; java.lang.String PATH_VALIDATION_INTEGER_RANGE = "/validation/integer/range"; - java.lang.String PATH_VALIDATION_LIST_MAX = "/validation/list/max"; - java.lang.String PATH_VALIDATION_LIST_MIN = "/validation/list/min"; + java.lang.String PATH_VALIDATION_LIST_MAX = "/validation/list/max?{&list*}"; + java.lang.String PATH_VALIDATION_LIST_MIN = "/validation/list/min?{&list*}"; java.lang.String PATH_VALIDATION_LIST_MODEL = "/validation/list/model"; - java.lang.String PATH_VALIDATION_LIST_RANGE = "/validation/list/range"; + java.lang.String PATH_VALIDATION_LIST_RANGE = "/validation/list/range?{&list*}"; java.lang.String PATH_VALIDATION_LONG_MAX = "/validation/long/max"; java.lang.String PATH_VALIDATION_LONG_MIN = "/validation/long/min"; java.lang.String PATH_VALIDATION_LONG_RANGE = "/validation/long/range"; @@ -26,84 +26,84 @@ public interface ValidationApiClient { java.lang.String PATH_VALIDATION_STRING_PATTERN = "/validation/string/pattern"; java.lang.String PATH_VALIDATION_STRING_RANGE = "/validation/string/range"; - @io.micronaut.http.annotation.Get("/validation/double/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MAX) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationDoubleMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/double/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MIN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationDoubleMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/double/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_RANGE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationDoubleRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/float/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MAX) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationFloatMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MIN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationFloatMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_RANGE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationFloatRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/integer/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MAX) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationIntegerMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MIN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationIntegerMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_RANGE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationIntegerRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/list/max?{&list*}") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MAX) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationListMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "list") java.util.List list); - @io.micronaut.http.annotation.Get("/validation/list/min?{&list*}") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MIN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationListMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "list") java.util.List list); - @io.micronaut.http.annotation.Post("/validation/list/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_MODEL) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono validationListModel( @@ -111,35 +111,35 @@ reactor.core.publisher.Mono validationListModel( @io.micronaut.http.annotation.Body java.util.List stringModel); - @io.micronaut.http.annotation.Post("/validation/list/range?{&list*}") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_RANGE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationListRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "list") java.util.List list); - @io.micronaut.http.annotation.Get("/validation/long/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MAX) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationLongMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MIN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationLongMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_RANGE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationLongRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Long integer); - @io.micronaut.http.annotation.Post("/validation/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_MODEL) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono validationModel( @@ -147,28 +147,28 @@ reactor.core.publisher.Mono validationModel( @io.micronaut.http.annotation.Body StringModel stringModel); - @io.micronaut.http.annotation.Get("/validation/string/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MAX) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationStringMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MIN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationStringMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/pattern") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_PATTERN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationStringPattern( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_RANGE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono validationStringRange( @io.micronaut.core.annotation.NonNull diff --git a/gen/main/java/testapi/defaults/MediatypeApi.java b/gen/main/java/testapi/defaults/MediatypeApi.java index fe8785d1..dca6cf8e 100644 --- a/gen/main/java/testapi/defaults/MediatypeApi.java +++ b/gen/main/java/testapi/defaults/MediatypeApi.java @@ -12,7 +12,7 @@ public interface MediatypeApi { java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; java.lang.String PATH_MEDIATYPE_PRODUCES_SAME_MODEL = "/mediatype/produces-with-same-model"; - @io.micronaut.http.annotation.Post("/mediatype/consumes-and-produces") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_AND_PRODUCES) @io.micronaut.http.annotation.Consumes({ "application/octet-stream" }) @io.micronaut.http.annotation.Produces({ "application/xml" }) io.micronaut.http.HttpResponse mediatypeConsumesAndProduces( @@ -20,7 +20,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesAndProduces( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-with-fileupload") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD) @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUpload( @@ -34,7 +34,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUplo @io.micronaut.http.annotation.Part(value = "file") io.micronaut.http.multipart.CompletedFileUpload file); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD) @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( @@ -45,7 +45,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileU @io.micronaut.http.annotation.Part(value = "userId") java.lang.Integer userId); - @io.micronaut.http.annotation.Post("/mediatype/consumes-octet-stream") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_OCTET_STREAM) @io.micronaut.http.annotation.Consumes({ "application/octet-stream" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesOctetStream( @@ -53,7 +53,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesOctetStream( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-plain") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_PLAIN) @io.micronaut.http.annotation.Consumes({ "text/plain" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesPlain( @@ -61,7 +61,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesPlain( @io.micronaut.http.annotation.Body java.lang.String body); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-different-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL) @io.micronaut.http.annotation.Produces({ "application/json", "text/plain" }) io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.core.annotation.NonNull @@ -71,10 +71,10 @@ io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.http.annotation.QueryValue(value = "plain") java.lang.Boolean plain); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-same-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_SAME_MODEL) @io.micronaut.http.annotation.Produces({ "application/json", "application/xml" }) io.micronaut.http.HttpResponse mediatypeProducesSameModel( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "value") java.lang.String value); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/defaults/MediatypeApiClient.java b/gen/main/java/testapi/defaults/MediatypeApiClient.java index 60bad5f1..18827b85 100644 --- a/gen/main/java/testapi/defaults/MediatypeApiClient.java +++ b/gen/main/java/testapi/defaults/MediatypeApiClient.java @@ -12,7 +12,7 @@ public interface MediatypeApiClient { java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; java.lang.String PATH_MEDIATYPE_PRODUCES_SAME_MODEL = "/mediatype/produces-with-same-model"; - @io.micronaut.http.annotation.Post("/mediatype/consumes-and-produces") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_AND_PRODUCES) @io.micronaut.http.annotation.Produces({ "application/octet-stream" }) @io.micronaut.http.annotation.Consumes({ "application/xml" }) io.micronaut.http.HttpResponse mediatypeConsumesAndProduces( @@ -20,7 +20,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesAndProduces( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-with-fileupload") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD) @io.micronaut.http.annotation.Produces({ "multipart/form-data" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUpload( @@ -28,7 +28,7 @@ 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(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD) @io.micronaut.http.annotation.Produces({ "multipart/form-data" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( @@ -36,7 +36,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileU @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); - @io.micronaut.http.annotation.Post("/mediatype/consumes-octet-stream") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_OCTET_STREAM) @io.micronaut.http.annotation.Produces({ "application/octet-stream" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesOctetStream( @@ -44,7 +44,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesOctetStream( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-plain") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_PLAIN) @io.micronaut.http.annotation.Produces({ "text/plain" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesPlain( @@ -52,7 +52,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesPlain( @io.micronaut.http.annotation.Body java.lang.String body); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-different-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL) @io.micronaut.http.annotation.Consumes({ "application/json", "text/plain" }) io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.core.annotation.NonNull @@ -62,7 +62,7 @@ io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.http.annotation.QueryValue(value = "plain") java.lang.Boolean plain); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-same-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_SAME_MODEL) @io.micronaut.http.annotation.Consumes({ "application/json", "application/xml" }) io.micronaut.http.HttpResponse mediatypeProducesSameModel( @io.micronaut.core.annotation.NonNull diff --git a/gen/main/java/testapi/defaults/ParameterApi.java b/gen/main/java/testapi/defaults/ParameterApi.java index 9e3b9c13..e4db3234 100644 --- a/gen/main/java/testapi/defaults/ParameterApi.java +++ b/gen/main/java/testapi/defaults/ParameterApi.java @@ -15,16 +15,16 @@ public interface ParameterApi { java.lang.String PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT = "/param/header/optionalWithoutDefault"; java.lang.String PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT = "/param/header/requiredWithDefault"; java.lang.String PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT = "/param/header/requiredWithoutDefault"; - java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_STRING = "/param/path/overlay/{string}"; - java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_UUID = "/param/path/overlay/{uuid}"; + java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_STRING = "/param/path/overlay/{string:10}"; + java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_UUID = "/param/path/overlay/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}"; java.lang.String PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT = "/param/path/requiredWithDefault/{string}"; java.lang.String PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT = "/param/path/requiredWithoutDefault/{string}"; - java.lang.String PATH_PARAM_PATH_WITH_BOOLEAN = "/param/path/with-bool/{bool}"; - java.lang.String PATH_PARAM_PATH_WITH_INTEGER = "/param/path/with-integer/{integer}"; - java.lang.String PATH_PARAM_PATH_WITH_LONG = "/param/path/with-long/{long}"; - java.lang.String PATH_PARAM_PATH_WITH_MAX_LENGTH = "/param/path/with-max-length/{string}"; - java.lang.String PATH_PARAM_PATH_WITH_PATTERN = "/param/path/with-pattern/{string}"; - java.lang.String PATH_PARAM_PATH_WITH_UUID = "/param/path/with-uuid/{uuid}"; + java.lang.String PATH_PARAM_PATH_WITH_BOOLEAN = "/param/path/with-bool/{bool:true|false}"; + java.lang.String PATH_PARAM_PATH_WITH_INTEGER = "/param/path/with-integer/{integer:\\-?[0-9]+}"; + java.lang.String PATH_PARAM_PATH_WITH_LONG = "/param/path/with-long/{long:\\-?[0-9]+}"; + java.lang.String PATH_PARAM_PATH_WITH_MAX_LENGTH = "/param/path/with-max-length/{string:5}"; + java.lang.String PATH_PARAM_PATH_WITH_PATTERN = "/param/path/with-pattern/{string:[0-9][a-z]}"; + java.lang.String PATH_PARAM_PATH_WITH_UUID = "/param/path/with-uuid/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}"; java.lang.String PATH_PARAM_QUERY_DATE = "/param/query/date"; java.lang.String PATH_PARAM_QUERY_DATE_TIME = "/param/query/date-time"; java.lang.String PATH_PARAM_QUERY_MULTIPLE_LISTS = "/param/query/multiple-lists"; @@ -35,7 +35,7 @@ public interface ParameterApi { java.lang.String PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT = "/param/query/requiredWithoutDefault"; java.lang.String PATH_PARAM_QUERY_UUID = "/param/query/uuid"; - @io.micronaut.http.annotation.Get("/param/all/{path}") + @io.micronaut.http.annotation.Get(PATH_PARAM_ALL) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramAll( @io.micronaut.core.annotation.NonNull @@ -51,7 +51,7 @@ io.micronaut.http.HttpResponse paramAll( @io.micronaut.http.annotation.Header(value = "integer") java.util.Optional integer); - @io.micronaut.http.annotation.Post("/param/body/optional") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_OPTIONAL) @io.micronaut.http.annotation.Consumes({ "application/json" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramBodyOptional( @@ -60,7 +60,7 @@ io.micronaut.http.HttpResponse paramBodyOptional( @javax.validation.Valid java.util.Optional parameterModel); - @io.micronaut.http.annotation.Post("/param/body/required") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_REQUIRED) @io.micronaut.http.annotation.Consumes({ "application/json" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramBodyRequired( @@ -69,63 +69,63 @@ io.micronaut.http.HttpResponse paramBodyRequired( @javax.validation.Valid ParameterModel parameterModel); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramCookieOptionalWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.CookieValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramCookieOptionalWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.CookieValue(value = "string") java.util.Optional string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramCookieRequiredWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.CookieValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramCookieRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderOptionalWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Header(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderOptionalWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Header(value = "string") java.util.Optional string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderRequiredWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Header(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{string:10}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_STRING) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathOverlayWithString( @io.micronaut.core.annotation.NonNull @@ -133,49 +133,49 @@ io.micronaut.http.HttpResponse paramPathOverlayWithString( @javax.validation.constraints.Size(max = 10) java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_UUID) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathOverlayWithUuid( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/path/requiredWithDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathRequiredWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/requiredWithoutDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-bool/{bool:true|false}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_BOOLEAN) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithBoolean( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "bool") java.lang.Boolean bool); - @io.micronaut.http.annotation.Get("/param/path/with-integer/{integer:\\-?[0-9]+}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_INTEGER) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithInteger( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/param/path/with-long/{long:\\-?[0-9]+}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_LONG) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithLong( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "long") java.lang.Long _long); - @io.micronaut.http.annotation.Get("/param/path/with-max-length/{string:5}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_MAX_LENGTH) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithMaxLength( @io.micronaut.core.annotation.NonNull @@ -183,7 +183,7 @@ io.micronaut.http.HttpResponse paramPathWithMaxLength( @javax.validation.constraints.Size(max = 5) java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-pattern/{string:[0-9][a-z]}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_PATTERN) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithPattern( @io.micronaut.core.annotation.NonNull @@ -191,28 +191,28 @@ io.micronaut.http.HttpResponse paramPathWithPattern( @javax.validation.constraints.Pattern(regexp = "[0-9][a-z]") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-uuid/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_UUID) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithUuid( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/query/date") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryDate( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "date") java.util.Optional date); - @io.micronaut.http.annotation.Get("/param/query/date-time") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE_TIME) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryDateTime( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "date") java.util.Optional date); - @io.micronaut.http.annotation.Get("/param/query/multiple-lists") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_MULTIPLE_LISTS) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.core.annotation.NonNull @@ -225,45 +225,45 @@ io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.http.annotation.QueryValue java.util.Optional> c); - @io.micronaut.http.annotation.Get("/param/query/number") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_NUMBER) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryNumber( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "date") java.util.Optional date); - @io.micronaut.http.annotation.Get("/param/query/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryOptionalWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryOptionalWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.util.Optional string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryRequiredWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/uuid") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_UUID) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryUuid( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "date") java.util.Optional date); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/defaults/ParameterApiClient.java b/gen/main/java/testapi/defaults/ParameterApiClient.java index 7f51e5c9..3408feef 100644 --- a/gen/main/java/testapi/defaults/ParameterApiClient.java +++ b/gen/main/java/testapi/defaults/ParameterApiClient.java @@ -27,7 +27,7 @@ public interface ParameterApiClient { java.lang.String PATH_PARAM_PATH_WITH_UUID = "/param/path/with-uuid/{uuid}"; java.lang.String PATH_PARAM_QUERY_DATE = "/param/query/date"; java.lang.String PATH_PARAM_QUERY_DATE_TIME = "/param/query/date-time"; - java.lang.String PATH_PARAM_QUERY_MULTIPLE_LISTS = "/param/query/multiple-lists"; + java.lang.String PATH_PARAM_QUERY_MULTIPLE_LISTS = "/param/query/multiple-lists?{&a*}{&b*}{&c*}"; java.lang.String PATH_PARAM_QUERY_NUMBER = "/param/query/number"; java.lang.String PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT = "/param/query/optionalWithDefault"; java.lang.String PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT = "/param/query/optionalWithoutDefault"; @@ -35,7 +35,7 @@ public interface ParameterApiClient { java.lang.String PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT = "/param/query/requiredWithoutDefault"; java.lang.String PATH_PARAM_QUERY_UUID = "/param/query/uuid"; - @io.micronaut.http.annotation.Get("/param/all/{path}") + @io.micronaut.http.annotation.Get(PATH_PARAM_ALL) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramAll( @io.micronaut.core.annotation.NonNull @@ -51,7 +51,7 @@ io.micronaut.http.HttpResponse paramAll( @io.micronaut.http.annotation.Header(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Post("/param/body/optional") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_OPTIONAL) @io.micronaut.http.annotation.Produces({ "application/json" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramBodyOptional( @@ -59,7 +59,7 @@ io.micronaut.http.HttpResponse paramBodyOptional( @io.micronaut.http.annotation.Body ParameterModel parameterModel); - @io.micronaut.http.annotation.Post("/param/body/required") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_REQUIRED) @io.micronaut.http.annotation.Produces({ "application/json" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramBodyRequired( @@ -67,147 +67,147 @@ io.micronaut.http.HttpResponse paramBodyRequired( @io.micronaut.http.annotation.Body ParameterModel parameterModel); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramCookieOptionalWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramCookieOptionalWithoutDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramCookieRequiredWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramCookieRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderOptionalWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderOptionalWithoutDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderRequiredWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_STRING) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathOverlayWithString( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{uuid}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_UUID) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathOverlayWithUuid( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/path/requiredWithDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathRequiredWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/requiredWithoutDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-bool/{bool}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_BOOLEAN) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithBoolean( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "bool") java.lang.Boolean bool); - @io.micronaut.http.annotation.Get("/param/path/with-integer/{integer}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_INTEGER) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithInteger( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/param/path/with-long/{long}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_LONG) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithLong( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "long") java.lang.Long _long); - @io.micronaut.http.annotation.Get("/param/path/with-max-length/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_MAX_LENGTH) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithMaxLength( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-pattern/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_PATTERN) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithPattern( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-uuid/{uuid}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_UUID) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithUuid( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/query/date") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryDate( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "date") java.time.LocalDate date); - @io.micronaut.http.annotation.Get("/param/query/date-time") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE_TIME) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryDateTime( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "date") java.time.Instant date); - @io.micronaut.http.annotation.Get("/param/query/multiple-lists?{&a*}{&b*}{&c*}") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_MULTIPLE_LISTS) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.core.annotation.Nullable @@ -220,42 +220,42 @@ io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.http.annotation.QueryValue(value = "c") java.util.List c); - @io.micronaut.http.annotation.Get("/param/query/number") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_NUMBER) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryNumber( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "date") java.lang.Double date); - @io.micronaut.http.annotation.Get("/param/query/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryOptionalWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryOptionalWithoutDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryRequiredWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/uuid") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_UUID) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryUuid( @io.micronaut.core.annotation.Nullable diff --git a/gen/main/java/testapi/defaults/RequestApi.java b/gen/main/java/testapi/defaults/RequestApi.java index af8fbced..8a68eb09 100644 --- a/gen/main/java/testapi/defaults/RequestApi.java +++ b/gen/main/java/testapi/defaults/RequestApi.java @@ -6,6 +6,6 @@ public interface RequestApi { java.lang.String PATH_NO_OPERATION_ID_GET = "/no-operation-id"; - @io.micronaut.http.annotation.Get("/no-operation-id") + @io.micronaut.http.annotation.Get(PATH_NO_OPERATION_ID_GET) io.micronaut.http.HttpResponse noOperationIdGet(); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/defaults/RequestApiClient.java b/gen/main/java/testapi/defaults/RequestApiClient.java index 884cfdd2..8ce23773 100644 --- a/gen/main/java/testapi/defaults/RequestApiClient.java +++ b/gen/main/java/testapi/defaults/RequestApiClient.java @@ -6,6 +6,6 @@ public interface RequestApiClient { java.lang.String PATH_NO_OPERATION_ID_GET = "/no-operation-id"; - @io.micronaut.http.annotation.Get("/no-operation-id") + @io.micronaut.http.annotation.Get(PATH_NO_OPERATION_ID_GET) io.micronaut.http.HttpResponse noOperationIdGet(); } diff --git a/gen/main/java/testapi/defaults/ResponseApi.java b/gen/main/java/testapi/defaults/ResponseApi.java index 285a0438..55d27757 100644 --- a/gen/main/java/testapi/defaults/ResponseApi.java +++ b/gen/main/java/testapi/defaults/ResponseApi.java @@ -20,43 +20,43 @@ public interface ResponseApi { java.lang.String PATH_VOID_NOT_FOUND = "/response/void-not-found"; java.lang.String PATH_WITH_DEFAULT = "/response/default"; - @io.micronaut.http.annotation.Get("/response/array-complex") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arrayComplex(); - @io.micronaut.http.annotation.Get("/response/array-complex-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX_NOT_FOUND) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arrayComplexNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/array-simple") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arraySimple(); - @io.micronaut.http.annotation.Get("/response/array-simple-empty") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_EMPTY) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arraySimpleEmpty(); - @io.micronaut.http.annotation.Get("/response/array-simple-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_NOT_FOUND) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arraySimpleNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/header") + @io.micronaut.http.annotation.Get(PATH_HEADER) io.micronaut.http.HttpResponse header(); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleDataTypes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES_NOT_FOUND) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.core.annotation.NonNull @@ -66,14 +66,14 @@ io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleResponseCodes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.core.annotation.NonNull @@ -83,26 +83,26 @@ io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/optional") + @io.micronaut.http.annotation.Get(PATH_OPTIONAL) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse optional( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/single") + @io.micronaut.http.annotation.Get(PATH_SINGLE) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse single(); - @io.micronaut.http.annotation.Get("/response/void") + @io.micronaut.http.annotation.Get(PATH_VOID_FOUND) io.micronaut.http.HttpResponse voidFound(); - @io.micronaut.http.annotation.Get("/response/void-not-found") + @io.micronaut.http.annotation.Get(PATH_VOID_NOT_FOUND) io.micronaut.http.HttpResponse voidNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/default") + @io.micronaut.http.annotation.Get(PATH_WITH_DEFAULT) io.micronaut.http.HttpResponse withDefault(); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/defaults/ResponseApiClient.java b/gen/main/java/testapi/defaults/ResponseApiClient.java index dd35f058..19782dda 100644 --- a/gen/main/java/testapi/defaults/ResponseApiClient.java +++ b/gen/main/java/testapi/defaults/ResponseApiClient.java @@ -20,43 +20,43 @@ public interface ResponseApiClient { java.lang.String PATH_VOID_NOT_FOUND = "/response/void-not-found"; java.lang.String PATH_WITH_DEFAULT = "/response/default"; - @io.micronaut.http.annotation.Get("/response/array-complex") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse> arrayComplex(); - @io.micronaut.http.annotation.Get("/response/array-complex-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX_NOT_FOUND) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse> arrayComplexNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/array-simple") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse> arraySimple(); - @io.micronaut.http.annotation.Get("/response/array-simple-empty") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_EMPTY) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse> arraySimpleEmpty(); - @io.micronaut.http.annotation.Get("/response/array-simple-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_NOT_FOUND) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse> arraySimpleNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/header") + @io.micronaut.http.annotation.Get(PATH_HEADER) io.micronaut.http.HttpResponse header(); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse multipleDataTypes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES_NOT_FOUND) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.core.annotation.NonNull @@ -66,14 +66,14 @@ io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse multipleResponseCodes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.core.annotation.NonNull @@ -83,26 +83,26 @@ io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/optional") + @io.micronaut.http.annotation.Get(PATH_OPTIONAL) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse optional( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/single") + @io.micronaut.http.annotation.Get(PATH_SINGLE) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse single(); - @io.micronaut.http.annotation.Get("/response/void") + @io.micronaut.http.annotation.Get(PATH_VOID_FOUND) io.micronaut.http.HttpResponse voidFound(); - @io.micronaut.http.annotation.Get("/response/void-not-found") + @io.micronaut.http.annotation.Get(PATH_VOID_NOT_FOUND) io.micronaut.http.HttpResponse voidNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/default") + @io.micronaut.http.annotation.Get(PATH_WITH_DEFAULT) io.micronaut.http.HttpResponse withDefault(); } diff --git a/gen/main/java/testapi/defaults/ValidationApi.java b/gen/main/java/testapi/defaults/ValidationApi.java index 48bd2b8c..7ec851dc 100644 --- a/gen/main/java/testapi/defaults/ValidationApi.java +++ b/gen/main/java/testapi/defaults/ValidationApi.java @@ -26,21 +26,21 @@ public interface ValidationApi { java.lang.String PATH_VALIDATION_STRING_PATTERN = "/validation/string/pattern"; java.lang.String PATH_VALIDATION_STRING_RANGE = "/validation/string/range"; - @io.micronaut.http.annotation.Get("/validation/double/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MAX) io.micronaut.http.HttpResponse validationDoubleMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @javax.validation.constraints.DecimalMax(value = "4", inclusive = false) java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/double/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MIN) io.micronaut.http.HttpResponse validationDoubleMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @javax.validation.constraints.DecimalMin(value = "3", inclusive = false) java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/double/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_RANGE) io.micronaut.http.HttpResponse validationDoubleRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @@ -48,21 +48,21 @@ io.micronaut.http.HttpResponse validationDoubleRange( @javax.validation.constraints.DecimalMax(value = "4", inclusive = true) java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/float/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MAX) io.micronaut.http.HttpResponse validationFloatMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @javax.validation.constraints.DecimalMax(value = "4", inclusive = false) java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MIN) io.micronaut.http.HttpResponse validationFloatMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @javax.validation.constraints.DecimalMin(value = "3", inclusive = false) java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_RANGE) io.micronaut.http.HttpResponse validationFloatRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @@ -70,21 +70,21 @@ io.micronaut.http.HttpResponse validationFloatRange( @javax.validation.constraints.DecimalMax(value = "4", inclusive = true) java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/integer/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MAX) io.micronaut.http.HttpResponse validationIntegerMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @javax.validation.constraints.Max(4) java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MIN) io.micronaut.http.HttpResponse validationIntegerMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @javax.validation.constraints.Min(3) java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_RANGE) io.micronaut.http.HttpResponse validationIntegerRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @@ -92,21 +92,21 @@ io.micronaut.http.HttpResponse validationIntegerRange( @javax.validation.constraints.Max(4) java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/list/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MAX) io.micronaut.http.HttpResponse validationListMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @javax.validation.constraints.Size(max = 4) java.util.List list); - @io.micronaut.http.annotation.Get("/validation/list/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MIN) io.micronaut.http.HttpResponse validationListMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @javax.validation.constraints.Size(min = 3) java.util.List list); - @io.micronaut.http.annotation.Post("/validation/list/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_MODEL) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse validationListModel( @io.micronaut.core.annotation.NonNull @@ -114,28 +114,28 @@ io.micronaut.http.HttpResponse validationListModel( @javax.validation.Valid java.util.List stringModel); - @io.micronaut.http.annotation.Post("/validation/list/range") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_RANGE) io.micronaut.http.HttpResponse validationListRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @javax.validation.constraints.Size(min = 3, max = 4) java.util.List list); - @io.micronaut.http.annotation.Get("/validation/long/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MAX) io.micronaut.http.HttpResponse validationLongMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @javax.validation.constraints.Max(4) java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MIN) io.micronaut.http.HttpResponse validationLongMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @javax.validation.constraints.Min(3) java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_RANGE) io.micronaut.http.HttpResponse validationLongRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @@ -143,7 +143,7 @@ io.micronaut.http.HttpResponse validationLongRange( @javax.validation.constraints.Max(4) java.lang.Long integer); - @io.micronaut.http.annotation.Post("/validation/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_MODEL) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse validationModel( @io.micronaut.core.annotation.NonNull @@ -151,31 +151,31 @@ io.micronaut.http.HttpResponse validationModel( @javax.validation.Valid StringModel stringModel); - @io.micronaut.http.annotation.Get("/validation/string/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MAX) io.micronaut.http.HttpResponse validationStringMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @javax.validation.constraints.Size(max = 4) java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MIN) io.micronaut.http.HttpResponse validationStringMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @javax.validation.constraints.Size(min = 3) java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/pattern") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_PATTERN) io.micronaut.http.HttpResponse validationStringPattern( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @javax.validation.constraints.Pattern(regexp = "[a-z]{3,5}") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_RANGE) io.micronaut.http.HttpResponse validationStringRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @javax.validation.constraints.Size(min = 3, max = 4) java.lang.String string); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/defaults/ValidationApiClient.java b/gen/main/java/testapi/defaults/ValidationApiClient.java index 7a662109..f88fabc8 100644 --- a/gen/main/java/testapi/defaults/ValidationApiClient.java +++ b/gen/main/java/testapi/defaults/ValidationApiClient.java @@ -13,10 +13,10 @@ public interface ValidationApiClient { java.lang.String PATH_VALIDATION_INTEGER_MAX = "/validation/integer/max"; java.lang.String PATH_VALIDATION_INTEGER_MIN = "/validation/integer/min"; java.lang.String PATH_VALIDATION_INTEGER_RANGE = "/validation/integer/range"; - java.lang.String PATH_VALIDATION_LIST_MAX = "/validation/list/max"; - java.lang.String PATH_VALIDATION_LIST_MIN = "/validation/list/min"; + java.lang.String PATH_VALIDATION_LIST_MAX = "/validation/list/max?{&list*}"; + java.lang.String PATH_VALIDATION_LIST_MIN = "/validation/list/min?{&list*}"; java.lang.String PATH_VALIDATION_LIST_MODEL = "/validation/list/model"; - java.lang.String PATH_VALIDATION_LIST_RANGE = "/validation/list/range"; + java.lang.String PATH_VALIDATION_LIST_RANGE = "/validation/list/range?{&list*}"; java.lang.String PATH_VALIDATION_LONG_MAX = "/validation/long/max"; java.lang.String PATH_VALIDATION_LONG_MIN = "/validation/long/min"; java.lang.String PATH_VALIDATION_LONG_RANGE = "/validation/long/range"; @@ -26,129 +26,129 @@ public interface ValidationApiClient { java.lang.String PATH_VALIDATION_STRING_PATTERN = "/validation/string/pattern"; java.lang.String PATH_VALIDATION_STRING_RANGE = "/validation/string/range"; - @io.micronaut.http.annotation.Get("/validation/double/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MAX) io.micronaut.http.HttpResponse validationDoubleMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/double/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MIN) io.micronaut.http.HttpResponse validationDoubleMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/double/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_RANGE) io.micronaut.http.HttpResponse validationDoubleRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/float/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MAX) io.micronaut.http.HttpResponse validationFloatMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MIN) io.micronaut.http.HttpResponse validationFloatMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_RANGE) io.micronaut.http.HttpResponse validationFloatRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/integer/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MAX) io.micronaut.http.HttpResponse validationIntegerMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MIN) io.micronaut.http.HttpResponse validationIntegerMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_RANGE) io.micronaut.http.HttpResponse validationIntegerRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/list/max?{&list*}") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MAX) io.micronaut.http.HttpResponse validationListMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "list") java.util.List list); - @io.micronaut.http.annotation.Get("/validation/list/min?{&list*}") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MIN) io.micronaut.http.HttpResponse validationListMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "list") java.util.List list); - @io.micronaut.http.annotation.Post("/validation/list/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_MODEL) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse validationListModel( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Body java.util.List stringModel); - @io.micronaut.http.annotation.Post("/validation/list/range?{&list*}") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_RANGE) io.micronaut.http.HttpResponse validationListRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "list") java.util.List list); - @io.micronaut.http.annotation.Get("/validation/long/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MAX) io.micronaut.http.HttpResponse validationLongMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MIN) io.micronaut.http.HttpResponse validationLongMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_RANGE) io.micronaut.http.HttpResponse validationLongRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Long integer); - @io.micronaut.http.annotation.Post("/validation/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_MODEL) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse validationModel( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Body StringModel stringModel); - @io.micronaut.http.annotation.Get("/validation/string/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MAX) io.micronaut.http.HttpResponse validationStringMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MIN) io.micronaut.http.HttpResponse validationStringMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/pattern") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_PATTERN) io.micronaut.http.HttpResponse validationStringPattern( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_RANGE) io.micronaut.http.HttpResponse validationStringRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") diff --git a/gen/main/java/testapi/modelsuffix/MediatypeApi.java b/gen/main/java/testapi/modelsuffix/MediatypeApi.java index 93a4b649..55506893 100644 --- a/gen/main/java/testapi/modelsuffix/MediatypeApi.java +++ b/gen/main/java/testapi/modelsuffix/MediatypeApi.java @@ -12,7 +12,7 @@ public interface MediatypeApi { java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; java.lang.String PATH_MEDIATYPE_PRODUCES_SAME_MODEL = "/mediatype/produces-with-same-model"; - @io.micronaut.http.annotation.Post("/mediatype/consumes-and-produces") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_AND_PRODUCES) @io.micronaut.http.annotation.Consumes({ "application/octet-stream" }) @io.micronaut.http.annotation.Produces({ "application/xml" }) io.micronaut.http.HttpResponse mediatypeConsumesAndProduces( @@ -20,7 +20,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesAndProduces( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-with-fileupload") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD) @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUpload( @@ -34,7 +34,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUp @io.micronaut.http.annotation.Part(value = "file") io.micronaut.http.multipart.CompletedFileUpload file); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD) @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( @@ -45,7 +45,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFil @io.micronaut.http.annotation.Part(value = "userId") java.lang.Integer userId); - @io.micronaut.http.annotation.Post("/mediatype/consumes-octet-stream") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_OCTET_STREAM) @io.micronaut.http.annotation.Consumes({ "application/octet-stream" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesOctetStream( @@ -53,7 +53,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesOctetStream( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-plain") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_PLAIN) @io.micronaut.http.annotation.Consumes({ "text/plain" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesPlain( @@ -61,7 +61,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesPlain( @io.micronaut.http.annotation.Body java.lang.String body); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-different-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL) @io.micronaut.http.annotation.Produces({ "application/json", "text/plain" }) io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.core.annotation.NonNull @@ -71,10 +71,10 @@ io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.http.annotation.QueryValue(value = "plain") java.lang.Boolean plain); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-same-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_SAME_MODEL) @io.micronaut.http.annotation.Produces({ "application/json", "application/xml" }) io.micronaut.http.HttpResponse mediatypeProducesSameModel( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "value") java.lang.String value); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/modelsuffix/MediatypeApiClient.java b/gen/main/java/testapi/modelsuffix/MediatypeApiClient.java index ee1ee51a..a2b825e4 100644 --- a/gen/main/java/testapi/modelsuffix/MediatypeApiClient.java +++ b/gen/main/java/testapi/modelsuffix/MediatypeApiClient.java @@ -12,7 +12,7 @@ public interface MediatypeApiClient { java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; java.lang.String PATH_MEDIATYPE_PRODUCES_SAME_MODEL = "/mediatype/produces-with-same-model"; - @io.micronaut.http.annotation.Post("/mediatype/consumes-and-produces") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_AND_PRODUCES) @io.micronaut.http.annotation.Produces({ "application/octet-stream" }) @io.micronaut.http.annotation.Consumes({ "application/xml" }) io.micronaut.http.HttpResponse mediatypeConsumesAndProduces( @@ -20,7 +20,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesAndProduces( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-with-fileupload") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD) @io.micronaut.http.annotation.Produces({ "multipart/form-data" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUpload( @@ -28,7 +28,7 @@ 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(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD) @io.micronaut.http.annotation.Produces({ "multipart/form-data" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( @@ -36,7 +36,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFil @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); - @io.micronaut.http.annotation.Post("/mediatype/consumes-octet-stream") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_OCTET_STREAM) @io.micronaut.http.annotation.Produces({ "application/octet-stream" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesOctetStream( @@ -44,7 +44,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesOctetStream( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-plain") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_PLAIN) @io.micronaut.http.annotation.Produces({ "text/plain" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesPlain( @@ -52,7 +52,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesPlain( @io.micronaut.http.annotation.Body java.lang.String body); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-different-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL) @io.micronaut.http.annotation.Consumes({ "application/json", "text/plain" }) io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.core.annotation.NonNull @@ -62,7 +62,7 @@ io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.http.annotation.QueryValue(value = "plain") java.lang.Boolean plain); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-same-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_SAME_MODEL) @io.micronaut.http.annotation.Consumes({ "application/json", "application/xml" }) io.micronaut.http.HttpResponse mediatypeProducesSameModel( @io.micronaut.core.annotation.NonNull diff --git a/gen/main/java/testapi/modelsuffix/ParameterApi.java b/gen/main/java/testapi/modelsuffix/ParameterApi.java index 28fa6937..25507e40 100644 --- a/gen/main/java/testapi/modelsuffix/ParameterApi.java +++ b/gen/main/java/testapi/modelsuffix/ParameterApi.java @@ -15,16 +15,16 @@ public interface ParameterApi { java.lang.String PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT = "/param/header/optionalWithoutDefault"; java.lang.String PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT = "/param/header/requiredWithDefault"; java.lang.String PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT = "/param/header/requiredWithoutDefault"; - java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_STRING = "/param/path/overlay/{string}"; - java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_UUID = "/param/path/overlay/{uuid}"; + java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_STRING = "/param/path/overlay/{string:10}"; + java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_UUID = "/param/path/overlay/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}"; java.lang.String PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT = "/param/path/requiredWithDefault/{string}"; java.lang.String PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT = "/param/path/requiredWithoutDefault/{string}"; - java.lang.String PATH_PARAM_PATH_WITH_BOOLEAN = "/param/path/with-bool/{bool}"; - java.lang.String PATH_PARAM_PATH_WITH_INTEGER = "/param/path/with-integer/{integer}"; - java.lang.String PATH_PARAM_PATH_WITH_LONG = "/param/path/with-long/{long}"; - java.lang.String PATH_PARAM_PATH_WITH_MAX_LENGTH = "/param/path/with-max-length/{string}"; - java.lang.String PATH_PARAM_PATH_WITH_PATTERN = "/param/path/with-pattern/{string}"; - java.lang.String PATH_PARAM_PATH_WITH_UUID = "/param/path/with-uuid/{uuid}"; + java.lang.String PATH_PARAM_PATH_WITH_BOOLEAN = "/param/path/with-bool/{bool:true|false}"; + java.lang.String PATH_PARAM_PATH_WITH_INTEGER = "/param/path/with-integer/{integer:\\-?[0-9]+}"; + java.lang.String PATH_PARAM_PATH_WITH_LONG = "/param/path/with-long/{long:\\-?[0-9]+}"; + java.lang.String PATH_PARAM_PATH_WITH_MAX_LENGTH = "/param/path/with-max-length/{string:5}"; + java.lang.String PATH_PARAM_PATH_WITH_PATTERN = "/param/path/with-pattern/{string:[0-9][a-z]}"; + java.lang.String PATH_PARAM_PATH_WITH_UUID = "/param/path/with-uuid/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}"; java.lang.String PATH_PARAM_QUERY_DATE = "/param/query/date"; java.lang.String PATH_PARAM_QUERY_DATE_TIME = "/param/query/date-time"; java.lang.String PATH_PARAM_QUERY_MULTIPLE_LISTS = "/param/query/multiple-lists"; @@ -35,7 +35,7 @@ public interface ParameterApi { java.lang.String PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT = "/param/query/requiredWithoutDefault"; java.lang.String PATH_PARAM_QUERY_UUID = "/param/query/uuid"; - @io.micronaut.http.annotation.Get("/param/all/{path}") + @io.micronaut.http.annotation.Get(PATH_PARAM_ALL) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramAll( @io.micronaut.core.annotation.NonNull @@ -51,7 +51,7 @@ io.micronaut.http.HttpResponse paramAll( @io.micronaut.http.annotation.Header(value = "integer") java.util.Optional integer); - @io.micronaut.http.annotation.Post("/param/body/optional") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_OPTIONAL) @io.micronaut.http.annotation.Consumes({ "application/json" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramBodyOptional( @@ -60,7 +60,7 @@ io.micronaut.http.HttpResponse paramBodyOptional( @javax.validation.Valid java.util.Optional parameterModelVO); - @io.micronaut.http.annotation.Post("/param/body/required") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_REQUIRED) @io.micronaut.http.annotation.Consumes({ "application/json" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramBodyRequired( @@ -69,63 +69,63 @@ io.micronaut.http.HttpResponse paramBodyRequired( @javax.validation.Valid ParameterModelVO parameterModelVO); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramCookieOptionalWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.CookieValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramCookieOptionalWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.CookieValue(value = "string") java.util.Optional string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramCookieRequiredWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.CookieValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramCookieRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderOptionalWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Header(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderOptionalWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Header(value = "string") java.util.Optional string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderRequiredWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Header(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{string:10}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_STRING) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathOverlayWithString( @io.micronaut.core.annotation.NonNull @@ -133,49 +133,49 @@ io.micronaut.http.HttpResponse paramPathOverlayWithString( @javax.validation.constraints.Size(max = 10) java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_UUID) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathOverlayWithUuid( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/path/requiredWithDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathRequiredWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/requiredWithoutDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-bool/{bool:true|false}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_BOOLEAN) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithBoolean( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "bool") java.lang.Boolean bool); - @io.micronaut.http.annotation.Get("/param/path/with-integer/{integer:\\-?[0-9]+}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_INTEGER) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithInteger( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/param/path/with-long/{long:\\-?[0-9]+}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_LONG) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithLong( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "long") java.lang.Long _long); - @io.micronaut.http.annotation.Get("/param/path/with-max-length/{string:5}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_MAX_LENGTH) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithMaxLength( @io.micronaut.core.annotation.NonNull @@ -183,7 +183,7 @@ io.micronaut.http.HttpResponse paramPathWithMaxLength( @javax.validation.constraints.Size(max = 5) java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-pattern/{string:[0-9][a-z]}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_PATTERN) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithPattern( @io.micronaut.core.annotation.NonNull @@ -191,28 +191,28 @@ io.micronaut.http.HttpResponse paramPathWithPattern( @javax.validation.constraints.Pattern(regexp = "[0-9][a-z]") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-uuid/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_UUID) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithUuid( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/query/date") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryDate( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "date") java.util.Optional date); - @io.micronaut.http.annotation.Get("/param/query/date-time") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE_TIME) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryDateTime( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "date") java.util.Optional date); - @io.micronaut.http.annotation.Get("/param/query/multiple-lists") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_MULTIPLE_LISTS) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.core.annotation.NonNull @@ -225,45 +225,45 @@ io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.http.annotation.QueryValue java.util.Optional> c); - @io.micronaut.http.annotation.Get("/param/query/number") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_NUMBER) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryNumber( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "date") java.util.Optional date); - @io.micronaut.http.annotation.Get("/param/query/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryOptionalWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryOptionalWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.util.Optional string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryRequiredWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/uuid") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_UUID) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryUuid( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "date") java.util.Optional date); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/modelsuffix/ParameterApiClient.java b/gen/main/java/testapi/modelsuffix/ParameterApiClient.java index 41e6799d..0f0517bf 100644 --- a/gen/main/java/testapi/modelsuffix/ParameterApiClient.java +++ b/gen/main/java/testapi/modelsuffix/ParameterApiClient.java @@ -27,7 +27,7 @@ public interface ParameterApiClient { java.lang.String PATH_PARAM_PATH_WITH_UUID = "/param/path/with-uuid/{uuid}"; java.lang.String PATH_PARAM_QUERY_DATE = "/param/query/date"; java.lang.String PATH_PARAM_QUERY_DATE_TIME = "/param/query/date-time"; - java.lang.String PATH_PARAM_QUERY_MULTIPLE_LISTS = "/param/query/multiple-lists"; + java.lang.String PATH_PARAM_QUERY_MULTIPLE_LISTS = "/param/query/multiple-lists?{&a*}{&b*}{&c*}"; java.lang.String PATH_PARAM_QUERY_NUMBER = "/param/query/number"; java.lang.String PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT = "/param/query/optionalWithDefault"; java.lang.String PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT = "/param/query/optionalWithoutDefault"; @@ -35,7 +35,7 @@ public interface ParameterApiClient { java.lang.String PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT = "/param/query/requiredWithoutDefault"; java.lang.String PATH_PARAM_QUERY_UUID = "/param/query/uuid"; - @io.micronaut.http.annotation.Get("/param/all/{path}") + @io.micronaut.http.annotation.Get(PATH_PARAM_ALL) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramAll( @io.micronaut.core.annotation.NonNull @@ -51,7 +51,7 @@ io.micronaut.http.HttpResponse paramAll( @io.micronaut.http.annotation.Header(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Post("/param/body/optional") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_OPTIONAL) @io.micronaut.http.annotation.Produces({ "application/json" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramBodyOptional( @@ -59,7 +59,7 @@ io.micronaut.http.HttpResponse paramBodyOptional( @io.micronaut.http.annotation.Body ParameterModelVO parameterModelVO); - @io.micronaut.http.annotation.Post("/param/body/required") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_REQUIRED) @io.micronaut.http.annotation.Produces({ "application/json" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramBodyRequired( @@ -67,147 +67,147 @@ io.micronaut.http.HttpResponse paramBodyRequired( @io.micronaut.http.annotation.Body ParameterModelVO parameterModelVO); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramCookieOptionalWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramCookieOptionalWithoutDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramCookieRequiredWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramCookieRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderOptionalWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderOptionalWithoutDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderRequiredWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_STRING) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathOverlayWithString( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{uuid}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_UUID) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathOverlayWithUuid( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/path/requiredWithDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathRequiredWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/requiredWithoutDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-bool/{bool}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_BOOLEAN) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithBoolean( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "bool") java.lang.Boolean bool); - @io.micronaut.http.annotation.Get("/param/path/with-integer/{integer}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_INTEGER) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithInteger( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/param/path/with-long/{long}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_LONG) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithLong( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "long") java.lang.Long _long); - @io.micronaut.http.annotation.Get("/param/path/with-max-length/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_MAX_LENGTH) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithMaxLength( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-pattern/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_PATTERN) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithPattern( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-uuid/{uuid}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_UUID) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithUuid( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/query/date") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryDate( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "date") java.time.LocalDate date); - @io.micronaut.http.annotation.Get("/param/query/date-time") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE_TIME) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryDateTime( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "date") java.time.Instant date); - @io.micronaut.http.annotation.Get("/param/query/multiple-lists?{&a*}{&b*}{&c*}") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_MULTIPLE_LISTS) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.core.annotation.Nullable @@ -220,42 +220,42 @@ io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.http.annotation.QueryValue(value = "c") java.util.List c); - @io.micronaut.http.annotation.Get("/param/query/number") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_NUMBER) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryNumber( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "date") java.lang.Double date); - @io.micronaut.http.annotation.Get("/param/query/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryOptionalWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryOptionalWithoutDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryRequiredWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/uuid") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_UUID) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryUuid( @io.micronaut.core.annotation.Nullable diff --git a/gen/main/java/testapi/modelsuffix/RequestApi.java b/gen/main/java/testapi/modelsuffix/RequestApi.java index c5a96670..ad990810 100644 --- a/gen/main/java/testapi/modelsuffix/RequestApi.java +++ b/gen/main/java/testapi/modelsuffix/RequestApi.java @@ -6,6 +6,6 @@ public interface RequestApi { java.lang.String PATH_NO_OPERATION_ID_GET = "/no-operation-id"; - @io.micronaut.http.annotation.Get("/no-operation-id") + @io.micronaut.http.annotation.Get(PATH_NO_OPERATION_ID_GET) io.micronaut.http.HttpResponse noOperationIdGet(); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/modelsuffix/RequestApiClient.java b/gen/main/java/testapi/modelsuffix/RequestApiClient.java index 74b4f935..5c68790d 100644 --- a/gen/main/java/testapi/modelsuffix/RequestApiClient.java +++ b/gen/main/java/testapi/modelsuffix/RequestApiClient.java @@ -6,6 +6,6 @@ public interface RequestApiClient { java.lang.String PATH_NO_OPERATION_ID_GET = "/no-operation-id"; - @io.micronaut.http.annotation.Get("/no-operation-id") + @io.micronaut.http.annotation.Get(PATH_NO_OPERATION_ID_GET) io.micronaut.http.HttpResponse noOperationIdGet(); } diff --git a/gen/main/java/testapi/modelsuffix/ResponseApi.java b/gen/main/java/testapi/modelsuffix/ResponseApi.java index 14e88253..41aad78e 100644 --- a/gen/main/java/testapi/modelsuffix/ResponseApi.java +++ b/gen/main/java/testapi/modelsuffix/ResponseApi.java @@ -20,43 +20,43 @@ public interface ResponseApi { java.lang.String PATH_VOID_NOT_FOUND = "/response/void-not-found"; java.lang.String PATH_WITH_DEFAULT = "/response/default"; - @io.micronaut.http.annotation.Get("/response/array-complex") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arrayComplex(); - @io.micronaut.http.annotation.Get("/response/array-complex-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX_NOT_FOUND) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arrayComplexNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/array-simple") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arraySimple(); - @io.micronaut.http.annotation.Get("/response/array-simple-empty") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_EMPTY) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arraySimpleEmpty(); - @io.micronaut.http.annotation.Get("/response/array-simple-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_NOT_FOUND) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arraySimpleNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/header") + @io.micronaut.http.annotation.Get(PATH_HEADER) io.micronaut.http.HttpResponse header(); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleDataTypes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES_NOT_FOUND) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.core.annotation.NonNull @@ -66,14 +66,14 @@ io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleResponseCodes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.core.annotation.NonNull @@ -83,26 +83,26 @@ io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/optional") + @io.micronaut.http.annotation.Get(PATH_OPTIONAL) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse optional( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/single") + @io.micronaut.http.annotation.Get(PATH_SINGLE) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse single(); - @io.micronaut.http.annotation.Get("/response/void") + @io.micronaut.http.annotation.Get(PATH_VOID_FOUND) io.micronaut.http.HttpResponse voidFound(); - @io.micronaut.http.annotation.Get("/response/void-not-found") + @io.micronaut.http.annotation.Get(PATH_VOID_NOT_FOUND) io.micronaut.http.HttpResponse voidNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/default") + @io.micronaut.http.annotation.Get(PATH_WITH_DEFAULT) io.micronaut.http.HttpResponse withDefault(); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/modelsuffix/ResponseApiClient.java b/gen/main/java/testapi/modelsuffix/ResponseApiClient.java index 3f95be6d..e7876225 100644 --- a/gen/main/java/testapi/modelsuffix/ResponseApiClient.java +++ b/gen/main/java/testapi/modelsuffix/ResponseApiClient.java @@ -20,43 +20,43 @@ public interface ResponseApiClient { java.lang.String PATH_VOID_NOT_FOUND = "/response/void-not-found"; java.lang.String PATH_WITH_DEFAULT = "/response/default"; - @io.micronaut.http.annotation.Get("/response/array-complex") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse> arrayComplex(); - @io.micronaut.http.annotation.Get("/response/array-complex-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX_NOT_FOUND) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse> arrayComplexNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/array-simple") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse> arraySimple(); - @io.micronaut.http.annotation.Get("/response/array-simple-empty") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_EMPTY) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse> arraySimpleEmpty(); - @io.micronaut.http.annotation.Get("/response/array-simple-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_NOT_FOUND) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse> arraySimpleNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/header") + @io.micronaut.http.annotation.Get(PATH_HEADER) io.micronaut.http.HttpResponse header(); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse multipleDataTypes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES_NOT_FOUND) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.core.annotation.NonNull @@ -66,14 +66,14 @@ io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse multipleResponseCodes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.core.annotation.NonNull @@ -83,26 +83,26 @@ io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/optional") + @io.micronaut.http.annotation.Get(PATH_OPTIONAL) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse optional( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/single") + @io.micronaut.http.annotation.Get(PATH_SINGLE) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse single(); - @io.micronaut.http.annotation.Get("/response/void") + @io.micronaut.http.annotation.Get(PATH_VOID_FOUND) io.micronaut.http.HttpResponse voidFound(); - @io.micronaut.http.annotation.Get("/response/void-not-found") + @io.micronaut.http.annotation.Get(PATH_VOID_NOT_FOUND) io.micronaut.http.HttpResponse voidNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/default") + @io.micronaut.http.annotation.Get(PATH_WITH_DEFAULT) io.micronaut.http.HttpResponse withDefault(); } diff --git a/gen/main/java/testapi/modelsuffix/ValidationApi.java b/gen/main/java/testapi/modelsuffix/ValidationApi.java index b2bc1566..7be32a75 100644 --- a/gen/main/java/testapi/modelsuffix/ValidationApi.java +++ b/gen/main/java/testapi/modelsuffix/ValidationApi.java @@ -26,21 +26,21 @@ public interface ValidationApi { java.lang.String PATH_VALIDATION_STRING_PATTERN = "/validation/string/pattern"; java.lang.String PATH_VALIDATION_STRING_RANGE = "/validation/string/range"; - @io.micronaut.http.annotation.Get("/validation/double/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MAX) io.micronaut.http.HttpResponse validationDoubleMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @javax.validation.constraints.DecimalMax(value = "4", inclusive = false) java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/double/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MIN) io.micronaut.http.HttpResponse validationDoubleMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @javax.validation.constraints.DecimalMin(value = "3", inclusive = false) java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/double/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_RANGE) io.micronaut.http.HttpResponse validationDoubleRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @@ -48,21 +48,21 @@ io.micronaut.http.HttpResponse validationDoubleRange( @javax.validation.constraints.DecimalMax(value = "4", inclusive = true) java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/float/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MAX) io.micronaut.http.HttpResponse validationFloatMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @javax.validation.constraints.DecimalMax(value = "4", inclusive = false) java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MIN) io.micronaut.http.HttpResponse validationFloatMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @javax.validation.constraints.DecimalMin(value = "3", inclusive = false) java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_RANGE) io.micronaut.http.HttpResponse validationFloatRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @@ -70,21 +70,21 @@ io.micronaut.http.HttpResponse validationFloatRange( @javax.validation.constraints.DecimalMax(value = "4", inclusive = true) java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/integer/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MAX) io.micronaut.http.HttpResponse validationIntegerMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @javax.validation.constraints.Max(4) java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MIN) io.micronaut.http.HttpResponse validationIntegerMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @javax.validation.constraints.Min(3) java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_RANGE) io.micronaut.http.HttpResponse validationIntegerRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @@ -92,21 +92,21 @@ io.micronaut.http.HttpResponse validationIntegerRange( @javax.validation.constraints.Max(4) java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/list/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MAX) io.micronaut.http.HttpResponse validationListMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @javax.validation.constraints.Size(max = 4) java.util.List list); - @io.micronaut.http.annotation.Get("/validation/list/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MIN) io.micronaut.http.HttpResponse validationListMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @javax.validation.constraints.Size(min = 3) java.util.List list); - @io.micronaut.http.annotation.Post("/validation/list/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_MODEL) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse validationListModel( @io.micronaut.core.annotation.NonNull @@ -114,28 +114,28 @@ io.micronaut.http.HttpResponse validationListModel( @javax.validation.Valid java.util.List stringModelVO); - @io.micronaut.http.annotation.Post("/validation/list/range") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_RANGE) io.micronaut.http.HttpResponse validationListRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @javax.validation.constraints.Size(min = 3, max = 4) java.util.List list); - @io.micronaut.http.annotation.Get("/validation/long/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MAX) io.micronaut.http.HttpResponse validationLongMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @javax.validation.constraints.Max(4) java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MIN) io.micronaut.http.HttpResponse validationLongMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @javax.validation.constraints.Min(3) java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_RANGE) io.micronaut.http.HttpResponse validationLongRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @@ -143,7 +143,7 @@ io.micronaut.http.HttpResponse validationLongRange( @javax.validation.constraints.Max(4) java.lang.Long integer); - @io.micronaut.http.annotation.Post("/validation/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_MODEL) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse validationModel( @io.micronaut.core.annotation.NonNull @@ -151,31 +151,31 @@ io.micronaut.http.HttpResponse validationModel( @javax.validation.Valid StringModelVO stringModelVO); - @io.micronaut.http.annotation.Get("/validation/string/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MAX) io.micronaut.http.HttpResponse validationStringMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @javax.validation.constraints.Size(max = 4) java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MIN) io.micronaut.http.HttpResponse validationStringMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @javax.validation.constraints.Size(min = 3) java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/pattern") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_PATTERN) io.micronaut.http.HttpResponse validationStringPattern( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @javax.validation.constraints.Pattern(regexp = "[a-z]{3,5}") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_RANGE) io.micronaut.http.HttpResponse validationStringRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @javax.validation.constraints.Size(min = 3, max = 4) java.lang.String string); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/modelsuffix/ValidationApiClient.java b/gen/main/java/testapi/modelsuffix/ValidationApiClient.java index 07b8f3f9..2f6f2c30 100644 --- a/gen/main/java/testapi/modelsuffix/ValidationApiClient.java +++ b/gen/main/java/testapi/modelsuffix/ValidationApiClient.java @@ -13,10 +13,10 @@ public interface ValidationApiClient { java.lang.String PATH_VALIDATION_INTEGER_MAX = "/validation/integer/max"; java.lang.String PATH_VALIDATION_INTEGER_MIN = "/validation/integer/min"; java.lang.String PATH_VALIDATION_INTEGER_RANGE = "/validation/integer/range"; - java.lang.String PATH_VALIDATION_LIST_MAX = "/validation/list/max"; - java.lang.String PATH_VALIDATION_LIST_MIN = "/validation/list/min"; + java.lang.String PATH_VALIDATION_LIST_MAX = "/validation/list/max?{&list*}"; + java.lang.String PATH_VALIDATION_LIST_MIN = "/validation/list/min?{&list*}"; java.lang.String PATH_VALIDATION_LIST_MODEL = "/validation/list/model"; - java.lang.String PATH_VALIDATION_LIST_RANGE = "/validation/list/range"; + java.lang.String PATH_VALIDATION_LIST_RANGE = "/validation/list/range?{&list*}"; java.lang.String PATH_VALIDATION_LONG_MAX = "/validation/long/max"; java.lang.String PATH_VALIDATION_LONG_MIN = "/validation/long/min"; java.lang.String PATH_VALIDATION_LONG_RANGE = "/validation/long/range"; @@ -26,129 +26,129 @@ public interface ValidationApiClient { java.lang.String PATH_VALIDATION_STRING_PATTERN = "/validation/string/pattern"; java.lang.String PATH_VALIDATION_STRING_RANGE = "/validation/string/range"; - @io.micronaut.http.annotation.Get("/validation/double/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MAX) io.micronaut.http.HttpResponse validationDoubleMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/double/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MIN) io.micronaut.http.HttpResponse validationDoubleMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/double/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_RANGE) io.micronaut.http.HttpResponse validationDoubleRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/float/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MAX) io.micronaut.http.HttpResponse validationFloatMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MIN) io.micronaut.http.HttpResponse validationFloatMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_RANGE) io.micronaut.http.HttpResponse validationFloatRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/integer/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MAX) io.micronaut.http.HttpResponse validationIntegerMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MIN) io.micronaut.http.HttpResponse validationIntegerMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_RANGE) io.micronaut.http.HttpResponse validationIntegerRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/list/max?{&list*}") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MAX) io.micronaut.http.HttpResponse validationListMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "list") java.util.List list); - @io.micronaut.http.annotation.Get("/validation/list/min?{&list*}") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MIN) io.micronaut.http.HttpResponse validationListMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "list") java.util.List list); - @io.micronaut.http.annotation.Post("/validation/list/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_MODEL) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse validationListModel( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Body java.util.List stringModelVO); - @io.micronaut.http.annotation.Post("/validation/list/range?{&list*}") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_RANGE) io.micronaut.http.HttpResponse validationListRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "list") java.util.List list); - @io.micronaut.http.annotation.Get("/validation/long/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MAX) io.micronaut.http.HttpResponse validationLongMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MIN) io.micronaut.http.HttpResponse validationLongMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_RANGE) io.micronaut.http.HttpResponse validationLongRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Long integer); - @io.micronaut.http.annotation.Post("/validation/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_MODEL) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse validationModel( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Body StringModelVO stringModelVO); - @io.micronaut.http.annotation.Get("/validation/string/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MAX) io.micronaut.http.HttpResponse validationStringMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MIN) io.micronaut.http.HttpResponse validationStringMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/pattern") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_PATTERN) io.micronaut.http.HttpResponse validationStringPattern( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_RANGE) io.micronaut.http.HttpResponse validationStringRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") diff --git a/gen/main/java/testapi/nogeneric/MediatypeApi.java b/gen/main/java/testapi/nogeneric/MediatypeApi.java index 6329cb6a..b337b12a 100644 --- a/gen/main/java/testapi/nogeneric/MediatypeApi.java +++ b/gen/main/java/testapi/nogeneric/MediatypeApi.java @@ -12,7 +12,7 @@ public interface MediatypeApi { java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; java.lang.String PATH_MEDIATYPE_PRODUCES_SAME_MODEL = "/mediatype/produces-with-same-model"; - @io.micronaut.http.annotation.Post("/mediatype/consumes-and-produces") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_AND_PRODUCES) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/octet-stream" }) @io.micronaut.http.annotation.Produces({ "application/xml" }) @@ -21,7 +21,7 @@ StringModel mediatypeConsumesAndProduces( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-with-fileupload") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) @@ -36,7 +36,7 @@ Multipart mediatypeConsumesMultipartWithFileUpload( @io.micronaut.http.annotation.Part(value = "file") io.micronaut.http.multipart.CompletedFileUpload file); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) @@ -48,7 +48,7 @@ Multipart mediatypeConsumesMultipartWithoutFileUpload( @io.micronaut.http.annotation.Part(value = "userId") java.lang.Integer userId); - @io.micronaut.http.annotation.Post("/mediatype/consumes-octet-stream") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_OCTET_STREAM) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/octet-stream" }) @io.micronaut.http.annotation.Produces({ "application/json" }) @@ -57,7 +57,7 @@ StringModel mediatypeConsumesOctetStream( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-plain") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_PLAIN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "text/plain" }) @io.micronaut.http.annotation.Produces({ "application/json" }) @@ -66,7 +66,7 @@ StringModel mediatypeConsumesPlain( @io.micronaut.http.annotation.Body java.lang.String body); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-different-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL) @io.micronaut.http.annotation.Produces({ "application/json", "text/plain" }) io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.core.annotation.NonNull @@ -76,11 +76,11 @@ io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.http.annotation.QueryValue(value = "plain") java.lang.Boolean plain); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-same-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_SAME_MODEL) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json", "application/xml" }) StringModel mediatypeProducesSameModel( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "value") java.lang.String value); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/nogeneric/MediatypeApiClient.java b/gen/main/java/testapi/nogeneric/MediatypeApiClient.java index 32bd27f7..58bc7162 100644 --- a/gen/main/java/testapi/nogeneric/MediatypeApiClient.java +++ b/gen/main/java/testapi/nogeneric/MediatypeApiClient.java @@ -12,7 +12,7 @@ public interface MediatypeApiClient { java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; java.lang.String PATH_MEDIATYPE_PRODUCES_SAME_MODEL = "/mediatype/produces-with-same-model"; - @io.micronaut.http.annotation.Post("/mediatype/consumes-and-produces") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_AND_PRODUCES) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/octet-stream" }) @io.micronaut.http.annotation.Consumes({ "application/xml" }) @@ -21,7 +21,7 @@ StringModel mediatypeConsumesAndProduces( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-with-fileupload") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD) @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" }) @@ -30,7 +30,7 @@ Multipart mediatypeConsumesMultipartWithFileUpload( @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(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD) @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" }) @@ -39,7 +39,7 @@ Multipart mediatypeConsumesMultipartWithoutFileUpload( @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); - @io.micronaut.http.annotation.Post("/mediatype/consumes-octet-stream") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_OCTET_STREAM) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/octet-stream" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) @@ -48,7 +48,7 @@ StringModel mediatypeConsumesOctetStream( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-plain") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_PLAIN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "text/plain" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) @@ -57,7 +57,7 @@ StringModel mediatypeConsumesPlain( @io.micronaut.http.annotation.Body java.lang.String body); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-different-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL) @io.micronaut.http.annotation.Consumes({ "application/json", "text/plain" }) io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.core.annotation.NonNull @@ -67,7 +67,7 @@ io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.http.annotation.QueryValue(value = "plain") java.lang.Boolean plain); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-same-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_SAME_MODEL) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json", "application/xml" }) StringModel mediatypeProducesSameModel( diff --git a/gen/main/java/testapi/nogeneric/ParameterApi.java b/gen/main/java/testapi/nogeneric/ParameterApi.java index 9da2ef5e..7cfbcae5 100644 --- a/gen/main/java/testapi/nogeneric/ParameterApi.java +++ b/gen/main/java/testapi/nogeneric/ParameterApi.java @@ -15,16 +15,16 @@ public interface ParameterApi { java.lang.String PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT = "/param/header/optionalWithoutDefault"; java.lang.String PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT = "/param/header/requiredWithDefault"; java.lang.String PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT = "/param/header/requiredWithoutDefault"; - java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_STRING = "/param/path/overlay/{string}"; - java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_UUID = "/param/path/overlay/{uuid}"; + java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_STRING = "/param/path/overlay/{string:10}"; + java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_UUID = "/param/path/overlay/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}"; java.lang.String PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT = "/param/path/requiredWithDefault/{string}"; java.lang.String PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT = "/param/path/requiredWithoutDefault/{string}"; - java.lang.String PATH_PARAM_PATH_WITH_BOOLEAN = "/param/path/with-bool/{bool}"; - java.lang.String PATH_PARAM_PATH_WITH_INTEGER = "/param/path/with-integer/{integer}"; - java.lang.String PATH_PARAM_PATH_WITH_LONG = "/param/path/with-long/{long}"; - java.lang.String PATH_PARAM_PATH_WITH_MAX_LENGTH = "/param/path/with-max-length/{string}"; - java.lang.String PATH_PARAM_PATH_WITH_PATTERN = "/param/path/with-pattern/{string}"; - java.lang.String PATH_PARAM_PATH_WITH_UUID = "/param/path/with-uuid/{uuid}"; + java.lang.String PATH_PARAM_PATH_WITH_BOOLEAN = "/param/path/with-bool/{bool:true|false}"; + java.lang.String PATH_PARAM_PATH_WITH_INTEGER = "/param/path/with-integer/{integer:\\-?[0-9]+}"; + java.lang.String PATH_PARAM_PATH_WITH_LONG = "/param/path/with-long/{long:\\-?[0-9]+}"; + java.lang.String PATH_PARAM_PATH_WITH_MAX_LENGTH = "/param/path/with-max-length/{string:5}"; + java.lang.String PATH_PARAM_PATH_WITH_PATTERN = "/param/path/with-pattern/{string:[0-9][a-z]}"; + java.lang.String PATH_PARAM_PATH_WITH_UUID = "/param/path/with-uuid/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}"; java.lang.String PATH_PARAM_QUERY_DATE = "/param/query/date"; java.lang.String PATH_PARAM_QUERY_DATE_TIME = "/param/query/date-time"; java.lang.String PATH_PARAM_QUERY_MULTIPLE_LISTS = "/param/query/multiple-lists"; @@ -35,7 +35,7 @@ public interface ParameterApi { java.lang.String PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT = "/param/query/requiredWithoutDefault"; java.lang.String PATH_PARAM_QUERY_UUID = "/param/query/uuid"; - @io.micronaut.http.annotation.Get("/param/all/{path}") + @io.micronaut.http.annotation.Get(PATH_PARAM_ALL) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramAll( @@ -52,7 +52,7 @@ ParameterModel paramAll( @io.micronaut.http.annotation.Header(value = "integer") java.util.Optional integer); - @io.micronaut.http.annotation.Post("/param/body/optional") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_OPTIONAL) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) @io.micronaut.http.annotation.Produces({ "application/json" }) @@ -62,7 +62,7 @@ ParameterModel paramBodyOptional( @javax.validation.Valid java.util.Optional parameterModel); - @io.micronaut.http.annotation.Post("/param/body/required") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_REQUIRED) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) @io.micronaut.http.annotation.Produces({ "application/json" }) @@ -72,7 +72,7 @@ ParameterModel paramBodyRequired( @javax.validation.Valid ParameterModel parameterModel); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramCookieOptionalWithDefault( @@ -80,7 +80,7 @@ ParameterModel paramCookieOptionalWithDefault( @io.micronaut.http.annotation.CookieValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramCookieOptionalWithoutDefault( @@ -88,7 +88,7 @@ ParameterModel paramCookieOptionalWithoutDefault( @io.micronaut.http.annotation.CookieValue(value = "string") java.util.Optional string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramCookieRequiredWithDefault( @@ -96,7 +96,7 @@ ParameterModel paramCookieRequiredWithDefault( @io.micronaut.http.annotation.CookieValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramCookieRequiredWithoutDefault( @@ -104,7 +104,7 @@ ParameterModel paramCookieRequiredWithoutDefault( @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramHeaderOptionalWithDefault( @@ -112,7 +112,7 @@ ParameterModel paramHeaderOptionalWithDefault( @io.micronaut.http.annotation.Header(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramHeaderOptionalWithoutDefault( @@ -120,7 +120,7 @@ ParameterModel paramHeaderOptionalWithoutDefault( @io.micronaut.http.annotation.Header(value = "string") java.util.Optional string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramHeaderRequiredWithDefault( @@ -128,7 +128,7 @@ ParameterModel paramHeaderRequiredWithDefault( @io.micronaut.http.annotation.Header(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramHeaderRequiredWithoutDefault( @@ -136,7 +136,7 @@ ParameterModel paramHeaderRequiredWithoutDefault( @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{string:10}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_STRING) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramPathOverlayWithString( @@ -145,7 +145,7 @@ ParameterModel paramPathOverlayWithString( @javax.validation.constraints.Size(max = 10) java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_UUID) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramPathOverlayWithUuid( @@ -153,7 +153,7 @@ ParameterModel paramPathOverlayWithUuid( @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/path/requiredWithDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramPathRequiredWithDefault( @@ -161,7 +161,7 @@ ParameterModel paramPathRequiredWithDefault( @io.micronaut.http.annotation.PathVariable(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/requiredWithoutDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramPathRequiredWithoutDefault( @@ -169,7 +169,7 @@ ParameterModel paramPathRequiredWithoutDefault( @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-bool/{bool:true|false}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_BOOLEAN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramPathWithBoolean( @@ -177,7 +177,7 @@ ParameterModel paramPathWithBoolean( @io.micronaut.http.annotation.PathVariable(value = "bool") java.lang.Boolean bool); - @io.micronaut.http.annotation.Get("/param/path/with-integer/{integer:\\-?[0-9]+}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_INTEGER) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramPathWithInteger( @@ -185,7 +185,7 @@ ParameterModel paramPathWithInteger( @io.micronaut.http.annotation.PathVariable(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/param/path/with-long/{long:\\-?[0-9]+}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_LONG) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramPathWithLong( @@ -193,7 +193,7 @@ ParameterModel paramPathWithLong( @io.micronaut.http.annotation.PathVariable(value = "long") java.lang.Long _long); - @io.micronaut.http.annotation.Get("/param/path/with-max-length/{string:5}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_MAX_LENGTH) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramPathWithMaxLength( @@ -202,7 +202,7 @@ ParameterModel paramPathWithMaxLength( @javax.validation.constraints.Size(max = 5) java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-pattern/{string:[0-9][a-z]}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_PATTERN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramPathWithPattern( @@ -211,7 +211,7 @@ ParameterModel paramPathWithPattern( @javax.validation.constraints.Pattern(regexp = "[0-9][a-z]") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-uuid/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_UUID) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramPathWithUuid( @@ -219,7 +219,7 @@ ParameterModel paramPathWithUuid( @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/query/date") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramQueryDate( @@ -227,7 +227,7 @@ ParameterModel paramQueryDate( @io.micronaut.http.annotation.QueryValue(value = "date") java.util.Optional date); - @io.micronaut.http.annotation.Get("/param/query/date-time") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE_TIME) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramQueryDateTime( @@ -235,7 +235,7 @@ ParameterModel paramQueryDateTime( @io.micronaut.http.annotation.QueryValue(value = "date") java.util.Optional date); - @io.micronaut.http.annotation.Get("/param/query/multiple-lists") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_MULTIPLE_LISTS) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramQueryMultipleLists( @@ -249,7 +249,7 @@ ParameterModel paramQueryMultipleLists( @io.micronaut.http.annotation.QueryValue java.util.Optional> c); - @io.micronaut.http.annotation.Get("/param/query/number") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_NUMBER) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramQueryNumber( @@ -257,7 +257,7 @@ ParameterModel paramQueryNumber( @io.micronaut.http.annotation.QueryValue(value = "date") java.util.Optional date); - @io.micronaut.http.annotation.Get("/param/query/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramQueryOptionalWithDefault( @@ -265,7 +265,7 @@ ParameterModel paramQueryOptionalWithDefault( @io.micronaut.http.annotation.QueryValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramQueryOptionalWithoutDefault( @@ -273,7 +273,7 @@ ParameterModel paramQueryOptionalWithoutDefault( @io.micronaut.http.annotation.QueryValue(value = "string") java.util.Optional string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramQueryRequiredWithDefault( @@ -281,7 +281,7 @@ ParameterModel paramQueryRequiredWithDefault( @io.micronaut.http.annotation.QueryValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramQueryRequiredWithoutDefault( @@ -289,11 +289,11 @@ ParameterModel paramQueryRequiredWithoutDefault( @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/uuid") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_UUID) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramQueryUuid( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "date") java.util.Optional date); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/nogeneric/ParameterApiClient.java b/gen/main/java/testapi/nogeneric/ParameterApiClient.java index bafe7f06..1cadd41f 100644 --- a/gen/main/java/testapi/nogeneric/ParameterApiClient.java +++ b/gen/main/java/testapi/nogeneric/ParameterApiClient.java @@ -27,7 +27,7 @@ public interface ParameterApiClient { java.lang.String PATH_PARAM_PATH_WITH_UUID = "/param/path/with-uuid/{uuid}"; java.lang.String PATH_PARAM_QUERY_DATE = "/param/query/date"; java.lang.String PATH_PARAM_QUERY_DATE_TIME = "/param/query/date-time"; - java.lang.String PATH_PARAM_QUERY_MULTIPLE_LISTS = "/param/query/multiple-lists"; + java.lang.String PATH_PARAM_QUERY_MULTIPLE_LISTS = "/param/query/multiple-lists?{&a*}{&b*}{&c*}"; java.lang.String PATH_PARAM_QUERY_NUMBER = "/param/query/number"; java.lang.String PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT = "/param/query/optionalWithDefault"; java.lang.String PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT = "/param/query/optionalWithoutDefault"; @@ -35,7 +35,7 @@ public interface ParameterApiClient { java.lang.String PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT = "/param/query/requiredWithoutDefault"; java.lang.String PATH_PARAM_QUERY_UUID = "/param/query/uuid"; - @io.micronaut.http.annotation.Get("/param/all/{path}") + @io.micronaut.http.annotation.Get(PATH_PARAM_ALL) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) ParameterModel paramAll( @@ -52,7 +52,7 @@ ParameterModel paramAll( @io.micronaut.http.annotation.Header(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Post("/param/body/optional") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_OPTIONAL) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) @@ -61,7 +61,7 @@ ParameterModel paramBodyOptional( @io.micronaut.http.annotation.Body ParameterModel parameterModel); - @io.micronaut.http.annotation.Post("/param/body/required") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_REQUIRED) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) @@ -70,7 +70,7 @@ ParameterModel paramBodyRequired( @io.micronaut.http.annotation.Body ParameterModel parameterModel); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) ParameterModel paramCookieOptionalWithDefault( @@ -78,7 +78,7 @@ ParameterModel paramCookieOptionalWithDefault( @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) ParameterModel paramCookieOptionalWithoutDefault( @@ -86,7 +86,7 @@ ParameterModel paramCookieOptionalWithoutDefault( @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) ParameterModel paramCookieRequiredWithDefault( @@ -94,7 +94,7 @@ ParameterModel paramCookieRequiredWithDefault( @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) ParameterModel paramCookieRequiredWithoutDefault( @@ -102,7 +102,7 @@ ParameterModel paramCookieRequiredWithoutDefault( @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) ParameterModel paramHeaderOptionalWithDefault( @@ -110,7 +110,7 @@ ParameterModel paramHeaderOptionalWithDefault( @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) ParameterModel paramHeaderOptionalWithoutDefault( @@ -118,7 +118,7 @@ ParameterModel paramHeaderOptionalWithoutDefault( @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) ParameterModel paramHeaderRequiredWithDefault( @@ -126,7 +126,7 @@ ParameterModel paramHeaderRequiredWithDefault( @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) ParameterModel paramHeaderRequiredWithoutDefault( @@ -134,7 +134,7 @@ ParameterModel paramHeaderRequiredWithoutDefault( @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_STRING) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) ParameterModel paramPathOverlayWithString( @@ -142,7 +142,7 @@ ParameterModel paramPathOverlayWithString( @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{uuid}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_UUID) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) ParameterModel paramPathOverlayWithUuid( @@ -150,7 +150,7 @@ ParameterModel paramPathOverlayWithUuid( @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/path/requiredWithDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) ParameterModel paramPathRequiredWithDefault( @@ -158,7 +158,7 @@ ParameterModel paramPathRequiredWithDefault( @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/requiredWithoutDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) ParameterModel paramPathRequiredWithoutDefault( @@ -166,7 +166,7 @@ ParameterModel paramPathRequiredWithoutDefault( @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-bool/{bool}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_BOOLEAN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) ParameterModel paramPathWithBoolean( @@ -174,7 +174,7 @@ ParameterModel paramPathWithBoolean( @io.micronaut.http.annotation.PathVariable(value = "bool") java.lang.Boolean bool); - @io.micronaut.http.annotation.Get("/param/path/with-integer/{integer}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_INTEGER) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) ParameterModel paramPathWithInteger( @@ -182,7 +182,7 @@ ParameterModel paramPathWithInteger( @io.micronaut.http.annotation.PathVariable(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/param/path/with-long/{long}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_LONG) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) ParameterModel paramPathWithLong( @@ -190,7 +190,7 @@ ParameterModel paramPathWithLong( @io.micronaut.http.annotation.PathVariable(value = "long") java.lang.Long _long); - @io.micronaut.http.annotation.Get("/param/path/with-max-length/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_MAX_LENGTH) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) ParameterModel paramPathWithMaxLength( @@ -198,7 +198,7 @@ ParameterModel paramPathWithMaxLength( @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-pattern/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_PATTERN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) ParameterModel paramPathWithPattern( @@ -206,7 +206,7 @@ ParameterModel paramPathWithPattern( @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-uuid/{uuid}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_UUID) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) ParameterModel paramPathWithUuid( @@ -214,7 +214,7 @@ ParameterModel paramPathWithUuid( @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/query/date") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) ParameterModel paramQueryDate( @@ -222,7 +222,7 @@ ParameterModel paramQueryDate( @io.micronaut.http.annotation.QueryValue(value = "date") java.time.LocalDate date); - @io.micronaut.http.annotation.Get("/param/query/date-time") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE_TIME) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) ParameterModel paramQueryDateTime( @@ -230,7 +230,7 @@ ParameterModel paramQueryDateTime( @io.micronaut.http.annotation.QueryValue(value = "date") java.time.Instant date); - @io.micronaut.http.annotation.Get("/param/query/multiple-lists?{&a*}{&b*}{&c*}") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_MULTIPLE_LISTS) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) ParameterModel paramQueryMultipleLists( @@ -244,7 +244,7 @@ ParameterModel paramQueryMultipleLists( @io.micronaut.http.annotation.QueryValue(value = "c") java.util.List c); - @io.micronaut.http.annotation.Get("/param/query/number") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_NUMBER) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) ParameterModel paramQueryNumber( @@ -252,7 +252,7 @@ ParameterModel paramQueryNumber( @io.micronaut.http.annotation.QueryValue(value = "date") java.lang.Double date); - @io.micronaut.http.annotation.Get("/param/query/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) ParameterModel paramQueryOptionalWithDefault( @@ -260,7 +260,7 @@ ParameterModel paramQueryOptionalWithDefault( @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) ParameterModel paramQueryOptionalWithoutDefault( @@ -268,7 +268,7 @@ ParameterModel paramQueryOptionalWithoutDefault( @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) ParameterModel paramQueryRequiredWithDefault( @@ -276,7 +276,7 @@ ParameterModel paramQueryRequiredWithDefault( @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) ParameterModel paramQueryRequiredWithoutDefault( @@ -284,7 +284,7 @@ ParameterModel paramQueryRequiredWithoutDefault( @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/uuid") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_UUID) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) ParameterModel paramQueryUuid( diff --git a/gen/main/java/testapi/nogeneric/RequestApi.java b/gen/main/java/testapi/nogeneric/RequestApi.java index 1796ee13..6d34f59c 100644 --- a/gen/main/java/testapi/nogeneric/RequestApi.java +++ b/gen/main/java/testapi/nogeneric/RequestApi.java @@ -6,7 +6,7 @@ public interface RequestApi { java.lang.String PATH_NO_OPERATION_ID_GET = "/no-operation-id"; - @io.micronaut.http.annotation.Get("/no-operation-id") + @io.micronaut.http.annotation.Get(PATH_NO_OPERATION_ID_GET) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void noOperationIdGet(); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/nogeneric/RequestApiClient.java b/gen/main/java/testapi/nogeneric/RequestApiClient.java index d1ac4571..3fd2e0a7 100644 --- a/gen/main/java/testapi/nogeneric/RequestApiClient.java +++ b/gen/main/java/testapi/nogeneric/RequestApiClient.java @@ -6,7 +6,7 @@ public interface RequestApiClient { java.lang.String PATH_NO_OPERATION_ID_GET = "/no-operation-id"; - @io.micronaut.http.annotation.Get("/no-operation-id") + @io.micronaut.http.annotation.Get(PATH_NO_OPERATION_ID_GET) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void noOperationIdGet(); } diff --git a/gen/main/java/testapi/nogeneric/ResponseApi.java b/gen/main/java/testapi/nogeneric/ResponseApi.java index 9076561f..b95d1a02 100644 --- a/gen/main/java/testapi/nogeneric/ResponseApi.java +++ b/gen/main/java/testapi/nogeneric/ResponseApi.java @@ -20,12 +20,12 @@ public interface ResponseApi { java.lang.String PATH_VOID_NOT_FOUND = "/response/void-not-found"; java.lang.String PATH_WITH_DEFAULT = "/response/default"; - @io.micronaut.http.annotation.Get("/response/array-complex") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) java.util.List arrayComplex(); - @io.micronaut.http.annotation.Get("/response/array-complex-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX_NOT_FOUND) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) java.util.Optional> arrayComplexNotFound( @@ -33,17 +33,17 @@ java.util.Optional> arrayComplexNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/array-simple") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) java.util.List arraySimple(); - @io.micronaut.http.annotation.Get("/response/array-simple-empty") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_EMPTY) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) java.util.List arraySimpleEmpty(); - @io.micronaut.http.annotation.Get("/response/array-simple-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_NOT_FOUND) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) java.util.Optional> arraySimpleNotFound( @@ -51,17 +51,17 @@ java.util.Optional> arraySimpleNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/header") + @io.micronaut.http.annotation.Get(PATH_HEADER) io.micronaut.http.HttpResponse header(); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleDataTypes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES_NOT_FOUND) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.core.annotation.NonNull @@ -71,14 +71,14 @@ io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleResponseCodes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.core.annotation.NonNull @@ -88,7 +88,7 @@ io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/optional") + @io.micronaut.http.annotation.Get(PATH_OPTIONAL) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) java.util.Optional optional( @@ -96,23 +96,23 @@ java.util.Optional optional( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/single") + @io.micronaut.http.annotation.Get(PATH_SINGLE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) java.lang.String single(); - @io.micronaut.http.annotation.Get("/response/void") + @io.micronaut.http.annotation.Get(PATH_VOID_FOUND) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void voidFound(); - @io.micronaut.http.annotation.Get("/response/void-not-found") + @io.micronaut.http.annotation.Get(PATH_VOID_NOT_FOUND) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void voidNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/default") + @io.micronaut.http.annotation.Get(PATH_WITH_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void withDefault(); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/nogeneric/ResponseApiClient.java b/gen/main/java/testapi/nogeneric/ResponseApiClient.java index 8fd4fd17..eb23ce85 100644 --- a/gen/main/java/testapi/nogeneric/ResponseApiClient.java +++ b/gen/main/java/testapi/nogeneric/ResponseApiClient.java @@ -20,12 +20,12 @@ public interface ResponseApiClient { java.lang.String PATH_VOID_NOT_FOUND = "/response/void-not-found"; java.lang.String PATH_WITH_DEFAULT = "/response/default"; - @io.micronaut.http.annotation.Get("/response/array-complex") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) java.util.List arrayComplex(); - @io.micronaut.http.annotation.Get("/response/array-complex-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX_NOT_FOUND) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) java.util.Optional> arrayComplexNotFound( @@ -33,17 +33,17 @@ java.util.Optional> arrayComplexNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/array-simple") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) java.util.List arraySimple(); - @io.micronaut.http.annotation.Get("/response/array-simple-empty") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_EMPTY) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) java.util.List arraySimpleEmpty(); - @io.micronaut.http.annotation.Get("/response/array-simple-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_NOT_FOUND) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) java.util.Optional> arraySimpleNotFound( @@ -51,17 +51,17 @@ java.util.Optional> arraySimpleNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/header") + @io.micronaut.http.annotation.Get(PATH_HEADER) io.micronaut.http.HttpResponse header(); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse multipleDataTypes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES_NOT_FOUND) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.core.annotation.NonNull @@ -71,14 +71,14 @@ io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse multipleResponseCodes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.core.annotation.NonNull @@ -88,7 +88,7 @@ io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/optional") + @io.micronaut.http.annotation.Get(PATH_OPTIONAL) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) java.util.Optional optional( @@ -96,23 +96,23 @@ java.util.Optional optional( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/single") + @io.micronaut.http.annotation.Get(PATH_SINGLE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Consumes({ "application/json" }) java.lang.String single(); - @io.micronaut.http.annotation.Get("/response/void") + @io.micronaut.http.annotation.Get(PATH_VOID_FOUND) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void voidFound(); - @io.micronaut.http.annotation.Get("/response/void-not-found") + @io.micronaut.http.annotation.Get(PATH_VOID_NOT_FOUND) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void voidNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/default") + @io.micronaut.http.annotation.Get(PATH_WITH_DEFAULT) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void withDefault(); } diff --git a/gen/main/java/testapi/nogeneric/ValidationApi.java b/gen/main/java/testapi/nogeneric/ValidationApi.java index bf1fcb1e..94fe6ff0 100644 --- a/gen/main/java/testapi/nogeneric/ValidationApi.java +++ b/gen/main/java/testapi/nogeneric/ValidationApi.java @@ -26,7 +26,7 @@ public interface ValidationApi { java.lang.String PATH_VALIDATION_STRING_PATTERN = "/validation/string/pattern"; java.lang.String PATH_VALIDATION_STRING_RANGE = "/validation/string/range"; - @io.micronaut.http.annotation.Get("/validation/double/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MAX) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationDoubleMax( @io.micronaut.core.annotation.NonNull @@ -34,7 +34,7 @@ void validationDoubleMax( @javax.validation.constraints.DecimalMax(value = "4", inclusive = false) java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/double/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MIN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationDoubleMin( @io.micronaut.core.annotation.NonNull @@ -42,7 +42,7 @@ void validationDoubleMin( @javax.validation.constraints.DecimalMin(value = "3", inclusive = false) java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/double/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_RANGE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationDoubleRange( @io.micronaut.core.annotation.NonNull @@ -51,7 +51,7 @@ void validationDoubleRange( @javax.validation.constraints.DecimalMax(value = "4", inclusive = true) java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/float/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MAX) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationFloatMax( @io.micronaut.core.annotation.NonNull @@ -59,7 +59,7 @@ void validationFloatMax( @javax.validation.constraints.DecimalMax(value = "4", inclusive = false) java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MIN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationFloatMin( @io.micronaut.core.annotation.NonNull @@ -67,7 +67,7 @@ void validationFloatMin( @javax.validation.constraints.DecimalMin(value = "3", inclusive = false) java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_RANGE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationFloatRange( @io.micronaut.core.annotation.NonNull @@ -76,7 +76,7 @@ void validationFloatRange( @javax.validation.constraints.DecimalMax(value = "4", inclusive = true) java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/integer/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MAX) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationIntegerMax( @io.micronaut.core.annotation.NonNull @@ -84,7 +84,7 @@ void validationIntegerMax( @javax.validation.constraints.Max(4) java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MIN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationIntegerMin( @io.micronaut.core.annotation.NonNull @@ -92,7 +92,7 @@ void validationIntegerMin( @javax.validation.constraints.Min(3) java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_RANGE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationIntegerRange( @io.micronaut.core.annotation.NonNull @@ -101,7 +101,7 @@ void validationIntegerRange( @javax.validation.constraints.Max(4) java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/list/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MAX) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationListMax( @io.micronaut.core.annotation.NonNull @@ -109,7 +109,7 @@ void validationListMax( @javax.validation.constraints.Size(max = 4) java.util.List list); - @io.micronaut.http.annotation.Get("/validation/list/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MIN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationListMin( @io.micronaut.core.annotation.NonNull @@ -117,7 +117,7 @@ void validationListMin( @javax.validation.constraints.Size(min = 3) java.util.List list); - @io.micronaut.http.annotation.Post("/validation/list/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_MODEL) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) @io.micronaut.http.annotation.Consumes({ "application/json" }) void validationListModel( @@ -126,7 +126,7 @@ void validationListModel( @javax.validation.Valid java.util.List stringModel); - @io.micronaut.http.annotation.Post("/validation/list/range") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_RANGE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationListRange( @io.micronaut.core.annotation.NonNull @@ -134,7 +134,7 @@ void validationListRange( @javax.validation.constraints.Size(min = 3, max = 4) java.util.List list); - @io.micronaut.http.annotation.Get("/validation/long/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MAX) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationLongMax( @io.micronaut.core.annotation.NonNull @@ -142,7 +142,7 @@ void validationLongMax( @javax.validation.constraints.Max(4) java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MIN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationLongMin( @io.micronaut.core.annotation.NonNull @@ -150,7 +150,7 @@ void validationLongMin( @javax.validation.constraints.Min(3) java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_RANGE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationLongRange( @io.micronaut.core.annotation.NonNull @@ -159,7 +159,7 @@ void validationLongRange( @javax.validation.constraints.Max(4) java.lang.Long integer); - @io.micronaut.http.annotation.Post("/validation/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_MODEL) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) @io.micronaut.http.annotation.Consumes({ "application/json" }) void validationModel( @@ -168,7 +168,7 @@ void validationModel( @javax.validation.Valid StringModel stringModel); - @io.micronaut.http.annotation.Get("/validation/string/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MAX) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationStringMax( @io.micronaut.core.annotation.NonNull @@ -176,7 +176,7 @@ void validationStringMax( @javax.validation.constraints.Size(max = 4) java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MIN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationStringMin( @io.micronaut.core.annotation.NonNull @@ -184,7 +184,7 @@ void validationStringMin( @javax.validation.constraints.Size(min = 3) java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/pattern") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_PATTERN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationStringPattern( @io.micronaut.core.annotation.NonNull @@ -192,11 +192,11 @@ void validationStringPattern( @javax.validation.constraints.Pattern(regexp = "[a-z]{3,5}") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_RANGE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationStringRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @javax.validation.constraints.Size(min = 3, max = 4) java.lang.String string); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/nogeneric/ValidationApiClient.java b/gen/main/java/testapi/nogeneric/ValidationApiClient.java index 2acb7e4b..93c9fef3 100644 --- a/gen/main/java/testapi/nogeneric/ValidationApiClient.java +++ b/gen/main/java/testapi/nogeneric/ValidationApiClient.java @@ -13,10 +13,10 @@ public interface ValidationApiClient { java.lang.String PATH_VALIDATION_INTEGER_MAX = "/validation/integer/max"; java.lang.String PATH_VALIDATION_INTEGER_MIN = "/validation/integer/min"; java.lang.String PATH_VALIDATION_INTEGER_RANGE = "/validation/integer/range"; - java.lang.String PATH_VALIDATION_LIST_MAX = "/validation/list/max"; - java.lang.String PATH_VALIDATION_LIST_MIN = "/validation/list/min"; + java.lang.String PATH_VALIDATION_LIST_MAX = "/validation/list/max?{&list*}"; + java.lang.String PATH_VALIDATION_LIST_MIN = "/validation/list/min?{&list*}"; java.lang.String PATH_VALIDATION_LIST_MODEL = "/validation/list/model"; - java.lang.String PATH_VALIDATION_LIST_RANGE = "/validation/list/range"; + java.lang.String PATH_VALIDATION_LIST_RANGE = "/validation/list/range?{&list*}"; java.lang.String PATH_VALIDATION_LONG_MAX = "/validation/long/max"; java.lang.String PATH_VALIDATION_LONG_MIN = "/validation/long/min"; java.lang.String PATH_VALIDATION_LONG_RANGE = "/validation/long/range"; @@ -26,84 +26,84 @@ public interface ValidationApiClient { java.lang.String PATH_VALIDATION_STRING_PATTERN = "/validation/string/pattern"; java.lang.String PATH_VALIDATION_STRING_RANGE = "/validation/string/range"; - @io.micronaut.http.annotation.Get("/validation/double/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MAX) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationDoubleMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/double/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MIN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationDoubleMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/double/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_RANGE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationDoubleRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/float/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MAX) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationFloatMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MIN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationFloatMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_RANGE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationFloatRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/integer/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MAX) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationIntegerMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MIN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationIntegerMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_RANGE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationIntegerRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/list/max?{&list*}") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MAX) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationListMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "list") java.util.List list); - @io.micronaut.http.annotation.Get("/validation/list/min?{&list*}") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MIN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationListMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "list") java.util.List list); - @io.micronaut.http.annotation.Post("/validation/list/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_MODEL) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) @io.micronaut.http.annotation.Produces({ "application/json" }) void validationListModel( @@ -111,35 +111,35 @@ void validationListModel( @io.micronaut.http.annotation.Body java.util.List stringModel); - @io.micronaut.http.annotation.Post("/validation/list/range?{&list*}") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_RANGE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationListRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "list") java.util.List list); - @io.micronaut.http.annotation.Get("/validation/long/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MAX) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationLongMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MIN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationLongMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_RANGE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationLongRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Long integer); - @io.micronaut.http.annotation.Post("/validation/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_MODEL) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) @io.micronaut.http.annotation.Produces({ "application/json" }) void validationModel( @@ -147,28 +147,28 @@ void validationModel( @io.micronaut.http.annotation.Body StringModel stringModel); - @io.micronaut.http.annotation.Get("/validation/string/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MAX) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationStringMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MIN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationStringMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/pattern") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_PATTERN) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationStringPattern( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_RANGE) @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationStringRange( @io.micronaut.core.annotation.NonNull diff --git a/gen/main/java/testapi/nooptional/MediatypeApi.java b/gen/main/java/testapi/nooptional/MediatypeApi.java index 6f204c02..fdc2a633 100644 --- a/gen/main/java/testapi/nooptional/MediatypeApi.java +++ b/gen/main/java/testapi/nooptional/MediatypeApi.java @@ -12,7 +12,7 @@ public interface MediatypeApi { java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; java.lang.String PATH_MEDIATYPE_PRODUCES_SAME_MODEL = "/mediatype/produces-with-same-model"; - @io.micronaut.http.annotation.Post("/mediatype/consumes-and-produces") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_AND_PRODUCES) @io.micronaut.http.annotation.Consumes({ "application/octet-stream" }) @io.micronaut.http.annotation.Produces({ "application/xml" }) io.micronaut.http.HttpResponse mediatypeConsumesAndProduces( @@ -20,7 +20,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesAndProduces( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-with-fileupload") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD) @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUpload( @@ -34,7 +34,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUplo @io.micronaut.http.annotation.Part(value = "file") io.micronaut.http.multipart.CompletedFileUpload file); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD) @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( @@ -45,7 +45,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileU @io.micronaut.http.annotation.Part(value = "userId") java.lang.Integer userId); - @io.micronaut.http.annotation.Post("/mediatype/consumes-octet-stream") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_OCTET_STREAM) @io.micronaut.http.annotation.Consumes({ "application/octet-stream" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesOctetStream( @@ -53,7 +53,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesOctetStream( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-plain") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_PLAIN) @io.micronaut.http.annotation.Consumes({ "text/plain" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesPlain( @@ -61,7 +61,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesPlain( @io.micronaut.http.annotation.Body java.lang.String body); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-different-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL) @io.micronaut.http.annotation.Produces({ "application/json", "text/plain" }) io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.core.annotation.NonNull @@ -71,10 +71,10 @@ io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.http.annotation.QueryValue(value = "plain") java.lang.Boolean plain); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-same-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_SAME_MODEL) @io.micronaut.http.annotation.Produces({ "application/json", "application/xml" }) io.micronaut.http.HttpResponse mediatypeProducesSameModel( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "value") java.lang.String value); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/nooptional/MediatypeApiClient.java b/gen/main/java/testapi/nooptional/MediatypeApiClient.java index 7838c991..5aca12ef 100644 --- a/gen/main/java/testapi/nooptional/MediatypeApiClient.java +++ b/gen/main/java/testapi/nooptional/MediatypeApiClient.java @@ -12,7 +12,7 @@ public interface MediatypeApiClient { java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; java.lang.String PATH_MEDIATYPE_PRODUCES_SAME_MODEL = "/mediatype/produces-with-same-model"; - @io.micronaut.http.annotation.Post("/mediatype/consumes-and-produces") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_AND_PRODUCES) @io.micronaut.http.annotation.Produces({ "application/octet-stream" }) @io.micronaut.http.annotation.Consumes({ "application/xml" }) io.micronaut.http.HttpResponse mediatypeConsumesAndProduces( @@ -20,7 +20,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesAndProduces( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-with-fileupload") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD) @io.micronaut.http.annotation.Produces({ "multipart/form-data" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUpload( @@ -28,7 +28,7 @@ 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(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD) @io.micronaut.http.annotation.Produces({ "multipart/form-data" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( @@ -36,7 +36,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileU @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); - @io.micronaut.http.annotation.Post("/mediatype/consumes-octet-stream") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_OCTET_STREAM) @io.micronaut.http.annotation.Produces({ "application/octet-stream" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesOctetStream( @@ -44,7 +44,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesOctetStream( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-plain") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_PLAIN) @io.micronaut.http.annotation.Produces({ "text/plain" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesPlain( @@ -52,7 +52,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesPlain( @io.micronaut.http.annotation.Body java.lang.String body); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-different-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL) @io.micronaut.http.annotation.Consumes({ "application/json", "text/plain" }) io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.core.annotation.NonNull @@ -62,7 +62,7 @@ io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.http.annotation.QueryValue(value = "plain") java.lang.Boolean plain); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-same-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_SAME_MODEL) @io.micronaut.http.annotation.Consumes({ "application/json", "application/xml" }) io.micronaut.http.HttpResponse mediatypeProducesSameModel( @io.micronaut.core.annotation.NonNull diff --git a/gen/main/java/testapi/nooptional/ParameterApi.java b/gen/main/java/testapi/nooptional/ParameterApi.java index 740a0e3f..9ec83cac 100644 --- a/gen/main/java/testapi/nooptional/ParameterApi.java +++ b/gen/main/java/testapi/nooptional/ParameterApi.java @@ -15,16 +15,16 @@ public interface ParameterApi { java.lang.String PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT = "/param/header/optionalWithoutDefault"; java.lang.String PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT = "/param/header/requiredWithDefault"; java.lang.String PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT = "/param/header/requiredWithoutDefault"; - java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_STRING = "/param/path/overlay/{string}"; - java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_UUID = "/param/path/overlay/{uuid}"; + java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_STRING = "/param/path/overlay/{string:10}"; + java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_UUID = "/param/path/overlay/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}"; java.lang.String PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT = "/param/path/requiredWithDefault/{string}"; java.lang.String PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT = "/param/path/requiredWithoutDefault/{string}"; - java.lang.String PATH_PARAM_PATH_WITH_BOOLEAN = "/param/path/with-bool/{bool}"; - java.lang.String PATH_PARAM_PATH_WITH_INTEGER = "/param/path/with-integer/{integer}"; - java.lang.String PATH_PARAM_PATH_WITH_LONG = "/param/path/with-long/{long}"; - java.lang.String PATH_PARAM_PATH_WITH_MAX_LENGTH = "/param/path/with-max-length/{string}"; - java.lang.String PATH_PARAM_PATH_WITH_PATTERN = "/param/path/with-pattern/{string}"; - java.lang.String PATH_PARAM_PATH_WITH_UUID = "/param/path/with-uuid/{uuid}"; + java.lang.String PATH_PARAM_PATH_WITH_BOOLEAN = "/param/path/with-bool/{bool:true|false}"; + java.lang.String PATH_PARAM_PATH_WITH_INTEGER = "/param/path/with-integer/{integer:\\-?[0-9]+}"; + java.lang.String PATH_PARAM_PATH_WITH_LONG = "/param/path/with-long/{long:\\-?[0-9]+}"; + java.lang.String PATH_PARAM_PATH_WITH_MAX_LENGTH = "/param/path/with-max-length/{string:5}"; + java.lang.String PATH_PARAM_PATH_WITH_PATTERN = "/param/path/with-pattern/{string:[0-9][a-z]}"; + java.lang.String PATH_PARAM_PATH_WITH_UUID = "/param/path/with-uuid/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}"; java.lang.String PATH_PARAM_QUERY_DATE = "/param/query/date"; java.lang.String PATH_PARAM_QUERY_DATE_TIME = "/param/query/date-time"; java.lang.String PATH_PARAM_QUERY_MULTIPLE_LISTS = "/param/query/multiple-lists"; @@ -35,7 +35,7 @@ public interface ParameterApi { java.lang.String PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT = "/param/query/requiredWithoutDefault"; java.lang.String PATH_PARAM_QUERY_UUID = "/param/query/uuid"; - @io.micronaut.http.annotation.Get("/param/all/{path}") + @io.micronaut.http.annotation.Get(PATH_PARAM_ALL) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramAll( @io.micronaut.core.annotation.NonNull @@ -51,7 +51,7 @@ io.micronaut.http.HttpResponse paramAll( @io.micronaut.http.annotation.Header(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Post("/param/body/optional") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_OPTIONAL) @io.micronaut.http.annotation.Consumes({ "application/json" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramBodyOptional( @@ -60,7 +60,7 @@ io.micronaut.http.HttpResponse paramBodyOptional( @javax.validation.Valid ParameterModel parameterModel); - @io.micronaut.http.annotation.Post("/param/body/required") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_REQUIRED) @io.micronaut.http.annotation.Consumes({ "application/json" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramBodyRequired( @@ -69,63 +69,63 @@ io.micronaut.http.HttpResponse paramBodyRequired( @javax.validation.Valid ParameterModel parameterModel); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramCookieOptionalWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.CookieValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramCookieOptionalWithoutDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramCookieRequiredWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.CookieValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramCookieRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderOptionalWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.Header(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderOptionalWithoutDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderRequiredWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Header(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{string:10}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_STRING) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathOverlayWithString( @io.micronaut.core.annotation.NonNull @@ -133,49 +133,49 @@ io.micronaut.http.HttpResponse paramPathOverlayWithString( @javax.validation.constraints.Size(max = 10) java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_UUID) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathOverlayWithUuid( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/path/requiredWithDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathRequiredWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/requiredWithoutDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-bool/{bool:true|false}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_BOOLEAN) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithBoolean( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "bool") java.lang.Boolean bool); - @io.micronaut.http.annotation.Get("/param/path/with-integer/{integer:\\-?[0-9]+}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_INTEGER) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithInteger( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/param/path/with-long/{long:\\-?[0-9]+}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_LONG) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithLong( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "long") java.lang.Long _long); - @io.micronaut.http.annotation.Get("/param/path/with-max-length/{string:5}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_MAX_LENGTH) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithMaxLength( @io.micronaut.core.annotation.NonNull @@ -183,7 +183,7 @@ io.micronaut.http.HttpResponse paramPathWithMaxLength( @javax.validation.constraints.Size(max = 5) java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-pattern/{string:[0-9][a-z]}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_PATTERN) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithPattern( @io.micronaut.core.annotation.NonNull @@ -191,28 +191,28 @@ io.micronaut.http.HttpResponse paramPathWithPattern( @javax.validation.constraints.Pattern(regexp = "[0-9][a-z]") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-uuid/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_UUID) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithUuid( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/query/date") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryDate( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "date") java.time.LocalDate date); - @io.micronaut.http.annotation.Get("/param/query/date-time") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE_TIME) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryDateTime( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "date") java.time.Instant date); - @io.micronaut.http.annotation.Get("/param/query/multiple-lists") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_MULTIPLE_LISTS) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.core.annotation.Nullable @@ -225,45 +225,45 @@ io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.http.annotation.QueryValue java.util.List c); - @io.micronaut.http.annotation.Get("/param/query/number") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_NUMBER) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryNumber( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "date") java.lang.Double date); - @io.micronaut.http.annotation.Get("/param/query/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryOptionalWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryOptionalWithoutDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryRequiredWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/uuid") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_UUID) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryUuid( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "date") java.util.UUID date); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/nooptional/ParameterApiClient.java b/gen/main/java/testapi/nooptional/ParameterApiClient.java index a99676a1..7cc2a277 100644 --- a/gen/main/java/testapi/nooptional/ParameterApiClient.java +++ b/gen/main/java/testapi/nooptional/ParameterApiClient.java @@ -27,7 +27,7 @@ public interface ParameterApiClient { java.lang.String PATH_PARAM_PATH_WITH_UUID = "/param/path/with-uuid/{uuid}"; java.lang.String PATH_PARAM_QUERY_DATE = "/param/query/date"; java.lang.String PATH_PARAM_QUERY_DATE_TIME = "/param/query/date-time"; - java.lang.String PATH_PARAM_QUERY_MULTIPLE_LISTS = "/param/query/multiple-lists"; + java.lang.String PATH_PARAM_QUERY_MULTIPLE_LISTS = "/param/query/multiple-lists?{&a*}{&b*}{&c*}"; java.lang.String PATH_PARAM_QUERY_NUMBER = "/param/query/number"; java.lang.String PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT = "/param/query/optionalWithDefault"; java.lang.String PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT = "/param/query/optionalWithoutDefault"; @@ -35,7 +35,7 @@ public interface ParameterApiClient { java.lang.String PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT = "/param/query/requiredWithoutDefault"; java.lang.String PATH_PARAM_QUERY_UUID = "/param/query/uuid"; - @io.micronaut.http.annotation.Get("/param/all/{path}") + @io.micronaut.http.annotation.Get(PATH_PARAM_ALL) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramAll( @io.micronaut.core.annotation.NonNull @@ -51,7 +51,7 @@ io.micronaut.http.HttpResponse paramAll( @io.micronaut.http.annotation.Header(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Post("/param/body/optional") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_OPTIONAL) @io.micronaut.http.annotation.Produces({ "application/json" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramBodyOptional( @@ -59,7 +59,7 @@ io.micronaut.http.HttpResponse paramBodyOptional( @io.micronaut.http.annotation.Body ParameterModel parameterModel); - @io.micronaut.http.annotation.Post("/param/body/required") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_REQUIRED) @io.micronaut.http.annotation.Produces({ "application/json" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramBodyRequired( @@ -67,147 +67,147 @@ io.micronaut.http.HttpResponse paramBodyRequired( @io.micronaut.http.annotation.Body ParameterModel parameterModel); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramCookieOptionalWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramCookieOptionalWithoutDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramCookieRequiredWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramCookieRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderOptionalWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderOptionalWithoutDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderRequiredWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_STRING) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathOverlayWithString( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{uuid}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_UUID) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathOverlayWithUuid( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/path/requiredWithDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathRequiredWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/requiredWithoutDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-bool/{bool}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_BOOLEAN) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithBoolean( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "bool") java.lang.Boolean bool); - @io.micronaut.http.annotation.Get("/param/path/with-integer/{integer}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_INTEGER) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithInteger( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/param/path/with-long/{long}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_LONG) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithLong( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "long") java.lang.Long _long); - @io.micronaut.http.annotation.Get("/param/path/with-max-length/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_MAX_LENGTH) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithMaxLength( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-pattern/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_PATTERN) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithPattern( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-uuid/{uuid}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_UUID) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithUuid( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/query/date") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryDate( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "date") java.time.LocalDate date); - @io.micronaut.http.annotation.Get("/param/query/date-time") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE_TIME) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryDateTime( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "date") java.time.Instant date); - @io.micronaut.http.annotation.Get("/param/query/multiple-lists?{&a*}{&b*}{&c*}") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_MULTIPLE_LISTS) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.core.annotation.Nullable @@ -220,42 +220,42 @@ io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.http.annotation.QueryValue(value = "c") java.util.List c); - @io.micronaut.http.annotation.Get("/param/query/number") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_NUMBER) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryNumber( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "date") java.lang.Double date); - @io.micronaut.http.annotation.Get("/param/query/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryOptionalWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryOptionalWithoutDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryRequiredWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/uuid") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_UUID) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryUuid( @io.micronaut.core.annotation.Nullable diff --git a/gen/main/java/testapi/nooptional/RequestApi.java b/gen/main/java/testapi/nooptional/RequestApi.java index 94ae355f..f3adcd97 100644 --- a/gen/main/java/testapi/nooptional/RequestApi.java +++ b/gen/main/java/testapi/nooptional/RequestApi.java @@ -6,6 +6,6 @@ public interface RequestApi { java.lang.String PATH_NO_OPERATION_ID_GET = "/no-operation-id"; - @io.micronaut.http.annotation.Get("/no-operation-id") + @io.micronaut.http.annotation.Get(PATH_NO_OPERATION_ID_GET) io.micronaut.http.HttpResponse noOperationIdGet(); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/nooptional/RequestApiClient.java b/gen/main/java/testapi/nooptional/RequestApiClient.java index b3a8697f..53124b41 100644 --- a/gen/main/java/testapi/nooptional/RequestApiClient.java +++ b/gen/main/java/testapi/nooptional/RequestApiClient.java @@ -6,6 +6,6 @@ public interface RequestApiClient { java.lang.String PATH_NO_OPERATION_ID_GET = "/no-operation-id"; - @io.micronaut.http.annotation.Get("/no-operation-id") + @io.micronaut.http.annotation.Get(PATH_NO_OPERATION_ID_GET) io.micronaut.http.HttpResponse noOperationIdGet(); } diff --git a/gen/main/java/testapi/nooptional/ResponseApi.java b/gen/main/java/testapi/nooptional/ResponseApi.java index 33a5ce6b..00164d5f 100644 --- a/gen/main/java/testapi/nooptional/ResponseApi.java +++ b/gen/main/java/testapi/nooptional/ResponseApi.java @@ -20,43 +20,43 @@ public interface ResponseApi { java.lang.String PATH_VOID_NOT_FOUND = "/response/void-not-found"; java.lang.String PATH_WITH_DEFAULT = "/response/default"; - @io.micronaut.http.annotation.Get("/response/array-complex") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arrayComplex(); - @io.micronaut.http.annotation.Get("/response/array-complex-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX_NOT_FOUND) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arrayComplexNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/array-simple") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arraySimple(); - @io.micronaut.http.annotation.Get("/response/array-simple-empty") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_EMPTY) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arraySimpleEmpty(); - @io.micronaut.http.annotation.Get("/response/array-simple-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_NOT_FOUND) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arraySimpleNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/header") + @io.micronaut.http.annotation.Get(PATH_HEADER) io.micronaut.http.HttpResponse header(); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleDataTypes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES_NOT_FOUND) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.core.annotation.NonNull @@ -66,14 +66,14 @@ io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleResponseCodes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.core.annotation.NonNull @@ -83,26 +83,26 @@ io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/optional") + @io.micronaut.http.annotation.Get(PATH_OPTIONAL) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse optional( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/single") + @io.micronaut.http.annotation.Get(PATH_SINGLE) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse single(); - @io.micronaut.http.annotation.Get("/response/void") + @io.micronaut.http.annotation.Get(PATH_VOID_FOUND) io.micronaut.http.HttpResponse voidFound(); - @io.micronaut.http.annotation.Get("/response/void-not-found") + @io.micronaut.http.annotation.Get(PATH_VOID_NOT_FOUND) io.micronaut.http.HttpResponse voidNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/default") + @io.micronaut.http.annotation.Get(PATH_WITH_DEFAULT) io.micronaut.http.HttpResponse withDefault(); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/nooptional/ResponseApiClient.java b/gen/main/java/testapi/nooptional/ResponseApiClient.java index a1600391..d91bcb0e 100644 --- a/gen/main/java/testapi/nooptional/ResponseApiClient.java +++ b/gen/main/java/testapi/nooptional/ResponseApiClient.java @@ -20,43 +20,43 @@ public interface ResponseApiClient { java.lang.String PATH_VOID_NOT_FOUND = "/response/void-not-found"; java.lang.String PATH_WITH_DEFAULT = "/response/default"; - @io.micronaut.http.annotation.Get("/response/array-complex") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse> arrayComplex(); - @io.micronaut.http.annotation.Get("/response/array-complex-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX_NOT_FOUND) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse> arrayComplexNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/array-simple") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse> arraySimple(); - @io.micronaut.http.annotation.Get("/response/array-simple-empty") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_EMPTY) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse> arraySimpleEmpty(); - @io.micronaut.http.annotation.Get("/response/array-simple-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_NOT_FOUND) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse> arraySimpleNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/header") + @io.micronaut.http.annotation.Get(PATH_HEADER) io.micronaut.http.HttpResponse header(); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse multipleDataTypes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES_NOT_FOUND) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.core.annotation.NonNull @@ -66,14 +66,14 @@ io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse multipleResponseCodes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.core.annotation.NonNull @@ -83,26 +83,26 @@ io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/optional") + @io.micronaut.http.annotation.Get(PATH_OPTIONAL) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse optional( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/single") + @io.micronaut.http.annotation.Get(PATH_SINGLE) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse single(); - @io.micronaut.http.annotation.Get("/response/void") + @io.micronaut.http.annotation.Get(PATH_VOID_FOUND) io.micronaut.http.HttpResponse voidFound(); - @io.micronaut.http.annotation.Get("/response/void-not-found") + @io.micronaut.http.annotation.Get(PATH_VOID_NOT_FOUND) io.micronaut.http.HttpResponse voidNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/default") + @io.micronaut.http.annotation.Get(PATH_WITH_DEFAULT) io.micronaut.http.HttpResponse withDefault(); } diff --git a/gen/main/java/testapi/nooptional/ValidationApi.java b/gen/main/java/testapi/nooptional/ValidationApi.java index 63965bbb..57984054 100644 --- a/gen/main/java/testapi/nooptional/ValidationApi.java +++ b/gen/main/java/testapi/nooptional/ValidationApi.java @@ -26,21 +26,21 @@ public interface ValidationApi { java.lang.String PATH_VALIDATION_STRING_PATTERN = "/validation/string/pattern"; java.lang.String PATH_VALIDATION_STRING_RANGE = "/validation/string/range"; - @io.micronaut.http.annotation.Get("/validation/double/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MAX) io.micronaut.http.HttpResponse validationDoubleMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @javax.validation.constraints.DecimalMax(value = "4", inclusive = false) java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/double/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MIN) io.micronaut.http.HttpResponse validationDoubleMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @javax.validation.constraints.DecimalMin(value = "3", inclusive = false) java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/double/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_RANGE) io.micronaut.http.HttpResponse validationDoubleRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @@ -48,21 +48,21 @@ io.micronaut.http.HttpResponse validationDoubleRange( @javax.validation.constraints.DecimalMax(value = "4", inclusive = true) java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/float/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MAX) io.micronaut.http.HttpResponse validationFloatMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @javax.validation.constraints.DecimalMax(value = "4", inclusive = false) java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MIN) io.micronaut.http.HttpResponse validationFloatMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @javax.validation.constraints.DecimalMin(value = "3", inclusive = false) java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_RANGE) io.micronaut.http.HttpResponse validationFloatRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @@ -70,21 +70,21 @@ io.micronaut.http.HttpResponse validationFloatRange( @javax.validation.constraints.DecimalMax(value = "4", inclusive = true) java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/integer/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MAX) io.micronaut.http.HttpResponse validationIntegerMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @javax.validation.constraints.Max(4) java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MIN) io.micronaut.http.HttpResponse validationIntegerMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @javax.validation.constraints.Min(3) java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_RANGE) io.micronaut.http.HttpResponse validationIntegerRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @@ -92,21 +92,21 @@ io.micronaut.http.HttpResponse validationIntegerRange( @javax.validation.constraints.Max(4) java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/list/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MAX) io.micronaut.http.HttpResponse validationListMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @javax.validation.constraints.Size(max = 4) java.util.List list); - @io.micronaut.http.annotation.Get("/validation/list/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MIN) io.micronaut.http.HttpResponse validationListMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @javax.validation.constraints.Size(min = 3) java.util.List list); - @io.micronaut.http.annotation.Post("/validation/list/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_MODEL) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse validationListModel( @io.micronaut.core.annotation.NonNull @@ -114,28 +114,28 @@ io.micronaut.http.HttpResponse validationListModel( @javax.validation.Valid java.util.List stringModel); - @io.micronaut.http.annotation.Post("/validation/list/range") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_RANGE) io.micronaut.http.HttpResponse validationListRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @javax.validation.constraints.Size(min = 3, max = 4) java.util.List list); - @io.micronaut.http.annotation.Get("/validation/long/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MAX) io.micronaut.http.HttpResponse validationLongMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @javax.validation.constraints.Max(4) java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MIN) io.micronaut.http.HttpResponse validationLongMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @javax.validation.constraints.Min(3) java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_RANGE) io.micronaut.http.HttpResponse validationLongRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @@ -143,7 +143,7 @@ io.micronaut.http.HttpResponse validationLongRange( @javax.validation.constraints.Max(4) java.lang.Long integer); - @io.micronaut.http.annotation.Post("/validation/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_MODEL) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse validationModel( @io.micronaut.core.annotation.NonNull @@ -151,31 +151,31 @@ io.micronaut.http.HttpResponse validationModel( @javax.validation.Valid StringModel stringModel); - @io.micronaut.http.annotation.Get("/validation/string/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MAX) io.micronaut.http.HttpResponse validationStringMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @javax.validation.constraints.Size(max = 4) java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MIN) io.micronaut.http.HttpResponse validationStringMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @javax.validation.constraints.Size(min = 3) java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/pattern") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_PATTERN) io.micronaut.http.HttpResponse validationStringPattern( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @javax.validation.constraints.Pattern(regexp = "[a-z]{3,5}") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_RANGE) io.micronaut.http.HttpResponse validationStringRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @javax.validation.constraints.Size(min = 3, max = 4) java.lang.String string); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/nooptional/ValidationApiClient.java b/gen/main/java/testapi/nooptional/ValidationApiClient.java index 591a11b1..1887ed90 100644 --- a/gen/main/java/testapi/nooptional/ValidationApiClient.java +++ b/gen/main/java/testapi/nooptional/ValidationApiClient.java @@ -13,10 +13,10 @@ public interface ValidationApiClient { java.lang.String PATH_VALIDATION_INTEGER_MAX = "/validation/integer/max"; java.lang.String PATH_VALIDATION_INTEGER_MIN = "/validation/integer/min"; java.lang.String PATH_VALIDATION_INTEGER_RANGE = "/validation/integer/range"; - java.lang.String PATH_VALIDATION_LIST_MAX = "/validation/list/max"; - java.lang.String PATH_VALIDATION_LIST_MIN = "/validation/list/min"; + java.lang.String PATH_VALIDATION_LIST_MAX = "/validation/list/max?{&list*}"; + java.lang.String PATH_VALIDATION_LIST_MIN = "/validation/list/min?{&list*}"; java.lang.String PATH_VALIDATION_LIST_MODEL = "/validation/list/model"; - java.lang.String PATH_VALIDATION_LIST_RANGE = "/validation/list/range"; + java.lang.String PATH_VALIDATION_LIST_RANGE = "/validation/list/range?{&list*}"; java.lang.String PATH_VALIDATION_LONG_MAX = "/validation/long/max"; java.lang.String PATH_VALIDATION_LONG_MIN = "/validation/long/min"; java.lang.String PATH_VALIDATION_LONG_RANGE = "/validation/long/range"; @@ -26,129 +26,129 @@ public interface ValidationApiClient { java.lang.String PATH_VALIDATION_STRING_PATTERN = "/validation/string/pattern"; java.lang.String PATH_VALIDATION_STRING_RANGE = "/validation/string/range"; - @io.micronaut.http.annotation.Get("/validation/double/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MAX) io.micronaut.http.HttpResponse validationDoubleMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/double/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MIN) io.micronaut.http.HttpResponse validationDoubleMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/double/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_RANGE) io.micronaut.http.HttpResponse validationDoubleRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/float/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MAX) io.micronaut.http.HttpResponse validationFloatMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MIN) io.micronaut.http.HttpResponse validationFloatMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_RANGE) io.micronaut.http.HttpResponse validationFloatRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/integer/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MAX) io.micronaut.http.HttpResponse validationIntegerMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MIN) io.micronaut.http.HttpResponse validationIntegerMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_RANGE) io.micronaut.http.HttpResponse validationIntegerRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/list/max?{&list*}") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MAX) io.micronaut.http.HttpResponse validationListMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "list") java.util.List list); - @io.micronaut.http.annotation.Get("/validation/list/min?{&list*}") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MIN) io.micronaut.http.HttpResponse validationListMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "list") java.util.List list); - @io.micronaut.http.annotation.Post("/validation/list/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_MODEL) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse validationListModel( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Body java.util.List stringModel); - @io.micronaut.http.annotation.Post("/validation/list/range?{&list*}") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_RANGE) io.micronaut.http.HttpResponse validationListRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "list") java.util.List list); - @io.micronaut.http.annotation.Get("/validation/long/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MAX) io.micronaut.http.HttpResponse validationLongMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MIN) io.micronaut.http.HttpResponse validationLongMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_RANGE) io.micronaut.http.HttpResponse validationLongRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Long integer); - @io.micronaut.http.annotation.Post("/validation/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_MODEL) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse validationModel( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Body StringModel stringModel); - @io.micronaut.http.annotation.Get("/validation/string/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MAX) io.micronaut.http.HttpResponse validationStringMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MIN) io.micronaut.http.HttpResponse validationStringMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/pattern") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_PATTERN) io.micronaut.http.HttpResponse validationStringPattern( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_RANGE) io.micronaut.http.HttpResponse validationStringRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") diff --git a/gen/main/java/testapi/novalidation/MediatypeApi.java b/gen/main/java/testapi/novalidation/MediatypeApi.java index 741fd15b..2ece9cc7 100644 --- a/gen/main/java/testapi/novalidation/MediatypeApi.java +++ b/gen/main/java/testapi/novalidation/MediatypeApi.java @@ -11,7 +11,7 @@ public interface MediatypeApi { java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; java.lang.String PATH_MEDIATYPE_PRODUCES_SAME_MODEL = "/mediatype/produces-with-same-model"; - @io.micronaut.http.annotation.Post("/mediatype/consumes-and-produces") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_AND_PRODUCES) @io.micronaut.http.annotation.Consumes({ "application/octet-stream" }) @io.micronaut.http.annotation.Produces({ "application/xml" }) io.micronaut.http.HttpResponse mediatypeConsumesAndProduces( @@ -19,7 +19,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesAndProduces( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-with-fileupload") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD) @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUpload( @@ -33,7 +33,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUplo @io.micronaut.http.annotation.Part(value = "file") io.micronaut.http.multipart.CompletedFileUpload file); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD) @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( @@ -44,7 +44,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileU @io.micronaut.http.annotation.Part(value = "userId") java.lang.Integer userId); - @io.micronaut.http.annotation.Post("/mediatype/consumes-octet-stream") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_OCTET_STREAM) @io.micronaut.http.annotation.Consumes({ "application/octet-stream" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesOctetStream( @@ -52,7 +52,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesOctetStream( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-plain") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_PLAIN) @io.micronaut.http.annotation.Consumes({ "text/plain" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesPlain( @@ -60,7 +60,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesPlain( @io.micronaut.http.annotation.Body java.lang.String body); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-different-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL) @io.micronaut.http.annotation.Produces({ "application/json", "text/plain" }) io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.core.annotation.NonNull @@ -70,10 +70,10 @@ io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.http.annotation.QueryValue(value = "plain") java.lang.Boolean plain); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-same-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_SAME_MODEL) @io.micronaut.http.annotation.Produces({ "application/json", "application/xml" }) io.micronaut.http.HttpResponse mediatypeProducesSameModel( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "value") java.lang.String value); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/novalidation/MediatypeApiClient.java b/gen/main/java/testapi/novalidation/MediatypeApiClient.java index 3dd0116b..775fee89 100644 --- a/gen/main/java/testapi/novalidation/MediatypeApiClient.java +++ b/gen/main/java/testapi/novalidation/MediatypeApiClient.java @@ -12,7 +12,7 @@ public interface MediatypeApiClient { java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; java.lang.String PATH_MEDIATYPE_PRODUCES_SAME_MODEL = "/mediatype/produces-with-same-model"; - @io.micronaut.http.annotation.Post("/mediatype/consumes-and-produces") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_AND_PRODUCES) @io.micronaut.http.annotation.Produces({ "application/octet-stream" }) @io.micronaut.http.annotation.Consumes({ "application/xml" }) io.micronaut.http.HttpResponse mediatypeConsumesAndProduces( @@ -20,7 +20,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesAndProduces( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-with-fileupload") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD) @io.micronaut.http.annotation.Produces({ "multipart/form-data" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUpload( @@ -28,7 +28,7 @@ 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(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD) @io.micronaut.http.annotation.Produces({ "multipart/form-data" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( @@ -36,7 +36,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileU @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); - @io.micronaut.http.annotation.Post("/mediatype/consumes-octet-stream") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_OCTET_STREAM) @io.micronaut.http.annotation.Produces({ "application/octet-stream" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesOctetStream( @@ -44,7 +44,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesOctetStream( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-plain") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_PLAIN) @io.micronaut.http.annotation.Produces({ "text/plain" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesPlain( @@ -52,7 +52,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesPlain( @io.micronaut.http.annotation.Body java.lang.String body); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-different-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL) @io.micronaut.http.annotation.Consumes({ "application/json", "text/plain" }) io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.core.annotation.NonNull @@ -62,7 +62,7 @@ io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.http.annotation.QueryValue(value = "plain") java.lang.Boolean plain); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-same-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_SAME_MODEL) @io.micronaut.http.annotation.Consumes({ "application/json", "application/xml" }) io.micronaut.http.HttpResponse mediatypeProducesSameModel( @io.micronaut.core.annotation.NonNull diff --git a/gen/main/java/testapi/novalidation/ParameterApi.java b/gen/main/java/testapi/novalidation/ParameterApi.java index 8276919a..d9035ccb 100644 --- a/gen/main/java/testapi/novalidation/ParameterApi.java +++ b/gen/main/java/testapi/novalidation/ParameterApi.java @@ -14,16 +14,16 @@ public interface ParameterApi { java.lang.String PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT = "/param/header/optionalWithoutDefault"; java.lang.String PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT = "/param/header/requiredWithDefault"; java.lang.String PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT = "/param/header/requiredWithoutDefault"; - java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_STRING = "/param/path/overlay/{string}"; - java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_UUID = "/param/path/overlay/{uuid}"; + java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_STRING = "/param/path/overlay/{string:10}"; + java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_UUID = "/param/path/overlay/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}"; java.lang.String PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT = "/param/path/requiredWithDefault/{string}"; java.lang.String PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT = "/param/path/requiredWithoutDefault/{string}"; - java.lang.String PATH_PARAM_PATH_WITH_BOOLEAN = "/param/path/with-bool/{bool}"; - java.lang.String PATH_PARAM_PATH_WITH_INTEGER = "/param/path/with-integer/{integer}"; - java.lang.String PATH_PARAM_PATH_WITH_LONG = "/param/path/with-long/{long}"; - java.lang.String PATH_PARAM_PATH_WITH_MAX_LENGTH = "/param/path/with-max-length/{string}"; - java.lang.String PATH_PARAM_PATH_WITH_PATTERN = "/param/path/with-pattern/{string}"; - java.lang.String PATH_PARAM_PATH_WITH_UUID = "/param/path/with-uuid/{uuid}"; + java.lang.String PATH_PARAM_PATH_WITH_BOOLEAN = "/param/path/with-bool/{bool:true|false}"; + java.lang.String PATH_PARAM_PATH_WITH_INTEGER = "/param/path/with-integer/{integer:\\-?[0-9]+}"; + java.lang.String PATH_PARAM_PATH_WITH_LONG = "/param/path/with-long/{long:\\-?[0-9]+}"; + java.lang.String PATH_PARAM_PATH_WITH_MAX_LENGTH = "/param/path/with-max-length/{string:5}"; + java.lang.String PATH_PARAM_PATH_WITH_PATTERN = "/param/path/with-pattern/{string:[0-9][a-z]}"; + java.lang.String PATH_PARAM_PATH_WITH_UUID = "/param/path/with-uuid/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}"; java.lang.String PATH_PARAM_QUERY_DATE = "/param/query/date"; java.lang.String PATH_PARAM_QUERY_DATE_TIME = "/param/query/date-time"; java.lang.String PATH_PARAM_QUERY_MULTIPLE_LISTS = "/param/query/multiple-lists"; @@ -34,7 +34,7 @@ public interface ParameterApi { java.lang.String PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT = "/param/query/requiredWithoutDefault"; java.lang.String PATH_PARAM_QUERY_UUID = "/param/query/uuid"; - @io.micronaut.http.annotation.Get("/param/all/{path}") + @io.micronaut.http.annotation.Get(PATH_PARAM_ALL) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramAll( @io.micronaut.core.annotation.NonNull @@ -50,7 +50,7 @@ io.micronaut.http.HttpResponse paramAll( @io.micronaut.http.annotation.Header(value = "integer") java.util.Optional integer); - @io.micronaut.http.annotation.Post("/param/body/optional") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_OPTIONAL) @io.micronaut.http.annotation.Consumes({ "application/json" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramBodyOptional( @@ -58,7 +58,7 @@ io.micronaut.http.HttpResponse paramBodyOptional( @io.micronaut.http.annotation.Body java.util.Optional parameterModel); - @io.micronaut.http.annotation.Post("/param/body/required") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_REQUIRED) @io.micronaut.http.annotation.Consumes({ "application/json" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramBodyRequired( @@ -66,147 +66,147 @@ io.micronaut.http.HttpResponse paramBodyRequired( @io.micronaut.http.annotation.Body ParameterModel parameterModel); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramCookieOptionalWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.CookieValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramCookieOptionalWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.CookieValue(value = "string") java.util.Optional string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramCookieRequiredWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.CookieValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramCookieRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderOptionalWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Header(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderOptionalWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Header(value = "string") java.util.Optional string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderRequiredWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Header(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{string:10}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_STRING) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathOverlayWithString( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_UUID) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathOverlayWithUuid( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/path/requiredWithDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathRequiredWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/requiredWithoutDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-bool/{bool:true|false}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_BOOLEAN) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithBoolean( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "bool") java.lang.Boolean bool); - @io.micronaut.http.annotation.Get("/param/path/with-integer/{integer:\\-?[0-9]+}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_INTEGER) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithInteger( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/param/path/with-long/{long:\\-?[0-9]+}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_LONG) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithLong( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "long") java.lang.Long _long); - @io.micronaut.http.annotation.Get("/param/path/with-max-length/{string:5}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_MAX_LENGTH) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithMaxLength( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-pattern/{string:[0-9][a-z]}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_PATTERN) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithPattern( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-uuid/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_UUID) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithUuid( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/query/date") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryDate( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "date") java.util.Optional date); - @io.micronaut.http.annotation.Get("/param/query/date-time") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE_TIME) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryDateTime( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "date") java.util.Optional date); - @io.micronaut.http.annotation.Get("/param/query/multiple-lists") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_MULTIPLE_LISTS) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.core.annotation.NonNull @@ -219,45 +219,45 @@ io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.http.annotation.QueryValue java.util.Optional> c); - @io.micronaut.http.annotation.Get("/param/query/number") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_NUMBER) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryNumber( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "date") java.util.Optional date); - @io.micronaut.http.annotation.Get("/param/query/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryOptionalWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryOptionalWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.util.Optional string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryRequiredWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/uuid") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_UUID) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryUuid( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "date") java.util.Optional date); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/novalidation/ParameterApiClient.java b/gen/main/java/testapi/novalidation/ParameterApiClient.java index 7d72f414..f70e0991 100644 --- a/gen/main/java/testapi/novalidation/ParameterApiClient.java +++ b/gen/main/java/testapi/novalidation/ParameterApiClient.java @@ -27,7 +27,7 @@ public interface ParameterApiClient { java.lang.String PATH_PARAM_PATH_WITH_UUID = "/param/path/with-uuid/{uuid}"; java.lang.String PATH_PARAM_QUERY_DATE = "/param/query/date"; java.lang.String PATH_PARAM_QUERY_DATE_TIME = "/param/query/date-time"; - java.lang.String PATH_PARAM_QUERY_MULTIPLE_LISTS = "/param/query/multiple-lists"; + java.lang.String PATH_PARAM_QUERY_MULTIPLE_LISTS = "/param/query/multiple-lists?{&a*}{&b*}{&c*}"; java.lang.String PATH_PARAM_QUERY_NUMBER = "/param/query/number"; java.lang.String PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT = "/param/query/optionalWithDefault"; java.lang.String PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT = "/param/query/optionalWithoutDefault"; @@ -35,7 +35,7 @@ public interface ParameterApiClient { java.lang.String PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT = "/param/query/requiredWithoutDefault"; java.lang.String PATH_PARAM_QUERY_UUID = "/param/query/uuid"; - @io.micronaut.http.annotation.Get("/param/all/{path}") + @io.micronaut.http.annotation.Get(PATH_PARAM_ALL) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramAll( @io.micronaut.core.annotation.NonNull @@ -51,7 +51,7 @@ io.micronaut.http.HttpResponse paramAll( @io.micronaut.http.annotation.Header(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Post("/param/body/optional") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_OPTIONAL) @io.micronaut.http.annotation.Produces({ "application/json" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramBodyOptional( @@ -59,7 +59,7 @@ io.micronaut.http.HttpResponse paramBodyOptional( @io.micronaut.http.annotation.Body ParameterModel parameterModel); - @io.micronaut.http.annotation.Post("/param/body/required") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_REQUIRED) @io.micronaut.http.annotation.Produces({ "application/json" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramBodyRequired( @@ -67,147 +67,147 @@ io.micronaut.http.HttpResponse paramBodyRequired( @io.micronaut.http.annotation.Body ParameterModel parameterModel); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramCookieOptionalWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramCookieOptionalWithoutDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramCookieRequiredWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramCookieRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderOptionalWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderOptionalWithoutDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderRequiredWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_STRING) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathOverlayWithString( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{uuid}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_UUID) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathOverlayWithUuid( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/path/requiredWithDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathRequiredWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/requiredWithoutDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-bool/{bool}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_BOOLEAN) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithBoolean( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "bool") java.lang.Boolean bool); - @io.micronaut.http.annotation.Get("/param/path/with-integer/{integer}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_INTEGER) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithInteger( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/param/path/with-long/{long}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_LONG) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithLong( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "long") java.lang.Long _long); - @io.micronaut.http.annotation.Get("/param/path/with-max-length/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_MAX_LENGTH) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithMaxLength( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-pattern/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_PATTERN) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithPattern( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-uuid/{uuid}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_UUID) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithUuid( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/query/date") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryDate( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "date") java.time.LocalDate date); - @io.micronaut.http.annotation.Get("/param/query/date-time") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE_TIME) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryDateTime( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "date") java.time.Instant date); - @io.micronaut.http.annotation.Get("/param/query/multiple-lists?{&a*}{&b*}{&c*}") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_MULTIPLE_LISTS) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.core.annotation.Nullable @@ -220,42 +220,42 @@ io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.http.annotation.QueryValue(value = "c") java.util.List c); - @io.micronaut.http.annotation.Get("/param/query/number") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_NUMBER) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryNumber( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "date") java.lang.Double date); - @io.micronaut.http.annotation.Get("/param/query/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryOptionalWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryOptionalWithoutDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryRequiredWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/uuid") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_UUID) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryUuid( @io.micronaut.core.annotation.Nullable diff --git a/gen/main/java/testapi/novalidation/RequestApi.java b/gen/main/java/testapi/novalidation/RequestApi.java index 2ab61264..ad523fc6 100644 --- a/gen/main/java/testapi/novalidation/RequestApi.java +++ b/gen/main/java/testapi/novalidation/RequestApi.java @@ -5,6 +5,6 @@ public interface RequestApi { java.lang.String PATH_NO_OPERATION_ID_GET = "/no-operation-id"; - @io.micronaut.http.annotation.Get("/no-operation-id") + @io.micronaut.http.annotation.Get(PATH_NO_OPERATION_ID_GET) io.micronaut.http.HttpResponse noOperationIdGet(); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/novalidation/RequestApiClient.java b/gen/main/java/testapi/novalidation/RequestApiClient.java index 580a5540..9f8bece9 100644 --- a/gen/main/java/testapi/novalidation/RequestApiClient.java +++ b/gen/main/java/testapi/novalidation/RequestApiClient.java @@ -6,6 +6,6 @@ public interface RequestApiClient { java.lang.String PATH_NO_OPERATION_ID_GET = "/no-operation-id"; - @io.micronaut.http.annotation.Get("/no-operation-id") + @io.micronaut.http.annotation.Get(PATH_NO_OPERATION_ID_GET) io.micronaut.http.HttpResponse noOperationIdGet(); } diff --git a/gen/main/java/testapi/novalidation/ResponseApi.java b/gen/main/java/testapi/novalidation/ResponseApi.java index 0e9de665..89f25caa 100644 --- a/gen/main/java/testapi/novalidation/ResponseApi.java +++ b/gen/main/java/testapi/novalidation/ResponseApi.java @@ -19,43 +19,43 @@ public interface ResponseApi { java.lang.String PATH_VOID_NOT_FOUND = "/response/void-not-found"; java.lang.String PATH_WITH_DEFAULT = "/response/default"; - @io.micronaut.http.annotation.Get("/response/array-complex") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arrayComplex(); - @io.micronaut.http.annotation.Get("/response/array-complex-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX_NOT_FOUND) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arrayComplexNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/array-simple") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arraySimple(); - @io.micronaut.http.annotation.Get("/response/array-simple-empty") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_EMPTY) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arraySimpleEmpty(); - @io.micronaut.http.annotation.Get("/response/array-simple-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_NOT_FOUND) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arraySimpleNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/header") + @io.micronaut.http.annotation.Get(PATH_HEADER) io.micronaut.http.HttpResponse header(); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleDataTypes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES_NOT_FOUND) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.core.annotation.NonNull @@ -65,14 +65,14 @@ io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleResponseCodes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.core.annotation.NonNull @@ -82,26 +82,26 @@ io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/optional") + @io.micronaut.http.annotation.Get(PATH_OPTIONAL) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse optional( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/single") + @io.micronaut.http.annotation.Get(PATH_SINGLE) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse single(); - @io.micronaut.http.annotation.Get("/response/void") + @io.micronaut.http.annotation.Get(PATH_VOID_FOUND) io.micronaut.http.HttpResponse voidFound(); - @io.micronaut.http.annotation.Get("/response/void-not-found") + @io.micronaut.http.annotation.Get(PATH_VOID_NOT_FOUND) io.micronaut.http.HttpResponse voidNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/default") + @io.micronaut.http.annotation.Get(PATH_WITH_DEFAULT) io.micronaut.http.HttpResponse withDefault(); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/novalidation/ResponseApiClient.java b/gen/main/java/testapi/novalidation/ResponseApiClient.java index af43b6ba..8f957f22 100644 --- a/gen/main/java/testapi/novalidation/ResponseApiClient.java +++ b/gen/main/java/testapi/novalidation/ResponseApiClient.java @@ -20,43 +20,43 @@ public interface ResponseApiClient { java.lang.String PATH_VOID_NOT_FOUND = "/response/void-not-found"; java.lang.String PATH_WITH_DEFAULT = "/response/default"; - @io.micronaut.http.annotation.Get("/response/array-complex") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse> arrayComplex(); - @io.micronaut.http.annotation.Get("/response/array-complex-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX_NOT_FOUND) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse> arrayComplexNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/array-simple") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse> arraySimple(); - @io.micronaut.http.annotation.Get("/response/array-simple-empty") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_EMPTY) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse> arraySimpleEmpty(); - @io.micronaut.http.annotation.Get("/response/array-simple-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_NOT_FOUND) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse> arraySimpleNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/header") + @io.micronaut.http.annotation.Get(PATH_HEADER) io.micronaut.http.HttpResponse header(); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse multipleDataTypes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES_NOT_FOUND) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.core.annotation.NonNull @@ -66,14 +66,14 @@ io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse multipleResponseCodes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.core.annotation.NonNull @@ -83,26 +83,26 @@ io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/optional") + @io.micronaut.http.annotation.Get(PATH_OPTIONAL) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse optional( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/single") + @io.micronaut.http.annotation.Get(PATH_SINGLE) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse single(); - @io.micronaut.http.annotation.Get("/response/void") + @io.micronaut.http.annotation.Get(PATH_VOID_FOUND) io.micronaut.http.HttpResponse voidFound(); - @io.micronaut.http.annotation.Get("/response/void-not-found") + @io.micronaut.http.annotation.Get(PATH_VOID_NOT_FOUND) io.micronaut.http.HttpResponse voidNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/default") + @io.micronaut.http.annotation.Get(PATH_WITH_DEFAULT) io.micronaut.http.HttpResponse withDefault(); } diff --git a/gen/main/java/testapi/novalidation/ValidationApi.java b/gen/main/java/testapi/novalidation/ValidationApi.java index 3f9fd470..3d2756ec 100644 --- a/gen/main/java/testapi/novalidation/ValidationApi.java +++ b/gen/main/java/testapi/novalidation/ValidationApi.java @@ -25,131 +25,131 @@ public interface ValidationApi { java.lang.String PATH_VALIDATION_STRING_PATTERN = "/validation/string/pattern"; java.lang.String PATH_VALIDATION_STRING_RANGE = "/validation/string/range"; - @io.micronaut.http.annotation.Get("/validation/double/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MAX) io.micronaut.http.HttpResponse validationDoubleMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/double/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MIN) io.micronaut.http.HttpResponse validationDoubleMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/double/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_RANGE) io.micronaut.http.HttpResponse validationDoubleRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/float/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MAX) io.micronaut.http.HttpResponse validationFloatMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MIN) io.micronaut.http.HttpResponse validationFloatMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_RANGE) io.micronaut.http.HttpResponse validationFloatRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/integer/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MAX) io.micronaut.http.HttpResponse validationIntegerMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MIN) io.micronaut.http.HttpResponse validationIntegerMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_RANGE) io.micronaut.http.HttpResponse validationIntegerRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/list/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MAX) io.micronaut.http.HttpResponse validationListMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue java.util.List list); - @io.micronaut.http.annotation.Get("/validation/list/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MIN) io.micronaut.http.HttpResponse validationListMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue java.util.List list); - @io.micronaut.http.annotation.Post("/validation/list/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_MODEL) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse validationListModel( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Body java.util.List stringModel); - @io.micronaut.http.annotation.Post("/validation/list/range") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_RANGE) io.micronaut.http.HttpResponse validationListRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue java.util.List list); - @io.micronaut.http.annotation.Get("/validation/long/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MAX) io.micronaut.http.HttpResponse validationLongMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MIN) io.micronaut.http.HttpResponse validationLongMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_RANGE) io.micronaut.http.HttpResponse validationLongRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Long integer); - @io.micronaut.http.annotation.Post("/validation/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_MODEL) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse validationModel( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Body StringModel stringModel); - @io.micronaut.http.annotation.Get("/validation/string/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MAX) io.micronaut.http.HttpResponse validationStringMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MIN) io.micronaut.http.HttpResponse validationStringMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/pattern") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_PATTERN) io.micronaut.http.HttpResponse validationStringPattern( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_RANGE) io.micronaut.http.HttpResponse validationStringRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/novalidation/ValidationApiClient.java b/gen/main/java/testapi/novalidation/ValidationApiClient.java index 0f59536f..1985d7d9 100644 --- a/gen/main/java/testapi/novalidation/ValidationApiClient.java +++ b/gen/main/java/testapi/novalidation/ValidationApiClient.java @@ -13,10 +13,10 @@ public interface ValidationApiClient { java.lang.String PATH_VALIDATION_INTEGER_MAX = "/validation/integer/max"; java.lang.String PATH_VALIDATION_INTEGER_MIN = "/validation/integer/min"; java.lang.String PATH_VALIDATION_INTEGER_RANGE = "/validation/integer/range"; - java.lang.String PATH_VALIDATION_LIST_MAX = "/validation/list/max"; - java.lang.String PATH_VALIDATION_LIST_MIN = "/validation/list/min"; + java.lang.String PATH_VALIDATION_LIST_MAX = "/validation/list/max?{&list*}"; + java.lang.String PATH_VALIDATION_LIST_MIN = "/validation/list/min?{&list*}"; java.lang.String PATH_VALIDATION_LIST_MODEL = "/validation/list/model"; - java.lang.String PATH_VALIDATION_LIST_RANGE = "/validation/list/range"; + java.lang.String PATH_VALIDATION_LIST_RANGE = "/validation/list/range?{&list*}"; java.lang.String PATH_VALIDATION_LONG_MAX = "/validation/long/max"; java.lang.String PATH_VALIDATION_LONG_MIN = "/validation/long/min"; java.lang.String PATH_VALIDATION_LONG_RANGE = "/validation/long/range"; @@ -26,129 +26,129 @@ public interface ValidationApiClient { java.lang.String PATH_VALIDATION_STRING_PATTERN = "/validation/string/pattern"; java.lang.String PATH_VALIDATION_STRING_RANGE = "/validation/string/range"; - @io.micronaut.http.annotation.Get("/validation/double/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MAX) io.micronaut.http.HttpResponse validationDoubleMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/double/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MIN) io.micronaut.http.HttpResponse validationDoubleMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/double/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_RANGE) io.micronaut.http.HttpResponse validationDoubleRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/float/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MAX) io.micronaut.http.HttpResponse validationFloatMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MIN) io.micronaut.http.HttpResponse validationFloatMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_RANGE) io.micronaut.http.HttpResponse validationFloatRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/integer/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MAX) io.micronaut.http.HttpResponse validationIntegerMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MIN) io.micronaut.http.HttpResponse validationIntegerMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_RANGE) io.micronaut.http.HttpResponse validationIntegerRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/list/max?{&list*}") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MAX) io.micronaut.http.HttpResponse validationListMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "list") java.util.List list); - @io.micronaut.http.annotation.Get("/validation/list/min?{&list*}") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MIN) io.micronaut.http.HttpResponse validationListMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "list") java.util.List list); - @io.micronaut.http.annotation.Post("/validation/list/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_MODEL) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse validationListModel( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Body java.util.List stringModel); - @io.micronaut.http.annotation.Post("/validation/list/range?{&list*}") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_RANGE) io.micronaut.http.HttpResponse validationListRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "list") java.util.List list); - @io.micronaut.http.annotation.Get("/validation/long/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MAX) io.micronaut.http.HttpResponse validationLongMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MIN) io.micronaut.http.HttpResponse validationLongMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_RANGE) io.micronaut.http.HttpResponse validationLongRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Long integer); - @io.micronaut.http.annotation.Post("/validation/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_MODEL) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse validationModel( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Body StringModel stringModel); - @io.micronaut.http.annotation.Get("/validation/string/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MAX) io.micronaut.http.HttpResponse validationStringMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MIN) io.micronaut.http.HttpResponse validationStringMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/pattern") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_PATTERN) io.micronaut.http.HttpResponse validationStringPattern( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_RANGE) io.micronaut.http.HttpResponse validationStringRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") diff --git a/gen/main/java/testapi/packages/api/MediatypeApi.java b/gen/main/java/testapi/packages/api/MediatypeApi.java index 5e3de36c..a34be2d0 100644 --- a/gen/main/java/testapi/packages/api/MediatypeApi.java +++ b/gen/main/java/testapi/packages/api/MediatypeApi.java @@ -14,7 +14,7 @@ public interface MediatypeApi { java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; java.lang.String PATH_MEDIATYPE_PRODUCES_SAME_MODEL = "/mediatype/produces-with-same-model"; - @io.micronaut.http.annotation.Post("/mediatype/consumes-and-produces") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_AND_PRODUCES) @io.micronaut.http.annotation.Consumes({ "application/octet-stream" }) @io.micronaut.http.annotation.Produces({ "application/xml" }) io.micronaut.http.HttpResponse mediatypeConsumesAndProduces( @@ -22,7 +22,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesAndProduces( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-with-fileupload") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD) @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUpload( @@ -36,7 +36,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUplo @io.micronaut.http.annotation.Part(value = "file") io.micronaut.http.multipart.CompletedFileUpload file); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD) @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( @@ -47,7 +47,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileU @io.micronaut.http.annotation.Part(value = "userId") java.lang.Integer userId); - @io.micronaut.http.annotation.Post("/mediatype/consumes-octet-stream") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_OCTET_STREAM) @io.micronaut.http.annotation.Consumes({ "application/octet-stream" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesOctetStream( @@ -55,7 +55,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesOctetStream( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-plain") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_PLAIN) @io.micronaut.http.annotation.Consumes({ "text/plain" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesPlain( @@ -63,7 +63,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesPlain( @io.micronaut.http.annotation.Body java.lang.String body); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-different-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL) @io.micronaut.http.annotation.Produces({ "application/json", "text/plain" }) io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.core.annotation.NonNull @@ -73,10 +73,10 @@ io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.http.annotation.QueryValue(value = "plain") java.lang.Boolean plain); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-same-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_SAME_MODEL) @io.micronaut.http.annotation.Produces({ "application/json", "application/xml" }) io.micronaut.http.HttpResponse mediatypeProducesSameModel( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "value") java.lang.String value); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/packages/api/MediatypeApiClient.java b/gen/main/java/testapi/packages/api/MediatypeApiClient.java index e24f269c..dc846913 100644 --- a/gen/main/java/testapi/packages/api/MediatypeApiClient.java +++ b/gen/main/java/testapi/packages/api/MediatypeApiClient.java @@ -14,7 +14,7 @@ public interface MediatypeApiClient { java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; java.lang.String PATH_MEDIATYPE_PRODUCES_SAME_MODEL = "/mediatype/produces-with-same-model"; - @io.micronaut.http.annotation.Post("/mediatype/consumes-and-produces") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_AND_PRODUCES) @io.micronaut.http.annotation.Produces({ "application/octet-stream" }) @io.micronaut.http.annotation.Consumes({ "application/xml" }) io.micronaut.http.HttpResponse mediatypeConsumesAndProduces( @@ -22,7 +22,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesAndProduces( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-with-fileupload") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD) @io.micronaut.http.annotation.Produces({ "multipart/form-data" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUpload( @@ -30,7 +30,7 @@ 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(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD) @io.micronaut.http.annotation.Produces({ "multipart/form-data" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( @@ -38,7 +38,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileU @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); - @io.micronaut.http.annotation.Post("/mediatype/consumes-octet-stream") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_OCTET_STREAM) @io.micronaut.http.annotation.Produces({ "application/octet-stream" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesOctetStream( @@ -46,7 +46,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesOctetStream( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-plain") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_PLAIN) @io.micronaut.http.annotation.Produces({ "text/plain" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesPlain( @@ -54,7 +54,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesPlain( @io.micronaut.http.annotation.Body java.lang.String body); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-different-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL) @io.micronaut.http.annotation.Consumes({ "application/json", "text/plain" }) io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.core.annotation.NonNull @@ -64,7 +64,7 @@ io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.http.annotation.QueryValue(value = "plain") java.lang.Boolean plain); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-same-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_SAME_MODEL) @io.micronaut.http.annotation.Consumes({ "application/json", "application/xml" }) io.micronaut.http.HttpResponse mediatypeProducesSameModel( @io.micronaut.core.annotation.NonNull diff --git a/gen/main/java/testapi/packages/api/ParameterApi.java b/gen/main/java/testapi/packages/api/ParameterApi.java index 42ba86fb..9175beaf 100644 --- a/gen/main/java/testapi/packages/api/ParameterApi.java +++ b/gen/main/java/testapi/packages/api/ParameterApi.java @@ -17,16 +17,16 @@ public interface ParameterApi { java.lang.String PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT = "/param/header/optionalWithoutDefault"; java.lang.String PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT = "/param/header/requiredWithDefault"; java.lang.String PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT = "/param/header/requiredWithoutDefault"; - java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_STRING = "/param/path/overlay/{string}"; - java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_UUID = "/param/path/overlay/{uuid}"; + java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_STRING = "/param/path/overlay/{string:10}"; + java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_UUID = "/param/path/overlay/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}"; java.lang.String PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT = "/param/path/requiredWithDefault/{string}"; java.lang.String PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT = "/param/path/requiredWithoutDefault/{string}"; - java.lang.String PATH_PARAM_PATH_WITH_BOOLEAN = "/param/path/with-bool/{bool}"; - java.lang.String PATH_PARAM_PATH_WITH_INTEGER = "/param/path/with-integer/{integer}"; - java.lang.String PATH_PARAM_PATH_WITH_LONG = "/param/path/with-long/{long}"; - java.lang.String PATH_PARAM_PATH_WITH_MAX_LENGTH = "/param/path/with-max-length/{string}"; - java.lang.String PATH_PARAM_PATH_WITH_PATTERN = "/param/path/with-pattern/{string}"; - java.lang.String PATH_PARAM_PATH_WITH_UUID = "/param/path/with-uuid/{uuid}"; + java.lang.String PATH_PARAM_PATH_WITH_BOOLEAN = "/param/path/with-bool/{bool:true|false}"; + java.lang.String PATH_PARAM_PATH_WITH_INTEGER = "/param/path/with-integer/{integer:\\-?[0-9]+}"; + java.lang.String PATH_PARAM_PATH_WITH_LONG = "/param/path/with-long/{long:\\-?[0-9]+}"; + java.lang.String PATH_PARAM_PATH_WITH_MAX_LENGTH = "/param/path/with-max-length/{string:5}"; + java.lang.String PATH_PARAM_PATH_WITH_PATTERN = "/param/path/with-pattern/{string:[0-9][a-z]}"; + java.lang.String PATH_PARAM_PATH_WITH_UUID = "/param/path/with-uuid/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}"; java.lang.String PATH_PARAM_QUERY_DATE = "/param/query/date"; java.lang.String PATH_PARAM_QUERY_DATE_TIME = "/param/query/date-time"; java.lang.String PATH_PARAM_QUERY_MULTIPLE_LISTS = "/param/query/multiple-lists"; @@ -37,7 +37,7 @@ public interface ParameterApi { java.lang.String PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT = "/param/query/requiredWithoutDefault"; java.lang.String PATH_PARAM_QUERY_UUID = "/param/query/uuid"; - @io.micronaut.http.annotation.Get("/param/all/{path}") + @io.micronaut.http.annotation.Get(PATH_PARAM_ALL) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramAll( @io.micronaut.core.annotation.NonNull @@ -53,7 +53,7 @@ io.micronaut.http.HttpResponse paramAll( @io.micronaut.http.annotation.Header(value = "integer") java.util.Optional integer); - @io.micronaut.http.annotation.Post("/param/body/optional") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_OPTIONAL) @io.micronaut.http.annotation.Consumes({ "application/json" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramBodyOptional( @@ -62,7 +62,7 @@ io.micronaut.http.HttpResponse paramBodyOptional( @javax.validation.Valid java.util.Optional parameterModel); - @io.micronaut.http.annotation.Post("/param/body/required") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_REQUIRED) @io.micronaut.http.annotation.Consumes({ "application/json" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramBodyRequired( @@ -71,63 +71,63 @@ io.micronaut.http.HttpResponse paramBodyRequired( @javax.validation.Valid ParameterModel parameterModel); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramCookieOptionalWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.CookieValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramCookieOptionalWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.CookieValue(value = "string") java.util.Optional string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramCookieRequiredWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.CookieValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramCookieRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderOptionalWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Header(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderOptionalWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Header(value = "string") java.util.Optional string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderRequiredWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Header(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{string:10}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_STRING) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathOverlayWithString( @io.micronaut.core.annotation.NonNull @@ -135,49 +135,49 @@ io.micronaut.http.HttpResponse paramPathOverlayWithString( @javax.validation.constraints.Size(max = 10) java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_UUID) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathOverlayWithUuid( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/path/requiredWithDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathRequiredWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/requiredWithoutDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-bool/{bool:true|false}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_BOOLEAN) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithBoolean( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "bool") java.lang.Boolean bool); - @io.micronaut.http.annotation.Get("/param/path/with-integer/{integer:\\-?[0-9]+}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_INTEGER) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithInteger( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/param/path/with-long/{long:\\-?[0-9]+}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_LONG) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithLong( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "long") java.lang.Long _long); - @io.micronaut.http.annotation.Get("/param/path/with-max-length/{string:5}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_MAX_LENGTH) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithMaxLength( @io.micronaut.core.annotation.NonNull @@ -185,7 +185,7 @@ io.micronaut.http.HttpResponse paramPathWithMaxLength( @javax.validation.constraints.Size(max = 5) java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-pattern/{string:[0-9][a-z]}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_PATTERN) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithPattern( @io.micronaut.core.annotation.NonNull @@ -193,28 +193,28 @@ io.micronaut.http.HttpResponse paramPathWithPattern( @javax.validation.constraints.Pattern(regexp = "[0-9][a-z]") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-uuid/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_UUID) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithUuid( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/query/date") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryDate( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "date") java.util.Optional date); - @io.micronaut.http.annotation.Get("/param/query/date-time") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE_TIME) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryDateTime( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "date") java.util.Optional date); - @io.micronaut.http.annotation.Get("/param/query/multiple-lists") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_MULTIPLE_LISTS) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.core.annotation.NonNull @@ -227,45 +227,45 @@ io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.http.annotation.QueryValue java.util.Optional> c); - @io.micronaut.http.annotation.Get("/param/query/number") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_NUMBER) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryNumber( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "date") java.util.Optional date); - @io.micronaut.http.annotation.Get("/param/query/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryOptionalWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryOptionalWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.util.Optional string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryRequiredWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/uuid") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_UUID) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryUuid( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "date") java.util.Optional date); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/packages/api/ParameterApiClient.java b/gen/main/java/testapi/packages/api/ParameterApiClient.java index 84a1de43..b46c657f 100644 --- a/gen/main/java/testapi/packages/api/ParameterApiClient.java +++ b/gen/main/java/testapi/packages/api/ParameterApiClient.java @@ -29,7 +29,7 @@ public interface ParameterApiClient { java.lang.String PATH_PARAM_PATH_WITH_UUID = "/param/path/with-uuid/{uuid}"; java.lang.String PATH_PARAM_QUERY_DATE = "/param/query/date"; java.lang.String PATH_PARAM_QUERY_DATE_TIME = "/param/query/date-time"; - java.lang.String PATH_PARAM_QUERY_MULTIPLE_LISTS = "/param/query/multiple-lists"; + java.lang.String PATH_PARAM_QUERY_MULTIPLE_LISTS = "/param/query/multiple-lists?{&a*}{&b*}{&c*}"; java.lang.String PATH_PARAM_QUERY_NUMBER = "/param/query/number"; java.lang.String PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT = "/param/query/optionalWithDefault"; java.lang.String PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT = "/param/query/optionalWithoutDefault"; @@ -37,7 +37,7 @@ public interface ParameterApiClient { java.lang.String PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT = "/param/query/requiredWithoutDefault"; java.lang.String PATH_PARAM_QUERY_UUID = "/param/query/uuid"; - @io.micronaut.http.annotation.Get("/param/all/{path}") + @io.micronaut.http.annotation.Get(PATH_PARAM_ALL) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramAll( @io.micronaut.core.annotation.NonNull @@ -53,7 +53,7 @@ io.micronaut.http.HttpResponse paramAll( @io.micronaut.http.annotation.Header(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Post("/param/body/optional") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_OPTIONAL) @io.micronaut.http.annotation.Produces({ "application/json" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramBodyOptional( @@ -61,7 +61,7 @@ io.micronaut.http.HttpResponse paramBodyOptional( @io.micronaut.http.annotation.Body ParameterModel parameterModel); - @io.micronaut.http.annotation.Post("/param/body/required") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_REQUIRED) @io.micronaut.http.annotation.Produces({ "application/json" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramBodyRequired( @@ -69,147 +69,147 @@ io.micronaut.http.HttpResponse paramBodyRequired( @io.micronaut.http.annotation.Body ParameterModel parameterModel); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramCookieOptionalWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramCookieOptionalWithoutDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramCookieRequiredWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramCookieRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderOptionalWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderOptionalWithoutDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderRequiredWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_STRING) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathOverlayWithString( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{uuid}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_UUID) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathOverlayWithUuid( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/path/requiredWithDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathRequiredWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/requiredWithoutDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-bool/{bool}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_BOOLEAN) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithBoolean( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "bool") java.lang.Boolean bool); - @io.micronaut.http.annotation.Get("/param/path/with-integer/{integer}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_INTEGER) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithInteger( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/param/path/with-long/{long}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_LONG) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithLong( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "long") java.lang.Long _long); - @io.micronaut.http.annotation.Get("/param/path/with-max-length/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_MAX_LENGTH) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithMaxLength( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-pattern/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_PATTERN) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithPattern( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-uuid/{uuid}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_UUID) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithUuid( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/query/date") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryDate( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "date") java.time.LocalDate date); - @io.micronaut.http.annotation.Get("/param/query/date-time") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE_TIME) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryDateTime( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "date") java.time.Instant date); - @io.micronaut.http.annotation.Get("/param/query/multiple-lists?{&a*}{&b*}{&c*}") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_MULTIPLE_LISTS) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.core.annotation.Nullable @@ -222,42 +222,42 @@ io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.http.annotation.QueryValue(value = "c") java.util.List c); - @io.micronaut.http.annotation.Get("/param/query/number") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_NUMBER) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryNumber( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "date") java.lang.Double date); - @io.micronaut.http.annotation.Get("/param/query/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryOptionalWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryOptionalWithoutDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryRequiredWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/uuid") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_UUID) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryUuid( @io.micronaut.core.annotation.Nullable diff --git a/gen/main/java/testapi/packages/api/RequestApi.java b/gen/main/java/testapi/packages/api/RequestApi.java index 1e0dea59..eff33598 100644 --- a/gen/main/java/testapi/packages/api/RequestApi.java +++ b/gen/main/java/testapi/packages/api/RequestApi.java @@ -8,6 +8,6 @@ public interface RequestApi { java.lang.String PATH_NO_OPERATION_ID_GET = "/no-operation-id"; - @io.micronaut.http.annotation.Get("/no-operation-id") + @io.micronaut.http.annotation.Get(PATH_NO_OPERATION_ID_GET) io.micronaut.http.HttpResponse noOperationIdGet(); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/packages/api/RequestApiClient.java b/gen/main/java/testapi/packages/api/RequestApiClient.java index e6d1ebc9..89190738 100644 --- a/gen/main/java/testapi/packages/api/RequestApiClient.java +++ b/gen/main/java/testapi/packages/api/RequestApiClient.java @@ -8,6 +8,6 @@ public interface RequestApiClient { java.lang.String PATH_NO_OPERATION_ID_GET = "/no-operation-id"; - @io.micronaut.http.annotation.Get("/no-operation-id") + @io.micronaut.http.annotation.Get(PATH_NO_OPERATION_ID_GET) io.micronaut.http.HttpResponse noOperationIdGet(); } diff --git a/gen/main/java/testapi/packages/api/ResponseApi.java b/gen/main/java/testapi/packages/api/ResponseApi.java index a64501dc..4ae895bf 100644 --- a/gen/main/java/testapi/packages/api/ResponseApi.java +++ b/gen/main/java/testapi/packages/api/ResponseApi.java @@ -22,43 +22,43 @@ public interface ResponseApi { java.lang.String PATH_VOID_NOT_FOUND = "/response/void-not-found"; java.lang.String PATH_WITH_DEFAULT = "/response/default"; - @io.micronaut.http.annotation.Get("/response/array-complex") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arrayComplex(); - @io.micronaut.http.annotation.Get("/response/array-complex-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX_NOT_FOUND) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arrayComplexNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/array-simple") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arraySimple(); - @io.micronaut.http.annotation.Get("/response/array-simple-empty") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_EMPTY) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arraySimpleEmpty(); - @io.micronaut.http.annotation.Get("/response/array-simple-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_NOT_FOUND) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arraySimpleNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/header") + @io.micronaut.http.annotation.Get(PATH_HEADER) io.micronaut.http.HttpResponse header(); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleDataTypes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES_NOT_FOUND) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.core.annotation.NonNull @@ -68,14 +68,14 @@ io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleResponseCodes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.core.annotation.NonNull @@ -85,26 +85,26 @@ io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/optional") + @io.micronaut.http.annotation.Get(PATH_OPTIONAL) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse optional( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/single") + @io.micronaut.http.annotation.Get(PATH_SINGLE) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse single(); - @io.micronaut.http.annotation.Get("/response/void") + @io.micronaut.http.annotation.Get(PATH_VOID_FOUND) io.micronaut.http.HttpResponse voidFound(); - @io.micronaut.http.annotation.Get("/response/void-not-found") + @io.micronaut.http.annotation.Get(PATH_VOID_NOT_FOUND) io.micronaut.http.HttpResponse voidNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/default") + @io.micronaut.http.annotation.Get(PATH_WITH_DEFAULT) io.micronaut.http.HttpResponse withDefault(); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/packages/api/ResponseApiClient.java b/gen/main/java/testapi/packages/api/ResponseApiClient.java index 7be892e2..ebf0b666 100644 --- a/gen/main/java/testapi/packages/api/ResponseApiClient.java +++ b/gen/main/java/testapi/packages/api/ResponseApiClient.java @@ -22,43 +22,43 @@ public interface ResponseApiClient { java.lang.String PATH_VOID_NOT_FOUND = "/response/void-not-found"; java.lang.String PATH_WITH_DEFAULT = "/response/default"; - @io.micronaut.http.annotation.Get("/response/array-complex") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse> arrayComplex(); - @io.micronaut.http.annotation.Get("/response/array-complex-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX_NOT_FOUND) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse> arrayComplexNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/array-simple") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse> arraySimple(); - @io.micronaut.http.annotation.Get("/response/array-simple-empty") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_EMPTY) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse> arraySimpleEmpty(); - @io.micronaut.http.annotation.Get("/response/array-simple-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_NOT_FOUND) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse> arraySimpleNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/header") + @io.micronaut.http.annotation.Get(PATH_HEADER) io.micronaut.http.HttpResponse header(); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse multipleDataTypes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES_NOT_FOUND) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.core.annotation.NonNull @@ -68,14 +68,14 @@ io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse multipleResponseCodes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.core.annotation.NonNull @@ -85,26 +85,26 @@ io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/optional") + @io.micronaut.http.annotation.Get(PATH_OPTIONAL) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse optional( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/single") + @io.micronaut.http.annotation.Get(PATH_SINGLE) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse single(); - @io.micronaut.http.annotation.Get("/response/void") + @io.micronaut.http.annotation.Get(PATH_VOID_FOUND) io.micronaut.http.HttpResponse voidFound(); - @io.micronaut.http.annotation.Get("/response/void-not-found") + @io.micronaut.http.annotation.Get(PATH_VOID_NOT_FOUND) io.micronaut.http.HttpResponse voidNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/default") + @io.micronaut.http.annotation.Get(PATH_WITH_DEFAULT) io.micronaut.http.HttpResponse withDefault(); } diff --git a/gen/main/java/testapi/packages/api/ValidationApi.java b/gen/main/java/testapi/packages/api/ValidationApi.java index f3dddbb9..861f0366 100644 --- a/gen/main/java/testapi/packages/api/ValidationApi.java +++ b/gen/main/java/testapi/packages/api/ValidationApi.java @@ -28,21 +28,21 @@ public interface ValidationApi { java.lang.String PATH_VALIDATION_STRING_PATTERN = "/validation/string/pattern"; java.lang.String PATH_VALIDATION_STRING_RANGE = "/validation/string/range"; - @io.micronaut.http.annotation.Get("/validation/double/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MAX) io.micronaut.http.HttpResponse validationDoubleMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @javax.validation.constraints.DecimalMax(value = "4", inclusive = false) java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/double/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MIN) io.micronaut.http.HttpResponse validationDoubleMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @javax.validation.constraints.DecimalMin(value = "3", inclusive = false) java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/double/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_RANGE) io.micronaut.http.HttpResponse validationDoubleRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @@ -50,21 +50,21 @@ io.micronaut.http.HttpResponse validationDoubleRange( @javax.validation.constraints.DecimalMax(value = "4", inclusive = true) java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/float/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MAX) io.micronaut.http.HttpResponse validationFloatMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @javax.validation.constraints.DecimalMax(value = "4", inclusive = false) java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MIN) io.micronaut.http.HttpResponse validationFloatMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @javax.validation.constraints.DecimalMin(value = "3", inclusive = false) java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_RANGE) io.micronaut.http.HttpResponse validationFloatRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @@ -72,21 +72,21 @@ io.micronaut.http.HttpResponse validationFloatRange( @javax.validation.constraints.DecimalMax(value = "4", inclusive = true) java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/integer/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MAX) io.micronaut.http.HttpResponse validationIntegerMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @javax.validation.constraints.Max(4) java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MIN) io.micronaut.http.HttpResponse validationIntegerMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @javax.validation.constraints.Min(3) java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_RANGE) io.micronaut.http.HttpResponse validationIntegerRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @@ -94,21 +94,21 @@ io.micronaut.http.HttpResponse validationIntegerRange( @javax.validation.constraints.Max(4) java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/list/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MAX) io.micronaut.http.HttpResponse validationListMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @javax.validation.constraints.Size(max = 4) java.util.List list); - @io.micronaut.http.annotation.Get("/validation/list/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MIN) io.micronaut.http.HttpResponse validationListMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @javax.validation.constraints.Size(min = 3) java.util.List list); - @io.micronaut.http.annotation.Post("/validation/list/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_MODEL) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse validationListModel( @io.micronaut.core.annotation.NonNull @@ -116,28 +116,28 @@ io.micronaut.http.HttpResponse validationListModel( @javax.validation.Valid java.util.List stringModel); - @io.micronaut.http.annotation.Post("/validation/list/range") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_RANGE) io.micronaut.http.HttpResponse validationListRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @javax.validation.constraints.Size(min = 3, max = 4) java.util.List list); - @io.micronaut.http.annotation.Get("/validation/long/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MAX) io.micronaut.http.HttpResponse validationLongMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @javax.validation.constraints.Max(4) java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MIN) io.micronaut.http.HttpResponse validationLongMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @javax.validation.constraints.Min(3) java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_RANGE) io.micronaut.http.HttpResponse validationLongRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @@ -145,7 +145,7 @@ io.micronaut.http.HttpResponse validationLongRange( @javax.validation.constraints.Max(4) java.lang.Long integer); - @io.micronaut.http.annotation.Post("/validation/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_MODEL) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse validationModel( @io.micronaut.core.annotation.NonNull @@ -153,31 +153,31 @@ io.micronaut.http.HttpResponse validationModel( @javax.validation.Valid StringModel stringModel); - @io.micronaut.http.annotation.Get("/validation/string/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MAX) io.micronaut.http.HttpResponse validationStringMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @javax.validation.constraints.Size(max = 4) java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MIN) io.micronaut.http.HttpResponse validationStringMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @javax.validation.constraints.Size(min = 3) java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/pattern") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_PATTERN) io.micronaut.http.HttpResponse validationStringPattern( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @javax.validation.constraints.Pattern(regexp = "[a-z]{3,5}") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_RANGE) io.micronaut.http.HttpResponse validationStringRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @javax.validation.constraints.Size(min = 3, max = 4) java.lang.String string); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/packages/api/ValidationApiClient.java b/gen/main/java/testapi/packages/api/ValidationApiClient.java index f960ef20..f1cbfc46 100644 --- a/gen/main/java/testapi/packages/api/ValidationApiClient.java +++ b/gen/main/java/testapi/packages/api/ValidationApiClient.java @@ -15,10 +15,10 @@ public interface ValidationApiClient { java.lang.String PATH_VALIDATION_INTEGER_MAX = "/validation/integer/max"; java.lang.String PATH_VALIDATION_INTEGER_MIN = "/validation/integer/min"; java.lang.String PATH_VALIDATION_INTEGER_RANGE = "/validation/integer/range"; - java.lang.String PATH_VALIDATION_LIST_MAX = "/validation/list/max"; - java.lang.String PATH_VALIDATION_LIST_MIN = "/validation/list/min"; + java.lang.String PATH_VALIDATION_LIST_MAX = "/validation/list/max?{&list*}"; + java.lang.String PATH_VALIDATION_LIST_MIN = "/validation/list/min?{&list*}"; java.lang.String PATH_VALIDATION_LIST_MODEL = "/validation/list/model"; - java.lang.String PATH_VALIDATION_LIST_RANGE = "/validation/list/range"; + java.lang.String PATH_VALIDATION_LIST_RANGE = "/validation/list/range?{&list*}"; java.lang.String PATH_VALIDATION_LONG_MAX = "/validation/long/max"; java.lang.String PATH_VALIDATION_LONG_MIN = "/validation/long/min"; java.lang.String PATH_VALIDATION_LONG_RANGE = "/validation/long/range"; @@ -28,129 +28,129 @@ public interface ValidationApiClient { java.lang.String PATH_VALIDATION_STRING_PATTERN = "/validation/string/pattern"; java.lang.String PATH_VALIDATION_STRING_RANGE = "/validation/string/range"; - @io.micronaut.http.annotation.Get("/validation/double/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MAX) io.micronaut.http.HttpResponse validationDoubleMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/double/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MIN) io.micronaut.http.HttpResponse validationDoubleMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/double/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_RANGE) io.micronaut.http.HttpResponse validationDoubleRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Double number); - @io.micronaut.http.annotation.Get("/validation/float/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MAX) io.micronaut.http.HttpResponse validationFloatMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MIN) io.micronaut.http.HttpResponse validationFloatMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_RANGE) io.micronaut.http.HttpResponse validationFloatRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/integer/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MAX) io.micronaut.http.HttpResponse validationIntegerMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MIN) io.micronaut.http.HttpResponse validationIntegerMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_RANGE) io.micronaut.http.HttpResponse validationIntegerRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/list/max?{&list*}") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MAX) io.micronaut.http.HttpResponse validationListMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "list") java.util.List list); - @io.micronaut.http.annotation.Get("/validation/list/min?{&list*}") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MIN) io.micronaut.http.HttpResponse validationListMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "list") java.util.List list); - @io.micronaut.http.annotation.Post("/validation/list/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_MODEL) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse validationListModel( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Body java.util.List stringModel); - @io.micronaut.http.annotation.Post("/validation/list/range?{&list*}") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_RANGE) io.micronaut.http.HttpResponse validationListRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "list") java.util.List list); - @io.micronaut.http.annotation.Get("/validation/long/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MAX) io.micronaut.http.HttpResponse validationLongMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MIN) io.micronaut.http.HttpResponse validationLongMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_RANGE) io.micronaut.http.HttpResponse validationLongRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Long integer); - @io.micronaut.http.annotation.Post("/validation/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_MODEL) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse validationModel( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Body StringModel stringModel); - @io.micronaut.http.annotation.Get("/validation/string/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MAX) io.micronaut.http.HttpResponse validationStringMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MIN) io.micronaut.http.HttpResponse validationStringMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/pattern") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_PATTERN) io.micronaut.http.HttpResponse validationStringPattern( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_RANGE) io.micronaut.http.HttpResponse validationStringRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") diff --git a/gen/main/java/testapi/types/MediatypeApi.java b/gen/main/java/testapi/types/MediatypeApi.java index 124d8859..20d94fcc 100644 --- a/gen/main/java/testapi/types/MediatypeApi.java +++ b/gen/main/java/testapi/types/MediatypeApi.java @@ -11,7 +11,7 @@ public interface MediatypeApi { java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; java.lang.String PATH_MEDIATYPE_PRODUCES_SAME_MODEL = "/mediatype/produces-with-same-model"; - @io.micronaut.http.annotation.Post("/mediatype/consumes-and-produces") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_AND_PRODUCES) @io.micronaut.http.annotation.Consumes({ "application/octet-stream" }) @io.micronaut.http.annotation.Produces({ "application/xml" }) io.micronaut.http.HttpResponse mediatypeConsumesAndProduces( @@ -19,7 +19,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesAndProduces( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-with-fileupload") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD) @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUpload( @@ -33,7 +33,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUplo @io.micronaut.http.annotation.Part(value = "file") io.micronaut.http.multipart.CompletedFileUpload file); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD) @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( @@ -44,7 +44,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileU @io.micronaut.http.annotation.Part(value = "userId") java.lang.Integer userId); - @io.micronaut.http.annotation.Post("/mediatype/consumes-octet-stream") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_OCTET_STREAM) @io.micronaut.http.annotation.Consumes({ "application/octet-stream" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesOctetStream( @@ -52,7 +52,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesOctetStream( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-plain") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_PLAIN) @io.micronaut.http.annotation.Consumes({ "text/plain" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesPlain( @@ -60,7 +60,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesPlain( @io.micronaut.http.annotation.Body java.lang.String body); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-different-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL) @io.micronaut.http.annotation.Produces({ "application/json", "text/plain" }) io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.core.annotation.NonNull @@ -70,10 +70,10 @@ io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.http.annotation.QueryValue(value = "plain") java.lang.Boolean plain); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-same-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_SAME_MODEL) @io.micronaut.http.annotation.Produces({ "application/json", "application/xml" }) io.micronaut.http.HttpResponse mediatypeProducesSameModel( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "value") java.lang.String value); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/types/MediatypeApiClient.java b/gen/main/java/testapi/types/MediatypeApiClient.java index cc99e0af..777c3879 100644 --- a/gen/main/java/testapi/types/MediatypeApiClient.java +++ b/gen/main/java/testapi/types/MediatypeApiClient.java @@ -11,7 +11,7 @@ public interface MediatypeApiClient { java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; java.lang.String PATH_MEDIATYPE_PRODUCES_SAME_MODEL = "/mediatype/produces-with-same-model"; - @io.micronaut.http.annotation.Post("/mediatype/consumes-and-produces") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_AND_PRODUCES) @io.micronaut.http.annotation.Produces({ "application/octet-stream" }) @io.micronaut.http.annotation.Consumes({ "application/xml" }) io.micronaut.http.HttpResponse mediatypeConsumesAndProduces( @@ -19,7 +19,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesAndProduces( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-with-fileupload") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD) @io.micronaut.http.annotation.Produces({ "multipart/form-data" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUpload( @@ -27,7 +27,7 @@ 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(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD) @io.micronaut.http.annotation.Produces({ "multipart/form-data" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( @@ -35,7 +35,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileU @io.micronaut.http.annotation.Body io.micronaut.http.client.multipart.MultipartBody multipart); - @io.micronaut.http.annotation.Post("/mediatype/consumes-octet-stream") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_OCTET_STREAM) @io.micronaut.http.annotation.Produces({ "application/octet-stream" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesOctetStream( @@ -43,7 +43,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesOctetStream( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post("/mediatype/consumes-plain") + @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_PLAIN) @io.micronaut.http.annotation.Produces({ "text/plain" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesPlain( @@ -51,7 +51,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesPlain( @io.micronaut.http.annotation.Body java.lang.String body); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-different-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL) @io.micronaut.http.annotation.Consumes({ "application/json", "text/plain" }) io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.core.annotation.NonNull @@ -61,7 +61,7 @@ io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.http.annotation.QueryValue(value = "plain") java.lang.Boolean plain); - @io.micronaut.http.annotation.Get("/mediatype/produces-with-same-model") + @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_SAME_MODEL) @io.micronaut.http.annotation.Consumes({ "application/json", "application/xml" }) io.micronaut.http.HttpResponse mediatypeProducesSameModel( @io.micronaut.core.annotation.NonNull diff --git a/gen/main/java/testapi/types/ParameterApi.java b/gen/main/java/testapi/types/ParameterApi.java index 96724a95..1b74dfef 100644 --- a/gen/main/java/testapi/types/ParameterApi.java +++ b/gen/main/java/testapi/types/ParameterApi.java @@ -14,16 +14,16 @@ public interface ParameterApi { java.lang.String PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT = "/param/header/optionalWithoutDefault"; java.lang.String PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT = "/param/header/requiredWithDefault"; java.lang.String PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT = "/param/header/requiredWithoutDefault"; - java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_STRING = "/param/path/overlay/{string}"; - java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_UUID = "/param/path/overlay/{uuid}"; + java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_STRING = "/param/path/overlay/{string:10}"; + java.lang.String PATH_PARAM_PATH_OVERLAY_WITH_UUID = "/param/path/overlay/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}"; java.lang.String PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT = "/param/path/requiredWithDefault/{string}"; java.lang.String PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT = "/param/path/requiredWithoutDefault/{string}"; - java.lang.String PATH_PARAM_PATH_WITH_BOOLEAN = "/param/path/with-bool/{bool}"; - java.lang.String PATH_PARAM_PATH_WITH_INTEGER = "/param/path/with-integer/{integer}"; - java.lang.String PATH_PARAM_PATH_WITH_LONG = "/param/path/with-long/{long}"; - java.lang.String PATH_PARAM_PATH_WITH_MAX_LENGTH = "/param/path/with-max-length/{string}"; - java.lang.String PATH_PARAM_PATH_WITH_PATTERN = "/param/path/with-pattern/{string}"; - java.lang.String PATH_PARAM_PATH_WITH_UUID = "/param/path/with-uuid/{uuid}"; + java.lang.String PATH_PARAM_PATH_WITH_BOOLEAN = "/param/path/with-bool/{bool:true|false}"; + java.lang.String PATH_PARAM_PATH_WITH_INTEGER = "/param/path/with-integer/{integer:\\-?[0-9]+}"; + java.lang.String PATH_PARAM_PATH_WITH_LONG = "/param/path/with-long/{long:\\-?[0-9]+}"; + java.lang.String PATH_PARAM_PATH_WITH_MAX_LENGTH = "/param/path/with-max-length/{string:5}"; + java.lang.String PATH_PARAM_PATH_WITH_PATTERN = "/param/path/with-pattern/{string:[0-9][a-z]}"; + java.lang.String PATH_PARAM_PATH_WITH_UUID = "/param/path/with-uuid/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}"; java.lang.String PATH_PARAM_QUERY_DATE = "/param/query/date"; java.lang.String PATH_PARAM_QUERY_DATE_TIME = "/param/query/date-time"; java.lang.String PATH_PARAM_QUERY_MULTIPLE_LISTS = "/param/query/multiple-lists"; @@ -34,7 +34,7 @@ public interface ParameterApi { java.lang.String PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT = "/param/query/requiredWithoutDefault"; java.lang.String PATH_PARAM_QUERY_UUID = "/param/query/uuid"; - @io.micronaut.http.annotation.Get("/param/all/{path}") + @io.micronaut.http.annotation.Get(PATH_PARAM_ALL) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramAll( @io.micronaut.core.annotation.NonNull @@ -50,7 +50,7 @@ io.micronaut.http.HttpResponse paramAll( @io.micronaut.http.annotation.Header(value = "integer") java.util.Optional integer); - @io.micronaut.http.annotation.Post("/param/body/optional") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_OPTIONAL) @io.micronaut.http.annotation.Consumes({ "application/json" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramBodyOptional( @@ -59,7 +59,7 @@ io.micronaut.http.HttpResponse paramBodyOptional( @javax.validation.Valid java.util.Optional parameterModel); - @io.micronaut.http.annotation.Post("/param/body/required") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_REQUIRED) @io.micronaut.http.annotation.Consumes({ "application/json" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramBodyRequired( @@ -68,63 +68,63 @@ io.micronaut.http.HttpResponse paramBodyRequired( @javax.validation.Valid ParameterModel parameterModel); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramCookieOptionalWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.CookieValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramCookieOptionalWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.CookieValue(value = "string") java.util.Optional string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramCookieRequiredWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.CookieValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramCookieRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderOptionalWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Header(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderOptionalWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Header(value = "string") java.util.Optional string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderRequiredWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Header(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{string:10}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_STRING) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathOverlayWithString( @io.micronaut.core.annotation.NonNull @@ -132,49 +132,49 @@ io.micronaut.http.HttpResponse paramPathOverlayWithString( @javax.validation.constraints.Size(max = 10) java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_UUID) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathOverlayWithUuid( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/path/requiredWithDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathRequiredWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/requiredWithoutDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-bool/{bool:true|false}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_BOOLEAN) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithBoolean( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "bool") java.lang.Boolean bool); - @io.micronaut.http.annotation.Get("/param/path/with-integer/{integer:\\-?[0-9]+}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_INTEGER) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithInteger( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/param/path/with-long/{long:\\-?[0-9]+}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_LONG) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithLong( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "long") java.lang.Long _long); - @io.micronaut.http.annotation.Get("/param/path/with-max-length/{string:5}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_MAX_LENGTH) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithMaxLength( @io.micronaut.core.annotation.NonNull @@ -182,7 +182,7 @@ io.micronaut.http.HttpResponse paramPathWithMaxLength( @javax.validation.constraints.Size(max = 5) java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-pattern/{string:[0-9][a-z]}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_PATTERN) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithPattern( @io.micronaut.core.annotation.NonNull @@ -190,28 +190,28 @@ io.micronaut.http.HttpResponse paramPathWithPattern( @javax.validation.constraints.Pattern(regexp = "[0-9][a-z]") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-uuid/{uuid:[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9]-[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_UUID) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithUuid( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/query/date") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryDate( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "date") java.util.Optional date); - @io.micronaut.http.annotation.Get("/param/query/date-time") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE_TIME) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryDateTime( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "date") java.util.Optional date); - @io.micronaut.http.annotation.Get("/param/query/multiple-lists") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_MULTIPLE_LISTS) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.core.annotation.NonNull @@ -224,45 +224,45 @@ io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.http.annotation.QueryValue java.util.Optional> c); - @io.micronaut.http.annotation.Get("/param/query/number") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_NUMBER) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryNumber( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "date") java.util.Optional date); - @io.micronaut.http.annotation.Get("/param/query/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryOptionalWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryOptionalWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.util.Optional string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryRequiredWithDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/uuid") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_UUID) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryUuid( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "date") java.util.Optional date); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/types/ParameterApiClient.java b/gen/main/java/testapi/types/ParameterApiClient.java index 634706af..e5d27c0c 100644 --- a/gen/main/java/testapi/types/ParameterApiClient.java +++ b/gen/main/java/testapi/types/ParameterApiClient.java @@ -26,7 +26,7 @@ public interface ParameterApiClient { java.lang.String PATH_PARAM_PATH_WITH_UUID = "/param/path/with-uuid/{uuid}"; java.lang.String PATH_PARAM_QUERY_DATE = "/param/query/date"; java.lang.String PATH_PARAM_QUERY_DATE_TIME = "/param/query/date-time"; - java.lang.String PATH_PARAM_QUERY_MULTIPLE_LISTS = "/param/query/multiple-lists"; + java.lang.String PATH_PARAM_QUERY_MULTIPLE_LISTS = "/param/query/multiple-lists?{&a*}{&b*}{&c*}"; java.lang.String PATH_PARAM_QUERY_NUMBER = "/param/query/number"; java.lang.String PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT = "/param/query/optionalWithDefault"; java.lang.String PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT = "/param/query/optionalWithoutDefault"; @@ -34,7 +34,7 @@ public interface ParameterApiClient { java.lang.String PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT = "/param/query/requiredWithoutDefault"; java.lang.String PATH_PARAM_QUERY_UUID = "/param/query/uuid"; - @io.micronaut.http.annotation.Get("/param/all/{path}") + @io.micronaut.http.annotation.Get(PATH_PARAM_ALL) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramAll( @io.micronaut.core.annotation.NonNull @@ -50,7 +50,7 @@ io.micronaut.http.HttpResponse paramAll( @io.micronaut.http.annotation.Header(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Post("/param/body/optional") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_OPTIONAL) @io.micronaut.http.annotation.Produces({ "application/json" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramBodyOptional( @@ -58,7 +58,7 @@ io.micronaut.http.HttpResponse paramBodyOptional( @io.micronaut.http.annotation.Body ParameterModel parameterModel); - @io.micronaut.http.annotation.Post("/param/body/required") + @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_REQUIRED) @io.micronaut.http.annotation.Produces({ "application/json" }) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramBodyRequired( @@ -66,147 +66,147 @@ io.micronaut.http.HttpResponse paramBodyRequired( @io.micronaut.http.annotation.Body ParameterModel parameterModel); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramCookieOptionalWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramCookieOptionalWithoutDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramCookieRequiredWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/cookie/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramCookieRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderOptionalWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderOptionalWithoutDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderRequiredWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/header/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramHeaderRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_STRING) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathOverlayWithString( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/overlay/{uuid}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_UUID) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathOverlayWithUuid( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/path/requiredWithDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathRequiredWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/requiredWithoutDefault/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-bool/{bool}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_BOOLEAN) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithBoolean( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "bool") java.lang.Boolean bool); - @io.micronaut.http.annotation.Get("/param/path/with-integer/{integer}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_INTEGER) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithInteger( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/param/path/with-long/{long}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_LONG) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithLong( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "long") java.lang.Long _long); - @io.micronaut.http.annotation.Get("/param/path/with-max-length/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_MAX_LENGTH) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithMaxLength( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-pattern/{string}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_PATTERN) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithPattern( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/path/with-uuid/{uuid}") + @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_UUID) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithUuid( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get("/param/query/date") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryDate( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "date") java.time.LocalDate date); - @io.micronaut.http.annotation.Get("/param/query/date-time") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE_TIME) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryDateTime( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "date") java.time.ZonedDateTime date); - @io.micronaut.http.annotation.Get("/param/query/multiple-lists?{&a*}{&b*}{&c*}") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_MULTIPLE_LISTS) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.core.annotation.Nullable @@ -219,42 +219,42 @@ io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.http.annotation.QueryValue(value = "c") java.util.List c); - @io.micronaut.http.annotation.Get("/param/query/number") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_NUMBER) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryNumber( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "date") java.lang.Double date); - @io.micronaut.http.annotation.Get("/param/query/optionalWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryOptionalWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/optionalWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryOptionalWithoutDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryRequiredWithDefault( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/requiredWithoutDefault") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryRequiredWithoutDefault( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/param/query/uuid") + @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_UUID) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse paramQueryUuid( @io.micronaut.core.annotation.Nullable diff --git a/gen/main/java/testapi/types/RequestApi.java b/gen/main/java/testapi/types/RequestApi.java index 0cb1ecae..1277706c 100644 --- a/gen/main/java/testapi/types/RequestApi.java +++ b/gen/main/java/testapi/types/RequestApi.java @@ -5,6 +5,6 @@ public interface RequestApi { java.lang.String PATH_NO_OPERATION_ID_GET = "/no-operation-id"; - @io.micronaut.http.annotation.Get("/no-operation-id") + @io.micronaut.http.annotation.Get(PATH_NO_OPERATION_ID_GET) io.micronaut.http.HttpResponse noOperationIdGet(); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/types/RequestApiClient.java b/gen/main/java/testapi/types/RequestApiClient.java index 7db7deba..a6100de8 100644 --- a/gen/main/java/testapi/types/RequestApiClient.java +++ b/gen/main/java/testapi/types/RequestApiClient.java @@ -5,6 +5,6 @@ public interface RequestApiClient { java.lang.String PATH_NO_OPERATION_ID_GET = "/no-operation-id"; - @io.micronaut.http.annotation.Get("/no-operation-id") + @io.micronaut.http.annotation.Get(PATH_NO_OPERATION_ID_GET) io.micronaut.http.HttpResponse noOperationIdGet(); } diff --git a/gen/main/java/testapi/types/ResponseApi.java b/gen/main/java/testapi/types/ResponseApi.java index 99561141..10ca01dc 100644 --- a/gen/main/java/testapi/types/ResponseApi.java +++ b/gen/main/java/testapi/types/ResponseApi.java @@ -19,43 +19,43 @@ public interface ResponseApi { java.lang.String PATH_VOID_NOT_FOUND = "/response/void-not-found"; java.lang.String PATH_WITH_DEFAULT = "/response/default"; - @io.micronaut.http.annotation.Get("/response/array-complex") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arrayComplex(); - @io.micronaut.http.annotation.Get("/response/array-complex-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX_NOT_FOUND) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arrayComplexNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/array-simple") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arraySimple(); - @io.micronaut.http.annotation.Get("/response/array-simple-empty") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_EMPTY) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arraySimpleEmpty(); - @io.micronaut.http.annotation.Get("/response/array-simple-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_NOT_FOUND) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arraySimpleNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/header") + @io.micronaut.http.annotation.Get(PATH_HEADER) io.micronaut.http.HttpResponse header(); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleDataTypes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES_NOT_FOUND) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.core.annotation.NonNull @@ -65,14 +65,14 @@ io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleResponseCodes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.core.annotation.NonNull @@ -82,26 +82,26 @@ io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/optional") + @io.micronaut.http.annotation.Get(PATH_OPTIONAL) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse optional( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/single") + @io.micronaut.http.annotation.Get(PATH_SINGLE) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse single(); - @io.micronaut.http.annotation.Get("/response/void") + @io.micronaut.http.annotation.Get(PATH_VOID_FOUND) io.micronaut.http.HttpResponse voidFound(); - @io.micronaut.http.annotation.Get("/response/void-not-found") + @io.micronaut.http.annotation.Get(PATH_VOID_NOT_FOUND) io.micronaut.http.HttpResponse voidNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/default") + @io.micronaut.http.annotation.Get(PATH_WITH_DEFAULT) io.micronaut.http.HttpResponse withDefault(); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/types/ResponseApiClient.java b/gen/main/java/testapi/types/ResponseApiClient.java index 90a8e50d..99326421 100644 --- a/gen/main/java/testapi/types/ResponseApiClient.java +++ b/gen/main/java/testapi/types/ResponseApiClient.java @@ -19,43 +19,43 @@ public interface ResponseApiClient { java.lang.String PATH_VOID_NOT_FOUND = "/response/void-not-found"; java.lang.String PATH_WITH_DEFAULT = "/response/default"; - @io.micronaut.http.annotation.Get("/response/array-complex") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse> arrayComplex(); - @io.micronaut.http.annotation.Get("/response/array-complex-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX_NOT_FOUND) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse> arrayComplexNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/array-simple") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse> arraySimple(); - @io.micronaut.http.annotation.Get("/response/array-simple-empty") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_EMPTY) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse> arraySimpleEmpty(); - @io.micronaut.http.annotation.Get("/response/array-simple-not-found") + @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_NOT_FOUND) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse> arraySimpleNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/header") + @io.micronaut.http.annotation.Get(PATH_HEADER) io.micronaut.http.HttpResponse header(); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse multipleDataTypes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-datatypes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES_NOT_FOUND) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.core.annotation.NonNull @@ -65,14 +65,14 @@ io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse multipleResponseCodes( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "redirect") java.lang.Boolean redirect); - @io.micronaut.http.annotation.Get("/response/multiple-response-codes-not-found") + @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.core.annotation.NonNull @@ -82,26 +82,26 @@ io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/optional") + @io.micronaut.http.annotation.Get(PATH_OPTIONAL) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse optional( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/single") + @io.micronaut.http.annotation.Get(PATH_SINGLE) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse single(); - @io.micronaut.http.annotation.Get("/response/void") + @io.micronaut.http.annotation.Get(PATH_VOID_FOUND) io.micronaut.http.HttpResponse voidFound(); - @io.micronaut.http.annotation.Get("/response/void-not-found") + @io.micronaut.http.annotation.Get(PATH_VOID_NOT_FOUND) io.micronaut.http.HttpResponse voidNotFound( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get("/response/default") + @io.micronaut.http.annotation.Get(PATH_WITH_DEFAULT) io.micronaut.http.HttpResponse withDefault(); } diff --git a/gen/main/java/testapi/types/ValidationApi.java b/gen/main/java/testapi/types/ValidationApi.java index 1b81f322..b053aab7 100644 --- a/gen/main/java/testapi/types/ValidationApi.java +++ b/gen/main/java/testapi/types/ValidationApi.java @@ -25,21 +25,21 @@ public interface ValidationApi { java.lang.String PATH_VALIDATION_STRING_PATTERN = "/validation/string/pattern"; java.lang.String PATH_VALIDATION_STRING_RANGE = "/validation/string/range"; - @io.micronaut.http.annotation.Get("/validation/double/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MAX) io.micronaut.http.HttpResponse validationDoubleMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @javax.validation.constraints.DecimalMax(value = "4", inclusive = false) java.math.BigDecimal number); - @io.micronaut.http.annotation.Get("/validation/double/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MIN) io.micronaut.http.HttpResponse validationDoubleMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @javax.validation.constraints.DecimalMin(value = "3", inclusive = false) java.math.BigDecimal number); - @io.micronaut.http.annotation.Get("/validation/double/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_RANGE) io.micronaut.http.HttpResponse validationDoubleRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @@ -47,21 +47,21 @@ io.micronaut.http.HttpResponse validationDoubleRange( @javax.validation.constraints.DecimalMax(value = "4", inclusive = true) java.math.BigDecimal number); - @io.micronaut.http.annotation.Get("/validation/float/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MAX) io.micronaut.http.HttpResponse validationFloatMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @javax.validation.constraints.DecimalMax(value = "4", inclusive = false) java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MIN) io.micronaut.http.HttpResponse validationFloatMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @javax.validation.constraints.DecimalMin(value = "3", inclusive = false) java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_RANGE) io.micronaut.http.HttpResponse validationFloatRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @@ -69,21 +69,21 @@ io.micronaut.http.HttpResponse validationFloatRange( @javax.validation.constraints.DecimalMax(value = "4", inclusive = true) java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/integer/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MAX) io.micronaut.http.HttpResponse validationIntegerMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @javax.validation.constraints.Max(4) java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MIN) io.micronaut.http.HttpResponse validationIntegerMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @javax.validation.constraints.Min(3) java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_RANGE) io.micronaut.http.HttpResponse validationIntegerRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @@ -91,21 +91,21 @@ io.micronaut.http.HttpResponse validationIntegerRange( @javax.validation.constraints.Max(4) java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/list/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MAX) io.micronaut.http.HttpResponse validationListMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @javax.validation.constraints.Size(max = 4) java.util.List list); - @io.micronaut.http.annotation.Get("/validation/list/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MIN) io.micronaut.http.HttpResponse validationListMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @javax.validation.constraints.Size(min = 3) java.util.List list); - @io.micronaut.http.annotation.Post("/validation/list/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_MODEL) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse validationListModel( @io.micronaut.core.annotation.NonNull @@ -113,28 +113,28 @@ io.micronaut.http.HttpResponse validationListModel( @javax.validation.Valid java.util.List stringModel); - @io.micronaut.http.annotation.Post("/validation/list/range") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_RANGE) io.micronaut.http.HttpResponse validationListRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @javax.validation.constraints.Size(min = 3, max = 4) java.util.List list); - @io.micronaut.http.annotation.Get("/validation/long/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MAX) io.micronaut.http.HttpResponse validationLongMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @javax.validation.constraints.Max(4) java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MIN) io.micronaut.http.HttpResponse validationLongMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @javax.validation.constraints.Min(3) java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_RANGE) io.micronaut.http.HttpResponse validationLongRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @@ -142,7 +142,7 @@ io.micronaut.http.HttpResponse validationLongRange( @javax.validation.constraints.Max(4) java.lang.Long integer); - @io.micronaut.http.annotation.Post("/validation/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_MODEL) @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse validationModel( @io.micronaut.core.annotation.NonNull @@ -150,31 +150,31 @@ io.micronaut.http.HttpResponse validationModel( @javax.validation.Valid StringModel stringModel); - @io.micronaut.http.annotation.Get("/validation/string/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MAX) io.micronaut.http.HttpResponse validationStringMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @javax.validation.constraints.Size(max = 4) java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MIN) io.micronaut.http.HttpResponse validationStringMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @javax.validation.constraints.Size(min = 3) java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/pattern") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_PATTERN) io.micronaut.http.HttpResponse validationStringPattern( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @javax.validation.constraints.Pattern(regexp = "[a-z]{3,5}") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_RANGE) io.micronaut.http.HttpResponse validationStringRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @javax.validation.constraints.Size(min = 3, max = 4) java.lang.String string); -} \ No newline at end of file +} diff --git a/gen/main/java/testapi/types/ValidationApiClient.java b/gen/main/java/testapi/types/ValidationApiClient.java index 21ca9ad3..42bd31c4 100644 --- a/gen/main/java/testapi/types/ValidationApiClient.java +++ b/gen/main/java/testapi/types/ValidationApiClient.java @@ -12,10 +12,10 @@ public interface ValidationApiClient { java.lang.String PATH_VALIDATION_INTEGER_MAX = "/validation/integer/max"; java.lang.String PATH_VALIDATION_INTEGER_MIN = "/validation/integer/min"; java.lang.String PATH_VALIDATION_INTEGER_RANGE = "/validation/integer/range"; - java.lang.String PATH_VALIDATION_LIST_MAX = "/validation/list/max"; - java.lang.String PATH_VALIDATION_LIST_MIN = "/validation/list/min"; + java.lang.String PATH_VALIDATION_LIST_MAX = "/validation/list/max?{&list*}"; + java.lang.String PATH_VALIDATION_LIST_MIN = "/validation/list/min?{&list*}"; java.lang.String PATH_VALIDATION_LIST_MODEL = "/validation/list/model"; - java.lang.String PATH_VALIDATION_LIST_RANGE = "/validation/list/range"; + java.lang.String PATH_VALIDATION_LIST_RANGE = "/validation/list/range?{&list*}"; java.lang.String PATH_VALIDATION_LONG_MAX = "/validation/long/max"; java.lang.String PATH_VALIDATION_LONG_MIN = "/validation/long/min"; java.lang.String PATH_VALIDATION_LONG_RANGE = "/validation/long/range"; @@ -25,129 +25,129 @@ public interface ValidationApiClient { java.lang.String PATH_VALIDATION_STRING_PATTERN = "/validation/string/pattern"; java.lang.String PATH_VALIDATION_STRING_RANGE = "/validation/string/range"; - @io.micronaut.http.annotation.Get("/validation/double/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MAX) io.micronaut.http.HttpResponse validationDoubleMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.math.BigDecimal number); - @io.micronaut.http.annotation.Get("/validation/double/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MIN) io.micronaut.http.HttpResponse validationDoubleMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.math.BigDecimal number); - @io.micronaut.http.annotation.Get("/validation/double/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_RANGE) io.micronaut.http.HttpResponse validationDoubleRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.math.BigDecimal number); - @io.micronaut.http.annotation.Get("/validation/float/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MAX) io.micronaut.http.HttpResponse validationFloatMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MIN) io.micronaut.http.HttpResponse validationFloatMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/float/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_RANGE) io.micronaut.http.HttpResponse validationFloatRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") java.lang.Float number); - @io.micronaut.http.annotation.Get("/validation/integer/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MAX) io.micronaut.http.HttpResponse validationIntegerMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MIN) io.micronaut.http.HttpResponse validationIntegerMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/integer/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_RANGE) io.micronaut.http.HttpResponse validationIntegerRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get("/validation/list/max?{&list*}") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MAX) io.micronaut.http.HttpResponse validationListMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "list") java.util.List list); - @io.micronaut.http.annotation.Get("/validation/list/min?{&list*}") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MIN) io.micronaut.http.HttpResponse validationListMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "list") java.util.List list); - @io.micronaut.http.annotation.Post("/validation/list/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_MODEL) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse validationListModel( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Body java.util.List stringModel); - @io.micronaut.http.annotation.Post("/validation/list/range?{&list*}") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_RANGE) io.micronaut.http.HttpResponse validationListRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "list") java.util.List list); - @io.micronaut.http.annotation.Get("/validation/long/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MAX) io.micronaut.http.HttpResponse validationLongMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MIN) io.micronaut.http.HttpResponse validationLongMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Long integer); - @io.micronaut.http.annotation.Get("/validation/long/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_RANGE) io.micronaut.http.HttpResponse validationLongRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") java.lang.Long integer); - @io.micronaut.http.annotation.Post("/validation/model") + @io.micronaut.http.annotation.Post(PATH_VALIDATION_MODEL) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse validationModel( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.Body StringModel stringModel); - @io.micronaut.http.annotation.Get("/validation/string/max") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MAX) io.micronaut.http.HttpResponse validationStringMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/min") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MIN) io.micronaut.http.HttpResponse validationStringMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/pattern") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_PATTERN) io.micronaut.http.HttpResponse validationStringPattern( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get("/validation/string/range") + @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_RANGE) io.micronaut.http.HttpResponse validationStringRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") diff --git a/gen/main/java/testmodel/micronaut_java/InheritanceExtendedAllOf.java b/gen/main/java/testmodel/micronaut_java/InheritanceExtendedAllOf.java deleted file mode 100644 index 8358cced..00000000 --- a/gen/main/java/testmodel/micronaut_java/InheritanceExtendedAllOf.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Spec for api tests. - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 1 - * - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - -package testmodel.micronaut_java; - -import java.util.Objects; -import java.util.Arrays; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.*; - -import javax.validation.constraints.*; -import javax.validation.Valid; -import io.micronaut.core.annotation.*; -import javax.annotation.Generated; - -/** - * InheritanceExtendedAllOf - */ -@JsonPropertyOrder({ - InheritanceExtendedAllOf.JSON_PROPERTY_BAR -}) -@JsonTypeName("InheritanceExtended_allOf") -@java.lang.SuppressWarnings("all") -@Generated(value="org.openapitools.codegen.languages.JavaMicronautServerCodegen") -@Introspected -public class InheritanceExtendedAllOf { - public static final String JSON_PROPERTY_BAR = "bar"; - private String bar; - - public InheritanceExtendedAllOf(String bar) { - this.bar = bar; - } - - public InheritanceExtendedAllOf bar(String bar) { - this.bar = bar; - return this; - } - - /** - * Get bar - * @return bar - **/ - @NotNull - @JsonProperty(JSON_PROPERTY_BAR) - @JsonInclude(value = JsonInclude.Include.ALWAYS) - public String getBar() { - return bar; - } - - @JsonProperty(JSON_PROPERTY_BAR) - @JsonInclude(value = JsonInclude.Include.ALWAYS) - public void setBar(String bar) { - this.bar = bar; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - InheritanceExtendedAllOf inheritanceExtendedAllOf = (InheritanceExtendedAllOf) o; - return Objects.equals(this.bar, inheritanceExtendedAllOf.bar); - } - - @Override - public int hashCode() { - return Objects.hash(bar); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class InheritanceExtendedAllOf {\n"); - sb.append(" bar: ").append(toIndentedString(bar)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } - -} - diff --git a/gen/main/java/testmodel/micronaut_java/InheritanceWithEnumType1AllOf.java b/gen/main/java/testmodel/micronaut_java/InheritanceWithEnumType1AllOf.java deleted file mode 100644 index 4f6b2f52..00000000 --- a/gen/main/java/testmodel/micronaut_java/InheritanceWithEnumType1AllOf.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Spec for api tests. - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 1 - * - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - -package testmodel.micronaut_java; - -import java.util.Objects; -import java.util.Arrays; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.*; - -import javax.validation.constraints.*; -import javax.validation.Valid; -import io.micronaut.core.annotation.*; -import javax.annotation.Generated; - -/** - * InheritanceWithEnumType1AllOf - */ -@JsonPropertyOrder({ - InheritanceWithEnumType1AllOf.JSON_PROPERTY_D -}) -@JsonTypeName("InheritanceWithEnumType1_allOf") -@java.lang.SuppressWarnings("all") -@Generated(value="org.openapitools.codegen.languages.JavaMicronautServerCodegen") -@Introspected -public class InheritanceWithEnumType1AllOf { - public static final String JSON_PROPERTY_D = "d"; - private String d; - - public InheritanceWithEnumType1AllOf() { - } - - public InheritanceWithEnumType1AllOf d(String d) { - this.d = d; - return this; - } - - /** - * Get d - * @return d - **/ - @Nullable - @JsonProperty(JSON_PROPERTY_D) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public String getD() { - return d; - } - - @JsonProperty(JSON_PROPERTY_D) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setD(String d) { - this.d = d; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - InheritanceWithEnumType1AllOf inheritanceWithEnumType1AllOf = (InheritanceWithEnumType1AllOf) o; - return Objects.equals(this.d, inheritanceWithEnumType1AllOf.d); - } - - @Override - public int hashCode() { - return Objects.hash(d); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class InheritanceWithEnumType1AllOf {\n"); - sb.append(" d: ").append(toIndentedString(d)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } - -} - diff --git a/gen/main/java/testmodel/micronaut_java/InheritanceWithEnumType2AllOf.java b/gen/main/java/testmodel/micronaut_java/InheritanceWithEnumType2AllOf.java deleted file mode 100644 index dd95a64b..00000000 --- a/gen/main/java/testmodel/micronaut_java/InheritanceWithEnumType2AllOf.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Spec for api tests. - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 1 - * - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - -package testmodel.micronaut_java; - -import java.util.Objects; -import java.util.Arrays; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.*; - -import javax.validation.constraints.*; -import javax.validation.Valid; -import io.micronaut.core.annotation.*; -import javax.annotation.Generated; - -/** - * InheritanceWithEnumType2AllOf - */ -@JsonPropertyOrder({ - InheritanceWithEnumType2AllOf.JSON_PROPERTY_E -}) -@JsonTypeName("InheritanceWithEnumType2_allOf") -@java.lang.SuppressWarnings("all") -@Generated(value="org.openapitools.codegen.languages.JavaMicronautServerCodegen") -@Introspected -public class InheritanceWithEnumType2AllOf { - public static final String JSON_PROPERTY_E = "e"; - private String e; - - public InheritanceWithEnumType2AllOf() { - } - - public InheritanceWithEnumType2AllOf e(String e) { - this.e = e; - return this; - } - - /** - * Get e - * @return e - **/ - @Nullable - @JsonProperty(JSON_PROPERTY_E) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public String getE() { - return e; - } - - @JsonProperty(JSON_PROPERTY_E) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setE(String e) { - this.e = e; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - InheritanceWithEnumType2AllOf inheritanceWithEnumType2AllOf = (InheritanceWithEnumType2AllOf) o; - return Objects.equals(this.e, inheritanceWithEnumType2AllOf.e); - } - - @Override - public int hashCode() { - return Objects.hash(e); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class InheritanceWithEnumType2AllOf {\n"); - sb.append(" e: ").append(toIndentedString(e)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } - -} - diff --git a/gen/main/java/testmodel/micronaut_java/InheritanceWithStringType1AllOf.java b/gen/main/java/testmodel/micronaut_java/InheritanceWithStringType1AllOf.java deleted file mode 100644 index 68cf163c..00000000 --- a/gen/main/java/testmodel/micronaut_java/InheritanceWithStringType1AllOf.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Spec for api tests. - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 1 - * - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - -package testmodel.micronaut_java; - -import java.util.Objects; -import java.util.Arrays; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.*; - -import javax.validation.constraints.*; -import javax.validation.Valid; -import io.micronaut.core.annotation.*; -import javax.annotation.Generated; - -/** - * InheritanceWithStringType1AllOf - */ -@JsonPropertyOrder({ - InheritanceWithStringType1AllOf.JSON_PROPERTY_B -}) -@JsonTypeName("InheritanceWithStringType1_allOf") -@java.lang.SuppressWarnings("all") -@Generated(value="org.openapitools.codegen.languages.JavaMicronautServerCodegen") -@Introspected -public class InheritanceWithStringType1AllOf { - public static final String JSON_PROPERTY_B = "b"; - private String b; - - public InheritanceWithStringType1AllOf() { - } - - public InheritanceWithStringType1AllOf b(String b) { - this.b = b; - return this; - } - - /** - * Get b - * @return b - **/ - @Nullable - @JsonProperty(JSON_PROPERTY_B) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public String getB() { - return b; - } - - @JsonProperty(JSON_PROPERTY_B) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setB(String b) { - this.b = b; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - InheritanceWithStringType1AllOf inheritanceWithStringType1AllOf = (InheritanceWithStringType1AllOf) o; - return Objects.equals(this.b, inheritanceWithStringType1AllOf.b); - } - - @Override - public int hashCode() { - return Objects.hash(b); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class InheritanceWithStringType1AllOf {\n"); - sb.append(" b: ").append(toIndentedString(b)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } - -} - diff --git a/gen/main/java/testmodel/micronaut_java/InheritanceWithStringType2AllOf.java b/gen/main/java/testmodel/micronaut_java/InheritanceWithStringType2AllOf.java deleted file mode 100644 index b537fa48..00000000 --- a/gen/main/java/testmodel/micronaut_java/InheritanceWithStringType2AllOf.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Spec for api tests. - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 1 - * - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - -package testmodel.micronaut_java; - -import java.util.Objects; -import java.util.Arrays; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.*; - -import javax.validation.constraints.*; -import javax.validation.Valid; -import io.micronaut.core.annotation.*; -import javax.annotation.Generated; - -/** - * InheritanceWithStringType2AllOf - */ -@JsonPropertyOrder({ - InheritanceWithStringType2AllOf.JSON_PROPERTY_C -}) -@JsonTypeName("InheritanceWithStringType2_allOf") -@java.lang.SuppressWarnings("all") -@Generated(value="org.openapitools.codegen.languages.JavaMicronautServerCodegen") -@Introspected -public class InheritanceWithStringType2AllOf { - public static final String JSON_PROPERTY_C = "c"; - private String c; - - public InheritanceWithStringType2AllOf() { - } - - public InheritanceWithStringType2AllOf c(String c) { - this.c = c; - return this; - } - - /** - * Get c - * @return c - **/ - @Nullable - @JsonProperty(JSON_PROPERTY_C) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public String getC() { - return c; - } - - @JsonProperty(JSON_PROPERTY_C) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setC(String c) { - this.c = c; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - InheritanceWithStringType2AllOf inheritanceWithStringType2AllOf = (InheritanceWithStringType2AllOf) o; - return Objects.equals(this.c, inheritanceWithStringType2AllOf.c); - } - - @Override - public int hashCode() { - return Objects.hash(c); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class InheritanceWithStringType2AllOf {\n"); - sb.append(" c: ").append(toIndentedString(c)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } - -} - diff --git a/gen/main/java/testmodel/micronaut_java/InheritanceWithoutType1AllOf.java b/gen/main/java/testmodel/micronaut_java/InheritanceWithoutType1AllOf.java deleted file mode 100644 index aad8a2c5..00000000 --- a/gen/main/java/testmodel/micronaut_java/InheritanceWithoutType1AllOf.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Spec for api tests. - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 1 - * - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - -package testmodel.micronaut_java; - -import java.util.Objects; -import java.util.Arrays; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.*; - -import javax.validation.constraints.*; -import javax.validation.Valid; -import io.micronaut.core.annotation.*; -import javax.annotation.Generated; - -/** - * InheritanceWithoutType1AllOf - */ -@JsonPropertyOrder({ - InheritanceWithoutType1AllOf.JSON_PROPERTY_F -}) -@JsonTypeName("InheritanceWithoutType1_allOf") -@java.lang.SuppressWarnings("all") -@Generated(value="org.openapitools.codegen.languages.JavaMicronautServerCodegen") -@Introspected -public class InheritanceWithoutType1AllOf { - public static final String JSON_PROPERTY_F = "f"; - private String f; - - public InheritanceWithoutType1AllOf() { - } - - public InheritanceWithoutType1AllOf f(String f) { - this.f = f; - return this; - } - - /** - * Get f - * @return f - **/ - @Nullable - @JsonProperty(JSON_PROPERTY_F) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public String getF() { - return f; - } - - @JsonProperty(JSON_PROPERTY_F) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setF(String f) { - this.f = f; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - InheritanceWithoutType1AllOf inheritanceWithoutType1AllOf = (InheritanceWithoutType1AllOf) o; - return Objects.equals(this.f, inheritanceWithoutType1AllOf.f); - } - - @Override - public int hashCode() { - return Objects.hash(f); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class InheritanceWithoutType1AllOf {\n"); - sb.append(" f: ").append(toIndentedString(f)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } - -} - diff --git a/gen/main/java/testmodel/micronaut_java/InheritanceWithoutType2AllOf.java b/gen/main/java/testmodel/micronaut_java/InheritanceWithoutType2AllOf.java deleted file mode 100644 index a68b3aa1..00000000 --- a/gen/main/java/testmodel/micronaut_java/InheritanceWithoutType2AllOf.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Spec for api tests. - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 1 - * - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - -package testmodel.micronaut_java; - -import java.util.Objects; -import java.util.Arrays; -import com.fasterxml.jackson.annotation.JsonTypeName; -import com.fasterxml.jackson.annotation.*; - -import javax.validation.constraints.*; -import javax.validation.Valid; -import io.micronaut.core.annotation.*; -import javax.annotation.Generated; - -/** - * InheritanceWithoutType2AllOf - */ -@JsonPropertyOrder({ - InheritanceWithoutType2AllOf.JSON_PROPERTY_G -}) -@JsonTypeName("InheritanceWithoutType2_allOf") -@java.lang.SuppressWarnings("all") -@Generated(value="org.openapitools.codegen.languages.JavaMicronautServerCodegen") -@Introspected -public class InheritanceWithoutType2AllOf { - public static final String JSON_PROPERTY_G = "g"; - private String g; - - public InheritanceWithoutType2AllOf() { - } - - public InheritanceWithoutType2AllOf g(String g) { - this.g = g; - return this; - } - - /** - * Get g - * @return g - **/ - @Nullable - @JsonProperty(JSON_PROPERTY_G) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public String getG() { - return g; - } - - @JsonProperty(JSON_PROPERTY_G) - @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setG(String g) { - this.g = g; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - InheritanceWithoutType2AllOf inheritanceWithoutType2AllOf = (InheritanceWithoutType2AllOf) o; - return Objects.equals(this.g, inheritanceWithoutType2AllOf.g); - } - - @Override - public int hashCode() { - return Objects.hash(g); - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class InheritanceWithoutType2AllOf {\n"); - sb.append(" g: ").append(toIndentedString(g)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces - * (except the first line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } - -} - diff --git a/gen/main/java/testsecurity/auth/SecurityApiClient.java b/gen/main/java/testsecurity/auth/client/SecurityApiClient.java similarity index 59% rename from gen/main/java/testsecurity/auth/SecurityApiClient.java rename to gen/main/java/testsecurity/auth/client/SecurityApiClient.java index 26f71ac8..85fca462 100644 --- a/gen/main/java/testsecurity/auth/SecurityApiClient.java +++ b/gen/main/java/testsecurity/auth/client/SecurityApiClient.java @@ -1,4 +1,4 @@ -package testsecurity.auth; +package testsecurity.auth.client; @jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") @io.micronaut.http.client.annotation.Client(id = "id") @@ -8,32 +8,21 @@ public interface SecurityApiClient { java.lang.String PATH_AUTHENTICATED_WITH_PARAM = "/authenticated/with-param"; java.lang.String PATH_AUTHENTICATED_WITHOUT_PARAM = "/authenticated/without-param"; - @io.micronaut.http.annotation.Get("/anonymous") + @io.micronaut.http.annotation.Get(PATH_ANONYMOUS) io.micronaut.http.HttpResponse anonymous(); - @io.micronaut.http.annotation.Get("/authenticated/with-param") - io.micronaut.http.HttpResponse authenticatedWithParam( - @io.micronaut.core.annotation.Nullable - @io.micronaut.http.annotation.QueryValue(value = "queryParam") - java.lang.String queryParam); - - @io.micronaut.http.annotation.Get("/authenticated/with-param") + @io.micronaut.http.annotation.Get(PATH_AUTHENTICATED_WITH_PARAM) io.micronaut.http.HttpResponse authenticatedWithParam( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.Header(io.micronaut.http.HttpHeaders.AUTHORIZATION) - String authorization, + java.lang.String authorization, @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "queryParam") java.lang.String queryParam); - - @io.micronaut.http.annotation.Get("/authenticated/without-param") - io.micronaut.http.HttpResponse authenticatedWithoutParam(); - - @io.micronaut.http.annotation.Get("/authenticated/without-param") + @io.micronaut.http.annotation.Get(PATH_AUTHENTICATED_WITHOUT_PARAM) io.micronaut.http.HttpResponse authenticatedWithoutParam( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.Header(io.micronaut.http.HttpHeaders.AUTHORIZATION) - String authorization); - + java.lang.String authorization); } diff --git a/gen/main/java/testsecurity/auth/SecurityApi.java b/gen/main/java/testsecurity/auth/server/SecurityApi.java similarity index 78% rename from gen/main/java/testsecurity/auth/SecurityApi.java rename to gen/main/java/testsecurity/auth/server/SecurityApi.java index dfbbbd94..df5328bf 100644 --- a/gen/main/java/testsecurity/auth/SecurityApi.java +++ b/gen/main/java/testsecurity/auth/server/SecurityApi.java @@ -1,4 +1,4 @@ -package testsecurity.auth; +package testsecurity.auth.server; @jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") @io.micronaut.validation.Validated @@ -8,10 +8,10 @@ public interface SecurityApi { java.lang.String PATH_AUTHENTICATED_WITH_PARAM = "/authenticated/with-param"; java.lang.String PATH_AUTHENTICATED_WITHOUT_PARAM = "/authenticated/without-param"; - @io.micronaut.http.annotation.Get("/anonymous") + @io.micronaut.http.annotation.Get(PATH_ANONYMOUS) io.micronaut.http.HttpResponse anonymous(); - @io.micronaut.http.annotation.Get("/authenticated/with-param") + @io.micronaut.http.annotation.Get(PATH_AUTHENTICATED_WITH_PARAM) io.micronaut.http.HttpResponse authenticatedWithParam( @io.micronaut.core.annotation.NonNull io.micronaut.security.authentication.Authentication authentication, @@ -19,6 +19,6 @@ io.micronaut.http.HttpResponse authenticatedWithParam( @io.micronaut.http.annotation.QueryValue(value = "queryParam") java.util.Optional queryParam); - @io.micronaut.http.annotation.Get("/authenticated/without-param") + @io.micronaut.http.annotation.Get(PATH_AUTHENTICATED_WITHOUT_PARAM) io.micronaut.http.HttpResponse authenticatedWithoutParam(); -} \ No newline at end of file +} diff --git a/gen/main/java/testsecurity/defaults/SecurityApiClient.java b/gen/main/java/testsecurity/auth/server/SecurityApiClient.java similarity index 59% rename from gen/main/java/testsecurity/defaults/SecurityApiClient.java rename to gen/main/java/testsecurity/auth/server/SecurityApiClient.java index fb2704f0..308144dd 100644 --- a/gen/main/java/testsecurity/defaults/SecurityApiClient.java +++ b/gen/main/java/testsecurity/auth/server/SecurityApiClient.java @@ -1,4 +1,4 @@ -package testsecurity.defaults; +package testsecurity.auth.server; @jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") @io.micronaut.http.client.annotation.Client(id = "id") @@ -8,32 +8,21 @@ public interface SecurityApiClient { java.lang.String PATH_AUTHENTICATED_WITH_PARAM = "/authenticated/with-param"; java.lang.String PATH_AUTHENTICATED_WITHOUT_PARAM = "/authenticated/without-param"; - @io.micronaut.http.annotation.Get("/anonymous") + @io.micronaut.http.annotation.Get(PATH_ANONYMOUS) io.micronaut.http.HttpResponse anonymous(); - @io.micronaut.http.annotation.Get("/authenticated/with-param") - io.micronaut.http.HttpResponse authenticatedWithParam( - @io.micronaut.core.annotation.Nullable - @io.micronaut.http.annotation.QueryValue(value = "queryParam") - java.lang.String queryParam); - - @io.micronaut.http.annotation.Get("/authenticated/with-param") + @io.micronaut.http.annotation.Get(PATH_AUTHENTICATED_WITH_PARAM) io.micronaut.http.HttpResponse authenticatedWithParam( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.Header(io.micronaut.http.HttpHeaders.AUTHORIZATION) - String authorization, + java.lang.String authorization, @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "queryParam") java.lang.String queryParam); - - @io.micronaut.http.annotation.Get("/authenticated/without-param") - io.micronaut.http.HttpResponse authenticatedWithoutParam(); - - @io.micronaut.http.annotation.Get("/authenticated/without-param") + @io.micronaut.http.annotation.Get(PATH_AUTHENTICATED_WITHOUT_PARAM) io.micronaut.http.HttpResponse authenticatedWithoutParam( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.Header(io.micronaut.http.HttpHeaders.AUTHORIZATION) - String authorization); - + java.lang.String authorization); } diff --git a/gen/main/java/testsecurity/defaults/client/SecurityApiClient.java b/gen/main/java/testsecurity/defaults/client/SecurityApiClient.java new file mode 100644 index 00000000..9e3e38d9 --- /dev/null +++ b/gen/main/java/testsecurity/defaults/client/SecurityApiClient.java @@ -0,0 +1,22 @@ +package testsecurity.defaults.client; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.http.client.annotation.Client(id = "id") +public interface SecurityApiClient { + + java.lang.String PATH_ANONYMOUS = "/anonymous"; + java.lang.String PATH_AUTHENTICATED_WITH_PARAM = "/authenticated/with-param"; + java.lang.String PATH_AUTHENTICATED_WITHOUT_PARAM = "/authenticated/without-param"; + + @io.micronaut.http.annotation.Get(PATH_ANONYMOUS) + io.micronaut.http.HttpResponse anonymous(); + + @io.micronaut.http.annotation.Get(PATH_AUTHENTICATED_WITH_PARAM) + io.micronaut.http.HttpResponse authenticatedWithParam( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "queryParam") + java.lang.String queryParam); + + @io.micronaut.http.annotation.Get(PATH_AUTHENTICATED_WITHOUT_PARAM) + io.micronaut.http.HttpResponse authenticatedWithoutParam(); +} diff --git a/gen/main/java/testsecurity/defaults/SecurityApi.java b/gen/main/java/testsecurity/defaults/server/SecurityApi.java similarity index 75% rename from gen/main/java/testsecurity/defaults/SecurityApi.java rename to gen/main/java/testsecurity/defaults/server/SecurityApi.java index 1a8b5d50..18aad59d 100644 --- a/gen/main/java/testsecurity/defaults/SecurityApi.java +++ b/gen/main/java/testsecurity/defaults/server/SecurityApi.java @@ -1,4 +1,4 @@ -package testsecurity.defaults; +package testsecurity.defaults.server; @jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") @io.micronaut.validation.Validated @@ -8,15 +8,15 @@ public interface SecurityApi { java.lang.String PATH_AUTHENTICATED_WITH_PARAM = "/authenticated/with-param"; java.lang.String PATH_AUTHENTICATED_WITHOUT_PARAM = "/authenticated/without-param"; - @io.micronaut.http.annotation.Get("/anonymous") + @io.micronaut.http.annotation.Get(PATH_ANONYMOUS) io.micronaut.http.HttpResponse anonymous(); - @io.micronaut.http.annotation.Get("/authenticated/with-param") + @io.micronaut.http.annotation.Get(PATH_AUTHENTICATED_WITH_PARAM) io.micronaut.http.HttpResponse authenticatedWithParam( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "queryParam") java.util.Optional queryParam); - @io.micronaut.http.annotation.Get("/authenticated/without-param") + @io.micronaut.http.annotation.Get(PATH_AUTHENTICATED_WITHOUT_PARAM) io.micronaut.http.HttpResponse authenticatedWithoutParam(); -} \ No newline at end of file +} diff --git a/gen/main/java/testsecurity/defaults/server/SecurityApiClient.java b/gen/main/java/testsecurity/defaults/server/SecurityApiClient.java new file mode 100644 index 00000000..8dd275e0 --- /dev/null +++ b/gen/main/java/testsecurity/defaults/server/SecurityApiClient.java @@ -0,0 +1,22 @@ +package testsecurity.defaults.server; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.http.client.annotation.Client(id = "id") +public interface SecurityApiClient { + + java.lang.String PATH_ANONYMOUS = "/anonymous"; + java.lang.String PATH_AUTHENTICATED_WITH_PARAM = "/authenticated/with-param"; + java.lang.String PATH_AUTHENTICATED_WITHOUT_PARAM = "/authenticated/without-param"; + + @io.micronaut.http.annotation.Get(PATH_ANONYMOUS) + io.micronaut.http.HttpResponse anonymous(); + + @io.micronaut.http.annotation.Get(PATH_AUTHENTICATED_WITH_PARAM) + io.micronaut.http.HttpResponse authenticatedWithParam( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "queryParam") + java.lang.String queryParam); + + @io.micronaut.http.annotation.Get(PATH_AUTHENTICATED_WITHOUT_PARAM) + io.micronaut.http.HttpResponse authenticatedWithoutParam(); +} diff --git a/gen/main/java/testsecurity/types/SecurityApi.java b/gen/main/java/testsecurity/types/SecurityApi.java index 775428bd..4d0d9e3e 100644 --- a/gen/main/java/testsecurity/types/SecurityApi.java +++ b/gen/main/java/testsecurity/types/SecurityApi.java @@ -8,10 +8,10 @@ public interface SecurityApi { java.lang.String PATH_AUTHENTICATED_WITH_PARAM = "/authenticated/with-param"; java.lang.String PATH_AUTHENTICATED_WITHOUT_PARAM = "/authenticated/without-param"; - @io.micronaut.http.annotation.Get("/anonymous") + @io.micronaut.http.annotation.Get(PATH_ANONYMOUS) io.micronaut.http.HttpResponse anonymous(); - @io.micronaut.http.annotation.Get("/authenticated/with-param") + @io.micronaut.http.annotation.Get(PATH_AUTHENTICATED_WITH_PARAM) io.micronaut.http.HttpResponse authenticatedWithParam( @io.micronaut.core.annotation.NonNull java.security.Principal authentication, @@ -19,6 +19,6 @@ io.micronaut.http.HttpResponse authenticatedWithParam( @io.micronaut.http.annotation.QueryValue(value = "queryParam") java.util.Optional queryParam); - @io.micronaut.http.annotation.Get("/authenticated/without-param") + @io.micronaut.http.annotation.Get(PATH_AUTHENTICATED_WITHOUT_PARAM) io.micronaut.http.HttpResponse authenticatedWithoutParam(); -} \ No newline at end of file +} diff --git a/gen/main/java/testsecurity/types/SecurityApiClient.java b/gen/main/java/testsecurity/types/SecurityApiClient.java index 80dc94f1..fa440015 100644 --- a/gen/main/java/testsecurity/types/SecurityApiClient.java +++ b/gen/main/java/testsecurity/types/SecurityApiClient.java @@ -8,32 +8,21 @@ public interface SecurityApiClient { java.lang.String PATH_AUTHENTICATED_WITH_PARAM = "/authenticated/with-param"; java.lang.String PATH_AUTHENTICATED_WITHOUT_PARAM = "/authenticated/without-param"; - @io.micronaut.http.annotation.Get("/anonymous") + @io.micronaut.http.annotation.Get(PATH_ANONYMOUS) io.micronaut.http.HttpResponse anonymous(); - @io.micronaut.http.annotation.Get("/authenticated/with-param") - io.micronaut.http.HttpResponse authenticatedWithParam( - @io.micronaut.core.annotation.Nullable - @io.micronaut.http.annotation.QueryValue(value = "queryParam") - java.lang.String queryParam); - - @io.micronaut.http.annotation.Get("/authenticated/with-param") + @io.micronaut.http.annotation.Get(PATH_AUTHENTICATED_WITH_PARAM) io.micronaut.http.HttpResponse authenticatedWithParam( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.Header(io.micronaut.http.HttpHeaders.AUTHORIZATION) - String authorization, + java.lang.String authorization, @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "queryParam") java.lang.String queryParam); - - @io.micronaut.http.annotation.Get("/authenticated/without-param") - io.micronaut.http.HttpResponse authenticatedWithoutParam(); - - @io.micronaut.http.annotation.Get("/authenticated/without-param") + @io.micronaut.http.annotation.Get(PATH_AUTHENTICATED_WITHOUT_PARAM) io.micronaut.http.HttpResponse authenticatedWithoutParam( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.Header(io.micronaut.http.HttpHeaders.AUTHORIZATION) - String authorization); - + java.lang.String authorization); } diff --git a/gen/test/java/testsecurity/auth/SecurityApiTestClient.java b/gen/test/java/testsecurity/auth/server/SecurityApiTestClient.java similarity index 68% rename from gen/test/java/testsecurity/auth/SecurityApiTestClient.java rename to gen/test/java/testsecurity/auth/server/SecurityApiTestClient.java index c9b0e60a..b111ab59 100644 --- a/gen/test/java/testsecurity/auth/SecurityApiTestClient.java +++ b/gen/test/java/testsecurity/auth/server/SecurityApiTestClient.java @@ -1,4 +1,4 @@ -package testsecurity.auth; +package testsecurity.auth.server; /** Test client for {@link SecurityApi}. **/ @jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") @@ -8,12 +8,6 @@ public interface SecurityApiTestClient { @io.micronaut.http.annotation.Get("/anonymous") io.micronaut.http.HttpResponse anonymous(); - @io.micronaut.http.annotation.Get("/authenticated/with-param") - io.micronaut.http.HttpResponse authenticatedWithParam( - @io.micronaut.core.annotation.Nullable - @io.micronaut.http.annotation.QueryValue(value = "queryParam") - java.lang.String queryParam); - @io.micronaut.http.annotation.Get("/authenticated/with-param") io.micronaut.http.HttpResponse authenticatedWithParam( @io.micronaut.core.annotation.Nullable @@ -22,11 +16,10 @@ io.micronaut.http.HttpResponse authenticatedWithParam( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "queryParam") java.lang.String queryParam); - @io.micronaut.http.annotation.Get("/authenticated/without-param") - io.micronaut.http.HttpResponse authenticatedWithoutParam(); @io.micronaut.http.annotation.Get("/authenticated/without-param") io.micronaut.http.HttpResponse authenticatedWithoutParam( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.Header(io.micronaut.http.HttpHeaders.AUTHORIZATION) - java.lang.String authorization);} + java.lang.String authorization); +} diff --git a/gen/test/java/testsecurity/auth/SecurityApiTestSpec.java b/gen/test/java/testsecurity/auth/server/SecurityApiTestSpec.java similarity index 94% rename from gen/test/java/testsecurity/auth/SecurityApiTestSpec.java rename to gen/test/java/testsecurity/auth/server/SecurityApiTestSpec.java index 0fc810a8..3f751476 100644 --- a/gen/test/java/testsecurity/auth/SecurityApiTestSpec.java +++ b/gen/test/java/testsecurity/auth/server/SecurityApiTestSpec.java @@ -1,4 +1,4 @@ -package testsecurity.auth; +package testsecurity.auth.server; /** Test for {@link SecurityApi}. */ @jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") diff --git a/gen/test/java/testsecurity/defaults/SecurityApiTestClient.java b/gen/test/java/testsecurity/defaults/server/SecurityApiTestClient.java similarity index 68% rename from gen/test/java/testsecurity/defaults/SecurityApiTestClient.java rename to gen/test/java/testsecurity/defaults/server/SecurityApiTestClient.java index 6400a6b7..8b1b6672 100644 --- a/gen/test/java/testsecurity/defaults/SecurityApiTestClient.java +++ b/gen/test/java/testsecurity/defaults/server/SecurityApiTestClient.java @@ -1,4 +1,4 @@ -package testsecurity.defaults; +package testsecurity.defaults.server; /** Test client for {@link SecurityApi}. **/ @jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") @@ -8,12 +8,6 @@ public interface SecurityApiTestClient { @io.micronaut.http.annotation.Get("/anonymous") io.micronaut.http.HttpResponse anonymous(); - @io.micronaut.http.annotation.Get("/authenticated/with-param") - io.micronaut.http.HttpResponse authenticatedWithParam( - @io.micronaut.core.annotation.Nullable - @io.micronaut.http.annotation.QueryValue(value = "queryParam") - java.lang.String queryParam); - @io.micronaut.http.annotation.Get("/authenticated/with-param") io.micronaut.http.HttpResponse authenticatedWithParam( @io.micronaut.core.annotation.Nullable @@ -22,11 +16,10 @@ io.micronaut.http.HttpResponse authenticatedWithParam( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "queryParam") java.lang.String queryParam); - @io.micronaut.http.annotation.Get("/authenticated/without-param") - io.micronaut.http.HttpResponse authenticatedWithoutParam(); @io.micronaut.http.annotation.Get("/authenticated/without-param") io.micronaut.http.HttpResponse authenticatedWithoutParam( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.Header(io.micronaut.http.HttpHeaders.AUTHORIZATION) - java.lang.String authorization);} + java.lang.String authorization); +} diff --git a/gen/test/java/testsecurity/defaults/SecurityApiTestSpec.java b/gen/test/java/testsecurity/defaults/server/SecurityApiTestSpec.java similarity index 93% rename from gen/test/java/testsecurity/defaults/SecurityApiTestSpec.java rename to gen/test/java/testsecurity/defaults/server/SecurityApiTestSpec.java index 5fbdd890..773d291a 100644 --- a/gen/test/java/testsecurity/defaults/SecurityApiTestSpec.java +++ b/gen/test/java/testsecurity/defaults/server/SecurityApiTestSpec.java @@ -1,4 +1,4 @@ -package testsecurity.defaults; +package testsecurity.defaults.server; /** Test for {@link SecurityApi}. */ @jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") diff --git a/gen/test/java/testsecurity/types/SecurityApiTestClient.java b/gen/test/java/testsecurity/types/SecurityApiTestClient.java index 3186d8aa..4675a126 100644 --- a/gen/test/java/testsecurity/types/SecurityApiTestClient.java +++ b/gen/test/java/testsecurity/types/SecurityApiTestClient.java @@ -8,12 +8,6 @@ public interface SecurityApiTestClient { @io.micronaut.http.annotation.Get("/anonymous") io.micronaut.http.HttpResponse anonymous(); - @io.micronaut.http.annotation.Get("/authenticated/with-param") - io.micronaut.http.HttpResponse authenticatedWithParam( - @io.micronaut.core.annotation.Nullable - @io.micronaut.http.annotation.QueryValue(value = "queryParam") - java.lang.String queryParam); - @io.micronaut.http.annotation.Get("/authenticated/with-param") io.micronaut.http.HttpResponse authenticatedWithParam( @io.micronaut.core.annotation.Nullable @@ -22,11 +16,10 @@ io.micronaut.http.HttpResponse authenticatedWithParam( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.QueryValue(value = "queryParam") java.lang.String queryParam); - @io.micronaut.http.annotation.Get("/authenticated/without-param") - io.micronaut.http.HttpResponse authenticatedWithoutParam(); @io.micronaut.http.annotation.Get("/authenticated/without-param") io.micronaut.http.HttpResponse authenticatedWithoutParam( @io.micronaut.core.annotation.Nullable @io.micronaut.http.annotation.Header(io.micronaut.http.HttpHeaders.AUTHORIZATION) - java.lang.String authorization);} + java.lang.String authorization); +} diff --git a/src/it/test-security/pom.xml b/src/it/test-security/pom.xml index fa23564b..d6083e4d 100644 --- a/src/it/test-security/pom.xml +++ b/src/it/test-security/pom.xml @@ -63,9 +63,23 @@ org.openapitools openapi-generator-maven-plugin + + + openapi-generate-client + + generate + + + + test-client + true + + + + codegen.server - @project.basedir@/src/test/resources/openapi/test-security.yaml + /home/ssc/code/kokuwa/micronaut-codegen/src/test/resources/openapi/test-security.yaml diff --git a/src/main/resources/Micronaut/apiClient.mustache b/src/main/resources/Micronaut/apiClient.mustache index 880a53f0..f7497348 100644 --- a/src/main/resources/Micronaut/apiClient.mustache +++ b/src/main/resources/Micronaut/apiClient.mustache @@ -6,23 +6,16 @@ package {{package}}; {{>generated}}@io.micronaut.http.client.annotation.Client(id = "{{clientId}}") public interface {{classname}}Client { {{#operations}}{{#operation}} - java.lang.String PATH_{{vendorExtensions.operationIdUpperCase}} = "{{path}}";{{/operation}}{{/operations}}{{#operations}}{{#operation}} - - @io.micronaut.http.annotation.{{vendorExtensions.httpMethod}}("{{{vendorExtensions.clientPath}}}"){{^vendorExtensions.generic}} - @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.{{vendorExtensions.status}}){{/vendorExtensions.generic}}{{#hasConsumes}} - @io.micronaut.http.annotation.Produces({ {{#consumes}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}} - @io.micronaut.http.annotation.Consumes({ {{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}} }){{/hasProduces}} - {{>returnType}} {{nickname}}({{#hasParams}} -{{>apiClientParams}}){{/hasParams}}{{^hasParams}}){{/hasParams}};{{#vendorExtensions.has401}} - - @io.micronaut.http.annotation.{{vendorExtensions.httpMethod}}("{{{vendorExtensions.clientPath}}}"){{^vendorExtensions.generic}} + java.lang.String PATH_{{vendorExtensions.operationIdUpperCase}} = "{{{vendorExtensions.clientPath}}}";{{/operation}} +{{/operations}}{{#operations}}{{#operation}} + @io.micronaut.http.annotation.{{vendorExtensions.httpMethod}}(PATH_{{vendorExtensions.operationIdUpperCase}}){{^vendorExtensions.generic}} @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.{{vendorExtensions.status}}){{/vendorExtensions.generic}}{{#hasConsumes}} @io.micronaut.http.annotation.Produces({ {{#consumes}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}} @io.micronaut.http.annotation.Consumes({ {{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}} }){{/hasProduces}} - {{>returnType}} {{nickname}}( + {{>returnType}} {{nickname}}({{#vendorExtensions.has401}}{{#generateAuthentication}} @{{type.Nullable}} @io.micronaut.http.annotation.Header(io.micronaut.http.HttpHeaders.AUTHORIZATION) - String authorization{{#hasParams}}, -{{>apiClientParams}}{{/hasParams}}); -{{/vendorExtensions.has401}}{{/operation}} -}{{/operations}} + java.lang.String authorization{{#hasParams}},{{/hasParams}}{{/generateAuthentication}}{{/vendorExtensions.has401}}{{#hasParams}} +{{>apiClientParams}}{{/hasParams}});{{^-last}} +{{/-last}}{{/operation}}{{/operations}} +} diff --git a/src/main/resources/Micronaut/apiServer.mustache b/src/main/resources/Micronaut/apiServer.mustache index 51366531..5d3c0779 100644 --- a/src/main/resources/Micronaut/apiServer.mustache +++ b/src/main/resources/Micronaut/apiServer.mustache @@ -5,12 +5,12 @@ package {{package}}; {{/isModelImport}}{{>generated}}{{#useBeanValidation}}@io.micronaut.validation.Validated {{/useBeanValidation}}public interface {{classname}} { {{#operations}}{{#operation}} - java.lang.String PATH_{{vendorExtensions.operationIdUpperCase}} = "{{path}}";{{/operation}}{{/operations}}{{#operations}}{{#operation}} + java.lang.String PATH_{{vendorExtensions.operationIdUpperCase}} = "{{{vendorExtensions.serverPath}}}";{{/operation}}{{/operations}}{{#operations}}{{#operation}} - @io.micronaut.http.annotation.{{vendorExtensions.httpMethod}}("{{vendorExtensions.serverPath}}"){{^vendorExtensions.generic}} + @io.micronaut.http.annotation.{{vendorExtensions.httpMethod}}(PATH_{{vendorExtensions.operationIdUpperCase}}){{^vendorExtensions.generic}} @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.{{vendorExtensions.status}}){{/vendorExtensions.generic}}{{#hasConsumes}} @io.micronaut.http.annotation.Consumes({ {{#consumes}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}} @io.micronaut.http.annotation.Produces({ {{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}} }){{/hasProduces}} {{>returnType}} {{nickname}}({{#hasParams}} -{{>apiServerParams}}){{/hasParams}}{{^hasParams}}){{/hasParams}};{{/operation}} -}{{/operations}} \ No newline at end of file +{{>apiServerParams}}){{/hasParams}}{{^hasParams}}){{/hasParams}};{{/operation}}{{/operations}} +} diff --git a/src/main/resources/Micronaut/testClient.mustache b/src/main/resources/Micronaut/testClient.mustache index 29365a52..63ff64a1 100644 --- a/src/main/resources/Micronaut/testClient.mustache +++ b/src/main/resources/Micronaut/testClient.mustache @@ -11,16 +11,10 @@ public interface {{classname}}TestClient { @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.{{vendorExtensions.status}}){{/vendorExtensions.generic}}{{#hasConsumes}} @io.micronaut.http.annotation.Produces({ {{#consumes}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}} @io.micronaut.http.annotation.Consumes({ {{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}} }){{/hasProduces}} - io.micronaut.http.HttpResponse<{{^returnType}}?{{/returnType}}{{#returnType}}{{{returnType}}}{{/returnType}}> {{nickname}}({{#hasParams}} -{{>testClientParams}}){{/hasParams}}{{^hasParams}}){{/hasParams}}; -{{#vendorExtensions.has401}} - - @io.micronaut.http.annotation.{{vendorExtensions.httpMethod}}("{{{vendorExtensions.clientPath}}}"){{^vendorExtensions.generic}} - @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.{{vendorExtensions.status}}){{/vendorExtensions.generic}}{{#hasConsumes}} - @io.micronaut.http.annotation.Produces({ {{#consumes}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/consumes}} }){{/hasConsumes}}{{#hasProduces}} - @io.micronaut.http.annotation.Consumes({ {{#produces}}"{{{mediaType}}}"{{^-last}}, {{/-last}}{{/produces}} }){{/hasProduces}} - io.micronaut.http.HttpResponse<{{^returnType}}?{{/returnType}}{{#returnType}}{{{returnType}}}{{/returnType}}> {{nickname}}( + io.micronaut.http.HttpResponse<{{^returnType}}?{{/returnType}}{{#returnType}}{{{returnType}}}{{/returnType}}> {{nickname}}({{#vendorExtensions.has401}} @{{type.Nullable}} @io.micronaut.http.annotation.Header(io.micronaut.http.HttpHeaders.AUTHORIZATION) - java.lang.String authorization{{#hasParams}}, -{{>testClientParams}}{{/hasParams}});{{/vendorExtensions.has401}}{{/operation}}}{{/operations}} + java.lang.String authorization{{#hasParams}},{{/hasParams}}{{/vendorExtensions.has401}}{{#hasParams}} +{{>testClientParams}}{{/hasParams}});{{^-last}} +{{/-last}}{{/operation}}{{/operations}} +} diff --git a/src/test/java/org/openapitools/codegen/languages/MicronautCodegenTest.java b/src/test/java/org/openapitools/codegen/languages/MicronautCodegenTest.java index ec09ac49..6dc93f37 100644 --- a/src/test/java/org/openapitools/codegen/languages/MicronautCodegenTest.java +++ b/src/test/java/org/openapitools/codegen/languages/MicronautCodegenTest.java @@ -86,16 +86,31 @@ void apiWithAsyncSimple() { .addAdditionalProperty(OptionalFeatures.USE_OPTIONAL, false)); } - @DisplayName("security with defaults") + @DisplayName("security with defaults for server") @Test - void security() { - generate(configurator(SPEC_SECURITY, "testsecurity.defaults")); + void securityServer() { + generate(configurator(SPEC_SECURITY, "testsecurity.defaults.server")); } - @DisplayName("security with custom types") + @DisplayName("security with defaults for client") + @Test + void securityClient() { + generate(configurator(SPEC_SECURITY, "testsecurity.defaults.client") + .addAdditionalProperty(MicronautCodegen.CLIENT_ID, "test")); + } + + @DisplayName("security with authentication for client") + @Test + void securityWithAuthenticationClient() { + generate(configurator(SPEC_SECURITY, "testsecurity.auth.client") + .addAdditionalProperty(MicronautCodegen.CLIENT_ID, "test") + .addAdditionalProperty(MicronautCodegen.GENERATE_AUTHENTICATION, true)); + } + + @DisplayName("security with authentication for server") @Test - void securityWithAuthentication() { - generate(configurator(SPEC_SECURITY, "testsecurity.auth") + void securityWithAuthenticationServer() { + generate(configurator(SPEC_SECURITY, "testsecurity.auth.server") .addAdditionalProperty(MicronautCodegen.GENERATE_AUTHENTICATION, true)); }