From a7238a00771ec721e3f3731691c0e2e2257341fa Mon Sep 17 00:00:00 2001 From: Stephan Schnabel Date: Thu, 17 Aug 2023 22:08:04 +0200 Subject: [PATCH] Disable constants generation by default --- README.md | 1 + .../testapi/async/reactor/MediatypeApi.java | 22 +- .../java/testapi/async/reactor/Multipart.java | 13 +- .../testapi/async/reactor/NumberModel.java | 4 +- .../testapi/async/reactor/ParameterApi.java | 91 +- .../testapi/async/reactor/ParameterModel.java | 31 +- .../testapi/async/reactor/RequestApi.java | 4 +- .../testapi/async/reactor/ResponseApi.java | 46 +- .../testapi/async/reactor/StringModel.java | 4 +- .../testapi/async/reactor/ValidationApi.java | 64 +- .../testapi/async/simple/MediatypeApi.java | 22 +- .../java/testapi/async/simple/Multipart.java | 13 +- .../testapi/async/simple/NumberModel.java | 4 +- .../testapi/async/simple/ParameterApi.java | 91 +- .../testapi/async/simple/ParameterModel.java | 31 +- .../java/testapi/async/simple/RequestApi.java | 4 +- .../testapi/async/simple/ResponseApi.java | 46 +- .../testapi/async/simple/StringModel.java | 4 +- .../testapi/async/simple/ValidationApi.java | 64 +- .../java/testapi/constants/MediatypeApi.java | 78 ++ .../testapi/constants/MediatypeApiClient.java | 71 ++ .../java/testapi/constants/Multipart.java | 117 +++ .../java/testapi/constants/NumberModel.java | 57 ++ .../java/testapi/constants/ParameterApi.java | 268 ++++++ .../testapi/constants/ParameterApiClient.java | 264 ++++++ .../testapi/constants/ParameterModel.java | 282 ++++++ .../java/testapi/constants/RequestApi.java | 10 + .../testapi/constants/RequestApiClient.java | 11 + .../java/testapi/constants/ResponseApi.java | 107 +++ .../testapi/constants/ResponseApiClient.java | 108 +++ .../java/testapi/constants/StringModel.java | 58 ++ .../java/testapi/constants/ValidationApi.java | 180 ++++ .../constants/ValidationApiClient.java | 156 ++++ .../java/testapi/defaults/MediatypeApi.java | 22 +- gen/main/java/testapi/defaults/Multipart.java | 13 +- .../java/testapi/defaults/NumberModel.java | 4 +- .../java/testapi/defaults/ParameterApi.java | 91 +- .../java/testapi/defaults/ParameterModel.java | 31 +- .../java/testapi/defaults/RequestApi.java | 4 +- .../java/testapi/defaults/ResponseApi.java | 46 +- .../java/testapi/defaults/StringModel.java | 4 +- .../java/testapi/defaults/ValidationApi.java | 64 +- .../testapi/modelsuffix/MediatypeApi.java | 22 +- .../java/testapi/modelsuffix/MultipartVO.java | 13 +- .../testapi/modelsuffix/NumberModelVO.java | 4 +- .../testapi/modelsuffix/ParameterApi.java | 91 +- .../testapi/modelsuffix/ParameterModelVO.java | 31 +- .../java/testapi/modelsuffix/RequestApi.java | 4 +- .../java/testapi/modelsuffix/ResponseApi.java | 46 +- .../testapi/modelsuffix/StringModelVO.java | 4 +- .../testapi/modelsuffix/ValidationApi.java | 64 +- .../java/testapi/nogeneric/MediatypeApi.java | 22 +- .../java/testapi/nogeneric/Multipart.java | 13 +- .../java/testapi/nogeneric/NumberModel.java | 4 +- .../java/testapi/nogeneric/ParameterApi.java | 91 +- .../testapi/nogeneric/ParameterModel.java | 31 +- .../java/testapi/nogeneric/RequestApi.java | 4 +- .../java/testapi/nogeneric/ResponseApi.java | 46 +- .../java/testapi/nogeneric/StringModel.java | 4 +- .../java/testapi/nogeneric/ValidationApi.java | 64 +- .../java/testapi/nooptional/MediatypeApi.java | 22 +- .../java/testapi/nooptional/Multipart.java | 13 +- .../java/testapi/nooptional/NumberModel.java | 4 +- .../java/testapi/nooptional/ParameterApi.java | 91 +- .../testapi/nooptional/ParameterModel.java | 31 +- .../java/testapi/nooptional/RequestApi.java | 4 +- .../java/testapi/nooptional/ResponseApi.java | 46 +- .../java/testapi/nooptional/StringModel.java | 4 +- .../testapi/nooptional/ValidationApi.java | 64 +- .../testapi/novalidation/MediatypeApi.java | 22 +- .../java/testapi/novalidation/Multipart.java | 13 +- .../testapi/novalidation/NumberModel.java | 4 +- .../testapi/novalidation/ParameterApi.java | 91 +- .../testapi/novalidation/ParameterModel.java | 31 +- .../java/testapi/novalidation/RequestApi.java | 4 +- .../testapi/novalidation/ResponseApi.java | 46 +- .../testapi/novalidation/StringModel.java | 4 +- .../testapi/novalidation/ValidationApi.java | 64 +- .../testapi/packages/api/MediatypeApi.java | 22 +- .../testapi/packages/api/ParameterApi.java | 91 +- .../java/testapi/packages/api/RequestApi.java | 4 +- .../testapi/packages/api/ResponseApi.java | 46 +- .../testapi/packages/api/ValidationApi.java | 64 +- .../testapi/packages/model/Multipart.java | 13 +- .../testapi/packages/model/NumberModel.java | 4 +- .../packages/model/ParameterModel.java | 31 +- .../testapi/packages/model/StringModel.java | 4 +- gen/main/java/testapi/types/MediatypeApi.java | 22 +- gen/main/java/testapi/types/Multipart.java | 13 +- gen/main/java/testapi/types/NumberModel.java | 4 +- gen/main/java/testapi/types/ParameterApi.java | 91 +- .../java/testapi/types/ParameterModel.java | 31 +- gen/main/java/testapi/types/RequestApi.java | 4 +- gen/main/java/testapi/types/ResponseApi.java | 46 +- gen/main/java/testapi/types/StringModel.java | 4 +- .../java/testapi/types/ValidationApi.java | 64 +- .../AdditionalPropertiesModel.java | 4 +- .../micronaut_pojo/EnumerationModel.java | 13 +- .../testmodel/micronaut_pojo/FirstModel.java | 10 +- .../micronaut_pojo/InheritanceExtended.java | 6 +- .../micronaut_pojo/InheritanceSimple.java | 5 +- .../InheritanceSimpleDefault.java | 2 +- .../InheritanceWithEnumType.java | 6 +- .../InheritanceWithEnumType1.java | 4 +- .../InheritanceWithEnumType2.java | 4 +- .../InheritanceWithStringType.java | 11 +- .../InheritanceWithStringType1.java | 6 +- .../InheritanceWithStringType2.java | 6 +- .../InheritanceWithoutType.java | 11 +- .../InheritanceWithoutType1.java | 6 +- .../InheritanceWithoutType2.java | 6 +- .../java/testmodel/micronaut_pojo/Model.java | 94 +- .../micronaut_pojo/OneOfImplementor1.java | 4 +- .../micronaut_pojo/OneOfImplementor2.java | 4 +- .../micronaut_pojo/OneOfInterface.java | 6 +- .../micronaut_pojo/PropertyTypeOne.java | 4 +- .../micronaut_pojo/PropertyTypeTwo.java | 4 +- .../micronaut_pojo/SecondLevelOneModel.java | 7 +- .../micronaut_pojo/SecondLevelTwoModel.java | 7 +- .../AdditionalPropertiesModel.java | 72 ++ .../AdditionalPropertiesModelValue.java | 9 + .../EnumerationInteger.java | 40 + .../EnumerationModel.java | 181 ++++ .../EnumerationNumber.java | 36 + .../EnumerationString.java | 34 + .../EnumerationStringDefault.java | 34 + .../micronaut_pojo_constants/FirstModel.java | 98 +++ .../InheritanceExtended.java | 78 ++ .../InheritanceSimple.java | 15 + .../InheritanceSimpleDefault.java | 56 ++ .../InheritanceWithEnumType.java | 16 + .../InheritanceWithEnumType1.java | 62 ++ .../InheritanceWithEnumType2.java | 62 ++ .../InheritanceWithEnumType3.java | 37 + .../InheritanceWithEnumTypeEnum.java | 36 + .../InheritanceWithStringType.java | 23 + .../InheritanceWithStringType1.java | 81 ++ .../InheritanceWithStringType2.java | 81 ++ .../InheritanceWithoutType.java | 23 + .../InheritanceWithoutType1.java | 81 ++ .../InheritanceWithoutType2.java | 81 ++ .../micronaut_pojo_constants/Model.java | 828 ++++++++++++++++++ .../OneOfImplementor1.java | 62 ++ .../OneOfImplementor2.java | 62 ++ .../OneOfInterface.java | 15 + .../micronaut_pojo_constants/OneOfModel.java | 9 + .../PropertyTypeOne.java | 87 ++ .../PropertyTypeTwo.java | 87 ++ .../SecondLevelModel.java | 9 + .../SecondLevelOneModel.java | 77 ++ .../SecondLevelTwoModel.java | 77 ++ .../AdditionalPropertiesModel.java | 4 +- .../EnumerationModel.java | 13 +- .../micronaut_pojo_nullable/FirstModel.java | 10 +- .../InheritanceExtended.java | 6 +- .../InheritanceSimple.java | 5 +- .../InheritanceSimpleDefault.java | 2 +- .../InheritanceWithEnumType.java | 6 +- .../InheritanceWithEnumType1.java | 4 +- .../InheritanceWithEnumType2.java | 4 +- .../InheritanceWithStringType.java | 11 +- .../InheritanceWithStringType1.java | 6 +- .../InheritanceWithStringType2.java | 6 +- .../InheritanceWithoutType.java | 11 +- .../InheritanceWithoutType1.java | 6 +- .../InheritanceWithoutType2.java | 6 +- .../micronaut_pojo_nullable/Model.java | 94 +- .../OneOfImplementor1.java | 4 +- .../OneOfImplementor2.java | 4 +- .../OneOfInterface.java | 6 +- .../PropertyTypeOne.java | 4 +- .../PropertyTypeTwo.java | 4 +- .../SecondLevelOneModel.java | 7 +- .../SecondLevelTwoModel.java | 7 +- .../AdditionalPropertiesModel.java | 4 +- .../EnumerationModel.java | 13 +- .../micronaut_pojo_unsealed/FirstModel.java | 10 +- .../InheritanceExtended.java | 6 +- .../InheritanceSimple.java | 5 +- .../InheritanceSimpleDefault.java | 2 +- .../InheritanceWithEnumType.java | 6 +- .../InheritanceWithEnumType1.java | 4 +- .../InheritanceWithEnumType2.java | 4 +- .../InheritanceWithStringType.java | 11 +- .../InheritanceWithStringType1.java | 6 +- .../InheritanceWithStringType2.java | 6 +- .../InheritanceWithoutType.java | 11 +- .../InheritanceWithoutType1.java | 6 +- .../InheritanceWithoutType2.java | 6 +- .../micronaut_pojo_unsealed/Model.java | 94 +- .../OneOfImplementor1.java | 4 +- .../OneOfImplementor2.java | 4 +- .../OneOfInterface.java | 6 +- .../PropertyTypeOne.java | 4 +- .../PropertyTypeTwo.java | 4 +- .../SecondLevelOneModel.java | 7 +- .../SecondLevelTwoModel.java | 7 +- .../AdditionalPropertiesModel.java | 7 +- .../micronaut_record/EnumerationModel.java | 15 +- .../micronaut_record/FirstModel.java | 13 +- .../micronaut_record/InheritanceExtended.java | 9 +- .../micronaut_record/InheritanceSimple.java | 4 +- .../InheritanceSimpleDefault.java | 6 +- .../InheritanceWithEnumType.java | 6 +- .../InheritanceWithEnumType1.java | 4 +- .../InheritanceWithEnumType2.java | 4 +- .../InheritanceWithEnumType3.java | 1 - .../InheritanceWithStringType.java | 10 +- .../InheritanceWithStringType1.java | 6 +- .../InheritanceWithStringType2.java | 6 +- .../InheritanceWithoutType.java | 10 +- .../InheritanceWithoutType1.java | 6 +- .../InheritanceWithoutType2.java | 6 +- .../testmodel/micronaut_record/Model.java | 99 +-- .../micronaut_record/OneOfImplementor1.java | 4 +- .../micronaut_record/OneOfImplementor2.java | 4 +- .../micronaut_record/OneOfInterface.java | 6 +- .../micronaut_record/PropertyTypeOne.java | 5 +- .../micronaut_record/PropertyTypeTwo.java | 5 +- .../micronaut_record/SecondLevelOneModel.java | 10 +- .../micronaut_record/SecondLevelTwoModel.java | 10 +- .../AdditionalPropertiesModel.java | 12 + .../AdditionalPropertiesModelValue.java | 9 + .../EnumerationInteger.java | 40 + .../EnumerationModel.java | 90 ++ .../EnumerationNumber.java | 36 + .../EnumerationString.java | 34 + .../EnumerationStringDefault.java | 34 + .../FirstModel.java | 23 + .../InheritanceExtended.java | 18 + .../InheritanceSimple.java | 12 + .../InheritanceSimpleDefault.java | 11 + .../InheritanceWithEnumType.java | 16 + .../InheritanceWithEnumType1.java | 17 + .../InheritanceWithEnumType2.java | 17 + .../InheritanceWithEnumType3.java | 11 + .../InheritanceWithEnumTypeEnum.java | 36 + .../InheritanceWithStringType.java | 20 + .../InheritanceWithStringType1.java | 21 + .../InheritanceWithStringType2.java | 21 + .../InheritanceWithoutType.java | 20 + .../InheritanceWithoutType1.java | 21 + .../InheritanceWithoutType2.java | 21 + .../micronaut_record_constants/Model.java | 168 ++++ .../OneOfImplementor1.java | 17 + .../OneOfImplementor2.java | 17 + .../OneOfInterface.java | 15 + .../OneOfModel.java | 9 + .../PropertyTypeOne.java | 42 + .../PropertyTypeTwo.java | 42 + .../SecondLevelModel.java | 9 + .../SecondLevelOneModel.java | 17 + .../SecondLevelTwoModel.java | 17 + .../AdditionalPropertiesModel.java | 4 +- .../nomicronaut/EnumerationModel.java | 13 +- .../testmodel/nomicronaut/FirstModel.java | 10 +- .../nomicronaut/InheritanceExtended.java | 6 +- .../nomicronaut/InheritanceSimple.java | 5 +- .../nomicronaut/InheritanceSimpleDefault.java | 2 +- .../nomicronaut/InheritanceWithEnumType.java | 6 +- .../nomicronaut/InheritanceWithEnumType1.java | 4 +- .../nomicronaut/InheritanceWithEnumType2.java | 4 +- .../InheritanceWithStringType.java | 11 +- .../InheritanceWithStringType1.java | 6 +- .../InheritanceWithStringType2.java | 6 +- .../nomicronaut/InheritanceWithoutType.java | 11 +- .../nomicronaut/InheritanceWithoutType1.java | 6 +- .../nomicronaut/InheritanceWithoutType2.java | 6 +- .../java/testmodel/nomicronaut/Model.java | 94 +- .../nomicronaut/OneOfImplementor1.java | 4 +- .../nomicronaut/OneOfImplementor2.java | 4 +- .../testmodel/nomicronaut/OneOfInterface.java | 6 +- .../nomicronaut/PropertyTypeOne.java | 4 +- .../nomicronaut/PropertyTypeTwo.java | 4 +- .../nomicronaut/SecondLevelOneModel.java | 7 +- .../nomicronaut/SecondLevelTwoModel.java | 7 +- .../testsecurity/auth/server/SecurityApi.java | 10 +- .../defaults/server/SecurityApi.java | 10 +- .../java/testsecurity/types/SecurityApi.java | 10 +- .../constants/MediatypeApiTestClient.java | 62 ++ .../constants/MediatypeApiTestSpec.java | 34 + .../constants/ParameterApiTestClient.java | 234 +++++ .../constants/ParameterApiTestSpec.java | 134 +++ .../constants/RequestApiTestClient.java | 10 + .../testapi/constants/RequestApiTestSpec.java | 10 + .../constants/ResponseApiTestClient.java | 93 ++ .../constants/ResponseApiTestSpec.java | 86 ++ .../constants/ValidationApiTestClient.java | 135 +++ .../constants/ValidationApiTestSpec.java | 132 +++ src/it/pom.xml | 3 + .../pom.xml | 1 + src/it/test-model-only-jackson/pom.xml | 1 + .../codegen/languages/MicronautCodegen.java | 8 + .../resources/Micronaut/apiServer.mustache | 7 +- .../Micronaut/modelInterface.mustache | 31 +- .../resources/Micronaut/modelPojo.mustache | 3 +- .../Micronaut/modelPropertyJackson.mustache | 2 +- .../resources/Micronaut/modelRecord.mustache | 15 +- .../languages/MicronautCodegenTest.java | 22 + 299 files changed, 7397 insertions(+), 2553 deletions(-) create mode 100644 gen/main/java/testapi/constants/MediatypeApi.java create mode 100644 gen/main/java/testapi/constants/MediatypeApiClient.java create mode 100644 gen/main/java/testapi/constants/Multipart.java create mode 100644 gen/main/java/testapi/constants/NumberModel.java create mode 100644 gen/main/java/testapi/constants/ParameterApi.java create mode 100644 gen/main/java/testapi/constants/ParameterApiClient.java create mode 100644 gen/main/java/testapi/constants/ParameterModel.java create mode 100644 gen/main/java/testapi/constants/RequestApi.java create mode 100644 gen/main/java/testapi/constants/RequestApiClient.java create mode 100644 gen/main/java/testapi/constants/ResponseApi.java create mode 100644 gen/main/java/testapi/constants/ResponseApiClient.java create mode 100644 gen/main/java/testapi/constants/StringModel.java create mode 100644 gen/main/java/testapi/constants/ValidationApi.java create mode 100644 gen/main/java/testapi/constants/ValidationApiClient.java create mode 100644 gen/main/java/testmodel/micronaut_pojo_constants/AdditionalPropertiesModel.java create mode 100644 gen/main/java/testmodel/micronaut_pojo_constants/AdditionalPropertiesModelValue.java create mode 100644 gen/main/java/testmodel/micronaut_pojo_constants/EnumerationInteger.java create mode 100644 gen/main/java/testmodel/micronaut_pojo_constants/EnumerationModel.java create mode 100644 gen/main/java/testmodel/micronaut_pojo_constants/EnumerationNumber.java create mode 100644 gen/main/java/testmodel/micronaut_pojo_constants/EnumerationString.java create mode 100644 gen/main/java/testmodel/micronaut_pojo_constants/EnumerationStringDefault.java create mode 100644 gen/main/java/testmodel/micronaut_pojo_constants/FirstModel.java create mode 100644 gen/main/java/testmodel/micronaut_pojo_constants/InheritanceExtended.java create mode 100644 gen/main/java/testmodel/micronaut_pojo_constants/InheritanceSimple.java create mode 100644 gen/main/java/testmodel/micronaut_pojo_constants/InheritanceSimpleDefault.java create mode 100644 gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithEnumType.java create mode 100644 gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithEnumType1.java create mode 100644 gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithEnumType2.java create mode 100644 gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithEnumType3.java create mode 100644 gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithEnumTypeEnum.java create mode 100644 gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithStringType.java create mode 100644 gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithStringType1.java create mode 100644 gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithStringType2.java create mode 100644 gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithoutType.java create mode 100644 gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithoutType1.java create mode 100644 gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithoutType2.java create mode 100644 gen/main/java/testmodel/micronaut_pojo_constants/Model.java create mode 100644 gen/main/java/testmodel/micronaut_pojo_constants/OneOfImplementor1.java create mode 100644 gen/main/java/testmodel/micronaut_pojo_constants/OneOfImplementor2.java create mode 100644 gen/main/java/testmodel/micronaut_pojo_constants/OneOfInterface.java create mode 100644 gen/main/java/testmodel/micronaut_pojo_constants/OneOfModel.java create mode 100644 gen/main/java/testmodel/micronaut_pojo_constants/PropertyTypeOne.java create mode 100644 gen/main/java/testmodel/micronaut_pojo_constants/PropertyTypeTwo.java create mode 100644 gen/main/java/testmodel/micronaut_pojo_constants/SecondLevelModel.java create mode 100644 gen/main/java/testmodel/micronaut_pojo_constants/SecondLevelOneModel.java create mode 100644 gen/main/java/testmodel/micronaut_pojo_constants/SecondLevelTwoModel.java create mode 100644 gen/main/java/testmodel/micronaut_record_constants/AdditionalPropertiesModel.java create mode 100644 gen/main/java/testmodel/micronaut_record_constants/AdditionalPropertiesModelValue.java create mode 100644 gen/main/java/testmodel/micronaut_record_constants/EnumerationInteger.java create mode 100644 gen/main/java/testmodel/micronaut_record_constants/EnumerationModel.java create mode 100644 gen/main/java/testmodel/micronaut_record_constants/EnumerationNumber.java create mode 100644 gen/main/java/testmodel/micronaut_record_constants/EnumerationString.java create mode 100644 gen/main/java/testmodel/micronaut_record_constants/EnumerationStringDefault.java create mode 100644 gen/main/java/testmodel/micronaut_record_constants/FirstModel.java create mode 100644 gen/main/java/testmodel/micronaut_record_constants/InheritanceExtended.java create mode 100644 gen/main/java/testmodel/micronaut_record_constants/InheritanceSimple.java create mode 100644 gen/main/java/testmodel/micronaut_record_constants/InheritanceSimpleDefault.java create mode 100644 gen/main/java/testmodel/micronaut_record_constants/InheritanceWithEnumType.java create mode 100644 gen/main/java/testmodel/micronaut_record_constants/InheritanceWithEnumType1.java create mode 100644 gen/main/java/testmodel/micronaut_record_constants/InheritanceWithEnumType2.java create mode 100644 gen/main/java/testmodel/micronaut_record_constants/InheritanceWithEnumType3.java create mode 100644 gen/main/java/testmodel/micronaut_record_constants/InheritanceWithEnumTypeEnum.java create mode 100644 gen/main/java/testmodel/micronaut_record_constants/InheritanceWithStringType.java create mode 100644 gen/main/java/testmodel/micronaut_record_constants/InheritanceWithStringType1.java create mode 100644 gen/main/java/testmodel/micronaut_record_constants/InheritanceWithStringType2.java create mode 100644 gen/main/java/testmodel/micronaut_record_constants/InheritanceWithoutType.java create mode 100644 gen/main/java/testmodel/micronaut_record_constants/InheritanceWithoutType1.java create mode 100644 gen/main/java/testmodel/micronaut_record_constants/InheritanceWithoutType2.java create mode 100644 gen/main/java/testmodel/micronaut_record_constants/Model.java create mode 100644 gen/main/java/testmodel/micronaut_record_constants/OneOfImplementor1.java create mode 100644 gen/main/java/testmodel/micronaut_record_constants/OneOfImplementor2.java create mode 100644 gen/main/java/testmodel/micronaut_record_constants/OneOfInterface.java create mode 100644 gen/main/java/testmodel/micronaut_record_constants/OneOfModel.java create mode 100644 gen/main/java/testmodel/micronaut_record_constants/PropertyTypeOne.java create mode 100644 gen/main/java/testmodel/micronaut_record_constants/PropertyTypeTwo.java create mode 100644 gen/main/java/testmodel/micronaut_record_constants/SecondLevelModel.java create mode 100644 gen/main/java/testmodel/micronaut_record_constants/SecondLevelOneModel.java create mode 100644 gen/main/java/testmodel/micronaut_record_constants/SecondLevelTwoModel.java create mode 100644 gen/test/java/testapi/constants/MediatypeApiTestClient.java create mode 100644 gen/test/java/testapi/constants/MediatypeApiTestSpec.java create mode 100644 gen/test/java/testapi/constants/ParameterApiTestClient.java create mode 100644 gen/test/java/testapi/constants/ParameterApiTestSpec.java create mode 100644 gen/test/java/testapi/constants/RequestApiTestClient.java create mode 100644 gen/test/java/testapi/constants/RequestApiTestSpec.java create mode 100644 gen/test/java/testapi/constants/ResponseApiTestClient.java create mode 100644 gen/test/java/testapi/constants/ResponseApiTestSpec.java create mode 100644 gen/test/java/testapi/constants/ValidationApiTestClient.java create mode 100644 gen/test/java/testapi/constants/ValidationApiTestSpec.java diff --git a/README.md b/README.md index 78190c29..94cbd6a5 100644 --- a/README.md +++ b/README.md @@ -59,6 +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`) +* generateConstants: generate constants for model names and api paths (default `false`) * generateAuthentication: generate Àuthentication into controller interfaces if response code 401 is present (default `false`) * sealed: generate sealed interfaces (default `true`) * record: generate records instead of pojos (default `false`) diff --git a/gen/main/java/testapi/async/reactor/MediatypeApi.java b/gen/main/java/testapi/async/reactor/MediatypeApi.java index ce9f12f7..70db4009 100644 --- a/gen/main/java/testapi/async/reactor/MediatypeApi.java +++ b/gen/main/java/testapi/async/reactor/MediatypeApi.java @@ -4,15 +4,7 @@ @io.micronaut.validation.Validated public interface MediatypeApi { - java.lang.String PATH_MEDIATYPE_CONSUMES_AND_PRODUCES = "/mediatype/consumes-and-produces"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD = "/mediatype/consumes-multipart-with-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_OCTET_STREAM = "/mediatype/consumes-octet-stream"; - java.lang.String PATH_MEDIATYPE_CONSUMES_PLAIN = "/mediatype/consumes-plain"; - java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; - java.lang.String PATH_MEDIATYPE_PRODUCES_SAME_MODEL = "/mediatype/produces-with-same-model"; - - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_AND_PRODUCES) + @io.micronaut.http.annotation.Post("/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 +12,7 @@ reactor.core.publisher.Mono> mediaty @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD) + @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-with-fileupload") @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> mediatypeConsumesMultipartWithFileUpload( @@ -33,7 +25,7 @@ reactor.core.publisher.Mono> mediatype @io.micronaut.core.annotation.NonNull io.micronaut.http.multipart.StreamingFileUpload file); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD) + @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> mediatypeConsumesMultipartWithoutFileUpload( @@ -44,7 +36,7 @@ reactor.core.publisher.Mono> mediatype @io.micronaut.http.annotation.Part(value = "userId") java.lang.Integer userId); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_OCTET_STREAM) + @io.micronaut.http.annotation.Post("/mediatype/consumes-octet-stream") @io.micronaut.http.annotation.Consumes({ "application/octet-stream" }) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> mediatypeConsumesOctetStream( @@ -52,7 +44,7 @@ reactor.core.publisher.Mono> mediaty @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_PLAIN) + @io.micronaut.http.annotation.Post("/mediatype/consumes-plain") @io.micronaut.http.annotation.Consumes({ "text/plain" }) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> mediatypeConsumesPlain( @@ -60,7 +52,7 @@ reactor.core.publisher.Mono> mediaty @io.micronaut.http.annotation.Body java.lang.String body); - @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL) + @io.micronaut.http.annotation.Get("/mediatype/produces-with-different-model") @io.micronaut.http.annotation.Produces({ "application/json", "text/plain" }) reactor.core.publisher.Mono> mediatypeProducesDifferentModel( @io.micronaut.core.annotation.NonNull @@ -70,7 +62,7 @@ reactor.core.publisher.Mono> mediatypePro @io.micronaut.http.annotation.QueryValue(value = "plain") java.lang.Boolean plain); - @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_SAME_MODEL) + @io.micronaut.http.annotation.Get("/mediatype/produces-with-same-model") @io.micronaut.http.annotation.Produces({ "application/json", "application/xml" }) reactor.core.publisher.Mono> mediatypeProducesSameModel( @io.micronaut.core.annotation.NonNull diff --git a/gen/main/java/testapi/async/reactor/Multipart.java b/gen/main/java/testapi/async/reactor/Multipart.java index fa23d8b1..78f0856b 100644 --- a/gen/main/java/testapi/async/reactor/Multipart.java +++ b/gen/main/java/testapi/async/reactor/Multipart.java @@ -4,24 +4,19 @@ @io.micronaut.serde.annotation.Serdeable public class Multipart { - public static final java.lang.String JSON_PROPERTY_ORDER_ID = "orderId"; - public static final java.lang.String JSON_PROPERTY_USER_ID = "userId"; - public static final java.lang.String JSON_PROPERTY_FILE_NAME = "fileName"; - public static final java.lang.String JSON_PROPERTY_FILE = "file"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ORDER_ID) + @com.fasterxml.jackson.annotation.JsonProperty("orderId") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer orderId; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_USER_ID) + @com.fasterxml.jackson.annotation.JsonProperty("userId") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer userId; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FILE_NAME) + @com.fasterxml.jackson.annotation.JsonProperty("fileName") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String fileName; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FILE) + @com.fasterxml.jackson.annotation.JsonProperty("file") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private byte[] file; diff --git a/gen/main/java/testapi/async/reactor/NumberModel.java b/gen/main/java/testapi/async/reactor/NumberModel.java index b116a54a..d97a57b3 100644 --- a/gen/main/java/testapi/async/reactor/NumberModel.java +++ b/gen/main/java/testapi/async/reactor/NumberModel.java @@ -4,9 +4,7 @@ @io.micronaut.serde.annotation.Serdeable public class NumberModel { - public static final java.lang.String JSON_PROPERTY_BAR = "bar"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BAR) + @com.fasterxml.jackson.annotation.JsonProperty("bar") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Double bar; diff --git a/gen/main/java/testapi/async/reactor/ParameterApi.java b/gen/main/java/testapi/async/reactor/ParameterApi.java index 251c446c..b858ef59 100644 --- a/gen/main/java/testapi/async/reactor/ParameterApi.java +++ b/gen/main/java/testapi/async/reactor/ParameterApi.java @@ -4,38 +4,7 @@ @io.micronaut.validation.Validated public interface ParameterApi { - java.lang.String PATH_PARAM_ALL = "/param/all/{path}"; - java.lang.String PATH_PARAM_BODY_OPTIONAL = "/param/body/optional"; - java.lang.String PATH_PARAM_BODY_REQUIRED = "/param/body/required"; - java.lang.String PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT = "/param/cookie/optionalWithDefault"; - java.lang.String PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT = "/param/cookie/optionalWithoutDefault"; - java.lang.String PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT = "/param/cookie/requiredWithDefault"; - java.lang.String PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT = "/param/cookie/requiredWithoutDefault"; - java.lang.String PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT = "/param/header/optionalWithDefault"; - 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: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: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"; - 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"; - java.lang.String PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT = "/param/query/requiredWithDefault"; - 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(PATH_PARAM_ALL) + @io.micronaut.http.annotation.Get("/param/all/{path}") @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramAll( @io.micronaut.core.annotation.NonNull @@ -51,7 +20,7 @@ reactor.core.publisher.Mono> para @io.micronaut.http.annotation.Header(value = "integer") java.util.Optional integer); - @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_OPTIONAL) + @io.micronaut.http.annotation.Post("/param/body/optional") @io.micronaut.http.annotation.Consumes({ "application/json" }) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramBodyOptional( @@ -60,7 +29,7 @@ reactor.core.publisher.Mono> para @jakarta.validation.Valid java.util.Optional parameterModel); - @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_REQUIRED) + @io.micronaut.http.annotation.Post("/param/body/required") @io.micronaut.http.annotation.Consumes({ "application/json" }) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramBodyRequired( @@ -69,63 +38,63 @@ reactor.core.publisher.Mono> para @jakarta.validation.Valid ParameterModel parameterModel); - @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/optionalWithDefault") @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(PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/optionalWithoutDefault") @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(PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/requiredWithDefault") @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(PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/requiredWithoutDefault") @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(PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/optionalWithDefault") @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(PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/optionalWithoutDefault") @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(PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/requiredWithDefault") @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(PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/requiredWithoutDefault") @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(PATH_PARAM_PATH_OVERLAY_WITH_STRING) + @io.micronaut.http.annotation.Get("/param/path/overlay/{string:10}") @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramPathOverlayWithString( @io.micronaut.core.annotation.NonNull @@ -133,49 +102,49 @@ reactor.core.publisher.Mono> para @jakarta.validation.constraints.Size(max = 10) java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_UUID) + @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.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(PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/path/requiredWithDefault/{string}") @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(PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/path/requiredWithoutDefault/{string}") @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(PATH_PARAM_PATH_WITH_BOOLEAN) + @io.micronaut.http.annotation.Get("/param/path/with-bool/{bool:true|false}") @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(PATH_PARAM_PATH_WITH_INTEGER) + @io.micronaut.http.annotation.Get("/param/path/with-integer/{integer:\\-?[0-9]+}") @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(PATH_PARAM_PATH_WITH_LONG) + @io.micronaut.http.annotation.Get("/param/path/with-long/{long:\\-?[0-9]+}") @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(PATH_PARAM_PATH_WITH_MAX_LENGTH) + @io.micronaut.http.annotation.Get("/param/path/with-max-length/{string:5}") @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramPathWithMaxLength( @io.micronaut.core.annotation.NonNull @@ -183,7 +152,7 @@ reactor.core.publisher.Mono> para @jakarta.validation.constraints.Size(max = 5) java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_PATTERN) + @io.micronaut.http.annotation.Get("/param/path/with-pattern/{string:[0-9][a-z]}") @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramPathWithPattern( @io.micronaut.core.annotation.NonNull @@ -191,28 +160,28 @@ reactor.core.publisher.Mono> para @jakarta.validation.constraints.Pattern(regexp = "[0-9][a-z]") java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_UUID) + @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.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(PATH_PARAM_QUERY_DATE) + @io.micronaut.http.annotation.Get("/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(PATH_PARAM_QUERY_DATE_TIME) + @io.micronaut.http.annotation.Get("/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(PATH_PARAM_QUERY_MULTIPLE_LISTS) + @io.micronaut.http.annotation.Get("/param/query/multiple-lists") @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramQueryMultipleLists( @io.micronaut.core.annotation.NonNull @@ -225,42 +194,42 @@ reactor.core.publisher.Mono> para @io.micronaut.http.annotation.QueryValue java.util.Optional> c); - @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_NUMBER) + @io.micronaut.http.annotation.Get("/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(PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/optionalWithDefault") @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(PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/optionalWithoutDefault") @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(PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/requiredWithDefault") @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(PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/requiredWithoutDefault") @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(PATH_PARAM_QUERY_UUID) + @io.micronaut.http.annotation.Get("/param/query/uuid") @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> paramQueryUuid( @io.micronaut.core.annotation.NonNull diff --git a/gen/main/java/testapi/async/reactor/ParameterModel.java b/gen/main/java/testapi/async/reactor/ParameterModel.java index cb01a021..db52ac16 100644 --- a/gen/main/java/testapi/async/reactor/ParameterModel.java +++ b/gen/main/java/testapi/async/reactor/ParameterModel.java @@ -4,54 +4,43 @@ @io.micronaut.serde.annotation.Serdeable public class ParameterModel { - public static final java.lang.String JSON_PROPERTY_BOOL = "bool"; - public static final java.lang.String JSON_PROPERTY_STRING = "string"; - public static final java.lang.String JSON_PROPERTY_NUMBER = "number"; - public static final java.lang.String JSON_PROPERTY_INTEGER = "integer"; - public static final java.lang.String JSON_PROPERTY_UUID = "uuid"; - public static final java.lang.String JSON_PROPERTY_DATE = "date"; - public static final java.lang.String JSON_PROPERTY_DATE_TIME = "dateTime"; - public static final java.lang.String JSON_PROPERTY_A = "a"; - public static final java.lang.String JSON_PROPERTY_B = "b"; - public static final java.lang.String JSON_PROPERTY_C = "c"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BOOL) + @com.fasterxml.jackson.annotation.JsonProperty("bool") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String bool; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_STRING) + @com.fasterxml.jackson.annotation.JsonProperty("string") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String string; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NUMBER) + @com.fasterxml.jackson.annotation.JsonProperty("number") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Double number; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_INTEGER) + @com.fasterxml.jackson.annotation.JsonProperty("integer") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer integer; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_UUID) + @com.fasterxml.jackson.annotation.JsonProperty("uuid") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.UUID uuid; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE) + @com.fasterxml.jackson.annotation.JsonProperty("date") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.time.LocalDate date; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE_TIME) + @com.fasterxml.jackson.annotation.JsonProperty("dateTime") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.time.Instant dateTime; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + @com.fasterxml.jackson.annotation.JsonProperty("a") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.List a; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_B) + @com.fasterxml.jackson.annotation.JsonProperty("b") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.List b; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_C) + @com.fasterxml.jackson.annotation.JsonProperty("c") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.List c; diff --git a/gen/main/java/testapi/async/reactor/RequestApi.java b/gen/main/java/testapi/async/reactor/RequestApi.java index 136699e8..745ada12 100644 --- a/gen/main/java/testapi/async/reactor/RequestApi.java +++ b/gen/main/java/testapi/async/reactor/RequestApi.java @@ -4,8 +4,6 @@ @io.micronaut.validation.Validated public interface RequestApi { - java.lang.String PATH_NO_OPERATION_ID_GET = "/no-operation-id"; - - @io.micronaut.http.annotation.Get(PATH_NO_OPERATION_ID_GET) + @io.micronaut.http.annotation.Get("/no-operation-id") 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 6a0bad15..ab3d72aa 100644 --- a/gen/main/java/testapi/async/reactor/ResponseApi.java +++ b/gen/main/java/testapi/async/reactor/ResponseApi.java @@ -4,59 +4,43 @@ @io.micronaut.validation.Validated public interface ResponseApi { - java.lang.String PATH_ARRAY_COMPLEX = "/response/array-complex"; - java.lang.String PATH_ARRAY_COMPLEX_NOT_FOUND = "/response/array-complex-not-found"; - java.lang.String PATH_ARRAY_SIMPLE = "/response/array-simple"; - java.lang.String PATH_ARRAY_SIMPLE_EMPTY = "/response/array-simple-empty"; - java.lang.String PATH_ARRAY_SIMPLE_NOT_FOUND = "/response/array-simple-not-found"; - java.lang.String PATH_HEADER = "/response/header"; - java.lang.String PATH_MULTIPLE_DATA_TYPES = "/response/multiple-datatypes"; - java.lang.String PATH_MULTIPLE_DATA_TYPES_NOT_FOUND = "/response/multiple-datatypes-not-found"; - java.lang.String PATH_MULTIPLE_RESPONSE_CODES = "/response/multiple-response-codes"; - java.lang.String PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND = "/response/multiple-response-codes-not-found"; - java.lang.String PATH_OPTIONAL = "/response/optional"; - java.lang.String PATH_SINGLE = "/response/single"; - java.lang.String PATH_VOID_FOUND = "/response/void"; - java.lang.String PATH_VOID_NOT_FOUND = "/response/void-not-found"; - java.lang.String PATH_WITH_DEFAULT = "/response/default"; - - @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX) + @io.micronaut.http.annotation.Get("/response/array-complex") @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono>> arrayComplex(); - @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/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(PATH_ARRAY_SIMPLE) + @io.micronaut.http.annotation.Get("/response/array-simple") @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono>> arraySimple(); - @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_EMPTY) + @io.micronaut.http.annotation.Get("/response/array-simple-empty") @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono>> arraySimpleEmpty(); - @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/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(PATH_HEADER) + @io.micronaut.http.annotation.Get("/response/header") reactor.core.publisher.Mono> header(); - @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES) + @io.micronaut.http.annotation.Get("/response/multiple-datatypes") @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(PATH_MULTIPLE_DATA_TYPES_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/multiple-datatypes-not-found") @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> multipleDataTypesNotFound( @io.micronaut.core.annotation.NonNull @@ -66,14 +50,14 @@ reactor.core.publisher.Mono> multipleData @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES) + @io.micronaut.http.annotation.Get("/response/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(PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/multiple-response-codes-not-found") @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> multipleResponseCodesNotFound( @io.micronaut.core.annotation.NonNull @@ -83,26 +67,26 @@ reactor.core.publisher.Mono> multipl @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get(PATH_OPTIONAL) + @io.micronaut.http.annotation.Get("/response/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(PATH_SINGLE) + @io.micronaut.http.annotation.Get("/response/single") @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> single(); - @io.micronaut.http.annotation.Get(PATH_VOID_FOUND) + @io.micronaut.http.annotation.Get("/response/void") reactor.core.publisher.Mono> voidFound(); - @io.micronaut.http.annotation.Get(PATH_VOID_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/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(PATH_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/response/default") reactor.core.publisher.Mono> withDefault(); } diff --git a/gen/main/java/testapi/async/reactor/StringModel.java b/gen/main/java/testapi/async/reactor/StringModel.java index bae3c8ab..2cf0a440 100644 --- a/gen/main/java/testapi/async/reactor/StringModel.java +++ b/gen/main/java/testapi/async/reactor/StringModel.java @@ -4,10 +4,8 @@ @io.micronaut.serde.annotation.Serdeable public class StringModel { - public static final java.lang.String JSON_PROPERTY_FOO = "foo"; - @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + @com.fasterxml.jackson.annotation.JsonProperty("foo") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.lang.String foo; diff --git a/gen/main/java/testapi/async/reactor/ValidationApi.java b/gen/main/java/testapi/async/reactor/ValidationApi.java index 3785b46b..9d420295 100644 --- a/gen/main/java/testapi/async/reactor/ValidationApi.java +++ b/gen/main/java/testapi/async/reactor/ValidationApi.java @@ -4,43 +4,21 @@ @io.micronaut.validation.Validated public interface ValidationApi { - java.lang.String PATH_VALIDATION_DOUBLE_MAX = "/validation/double/max"; - java.lang.String PATH_VALIDATION_DOUBLE_MIN = "/validation/double/min"; - java.lang.String PATH_VALIDATION_DOUBLE_RANGE = "/validation/double/range"; - java.lang.String PATH_VALIDATION_FLOAT_MAX = "/validation/float/max"; - java.lang.String PATH_VALIDATION_FLOAT_MIN = "/validation/float/min"; - java.lang.String PATH_VALIDATION_FLOAT_RANGE = "/validation/float/range"; - 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_MODEL = "/validation/list/model"; - java.lang.String PATH_VALIDATION_LIST_RANGE = "/validation/list/range"; - 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"; - java.lang.String PATH_VALIDATION_MODEL = "/validation/model"; - java.lang.String PATH_VALIDATION_STRING_MAX = "/validation/string/max"; - java.lang.String PATH_VALIDATION_STRING_MIN = "/validation/string/min"; - 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(PATH_VALIDATION_DOUBLE_MAX) + @io.micronaut.http.annotation.Get("/validation/double/max") reactor.core.publisher.Mono> validationDoubleMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = false) java.lang.Double number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MIN) + @io.micronaut.http.annotation.Get("/validation/double/min") reactor.core.publisher.Mono> validationDoubleMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @jakarta.validation.constraints.DecimalMin(value = "3", inclusive = false) java.lang.Double number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_RANGE) + @io.micronaut.http.annotation.Get("/validation/double/range") reactor.core.publisher.Mono> validationDoubleRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @@ -48,21 +26,21 @@ reactor.core.publisher.Mono> validationDo @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = true) java.lang.Double number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MAX) + @io.micronaut.http.annotation.Get("/validation/float/max") reactor.core.publisher.Mono> validationFloatMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = false) java.lang.Float number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MIN) + @io.micronaut.http.annotation.Get("/validation/float/min") reactor.core.publisher.Mono> validationFloatMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @jakarta.validation.constraints.DecimalMin(value = "3", inclusive = false) java.lang.Float number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_RANGE) + @io.micronaut.http.annotation.Get("/validation/float/range") reactor.core.publisher.Mono> validationFloatRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @@ -70,21 +48,21 @@ reactor.core.publisher.Mono> validationFl @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = true) java.lang.Float number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MAX) + @io.micronaut.http.annotation.Get("/validation/integer/max") reactor.core.publisher.Mono> validationIntegerMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @jakarta.validation.constraints.Max(4) java.lang.Integer integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MIN) + @io.micronaut.http.annotation.Get("/validation/integer/min") reactor.core.publisher.Mono> validationIntegerMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @jakarta.validation.constraints.Min(3) java.lang.Integer integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_RANGE) + @io.micronaut.http.annotation.Get("/validation/integer/range") reactor.core.publisher.Mono> validationIntegerRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @@ -92,21 +70,21 @@ reactor.core.publisher.Mono> validationIn @jakarta.validation.constraints.Max(4) java.lang.Integer integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MAX) + @io.micronaut.http.annotation.Get("/validation/list/max") reactor.core.publisher.Mono> validationListMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @jakarta.validation.constraints.Size(max = 4) java.util.List list); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MIN) + @io.micronaut.http.annotation.Get("/validation/list/min") reactor.core.publisher.Mono> validationListMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @jakarta.validation.constraints.Size(min = 3) java.util.List list); - @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_MODEL) + @io.micronaut.http.annotation.Post("/validation/list/model") @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> validationListModel( @io.micronaut.core.annotation.NonNull @@ -114,28 +92,28 @@ reactor.core.publisher.Mono> validationLi @jakarta.validation.Valid java.util.List stringModel); - @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_RANGE) + @io.micronaut.http.annotation.Post("/validation/list/range") reactor.core.publisher.Mono> validationListRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @jakarta.validation.constraints.Size(min = 3, max = 4) java.util.List list); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MAX) + @io.micronaut.http.annotation.Get("/validation/long/max") reactor.core.publisher.Mono> validationLongMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @jakarta.validation.constraints.Max(4) java.lang.Long integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MIN) + @io.micronaut.http.annotation.Get("/validation/long/min") reactor.core.publisher.Mono> validationLongMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @jakarta.validation.constraints.Min(3) java.lang.Long integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_RANGE) + @io.micronaut.http.annotation.Get("/validation/long/range") reactor.core.publisher.Mono> validationLongRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @@ -143,7 +121,7 @@ reactor.core.publisher.Mono> validationLo @jakarta.validation.constraints.Max(4) java.lang.Long integer); - @io.micronaut.http.annotation.Post(PATH_VALIDATION_MODEL) + @io.micronaut.http.annotation.Post("/validation/model") @io.micronaut.http.annotation.Consumes({ "application/json" }) reactor.core.publisher.Mono> validationModel( @io.micronaut.core.annotation.NonNull @@ -151,28 +129,28 @@ reactor.core.publisher.Mono> validationMo @jakarta.validation.Valid StringModel stringModel); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MAX) + @io.micronaut.http.annotation.Get("/validation/string/max") reactor.core.publisher.Mono> validationStringMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @jakarta.validation.constraints.Size(max = 4) java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MIN) + @io.micronaut.http.annotation.Get("/validation/string/min") reactor.core.publisher.Mono> validationStringMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @jakarta.validation.constraints.Size(min = 3) java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_PATTERN) + @io.micronaut.http.annotation.Get("/validation/string/pattern") reactor.core.publisher.Mono> validationStringPattern( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @jakarta.validation.constraints.Pattern(regexp = "[a-z]{3,5}") java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_RANGE) + @io.micronaut.http.annotation.Get("/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 9e188ffc..68d30884 100644 --- a/gen/main/java/testapi/async/simple/MediatypeApi.java +++ b/gen/main/java/testapi/async/simple/MediatypeApi.java @@ -4,15 +4,7 @@ @io.micronaut.validation.Validated public interface MediatypeApi { - java.lang.String PATH_MEDIATYPE_CONSUMES_AND_PRODUCES = "/mediatype/consumes-and-produces"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD = "/mediatype/consumes-multipart-with-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_OCTET_STREAM = "/mediatype/consumes-octet-stream"; - java.lang.String PATH_MEDIATYPE_CONSUMES_PLAIN = "/mediatype/consumes-plain"; - java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; - java.lang.String PATH_MEDIATYPE_PRODUCES_SAME_MODEL = "/mediatype/produces-with-same-model"; - - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_AND_PRODUCES) + @io.micronaut.http.annotation.Post("/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 +13,7 @@ reactor.core.publisher.Mono mediatypeConsumesAndProduces( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD) + @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-with-fileupload") @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" }) @@ -35,7 +27,7 @@ reactor.core.publisher.Mono mediatypeConsumesMultipartWithFileUpload( @io.micronaut.core.annotation.NonNull io.micronaut.http.multipart.StreamingFileUpload file); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD) + @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") @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" }) @@ -47,7 +39,7 @@ reactor.core.publisher.Mono mediatypeConsumesMultipartWithoutFileUplo @io.micronaut.http.annotation.Part(value = "userId") java.lang.Integer userId); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_OCTET_STREAM) + @io.micronaut.http.annotation.Post("/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" }) @@ -56,7 +48,7 @@ reactor.core.publisher.Mono mediatypeConsumesOctetStream( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_PLAIN) + @io.micronaut.http.annotation.Post("/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" }) @@ -65,7 +57,7 @@ reactor.core.publisher.Mono mediatypeConsumesPlain( @io.micronaut.http.annotation.Body java.lang.String body); - @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL) + @io.micronaut.http.annotation.Get("/mediatype/produces-with-different-model") @io.micronaut.http.annotation.Produces({ "application/json", "text/plain" }) reactor.core.publisher.Mono> mediatypeProducesDifferentModel( @io.micronaut.core.annotation.NonNull @@ -75,7 +67,7 @@ reactor.core.publisher.Mono> mediatypePro @io.micronaut.http.annotation.QueryValue(value = "plain") java.lang.Boolean plain); - @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_SAME_MODEL) + @io.micronaut.http.annotation.Get("/mediatype/produces-with-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( diff --git a/gen/main/java/testapi/async/simple/Multipart.java b/gen/main/java/testapi/async/simple/Multipart.java index 74f82c2e..d6a19b48 100644 --- a/gen/main/java/testapi/async/simple/Multipart.java +++ b/gen/main/java/testapi/async/simple/Multipart.java @@ -4,24 +4,19 @@ @io.micronaut.serde.annotation.Serdeable public class Multipart { - public static final java.lang.String JSON_PROPERTY_ORDER_ID = "orderId"; - public static final java.lang.String JSON_PROPERTY_USER_ID = "userId"; - public static final java.lang.String JSON_PROPERTY_FILE_NAME = "fileName"; - public static final java.lang.String JSON_PROPERTY_FILE = "file"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ORDER_ID) + @com.fasterxml.jackson.annotation.JsonProperty("orderId") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer orderId; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_USER_ID) + @com.fasterxml.jackson.annotation.JsonProperty("userId") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer userId; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FILE_NAME) + @com.fasterxml.jackson.annotation.JsonProperty("fileName") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String fileName; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FILE) + @com.fasterxml.jackson.annotation.JsonProperty("file") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private byte[] file; diff --git a/gen/main/java/testapi/async/simple/NumberModel.java b/gen/main/java/testapi/async/simple/NumberModel.java index a860c377..baf62d02 100644 --- a/gen/main/java/testapi/async/simple/NumberModel.java +++ b/gen/main/java/testapi/async/simple/NumberModel.java @@ -4,9 +4,7 @@ @io.micronaut.serde.annotation.Serdeable public class NumberModel { - public static final java.lang.String JSON_PROPERTY_BAR = "bar"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BAR) + @com.fasterxml.jackson.annotation.JsonProperty("bar") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Double bar; diff --git a/gen/main/java/testapi/async/simple/ParameterApi.java b/gen/main/java/testapi/async/simple/ParameterApi.java index 6da30207..1829995a 100644 --- a/gen/main/java/testapi/async/simple/ParameterApi.java +++ b/gen/main/java/testapi/async/simple/ParameterApi.java @@ -4,38 +4,7 @@ @io.micronaut.validation.Validated public interface ParameterApi { - java.lang.String PATH_PARAM_ALL = "/param/all/{path}"; - java.lang.String PATH_PARAM_BODY_OPTIONAL = "/param/body/optional"; - java.lang.String PATH_PARAM_BODY_REQUIRED = "/param/body/required"; - java.lang.String PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT = "/param/cookie/optionalWithDefault"; - java.lang.String PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT = "/param/cookie/optionalWithoutDefault"; - java.lang.String PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT = "/param/cookie/requiredWithDefault"; - java.lang.String PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT = "/param/cookie/requiredWithoutDefault"; - java.lang.String PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT = "/param/header/optionalWithDefault"; - 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: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: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"; - 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"; - java.lang.String PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT = "/param/query/requiredWithDefault"; - 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(PATH_PARAM_ALL) + @io.micronaut.http.annotation.Get("/param/all/{path}") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramAll( @@ -52,7 +21,7 @@ reactor.core.publisher.Mono paramAll( @io.micronaut.http.annotation.Header(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_OPTIONAL) + @io.micronaut.http.annotation.Post("/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 +31,7 @@ reactor.core.publisher.Mono paramBodyOptional( @jakarta.validation.Valid ParameterModel parameterModel); - @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_REQUIRED) + @io.micronaut.http.annotation.Post("/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 +41,7 @@ reactor.core.publisher.Mono paramBodyRequired( @jakarta.validation.Valid ParameterModel parameterModel); - @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/optionalWithDefault") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramCookieOptionalWithDefault( @@ -80,7 +49,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(PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/optionalWithoutDefault") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramCookieOptionalWithoutDefault( @@ -88,7 +57,7 @@ reactor.core.publisher.Mono paramCookieOptionalWithoutDefault( @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/requiredWithDefault") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramCookieRequiredWithDefault( @@ -96,7 +65,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(PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/requiredWithoutDefault") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramCookieRequiredWithoutDefault( @@ -104,7 +73,7 @@ reactor.core.publisher.Mono paramCookieRequiredWithoutDefault( @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/optionalWithDefault") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramHeaderOptionalWithDefault( @@ -112,7 +81,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(PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/optionalWithoutDefault") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramHeaderOptionalWithoutDefault( @@ -120,7 +89,7 @@ reactor.core.publisher.Mono paramHeaderOptionalWithoutDefault( @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/requiredWithDefault") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramHeaderRequiredWithDefault( @@ -128,7 +97,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(PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/requiredWithoutDefault") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramHeaderRequiredWithoutDefault( @@ -136,7 +105,7 @@ reactor.core.publisher.Mono paramHeaderRequiredWithoutDefault( @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_STRING) + @io.micronaut.http.annotation.Get("/param/path/overlay/{string:10}") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramPathOverlayWithString( @@ -145,7 +114,7 @@ reactor.core.publisher.Mono paramPathOverlayWithString( @jakarta.validation.constraints.Size(max = 10) java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_UUID) + @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.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramPathOverlayWithUuid( @@ -153,7 +122,7 @@ reactor.core.publisher.Mono paramPathOverlayWithUuid( @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/path/requiredWithDefault/{string}") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramPathRequiredWithDefault( @@ -161,7 +130,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(PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/path/requiredWithoutDefault/{string}") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramPathRequiredWithoutDefault( @@ -169,7 +138,7 @@ reactor.core.publisher.Mono paramPathRequiredWithoutDefault( @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_BOOLEAN) + @io.micronaut.http.annotation.Get("/param/path/with-bool/{bool:true|false}") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramPathWithBoolean( @@ -177,7 +146,7 @@ reactor.core.publisher.Mono paramPathWithBoolean( @io.micronaut.http.annotation.PathVariable(value = "bool") java.lang.Boolean bool); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_INTEGER) + @io.micronaut.http.annotation.Get("/param/path/with-integer/{integer:\\-?[0-9]+}") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramPathWithInteger( @@ -185,7 +154,7 @@ reactor.core.publisher.Mono paramPathWithInteger( @io.micronaut.http.annotation.PathVariable(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_LONG) + @io.micronaut.http.annotation.Get("/param/path/with-long/{long:\\-?[0-9]+}") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramPathWithLong( @@ -193,7 +162,7 @@ reactor.core.publisher.Mono paramPathWithLong( @io.micronaut.http.annotation.PathVariable(value = "long") java.lang.Long _long); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_MAX_LENGTH) + @io.micronaut.http.annotation.Get("/param/path/with-max-length/{string:5}") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramPathWithMaxLength( @@ -202,7 +171,7 @@ reactor.core.publisher.Mono paramPathWithMaxLength( @jakarta.validation.constraints.Size(max = 5) java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_PATTERN) + @io.micronaut.http.annotation.Get("/param/path/with-pattern/{string:[0-9][a-z]}") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramPathWithPattern( @@ -211,7 +180,7 @@ reactor.core.publisher.Mono paramPathWithPattern( @jakarta.validation.constraints.Pattern(regexp = "[0-9][a-z]") java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_UUID) + @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.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramPathWithUuid( @@ -219,7 +188,7 @@ reactor.core.publisher.Mono paramPathWithUuid( @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE) + @io.micronaut.http.annotation.Get("/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 +196,7 @@ reactor.core.publisher.Mono paramQueryDate( @io.micronaut.http.annotation.QueryValue(value = "date") java.time.LocalDate date); - @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE_TIME) + @io.micronaut.http.annotation.Get("/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 +204,7 @@ reactor.core.publisher.Mono paramQueryDateTime( @io.micronaut.http.annotation.QueryValue(value = "date") java.time.Instant date); - @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_MULTIPLE_LISTS) + @io.micronaut.http.annotation.Get("/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 +218,7 @@ reactor.core.publisher.Mono paramQueryMultipleLists( @io.micronaut.http.annotation.QueryValue java.util.List c); - @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_NUMBER) + @io.micronaut.http.annotation.Get("/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 +226,7 @@ reactor.core.publisher.Mono paramQueryNumber( @io.micronaut.http.annotation.QueryValue(value = "date") java.lang.Double date); - @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/optionalWithDefault") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramQueryOptionalWithDefault( @@ -265,7 +234,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(PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/optionalWithoutDefault") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramQueryOptionalWithoutDefault( @@ -273,7 +242,7 @@ reactor.core.publisher.Mono paramQueryOptionalWithoutDefault( @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/requiredWithDefault") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramQueryRequiredWithDefault( @@ -281,7 +250,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(PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/requiredWithoutDefault") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono paramQueryRequiredWithoutDefault( @@ -289,7 +258,7 @@ reactor.core.publisher.Mono paramQueryRequiredWithoutDefault( @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_UUID) + @io.micronaut.http.annotation.Get("/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( diff --git a/gen/main/java/testapi/async/simple/ParameterModel.java b/gen/main/java/testapi/async/simple/ParameterModel.java index cafc7249..b273cde2 100644 --- a/gen/main/java/testapi/async/simple/ParameterModel.java +++ b/gen/main/java/testapi/async/simple/ParameterModel.java @@ -4,54 +4,43 @@ @io.micronaut.serde.annotation.Serdeable public class ParameterModel { - public static final java.lang.String JSON_PROPERTY_BOOL = "bool"; - public static final java.lang.String JSON_PROPERTY_STRING = "string"; - public static final java.lang.String JSON_PROPERTY_NUMBER = "number"; - public static final java.lang.String JSON_PROPERTY_INTEGER = "integer"; - public static final java.lang.String JSON_PROPERTY_UUID = "uuid"; - public static final java.lang.String JSON_PROPERTY_DATE = "date"; - public static final java.lang.String JSON_PROPERTY_DATE_TIME = "dateTime"; - public static final java.lang.String JSON_PROPERTY_A = "a"; - public static final java.lang.String JSON_PROPERTY_B = "b"; - public static final java.lang.String JSON_PROPERTY_C = "c"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BOOL) + @com.fasterxml.jackson.annotation.JsonProperty("bool") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String bool; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_STRING) + @com.fasterxml.jackson.annotation.JsonProperty("string") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String string; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NUMBER) + @com.fasterxml.jackson.annotation.JsonProperty("number") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Double number; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_INTEGER) + @com.fasterxml.jackson.annotation.JsonProperty("integer") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer integer; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_UUID) + @com.fasterxml.jackson.annotation.JsonProperty("uuid") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.UUID uuid; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE) + @com.fasterxml.jackson.annotation.JsonProperty("date") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.time.LocalDate date; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE_TIME) + @com.fasterxml.jackson.annotation.JsonProperty("dateTime") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.time.Instant dateTime; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + @com.fasterxml.jackson.annotation.JsonProperty("a") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.List a; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_B) + @com.fasterxml.jackson.annotation.JsonProperty("b") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.List b; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_C) + @com.fasterxml.jackson.annotation.JsonProperty("c") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.List c; diff --git a/gen/main/java/testapi/async/simple/RequestApi.java b/gen/main/java/testapi/async/simple/RequestApi.java index 2a762a79..bb338c4b 100644 --- a/gen/main/java/testapi/async/simple/RequestApi.java +++ b/gen/main/java/testapi/async/simple/RequestApi.java @@ -4,9 +4,7 @@ @io.micronaut.validation.Validated public interface RequestApi { - java.lang.String PATH_NO_OPERATION_ID_GET = "/no-operation-id"; - - @io.micronaut.http.annotation.Get(PATH_NO_OPERATION_ID_GET) + @io.micronaut.http.annotation.Get("/no-operation-id") @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 0766264b..e7289c9c 100644 --- a/gen/main/java/testapi/async/simple/ResponseApi.java +++ b/gen/main/java/testapi/async/simple/ResponseApi.java @@ -4,28 +4,12 @@ @io.micronaut.validation.Validated public interface ResponseApi { - java.lang.String PATH_ARRAY_COMPLEX = "/response/array-complex"; - java.lang.String PATH_ARRAY_COMPLEX_NOT_FOUND = "/response/array-complex-not-found"; - java.lang.String PATH_ARRAY_SIMPLE = "/response/array-simple"; - java.lang.String PATH_ARRAY_SIMPLE_EMPTY = "/response/array-simple-empty"; - java.lang.String PATH_ARRAY_SIMPLE_NOT_FOUND = "/response/array-simple-not-found"; - java.lang.String PATH_HEADER = "/response/header"; - java.lang.String PATH_MULTIPLE_DATA_TYPES = "/response/multiple-datatypes"; - java.lang.String PATH_MULTIPLE_DATA_TYPES_NOT_FOUND = "/response/multiple-datatypes-not-found"; - java.lang.String PATH_MULTIPLE_RESPONSE_CODES = "/response/multiple-response-codes"; - java.lang.String PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND = "/response/multiple-response-codes-not-found"; - java.lang.String PATH_OPTIONAL = "/response/optional"; - java.lang.String PATH_SINGLE = "/response/single"; - java.lang.String PATH_VOID_FOUND = "/response/void"; - java.lang.String PATH_VOID_NOT_FOUND = "/response/void-not-found"; - java.lang.String PATH_WITH_DEFAULT = "/response/default"; - - @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX) + @io.micronaut.http.annotation.Get("/response/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(PATH_ARRAY_COMPLEX_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/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 +17,17 @@ reactor.core.publisher.Mono> arrayComplexNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE) + @io.micronaut.http.annotation.Get("/response/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(PATH_ARRAY_SIMPLE_EMPTY) + @io.micronaut.http.annotation.Get("/response/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(PATH_ARRAY_SIMPLE_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/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 +35,17 @@ reactor.core.publisher.Mono> arraySimpleNotFoun @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get(PATH_HEADER) + @io.micronaut.http.annotation.Get("/response/header") reactor.core.publisher.Mono> header(); - @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES) + @io.micronaut.http.annotation.Get("/response/multiple-datatypes") @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(PATH_MULTIPLE_DATA_TYPES_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/multiple-datatypes-not-found") @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> multipleDataTypesNotFound( @io.micronaut.core.annotation.NonNull @@ -71,14 +55,14 @@ reactor.core.publisher.Mono> multipleData @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES) + @io.micronaut.http.annotation.Get("/response/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(PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/multiple-response-codes-not-found") @io.micronaut.http.annotation.Produces({ "application/json" }) reactor.core.publisher.Mono> multipleResponseCodesNotFound( @io.micronaut.core.annotation.NonNull @@ -88,7 +72,7 @@ reactor.core.publisher.Mono> multipl @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get(PATH_OPTIONAL) + @io.micronaut.http.annotation.Get("/response/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 +80,23 @@ reactor.core.publisher.Mono optional( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get(PATH_SINGLE) + @io.micronaut.http.annotation.Get("/response/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(PATH_VOID_FOUND) + @io.micronaut.http.annotation.Get("/response/void") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) reactor.core.publisher.Mono voidFound(); - @io.micronaut.http.annotation.Get(PATH_VOID_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/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(PATH_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/response/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/StringModel.java b/gen/main/java/testapi/async/simple/StringModel.java index 2016f84d..6b11d795 100644 --- a/gen/main/java/testapi/async/simple/StringModel.java +++ b/gen/main/java/testapi/async/simple/StringModel.java @@ -4,10 +4,8 @@ @io.micronaut.serde.annotation.Serdeable public class StringModel { - public static final java.lang.String JSON_PROPERTY_FOO = "foo"; - @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + @com.fasterxml.jackson.annotation.JsonProperty("foo") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.lang.String foo; diff --git a/gen/main/java/testapi/async/simple/ValidationApi.java b/gen/main/java/testapi/async/simple/ValidationApi.java index f55c5e60..f3d45201 100644 --- a/gen/main/java/testapi/async/simple/ValidationApi.java +++ b/gen/main/java/testapi/async/simple/ValidationApi.java @@ -4,29 +4,7 @@ @io.micronaut.validation.Validated public interface ValidationApi { - java.lang.String PATH_VALIDATION_DOUBLE_MAX = "/validation/double/max"; - java.lang.String PATH_VALIDATION_DOUBLE_MIN = "/validation/double/min"; - java.lang.String PATH_VALIDATION_DOUBLE_RANGE = "/validation/double/range"; - java.lang.String PATH_VALIDATION_FLOAT_MAX = "/validation/float/max"; - java.lang.String PATH_VALIDATION_FLOAT_MIN = "/validation/float/min"; - java.lang.String PATH_VALIDATION_FLOAT_RANGE = "/validation/float/range"; - 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_MODEL = "/validation/list/model"; - java.lang.String PATH_VALIDATION_LIST_RANGE = "/validation/list/range"; - 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"; - java.lang.String PATH_VALIDATION_MODEL = "/validation/model"; - java.lang.String PATH_VALIDATION_STRING_MAX = "/validation/string/max"; - java.lang.String PATH_VALIDATION_STRING_MIN = "/validation/string/min"; - 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(PATH_VALIDATION_DOUBLE_MAX) + @io.micronaut.http.annotation.Get("/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 +12,7 @@ reactor.core.publisher.Mono validationDoubleMax( @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = false) java.lang.Double number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MIN) + @io.micronaut.http.annotation.Get("/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 +20,7 @@ reactor.core.publisher.Mono validationDoubleMin( @jakarta.validation.constraints.DecimalMin(value = "3", inclusive = false) java.lang.Double number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_RANGE) + @io.micronaut.http.annotation.Get("/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 +29,7 @@ reactor.core.publisher.Mono validationDoubleRange( @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = true) java.lang.Double number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MAX) + @io.micronaut.http.annotation.Get("/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 +37,7 @@ reactor.core.publisher.Mono validationFloatMax( @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = false) java.lang.Float number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MIN) + @io.micronaut.http.annotation.Get("/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 +45,7 @@ reactor.core.publisher.Mono validationFloatMin( @jakarta.validation.constraints.DecimalMin(value = "3", inclusive = false) java.lang.Float number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_RANGE) + @io.micronaut.http.annotation.Get("/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 +54,7 @@ reactor.core.publisher.Mono validationFloatRange( @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = true) java.lang.Float number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MAX) + @io.micronaut.http.annotation.Get("/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 +62,7 @@ reactor.core.publisher.Mono validationIntegerMax( @jakarta.validation.constraints.Max(4) java.lang.Integer integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MIN) + @io.micronaut.http.annotation.Get("/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 +70,7 @@ reactor.core.publisher.Mono validationIntegerMin( @jakarta.validation.constraints.Min(3) java.lang.Integer integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_RANGE) + @io.micronaut.http.annotation.Get("/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 +79,7 @@ reactor.core.publisher.Mono validationIntegerRange( @jakarta.validation.constraints.Max(4) java.lang.Integer integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MAX) + @io.micronaut.http.annotation.Get("/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 +87,7 @@ reactor.core.publisher.Mono validationListMax( @jakarta.validation.constraints.Size(max = 4) java.util.List list); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MIN) + @io.micronaut.http.annotation.Get("/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 +95,7 @@ reactor.core.publisher.Mono validationListMin( @jakarta.validation.constraints.Size(min = 3) java.util.List list); - @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_MODEL) + @io.micronaut.http.annotation.Post("/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 +104,7 @@ reactor.core.publisher.Mono validationListModel( @jakarta.validation.Valid java.util.List stringModel); - @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_RANGE) + @io.micronaut.http.annotation.Post("/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 +112,7 @@ reactor.core.publisher.Mono validationListRange( @jakarta.validation.constraints.Size(min = 3, max = 4) java.util.List list); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MAX) + @io.micronaut.http.annotation.Get("/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 +120,7 @@ reactor.core.publisher.Mono validationLongMax( @jakarta.validation.constraints.Max(4) java.lang.Long integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MIN) + @io.micronaut.http.annotation.Get("/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 +128,7 @@ reactor.core.publisher.Mono validationLongMin( @jakarta.validation.constraints.Min(3) java.lang.Long integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_RANGE) + @io.micronaut.http.annotation.Get("/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 +137,7 @@ reactor.core.publisher.Mono validationLongRange( @jakarta.validation.constraints.Max(4) java.lang.Long integer); - @io.micronaut.http.annotation.Post(PATH_VALIDATION_MODEL) + @io.micronaut.http.annotation.Post("/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 +146,7 @@ reactor.core.publisher.Mono validationModel( @jakarta.validation.Valid StringModel stringModel); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MAX) + @io.micronaut.http.annotation.Get("/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 +154,7 @@ reactor.core.publisher.Mono validationStringMax( @jakarta.validation.constraints.Size(max = 4) java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MIN) + @io.micronaut.http.annotation.Get("/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 +162,7 @@ reactor.core.publisher.Mono validationStringMin( @jakarta.validation.constraints.Size(min = 3) java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_PATTERN) + @io.micronaut.http.annotation.Get("/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,7 +170,7 @@ reactor.core.publisher.Mono validationStringPattern( @jakarta.validation.constraints.Pattern(regexp = "[a-z]{3,5}") java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_RANGE) + @io.micronaut.http.annotation.Get("/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/constants/MediatypeApi.java b/gen/main/java/testapi/constants/MediatypeApi.java new file mode 100644 index 00000000..7ab61cb7 --- /dev/null +++ b/gen/main/java/testapi/constants/MediatypeApi.java @@ -0,0 +1,78 @@ +package testapi.constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.validation.Validated +public interface MediatypeApi { + java.lang.String PATH_MEDIATYPE_CONSUMES_AND_PRODUCES = "/mediatype/consumes-and-produces"; + java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD = "/mediatype/consumes-multipart-with-fileupload"; + java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload"; + java.lang.String PATH_MEDIATYPE_CONSUMES_OCTET_STREAM = "/mediatype/consumes-octet-stream"; + java.lang.String PATH_MEDIATYPE_CONSUMES_PLAIN = "/mediatype/consumes-plain"; + java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; + java.lang.String PATH_MEDIATYPE_PRODUCES_SAME_MODEL = "/mediatype/produces-with-same-model"; + + @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( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.Body + byte[] body); + + @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( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.Part(value = "orderId") + java.lang.Integer orderId, + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.Part(value = "userId") + java.lang.Integer userId, + @io.micronaut.core.annotation.NonNull + io.micronaut.http.multipart.CompletedFileUpload file); + + @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( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.Part(value = "orderId") + java.lang.Integer orderId, + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.Part(value = "userId") + java.lang.Integer userId); + + @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( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.Body + byte[] body); + + @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( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.Body + java.lang.String body); + + @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 + @io.micronaut.http.annotation.QueryValue(value = "value") + java.lang.String value, + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.QueryValue(value = "plain") + java.lang.Boolean plain); + + @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); +} diff --git a/gen/main/java/testapi/constants/MediatypeApiClient.java b/gen/main/java/testapi/constants/MediatypeApiClient.java new file mode 100644 index 00000000..7641052a --- /dev/null +++ b/gen/main/java/testapi/constants/MediatypeApiClient.java @@ -0,0 +1,71 @@ +package testapi.constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.http.client.annotation.Client(id = "id") +public interface MediatypeApiClient { + + java.lang.String PATH_MEDIATYPE_CONSUMES_AND_PRODUCES = "/mediatype/consumes-and-produces"; + java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD = "/mediatype/consumes-multipart-with-fileupload"; + java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload"; + java.lang.String PATH_MEDIATYPE_CONSUMES_OCTET_STREAM = "/mediatype/consumes-octet-stream"; + java.lang.String PATH_MEDIATYPE_CONSUMES_PLAIN = "/mediatype/consumes-plain"; + java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; + java.lang.String PATH_MEDIATYPE_PRODUCES_SAME_MODEL = "/mediatype/produces-with-same-model"; + + @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( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.Body + byte[] body); + + @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( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.Body + io.micronaut.http.client.multipart.MultipartBody multipart); + + @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( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.Body + io.micronaut.http.client.multipart.MultipartBody multipart); + + @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( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.Body + byte[] body); + + @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( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.Body + java.lang.String body); + + @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 + @io.micronaut.http.annotation.QueryValue(value = "value") + java.lang.String value, + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.QueryValue(value = "plain") + java.lang.Boolean plain); + + @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 + @io.micronaut.http.annotation.QueryValue(value = "value") + java.lang.String value); +} diff --git a/gen/main/java/testapi/constants/Multipart.java b/gen/main/java/testapi/constants/Multipart.java new file mode 100644 index 00000000..3eb1ba1f --- /dev/null +++ b/gen/main/java/testapi/constants/Multipart.java @@ -0,0 +1,117 @@ +package testapi.constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public class Multipart { + + public static final java.lang.String JSON_PROPERTY_ORDER_ID = "orderId"; + public static final java.lang.String JSON_PROPERTY_USER_ID = "userId"; + public static final java.lang.String JSON_PROPERTY_FILE_NAME = "fileName"; + public static final java.lang.String JSON_PROPERTY_FILE = "file"; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ORDER_ID) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.Integer orderId; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_USER_ID) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.Integer userId; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FILE_NAME) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.String fileName; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FILE) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private byte[] file; + + // methods + + @Override + public boolean equals(Object object) { + if (object == this) { + return true; + } + if (object == null || getClass() != object.getClass()) { + return false; + } + Multipart other = (Multipart) object; + return java.util.Objects.equals(orderId, other.orderId) + && java.util.Objects.equals(userId, other.userId) + && java.util.Objects.equals(fileName, other.fileName) + && java.util.Arrays.equals(file, other.file); + } + + @Override + public int hashCode() { + return java.util.Objects.hash(orderId, userId, fileName, java.util.Arrays.hashCode(file)); + } + + @Override + public java.lang.String toString() { + return new java.lang.StringBuilder() + .append("Multipart[") + .append("orderId=").append(orderId).append(",") + .append("userId=").append(userId).append(",") + .append("fileName=").append(fileName).append(",") + .append("file.length=").append(file == null ? null : file.length) + .append("]") + .toString(); + } + + // fluent + + public Multipart orderId(java.lang.Integer newOrderId) { + this.orderId = newOrderId; + return this; + } + + public Multipart userId(java.lang.Integer newUserId) { + this.userId = newUserId; + return this; + } + + public Multipart fileName(java.lang.String newFileName) { + this.fileName = newFileName; + return this; + } + + public Multipart file(byte[] newFile) { + this.file = newFile; + return this; + } + + // getter/setter + + public java.lang.Integer getOrderId() { + return orderId; + } + + public void setOrderId(java.lang.Integer newOrderId) { + this.orderId = newOrderId; + } + + public java.lang.Integer getUserId() { + return userId; + } + + public void setUserId(java.lang.Integer newUserId) { + this.userId = newUserId; + } + + public java.lang.String getFileName() { + return fileName; + } + + public void setFileName(java.lang.String newFileName) { + this.fileName = newFileName; + } + + public byte[] getFile() { + return file; + } + + public void setFile(byte[] newFile) { + this.file = newFile; + } +} diff --git a/gen/main/java/testapi/constants/NumberModel.java b/gen/main/java/testapi/constants/NumberModel.java new file mode 100644 index 00000000..b884488b --- /dev/null +++ b/gen/main/java/testapi/constants/NumberModel.java @@ -0,0 +1,57 @@ +package testapi.constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public class NumberModel { + + public static final java.lang.String JSON_PROPERTY_BAR = "bar"; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BAR) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.Double bar; + + // methods + + @Override + public boolean equals(Object object) { + if (object == this) { + return true; + } + if (object == null || getClass() != object.getClass()) { + return false; + } + NumberModel other = (NumberModel) object; + return java.util.Objects.equals(bar, other.bar); + } + + @Override + public int hashCode() { + return java.util.Objects.hash(bar); + } + + @Override + public java.lang.String toString() { + return new java.lang.StringBuilder() + .append("NumberModel[") + .append("bar=").append(bar) + .append("]") + .toString(); + } + + // fluent + + public NumberModel bar(java.lang.Double newBar) { + this.bar = newBar; + return this; + } + + // getter/setter + + public java.lang.Double getBar() { + return bar; + } + + public void setBar(java.lang.Double newBar) { + this.bar = newBar; + } +} diff --git a/gen/main/java/testapi/constants/ParameterApi.java b/gen/main/java/testapi/constants/ParameterApi.java new file mode 100644 index 00000000..caa20718 --- /dev/null +++ b/gen/main/java/testapi/constants/ParameterApi.java @@ -0,0 +1,268 @@ +package testapi.constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.validation.Validated +public interface ParameterApi { + java.lang.String PATH_PARAM_ALL = "/param/all/{path}"; + java.lang.String PATH_PARAM_BODY_OPTIONAL = "/param/body/optional"; + java.lang.String PATH_PARAM_BODY_REQUIRED = "/param/body/required"; + java.lang.String PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT = "/param/cookie/optionalWithDefault"; + java.lang.String PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT = "/param/cookie/optionalWithoutDefault"; + java.lang.String PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT = "/param/cookie/requiredWithDefault"; + java.lang.String PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT = "/param/cookie/requiredWithoutDefault"; + java.lang.String PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT = "/param/header/optionalWithDefault"; + 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: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: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"; + 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"; + java.lang.String PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT = "/param/query/requiredWithDefault"; + 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(PATH_PARAM_ALL) + @io.micronaut.http.annotation.Produces({ "application/json" }) + io.micronaut.http.HttpResponse paramAll( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.PathVariable(value = "path") + java.lang.String path, + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.QueryValue(value = "uuid") + java.util.UUID uuid, + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.QueryValue(value = "date") + java.util.Optional date, + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.Header(value = "integer") + java.util.Optional integer); + + @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( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.Body + @jakarta.validation.Valid + java.util.Optional parameterModel); + + @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( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.Body + @jakarta.validation.Valid + ParameterModel parameterModel); + + @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(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(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(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(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(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(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(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(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") + @jakarta.validation.constraints.Size(max = 10) + java.lang.String string); + + @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(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(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(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(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(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(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") + @jakarta.validation.constraints.Size(max = 5) + java.lang.String string); + + @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") + @jakarta.validation.constraints.Pattern(regexp = "[0-9][a-z]") + java.lang.String string); + + @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(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(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(PATH_PARAM_QUERY_MULTIPLE_LISTS) + @io.micronaut.http.annotation.Produces({ "application/json" }) + io.micronaut.http.HttpResponse paramQueryMultipleLists( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.QueryValue + java.util.Optional> a, + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.QueryValue + java.util.Optional> b, + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.QueryValue + java.util.Optional> c); + + @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(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(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(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(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(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); +} diff --git a/gen/main/java/testapi/constants/ParameterApiClient.java b/gen/main/java/testapi/constants/ParameterApiClient.java new file mode 100644 index 00000000..a95a6f91 --- /dev/null +++ b/gen/main/java/testapi/constants/ParameterApiClient.java @@ -0,0 +1,264 @@ +package testapi.constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.http.client.annotation.Client(id = "id") +public interface ParameterApiClient { + + java.lang.String PATH_PARAM_ALL = "/param/all/{path}"; + java.lang.String PATH_PARAM_BODY_OPTIONAL = "/param/body/optional"; + java.lang.String PATH_PARAM_BODY_REQUIRED = "/param/body/required"; + java.lang.String PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT = "/param/cookie/optionalWithDefault"; + java.lang.String PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT = "/param/cookie/optionalWithoutDefault"; + java.lang.String PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT = "/param/cookie/requiredWithDefault"; + java.lang.String PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT = "/param/cookie/requiredWithoutDefault"; + java.lang.String PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT = "/param/header/optionalWithDefault"; + 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_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_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?{&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"; + java.lang.String PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT = "/param/query/requiredWithDefault"; + 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(PATH_PARAM_ALL) + @io.micronaut.http.annotation.Consumes({ "application/json" }) + io.micronaut.http.HttpResponse paramAll( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.PathVariable(value = "path") + java.lang.String path, + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.QueryValue(value = "uuid") + java.util.UUID uuid, + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "date") + java.time.LocalDate date, + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.Header(value = "integer") + java.lang.Integer integer); + + @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( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.Body + ParameterModel parameterModel); + + @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( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.Body + ParameterModel parameterModel); + + @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(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(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(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(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(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(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(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(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(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(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(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(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(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(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(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(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(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(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(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(PATH_PARAM_QUERY_MULTIPLE_LISTS) + @io.micronaut.http.annotation.Consumes({ "application/json" }) + io.micronaut.http.HttpResponse paramQueryMultipleLists( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "a") + java.util.List a, + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "b") + java.util.List b, + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "c") + java.util.List c); + + @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(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(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(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(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(PATH_PARAM_QUERY_UUID) + @io.micronaut.http.annotation.Consumes({ "application/json" }) + io.micronaut.http.HttpResponse paramQueryUuid( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "date") + java.util.UUID date); +} diff --git a/gen/main/java/testapi/constants/ParameterModel.java b/gen/main/java/testapi/constants/ParameterModel.java new file mode 100644 index 00000000..0ce91d60 --- /dev/null +++ b/gen/main/java/testapi/constants/ParameterModel.java @@ -0,0 +1,282 @@ +package testapi.constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public class ParameterModel { + + public static final java.lang.String JSON_PROPERTY_BOOL = "bool"; + public static final java.lang.String JSON_PROPERTY_STRING = "string"; + public static final java.lang.String JSON_PROPERTY_NUMBER = "number"; + public static final java.lang.String JSON_PROPERTY_INTEGER = "integer"; + public static final java.lang.String JSON_PROPERTY_UUID = "uuid"; + public static final java.lang.String JSON_PROPERTY_DATE = "date"; + public static final java.lang.String JSON_PROPERTY_DATE_TIME = "dateTime"; + public static final java.lang.String JSON_PROPERTY_A = "a"; + public static final java.lang.String JSON_PROPERTY_B = "b"; + public static final java.lang.String JSON_PROPERTY_C = "c"; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BOOL) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.String bool; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_STRING) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.String string; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NUMBER) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.Double number; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_INTEGER) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.Integer integer; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_UUID) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.util.UUID uuid; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.time.LocalDate date; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE_TIME) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.time.Instant dateTime; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.util.List a; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_B) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.util.List b; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_C) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.util.List c; + + // methods + + @Override + public boolean equals(Object object) { + if (object == this) { + return true; + } + if (object == null || getClass() != object.getClass()) { + return false; + } + ParameterModel other = (ParameterModel) object; + return java.util.Objects.equals(bool, other.bool) + && java.util.Objects.equals(string, other.string) + && java.util.Objects.equals(number, other.number) + && java.util.Objects.equals(integer, other.integer) + && java.util.Objects.equals(uuid, other.uuid) + && java.util.Objects.equals(date, other.date) + && java.util.Objects.equals(dateTime, other.dateTime) + && java.util.Objects.equals(a, other.a) + && java.util.Objects.equals(b, other.b) + && java.util.Objects.equals(c, other.c); + } + + @Override + public int hashCode() { + return java.util.Objects.hash(bool, string, number, integer, uuid, date, dateTime, a, b, c); + } + + @Override + public java.lang.String toString() { + return new java.lang.StringBuilder() + .append("ParameterModel[") + .append("bool=").append(bool).append(",") + .append("string=").append(string).append(",") + .append("number=").append(number).append(",") + .append("integer=").append(integer).append(",") + .append("uuid=").append(uuid).append(",") + .append("date=").append(date).append(",") + .append("dateTime=").append(dateTime).append(",") + .append("a=").append(a).append(",") + .append("b=").append(b).append(",") + .append("c=").append(c) + .append("]") + .toString(); + } + + // fluent + + public ParameterModel bool(java.lang.String newBool) { + this.bool = newBool; + return this; + } + + public ParameterModel string(java.lang.String newString) { + this.string = newString; + return this; + } + + public ParameterModel number(java.lang.Double newNumber) { + this.number = newNumber; + return this; + } + + public ParameterModel integer(java.lang.Integer newInteger) { + this.integer = newInteger; + return this; + } + + public ParameterModel uuid(java.util.UUID newUuid) { + this.uuid = newUuid; + return this; + } + + public ParameterModel date(java.time.LocalDate newDate) { + this.date = newDate; + return this; + } + + public ParameterModel dateTime(java.time.Instant newDateTime) { + this.dateTime = newDateTime; + return this; + } + + public ParameterModel a(java.util.List newA) { + this.a = newA; + return this; + } + + public ParameterModel addAItem(java.lang.String aItem) { + if (this.a == null) { + this.a = new java.util.ArrayList<>(); + } + this.a.add(aItem); + return this; + } + + public ParameterModel removeAItem(java.lang.String aItem) { + if (this.a != null) { + this.a.remove(aItem); + } + return this; + } + + public ParameterModel b(java.util.List newB) { + this.b = newB; + return this; + } + + public ParameterModel addBItem(java.util.UUID bItem) { + if (this.b == null) { + this.b = new java.util.ArrayList<>(); + } + this.b.add(bItem); + return this; + } + + public ParameterModel removeBItem(java.util.UUID bItem) { + if (this.b != null) { + this.b.remove(bItem); + } + return this; + } + + public ParameterModel c(java.util.List newC) { + this.c = newC; + return this; + } + + public ParameterModel addCItem(java.lang.Integer cItem) { + if (this.c == null) { + this.c = new java.util.ArrayList<>(); + } + this.c.add(cItem); + return this; + } + + public ParameterModel removeCItem(java.lang.Integer cItem) { + if (this.c != null) { + this.c.remove(cItem); + } + return this; + } + + // getter/setter + + public java.lang.String getBool() { + return bool; + } + + public void setBool(java.lang.String newBool) { + this.bool = newBool; + } + + public java.lang.String getString() { + return string; + } + + public void setString(java.lang.String newString) { + this.string = newString; + } + + public java.lang.Double getNumber() { + return number; + } + + public void setNumber(java.lang.Double newNumber) { + this.number = newNumber; + } + + public java.lang.Integer getInteger() { + return integer; + } + + public void setInteger(java.lang.Integer newInteger) { + this.integer = newInteger; + } + + public java.util.UUID getUuid() { + return uuid; + } + + public void setUuid(java.util.UUID newUuid) { + this.uuid = newUuid; + } + + public java.time.LocalDate getDate() { + return date; + } + + public void setDate(java.time.LocalDate newDate) { + this.date = newDate; + } + + public java.time.Instant getDateTime() { + return dateTime; + } + + public void setDateTime(java.time.Instant newDateTime) { + this.dateTime = newDateTime; + } + + public java.util.List getA() { + return a; + } + + public void setA(java.util.List newA) { + this.a = newA; + } + + public java.util.List getB() { + return b; + } + + public void setB(java.util.List newB) { + this.b = newB; + } + + public java.util.List getC() { + return c; + } + + public void setC(java.util.List newC) { + this.c = newC; + } +} diff --git a/gen/main/java/testapi/constants/RequestApi.java b/gen/main/java/testapi/constants/RequestApi.java new file mode 100644 index 00000000..b9cd582d --- /dev/null +++ b/gen/main/java/testapi/constants/RequestApi.java @@ -0,0 +1,10 @@ +package testapi.constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.validation.Validated +public interface RequestApi { + java.lang.String PATH_NO_OPERATION_ID_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/constants/RequestApiClient.java b/gen/main/java/testapi/constants/RequestApiClient.java new file mode 100644 index 00000000..6d9d01d7 --- /dev/null +++ b/gen/main/java/testapi/constants/RequestApiClient.java @@ -0,0 +1,11 @@ +package testapi.constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.http.client.annotation.Client(id = "id") +public interface RequestApiClient { + + java.lang.String PATH_NO_OPERATION_ID_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/constants/ResponseApi.java b/gen/main/java/testapi/constants/ResponseApi.java new file mode 100644 index 00000000..2d280652 --- /dev/null +++ b/gen/main/java/testapi/constants/ResponseApi.java @@ -0,0 +1,107 @@ +package testapi.constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.validation.Validated +public interface ResponseApi { + java.lang.String PATH_ARRAY_COMPLEX = "/response/array-complex"; + java.lang.String PATH_ARRAY_COMPLEX_NOT_FOUND = "/response/array-complex-not-found"; + java.lang.String PATH_ARRAY_SIMPLE = "/response/array-simple"; + java.lang.String PATH_ARRAY_SIMPLE_EMPTY = "/response/array-simple-empty"; + java.lang.String PATH_ARRAY_SIMPLE_NOT_FOUND = "/response/array-simple-not-found"; + java.lang.String PATH_HEADER = "/response/header"; + java.lang.String PATH_MULTIPLE_DATA_TYPES = "/response/multiple-datatypes"; + java.lang.String PATH_MULTIPLE_DATA_TYPES_NOT_FOUND = "/response/multiple-datatypes-not-found"; + java.lang.String PATH_MULTIPLE_RESPONSE_CODES = "/response/multiple-response-codes"; + java.lang.String PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND = "/response/multiple-response-codes-not-found"; + java.lang.String PATH_OPTIONAL = "/response/optional"; + java.lang.String PATH_SINGLE = "/response/single"; + java.lang.String PATH_VOID_FOUND = "/response/void"; + java.lang.String PATH_VOID_NOT_FOUND = "/response/void-not-found"; + java.lang.String PATH_WITH_DEFAULT = "/response/default"; + + @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(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(PATH_ARRAY_SIMPLE) + @io.micronaut.http.annotation.Produces({ "application/json" }) + io.micronaut.http.HttpResponse> arraySimple(); + + @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(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(PATH_HEADER) + io.micronaut.http.HttpResponse header(); + + @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(PATH_MULTIPLE_DATA_TYPES_NOT_FOUND) + @io.micronaut.http.annotation.Produces({ "application/json" }) + io.micronaut.http.HttpResponse multipleDataTypesNotFound( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.QueryValue(value = "redirect") + java.lang.Boolean redirect, + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.QueryValue(value = "found") + java.lang.Boolean found); + + @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(PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND) + @io.micronaut.http.annotation.Produces({ "application/json" }) + io.micronaut.http.HttpResponse multipleResponseCodesNotFound( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.QueryValue(value = "redirect") + java.lang.Boolean redirect, + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.QueryValue(value = "found") + java.lang.Boolean found); + + @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(PATH_SINGLE) + @io.micronaut.http.annotation.Produces({ "application/json" }) + io.micronaut.http.HttpResponse single(); + + @io.micronaut.http.annotation.Get(PATH_VOID_FOUND) + io.micronaut.http.HttpResponse voidFound(); + + @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(PATH_WITH_DEFAULT) + io.micronaut.http.HttpResponse withDefault(); +} diff --git a/gen/main/java/testapi/constants/ResponseApiClient.java b/gen/main/java/testapi/constants/ResponseApiClient.java new file mode 100644 index 00000000..582f36e0 --- /dev/null +++ b/gen/main/java/testapi/constants/ResponseApiClient.java @@ -0,0 +1,108 @@ +package testapi.constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.http.client.annotation.Client(id = "id") +public interface ResponseApiClient { + + java.lang.String PATH_ARRAY_COMPLEX = "/response/array-complex"; + java.lang.String PATH_ARRAY_COMPLEX_NOT_FOUND = "/response/array-complex-not-found"; + java.lang.String PATH_ARRAY_SIMPLE = "/response/array-simple"; + java.lang.String PATH_ARRAY_SIMPLE_EMPTY = "/response/array-simple-empty"; + java.lang.String PATH_ARRAY_SIMPLE_NOT_FOUND = "/response/array-simple-not-found"; + java.lang.String PATH_HEADER = "/response/header"; + java.lang.String PATH_MULTIPLE_DATA_TYPES = "/response/multiple-datatypes"; + java.lang.String PATH_MULTIPLE_DATA_TYPES_NOT_FOUND = "/response/multiple-datatypes-not-found"; + java.lang.String PATH_MULTIPLE_RESPONSE_CODES = "/response/multiple-response-codes"; + java.lang.String PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND = "/response/multiple-response-codes-not-found"; + java.lang.String PATH_OPTIONAL = "/response/optional"; + java.lang.String PATH_SINGLE = "/response/single"; + java.lang.String PATH_VOID_FOUND = "/response/void"; + java.lang.String PATH_VOID_NOT_FOUND = "/response/void-not-found"; + java.lang.String PATH_WITH_DEFAULT = "/response/default"; + + @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(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(PATH_ARRAY_SIMPLE) + @io.micronaut.http.annotation.Consumes({ "application/json" }) + io.micronaut.http.HttpResponse> arraySimple(); + + @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(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(PATH_HEADER) + io.micronaut.http.HttpResponse header(); + + @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(PATH_MULTIPLE_DATA_TYPES_NOT_FOUND) + @io.micronaut.http.annotation.Consumes({ "application/json" }) + io.micronaut.http.HttpResponse multipleDataTypesNotFound( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.QueryValue(value = "redirect") + java.lang.Boolean redirect, + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.QueryValue(value = "found") + java.lang.Boolean found); + + @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(PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND) + @io.micronaut.http.annotation.Consumes({ "application/json" }) + io.micronaut.http.HttpResponse multipleResponseCodesNotFound( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.QueryValue(value = "redirect") + java.lang.Boolean redirect, + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.QueryValue(value = "found") + java.lang.Boolean found); + + @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(PATH_SINGLE) + @io.micronaut.http.annotation.Consumes({ "application/json" }) + io.micronaut.http.HttpResponse single(); + + @io.micronaut.http.annotation.Get(PATH_VOID_FOUND) + io.micronaut.http.HttpResponse voidFound(); + + @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(PATH_WITH_DEFAULT) + io.micronaut.http.HttpResponse withDefault(); +} diff --git a/gen/main/java/testapi/constants/StringModel.java b/gen/main/java/testapi/constants/StringModel.java new file mode 100644 index 00000000..c47bc524 --- /dev/null +++ b/gen/main/java/testapi/constants/StringModel.java @@ -0,0 +1,58 @@ +package testapi.constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public class StringModel { + + public static final java.lang.String JSON_PROPERTY_FOO = "foo"; + + @jakarta.validation.constraints.NotNull + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) + private java.lang.String foo; + + // methods + + @Override + public boolean equals(Object object) { + if (object == this) { + return true; + } + if (object == null || getClass() != object.getClass()) { + return false; + } + StringModel other = (StringModel) object; + return java.util.Objects.equals(foo, other.foo); + } + + @Override + public int hashCode() { + return java.util.Objects.hash(foo); + } + + @Override + public java.lang.String toString() { + return new java.lang.StringBuilder() + .append("StringModel[") + .append("foo=").append(foo) + .append("]") + .toString(); + } + + // fluent + + public StringModel foo(java.lang.String newFoo) { + this.foo = newFoo; + return this; + } + + // getter/setter + + public java.lang.String getFoo() { + return foo; + } + + public void setFoo(java.lang.String newFoo) { + this.foo = newFoo; + } +} diff --git a/gen/main/java/testapi/constants/ValidationApi.java b/gen/main/java/testapi/constants/ValidationApi.java new file mode 100644 index 00000000..3fb4edd9 --- /dev/null +++ b/gen/main/java/testapi/constants/ValidationApi.java @@ -0,0 +1,180 @@ +package testapi.constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.validation.Validated +public interface ValidationApi { + java.lang.String PATH_VALIDATION_DOUBLE_MAX = "/validation/double/max"; + java.lang.String PATH_VALIDATION_DOUBLE_MIN = "/validation/double/min"; + java.lang.String PATH_VALIDATION_DOUBLE_RANGE = "/validation/double/range"; + java.lang.String PATH_VALIDATION_FLOAT_MAX = "/validation/float/max"; + java.lang.String PATH_VALIDATION_FLOAT_MIN = "/validation/float/min"; + java.lang.String PATH_VALIDATION_FLOAT_RANGE = "/validation/float/range"; + 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_MODEL = "/validation/list/model"; + java.lang.String PATH_VALIDATION_LIST_RANGE = "/validation/list/range"; + 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"; + java.lang.String PATH_VALIDATION_MODEL = "/validation/model"; + java.lang.String PATH_VALIDATION_STRING_MAX = "/validation/string/max"; + java.lang.String PATH_VALIDATION_STRING_MIN = "/validation/string/min"; + 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(PATH_VALIDATION_DOUBLE_MAX) + io.micronaut.http.HttpResponse validationDoubleMax( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.QueryValue(value = "number") + @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = false) + java.lang.Double number); + + @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") + @jakarta.validation.constraints.DecimalMin(value = "3", inclusive = false) + java.lang.Double number); + + @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") + @jakarta.validation.constraints.DecimalMin(value = "3", inclusive = true) + @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = true) + java.lang.Double number); + + @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") + @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = false) + java.lang.Float number); + + @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") + @jakarta.validation.constraints.DecimalMin(value = "3", inclusive = false) + java.lang.Float number); + + @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") + @jakarta.validation.constraints.DecimalMin(value = "3", inclusive = true) + @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = true) + java.lang.Float number); + + @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") + @jakarta.validation.constraints.Max(4) + java.lang.Integer integer); + + @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") + @jakarta.validation.constraints.Min(3) + java.lang.Integer integer); + + @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") + @jakarta.validation.constraints.Min(3) + @jakarta.validation.constraints.Max(4) + java.lang.Integer integer); + + @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MAX) + io.micronaut.http.HttpResponse validationListMax( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.QueryValue + @jakarta.validation.constraints.Size(max = 4) + java.util.List 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 + @jakarta.validation.constraints.Size(min = 3) + java.util.List list); + + @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 + @jakarta.validation.Valid + java.util.List stringModel); + + @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_RANGE) + io.micronaut.http.HttpResponse validationListRange( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.QueryValue + @jakarta.validation.constraints.Size(min = 3, max = 4) + java.util.List list); + + @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") + @jakarta.validation.constraints.Max(4) + java.lang.Long integer); + + @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") + @jakarta.validation.constraints.Min(3) + java.lang.Long integer); + + @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") + @jakarta.validation.constraints.Min(3) + @jakarta.validation.constraints.Max(4) + java.lang.Long integer); + + @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 + @jakarta.validation.Valid + StringModel stringModel); + + @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") + @jakarta.validation.constraints.Size(max = 4) + java.lang.String string); + + @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") + @jakarta.validation.constraints.Size(min = 3) + java.lang.String string); + + @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") + @jakarta.validation.constraints.Pattern(regexp = "[a-z]{3,5}") + java.lang.String string); + + @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") + @jakarta.validation.constraints.Size(min = 3, max = 4) + java.lang.String string); +} diff --git a/gen/main/java/testapi/constants/ValidationApiClient.java b/gen/main/java/testapi/constants/ValidationApiClient.java new file mode 100644 index 00000000..62b24577 --- /dev/null +++ b/gen/main/java/testapi/constants/ValidationApiClient.java @@ -0,0 +1,156 @@ +package testapi.constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.http.client.annotation.Client(id = "id") +public interface ValidationApiClient { + + java.lang.String PATH_VALIDATION_DOUBLE_MAX = "/validation/double/max"; + java.lang.String PATH_VALIDATION_DOUBLE_MIN = "/validation/double/min"; + java.lang.String PATH_VALIDATION_DOUBLE_RANGE = "/validation/double/range"; + java.lang.String PATH_VALIDATION_FLOAT_MAX = "/validation/float/max"; + java.lang.String PATH_VALIDATION_FLOAT_MIN = "/validation/float/min"; + java.lang.String PATH_VALIDATION_FLOAT_RANGE = "/validation/float/range"; + 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?{&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?{&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"; + java.lang.String PATH_VALIDATION_MODEL = "/validation/model"; + java.lang.String PATH_VALIDATION_STRING_MAX = "/validation/string/max"; + java.lang.String PATH_VALIDATION_STRING_MIN = "/validation/string/min"; + 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(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(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(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(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(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(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(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(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(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(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(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(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(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(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(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(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(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(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(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(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(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); +} diff --git a/gen/main/java/testapi/defaults/MediatypeApi.java b/gen/main/java/testapi/defaults/MediatypeApi.java index 71b3c743..a7910463 100644 --- a/gen/main/java/testapi/defaults/MediatypeApi.java +++ b/gen/main/java/testapi/defaults/MediatypeApi.java @@ -4,15 +4,7 @@ @io.micronaut.validation.Validated public interface MediatypeApi { - java.lang.String PATH_MEDIATYPE_CONSUMES_AND_PRODUCES = "/mediatype/consumes-and-produces"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD = "/mediatype/consumes-multipart-with-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_OCTET_STREAM = "/mediatype/consumes-octet-stream"; - java.lang.String PATH_MEDIATYPE_CONSUMES_PLAIN = "/mediatype/consumes-plain"; - java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; - java.lang.String PATH_MEDIATYPE_PRODUCES_SAME_MODEL = "/mediatype/produces-with-same-model"; - - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_AND_PRODUCES) + @io.micronaut.http.annotation.Post("/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 +12,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesAndProduces( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD) + @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-with-fileupload") @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUpload( @@ -33,7 +25,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUplo @io.micronaut.core.annotation.NonNull io.micronaut.http.multipart.CompletedFileUpload file); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD) + @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( @@ -44,7 +36,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileU @io.micronaut.http.annotation.Part(value = "userId") java.lang.Integer userId); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_OCTET_STREAM) + @io.micronaut.http.annotation.Post("/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 +44,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesOctetStream( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_PLAIN) + @io.micronaut.http.annotation.Post("/mediatype/consumes-plain") @io.micronaut.http.annotation.Consumes({ "text/plain" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesPlain( @@ -60,7 +52,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesPlain( @io.micronaut.http.annotation.Body java.lang.String body); - @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL) + @io.micronaut.http.annotation.Get("/mediatype/produces-with-different-model") @io.micronaut.http.annotation.Produces({ "application/json", "text/plain" }) io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.core.annotation.NonNull @@ -70,7 +62,7 @@ io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.http.annotation.QueryValue(value = "plain") java.lang.Boolean plain); - @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_SAME_MODEL) + @io.micronaut.http.annotation.Get("/mediatype/produces-with-same-model") @io.micronaut.http.annotation.Produces({ "application/json", "application/xml" }) io.micronaut.http.HttpResponse mediatypeProducesSameModel( @io.micronaut.core.annotation.NonNull diff --git a/gen/main/java/testapi/defaults/Multipart.java b/gen/main/java/testapi/defaults/Multipart.java index 9d87de26..cffd416e 100644 --- a/gen/main/java/testapi/defaults/Multipart.java +++ b/gen/main/java/testapi/defaults/Multipart.java @@ -4,24 +4,19 @@ @io.micronaut.serde.annotation.Serdeable public class Multipart { - public static final java.lang.String JSON_PROPERTY_ORDER_ID = "orderId"; - public static final java.lang.String JSON_PROPERTY_USER_ID = "userId"; - public static final java.lang.String JSON_PROPERTY_FILE_NAME = "fileName"; - public static final java.lang.String JSON_PROPERTY_FILE = "file"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ORDER_ID) + @com.fasterxml.jackson.annotation.JsonProperty("orderId") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer orderId; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_USER_ID) + @com.fasterxml.jackson.annotation.JsonProperty("userId") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer userId; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FILE_NAME) + @com.fasterxml.jackson.annotation.JsonProperty("fileName") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String fileName; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FILE) + @com.fasterxml.jackson.annotation.JsonProperty("file") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private byte[] file; diff --git a/gen/main/java/testapi/defaults/NumberModel.java b/gen/main/java/testapi/defaults/NumberModel.java index e044e49c..7fb2b981 100644 --- a/gen/main/java/testapi/defaults/NumberModel.java +++ b/gen/main/java/testapi/defaults/NumberModel.java @@ -4,9 +4,7 @@ @io.micronaut.serde.annotation.Serdeable public class NumberModel { - public static final java.lang.String JSON_PROPERTY_BAR = "bar"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BAR) + @com.fasterxml.jackson.annotation.JsonProperty("bar") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Double bar; diff --git a/gen/main/java/testapi/defaults/ParameterApi.java b/gen/main/java/testapi/defaults/ParameterApi.java index fb5d247d..cbea07f1 100644 --- a/gen/main/java/testapi/defaults/ParameterApi.java +++ b/gen/main/java/testapi/defaults/ParameterApi.java @@ -4,38 +4,7 @@ @io.micronaut.validation.Validated public interface ParameterApi { - java.lang.String PATH_PARAM_ALL = "/param/all/{path}"; - java.lang.String PATH_PARAM_BODY_OPTIONAL = "/param/body/optional"; - java.lang.String PATH_PARAM_BODY_REQUIRED = "/param/body/required"; - java.lang.String PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT = "/param/cookie/optionalWithDefault"; - java.lang.String PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT = "/param/cookie/optionalWithoutDefault"; - java.lang.String PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT = "/param/cookie/requiredWithDefault"; - java.lang.String PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT = "/param/cookie/requiredWithoutDefault"; - java.lang.String PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT = "/param/header/optionalWithDefault"; - 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: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: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"; - 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"; - java.lang.String PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT = "/param/query/requiredWithDefault"; - 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(PATH_PARAM_ALL) + @io.micronaut.http.annotation.Get("/param/all/{path}") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramAll( @io.micronaut.core.annotation.NonNull @@ -51,7 +20,7 @@ io.micronaut.http.HttpResponse paramAll( @io.micronaut.http.annotation.Header(value = "integer") java.util.Optional integer); - @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_OPTIONAL) + @io.micronaut.http.annotation.Post("/param/body/optional") @io.micronaut.http.annotation.Consumes({ "application/json" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramBodyOptional( @@ -60,7 +29,7 @@ io.micronaut.http.HttpResponse paramBodyOptional( @jakarta.validation.Valid java.util.Optional parameterModel); - @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_REQUIRED) + @io.micronaut.http.annotation.Post("/param/body/required") @io.micronaut.http.annotation.Consumes({ "application/json" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramBodyRequired( @@ -69,63 +38,63 @@ io.micronaut.http.HttpResponse paramBodyRequired( @jakarta.validation.Valid ParameterModel parameterModel); - @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/optionalWithDefault") @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(PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/optionalWithoutDefault") @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(PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/requiredWithDefault") @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(PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/requiredWithoutDefault") @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(PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/optionalWithDefault") @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(PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/optionalWithoutDefault") @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(PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/requiredWithDefault") @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(PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/requiredWithoutDefault") @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(PATH_PARAM_PATH_OVERLAY_WITH_STRING) + @io.micronaut.http.annotation.Get("/param/path/overlay/{string:10}") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathOverlayWithString( @io.micronaut.core.annotation.NonNull @@ -133,49 +102,49 @@ io.micronaut.http.HttpResponse paramPathOverlayWithString( @jakarta.validation.constraints.Size(max = 10) java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_UUID) + @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.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(PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/path/requiredWithDefault/{string}") @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(PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/path/requiredWithoutDefault/{string}") @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(PATH_PARAM_PATH_WITH_BOOLEAN) + @io.micronaut.http.annotation.Get("/param/path/with-bool/{bool:true|false}") @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(PATH_PARAM_PATH_WITH_INTEGER) + @io.micronaut.http.annotation.Get("/param/path/with-integer/{integer:\\-?[0-9]+}") @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(PATH_PARAM_PATH_WITH_LONG) + @io.micronaut.http.annotation.Get("/param/path/with-long/{long:\\-?[0-9]+}") @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(PATH_PARAM_PATH_WITH_MAX_LENGTH) + @io.micronaut.http.annotation.Get("/param/path/with-max-length/{string:5}") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithMaxLength( @io.micronaut.core.annotation.NonNull @@ -183,7 +152,7 @@ io.micronaut.http.HttpResponse paramPathWithMaxLength( @jakarta.validation.constraints.Size(max = 5) java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_PATTERN) + @io.micronaut.http.annotation.Get("/param/path/with-pattern/{string:[0-9][a-z]}") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithPattern( @io.micronaut.core.annotation.NonNull @@ -191,28 +160,28 @@ io.micronaut.http.HttpResponse paramPathWithPattern( @jakarta.validation.constraints.Pattern(regexp = "[0-9][a-z]") java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_UUID) + @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.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(PATH_PARAM_QUERY_DATE) + @io.micronaut.http.annotation.Get("/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(PATH_PARAM_QUERY_DATE_TIME) + @io.micronaut.http.annotation.Get("/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(PATH_PARAM_QUERY_MULTIPLE_LISTS) + @io.micronaut.http.annotation.Get("/param/query/multiple-lists") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.core.annotation.NonNull @@ -225,42 +194,42 @@ io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.http.annotation.QueryValue java.util.Optional> c); - @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_NUMBER) + @io.micronaut.http.annotation.Get("/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(PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/optionalWithDefault") @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(PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/optionalWithoutDefault") @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(PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/requiredWithDefault") @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(PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/requiredWithoutDefault") @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(PATH_PARAM_QUERY_UUID) + @io.micronaut.http.annotation.Get("/param/query/uuid") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryUuid( @io.micronaut.core.annotation.NonNull diff --git a/gen/main/java/testapi/defaults/ParameterModel.java b/gen/main/java/testapi/defaults/ParameterModel.java index 8411edcb..5af0c93a 100644 --- a/gen/main/java/testapi/defaults/ParameterModel.java +++ b/gen/main/java/testapi/defaults/ParameterModel.java @@ -4,54 +4,43 @@ @io.micronaut.serde.annotation.Serdeable public class ParameterModel { - public static final java.lang.String JSON_PROPERTY_BOOL = "bool"; - public static final java.lang.String JSON_PROPERTY_STRING = "string"; - public static final java.lang.String JSON_PROPERTY_NUMBER = "number"; - public static final java.lang.String JSON_PROPERTY_INTEGER = "integer"; - public static final java.lang.String JSON_PROPERTY_UUID = "uuid"; - public static final java.lang.String JSON_PROPERTY_DATE = "date"; - public static final java.lang.String JSON_PROPERTY_DATE_TIME = "dateTime"; - public static final java.lang.String JSON_PROPERTY_A = "a"; - public static final java.lang.String JSON_PROPERTY_B = "b"; - public static final java.lang.String JSON_PROPERTY_C = "c"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BOOL) + @com.fasterxml.jackson.annotation.JsonProperty("bool") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String bool; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_STRING) + @com.fasterxml.jackson.annotation.JsonProperty("string") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String string; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NUMBER) + @com.fasterxml.jackson.annotation.JsonProperty("number") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Double number; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_INTEGER) + @com.fasterxml.jackson.annotation.JsonProperty("integer") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer integer; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_UUID) + @com.fasterxml.jackson.annotation.JsonProperty("uuid") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.UUID uuid; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE) + @com.fasterxml.jackson.annotation.JsonProperty("date") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.time.LocalDate date; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE_TIME) + @com.fasterxml.jackson.annotation.JsonProperty("dateTime") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.time.Instant dateTime; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + @com.fasterxml.jackson.annotation.JsonProperty("a") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.List a; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_B) + @com.fasterxml.jackson.annotation.JsonProperty("b") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.List b; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_C) + @com.fasterxml.jackson.annotation.JsonProperty("c") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.List c; diff --git a/gen/main/java/testapi/defaults/RequestApi.java b/gen/main/java/testapi/defaults/RequestApi.java index 8a68eb09..f99b23b2 100644 --- a/gen/main/java/testapi/defaults/RequestApi.java +++ b/gen/main/java/testapi/defaults/RequestApi.java @@ -4,8 +4,6 @@ @io.micronaut.validation.Validated public interface RequestApi { - java.lang.String PATH_NO_OPERATION_ID_GET = "/no-operation-id"; - - @io.micronaut.http.annotation.Get(PATH_NO_OPERATION_ID_GET) + @io.micronaut.http.annotation.Get("/no-operation-id") io.micronaut.http.HttpResponse noOperationIdGet(); } diff --git a/gen/main/java/testapi/defaults/ResponseApi.java b/gen/main/java/testapi/defaults/ResponseApi.java index 55d27757..3e68769b 100644 --- a/gen/main/java/testapi/defaults/ResponseApi.java +++ b/gen/main/java/testapi/defaults/ResponseApi.java @@ -4,59 +4,43 @@ @io.micronaut.validation.Validated public interface ResponseApi { - java.lang.String PATH_ARRAY_COMPLEX = "/response/array-complex"; - java.lang.String PATH_ARRAY_COMPLEX_NOT_FOUND = "/response/array-complex-not-found"; - java.lang.String PATH_ARRAY_SIMPLE = "/response/array-simple"; - java.lang.String PATH_ARRAY_SIMPLE_EMPTY = "/response/array-simple-empty"; - java.lang.String PATH_ARRAY_SIMPLE_NOT_FOUND = "/response/array-simple-not-found"; - java.lang.String PATH_HEADER = "/response/header"; - java.lang.String PATH_MULTIPLE_DATA_TYPES = "/response/multiple-datatypes"; - java.lang.String PATH_MULTIPLE_DATA_TYPES_NOT_FOUND = "/response/multiple-datatypes-not-found"; - java.lang.String PATH_MULTIPLE_RESPONSE_CODES = "/response/multiple-response-codes"; - java.lang.String PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND = "/response/multiple-response-codes-not-found"; - java.lang.String PATH_OPTIONAL = "/response/optional"; - java.lang.String PATH_SINGLE = "/response/single"; - java.lang.String PATH_VOID_FOUND = "/response/void"; - java.lang.String PATH_VOID_NOT_FOUND = "/response/void-not-found"; - java.lang.String PATH_WITH_DEFAULT = "/response/default"; - - @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX) + @io.micronaut.http.annotation.Get("/response/array-complex") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arrayComplex(); - @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/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(PATH_ARRAY_SIMPLE) + @io.micronaut.http.annotation.Get("/response/array-simple") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arraySimple(); - @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_EMPTY) + @io.micronaut.http.annotation.Get("/response/array-simple-empty") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arraySimpleEmpty(); - @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/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(PATH_HEADER) + @io.micronaut.http.annotation.Get("/response/header") io.micronaut.http.HttpResponse header(); - @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES) + @io.micronaut.http.annotation.Get("/response/multiple-datatypes") @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(PATH_MULTIPLE_DATA_TYPES_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/multiple-datatypes-not-found") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.core.annotation.NonNull @@ -66,14 +50,14 @@ io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES) + @io.micronaut.http.annotation.Get("/response/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(PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/multiple-response-codes-not-found") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.core.annotation.NonNull @@ -83,26 +67,26 @@ io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get(PATH_OPTIONAL) + @io.micronaut.http.annotation.Get("/response/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(PATH_SINGLE) + @io.micronaut.http.annotation.Get("/response/single") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse single(); - @io.micronaut.http.annotation.Get(PATH_VOID_FOUND) + @io.micronaut.http.annotation.Get("/response/void") io.micronaut.http.HttpResponse voidFound(); - @io.micronaut.http.annotation.Get(PATH_VOID_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/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(PATH_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/response/default") io.micronaut.http.HttpResponse withDefault(); } diff --git a/gen/main/java/testapi/defaults/StringModel.java b/gen/main/java/testapi/defaults/StringModel.java index 11230e77..3de64519 100644 --- a/gen/main/java/testapi/defaults/StringModel.java +++ b/gen/main/java/testapi/defaults/StringModel.java @@ -4,10 +4,8 @@ @io.micronaut.serde.annotation.Serdeable public class StringModel { - public static final java.lang.String JSON_PROPERTY_FOO = "foo"; - @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + @com.fasterxml.jackson.annotation.JsonProperty("foo") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.lang.String foo; diff --git a/gen/main/java/testapi/defaults/ValidationApi.java b/gen/main/java/testapi/defaults/ValidationApi.java index 727b1870..bd6ccde4 100644 --- a/gen/main/java/testapi/defaults/ValidationApi.java +++ b/gen/main/java/testapi/defaults/ValidationApi.java @@ -4,43 +4,21 @@ @io.micronaut.validation.Validated public interface ValidationApi { - java.lang.String PATH_VALIDATION_DOUBLE_MAX = "/validation/double/max"; - java.lang.String PATH_VALIDATION_DOUBLE_MIN = "/validation/double/min"; - java.lang.String PATH_VALIDATION_DOUBLE_RANGE = "/validation/double/range"; - java.lang.String PATH_VALIDATION_FLOAT_MAX = "/validation/float/max"; - java.lang.String PATH_VALIDATION_FLOAT_MIN = "/validation/float/min"; - java.lang.String PATH_VALIDATION_FLOAT_RANGE = "/validation/float/range"; - 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_MODEL = "/validation/list/model"; - java.lang.String PATH_VALIDATION_LIST_RANGE = "/validation/list/range"; - 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"; - java.lang.String PATH_VALIDATION_MODEL = "/validation/model"; - java.lang.String PATH_VALIDATION_STRING_MAX = "/validation/string/max"; - java.lang.String PATH_VALIDATION_STRING_MIN = "/validation/string/min"; - 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(PATH_VALIDATION_DOUBLE_MAX) + @io.micronaut.http.annotation.Get("/validation/double/max") io.micronaut.http.HttpResponse validationDoubleMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = false) java.lang.Double number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MIN) + @io.micronaut.http.annotation.Get("/validation/double/min") io.micronaut.http.HttpResponse validationDoubleMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @jakarta.validation.constraints.DecimalMin(value = "3", inclusive = false) java.lang.Double number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_RANGE) + @io.micronaut.http.annotation.Get("/validation/double/range") io.micronaut.http.HttpResponse validationDoubleRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @@ -48,21 +26,21 @@ io.micronaut.http.HttpResponse validationDoubleRange( @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = true) java.lang.Double number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MAX) + @io.micronaut.http.annotation.Get("/validation/float/max") io.micronaut.http.HttpResponse validationFloatMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = false) java.lang.Float number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MIN) + @io.micronaut.http.annotation.Get("/validation/float/min") io.micronaut.http.HttpResponse validationFloatMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @jakarta.validation.constraints.DecimalMin(value = "3", inclusive = false) java.lang.Float number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_RANGE) + @io.micronaut.http.annotation.Get("/validation/float/range") io.micronaut.http.HttpResponse validationFloatRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @@ -70,21 +48,21 @@ io.micronaut.http.HttpResponse validationFloatRange( @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = true) java.lang.Float number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MAX) + @io.micronaut.http.annotation.Get("/validation/integer/max") io.micronaut.http.HttpResponse validationIntegerMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @jakarta.validation.constraints.Max(4) java.lang.Integer integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MIN) + @io.micronaut.http.annotation.Get("/validation/integer/min") io.micronaut.http.HttpResponse validationIntegerMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @jakarta.validation.constraints.Min(3) java.lang.Integer integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_RANGE) + @io.micronaut.http.annotation.Get("/validation/integer/range") io.micronaut.http.HttpResponse validationIntegerRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @@ -92,21 +70,21 @@ io.micronaut.http.HttpResponse validationIntegerRange( @jakarta.validation.constraints.Max(4) java.lang.Integer integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MAX) + @io.micronaut.http.annotation.Get("/validation/list/max") io.micronaut.http.HttpResponse validationListMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @jakarta.validation.constraints.Size(max = 4) java.util.List list); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MIN) + @io.micronaut.http.annotation.Get("/validation/list/min") io.micronaut.http.HttpResponse validationListMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @jakarta.validation.constraints.Size(min = 3) java.util.List list); - @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_MODEL) + @io.micronaut.http.annotation.Post("/validation/list/model") @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse validationListModel( @io.micronaut.core.annotation.NonNull @@ -114,28 +92,28 @@ io.micronaut.http.HttpResponse validationListModel( @jakarta.validation.Valid java.util.List stringModel); - @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_RANGE) + @io.micronaut.http.annotation.Post("/validation/list/range") io.micronaut.http.HttpResponse validationListRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @jakarta.validation.constraints.Size(min = 3, max = 4) java.util.List list); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MAX) + @io.micronaut.http.annotation.Get("/validation/long/max") io.micronaut.http.HttpResponse validationLongMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @jakarta.validation.constraints.Max(4) java.lang.Long integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MIN) + @io.micronaut.http.annotation.Get("/validation/long/min") io.micronaut.http.HttpResponse validationLongMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @jakarta.validation.constraints.Min(3) java.lang.Long integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_RANGE) + @io.micronaut.http.annotation.Get("/validation/long/range") io.micronaut.http.HttpResponse validationLongRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @@ -143,7 +121,7 @@ io.micronaut.http.HttpResponse validationLongRange( @jakarta.validation.constraints.Max(4) java.lang.Long integer); - @io.micronaut.http.annotation.Post(PATH_VALIDATION_MODEL) + @io.micronaut.http.annotation.Post("/validation/model") @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse validationModel( @io.micronaut.core.annotation.NonNull @@ -151,28 +129,28 @@ io.micronaut.http.HttpResponse validationModel( @jakarta.validation.Valid StringModel stringModel); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MAX) + @io.micronaut.http.annotation.Get("/validation/string/max") io.micronaut.http.HttpResponse validationStringMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @jakarta.validation.constraints.Size(max = 4) java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MIN) + @io.micronaut.http.annotation.Get("/validation/string/min") io.micronaut.http.HttpResponse validationStringMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @jakarta.validation.constraints.Size(min = 3) java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_PATTERN) + @io.micronaut.http.annotation.Get("/validation/string/pattern") io.micronaut.http.HttpResponse validationStringPattern( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @jakarta.validation.constraints.Pattern(regexp = "[a-z]{3,5}") java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_RANGE) + @io.micronaut.http.annotation.Get("/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 27c1fc19..f7ed0cf6 100644 --- a/gen/main/java/testapi/modelsuffix/MediatypeApi.java +++ b/gen/main/java/testapi/modelsuffix/MediatypeApi.java @@ -4,15 +4,7 @@ @io.micronaut.validation.Validated public interface MediatypeApi { - java.lang.String PATH_MEDIATYPE_CONSUMES_AND_PRODUCES = "/mediatype/consumes-and-produces"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD = "/mediatype/consumes-multipart-with-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_OCTET_STREAM = "/mediatype/consumes-octet-stream"; - java.lang.String PATH_MEDIATYPE_CONSUMES_PLAIN = "/mediatype/consumes-plain"; - java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; - java.lang.String PATH_MEDIATYPE_PRODUCES_SAME_MODEL = "/mediatype/produces-with-same-model"; - - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_AND_PRODUCES) + @io.micronaut.http.annotation.Post("/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 +12,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesAndProduces( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD) + @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-with-fileupload") @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUpload( @@ -33,7 +25,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUp @io.micronaut.core.annotation.NonNull io.micronaut.http.multipart.CompletedFileUpload file); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD) + @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( @@ -44,7 +36,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFil @io.micronaut.http.annotation.Part(value = "userId") java.lang.Integer userId); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_OCTET_STREAM) + @io.micronaut.http.annotation.Post("/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 +44,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesOctetStream( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_PLAIN) + @io.micronaut.http.annotation.Post("/mediatype/consumes-plain") @io.micronaut.http.annotation.Consumes({ "text/plain" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesPlain( @@ -60,7 +52,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesPlain( @io.micronaut.http.annotation.Body java.lang.String body); - @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL) + @io.micronaut.http.annotation.Get("/mediatype/produces-with-different-model") @io.micronaut.http.annotation.Produces({ "application/json", "text/plain" }) io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.core.annotation.NonNull @@ -70,7 +62,7 @@ io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.http.annotation.QueryValue(value = "plain") java.lang.Boolean plain); - @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_SAME_MODEL) + @io.micronaut.http.annotation.Get("/mediatype/produces-with-same-model") @io.micronaut.http.annotation.Produces({ "application/json", "application/xml" }) io.micronaut.http.HttpResponse mediatypeProducesSameModel( @io.micronaut.core.annotation.NonNull diff --git a/gen/main/java/testapi/modelsuffix/MultipartVO.java b/gen/main/java/testapi/modelsuffix/MultipartVO.java index e1413c92..0bd22ac9 100644 --- a/gen/main/java/testapi/modelsuffix/MultipartVO.java +++ b/gen/main/java/testapi/modelsuffix/MultipartVO.java @@ -4,24 +4,19 @@ @io.micronaut.serde.annotation.Serdeable public class MultipartVO { - public static final java.lang.String JSON_PROPERTY_ORDER_ID = "orderId"; - public static final java.lang.String JSON_PROPERTY_USER_ID = "userId"; - public static final java.lang.String JSON_PROPERTY_FILE_NAME = "fileName"; - public static final java.lang.String JSON_PROPERTY_FILE = "file"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ORDER_ID) + @com.fasterxml.jackson.annotation.JsonProperty("orderId") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer orderId; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_USER_ID) + @com.fasterxml.jackson.annotation.JsonProperty("userId") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer userId; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FILE_NAME) + @com.fasterxml.jackson.annotation.JsonProperty("fileName") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String fileName; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FILE) + @com.fasterxml.jackson.annotation.JsonProperty("file") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private byte[] file; diff --git a/gen/main/java/testapi/modelsuffix/NumberModelVO.java b/gen/main/java/testapi/modelsuffix/NumberModelVO.java index 0139d516..7d8e7934 100644 --- a/gen/main/java/testapi/modelsuffix/NumberModelVO.java +++ b/gen/main/java/testapi/modelsuffix/NumberModelVO.java @@ -4,9 +4,7 @@ @io.micronaut.serde.annotation.Serdeable public class NumberModelVO { - public static final java.lang.String JSON_PROPERTY_BAR = "bar"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BAR) + @com.fasterxml.jackson.annotation.JsonProperty("bar") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Double bar; diff --git a/gen/main/java/testapi/modelsuffix/ParameterApi.java b/gen/main/java/testapi/modelsuffix/ParameterApi.java index 3fe76f02..ea86ac80 100644 --- a/gen/main/java/testapi/modelsuffix/ParameterApi.java +++ b/gen/main/java/testapi/modelsuffix/ParameterApi.java @@ -4,38 +4,7 @@ @io.micronaut.validation.Validated public interface ParameterApi { - java.lang.String PATH_PARAM_ALL = "/param/all/{path}"; - java.lang.String PATH_PARAM_BODY_OPTIONAL = "/param/body/optional"; - java.lang.String PATH_PARAM_BODY_REQUIRED = "/param/body/required"; - java.lang.String PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT = "/param/cookie/optionalWithDefault"; - java.lang.String PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT = "/param/cookie/optionalWithoutDefault"; - java.lang.String PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT = "/param/cookie/requiredWithDefault"; - java.lang.String PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT = "/param/cookie/requiredWithoutDefault"; - java.lang.String PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT = "/param/header/optionalWithDefault"; - 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: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: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"; - 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"; - java.lang.String PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT = "/param/query/requiredWithDefault"; - 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(PATH_PARAM_ALL) + @io.micronaut.http.annotation.Get("/param/all/{path}") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramAll( @io.micronaut.core.annotation.NonNull @@ -51,7 +20,7 @@ io.micronaut.http.HttpResponse paramAll( @io.micronaut.http.annotation.Header(value = "integer") java.util.Optional integer); - @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_OPTIONAL) + @io.micronaut.http.annotation.Post("/param/body/optional") @io.micronaut.http.annotation.Consumes({ "application/json" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramBodyOptional( @@ -60,7 +29,7 @@ io.micronaut.http.HttpResponse paramBodyOptional( @jakarta.validation.Valid java.util.Optional parameterModelVO); - @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_REQUIRED) + @io.micronaut.http.annotation.Post("/param/body/required") @io.micronaut.http.annotation.Consumes({ "application/json" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramBodyRequired( @@ -69,63 +38,63 @@ io.micronaut.http.HttpResponse paramBodyRequired( @jakarta.validation.Valid ParameterModelVO parameterModelVO); - @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/optionalWithDefault") @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(PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/optionalWithoutDefault") @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(PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/requiredWithDefault") @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(PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/requiredWithoutDefault") @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(PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/optionalWithDefault") @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(PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/optionalWithoutDefault") @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(PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/requiredWithDefault") @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(PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/requiredWithoutDefault") @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(PATH_PARAM_PATH_OVERLAY_WITH_STRING) + @io.micronaut.http.annotation.Get("/param/path/overlay/{string:10}") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathOverlayWithString( @io.micronaut.core.annotation.NonNull @@ -133,49 +102,49 @@ io.micronaut.http.HttpResponse paramPathOverlayWithString( @jakarta.validation.constraints.Size(max = 10) java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_UUID) + @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.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(PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/path/requiredWithDefault/{string}") @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(PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/path/requiredWithoutDefault/{string}") @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(PATH_PARAM_PATH_WITH_BOOLEAN) + @io.micronaut.http.annotation.Get("/param/path/with-bool/{bool:true|false}") @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(PATH_PARAM_PATH_WITH_INTEGER) + @io.micronaut.http.annotation.Get("/param/path/with-integer/{integer:\\-?[0-9]+}") @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(PATH_PARAM_PATH_WITH_LONG) + @io.micronaut.http.annotation.Get("/param/path/with-long/{long:\\-?[0-9]+}") @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(PATH_PARAM_PATH_WITH_MAX_LENGTH) + @io.micronaut.http.annotation.Get("/param/path/with-max-length/{string:5}") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithMaxLength( @io.micronaut.core.annotation.NonNull @@ -183,7 +152,7 @@ io.micronaut.http.HttpResponse paramPathWithMaxLength( @jakarta.validation.constraints.Size(max = 5) java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_PATTERN) + @io.micronaut.http.annotation.Get("/param/path/with-pattern/{string:[0-9][a-z]}") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithPattern( @io.micronaut.core.annotation.NonNull @@ -191,28 +160,28 @@ io.micronaut.http.HttpResponse paramPathWithPattern( @jakarta.validation.constraints.Pattern(regexp = "[0-9][a-z]") java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_UUID) + @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.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(PATH_PARAM_QUERY_DATE) + @io.micronaut.http.annotation.Get("/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(PATH_PARAM_QUERY_DATE_TIME) + @io.micronaut.http.annotation.Get("/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(PATH_PARAM_QUERY_MULTIPLE_LISTS) + @io.micronaut.http.annotation.Get("/param/query/multiple-lists") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.core.annotation.NonNull @@ -225,42 +194,42 @@ io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.http.annotation.QueryValue java.util.Optional> c); - @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_NUMBER) + @io.micronaut.http.annotation.Get("/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(PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/optionalWithDefault") @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(PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/optionalWithoutDefault") @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(PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/requiredWithDefault") @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(PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/requiredWithoutDefault") @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(PATH_PARAM_QUERY_UUID) + @io.micronaut.http.annotation.Get("/param/query/uuid") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryUuid( @io.micronaut.core.annotation.NonNull diff --git a/gen/main/java/testapi/modelsuffix/ParameterModelVO.java b/gen/main/java/testapi/modelsuffix/ParameterModelVO.java index c59024e8..9ecb5b80 100644 --- a/gen/main/java/testapi/modelsuffix/ParameterModelVO.java +++ b/gen/main/java/testapi/modelsuffix/ParameterModelVO.java @@ -4,54 +4,43 @@ @io.micronaut.serde.annotation.Serdeable public class ParameterModelVO { - public static final java.lang.String JSON_PROPERTY_BOOL = "bool"; - public static final java.lang.String JSON_PROPERTY_STRING = "string"; - public static final java.lang.String JSON_PROPERTY_NUMBER = "number"; - public static final java.lang.String JSON_PROPERTY_INTEGER = "integer"; - public static final java.lang.String JSON_PROPERTY_UUID = "uuid"; - public static final java.lang.String JSON_PROPERTY_DATE = "date"; - public static final java.lang.String JSON_PROPERTY_DATE_TIME = "dateTime"; - public static final java.lang.String JSON_PROPERTY_A = "a"; - public static final java.lang.String JSON_PROPERTY_B = "b"; - public static final java.lang.String JSON_PROPERTY_C = "c"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BOOL) + @com.fasterxml.jackson.annotation.JsonProperty("bool") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String bool; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_STRING) + @com.fasterxml.jackson.annotation.JsonProperty("string") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String string; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NUMBER) + @com.fasterxml.jackson.annotation.JsonProperty("number") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Double number; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_INTEGER) + @com.fasterxml.jackson.annotation.JsonProperty("integer") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer integer; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_UUID) + @com.fasterxml.jackson.annotation.JsonProperty("uuid") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.UUID uuid; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE) + @com.fasterxml.jackson.annotation.JsonProperty("date") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.time.LocalDate date; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE_TIME) + @com.fasterxml.jackson.annotation.JsonProperty("dateTime") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.time.Instant dateTime; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + @com.fasterxml.jackson.annotation.JsonProperty("a") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.List a; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_B) + @com.fasterxml.jackson.annotation.JsonProperty("b") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.List b; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_C) + @com.fasterxml.jackson.annotation.JsonProperty("c") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.List c; diff --git a/gen/main/java/testapi/modelsuffix/RequestApi.java b/gen/main/java/testapi/modelsuffix/RequestApi.java index ad990810..e40c9d42 100644 --- a/gen/main/java/testapi/modelsuffix/RequestApi.java +++ b/gen/main/java/testapi/modelsuffix/RequestApi.java @@ -4,8 +4,6 @@ @io.micronaut.validation.Validated public interface RequestApi { - java.lang.String PATH_NO_OPERATION_ID_GET = "/no-operation-id"; - - @io.micronaut.http.annotation.Get(PATH_NO_OPERATION_ID_GET) + @io.micronaut.http.annotation.Get("/no-operation-id") io.micronaut.http.HttpResponse noOperationIdGet(); } diff --git a/gen/main/java/testapi/modelsuffix/ResponseApi.java b/gen/main/java/testapi/modelsuffix/ResponseApi.java index 41aad78e..ffe7d324 100644 --- a/gen/main/java/testapi/modelsuffix/ResponseApi.java +++ b/gen/main/java/testapi/modelsuffix/ResponseApi.java @@ -4,59 +4,43 @@ @io.micronaut.validation.Validated public interface ResponseApi { - java.lang.String PATH_ARRAY_COMPLEX = "/response/array-complex"; - java.lang.String PATH_ARRAY_COMPLEX_NOT_FOUND = "/response/array-complex-not-found"; - java.lang.String PATH_ARRAY_SIMPLE = "/response/array-simple"; - java.lang.String PATH_ARRAY_SIMPLE_EMPTY = "/response/array-simple-empty"; - java.lang.String PATH_ARRAY_SIMPLE_NOT_FOUND = "/response/array-simple-not-found"; - java.lang.String PATH_HEADER = "/response/header"; - java.lang.String PATH_MULTIPLE_DATA_TYPES = "/response/multiple-datatypes"; - java.lang.String PATH_MULTIPLE_DATA_TYPES_NOT_FOUND = "/response/multiple-datatypes-not-found"; - java.lang.String PATH_MULTIPLE_RESPONSE_CODES = "/response/multiple-response-codes"; - java.lang.String PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND = "/response/multiple-response-codes-not-found"; - java.lang.String PATH_OPTIONAL = "/response/optional"; - java.lang.String PATH_SINGLE = "/response/single"; - java.lang.String PATH_VOID_FOUND = "/response/void"; - java.lang.String PATH_VOID_NOT_FOUND = "/response/void-not-found"; - java.lang.String PATH_WITH_DEFAULT = "/response/default"; - - @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX) + @io.micronaut.http.annotation.Get("/response/array-complex") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arrayComplex(); - @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/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(PATH_ARRAY_SIMPLE) + @io.micronaut.http.annotation.Get("/response/array-simple") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arraySimple(); - @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_EMPTY) + @io.micronaut.http.annotation.Get("/response/array-simple-empty") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arraySimpleEmpty(); - @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/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(PATH_HEADER) + @io.micronaut.http.annotation.Get("/response/header") io.micronaut.http.HttpResponse header(); - @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES) + @io.micronaut.http.annotation.Get("/response/multiple-datatypes") @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(PATH_MULTIPLE_DATA_TYPES_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/multiple-datatypes-not-found") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.core.annotation.NonNull @@ -66,14 +50,14 @@ io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES) + @io.micronaut.http.annotation.Get("/response/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(PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/multiple-response-codes-not-found") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.core.annotation.NonNull @@ -83,26 +67,26 @@ io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get(PATH_OPTIONAL) + @io.micronaut.http.annotation.Get("/response/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(PATH_SINGLE) + @io.micronaut.http.annotation.Get("/response/single") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse single(); - @io.micronaut.http.annotation.Get(PATH_VOID_FOUND) + @io.micronaut.http.annotation.Get("/response/void") io.micronaut.http.HttpResponse voidFound(); - @io.micronaut.http.annotation.Get(PATH_VOID_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/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(PATH_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/response/default") io.micronaut.http.HttpResponse withDefault(); } diff --git a/gen/main/java/testapi/modelsuffix/StringModelVO.java b/gen/main/java/testapi/modelsuffix/StringModelVO.java index 1b707a93..3fb45c82 100644 --- a/gen/main/java/testapi/modelsuffix/StringModelVO.java +++ b/gen/main/java/testapi/modelsuffix/StringModelVO.java @@ -4,10 +4,8 @@ @io.micronaut.serde.annotation.Serdeable public class StringModelVO { - public static final java.lang.String JSON_PROPERTY_FOO = "foo"; - @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + @com.fasterxml.jackson.annotation.JsonProperty("foo") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.lang.String foo; diff --git a/gen/main/java/testapi/modelsuffix/ValidationApi.java b/gen/main/java/testapi/modelsuffix/ValidationApi.java index e0e2f25c..dd9b7064 100644 --- a/gen/main/java/testapi/modelsuffix/ValidationApi.java +++ b/gen/main/java/testapi/modelsuffix/ValidationApi.java @@ -4,43 +4,21 @@ @io.micronaut.validation.Validated public interface ValidationApi { - java.lang.String PATH_VALIDATION_DOUBLE_MAX = "/validation/double/max"; - java.lang.String PATH_VALIDATION_DOUBLE_MIN = "/validation/double/min"; - java.lang.String PATH_VALIDATION_DOUBLE_RANGE = "/validation/double/range"; - java.lang.String PATH_VALIDATION_FLOAT_MAX = "/validation/float/max"; - java.lang.String PATH_VALIDATION_FLOAT_MIN = "/validation/float/min"; - java.lang.String PATH_VALIDATION_FLOAT_RANGE = "/validation/float/range"; - 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_MODEL = "/validation/list/model"; - java.lang.String PATH_VALIDATION_LIST_RANGE = "/validation/list/range"; - 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"; - java.lang.String PATH_VALIDATION_MODEL = "/validation/model"; - java.lang.String PATH_VALIDATION_STRING_MAX = "/validation/string/max"; - java.lang.String PATH_VALIDATION_STRING_MIN = "/validation/string/min"; - 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(PATH_VALIDATION_DOUBLE_MAX) + @io.micronaut.http.annotation.Get("/validation/double/max") io.micronaut.http.HttpResponse validationDoubleMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = false) java.lang.Double number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MIN) + @io.micronaut.http.annotation.Get("/validation/double/min") io.micronaut.http.HttpResponse validationDoubleMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @jakarta.validation.constraints.DecimalMin(value = "3", inclusive = false) java.lang.Double number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_RANGE) + @io.micronaut.http.annotation.Get("/validation/double/range") io.micronaut.http.HttpResponse validationDoubleRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @@ -48,21 +26,21 @@ io.micronaut.http.HttpResponse validationDoubleRange( @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = true) java.lang.Double number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MAX) + @io.micronaut.http.annotation.Get("/validation/float/max") io.micronaut.http.HttpResponse validationFloatMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = false) java.lang.Float number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MIN) + @io.micronaut.http.annotation.Get("/validation/float/min") io.micronaut.http.HttpResponse validationFloatMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @jakarta.validation.constraints.DecimalMin(value = "3", inclusive = false) java.lang.Float number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_RANGE) + @io.micronaut.http.annotation.Get("/validation/float/range") io.micronaut.http.HttpResponse validationFloatRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @@ -70,21 +48,21 @@ io.micronaut.http.HttpResponse validationFloatRange( @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = true) java.lang.Float number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MAX) + @io.micronaut.http.annotation.Get("/validation/integer/max") io.micronaut.http.HttpResponse validationIntegerMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @jakarta.validation.constraints.Max(4) java.lang.Integer integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MIN) + @io.micronaut.http.annotation.Get("/validation/integer/min") io.micronaut.http.HttpResponse validationIntegerMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @jakarta.validation.constraints.Min(3) java.lang.Integer integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_RANGE) + @io.micronaut.http.annotation.Get("/validation/integer/range") io.micronaut.http.HttpResponse validationIntegerRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @@ -92,21 +70,21 @@ io.micronaut.http.HttpResponse validationIntegerRange( @jakarta.validation.constraints.Max(4) java.lang.Integer integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MAX) + @io.micronaut.http.annotation.Get("/validation/list/max") io.micronaut.http.HttpResponse validationListMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @jakarta.validation.constraints.Size(max = 4) java.util.List list); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MIN) + @io.micronaut.http.annotation.Get("/validation/list/min") io.micronaut.http.HttpResponse validationListMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @jakarta.validation.constraints.Size(min = 3) java.util.List list); - @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_MODEL) + @io.micronaut.http.annotation.Post("/validation/list/model") @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse validationListModel( @io.micronaut.core.annotation.NonNull @@ -114,28 +92,28 @@ io.micronaut.http.HttpResponse validationListModel( @jakarta.validation.Valid java.util.List stringModelVO); - @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_RANGE) + @io.micronaut.http.annotation.Post("/validation/list/range") io.micronaut.http.HttpResponse validationListRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @jakarta.validation.constraints.Size(min = 3, max = 4) java.util.List list); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MAX) + @io.micronaut.http.annotation.Get("/validation/long/max") io.micronaut.http.HttpResponse validationLongMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @jakarta.validation.constraints.Max(4) java.lang.Long integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MIN) + @io.micronaut.http.annotation.Get("/validation/long/min") io.micronaut.http.HttpResponse validationLongMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @jakarta.validation.constraints.Min(3) java.lang.Long integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_RANGE) + @io.micronaut.http.annotation.Get("/validation/long/range") io.micronaut.http.HttpResponse validationLongRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @@ -143,7 +121,7 @@ io.micronaut.http.HttpResponse validationLongRange( @jakarta.validation.constraints.Max(4) java.lang.Long integer); - @io.micronaut.http.annotation.Post(PATH_VALIDATION_MODEL) + @io.micronaut.http.annotation.Post("/validation/model") @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse validationModel( @io.micronaut.core.annotation.NonNull @@ -151,28 +129,28 @@ io.micronaut.http.HttpResponse validationModel( @jakarta.validation.Valid StringModelVO stringModelVO); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MAX) + @io.micronaut.http.annotation.Get("/validation/string/max") io.micronaut.http.HttpResponse validationStringMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @jakarta.validation.constraints.Size(max = 4) java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MIN) + @io.micronaut.http.annotation.Get("/validation/string/min") io.micronaut.http.HttpResponse validationStringMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @jakarta.validation.constraints.Size(min = 3) java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_PATTERN) + @io.micronaut.http.annotation.Get("/validation/string/pattern") io.micronaut.http.HttpResponse validationStringPattern( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @jakarta.validation.constraints.Pattern(regexp = "[a-z]{3,5}") java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_RANGE) + @io.micronaut.http.annotation.Get("/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 f4adbb1c..2ba8200e 100644 --- a/gen/main/java/testapi/nogeneric/MediatypeApi.java +++ b/gen/main/java/testapi/nogeneric/MediatypeApi.java @@ -4,15 +4,7 @@ @io.micronaut.validation.Validated public interface MediatypeApi { - java.lang.String PATH_MEDIATYPE_CONSUMES_AND_PRODUCES = "/mediatype/consumes-and-produces"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD = "/mediatype/consumes-multipart-with-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_OCTET_STREAM = "/mediatype/consumes-octet-stream"; - java.lang.String PATH_MEDIATYPE_CONSUMES_PLAIN = "/mediatype/consumes-plain"; - java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; - java.lang.String PATH_MEDIATYPE_PRODUCES_SAME_MODEL = "/mediatype/produces-with-same-model"; - - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_AND_PRODUCES) + @io.micronaut.http.annotation.Post("/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 +13,7 @@ StringModel mediatypeConsumesAndProduces( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD) + @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-with-fileupload") @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" }) @@ -35,7 +27,7 @@ Multipart mediatypeConsumesMultipartWithFileUpload( @io.micronaut.core.annotation.NonNull io.micronaut.http.multipart.CompletedFileUpload file); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD) + @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") @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" }) @@ -47,7 +39,7 @@ Multipart mediatypeConsumesMultipartWithoutFileUpload( @io.micronaut.http.annotation.Part(value = "userId") java.lang.Integer userId); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_OCTET_STREAM) + @io.micronaut.http.annotation.Post("/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" }) @@ -56,7 +48,7 @@ StringModel mediatypeConsumesOctetStream( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_PLAIN) + @io.micronaut.http.annotation.Post("/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" }) @@ -65,7 +57,7 @@ StringModel mediatypeConsumesPlain( @io.micronaut.http.annotation.Body java.lang.String body); - @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL) + @io.micronaut.http.annotation.Get("/mediatype/produces-with-different-model") @io.micronaut.http.annotation.Produces({ "application/json", "text/plain" }) io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.core.annotation.NonNull @@ -75,7 +67,7 @@ io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.http.annotation.QueryValue(value = "plain") java.lang.Boolean plain); - @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_SAME_MODEL) + @io.micronaut.http.annotation.Get("/mediatype/produces-with-same-model") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json", "application/xml" }) StringModel mediatypeProducesSameModel( diff --git a/gen/main/java/testapi/nogeneric/Multipart.java b/gen/main/java/testapi/nogeneric/Multipart.java index c57cb48e..4bab48d5 100644 --- a/gen/main/java/testapi/nogeneric/Multipart.java +++ b/gen/main/java/testapi/nogeneric/Multipart.java @@ -4,24 +4,19 @@ @io.micronaut.serde.annotation.Serdeable public class Multipart { - public static final java.lang.String JSON_PROPERTY_ORDER_ID = "orderId"; - public static final java.lang.String JSON_PROPERTY_USER_ID = "userId"; - public static final java.lang.String JSON_PROPERTY_FILE_NAME = "fileName"; - public static final java.lang.String JSON_PROPERTY_FILE = "file"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ORDER_ID) + @com.fasterxml.jackson.annotation.JsonProperty("orderId") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer orderId; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_USER_ID) + @com.fasterxml.jackson.annotation.JsonProperty("userId") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer userId; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FILE_NAME) + @com.fasterxml.jackson.annotation.JsonProperty("fileName") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String fileName; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FILE) + @com.fasterxml.jackson.annotation.JsonProperty("file") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private byte[] file; diff --git a/gen/main/java/testapi/nogeneric/NumberModel.java b/gen/main/java/testapi/nogeneric/NumberModel.java index ab44d478..60c9302b 100644 --- a/gen/main/java/testapi/nogeneric/NumberModel.java +++ b/gen/main/java/testapi/nogeneric/NumberModel.java @@ -4,9 +4,7 @@ @io.micronaut.serde.annotation.Serdeable public class NumberModel { - public static final java.lang.String JSON_PROPERTY_BAR = "bar"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BAR) + @com.fasterxml.jackson.annotation.JsonProperty("bar") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Double bar; diff --git a/gen/main/java/testapi/nogeneric/ParameterApi.java b/gen/main/java/testapi/nogeneric/ParameterApi.java index 0b58d201..41da22d0 100644 --- a/gen/main/java/testapi/nogeneric/ParameterApi.java +++ b/gen/main/java/testapi/nogeneric/ParameterApi.java @@ -4,38 +4,7 @@ @io.micronaut.validation.Validated public interface ParameterApi { - java.lang.String PATH_PARAM_ALL = "/param/all/{path}"; - java.lang.String PATH_PARAM_BODY_OPTIONAL = "/param/body/optional"; - java.lang.String PATH_PARAM_BODY_REQUIRED = "/param/body/required"; - java.lang.String PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT = "/param/cookie/optionalWithDefault"; - java.lang.String PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT = "/param/cookie/optionalWithoutDefault"; - java.lang.String PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT = "/param/cookie/requiredWithDefault"; - java.lang.String PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT = "/param/cookie/requiredWithoutDefault"; - java.lang.String PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT = "/param/header/optionalWithDefault"; - 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: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: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"; - 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"; - java.lang.String PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT = "/param/query/requiredWithDefault"; - 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(PATH_PARAM_ALL) + @io.micronaut.http.annotation.Get("/param/all/{path}") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramAll( @@ -52,7 +21,7 @@ ParameterModel paramAll( @io.micronaut.http.annotation.Header(value = "integer") java.util.Optional integer); - @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_OPTIONAL) + @io.micronaut.http.annotation.Post("/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 +31,7 @@ ParameterModel paramBodyOptional( @jakarta.validation.Valid java.util.Optional parameterModel); - @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_REQUIRED) + @io.micronaut.http.annotation.Post("/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 +41,7 @@ ParameterModel paramBodyRequired( @jakarta.validation.Valid ParameterModel parameterModel); - @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/optionalWithDefault") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramCookieOptionalWithDefault( @@ -80,7 +49,7 @@ ParameterModel paramCookieOptionalWithDefault( @io.micronaut.http.annotation.CookieValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/optionalWithoutDefault") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramCookieOptionalWithoutDefault( @@ -88,7 +57,7 @@ ParameterModel paramCookieOptionalWithoutDefault( @io.micronaut.http.annotation.CookieValue(value = "string") java.util.Optional string); - @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/requiredWithDefault") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramCookieRequiredWithDefault( @@ -96,7 +65,7 @@ ParameterModel paramCookieRequiredWithDefault( @io.micronaut.http.annotation.CookieValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/requiredWithoutDefault") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramCookieRequiredWithoutDefault( @@ -104,7 +73,7 @@ ParameterModel paramCookieRequiredWithoutDefault( @io.micronaut.http.annotation.CookieValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/optionalWithDefault") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramHeaderOptionalWithDefault( @@ -112,7 +81,7 @@ ParameterModel paramHeaderOptionalWithDefault( @io.micronaut.http.annotation.Header(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/optionalWithoutDefault") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramHeaderOptionalWithoutDefault( @@ -120,7 +89,7 @@ ParameterModel paramHeaderOptionalWithoutDefault( @io.micronaut.http.annotation.Header(value = "string") java.util.Optional string); - @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/requiredWithDefault") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramHeaderRequiredWithDefault( @@ -128,7 +97,7 @@ ParameterModel paramHeaderRequiredWithDefault( @io.micronaut.http.annotation.Header(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/requiredWithoutDefault") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramHeaderRequiredWithoutDefault( @@ -136,7 +105,7 @@ ParameterModel paramHeaderRequiredWithoutDefault( @io.micronaut.http.annotation.Header(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_STRING) + @io.micronaut.http.annotation.Get("/param/path/overlay/{string:10}") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramPathOverlayWithString( @@ -145,7 +114,7 @@ ParameterModel paramPathOverlayWithString( @jakarta.validation.constraints.Size(max = 10) java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_UUID) + @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.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramPathOverlayWithUuid( @@ -153,7 +122,7 @@ ParameterModel paramPathOverlayWithUuid( @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/path/requiredWithDefault/{string}") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramPathRequiredWithDefault( @@ -161,7 +130,7 @@ ParameterModel paramPathRequiredWithDefault( @io.micronaut.http.annotation.PathVariable(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/path/requiredWithoutDefault/{string}") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramPathRequiredWithoutDefault( @@ -169,7 +138,7 @@ ParameterModel paramPathRequiredWithoutDefault( @io.micronaut.http.annotation.PathVariable(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_BOOLEAN) + @io.micronaut.http.annotation.Get("/param/path/with-bool/{bool:true|false}") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramPathWithBoolean( @@ -177,7 +146,7 @@ ParameterModel paramPathWithBoolean( @io.micronaut.http.annotation.PathVariable(value = "bool") java.lang.Boolean bool); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_INTEGER) + @io.micronaut.http.annotation.Get("/param/path/with-integer/{integer:\\-?[0-9]+}") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramPathWithInteger( @@ -185,7 +154,7 @@ ParameterModel paramPathWithInteger( @io.micronaut.http.annotation.PathVariable(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_LONG) + @io.micronaut.http.annotation.Get("/param/path/with-long/{long:\\-?[0-9]+}") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramPathWithLong( @@ -193,7 +162,7 @@ ParameterModel paramPathWithLong( @io.micronaut.http.annotation.PathVariable(value = "long") java.lang.Long _long); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_MAX_LENGTH) + @io.micronaut.http.annotation.Get("/param/path/with-max-length/{string:5}") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramPathWithMaxLength( @@ -202,7 +171,7 @@ ParameterModel paramPathWithMaxLength( @jakarta.validation.constraints.Size(max = 5) java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_PATTERN) + @io.micronaut.http.annotation.Get("/param/path/with-pattern/{string:[0-9][a-z]}") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramPathWithPattern( @@ -211,7 +180,7 @@ ParameterModel paramPathWithPattern( @jakarta.validation.constraints.Pattern(regexp = "[0-9][a-z]") java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_UUID) + @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.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramPathWithUuid( @@ -219,7 +188,7 @@ ParameterModel paramPathWithUuid( @io.micronaut.http.annotation.PathVariable(value = "uuid") java.util.UUID uuid); - @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE) + @io.micronaut.http.annotation.Get("/param/query/date") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramQueryDate( @@ -227,7 +196,7 @@ ParameterModel paramQueryDate( @io.micronaut.http.annotation.QueryValue(value = "date") java.util.Optional date); - @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_DATE_TIME) + @io.micronaut.http.annotation.Get("/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 +204,7 @@ ParameterModel paramQueryDateTime( @io.micronaut.http.annotation.QueryValue(value = "date") java.util.Optional date); - @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_MULTIPLE_LISTS) + @io.micronaut.http.annotation.Get("/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 +218,7 @@ ParameterModel paramQueryMultipleLists( @io.micronaut.http.annotation.QueryValue java.util.Optional> c); - @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_NUMBER) + @io.micronaut.http.annotation.Get("/param/query/number") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramQueryNumber( @@ -257,7 +226,7 @@ ParameterModel paramQueryNumber( @io.micronaut.http.annotation.QueryValue(value = "date") java.util.Optional date); - @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/optionalWithDefault") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramQueryOptionalWithDefault( @@ -265,7 +234,7 @@ ParameterModel paramQueryOptionalWithDefault( @io.micronaut.http.annotation.QueryValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/optionalWithoutDefault") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramQueryOptionalWithoutDefault( @@ -273,7 +242,7 @@ ParameterModel paramQueryOptionalWithoutDefault( @io.micronaut.http.annotation.QueryValue(value = "string") java.util.Optional string); - @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/requiredWithDefault") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramQueryRequiredWithDefault( @@ -281,7 +250,7 @@ ParameterModel paramQueryRequiredWithDefault( @io.micronaut.http.annotation.QueryValue(value = "string", defaultValue = "this-is-default") java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/requiredWithoutDefault") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramQueryRequiredWithoutDefault( @@ -289,7 +258,7 @@ ParameterModel paramQueryRequiredWithoutDefault( @io.micronaut.http.annotation.QueryValue(value = "string") java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_UUID) + @io.micronaut.http.annotation.Get("/param/query/uuid") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) ParameterModel paramQueryUuid( diff --git a/gen/main/java/testapi/nogeneric/ParameterModel.java b/gen/main/java/testapi/nogeneric/ParameterModel.java index fbd0bb95..24ef743e 100644 --- a/gen/main/java/testapi/nogeneric/ParameterModel.java +++ b/gen/main/java/testapi/nogeneric/ParameterModel.java @@ -4,54 +4,43 @@ @io.micronaut.serde.annotation.Serdeable public class ParameterModel { - public static final java.lang.String JSON_PROPERTY_BOOL = "bool"; - public static final java.lang.String JSON_PROPERTY_STRING = "string"; - public static final java.lang.String JSON_PROPERTY_NUMBER = "number"; - public static final java.lang.String JSON_PROPERTY_INTEGER = "integer"; - public static final java.lang.String JSON_PROPERTY_UUID = "uuid"; - public static final java.lang.String JSON_PROPERTY_DATE = "date"; - public static final java.lang.String JSON_PROPERTY_DATE_TIME = "dateTime"; - public static final java.lang.String JSON_PROPERTY_A = "a"; - public static final java.lang.String JSON_PROPERTY_B = "b"; - public static final java.lang.String JSON_PROPERTY_C = "c"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BOOL) + @com.fasterxml.jackson.annotation.JsonProperty("bool") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String bool; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_STRING) + @com.fasterxml.jackson.annotation.JsonProperty("string") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String string; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NUMBER) + @com.fasterxml.jackson.annotation.JsonProperty("number") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Double number; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_INTEGER) + @com.fasterxml.jackson.annotation.JsonProperty("integer") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer integer; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_UUID) + @com.fasterxml.jackson.annotation.JsonProperty("uuid") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.UUID uuid; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE) + @com.fasterxml.jackson.annotation.JsonProperty("date") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.time.LocalDate date; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE_TIME) + @com.fasterxml.jackson.annotation.JsonProperty("dateTime") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.time.Instant dateTime; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + @com.fasterxml.jackson.annotation.JsonProperty("a") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.List a; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_B) + @com.fasterxml.jackson.annotation.JsonProperty("b") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.List b; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_C) + @com.fasterxml.jackson.annotation.JsonProperty("c") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.List c; diff --git a/gen/main/java/testapi/nogeneric/RequestApi.java b/gen/main/java/testapi/nogeneric/RequestApi.java index 6d34f59c..441d19dc 100644 --- a/gen/main/java/testapi/nogeneric/RequestApi.java +++ b/gen/main/java/testapi/nogeneric/RequestApi.java @@ -4,9 +4,7 @@ @io.micronaut.validation.Validated public interface RequestApi { - java.lang.String PATH_NO_OPERATION_ID_GET = "/no-operation-id"; - - @io.micronaut.http.annotation.Get(PATH_NO_OPERATION_ID_GET) + @io.micronaut.http.annotation.Get("/no-operation-id") @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 b95d1a02..12def1fa 100644 --- a/gen/main/java/testapi/nogeneric/ResponseApi.java +++ b/gen/main/java/testapi/nogeneric/ResponseApi.java @@ -4,28 +4,12 @@ @io.micronaut.validation.Validated public interface ResponseApi { - java.lang.String PATH_ARRAY_COMPLEX = "/response/array-complex"; - java.lang.String PATH_ARRAY_COMPLEX_NOT_FOUND = "/response/array-complex-not-found"; - java.lang.String PATH_ARRAY_SIMPLE = "/response/array-simple"; - java.lang.String PATH_ARRAY_SIMPLE_EMPTY = "/response/array-simple-empty"; - java.lang.String PATH_ARRAY_SIMPLE_NOT_FOUND = "/response/array-simple-not-found"; - java.lang.String PATH_HEADER = "/response/header"; - java.lang.String PATH_MULTIPLE_DATA_TYPES = "/response/multiple-datatypes"; - java.lang.String PATH_MULTIPLE_DATA_TYPES_NOT_FOUND = "/response/multiple-datatypes-not-found"; - java.lang.String PATH_MULTIPLE_RESPONSE_CODES = "/response/multiple-response-codes"; - java.lang.String PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND = "/response/multiple-response-codes-not-found"; - java.lang.String PATH_OPTIONAL = "/response/optional"; - java.lang.String PATH_SINGLE = "/response/single"; - java.lang.String PATH_VOID_FOUND = "/response/void"; - java.lang.String PATH_VOID_NOT_FOUND = "/response/void-not-found"; - java.lang.String PATH_WITH_DEFAULT = "/response/default"; - - @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX) + @io.micronaut.http.annotation.Get("/response/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(PATH_ARRAY_COMPLEX_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/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 +17,17 @@ java.util.Optional> arrayComplexNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE) + @io.micronaut.http.annotation.Get("/response/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(PATH_ARRAY_SIMPLE_EMPTY) + @io.micronaut.http.annotation.Get("/response/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(PATH_ARRAY_SIMPLE_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/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 +35,17 @@ java.util.Optional> arraySimpleNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get(PATH_HEADER) + @io.micronaut.http.annotation.Get("/response/header") io.micronaut.http.HttpResponse header(); - @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES) + @io.micronaut.http.annotation.Get("/response/multiple-datatypes") @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(PATH_MULTIPLE_DATA_TYPES_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/multiple-datatypes-not-found") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.core.annotation.NonNull @@ -71,14 +55,14 @@ io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES) + @io.micronaut.http.annotation.Get("/response/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(PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/multiple-response-codes-not-found") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.core.annotation.NonNull @@ -88,7 +72,7 @@ io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get(PATH_OPTIONAL) + @io.micronaut.http.annotation.Get("/response/optional") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.OK) @io.micronaut.http.annotation.Produces({ "application/json" }) java.util.Optional optional( @@ -96,23 +80,23 @@ java.util.Optional optional( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get(PATH_SINGLE) + @io.micronaut.http.annotation.Get("/response/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(PATH_VOID_FOUND) + @io.micronaut.http.annotation.Get("/response/void") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void voidFound(); - @io.micronaut.http.annotation.Get(PATH_VOID_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/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(PATH_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/response/default") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void withDefault(); } diff --git a/gen/main/java/testapi/nogeneric/StringModel.java b/gen/main/java/testapi/nogeneric/StringModel.java index f656ab0a..0ca7b466 100644 --- a/gen/main/java/testapi/nogeneric/StringModel.java +++ b/gen/main/java/testapi/nogeneric/StringModel.java @@ -4,10 +4,8 @@ @io.micronaut.serde.annotation.Serdeable public class StringModel { - public static final java.lang.String JSON_PROPERTY_FOO = "foo"; - @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + @com.fasterxml.jackson.annotation.JsonProperty("foo") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.lang.String foo; diff --git a/gen/main/java/testapi/nogeneric/ValidationApi.java b/gen/main/java/testapi/nogeneric/ValidationApi.java index c9c3def1..99d79e49 100644 --- a/gen/main/java/testapi/nogeneric/ValidationApi.java +++ b/gen/main/java/testapi/nogeneric/ValidationApi.java @@ -4,29 +4,7 @@ @io.micronaut.validation.Validated public interface ValidationApi { - java.lang.String PATH_VALIDATION_DOUBLE_MAX = "/validation/double/max"; - java.lang.String PATH_VALIDATION_DOUBLE_MIN = "/validation/double/min"; - java.lang.String PATH_VALIDATION_DOUBLE_RANGE = "/validation/double/range"; - java.lang.String PATH_VALIDATION_FLOAT_MAX = "/validation/float/max"; - java.lang.String PATH_VALIDATION_FLOAT_MIN = "/validation/float/min"; - java.lang.String PATH_VALIDATION_FLOAT_RANGE = "/validation/float/range"; - 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_MODEL = "/validation/list/model"; - java.lang.String PATH_VALIDATION_LIST_RANGE = "/validation/list/range"; - 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"; - java.lang.String PATH_VALIDATION_MODEL = "/validation/model"; - java.lang.String PATH_VALIDATION_STRING_MAX = "/validation/string/max"; - java.lang.String PATH_VALIDATION_STRING_MIN = "/validation/string/min"; - 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(PATH_VALIDATION_DOUBLE_MAX) + @io.micronaut.http.annotation.Get("/validation/double/max") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationDoubleMax( @io.micronaut.core.annotation.NonNull @@ -34,7 +12,7 @@ void validationDoubleMax( @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = false) java.lang.Double number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MIN) + @io.micronaut.http.annotation.Get("/validation/double/min") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationDoubleMin( @io.micronaut.core.annotation.NonNull @@ -42,7 +20,7 @@ void validationDoubleMin( @jakarta.validation.constraints.DecimalMin(value = "3", inclusive = false) java.lang.Double number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_RANGE) + @io.micronaut.http.annotation.Get("/validation/double/range") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationDoubleRange( @io.micronaut.core.annotation.NonNull @@ -51,7 +29,7 @@ void validationDoubleRange( @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = true) java.lang.Double number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MAX) + @io.micronaut.http.annotation.Get("/validation/float/max") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationFloatMax( @io.micronaut.core.annotation.NonNull @@ -59,7 +37,7 @@ void validationFloatMax( @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = false) java.lang.Float number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MIN) + @io.micronaut.http.annotation.Get("/validation/float/min") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationFloatMin( @io.micronaut.core.annotation.NonNull @@ -67,7 +45,7 @@ void validationFloatMin( @jakarta.validation.constraints.DecimalMin(value = "3", inclusive = false) java.lang.Float number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_RANGE) + @io.micronaut.http.annotation.Get("/validation/float/range") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationFloatRange( @io.micronaut.core.annotation.NonNull @@ -76,7 +54,7 @@ void validationFloatRange( @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = true) java.lang.Float number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MAX) + @io.micronaut.http.annotation.Get("/validation/integer/max") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationIntegerMax( @io.micronaut.core.annotation.NonNull @@ -84,7 +62,7 @@ void validationIntegerMax( @jakarta.validation.constraints.Max(4) java.lang.Integer integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MIN) + @io.micronaut.http.annotation.Get("/validation/integer/min") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationIntegerMin( @io.micronaut.core.annotation.NonNull @@ -92,7 +70,7 @@ void validationIntegerMin( @jakarta.validation.constraints.Min(3) java.lang.Integer integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_RANGE) + @io.micronaut.http.annotation.Get("/validation/integer/range") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationIntegerRange( @io.micronaut.core.annotation.NonNull @@ -101,7 +79,7 @@ void validationIntegerRange( @jakarta.validation.constraints.Max(4) java.lang.Integer integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MAX) + @io.micronaut.http.annotation.Get("/validation/list/max") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationListMax( @io.micronaut.core.annotation.NonNull @@ -109,7 +87,7 @@ void validationListMax( @jakarta.validation.constraints.Size(max = 4) java.util.List list); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MIN) + @io.micronaut.http.annotation.Get("/validation/list/min") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationListMin( @io.micronaut.core.annotation.NonNull @@ -117,7 +95,7 @@ void validationListMin( @jakarta.validation.constraints.Size(min = 3) java.util.List list); - @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_MODEL) + @io.micronaut.http.annotation.Post("/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 +104,7 @@ void validationListModel( @jakarta.validation.Valid java.util.List stringModel); - @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_RANGE) + @io.micronaut.http.annotation.Post("/validation/list/range") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationListRange( @io.micronaut.core.annotation.NonNull @@ -134,7 +112,7 @@ void validationListRange( @jakarta.validation.constraints.Size(min = 3, max = 4) java.util.List list); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MAX) + @io.micronaut.http.annotation.Get("/validation/long/max") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationLongMax( @io.micronaut.core.annotation.NonNull @@ -142,7 +120,7 @@ void validationLongMax( @jakarta.validation.constraints.Max(4) java.lang.Long integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MIN) + @io.micronaut.http.annotation.Get("/validation/long/min") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationLongMin( @io.micronaut.core.annotation.NonNull @@ -150,7 +128,7 @@ void validationLongMin( @jakarta.validation.constraints.Min(3) java.lang.Long integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_RANGE) + @io.micronaut.http.annotation.Get("/validation/long/range") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationLongRange( @io.micronaut.core.annotation.NonNull @@ -159,7 +137,7 @@ void validationLongRange( @jakarta.validation.constraints.Max(4) java.lang.Long integer); - @io.micronaut.http.annotation.Post(PATH_VALIDATION_MODEL) + @io.micronaut.http.annotation.Post("/validation/model") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) @io.micronaut.http.annotation.Consumes({ "application/json" }) void validationModel( @@ -168,7 +146,7 @@ void validationModel( @jakarta.validation.Valid StringModel stringModel); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MAX) + @io.micronaut.http.annotation.Get("/validation/string/max") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationStringMax( @io.micronaut.core.annotation.NonNull @@ -176,7 +154,7 @@ void validationStringMax( @jakarta.validation.constraints.Size(max = 4) java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MIN) + @io.micronaut.http.annotation.Get("/validation/string/min") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationStringMin( @io.micronaut.core.annotation.NonNull @@ -184,7 +162,7 @@ void validationStringMin( @jakarta.validation.constraints.Size(min = 3) java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_PATTERN) + @io.micronaut.http.annotation.Get("/validation/string/pattern") @io.micronaut.http.annotation.Status(io.micronaut.http.HttpStatus.NO_CONTENT) void validationStringPattern( @io.micronaut.core.annotation.NonNull @@ -192,7 +170,7 @@ void validationStringPattern( @jakarta.validation.constraints.Pattern(regexp = "[a-z]{3,5}") java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_RANGE) + @io.micronaut.http.annotation.Get("/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 3ff7017e..8fc24a68 100644 --- a/gen/main/java/testapi/nooptional/MediatypeApi.java +++ b/gen/main/java/testapi/nooptional/MediatypeApi.java @@ -4,15 +4,7 @@ @io.micronaut.validation.Validated public interface MediatypeApi { - java.lang.String PATH_MEDIATYPE_CONSUMES_AND_PRODUCES = "/mediatype/consumes-and-produces"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD = "/mediatype/consumes-multipart-with-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_OCTET_STREAM = "/mediatype/consumes-octet-stream"; - java.lang.String PATH_MEDIATYPE_CONSUMES_PLAIN = "/mediatype/consumes-plain"; - java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; - java.lang.String PATH_MEDIATYPE_PRODUCES_SAME_MODEL = "/mediatype/produces-with-same-model"; - - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_AND_PRODUCES) + @io.micronaut.http.annotation.Post("/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 +12,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesAndProduces( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD) + @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-with-fileupload") @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUpload( @@ -33,7 +25,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUplo @io.micronaut.core.annotation.NonNull io.micronaut.http.multipart.CompletedFileUpload file); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD) + @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( @@ -44,7 +36,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileU @io.micronaut.http.annotation.Part(value = "userId") java.lang.Integer userId); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_OCTET_STREAM) + @io.micronaut.http.annotation.Post("/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 +44,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesOctetStream( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_PLAIN) + @io.micronaut.http.annotation.Post("/mediatype/consumes-plain") @io.micronaut.http.annotation.Consumes({ "text/plain" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesPlain( @@ -60,7 +52,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesPlain( @io.micronaut.http.annotation.Body java.lang.String body); - @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL) + @io.micronaut.http.annotation.Get("/mediatype/produces-with-different-model") @io.micronaut.http.annotation.Produces({ "application/json", "text/plain" }) io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.core.annotation.NonNull @@ -70,7 +62,7 @@ io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.http.annotation.QueryValue(value = "plain") java.lang.Boolean plain); - @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_SAME_MODEL) + @io.micronaut.http.annotation.Get("/mediatype/produces-with-same-model") @io.micronaut.http.annotation.Produces({ "application/json", "application/xml" }) io.micronaut.http.HttpResponse mediatypeProducesSameModel( @io.micronaut.core.annotation.NonNull diff --git a/gen/main/java/testapi/nooptional/Multipart.java b/gen/main/java/testapi/nooptional/Multipart.java index ea3a5e7e..2bc652ab 100644 --- a/gen/main/java/testapi/nooptional/Multipart.java +++ b/gen/main/java/testapi/nooptional/Multipart.java @@ -4,24 +4,19 @@ @io.micronaut.serde.annotation.Serdeable public class Multipart { - public static final java.lang.String JSON_PROPERTY_ORDER_ID = "orderId"; - public static final java.lang.String JSON_PROPERTY_USER_ID = "userId"; - public static final java.lang.String JSON_PROPERTY_FILE_NAME = "fileName"; - public static final java.lang.String JSON_PROPERTY_FILE = "file"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ORDER_ID) + @com.fasterxml.jackson.annotation.JsonProperty("orderId") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer orderId; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_USER_ID) + @com.fasterxml.jackson.annotation.JsonProperty("userId") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer userId; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FILE_NAME) + @com.fasterxml.jackson.annotation.JsonProperty("fileName") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String fileName; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FILE) + @com.fasterxml.jackson.annotation.JsonProperty("file") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private byte[] file; diff --git a/gen/main/java/testapi/nooptional/NumberModel.java b/gen/main/java/testapi/nooptional/NumberModel.java index 4a34d183..9984d071 100644 --- a/gen/main/java/testapi/nooptional/NumberModel.java +++ b/gen/main/java/testapi/nooptional/NumberModel.java @@ -4,9 +4,7 @@ @io.micronaut.serde.annotation.Serdeable public class NumberModel { - public static final java.lang.String JSON_PROPERTY_BAR = "bar"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BAR) + @com.fasterxml.jackson.annotation.JsonProperty("bar") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Double bar; diff --git a/gen/main/java/testapi/nooptional/ParameterApi.java b/gen/main/java/testapi/nooptional/ParameterApi.java index 15fcb2f9..488ef101 100644 --- a/gen/main/java/testapi/nooptional/ParameterApi.java +++ b/gen/main/java/testapi/nooptional/ParameterApi.java @@ -4,38 +4,7 @@ @io.micronaut.validation.Validated public interface ParameterApi { - java.lang.String PATH_PARAM_ALL = "/param/all/{path}"; - java.lang.String PATH_PARAM_BODY_OPTIONAL = "/param/body/optional"; - java.lang.String PATH_PARAM_BODY_REQUIRED = "/param/body/required"; - java.lang.String PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT = "/param/cookie/optionalWithDefault"; - java.lang.String PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT = "/param/cookie/optionalWithoutDefault"; - java.lang.String PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT = "/param/cookie/requiredWithDefault"; - java.lang.String PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT = "/param/cookie/requiredWithoutDefault"; - java.lang.String PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT = "/param/header/optionalWithDefault"; - 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: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: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"; - 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"; - java.lang.String PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT = "/param/query/requiredWithDefault"; - 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(PATH_PARAM_ALL) + @io.micronaut.http.annotation.Get("/param/all/{path}") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramAll( @io.micronaut.core.annotation.NonNull @@ -51,7 +20,7 @@ io.micronaut.http.HttpResponse paramAll( @io.micronaut.http.annotation.Header(value = "integer") java.lang.Integer integer); - @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_OPTIONAL) + @io.micronaut.http.annotation.Post("/param/body/optional") @io.micronaut.http.annotation.Consumes({ "application/json" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramBodyOptional( @@ -60,7 +29,7 @@ io.micronaut.http.HttpResponse paramBodyOptional( @jakarta.validation.Valid ParameterModel parameterModel); - @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_REQUIRED) + @io.micronaut.http.annotation.Post("/param/body/required") @io.micronaut.http.annotation.Consumes({ "application/json" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramBodyRequired( @@ -69,63 +38,63 @@ io.micronaut.http.HttpResponse paramBodyRequired( @jakarta.validation.Valid ParameterModel parameterModel); - @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/optionalWithDefault") @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(PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/optionalWithoutDefault") @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(PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/requiredWithDefault") @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(PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/requiredWithoutDefault") @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(PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/optionalWithDefault") @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(PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/optionalWithoutDefault") @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(PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/requiredWithDefault") @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(PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/requiredWithoutDefault") @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(PATH_PARAM_PATH_OVERLAY_WITH_STRING) + @io.micronaut.http.annotation.Get("/param/path/overlay/{string:10}") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathOverlayWithString( @io.micronaut.core.annotation.NonNull @@ -133,49 +102,49 @@ io.micronaut.http.HttpResponse paramPathOverlayWithString( @jakarta.validation.constraints.Size(max = 10) java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_UUID) + @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.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(PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/path/requiredWithDefault/{string}") @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(PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/path/requiredWithoutDefault/{string}") @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(PATH_PARAM_PATH_WITH_BOOLEAN) + @io.micronaut.http.annotation.Get("/param/path/with-bool/{bool:true|false}") @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(PATH_PARAM_PATH_WITH_INTEGER) + @io.micronaut.http.annotation.Get("/param/path/with-integer/{integer:\\-?[0-9]+}") @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(PATH_PARAM_PATH_WITH_LONG) + @io.micronaut.http.annotation.Get("/param/path/with-long/{long:\\-?[0-9]+}") @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(PATH_PARAM_PATH_WITH_MAX_LENGTH) + @io.micronaut.http.annotation.Get("/param/path/with-max-length/{string:5}") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithMaxLength( @io.micronaut.core.annotation.NonNull @@ -183,7 +152,7 @@ io.micronaut.http.HttpResponse paramPathWithMaxLength( @jakarta.validation.constraints.Size(max = 5) java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_PATTERN) + @io.micronaut.http.annotation.Get("/param/path/with-pattern/{string:[0-9][a-z]}") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithPattern( @io.micronaut.core.annotation.NonNull @@ -191,28 +160,28 @@ io.micronaut.http.HttpResponse paramPathWithPattern( @jakarta.validation.constraints.Pattern(regexp = "[0-9][a-z]") java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_UUID) + @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.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(PATH_PARAM_QUERY_DATE) + @io.micronaut.http.annotation.Get("/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(PATH_PARAM_QUERY_DATE_TIME) + @io.micronaut.http.annotation.Get("/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(PATH_PARAM_QUERY_MULTIPLE_LISTS) + @io.micronaut.http.annotation.Get("/param/query/multiple-lists") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.core.annotation.Nullable @@ -225,42 +194,42 @@ io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.http.annotation.QueryValue java.util.List c); - @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_NUMBER) + @io.micronaut.http.annotation.Get("/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(PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/optionalWithDefault") @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(PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/optionalWithoutDefault") @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(PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/requiredWithDefault") @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(PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/requiredWithoutDefault") @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(PATH_PARAM_QUERY_UUID) + @io.micronaut.http.annotation.Get("/param/query/uuid") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryUuid( @io.micronaut.core.annotation.Nullable diff --git a/gen/main/java/testapi/nooptional/ParameterModel.java b/gen/main/java/testapi/nooptional/ParameterModel.java index 11044cf4..c5fc53e5 100644 --- a/gen/main/java/testapi/nooptional/ParameterModel.java +++ b/gen/main/java/testapi/nooptional/ParameterModel.java @@ -4,54 +4,43 @@ @io.micronaut.serde.annotation.Serdeable public class ParameterModel { - public static final java.lang.String JSON_PROPERTY_BOOL = "bool"; - public static final java.lang.String JSON_PROPERTY_STRING = "string"; - public static final java.lang.String JSON_PROPERTY_NUMBER = "number"; - public static final java.lang.String JSON_PROPERTY_INTEGER = "integer"; - public static final java.lang.String JSON_PROPERTY_UUID = "uuid"; - public static final java.lang.String JSON_PROPERTY_DATE = "date"; - public static final java.lang.String JSON_PROPERTY_DATE_TIME = "dateTime"; - public static final java.lang.String JSON_PROPERTY_A = "a"; - public static final java.lang.String JSON_PROPERTY_B = "b"; - public static final java.lang.String JSON_PROPERTY_C = "c"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BOOL) + @com.fasterxml.jackson.annotation.JsonProperty("bool") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String bool; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_STRING) + @com.fasterxml.jackson.annotation.JsonProperty("string") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String string; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NUMBER) + @com.fasterxml.jackson.annotation.JsonProperty("number") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Double number; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_INTEGER) + @com.fasterxml.jackson.annotation.JsonProperty("integer") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer integer; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_UUID) + @com.fasterxml.jackson.annotation.JsonProperty("uuid") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.UUID uuid; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE) + @com.fasterxml.jackson.annotation.JsonProperty("date") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.time.LocalDate date; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE_TIME) + @com.fasterxml.jackson.annotation.JsonProperty("dateTime") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.time.Instant dateTime; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + @com.fasterxml.jackson.annotation.JsonProperty("a") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.List a; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_B) + @com.fasterxml.jackson.annotation.JsonProperty("b") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.List b; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_C) + @com.fasterxml.jackson.annotation.JsonProperty("c") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.List c; diff --git a/gen/main/java/testapi/nooptional/RequestApi.java b/gen/main/java/testapi/nooptional/RequestApi.java index f3adcd97..4c95272e 100644 --- a/gen/main/java/testapi/nooptional/RequestApi.java +++ b/gen/main/java/testapi/nooptional/RequestApi.java @@ -4,8 +4,6 @@ @io.micronaut.validation.Validated public interface RequestApi { - java.lang.String PATH_NO_OPERATION_ID_GET = "/no-operation-id"; - - @io.micronaut.http.annotation.Get(PATH_NO_OPERATION_ID_GET) + @io.micronaut.http.annotation.Get("/no-operation-id") io.micronaut.http.HttpResponse noOperationIdGet(); } diff --git a/gen/main/java/testapi/nooptional/ResponseApi.java b/gen/main/java/testapi/nooptional/ResponseApi.java index 00164d5f..ea33cec3 100644 --- a/gen/main/java/testapi/nooptional/ResponseApi.java +++ b/gen/main/java/testapi/nooptional/ResponseApi.java @@ -4,59 +4,43 @@ @io.micronaut.validation.Validated public interface ResponseApi { - java.lang.String PATH_ARRAY_COMPLEX = "/response/array-complex"; - java.lang.String PATH_ARRAY_COMPLEX_NOT_FOUND = "/response/array-complex-not-found"; - java.lang.String PATH_ARRAY_SIMPLE = "/response/array-simple"; - java.lang.String PATH_ARRAY_SIMPLE_EMPTY = "/response/array-simple-empty"; - java.lang.String PATH_ARRAY_SIMPLE_NOT_FOUND = "/response/array-simple-not-found"; - java.lang.String PATH_HEADER = "/response/header"; - java.lang.String PATH_MULTIPLE_DATA_TYPES = "/response/multiple-datatypes"; - java.lang.String PATH_MULTIPLE_DATA_TYPES_NOT_FOUND = "/response/multiple-datatypes-not-found"; - java.lang.String PATH_MULTIPLE_RESPONSE_CODES = "/response/multiple-response-codes"; - java.lang.String PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND = "/response/multiple-response-codes-not-found"; - java.lang.String PATH_OPTIONAL = "/response/optional"; - java.lang.String PATH_SINGLE = "/response/single"; - java.lang.String PATH_VOID_FOUND = "/response/void"; - java.lang.String PATH_VOID_NOT_FOUND = "/response/void-not-found"; - java.lang.String PATH_WITH_DEFAULT = "/response/default"; - - @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX) + @io.micronaut.http.annotation.Get("/response/array-complex") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arrayComplex(); - @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/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(PATH_ARRAY_SIMPLE) + @io.micronaut.http.annotation.Get("/response/array-simple") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arraySimple(); - @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_EMPTY) + @io.micronaut.http.annotation.Get("/response/array-simple-empty") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arraySimpleEmpty(); - @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/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(PATH_HEADER) + @io.micronaut.http.annotation.Get("/response/header") io.micronaut.http.HttpResponse header(); - @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES) + @io.micronaut.http.annotation.Get("/response/multiple-datatypes") @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(PATH_MULTIPLE_DATA_TYPES_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/multiple-datatypes-not-found") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.core.annotation.NonNull @@ -66,14 +50,14 @@ io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES) + @io.micronaut.http.annotation.Get("/response/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(PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/multiple-response-codes-not-found") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.core.annotation.NonNull @@ -83,26 +67,26 @@ io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get(PATH_OPTIONAL) + @io.micronaut.http.annotation.Get("/response/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(PATH_SINGLE) + @io.micronaut.http.annotation.Get("/response/single") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse single(); - @io.micronaut.http.annotation.Get(PATH_VOID_FOUND) + @io.micronaut.http.annotation.Get("/response/void") io.micronaut.http.HttpResponse voidFound(); - @io.micronaut.http.annotation.Get(PATH_VOID_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/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(PATH_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/response/default") io.micronaut.http.HttpResponse withDefault(); } diff --git a/gen/main/java/testapi/nooptional/StringModel.java b/gen/main/java/testapi/nooptional/StringModel.java index eeb3e5bb..d01babaf 100644 --- a/gen/main/java/testapi/nooptional/StringModel.java +++ b/gen/main/java/testapi/nooptional/StringModel.java @@ -4,10 +4,8 @@ @io.micronaut.serde.annotation.Serdeable public class StringModel { - public static final java.lang.String JSON_PROPERTY_FOO = "foo"; - @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + @com.fasterxml.jackson.annotation.JsonProperty("foo") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.lang.String foo; diff --git a/gen/main/java/testapi/nooptional/ValidationApi.java b/gen/main/java/testapi/nooptional/ValidationApi.java index 2b916afd..d340ef54 100644 --- a/gen/main/java/testapi/nooptional/ValidationApi.java +++ b/gen/main/java/testapi/nooptional/ValidationApi.java @@ -4,43 +4,21 @@ @io.micronaut.validation.Validated public interface ValidationApi { - java.lang.String PATH_VALIDATION_DOUBLE_MAX = "/validation/double/max"; - java.lang.String PATH_VALIDATION_DOUBLE_MIN = "/validation/double/min"; - java.lang.String PATH_VALIDATION_DOUBLE_RANGE = "/validation/double/range"; - java.lang.String PATH_VALIDATION_FLOAT_MAX = "/validation/float/max"; - java.lang.String PATH_VALIDATION_FLOAT_MIN = "/validation/float/min"; - java.lang.String PATH_VALIDATION_FLOAT_RANGE = "/validation/float/range"; - 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_MODEL = "/validation/list/model"; - java.lang.String PATH_VALIDATION_LIST_RANGE = "/validation/list/range"; - 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"; - java.lang.String PATH_VALIDATION_MODEL = "/validation/model"; - java.lang.String PATH_VALIDATION_STRING_MAX = "/validation/string/max"; - java.lang.String PATH_VALIDATION_STRING_MIN = "/validation/string/min"; - 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(PATH_VALIDATION_DOUBLE_MAX) + @io.micronaut.http.annotation.Get("/validation/double/max") io.micronaut.http.HttpResponse validationDoubleMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = false) java.lang.Double number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MIN) + @io.micronaut.http.annotation.Get("/validation/double/min") io.micronaut.http.HttpResponse validationDoubleMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @jakarta.validation.constraints.DecimalMin(value = "3", inclusive = false) java.lang.Double number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_RANGE) + @io.micronaut.http.annotation.Get("/validation/double/range") io.micronaut.http.HttpResponse validationDoubleRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @@ -48,21 +26,21 @@ io.micronaut.http.HttpResponse validationDoubleRange( @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = true) java.lang.Double number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MAX) + @io.micronaut.http.annotation.Get("/validation/float/max") io.micronaut.http.HttpResponse validationFloatMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = false) java.lang.Float number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MIN) + @io.micronaut.http.annotation.Get("/validation/float/min") io.micronaut.http.HttpResponse validationFloatMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @jakarta.validation.constraints.DecimalMin(value = "3", inclusive = false) java.lang.Float number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_RANGE) + @io.micronaut.http.annotation.Get("/validation/float/range") io.micronaut.http.HttpResponse validationFloatRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @@ -70,21 +48,21 @@ io.micronaut.http.HttpResponse validationFloatRange( @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = true) java.lang.Float number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MAX) + @io.micronaut.http.annotation.Get("/validation/integer/max") io.micronaut.http.HttpResponse validationIntegerMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @jakarta.validation.constraints.Max(4) java.lang.Integer integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MIN) + @io.micronaut.http.annotation.Get("/validation/integer/min") io.micronaut.http.HttpResponse validationIntegerMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @jakarta.validation.constraints.Min(3) java.lang.Integer integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_RANGE) + @io.micronaut.http.annotation.Get("/validation/integer/range") io.micronaut.http.HttpResponse validationIntegerRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @@ -92,21 +70,21 @@ io.micronaut.http.HttpResponse validationIntegerRange( @jakarta.validation.constraints.Max(4) java.lang.Integer integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MAX) + @io.micronaut.http.annotation.Get("/validation/list/max") io.micronaut.http.HttpResponse validationListMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @jakarta.validation.constraints.Size(max = 4) java.util.List list); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MIN) + @io.micronaut.http.annotation.Get("/validation/list/min") io.micronaut.http.HttpResponse validationListMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @jakarta.validation.constraints.Size(min = 3) java.util.List list); - @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_MODEL) + @io.micronaut.http.annotation.Post("/validation/list/model") @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse validationListModel( @io.micronaut.core.annotation.NonNull @@ -114,28 +92,28 @@ io.micronaut.http.HttpResponse validationListModel( @jakarta.validation.Valid java.util.List stringModel); - @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_RANGE) + @io.micronaut.http.annotation.Post("/validation/list/range") io.micronaut.http.HttpResponse validationListRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @jakarta.validation.constraints.Size(min = 3, max = 4) java.util.List list); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MAX) + @io.micronaut.http.annotation.Get("/validation/long/max") io.micronaut.http.HttpResponse validationLongMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @jakarta.validation.constraints.Max(4) java.lang.Long integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MIN) + @io.micronaut.http.annotation.Get("/validation/long/min") io.micronaut.http.HttpResponse validationLongMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @jakarta.validation.constraints.Min(3) java.lang.Long integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_RANGE) + @io.micronaut.http.annotation.Get("/validation/long/range") io.micronaut.http.HttpResponse validationLongRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @@ -143,7 +121,7 @@ io.micronaut.http.HttpResponse validationLongRange( @jakarta.validation.constraints.Max(4) java.lang.Long integer); - @io.micronaut.http.annotation.Post(PATH_VALIDATION_MODEL) + @io.micronaut.http.annotation.Post("/validation/model") @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse validationModel( @io.micronaut.core.annotation.NonNull @@ -151,28 +129,28 @@ io.micronaut.http.HttpResponse validationModel( @jakarta.validation.Valid StringModel stringModel); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MAX) + @io.micronaut.http.annotation.Get("/validation/string/max") io.micronaut.http.HttpResponse validationStringMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @jakarta.validation.constraints.Size(max = 4) java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MIN) + @io.micronaut.http.annotation.Get("/validation/string/min") io.micronaut.http.HttpResponse validationStringMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @jakarta.validation.constraints.Size(min = 3) java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_PATTERN) + @io.micronaut.http.annotation.Get("/validation/string/pattern") io.micronaut.http.HttpResponse validationStringPattern( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @jakarta.validation.constraints.Pattern(regexp = "[a-z]{3,5}") java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_RANGE) + @io.micronaut.http.annotation.Get("/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 deb21994..b4275d22 100644 --- a/gen/main/java/testapi/novalidation/MediatypeApi.java +++ b/gen/main/java/testapi/novalidation/MediatypeApi.java @@ -3,15 +3,7 @@ @jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") public interface MediatypeApi { - java.lang.String PATH_MEDIATYPE_CONSUMES_AND_PRODUCES = "/mediatype/consumes-and-produces"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD = "/mediatype/consumes-multipart-with-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_OCTET_STREAM = "/mediatype/consumes-octet-stream"; - java.lang.String PATH_MEDIATYPE_CONSUMES_PLAIN = "/mediatype/consumes-plain"; - java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; - java.lang.String PATH_MEDIATYPE_PRODUCES_SAME_MODEL = "/mediatype/produces-with-same-model"; - - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_AND_PRODUCES) + @io.micronaut.http.annotation.Post("/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 +11,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesAndProduces( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD) + @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-with-fileupload") @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUpload( @@ -32,7 +24,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUplo @io.micronaut.core.annotation.NonNull io.micronaut.http.multipart.CompletedFileUpload file); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD) + @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( @@ -43,7 +35,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileU @io.micronaut.http.annotation.Part(value = "userId") java.lang.Integer userId); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_OCTET_STREAM) + @io.micronaut.http.annotation.Post("/mediatype/consumes-octet-stream") @io.micronaut.http.annotation.Consumes({ "application/octet-stream" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesOctetStream( @@ -51,7 +43,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesOctetStream( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_PLAIN) + @io.micronaut.http.annotation.Post("/mediatype/consumes-plain") @io.micronaut.http.annotation.Consumes({ "text/plain" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesPlain( @@ -59,7 +51,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesPlain( @io.micronaut.http.annotation.Body java.lang.String body); - @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL) + @io.micronaut.http.annotation.Get("/mediatype/produces-with-different-model") @io.micronaut.http.annotation.Produces({ "application/json", "text/plain" }) io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.core.annotation.NonNull @@ -69,7 +61,7 @@ io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.http.annotation.QueryValue(value = "plain") java.lang.Boolean plain); - @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_SAME_MODEL) + @io.micronaut.http.annotation.Get("/mediatype/produces-with-same-model") @io.micronaut.http.annotation.Produces({ "application/json", "application/xml" }) io.micronaut.http.HttpResponse mediatypeProducesSameModel( @io.micronaut.core.annotation.NonNull diff --git a/gen/main/java/testapi/novalidation/Multipart.java b/gen/main/java/testapi/novalidation/Multipart.java index 2904e601..405e155f 100644 --- a/gen/main/java/testapi/novalidation/Multipart.java +++ b/gen/main/java/testapi/novalidation/Multipart.java @@ -4,24 +4,19 @@ @io.micronaut.serde.annotation.Serdeable public class Multipart { - public static final java.lang.String JSON_PROPERTY_ORDER_ID = "orderId"; - public static final java.lang.String JSON_PROPERTY_USER_ID = "userId"; - public static final java.lang.String JSON_PROPERTY_FILE_NAME = "fileName"; - public static final java.lang.String JSON_PROPERTY_FILE = "file"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ORDER_ID) + @com.fasterxml.jackson.annotation.JsonProperty("orderId") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer orderId; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_USER_ID) + @com.fasterxml.jackson.annotation.JsonProperty("userId") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer userId; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FILE_NAME) + @com.fasterxml.jackson.annotation.JsonProperty("fileName") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String fileName; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FILE) + @com.fasterxml.jackson.annotation.JsonProperty("file") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private byte[] file; diff --git a/gen/main/java/testapi/novalidation/NumberModel.java b/gen/main/java/testapi/novalidation/NumberModel.java index 73e07226..e7baf094 100644 --- a/gen/main/java/testapi/novalidation/NumberModel.java +++ b/gen/main/java/testapi/novalidation/NumberModel.java @@ -4,9 +4,7 @@ @io.micronaut.serde.annotation.Serdeable public class NumberModel { - public static final java.lang.String JSON_PROPERTY_BAR = "bar"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BAR) + @com.fasterxml.jackson.annotation.JsonProperty("bar") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Double bar; diff --git a/gen/main/java/testapi/novalidation/ParameterApi.java b/gen/main/java/testapi/novalidation/ParameterApi.java index d9035ccb..a9c5301f 100644 --- a/gen/main/java/testapi/novalidation/ParameterApi.java +++ b/gen/main/java/testapi/novalidation/ParameterApi.java @@ -3,38 +3,7 @@ @jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") public interface ParameterApi { - java.lang.String PATH_PARAM_ALL = "/param/all/{path}"; - java.lang.String PATH_PARAM_BODY_OPTIONAL = "/param/body/optional"; - java.lang.String PATH_PARAM_BODY_REQUIRED = "/param/body/required"; - java.lang.String PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT = "/param/cookie/optionalWithDefault"; - java.lang.String PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT = "/param/cookie/optionalWithoutDefault"; - java.lang.String PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT = "/param/cookie/requiredWithDefault"; - java.lang.String PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT = "/param/cookie/requiredWithoutDefault"; - java.lang.String PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT = "/param/header/optionalWithDefault"; - 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: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: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"; - 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"; - java.lang.String PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT = "/param/query/requiredWithDefault"; - 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(PATH_PARAM_ALL) + @io.micronaut.http.annotation.Get("/param/all/{path}") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramAll( @io.micronaut.core.annotation.NonNull @@ -50,7 +19,7 @@ io.micronaut.http.HttpResponse paramAll( @io.micronaut.http.annotation.Header(value = "integer") java.util.Optional integer); - @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_OPTIONAL) + @io.micronaut.http.annotation.Post("/param/body/optional") @io.micronaut.http.annotation.Consumes({ "application/json" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramBodyOptional( @@ -58,7 +27,7 @@ io.micronaut.http.HttpResponse paramBodyOptional( @io.micronaut.http.annotation.Body java.util.Optional parameterModel); - @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_REQUIRED) + @io.micronaut.http.annotation.Post("/param/body/required") @io.micronaut.http.annotation.Consumes({ "application/json" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramBodyRequired( @@ -66,147 +35,147 @@ io.micronaut.http.HttpResponse paramBodyRequired( @io.micronaut.http.annotation.Body ParameterModel parameterModel); - @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/optionalWithDefault") @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(PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/optionalWithoutDefault") @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(PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/requiredWithDefault") @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(PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/requiredWithoutDefault") @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(PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/optionalWithDefault") @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(PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/optionalWithoutDefault") @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(PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/requiredWithDefault") @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(PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/requiredWithoutDefault") @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(PATH_PARAM_PATH_OVERLAY_WITH_STRING) + @io.micronaut.http.annotation.Get("/param/path/overlay/{string:10}") @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(PATH_PARAM_PATH_OVERLAY_WITH_UUID) + @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.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(PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/path/requiredWithDefault/{string}") @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(PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/path/requiredWithoutDefault/{string}") @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(PATH_PARAM_PATH_WITH_BOOLEAN) + @io.micronaut.http.annotation.Get("/param/path/with-bool/{bool:true|false}") @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(PATH_PARAM_PATH_WITH_INTEGER) + @io.micronaut.http.annotation.Get("/param/path/with-integer/{integer:\\-?[0-9]+}") @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(PATH_PARAM_PATH_WITH_LONG) + @io.micronaut.http.annotation.Get("/param/path/with-long/{long:\\-?[0-9]+}") @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(PATH_PARAM_PATH_WITH_MAX_LENGTH) + @io.micronaut.http.annotation.Get("/param/path/with-max-length/{string:5}") @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(PATH_PARAM_PATH_WITH_PATTERN) + @io.micronaut.http.annotation.Get("/param/path/with-pattern/{string:[0-9][a-z]}") @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(PATH_PARAM_PATH_WITH_UUID) + @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.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(PATH_PARAM_QUERY_DATE) + @io.micronaut.http.annotation.Get("/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(PATH_PARAM_QUERY_DATE_TIME) + @io.micronaut.http.annotation.Get("/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(PATH_PARAM_QUERY_MULTIPLE_LISTS) + @io.micronaut.http.annotation.Get("/param/query/multiple-lists") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.core.annotation.NonNull @@ -219,42 +188,42 @@ io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.http.annotation.QueryValue java.util.Optional> c); - @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_NUMBER) + @io.micronaut.http.annotation.Get("/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(PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/optionalWithDefault") @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(PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/optionalWithoutDefault") @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(PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/requiredWithDefault") @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(PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/requiredWithoutDefault") @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(PATH_PARAM_QUERY_UUID) + @io.micronaut.http.annotation.Get("/param/query/uuid") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryUuid( @io.micronaut.core.annotation.NonNull diff --git a/gen/main/java/testapi/novalidation/ParameterModel.java b/gen/main/java/testapi/novalidation/ParameterModel.java index c262f21b..55679747 100644 --- a/gen/main/java/testapi/novalidation/ParameterModel.java +++ b/gen/main/java/testapi/novalidation/ParameterModel.java @@ -4,54 +4,43 @@ @io.micronaut.serde.annotation.Serdeable public class ParameterModel { - public static final java.lang.String JSON_PROPERTY_BOOL = "bool"; - public static final java.lang.String JSON_PROPERTY_STRING = "string"; - public static final java.lang.String JSON_PROPERTY_NUMBER = "number"; - public static final java.lang.String JSON_PROPERTY_INTEGER = "integer"; - public static final java.lang.String JSON_PROPERTY_UUID = "uuid"; - public static final java.lang.String JSON_PROPERTY_DATE = "date"; - public static final java.lang.String JSON_PROPERTY_DATE_TIME = "dateTime"; - public static final java.lang.String JSON_PROPERTY_A = "a"; - public static final java.lang.String JSON_PROPERTY_B = "b"; - public static final java.lang.String JSON_PROPERTY_C = "c"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BOOL) + @com.fasterxml.jackson.annotation.JsonProperty("bool") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String bool; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_STRING) + @com.fasterxml.jackson.annotation.JsonProperty("string") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String string; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NUMBER) + @com.fasterxml.jackson.annotation.JsonProperty("number") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Double number; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_INTEGER) + @com.fasterxml.jackson.annotation.JsonProperty("integer") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer integer; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_UUID) + @com.fasterxml.jackson.annotation.JsonProperty("uuid") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.UUID uuid; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE) + @com.fasterxml.jackson.annotation.JsonProperty("date") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.time.LocalDate date; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE_TIME) + @com.fasterxml.jackson.annotation.JsonProperty("dateTime") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.time.Instant dateTime; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + @com.fasterxml.jackson.annotation.JsonProperty("a") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.List a; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_B) + @com.fasterxml.jackson.annotation.JsonProperty("b") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.List b; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_C) + @com.fasterxml.jackson.annotation.JsonProperty("c") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.List c; diff --git a/gen/main/java/testapi/novalidation/RequestApi.java b/gen/main/java/testapi/novalidation/RequestApi.java index ad523fc6..41989037 100644 --- a/gen/main/java/testapi/novalidation/RequestApi.java +++ b/gen/main/java/testapi/novalidation/RequestApi.java @@ -3,8 +3,6 @@ @jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") public interface RequestApi { - java.lang.String PATH_NO_OPERATION_ID_GET = "/no-operation-id"; - - @io.micronaut.http.annotation.Get(PATH_NO_OPERATION_ID_GET) + @io.micronaut.http.annotation.Get("/no-operation-id") io.micronaut.http.HttpResponse noOperationIdGet(); } diff --git a/gen/main/java/testapi/novalidation/ResponseApi.java b/gen/main/java/testapi/novalidation/ResponseApi.java index 89f25caa..8b39483d 100644 --- a/gen/main/java/testapi/novalidation/ResponseApi.java +++ b/gen/main/java/testapi/novalidation/ResponseApi.java @@ -3,59 +3,43 @@ @jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") public interface ResponseApi { - java.lang.String PATH_ARRAY_COMPLEX = "/response/array-complex"; - java.lang.String PATH_ARRAY_COMPLEX_NOT_FOUND = "/response/array-complex-not-found"; - java.lang.String PATH_ARRAY_SIMPLE = "/response/array-simple"; - java.lang.String PATH_ARRAY_SIMPLE_EMPTY = "/response/array-simple-empty"; - java.lang.String PATH_ARRAY_SIMPLE_NOT_FOUND = "/response/array-simple-not-found"; - java.lang.String PATH_HEADER = "/response/header"; - java.lang.String PATH_MULTIPLE_DATA_TYPES = "/response/multiple-datatypes"; - java.lang.String PATH_MULTIPLE_DATA_TYPES_NOT_FOUND = "/response/multiple-datatypes-not-found"; - java.lang.String PATH_MULTIPLE_RESPONSE_CODES = "/response/multiple-response-codes"; - java.lang.String PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND = "/response/multiple-response-codes-not-found"; - java.lang.String PATH_OPTIONAL = "/response/optional"; - java.lang.String PATH_SINGLE = "/response/single"; - java.lang.String PATH_VOID_FOUND = "/response/void"; - java.lang.String PATH_VOID_NOT_FOUND = "/response/void-not-found"; - java.lang.String PATH_WITH_DEFAULT = "/response/default"; - - @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX) + @io.micronaut.http.annotation.Get("/response/array-complex") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arrayComplex(); - @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/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(PATH_ARRAY_SIMPLE) + @io.micronaut.http.annotation.Get("/response/array-simple") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arraySimple(); - @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_EMPTY) + @io.micronaut.http.annotation.Get("/response/array-simple-empty") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arraySimpleEmpty(); - @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/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(PATH_HEADER) + @io.micronaut.http.annotation.Get("/response/header") io.micronaut.http.HttpResponse header(); - @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES) + @io.micronaut.http.annotation.Get("/response/multiple-datatypes") @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(PATH_MULTIPLE_DATA_TYPES_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/multiple-datatypes-not-found") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.core.annotation.NonNull @@ -65,14 +49,14 @@ io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES) + @io.micronaut.http.annotation.Get("/response/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(PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/multiple-response-codes-not-found") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.core.annotation.NonNull @@ -82,26 +66,26 @@ io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get(PATH_OPTIONAL) + @io.micronaut.http.annotation.Get("/response/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(PATH_SINGLE) + @io.micronaut.http.annotation.Get("/response/single") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse single(); - @io.micronaut.http.annotation.Get(PATH_VOID_FOUND) + @io.micronaut.http.annotation.Get("/response/void") io.micronaut.http.HttpResponse voidFound(); - @io.micronaut.http.annotation.Get(PATH_VOID_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/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(PATH_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/response/default") io.micronaut.http.HttpResponse withDefault(); } diff --git a/gen/main/java/testapi/novalidation/StringModel.java b/gen/main/java/testapi/novalidation/StringModel.java index 3a2f1ca2..7748e001 100644 --- a/gen/main/java/testapi/novalidation/StringModel.java +++ b/gen/main/java/testapi/novalidation/StringModel.java @@ -4,9 +4,7 @@ @io.micronaut.serde.annotation.Serdeable public class StringModel { - public static final java.lang.String JSON_PROPERTY_FOO = "foo"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + @com.fasterxml.jackson.annotation.JsonProperty("foo") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.lang.String foo; diff --git a/gen/main/java/testapi/novalidation/ValidationApi.java b/gen/main/java/testapi/novalidation/ValidationApi.java index 3d2756ec..e49186f0 100644 --- a/gen/main/java/testapi/novalidation/ValidationApi.java +++ b/gen/main/java/testapi/novalidation/ValidationApi.java @@ -3,151 +3,129 @@ @jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") public interface ValidationApi { - java.lang.String PATH_VALIDATION_DOUBLE_MAX = "/validation/double/max"; - java.lang.String PATH_VALIDATION_DOUBLE_MIN = "/validation/double/min"; - java.lang.String PATH_VALIDATION_DOUBLE_RANGE = "/validation/double/range"; - java.lang.String PATH_VALIDATION_FLOAT_MAX = "/validation/float/max"; - java.lang.String PATH_VALIDATION_FLOAT_MIN = "/validation/float/min"; - java.lang.String PATH_VALIDATION_FLOAT_RANGE = "/validation/float/range"; - 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_MODEL = "/validation/list/model"; - java.lang.String PATH_VALIDATION_LIST_RANGE = "/validation/list/range"; - 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"; - java.lang.String PATH_VALIDATION_MODEL = "/validation/model"; - java.lang.String PATH_VALIDATION_STRING_MAX = "/validation/string/max"; - java.lang.String PATH_VALIDATION_STRING_MIN = "/validation/string/min"; - 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(PATH_VALIDATION_DOUBLE_MAX) + @io.micronaut.http.annotation.Get("/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(PATH_VALIDATION_DOUBLE_MIN) + @io.micronaut.http.annotation.Get("/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(PATH_VALIDATION_DOUBLE_RANGE) + @io.micronaut.http.annotation.Get("/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(PATH_VALIDATION_FLOAT_MAX) + @io.micronaut.http.annotation.Get("/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(PATH_VALIDATION_FLOAT_MIN) + @io.micronaut.http.annotation.Get("/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(PATH_VALIDATION_FLOAT_RANGE) + @io.micronaut.http.annotation.Get("/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(PATH_VALIDATION_INTEGER_MAX) + @io.micronaut.http.annotation.Get("/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(PATH_VALIDATION_INTEGER_MIN) + @io.micronaut.http.annotation.Get("/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(PATH_VALIDATION_INTEGER_RANGE) + @io.micronaut.http.annotation.Get("/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(PATH_VALIDATION_LIST_MAX) + @io.micronaut.http.annotation.Get("/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(PATH_VALIDATION_LIST_MIN) + @io.micronaut.http.annotation.Get("/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(PATH_VALIDATION_LIST_MODEL) + @io.micronaut.http.annotation.Post("/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(PATH_VALIDATION_LIST_RANGE) + @io.micronaut.http.annotation.Post("/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(PATH_VALIDATION_LONG_MAX) + @io.micronaut.http.annotation.Get("/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(PATH_VALIDATION_LONG_MIN) + @io.micronaut.http.annotation.Get("/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(PATH_VALIDATION_LONG_RANGE) + @io.micronaut.http.annotation.Get("/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(PATH_VALIDATION_MODEL) + @io.micronaut.http.annotation.Post("/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(PATH_VALIDATION_STRING_MAX) + @io.micronaut.http.annotation.Get("/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(PATH_VALIDATION_STRING_MIN) + @io.micronaut.http.annotation.Get("/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(PATH_VALIDATION_STRING_PATTERN) + @io.micronaut.http.annotation.Get("/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(PATH_VALIDATION_STRING_RANGE) + @io.micronaut.http.annotation.Get("/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 3f1066cf..9d47e521 100644 --- a/gen/main/java/testapi/packages/api/MediatypeApi.java +++ b/gen/main/java/testapi/packages/api/MediatypeApi.java @@ -6,15 +6,7 @@ @io.micronaut.validation.Validated public interface MediatypeApi { - java.lang.String PATH_MEDIATYPE_CONSUMES_AND_PRODUCES = "/mediatype/consumes-and-produces"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD = "/mediatype/consumes-multipart-with-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_OCTET_STREAM = "/mediatype/consumes-octet-stream"; - java.lang.String PATH_MEDIATYPE_CONSUMES_PLAIN = "/mediatype/consumes-plain"; - java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; - java.lang.String PATH_MEDIATYPE_PRODUCES_SAME_MODEL = "/mediatype/produces-with-same-model"; - - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_AND_PRODUCES) + @io.micronaut.http.annotation.Post("/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 +14,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesAndProduces( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD) + @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-with-fileupload") @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUpload( @@ -35,7 +27,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUplo @io.micronaut.core.annotation.NonNull io.micronaut.http.multipart.CompletedFileUpload file); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD) + @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( @@ -46,7 +38,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileU @io.micronaut.http.annotation.Part(value = "userId") java.lang.Integer userId); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_OCTET_STREAM) + @io.micronaut.http.annotation.Post("/mediatype/consumes-octet-stream") @io.micronaut.http.annotation.Consumes({ "application/octet-stream" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesOctetStream( @@ -54,7 +46,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesOctetStream( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_PLAIN) + @io.micronaut.http.annotation.Post("/mediatype/consumes-plain") @io.micronaut.http.annotation.Consumes({ "text/plain" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesPlain( @@ -62,7 +54,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesPlain( @io.micronaut.http.annotation.Body java.lang.String body); - @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL) + @io.micronaut.http.annotation.Get("/mediatype/produces-with-different-model") @io.micronaut.http.annotation.Produces({ "application/json", "text/plain" }) io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.core.annotation.NonNull @@ -72,7 +64,7 @@ io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.http.annotation.QueryValue(value = "plain") java.lang.Boolean plain); - @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_SAME_MODEL) + @io.micronaut.http.annotation.Get("/mediatype/produces-with-same-model") @io.micronaut.http.annotation.Produces({ "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 3bb8ad75..65428f59 100644 --- a/gen/main/java/testapi/packages/api/ParameterApi.java +++ b/gen/main/java/testapi/packages/api/ParameterApi.java @@ -6,38 +6,7 @@ @io.micronaut.validation.Validated public interface ParameterApi { - java.lang.String PATH_PARAM_ALL = "/param/all/{path}"; - java.lang.String PATH_PARAM_BODY_OPTIONAL = "/param/body/optional"; - java.lang.String PATH_PARAM_BODY_REQUIRED = "/param/body/required"; - java.lang.String PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT = "/param/cookie/optionalWithDefault"; - java.lang.String PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT = "/param/cookie/optionalWithoutDefault"; - java.lang.String PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT = "/param/cookie/requiredWithDefault"; - java.lang.String PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT = "/param/cookie/requiredWithoutDefault"; - java.lang.String PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT = "/param/header/optionalWithDefault"; - 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: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: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"; - 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"; - java.lang.String PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT = "/param/query/requiredWithDefault"; - 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(PATH_PARAM_ALL) + @io.micronaut.http.annotation.Get("/param/all/{path}") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramAll( @io.micronaut.core.annotation.NonNull @@ -53,7 +22,7 @@ io.micronaut.http.HttpResponse paramAll( @io.micronaut.http.annotation.Header(value = "integer") java.util.Optional integer); - @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_OPTIONAL) + @io.micronaut.http.annotation.Post("/param/body/optional") @io.micronaut.http.annotation.Consumes({ "application/json" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramBodyOptional( @@ -62,7 +31,7 @@ io.micronaut.http.HttpResponse paramBodyOptional( @jakarta.validation.Valid java.util.Optional parameterModel); - @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_REQUIRED) + @io.micronaut.http.annotation.Post("/param/body/required") @io.micronaut.http.annotation.Consumes({ "application/json" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramBodyRequired( @@ -71,63 +40,63 @@ io.micronaut.http.HttpResponse paramBodyRequired( @jakarta.validation.Valid ParameterModel parameterModel); - @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/optionalWithDefault") @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(PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/optionalWithoutDefault") @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(PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/requiredWithDefault") @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(PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/requiredWithoutDefault") @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(PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/optionalWithDefault") @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(PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/optionalWithoutDefault") @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(PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/requiredWithDefault") @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(PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/requiredWithoutDefault") @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(PATH_PARAM_PATH_OVERLAY_WITH_STRING) + @io.micronaut.http.annotation.Get("/param/path/overlay/{string:10}") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathOverlayWithString( @io.micronaut.core.annotation.NonNull @@ -135,49 +104,49 @@ io.micronaut.http.HttpResponse paramPathOverlayWithString( @jakarta.validation.constraints.Size(max = 10) java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_UUID) + @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.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(PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/path/requiredWithDefault/{string}") @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(PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/path/requiredWithoutDefault/{string}") @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(PATH_PARAM_PATH_WITH_BOOLEAN) + @io.micronaut.http.annotation.Get("/param/path/with-bool/{bool:true|false}") @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(PATH_PARAM_PATH_WITH_INTEGER) + @io.micronaut.http.annotation.Get("/param/path/with-integer/{integer:\\-?[0-9]+}") @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(PATH_PARAM_PATH_WITH_LONG) + @io.micronaut.http.annotation.Get("/param/path/with-long/{long:\\-?[0-9]+}") @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(PATH_PARAM_PATH_WITH_MAX_LENGTH) + @io.micronaut.http.annotation.Get("/param/path/with-max-length/{string:5}") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithMaxLength( @io.micronaut.core.annotation.NonNull @@ -185,7 +154,7 @@ io.micronaut.http.HttpResponse paramPathWithMaxLength( @jakarta.validation.constraints.Size(max = 5) java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_PATTERN) + @io.micronaut.http.annotation.Get("/param/path/with-pattern/{string:[0-9][a-z]}") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithPattern( @io.micronaut.core.annotation.NonNull @@ -193,28 +162,28 @@ io.micronaut.http.HttpResponse paramPathWithPattern( @jakarta.validation.constraints.Pattern(regexp = "[0-9][a-z]") java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_UUID) + @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.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(PATH_PARAM_QUERY_DATE) + @io.micronaut.http.annotation.Get("/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(PATH_PARAM_QUERY_DATE_TIME) + @io.micronaut.http.annotation.Get("/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(PATH_PARAM_QUERY_MULTIPLE_LISTS) + @io.micronaut.http.annotation.Get("/param/query/multiple-lists") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.core.annotation.NonNull @@ -227,42 +196,42 @@ io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.http.annotation.QueryValue java.util.Optional> c); - @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_NUMBER) + @io.micronaut.http.annotation.Get("/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(PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/optionalWithDefault") @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(PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/optionalWithoutDefault") @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(PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/requiredWithDefault") @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(PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/requiredWithoutDefault") @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(PATH_PARAM_QUERY_UUID) + @io.micronaut.http.annotation.Get("/param/query/uuid") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryUuid( @io.micronaut.core.annotation.NonNull diff --git a/gen/main/java/testapi/packages/api/RequestApi.java b/gen/main/java/testapi/packages/api/RequestApi.java index eff33598..ec69b06b 100644 --- a/gen/main/java/testapi/packages/api/RequestApi.java +++ b/gen/main/java/testapi/packages/api/RequestApi.java @@ -6,8 +6,6 @@ @io.micronaut.validation.Validated public interface RequestApi { - java.lang.String PATH_NO_OPERATION_ID_GET = "/no-operation-id"; - - @io.micronaut.http.annotation.Get(PATH_NO_OPERATION_ID_GET) + @io.micronaut.http.annotation.Get("/no-operation-id") 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 4ae895bf..a77e8733 100644 --- a/gen/main/java/testapi/packages/api/ResponseApi.java +++ b/gen/main/java/testapi/packages/api/ResponseApi.java @@ -6,59 +6,43 @@ @io.micronaut.validation.Validated public interface ResponseApi { - java.lang.String PATH_ARRAY_COMPLEX = "/response/array-complex"; - java.lang.String PATH_ARRAY_COMPLEX_NOT_FOUND = "/response/array-complex-not-found"; - java.lang.String PATH_ARRAY_SIMPLE = "/response/array-simple"; - java.lang.String PATH_ARRAY_SIMPLE_EMPTY = "/response/array-simple-empty"; - java.lang.String PATH_ARRAY_SIMPLE_NOT_FOUND = "/response/array-simple-not-found"; - java.lang.String PATH_HEADER = "/response/header"; - java.lang.String PATH_MULTIPLE_DATA_TYPES = "/response/multiple-datatypes"; - java.lang.String PATH_MULTIPLE_DATA_TYPES_NOT_FOUND = "/response/multiple-datatypes-not-found"; - java.lang.String PATH_MULTIPLE_RESPONSE_CODES = "/response/multiple-response-codes"; - java.lang.String PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND = "/response/multiple-response-codes-not-found"; - java.lang.String PATH_OPTIONAL = "/response/optional"; - java.lang.String PATH_SINGLE = "/response/single"; - java.lang.String PATH_VOID_FOUND = "/response/void"; - java.lang.String PATH_VOID_NOT_FOUND = "/response/void-not-found"; - java.lang.String PATH_WITH_DEFAULT = "/response/default"; - - @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX) + @io.micronaut.http.annotation.Get("/response/array-complex") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arrayComplex(); - @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/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(PATH_ARRAY_SIMPLE) + @io.micronaut.http.annotation.Get("/response/array-simple") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arraySimple(); - @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_EMPTY) + @io.micronaut.http.annotation.Get("/response/array-simple-empty") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arraySimpleEmpty(); - @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/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(PATH_HEADER) + @io.micronaut.http.annotation.Get("/response/header") io.micronaut.http.HttpResponse header(); - @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES) + @io.micronaut.http.annotation.Get("/response/multiple-datatypes") @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(PATH_MULTIPLE_DATA_TYPES_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/multiple-datatypes-not-found") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.core.annotation.NonNull @@ -68,14 +52,14 @@ io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES) + @io.micronaut.http.annotation.Get("/response/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(PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/multiple-response-codes-not-found") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.core.annotation.NonNull @@ -85,26 +69,26 @@ io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get(PATH_OPTIONAL) + @io.micronaut.http.annotation.Get("/response/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(PATH_SINGLE) + @io.micronaut.http.annotation.Get("/response/single") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse single(); - @io.micronaut.http.annotation.Get(PATH_VOID_FOUND) + @io.micronaut.http.annotation.Get("/response/void") io.micronaut.http.HttpResponse voidFound(); - @io.micronaut.http.annotation.Get(PATH_VOID_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/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(PATH_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/response/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 b6da4aaf..49c8baa1 100644 --- a/gen/main/java/testapi/packages/api/ValidationApi.java +++ b/gen/main/java/testapi/packages/api/ValidationApi.java @@ -6,43 +6,21 @@ @io.micronaut.validation.Validated public interface ValidationApi { - java.lang.String PATH_VALIDATION_DOUBLE_MAX = "/validation/double/max"; - java.lang.String PATH_VALIDATION_DOUBLE_MIN = "/validation/double/min"; - java.lang.String PATH_VALIDATION_DOUBLE_RANGE = "/validation/double/range"; - java.lang.String PATH_VALIDATION_FLOAT_MAX = "/validation/float/max"; - java.lang.String PATH_VALIDATION_FLOAT_MIN = "/validation/float/min"; - java.lang.String PATH_VALIDATION_FLOAT_RANGE = "/validation/float/range"; - 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_MODEL = "/validation/list/model"; - java.lang.String PATH_VALIDATION_LIST_RANGE = "/validation/list/range"; - 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"; - java.lang.String PATH_VALIDATION_MODEL = "/validation/model"; - java.lang.String PATH_VALIDATION_STRING_MAX = "/validation/string/max"; - java.lang.String PATH_VALIDATION_STRING_MIN = "/validation/string/min"; - 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(PATH_VALIDATION_DOUBLE_MAX) + @io.micronaut.http.annotation.Get("/validation/double/max") io.micronaut.http.HttpResponse validationDoubleMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = false) java.lang.Double number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MIN) + @io.micronaut.http.annotation.Get("/validation/double/min") io.micronaut.http.HttpResponse validationDoubleMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @jakarta.validation.constraints.DecimalMin(value = "3", inclusive = false) java.lang.Double number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_RANGE) + @io.micronaut.http.annotation.Get("/validation/double/range") io.micronaut.http.HttpResponse validationDoubleRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @@ -50,21 +28,21 @@ io.micronaut.http.HttpResponse validationDoubleRange( @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = true) java.lang.Double number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MAX) + @io.micronaut.http.annotation.Get("/validation/float/max") io.micronaut.http.HttpResponse validationFloatMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = false) java.lang.Float number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MIN) + @io.micronaut.http.annotation.Get("/validation/float/min") io.micronaut.http.HttpResponse validationFloatMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @jakarta.validation.constraints.DecimalMin(value = "3", inclusive = false) java.lang.Float number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_RANGE) + @io.micronaut.http.annotation.Get("/validation/float/range") io.micronaut.http.HttpResponse validationFloatRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @@ -72,21 +50,21 @@ io.micronaut.http.HttpResponse validationFloatRange( @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = true) java.lang.Float number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MAX) + @io.micronaut.http.annotation.Get("/validation/integer/max") io.micronaut.http.HttpResponse validationIntegerMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @jakarta.validation.constraints.Max(4) java.lang.Integer integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MIN) + @io.micronaut.http.annotation.Get("/validation/integer/min") io.micronaut.http.HttpResponse validationIntegerMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @jakarta.validation.constraints.Min(3) java.lang.Integer integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_RANGE) + @io.micronaut.http.annotation.Get("/validation/integer/range") io.micronaut.http.HttpResponse validationIntegerRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @@ -94,21 +72,21 @@ io.micronaut.http.HttpResponse validationIntegerRange( @jakarta.validation.constraints.Max(4) java.lang.Integer integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MAX) + @io.micronaut.http.annotation.Get("/validation/list/max") io.micronaut.http.HttpResponse validationListMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @jakarta.validation.constraints.Size(max = 4) java.util.List list); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MIN) + @io.micronaut.http.annotation.Get("/validation/list/min") io.micronaut.http.HttpResponse validationListMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @jakarta.validation.constraints.Size(min = 3) java.util.List list); - @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_MODEL) + @io.micronaut.http.annotation.Post("/validation/list/model") @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse validationListModel( @io.micronaut.core.annotation.NonNull @@ -116,28 +94,28 @@ io.micronaut.http.HttpResponse validationListModel( @jakarta.validation.Valid java.util.List stringModel); - @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_RANGE) + @io.micronaut.http.annotation.Post("/validation/list/range") io.micronaut.http.HttpResponse validationListRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @jakarta.validation.constraints.Size(min = 3, max = 4) java.util.List list); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MAX) + @io.micronaut.http.annotation.Get("/validation/long/max") io.micronaut.http.HttpResponse validationLongMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @jakarta.validation.constraints.Max(4) java.lang.Long integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MIN) + @io.micronaut.http.annotation.Get("/validation/long/min") io.micronaut.http.HttpResponse validationLongMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @jakarta.validation.constraints.Min(3) java.lang.Long integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_RANGE) + @io.micronaut.http.annotation.Get("/validation/long/range") io.micronaut.http.HttpResponse validationLongRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @@ -145,7 +123,7 @@ io.micronaut.http.HttpResponse validationLongRange( @jakarta.validation.constraints.Max(4) java.lang.Long integer); - @io.micronaut.http.annotation.Post(PATH_VALIDATION_MODEL) + @io.micronaut.http.annotation.Post("/validation/model") @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse validationModel( @io.micronaut.core.annotation.NonNull @@ -153,28 +131,28 @@ io.micronaut.http.HttpResponse validationModel( @jakarta.validation.Valid StringModel stringModel); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MAX) + @io.micronaut.http.annotation.Get("/validation/string/max") io.micronaut.http.HttpResponse validationStringMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @jakarta.validation.constraints.Size(max = 4) java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MIN) + @io.micronaut.http.annotation.Get("/validation/string/min") io.micronaut.http.HttpResponse validationStringMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @jakarta.validation.constraints.Size(min = 3) java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_PATTERN) + @io.micronaut.http.annotation.Get("/validation/string/pattern") io.micronaut.http.HttpResponse validationStringPattern( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @jakarta.validation.constraints.Pattern(regexp = "[a-z]{3,5}") java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_RANGE) + @io.micronaut.http.annotation.Get("/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/model/Multipart.java b/gen/main/java/testapi/packages/model/Multipart.java index 4983eefd..d714fbc1 100644 --- a/gen/main/java/testapi/packages/model/Multipart.java +++ b/gen/main/java/testapi/packages/model/Multipart.java @@ -4,24 +4,19 @@ @io.micronaut.serde.annotation.Serdeable public class Multipart { - public static final java.lang.String JSON_PROPERTY_ORDER_ID = "orderId"; - public static final java.lang.String JSON_PROPERTY_USER_ID = "userId"; - public static final java.lang.String JSON_PROPERTY_FILE_NAME = "fileName"; - public static final java.lang.String JSON_PROPERTY_FILE = "file"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ORDER_ID) + @com.fasterxml.jackson.annotation.JsonProperty("orderId") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer orderId; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_USER_ID) + @com.fasterxml.jackson.annotation.JsonProperty("userId") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer userId; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FILE_NAME) + @com.fasterxml.jackson.annotation.JsonProperty("fileName") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String fileName; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FILE) + @com.fasterxml.jackson.annotation.JsonProperty("file") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private byte[] file; diff --git a/gen/main/java/testapi/packages/model/NumberModel.java b/gen/main/java/testapi/packages/model/NumberModel.java index f83328aa..89b10fa7 100644 --- a/gen/main/java/testapi/packages/model/NumberModel.java +++ b/gen/main/java/testapi/packages/model/NumberModel.java @@ -4,9 +4,7 @@ @io.micronaut.serde.annotation.Serdeable public class NumberModel { - public static final java.lang.String JSON_PROPERTY_BAR = "bar"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BAR) + @com.fasterxml.jackson.annotation.JsonProperty("bar") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Double bar; diff --git a/gen/main/java/testapi/packages/model/ParameterModel.java b/gen/main/java/testapi/packages/model/ParameterModel.java index b5f1d6ce..b397df25 100644 --- a/gen/main/java/testapi/packages/model/ParameterModel.java +++ b/gen/main/java/testapi/packages/model/ParameterModel.java @@ -4,54 +4,43 @@ @io.micronaut.serde.annotation.Serdeable public class ParameterModel { - public static final java.lang.String JSON_PROPERTY_BOOL = "bool"; - public static final java.lang.String JSON_PROPERTY_STRING = "string"; - public static final java.lang.String JSON_PROPERTY_NUMBER = "number"; - public static final java.lang.String JSON_PROPERTY_INTEGER = "integer"; - public static final java.lang.String JSON_PROPERTY_UUID = "uuid"; - public static final java.lang.String JSON_PROPERTY_DATE = "date"; - public static final java.lang.String JSON_PROPERTY_DATE_TIME = "dateTime"; - public static final java.lang.String JSON_PROPERTY_A = "a"; - public static final java.lang.String JSON_PROPERTY_B = "b"; - public static final java.lang.String JSON_PROPERTY_C = "c"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BOOL) + @com.fasterxml.jackson.annotation.JsonProperty("bool") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String bool; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_STRING) + @com.fasterxml.jackson.annotation.JsonProperty("string") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String string; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NUMBER) + @com.fasterxml.jackson.annotation.JsonProperty("number") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Double number; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_INTEGER) + @com.fasterxml.jackson.annotation.JsonProperty("integer") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer integer; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_UUID) + @com.fasterxml.jackson.annotation.JsonProperty("uuid") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.UUID uuid; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE) + @com.fasterxml.jackson.annotation.JsonProperty("date") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.time.LocalDate date; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE_TIME) + @com.fasterxml.jackson.annotation.JsonProperty("dateTime") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.time.Instant dateTime; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + @com.fasterxml.jackson.annotation.JsonProperty("a") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.List a; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_B) + @com.fasterxml.jackson.annotation.JsonProperty("b") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.List b; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_C) + @com.fasterxml.jackson.annotation.JsonProperty("c") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.List c; diff --git a/gen/main/java/testapi/packages/model/StringModel.java b/gen/main/java/testapi/packages/model/StringModel.java index 4d0f19f4..de84d6f7 100644 --- a/gen/main/java/testapi/packages/model/StringModel.java +++ b/gen/main/java/testapi/packages/model/StringModel.java @@ -4,10 +4,8 @@ @io.micronaut.serde.annotation.Serdeable public class StringModel { - public static final java.lang.String JSON_PROPERTY_FOO = "foo"; - @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + @com.fasterxml.jackson.annotation.JsonProperty("foo") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.lang.String foo; diff --git a/gen/main/java/testapi/types/MediatypeApi.java b/gen/main/java/testapi/types/MediatypeApi.java index 523ed4d7..24d0a4d0 100644 --- a/gen/main/java/testapi/types/MediatypeApi.java +++ b/gen/main/java/testapi/types/MediatypeApi.java @@ -3,15 +3,7 @@ @io.micronaut.validation.Validated public interface MediatypeApi { - java.lang.String PATH_MEDIATYPE_CONSUMES_AND_PRODUCES = "/mediatype/consumes-and-produces"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD = "/mediatype/consumes-multipart-with-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD = "/mediatype/consumes-multipart-without-fileupload"; - java.lang.String PATH_MEDIATYPE_CONSUMES_OCTET_STREAM = "/mediatype/consumes-octet-stream"; - java.lang.String PATH_MEDIATYPE_CONSUMES_PLAIN = "/mediatype/consumes-plain"; - java.lang.String PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL = "/mediatype/produces-with-different-model"; - java.lang.String PATH_MEDIATYPE_PRODUCES_SAME_MODEL = "/mediatype/produces-with-same-model"; - - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_AND_PRODUCES) + @io.micronaut.http.annotation.Post("/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 +11,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesAndProduces( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITH_FILE_UPLOAD) + @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-with-fileupload") @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUpload( @@ -32,7 +24,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUplo @io.micronaut.core.annotation.NonNull io.micronaut.http.multipart.CompletedFileUpload file); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_MULTIPART_WITHOUT_FILE_UPLOAD) + @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") @io.micronaut.http.annotation.Consumes({ "multipart/form-data" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileUpload( @@ -43,7 +35,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithoutFileU @io.micronaut.http.annotation.Part(value = "userId") java.lang.Integer userId); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_OCTET_STREAM) + @io.micronaut.http.annotation.Post("/mediatype/consumes-octet-stream") @io.micronaut.http.annotation.Consumes({ "application/octet-stream" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesOctetStream( @@ -51,7 +43,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesOctetStream( @io.micronaut.http.annotation.Body byte[] body); - @io.micronaut.http.annotation.Post(PATH_MEDIATYPE_CONSUMES_PLAIN) + @io.micronaut.http.annotation.Post("/mediatype/consumes-plain") @io.micronaut.http.annotation.Consumes({ "text/plain" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse mediatypeConsumesPlain( @@ -59,7 +51,7 @@ io.micronaut.http.HttpResponse mediatypeConsumesPlain( @io.micronaut.http.annotation.Body java.lang.String body); - @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_DIFFERENT_MODEL) + @io.micronaut.http.annotation.Get("/mediatype/produces-with-different-model") @io.micronaut.http.annotation.Produces({ "application/json", "text/plain" }) io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.core.annotation.NonNull @@ -69,7 +61,7 @@ io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( @io.micronaut.http.annotation.QueryValue(value = "plain") java.lang.Boolean plain); - @io.micronaut.http.annotation.Get(PATH_MEDIATYPE_PRODUCES_SAME_MODEL) + @io.micronaut.http.annotation.Get("/mediatype/produces-with-same-model") @io.micronaut.http.annotation.Produces({ "application/json", "application/xml" }) io.micronaut.http.HttpResponse mediatypeProducesSameModel( @io.micronaut.core.annotation.NonNull diff --git a/gen/main/java/testapi/types/Multipart.java b/gen/main/java/testapi/types/Multipart.java index 0c69785a..adf2371b 100644 --- a/gen/main/java/testapi/types/Multipart.java +++ b/gen/main/java/testapi/types/Multipart.java @@ -3,24 +3,19 @@ @io.micronaut.serde.annotation.Serdeable public class Multipart { - public static final java.lang.String JSON_PROPERTY_ORDER_ID = "orderId"; - public static final java.lang.String JSON_PROPERTY_USER_ID = "userId"; - public static final java.lang.String JSON_PROPERTY_FILE_NAME = "fileName"; - public static final java.lang.String JSON_PROPERTY_FILE = "file"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ORDER_ID) + @com.fasterxml.jackson.annotation.JsonProperty("orderId") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer orderId; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_USER_ID) + @com.fasterxml.jackson.annotation.JsonProperty("userId") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer userId; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FILE_NAME) + @com.fasterxml.jackson.annotation.JsonProperty("fileName") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String fileName; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FILE) + @com.fasterxml.jackson.annotation.JsonProperty("file") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private byte[] file; diff --git a/gen/main/java/testapi/types/NumberModel.java b/gen/main/java/testapi/types/NumberModel.java index a73dcee4..cf69a9ea 100644 --- a/gen/main/java/testapi/types/NumberModel.java +++ b/gen/main/java/testapi/types/NumberModel.java @@ -3,9 +3,7 @@ @io.micronaut.serde.annotation.Serdeable public class NumberModel { - public static final java.lang.String JSON_PROPERTY_BAR = "bar"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BAR) + @com.fasterxml.jackson.annotation.JsonProperty("bar") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Double bar; diff --git a/gen/main/java/testapi/types/ParameterApi.java b/gen/main/java/testapi/types/ParameterApi.java index 59fced2c..bff11445 100644 --- a/gen/main/java/testapi/types/ParameterApi.java +++ b/gen/main/java/testapi/types/ParameterApi.java @@ -3,38 +3,7 @@ @io.micronaut.validation.Validated public interface ParameterApi { - java.lang.String PATH_PARAM_ALL = "/param/all/{path}"; - java.lang.String PATH_PARAM_BODY_OPTIONAL = "/param/body/optional"; - java.lang.String PATH_PARAM_BODY_REQUIRED = "/param/body/required"; - java.lang.String PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT = "/param/cookie/optionalWithDefault"; - java.lang.String PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT = "/param/cookie/optionalWithoutDefault"; - java.lang.String PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT = "/param/cookie/requiredWithDefault"; - java.lang.String PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT = "/param/cookie/requiredWithoutDefault"; - java.lang.String PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT = "/param/header/optionalWithDefault"; - 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: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: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"; - 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"; - java.lang.String PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT = "/param/query/requiredWithDefault"; - 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(PATH_PARAM_ALL) + @io.micronaut.http.annotation.Get("/param/all/{path}") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramAll( @io.micronaut.core.annotation.NonNull @@ -50,7 +19,7 @@ io.micronaut.http.HttpResponse paramAll( @io.micronaut.http.annotation.Header(value = "integer") java.util.Optional integer); - @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_OPTIONAL) + @io.micronaut.http.annotation.Post("/param/body/optional") @io.micronaut.http.annotation.Consumes({ "application/json" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramBodyOptional( @@ -59,7 +28,7 @@ io.micronaut.http.HttpResponse paramBodyOptional( @jakarta.validation.Valid java.util.Optional parameterModel); - @io.micronaut.http.annotation.Post(PATH_PARAM_BODY_REQUIRED) + @io.micronaut.http.annotation.Post("/param/body/required") @io.micronaut.http.annotation.Consumes({ "application/json" }) @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramBodyRequired( @@ -68,63 +37,63 @@ io.micronaut.http.HttpResponse paramBodyRequired( @jakarta.validation.Valid ParameterModel parameterModel); - @io.micronaut.http.annotation.Get(PATH_PARAM_COOKIE_OPTIONAL_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/optionalWithDefault") @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(PATH_PARAM_COOKIE_OPTIONAL_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/optionalWithoutDefault") @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(PATH_PARAM_COOKIE_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/requiredWithDefault") @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(PATH_PARAM_COOKIE_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/cookie/requiredWithoutDefault") @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(PATH_PARAM_HEADER_OPTIONAL_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/optionalWithDefault") @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(PATH_PARAM_HEADER_OPTIONAL_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/optionalWithoutDefault") @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(PATH_PARAM_HEADER_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/requiredWithDefault") @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(PATH_PARAM_HEADER_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/header/requiredWithoutDefault") @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(PATH_PARAM_PATH_OVERLAY_WITH_STRING) + @io.micronaut.http.annotation.Get("/param/path/overlay/{string:10}") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathOverlayWithString( @io.micronaut.core.annotation.NonNull @@ -132,49 +101,49 @@ io.micronaut.http.HttpResponse paramPathOverlayWithString( @jakarta.validation.constraints.Size(max = 10) java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_OVERLAY_WITH_UUID) + @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.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(PATH_PARAM_PATH_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/path/requiredWithDefault/{string}") @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(PATH_PARAM_PATH_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/path/requiredWithoutDefault/{string}") @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(PATH_PARAM_PATH_WITH_BOOLEAN) + @io.micronaut.http.annotation.Get("/param/path/with-bool/{bool:true|false}") @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(PATH_PARAM_PATH_WITH_INTEGER) + @io.micronaut.http.annotation.Get("/param/path/with-integer/{integer:\\-?[0-9]+}") @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(PATH_PARAM_PATH_WITH_LONG) + @io.micronaut.http.annotation.Get("/param/path/with-long/{long:\\-?[0-9]+}") @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(PATH_PARAM_PATH_WITH_MAX_LENGTH) + @io.micronaut.http.annotation.Get("/param/path/with-max-length/{string:5}") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithMaxLength( @io.micronaut.core.annotation.NonNull @@ -182,7 +151,7 @@ io.micronaut.http.HttpResponse paramPathWithMaxLength( @jakarta.validation.constraints.Size(max = 5) java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_PATTERN) + @io.micronaut.http.annotation.Get("/param/path/with-pattern/{string:[0-9][a-z]}") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramPathWithPattern( @io.micronaut.core.annotation.NonNull @@ -190,28 +159,28 @@ io.micronaut.http.HttpResponse paramPathWithPattern( @jakarta.validation.constraints.Pattern(regexp = "[0-9][a-z]") java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_PARAM_PATH_WITH_UUID) + @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.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(PATH_PARAM_QUERY_DATE) + @io.micronaut.http.annotation.Get("/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(PATH_PARAM_QUERY_DATE_TIME) + @io.micronaut.http.annotation.Get("/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(PATH_PARAM_QUERY_MULTIPLE_LISTS) + @io.micronaut.http.annotation.Get("/param/query/multiple-lists") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.core.annotation.NonNull @@ -224,42 +193,42 @@ io.micronaut.http.HttpResponse paramQueryMultipleLists( @io.micronaut.http.annotation.QueryValue java.util.Optional> c); - @io.micronaut.http.annotation.Get(PATH_PARAM_QUERY_NUMBER) + @io.micronaut.http.annotation.Get("/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(PATH_PARAM_QUERY_OPTIONAL_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/optionalWithDefault") @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(PATH_PARAM_QUERY_OPTIONAL_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/optionalWithoutDefault") @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(PATH_PARAM_QUERY_REQUIRED_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/requiredWithDefault") @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(PATH_PARAM_QUERY_REQUIRED_WITHOUT_DEFAULT) + @io.micronaut.http.annotation.Get("/param/query/requiredWithoutDefault") @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(PATH_PARAM_QUERY_UUID) + @io.micronaut.http.annotation.Get("/param/query/uuid") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse paramQueryUuid( @io.micronaut.core.annotation.NonNull diff --git a/gen/main/java/testapi/types/ParameterModel.java b/gen/main/java/testapi/types/ParameterModel.java index 5435c04f..bf132f38 100644 --- a/gen/main/java/testapi/types/ParameterModel.java +++ b/gen/main/java/testapi/types/ParameterModel.java @@ -3,54 +3,43 @@ @io.micronaut.serde.annotation.Serdeable public class ParameterModel { - public static final java.lang.String JSON_PROPERTY_BOOL = "bool"; - public static final java.lang.String JSON_PROPERTY_STRING = "string"; - public static final java.lang.String JSON_PROPERTY_NUMBER = "number"; - public static final java.lang.String JSON_PROPERTY_INTEGER = "integer"; - public static final java.lang.String JSON_PROPERTY_UUID = "uuid"; - public static final java.lang.String JSON_PROPERTY_DATE = "date"; - public static final java.lang.String JSON_PROPERTY_DATE_TIME = "dateTime"; - public static final java.lang.String JSON_PROPERTY_A = "a"; - public static final java.lang.String JSON_PROPERTY_B = "b"; - public static final java.lang.String JSON_PROPERTY_C = "c"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BOOL) + @com.fasterxml.jackson.annotation.JsonProperty("bool") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String bool; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_STRING) + @com.fasterxml.jackson.annotation.JsonProperty("string") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String string; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NUMBER) + @com.fasterxml.jackson.annotation.JsonProperty("number") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Double number; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_INTEGER) + @com.fasterxml.jackson.annotation.JsonProperty("integer") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer integer; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_UUID) + @com.fasterxml.jackson.annotation.JsonProperty("uuid") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.UUID uuid; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE) + @com.fasterxml.jackson.annotation.JsonProperty("date") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.time.LocalDate date; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE_TIME) + @com.fasterxml.jackson.annotation.JsonProperty("dateTime") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.time.ZonedDateTime dateTime; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + @com.fasterxml.jackson.annotation.JsonProperty("a") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.List a; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_B) + @com.fasterxml.jackson.annotation.JsonProperty("b") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.List b; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_C) + @com.fasterxml.jackson.annotation.JsonProperty("c") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.List c; diff --git a/gen/main/java/testapi/types/RequestApi.java b/gen/main/java/testapi/types/RequestApi.java index 1277706c..e9c5792f 100644 --- a/gen/main/java/testapi/types/RequestApi.java +++ b/gen/main/java/testapi/types/RequestApi.java @@ -3,8 +3,6 @@ @io.micronaut.validation.Validated public interface RequestApi { - java.lang.String PATH_NO_OPERATION_ID_GET = "/no-operation-id"; - - @io.micronaut.http.annotation.Get(PATH_NO_OPERATION_ID_GET) + @io.micronaut.http.annotation.Get("/no-operation-id") io.micronaut.http.HttpResponse noOperationIdGet(); } diff --git a/gen/main/java/testapi/types/ResponseApi.java b/gen/main/java/testapi/types/ResponseApi.java index 10ca01dc..c64fe7be 100644 --- a/gen/main/java/testapi/types/ResponseApi.java +++ b/gen/main/java/testapi/types/ResponseApi.java @@ -3,59 +3,43 @@ @io.micronaut.validation.Validated public interface ResponseApi { - java.lang.String PATH_ARRAY_COMPLEX = "/response/array-complex"; - java.lang.String PATH_ARRAY_COMPLEX_NOT_FOUND = "/response/array-complex-not-found"; - java.lang.String PATH_ARRAY_SIMPLE = "/response/array-simple"; - java.lang.String PATH_ARRAY_SIMPLE_EMPTY = "/response/array-simple-empty"; - java.lang.String PATH_ARRAY_SIMPLE_NOT_FOUND = "/response/array-simple-not-found"; - java.lang.String PATH_HEADER = "/response/header"; - java.lang.String PATH_MULTIPLE_DATA_TYPES = "/response/multiple-datatypes"; - java.lang.String PATH_MULTIPLE_DATA_TYPES_NOT_FOUND = "/response/multiple-datatypes-not-found"; - java.lang.String PATH_MULTIPLE_RESPONSE_CODES = "/response/multiple-response-codes"; - java.lang.String PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND = "/response/multiple-response-codes-not-found"; - java.lang.String PATH_OPTIONAL = "/response/optional"; - java.lang.String PATH_SINGLE = "/response/single"; - java.lang.String PATH_VOID_FOUND = "/response/void"; - java.lang.String PATH_VOID_NOT_FOUND = "/response/void-not-found"; - java.lang.String PATH_WITH_DEFAULT = "/response/default"; - - @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX) + @io.micronaut.http.annotation.Get("/response/array-complex") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arrayComplex(); - @io.micronaut.http.annotation.Get(PATH_ARRAY_COMPLEX_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/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(PATH_ARRAY_SIMPLE) + @io.micronaut.http.annotation.Get("/response/array-simple") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arraySimple(); - @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_EMPTY) + @io.micronaut.http.annotation.Get("/response/array-simple-empty") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse> arraySimpleEmpty(); - @io.micronaut.http.annotation.Get(PATH_ARRAY_SIMPLE_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/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(PATH_HEADER) + @io.micronaut.http.annotation.Get("/response/header") io.micronaut.http.HttpResponse header(); - @io.micronaut.http.annotation.Get(PATH_MULTIPLE_DATA_TYPES) + @io.micronaut.http.annotation.Get("/response/multiple-datatypes") @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(PATH_MULTIPLE_DATA_TYPES_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/multiple-datatypes-not-found") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.core.annotation.NonNull @@ -65,14 +49,14 @@ io.micronaut.http.HttpResponse multipleDataTypesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get(PATH_MULTIPLE_RESPONSE_CODES) + @io.micronaut.http.annotation.Get("/response/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(PATH_MULTIPLE_RESPONSE_CODES_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/multiple-response-codes-not-found") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.core.annotation.NonNull @@ -82,26 +66,26 @@ io.micronaut.http.HttpResponse multipleResponseCodesNotFound( @io.micronaut.http.annotation.QueryValue(value = "found") java.lang.Boolean found); - @io.micronaut.http.annotation.Get(PATH_OPTIONAL) + @io.micronaut.http.annotation.Get("/response/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(PATH_SINGLE) + @io.micronaut.http.annotation.Get("/response/single") @io.micronaut.http.annotation.Produces({ "application/json" }) io.micronaut.http.HttpResponse single(); - @io.micronaut.http.annotation.Get(PATH_VOID_FOUND) + @io.micronaut.http.annotation.Get("/response/void") io.micronaut.http.HttpResponse voidFound(); - @io.micronaut.http.annotation.Get(PATH_VOID_NOT_FOUND) + @io.micronaut.http.annotation.Get("/response/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(PATH_WITH_DEFAULT) + @io.micronaut.http.annotation.Get("/response/default") io.micronaut.http.HttpResponse withDefault(); } diff --git a/gen/main/java/testapi/types/StringModel.java b/gen/main/java/testapi/types/StringModel.java index 0e30efb9..419ed146 100644 --- a/gen/main/java/testapi/types/StringModel.java +++ b/gen/main/java/testapi/types/StringModel.java @@ -3,10 +3,8 @@ @io.micronaut.serde.annotation.Serdeable public class StringModel { - public static final java.lang.String JSON_PROPERTY_FOO = "foo"; - @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + @com.fasterxml.jackson.annotation.JsonProperty("foo") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.lang.String foo; diff --git a/gen/main/java/testapi/types/ValidationApi.java b/gen/main/java/testapi/types/ValidationApi.java index f2dc745b..cd2a8639 100644 --- a/gen/main/java/testapi/types/ValidationApi.java +++ b/gen/main/java/testapi/types/ValidationApi.java @@ -3,43 +3,21 @@ @io.micronaut.validation.Validated public interface ValidationApi { - java.lang.String PATH_VALIDATION_DOUBLE_MAX = "/validation/double/max"; - java.lang.String PATH_VALIDATION_DOUBLE_MIN = "/validation/double/min"; - java.lang.String PATH_VALIDATION_DOUBLE_RANGE = "/validation/double/range"; - java.lang.String PATH_VALIDATION_FLOAT_MAX = "/validation/float/max"; - java.lang.String PATH_VALIDATION_FLOAT_MIN = "/validation/float/min"; - java.lang.String PATH_VALIDATION_FLOAT_RANGE = "/validation/float/range"; - 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_MODEL = "/validation/list/model"; - java.lang.String PATH_VALIDATION_LIST_RANGE = "/validation/list/range"; - 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"; - java.lang.String PATH_VALIDATION_MODEL = "/validation/model"; - java.lang.String PATH_VALIDATION_STRING_MAX = "/validation/string/max"; - java.lang.String PATH_VALIDATION_STRING_MIN = "/validation/string/min"; - 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(PATH_VALIDATION_DOUBLE_MAX) + @io.micronaut.http.annotation.Get("/validation/double/max") io.micronaut.http.HttpResponse validationDoubleMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = false) java.math.BigDecimal number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_MIN) + @io.micronaut.http.annotation.Get("/validation/double/min") io.micronaut.http.HttpResponse validationDoubleMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @jakarta.validation.constraints.DecimalMin(value = "3", inclusive = false) java.math.BigDecimal number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_DOUBLE_RANGE) + @io.micronaut.http.annotation.Get("/validation/double/range") io.micronaut.http.HttpResponse validationDoubleRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @@ -47,21 +25,21 @@ io.micronaut.http.HttpResponse validationDoubleRange( @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = true) java.math.BigDecimal number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MAX) + @io.micronaut.http.annotation.Get("/validation/float/max") io.micronaut.http.HttpResponse validationFloatMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = false) java.lang.Float number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_MIN) + @io.micronaut.http.annotation.Get("/validation/float/min") io.micronaut.http.HttpResponse validationFloatMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @jakarta.validation.constraints.DecimalMin(value = "3", inclusive = false) java.lang.Float number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_FLOAT_RANGE) + @io.micronaut.http.annotation.Get("/validation/float/range") io.micronaut.http.HttpResponse validationFloatRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "number") @@ -69,21 +47,21 @@ io.micronaut.http.HttpResponse validationFloatRange( @jakarta.validation.constraints.DecimalMax(value = "4", inclusive = true) java.lang.Float number); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MAX) + @io.micronaut.http.annotation.Get("/validation/integer/max") io.micronaut.http.HttpResponse validationIntegerMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @jakarta.validation.constraints.Max(4) java.lang.Integer integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_MIN) + @io.micronaut.http.annotation.Get("/validation/integer/min") io.micronaut.http.HttpResponse validationIntegerMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @jakarta.validation.constraints.Min(3) java.lang.Integer integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_INTEGER_RANGE) + @io.micronaut.http.annotation.Get("/validation/integer/range") io.micronaut.http.HttpResponse validationIntegerRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @@ -91,21 +69,21 @@ io.micronaut.http.HttpResponse validationIntegerRange( @jakarta.validation.constraints.Max(4) java.lang.Integer integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MAX) + @io.micronaut.http.annotation.Get("/validation/list/max") io.micronaut.http.HttpResponse validationListMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @jakarta.validation.constraints.Size(max = 4) java.util.List list); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LIST_MIN) + @io.micronaut.http.annotation.Get("/validation/list/min") io.micronaut.http.HttpResponse validationListMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @jakarta.validation.constraints.Size(min = 3) java.util.List list); - @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_MODEL) + @io.micronaut.http.annotation.Post("/validation/list/model") @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse validationListModel( @io.micronaut.core.annotation.NonNull @@ -113,28 +91,28 @@ io.micronaut.http.HttpResponse validationListModel( @jakarta.validation.Valid java.util.List stringModel); - @io.micronaut.http.annotation.Post(PATH_VALIDATION_LIST_RANGE) + @io.micronaut.http.annotation.Post("/validation/list/range") io.micronaut.http.HttpResponse validationListRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue @jakarta.validation.constraints.Size(min = 3, max = 4) java.util.List list); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MAX) + @io.micronaut.http.annotation.Get("/validation/long/max") io.micronaut.http.HttpResponse validationLongMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @jakarta.validation.constraints.Max(4) java.lang.Long integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_MIN) + @io.micronaut.http.annotation.Get("/validation/long/min") io.micronaut.http.HttpResponse validationLongMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @jakarta.validation.constraints.Min(3) java.lang.Long integer); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_LONG_RANGE) + @io.micronaut.http.annotation.Get("/validation/long/range") io.micronaut.http.HttpResponse validationLongRange( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "integer") @@ -142,7 +120,7 @@ io.micronaut.http.HttpResponse validationLongRange( @jakarta.validation.constraints.Max(4) java.lang.Long integer); - @io.micronaut.http.annotation.Post(PATH_VALIDATION_MODEL) + @io.micronaut.http.annotation.Post("/validation/model") @io.micronaut.http.annotation.Consumes({ "application/json" }) io.micronaut.http.HttpResponse validationModel( @io.micronaut.core.annotation.NonNull @@ -150,28 +128,28 @@ io.micronaut.http.HttpResponse validationModel( @jakarta.validation.Valid StringModel stringModel); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MAX) + @io.micronaut.http.annotation.Get("/validation/string/max") io.micronaut.http.HttpResponse validationStringMax( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @jakarta.validation.constraints.Size(max = 4) java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_MIN) + @io.micronaut.http.annotation.Get("/validation/string/min") io.micronaut.http.HttpResponse validationStringMin( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @jakarta.validation.constraints.Size(min = 3) java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_PATTERN) + @io.micronaut.http.annotation.Get("/validation/string/pattern") io.micronaut.http.HttpResponse validationStringPattern( @io.micronaut.core.annotation.NonNull @io.micronaut.http.annotation.QueryValue(value = "string") @jakarta.validation.constraints.Pattern(regexp = "[a-z]{3,5}") java.lang.String string); - @io.micronaut.http.annotation.Get(PATH_VALIDATION_STRING_RANGE) + @io.micronaut.http.annotation.Get("/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_pojo/AdditionalPropertiesModel.java b/gen/main/java/testmodel/micronaut_pojo/AdditionalPropertiesModel.java index 21c1f9aa..1952522f 100644 --- a/gen/main/java/testmodel/micronaut_pojo/AdditionalPropertiesModel.java +++ b/gen/main/java/testmodel/micronaut_pojo/AdditionalPropertiesModel.java @@ -4,9 +4,7 @@ @io.micronaut.serde.annotation.Serdeable public class AdditionalPropertiesModel { - public static final java.lang.String JSON_PROPERTY_ID = "id"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ID) + @com.fasterxml.jackson.annotation.JsonProperty("id") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String id; diff --git a/gen/main/java/testmodel/micronaut_pojo/EnumerationModel.java b/gen/main/java/testmodel/micronaut_pojo/EnumerationModel.java index a12cca45..e686cbdd 100644 --- a/gen/main/java/testmodel/micronaut_pojo/EnumerationModel.java +++ b/gen/main/java/testmodel/micronaut_pojo/EnumerationModel.java @@ -4,24 +4,19 @@ @io.micronaut.serde.annotation.Serdeable public class EnumerationModel { - public static final java.lang.String JSON_PROPERTY_STRING = "string"; - public static final java.lang.String JSON_PROPERTY_STRING_DEFAULT = "string-default"; - public static final java.lang.String JSON_PROPERTY_EMBEDDED = "embedded"; - public static final java.lang.String JSON_PROPERTY_EMBEDDED_DEFAULT = "embedded-default"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_STRING) + @com.fasterxml.jackson.annotation.JsonProperty("string") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private EnumerationString string; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_STRING_DEFAULT) + @com.fasterxml.jackson.annotation.JsonProperty("string-default") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private EnumerationStringDefault stringDefault = EnumerationStringDefault.THREE; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_EMBEDDED) + @com.fasterxml.jackson.annotation.JsonProperty("embedded") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private Embedded embedded; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_EMBEDDED_DEFAULT) + @com.fasterxml.jackson.annotation.JsonProperty("embedded-default") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private EmbeddedDefault embeddedDefault = EmbeddedDefault.FOUR; diff --git a/gen/main/java/testmodel/micronaut_pojo/FirstModel.java b/gen/main/java/testmodel/micronaut_pojo/FirstModel.java index d6722eef..dfb41459 100644 --- a/gen/main/java/testmodel/micronaut_pojo/FirstModel.java +++ b/gen/main/java/testmodel/micronaut_pojo/FirstModel.java @@ -4,20 +4,16 @@ @io.micronaut.serde.annotation.Serdeable public final class FirstModel implements OneOfModel { - public static final java.lang.String JSON_PROPERTY_TYPE = "type"; - public static final java.lang.String JSON_PROPERTY_FIRST = "first"; - public static final java.lang.String JSON_PROPERTY_SECOND_LEVEL = "secondLevel"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE) + @com.fasterxml.jackson.annotation.JsonProperty("type") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String type; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FIRST) + @com.fasterxml.jackson.annotation.JsonProperty("first") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String first; @jakarta.validation.Valid - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_SECOND_LEVEL) + @com.fasterxml.jackson.annotation.JsonProperty("secondLevel") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private SecondLevelModel secondLevel; diff --git a/gen/main/java/testmodel/micronaut_pojo/InheritanceExtended.java b/gen/main/java/testmodel/micronaut_pojo/InheritanceExtended.java index 33666252..e30d0ea4 100644 --- a/gen/main/java/testmodel/micronaut_pojo/InheritanceExtended.java +++ b/gen/main/java/testmodel/micronaut_pojo/InheritanceExtended.java @@ -4,15 +4,13 @@ @io.micronaut.serde.annotation.Serdeable public final class InheritanceExtended implements InheritanceSimple { - public static final java.lang.String JSON_PROPERTY_BAR = "bar"; - @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + @com.fasterxml.jackson.annotation.JsonProperty("foo") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.lang.String foo; @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BAR) + @com.fasterxml.jackson.annotation.JsonProperty("bar") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.lang.String bar; diff --git a/gen/main/java/testmodel/micronaut_pojo/InheritanceSimple.java b/gen/main/java/testmodel/micronaut_pojo/InheritanceSimple.java index 314c8325..c1b0fd0a 100644 --- a/gen/main/java/testmodel/micronaut_pojo/InheritanceSimple.java +++ b/gen/main/java/testmodel/micronaut_pojo/InheritanceSimple.java @@ -4,12 +4,11 @@ @com.fasterxml.jackson.databind.annotation.JsonDeserialize(as = InheritanceSimpleDefault.class) public sealed interface InheritanceSimple permits InheritanceExtended, InheritanceSimpleDefault { - java.lang.String JSON_PROPERTY_FOO = "foo"; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + @com.fasterxml.jackson.annotation.JsonProperty("foo") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) java.lang.String getFoo(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + @com.fasterxml.jackson.annotation.JsonProperty("foo") void setFoo(java.lang.String newFoo); } diff --git a/gen/main/java/testmodel/micronaut_pojo/InheritanceSimpleDefault.java b/gen/main/java/testmodel/micronaut_pojo/InheritanceSimpleDefault.java index 767ff909..8d9a0867 100644 --- a/gen/main/java/testmodel/micronaut_pojo/InheritanceSimpleDefault.java +++ b/gen/main/java/testmodel/micronaut_pojo/InheritanceSimpleDefault.java @@ -5,7 +5,7 @@ public final class InheritanceSimpleDefault implements InheritanceSimple { @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + @com.fasterxml.jackson.annotation.JsonProperty("foo") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.lang.String foo; diff --git a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType.java b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType.java index c439487d..ded4f429 100644 --- a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType.java +++ b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType.java @@ -1,7 +1,7 @@ package testmodel.micronaut_pojo; @jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") -@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = InheritanceWithEnumType.JSON_DISCRIMINATOR) +@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = "type") @com.fasterxml.jackson.annotation.JsonSubTypes({ @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithEnumType1.class, name = "Inheritance1"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithEnumType2.class, name = "Inheritance2"), @@ -9,8 +9,6 @@ }) public sealed interface InheritanceWithEnumType permits InheritanceWithEnumType1, InheritanceWithEnumType2, InheritanceWithEnumType3 { - java.lang.String JSON_DISCRIMINATOR = "type"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_DISCRIMINATOR) + @com.fasterxml.jackson.annotation.JsonProperty("type") InheritanceWithEnumTypeEnum getType(); } diff --git a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType1.java b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType1.java index 94e0f134..ebf53a7e 100644 --- a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType1.java +++ b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType1.java @@ -4,9 +4,7 @@ @io.micronaut.serde.annotation.Serdeable public final class InheritanceWithEnumType1 implements InheritanceWithEnumType { - public static final java.lang.String JSON_PROPERTY_D = "d"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_D) + @com.fasterxml.jackson.annotation.JsonProperty("d") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String d; diff --git a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType2.java b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType2.java index a1e3e36b..d5b82abf 100644 --- a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType2.java +++ b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithEnumType2.java @@ -4,9 +4,7 @@ @io.micronaut.serde.annotation.Serdeable public final class InheritanceWithEnumType2 implements InheritanceWithEnumType { - public static final java.lang.String JSON_PROPERTY_E = "e"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_E) + @com.fasterxml.jackson.annotation.JsonProperty("e") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String e; diff --git a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithStringType.java b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithStringType.java index 096f81c4..317fada3 100644 --- a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithStringType.java +++ b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithStringType.java @@ -1,23 +1,20 @@ package testmodel.micronaut_pojo; @jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") -@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = InheritanceWithStringType.JSON_DISCRIMINATOR) +@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = "type") @com.fasterxml.jackson.annotation.JsonSubTypes({ @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithStringType1.class, name = "Inheritance1"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithStringType2.class, name = "Inheritance2") }) public sealed interface InheritanceWithStringType permits InheritanceWithStringType1, InheritanceWithStringType2 { - java.lang.String JSON_DISCRIMINATOR = "type"; - java.lang.String JSON_PROPERTY_A = "a"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_DISCRIMINATOR) + @com.fasterxml.jackson.annotation.JsonProperty("type") java.lang.String getType(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + @com.fasterxml.jackson.annotation.JsonProperty("a") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.lang.String getA(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + @com.fasterxml.jackson.annotation.JsonProperty("a") void setA(java.lang.String newA); } diff --git a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithStringType1.java b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithStringType1.java index 6054cce3..7dab7a51 100644 --- a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithStringType1.java +++ b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithStringType1.java @@ -4,13 +4,11 @@ @io.micronaut.serde.annotation.Serdeable public final class InheritanceWithStringType1 implements InheritanceWithStringType { - public static final java.lang.String JSON_PROPERTY_B = "b"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + @com.fasterxml.jackson.annotation.JsonProperty("a") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String a; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_B) + @com.fasterxml.jackson.annotation.JsonProperty("b") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String b; diff --git a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithStringType2.java b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithStringType2.java index 55ff5f8d..f9e2c172 100644 --- a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithStringType2.java +++ b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithStringType2.java @@ -4,13 +4,11 @@ @io.micronaut.serde.annotation.Serdeable public final class InheritanceWithStringType2 implements InheritanceWithStringType { - public static final java.lang.String JSON_PROPERTY_C = "c"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + @com.fasterxml.jackson.annotation.JsonProperty("a") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String a; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_C) + @com.fasterxml.jackson.annotation.JsonProperty("c") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String c; diff --git a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithoutType.java b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithoutType.java index f8ced25e..7b680455 100644 --- a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithoutType.java +++ b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithoutType.java @@ -1,23 +1,20 @@ package testmodel.micronaut_pojo; @jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") -@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = InheritanceWithoutType.JSON_DISCRIMINATOR) +@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = "type") @com.fasterxml.jackson.annotation.JsonSubTypes({ @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithoutType1.class, name = "Inheritance1"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithoutType2.class, name = "Inheritance2") }) public sealed interface InheritanceWithoutType permits InheritanceWithoutType1, InheritanceWithoutType2 { - java.lang.String JSON_DISCRIMINATOR = "type"; - java.lang.String JSON_PROPERTY_E = "e"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_DISCRIMINATOR) + @com.fasterxml.jackson.annotation.JsonProperty("type") java.lang.String getType(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_E) + @com.fasterxml.jackson.annotation.JsonProperty("e") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.lang.String getE(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_E) + @com.fasterxml.jackson.annotation.JsonProperty("e") void setE(java.lang.String newE); } diff --git a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithoutType1.java b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithoutType1.java index c4f55eec..b73ee613 100644 --- a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithoutType1.java +++ b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithoutType1.java @@ -4,13 +4,11 @@ @io.micronaut.serde.annotation.Serdeable public final class InheritanceWithoutType1 implements InheritanceWithoutType { - public static final java.lang.String JSON_PROPERTY_F = "f"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_E) + @com.fasterxml.jackson.annotation.JsonProperty("e") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String e; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_F) + @com.fasterxml.jackson.annotation.JsonProperty("f") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String f; diff --git a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithoutType2.java b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithoutType2.java index d23bfec1..c4f9f915 100644 --- a/gen/main/java/testmodel/micronaut_pojo/InheritanceWithoutType2.java +++ b/gen/main/java/testmodel/micronaut_pojo/InheritanceWithoutType2.java @@ -4,13 +4,11 @@ @io.micronaut.serde.annotation.Serdeable public final class InheritanceWithoutType2 implements InheritanceWithoutType { - public static final java.lang.String JSON_PROPERTY_G = "g"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_E) + @com.fasterxml.jackson.annotation.JsonProperty("e") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String e; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_G) + @com.fasterxml.jackson.annotation.JsonProperty("g") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String g; diff --git a/gen/main/java/testmodel/micronaut_pojo/Model.java b/gen/main/java/testmodel/micronaut_pojo/Model.java index 4e6bf0fd..e3163e97 100644 --- a/gen/main/java/testmodel/micronaut_pojo/Model.java +++ b/gen/main/java/testmodel/micronaut_pojo/Model.java @@ -4,165 +4,133 @@ @io.micronaut.serde.annotation.Serdeable public class Model { - public static final java.lang.String JSON_PROPERTY_ID = "id"; - public static final java.lang.String JSON_PROPERTY_ID_WITH_EXAMPLE = "idWithExample"; - public static final java.lang.String JSON_PROPERTY_ID_WITH_DEFAULT = "idWithDefault"; - public static final java.lang.String JSON_PROPERTY_NAME = "name"; - public static final java.lang.String JSON_PROPERTY_NAME_WITH_EXAMPLE = "nameWithExample"; - public static final java.lang.String JSON_PROPERTY_NAME_WITH_DEFAULT = "nameWithDefault"; - public static final java.lang.String JSON_PROPERTY_DATE = "date"; - public static final java.lang.String JSON_PROPERTY_DATE_WITH_EXAMPLE = "dateWithExample"; - public static final java.lang.String JSON_PROPERTY_DATE_TIME = "date-time"; - public static final java.lang.String JSON_PROPERTY_DATE_TIME_WITH_EXAMPLE = "date-timeWithExample"; - public static final java.lang.String JSON_PROPERTY_NUMBER = "number"; - public static final java.lang.String JSON_PROPERTY_BINARY = "binary"; - public static final java.lang.String JSON_PROPERTY_BYTES = "bytes"; - public static final java.lang.String JSON_PROPERTY_ANY = "any"; - public static final java.lang.String JSON_PROPERTY_ARRAY = "array"; - public static final java.lang.String JSON_PROPERTY_ARRAY_WITH_EXAMPLE = "arrayWithExample"; - public static final java.lang.String JSON_PROPERTY_SET = "set"; - public static final java.lang.String JSON_PROPERTY_SET_WITH_EXAMPLES = "setWithExamples"; - public static final java.lang.String JSON_PROPERTY_MAP = "map"; - public static final java.lang.String JSON_PROPERTY_MAP_WITH_EXAMPLE = "mapWithExample"; - public static final java.lang.String JSON_PROPERTY_OPTIONAL_ARRAY = "optionalArray"; - public static final java.lang.String JSON_PROPERTY_OPTIONAL_SET = "optionalSet"; - public static final java.lang.String JSON_PROPERTY_OPTIONAL_MAP = "optionalMap"; - public static final java.lang.String JSON_PROPERTY_NULLABLE_STRING = "nullableString"; - public static final java.lang.String JSON_PROPERTY_NULLABLE_ARRAY = "nullableArray"; - public static final java.lang.String JSON_PROPERTY_NULLABLE_SET = "nullableSet"; - public static final java.lang.String JSON_PROPERTY_DEFAULT_STRING = "defaultString"; - public static final java.lang.String JSON_PROPERTY_DEFAULT_INTEGER = "defaultInteger"; - public static final java.lang.String JSON_PROPERTY_DEFAULT_LONG = "defaultLong"; - public static final java.lang.String JSON_PROPERTY_DEFAULT_NULLABLE = "defaultNullable"; - public static final java.lang.String JSON_PROPERTY_REFERENED_MODEL = "referenedModel"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ID) + @com.fasterxml.jackson.annotation.JsonProperty("id") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer id; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ID_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonProperty("idWithExample") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer idWithExample; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ID_WITH_DEFAULT) + @com.fasterxml.jackson.annotation.JsonProperty("idWithDefault") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer idWithDefault = 32; @jakarta.validation.constraints.NotNull @jakarta.validation.constraints.Size(max = 36) - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NAME) + @com.fasterxml.jackson.annotation.JsonProperty("name") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.lang.String name; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NAME_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonProperty("nameWithExample") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String nameWithExample; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NAME_WITH_DEFAULT) + @com.fasterxml.jackson.annotation.JsonProperty("nameWithDefault") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String nameWithDefault = "MyDefaultName"; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE) + @com.fasterxml.jackson.annotation.JsonProperty("date") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.time.LocalDate date; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonProperty("dateWithExample") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.time.LocalDate dateWithExample; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE_TIME) + @com.fasterxml.jackson.annotation.JsonProperty("date-time") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.time.Instant dateTime; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE_TIME_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonProperty("date-timeWithExample") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.time.Instant dateTimeWithExample; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NUMBER) + @com.fasterxml.jackson.annotation.JsonProperty("number") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Double number; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BINARY) + @com.fasterxml.jackson.annotation.JsonProperty("binary") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private byte[] binary; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BYTES) + @com.fasterxml.jackson.annotation.JsonProperty("bytes") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private byte[] bytes; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ANY) + @com.fasterxml.jackson.annotation.JsonProperty("any") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT) private java.lang.Object any; @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ARRAY) + @com.fasterxml.jackson.annotation.JsonProperty("array") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.util.List array = new java.util.ArrayList<>(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ARRAY_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonProperty("arrayWithExample") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.List arrayWithExample; @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_SET) + @com.fasterxml.jackson.annotation.JsonProperty("set") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.util.Set set = new java.util.LinkedHashSet<>(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_SET_WITH_EXAMPLES) + @com.fasterxml.jackson.annotation.JsonProperty("setWithExamples") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.Set setWithExamples; @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_MAP) + @com.fasterxml.jackson.annotation.JsonProperty("map") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.util.Map map = new java.util.HashMap<>(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_MAP_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonProperty("mapWithExample") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.Map mapWithExample; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_OPTIONAL_ARRAY) + @com.fasterxml.jackson.annotation.JsonProperty("optionalArray") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.List optionalArray; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_OPTIONAL_SET) + @com.fasterxml.jackson.annotation.JsonProperty("optionalSet") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.Set optionalSet; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_OPTIONAL_MAP) + @com.fasterxml.jackson.annotation.JsonProperty("optionalMap") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.Map optionalMap; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NULLABLE_STRING) + @com.fasterxml.jackson.annotation.JsonProperty("nullableString") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT) private java.lang.String nullableString; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NULLABLE_ARRAY) + @com.fasterxml.jackson.annotation.JsonProperty("nullableArray") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT) private java.util.List nullableArray; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NULLABLE_SET) + @com.fasterxml.jackson.annotation.JsonProperty("nullableSet") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT) private java.util.Set nullableSet; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DEFAULT_STRING) + @com.fasterxml.jackson.annotation.JsonProperty("defaultString") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String defaultString = "defaultStringValue"; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DEFAULT_INTEGER) + @com.fasterxml.jackson.annotation.JsonProperty("defaultInteger") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer defaultInteger = 1234; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DEFAULT_LONG) + @com.fasterxml.jackson.annotation.JsonProperty("defaultLong") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Long defaultLong = 5678l; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DEFAULT_NULLABLE) + @com.fasterxml.jackson.annotation.JsonProperty("defaultNullable") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT) private java.lang.String defaultNullable; @jakarta.validation.Valid - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_REFERENED_MODEL) + @com.fasterxml.jackson.annotation.JsonProperty("referenedModel") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private EnumerationModel referenedModel; diff --git a/gen/main/java/testmodel/micronaut_pojo/OneOfImplementor1.java b/gen/main/java/testmodel/micronaut_pojo/OneOfImplementor1.java index aea400ce..a7e3abd2 100644 --- a/gen/main/java/testmodel/micronaut_pojo/OneOfImplementor1.java +++ b/gen/main/java/testmodel/micronaut_pojo/OneOfImplementor1.java @@ -4,9 +4,7 @@ @io.micronaut.serde.annotation.Serdeable public final class OneOfImplementor1 implements OneOfInterface { - public static final java.lang.String JSON_PROPERTY_PROPERTY = "property"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_PROPERTY) + @com.fasterxml.jackson.annotation.JsonProperty("property") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String property; diff --git a/gen/main/java/testmodel/micronaut_pojo/OneOfImplementor2.java b/gen/main/java/testmodel/micronaut_pojo/OneOfImplementor2.java index 7bb721b0..4f62b4c0 100644 --- a/gen/main/java/testmodel/micronaut_pojo/OneOfImplementor2.java +++ b/gen/main/java/testmodel/micronaut_pojo/OneOfImplementor2.java @@ -4,9 +4,7 @@ @io.micronaut.serde.annotation.Serdeable public final class OneOfImplementor2 implements OneOfInterface { - public static final java.lang.String JSON_PROPERTY_PROPERTY = "property"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_PROPERTY) + @com.fasterxml.jackson.annotation.JsonProperty("property") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Double property; diff --git a/gen/main/java/testmodel/micronaut_pojo/OneOfInterface.java b/gen/main/java/testmodel/micronaut_pojo/OneOfInterface.java index fd6cd15f..fb513107 100644 --- a/gen/main/java/testmodel/micronaut_pojo/OneOfInterface.java +++ b/gen/main/java/testmodel/micronaut_pojo/OneOfInterface.java @@ -1,15 +1,13 @@ package testmodel.micronaut_pojo; @jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") -@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = OneOfInterface.JSON_DISCRIMINATOR) +@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = "type") @com.fasterxml.jackson.annotation.JsonSubTypes({ @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = OneOfImplementor1.class, name = "Implementation1"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = OneOfImplementor2.class, name = "Implementation2"), }) public sealed interface OneOfInterface permits OneOfImplementor1, OneOfImplementor2 { - java.lang.String JSON_DISCRIMINATOR = "type"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_DISCRIMINATOR) + @com.fasterxml.jackson.annotation.JsonProperty("type") java.lang.String getType(); } diff --git a/gen/main/java/testmodel/micronaut_pojo/PropertyTypeOne.java b/gen/main/java/testmodel/micronaut_pojo/PropertyTypeOne.java index 6505139f..2fa743e6 100644 --- a/gen/main/java/testmodel/micronaut_pojo/PropertyTypeOne.java +++ b/gen/main/java/testmodel/micronaut_pojo/PropertyTypeOne.java @@ -4,9 +4,7 @@ @io.micronaut.serde.annotation.Serdeable public final class PropertyTypeOne implements AdditionalPropertiesModelValue { - public static final java.lang.String JSON_PROPERTY_TYPE = "type"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE) + @com.fasterxml.jackson.annotation.JsonProperty("type") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private Type type; diff --git a/gen/main/java/testmodel/micronaut_pojo/PropertyTypeTwo.java b/gen/main/java/testmodel/micronaut_pojo/PropertyTypeTwo.java index 9e11edc0..0632d286 100644 --- a/gen/main/java/testmodel/micronaut_pojo/PropertyTypeTwo.java +++ b/gen/main/java/testmodel/micronaut_pojo/PropertyTypeTwo.java @@ -4,9 +4,7 @@ @io.micronaut.serde.annotation.Serdeable public final class PropertyTypeTwo implements AdditionalPropertiesModelValue { - public static final java.lang.String JSON_PROPERTY_TYPE = "type"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE) + @com.fasterxml.jackson.annotation.JsonProperty("type") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private Type type; diff --git a/gen/main/java/testmodel/micronaut_pojo/SecondLevelOneModel.java b/gen/main/java/testmodel/micronaut_pojo/SecondLevelOneModel.java index 5551892f..192372f9 100644 --- a/gen/main/java/testmodel/micronaut_pojo/SecondLevelOneModel.java +++ b/gen/main/java/testmodel/micronaut_pojo/SecondLevelOneModel.java @@ -4,14 +4,11 @@ @io.micronaut.serde.annotation.Serdeable public final class SecondLevelOneModel implements SecondLevelModel { - public static final java.lang.String JSON_PROPERTY_TYPE = "type"; - public static final java.lang.String JSON_PROPERTY_ONE = "one"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE) + @com.fasterxml.jackson.annotation.JsonProperty("type") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String type; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ONE) + @com.fasterxml.jackson.annotation.JsonProperty("one") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String one; diff --git a/gen/main/java/testmodel/micronaut_pojo/SecondLevelTwoModel.java b/gen/main/java/testmodel/micronaut_pojo/SecondLevelTwoModel.java index 128de999..2e7b8f8a 100644 --- a/gen/main/java/testmodel/micronaut_pojo/SecondLevelTwoModel.java +++ b/gen/main/java/testmodel/micronaut_pojo/SecondLevelTwoModel.java @@ -4,14 +4,11 @@ @io.micronaut.serde.annotation.Serdeable public final class SecondLevelTwoModel implements SecondLevelModel { - public static final java.lang.String JSON_PROPERTY_TYPE = "type"; - public static final java.lang.String JSON_PROPERTY_TWO = "two"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE) + @com.fasterxml.jackson.annotation.JsonProperty("type") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String type; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TWO) + @com.fasterxml.jackson.annotation.JsonProperty("two") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String two; diff --git a/gen/main/java/testmodel/micronaut_pojo_constants/AdditionalPropertiesModel.java b/gen/main/java/testmodel/micronaut_pojo_constants/AdditionalPropertiesModel.java new file mode 100644 index 00000000..f6d421c6 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_pojo_constants/AdditionalPropertiesModel.java @@ -0,0 +1,72 @@ +package testmodel.micronaut_pojo_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public class AdditionalPropertiesModel { + + public static final java.lang.String JSON_PROPERTY_ID = "id"; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ID) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.String id; + + private java.util.Map additionalProperties; + + // methods + + @Override + public boolean equals(Object object) { + if (object == this) { + return true; + } + if (object == null || getClass() != object.getClass()) { + return false; + } + AdditionalPropertiesModel other = (AdditionalPropertiesModel) object; + return java.util.Objects.equals(id, other.id); + } + + @Override + public int hashCode() { + return java.util.Objects.hash(id); + } + + @Override + public java.lang.String toString() { + return new java.lang.StringBuilder() + .append("AdditionalPropertiesModel[") + .append("id=").append(id) + .append("]") + .toString(); + } + + // fluent + + public AdditionalPropertiesModel id(java.lang.String newId) { + this.id = newId; + return this; + } + + @com.fasterxml.jackson.annotation.JsonAnyGetter + public java.util.Map getAdditionalProperties() { + return additionalProperties; + } + + @com.fasterxml.jackson.annotation.JsonAnySetter + public void setAdditionalProperties(java.lang.String propertyKey, AdditionalPropertiesModelValue value) { + if (this.additionalProperties == null) { + this.additionalProperties = new java.util.HashMap<>(); + } + this.additionalProperties.put(propertyKey, value); + } + + // getter/setter + + public java.lang.String getId() { + return id; + } + + public void setId(java.lang.String newId) { + this.id = newId; + } +} diff --git a/gen/main/java/testmodel/micronaut_pojo_constants/AdditionalPropertiesModelValue.java b/gen/main/java/testmodel/micronaut_pojo_constants/AdditionalPropertiesModelValue.java new file mode 100644 index 00000000..0c1a95a0 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_pojo_constants/AdditionalPropertiesModelValue.java @@ -0,0 +1,9 @@ +package testmodel.micronaut_pojo_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.DEDUCTION, visible = true) +@com.fasterxml.jackson.annotation.JsonSubTypes({ + @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = PropertyTypeOne.class), + @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = PropertyTypeTwo.class) +}) +public sealed interface AdditionalPropertiesModelValue permits PropertyTypeOne, PropertyTypeTwo {} diff --git a/gen/main/java/testmodel/micronaut_pojo_constants/EnumerationInteger.java b/gen/main/java/testmodel/micronaut_pojo_constants/EnumerationInteger.java new file mode 100644 index 00000000..1d474510 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_pojo_constants/EnumerationInteger.java @@ -0,0 +1,40 @@ +package testmodel.micronaut_pojo_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +public enum EnumerationInteger { + + NUMBER_MINUS_2147483648(-2147483648), + NUMBER_MINUS_1(-1), + NUMBER_0(0), + NUMBER_1(1), + NUMBER_2147483647(2147483647); + + public static final java.lang.Integer NUMBER_MINUS_2147483648_VALUE = -2147483648; + public static final java.lang.Integer NUMBER_MINUS_1_VALUE = -1; + public static final java.lang.Integer NUMBER_0_VALUE = 0; + public static final java.lang.Integer NUMBER_1_VALUE = 1; + public static final java.lang.Integer NUMBER_2147483647_VALUE = 2147483647; + + private final java.lang.Integer value; + + private EnumerationInteger(java.lang.Integer value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static EnumerationInteger toEnum(java.lang.Integer value) { + return toOptional(value).orElseThrow(() -> new IllegalArgumentException("Unknown value '" + value + "'.")); + } + + public static java.util.Optional toOptional(java.lang.Integer value) { + return java.util.Arrays + .stream(values()) + .filter(e -> e.value.equals(value)) + .findAny(); + } + + @com.fasterxml.jackson.annotation.JsonValue + public java.lang.Integer getValue() { + return value; + } +} diff --git a/gen/main/java/testmodel/micronaut_pojo_constants/EnumerationModel.java b/gen/main/java/testmodel/micronaut_pojo_constants/EnumerationModel.java new file mode 100644 index 00000000..14e3fefc --- /dev/null +++ b/gen/main/java/testmodel/micronaut_pojo_constants/EnumerationModel.java @@ -0,0 +1,181 @@ +package testmodel.micronaut_pojo_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public class EnumerationModel { + + public static final java.lang.String JSON_PROPERTY_STRING = "string"; + public static final java.lang.String JSON_PROPERTY_STRING_DEFAULT = "string-default"; + public static final java.lang.String JSON_PROPERTY_EMBEDDED = "embedded"; + public static final java.lang.String JSON_PROPERTY_EMBEDDED_DEFAULT = "embedded-default"; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_STRING) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private EnumerationString string; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_STRING_DEFAULT) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private EnumerationStringDefault stringDefault = EnumerationStringDefault.THREE; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_EMBEDDED) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private Embedded embedded; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_EMBEDDED_DEFAULT) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private EmbeddedDefault embeddedDefault = EmbeddedDefault.FOUR; + + // methods + + @Override + public boolean equals(Object object) { + if (object == this) { + return true; + } + if (object == null || getClass() != object.getClass()) { + return false; + } + EnumerationModel other = (EnumerationModel) object; + return java.util.Objects.equals(string, other.string) + && java.util.Objects.equals(stringDefault, other.stringDefault) + && java.util.Objects.equals(embedded, other.embedded) + && java.util.Objects.equals(embeddedDefault, other.embeddedDefault); + } + + @Override + public int hashCode() { + return java.util.Objects.hash(string, stringDefault, embedded, embeddedDefault); + } + + @Override + public java.lang.String toString() { + return new java.lang.StringBuilder() + .append("EnumerationModel[") + .append("string=").append(string).append(",") + .append("stringDefault=").append(stringDefault).append(",") + .append("embedded=").append(embedded).append(",") + .append("embeddedDefault=").append(embeddedDefault) + .append("]") + .toString(); + } + + // fluent + + public EnumerationModel string(EnumerationString newString) { + this.string = newString; + return this; + } + + public EnumerationModel stringDefault(EnumerationStringDefault newStringDefault) { + this.stringDefault = newStringDefault; + return this; + } + + public EnumerationModel embedded(Embedded newEmbedded) { + this.embedded = newEmbedded; + return this; + } + + public EnumerationModel embeddedDefault(EmbeddedDefault newEmbeddedDefault) { + this.embeddedDefault = newEmbeddedDefault; + return this; + } + + // getter/setter + + public EnumerationString getString() { + return string; + } + + public void setString(EnumerationString newString) { + this.string = newString; + } + + public EnumerationStringDefault getStringDefault() { + return stringDefault; + } + + public void setStringDefault(EnumerationStringDefault newStringDefault) { + this.stringDefault = newStringDefault; + } + + public Embedded getEmbedded() { + return embedded; + } + + public void setEmbedded(Embedded newEmbedded) { + this.embedded = newEmbedded; + } + + public EmbeddedDefault getEmbeddedDefault() { + return embeddedDefault; + } + + public void setEmbeddedDefault(EmbeddedDefault newEmbeddedDefault) { + this.embeddedDefault = newEmbeddedDefault; + } + +public enum Embedded { + + FIRST("first"), + SECOND("second"); + + public static final java.lang.String FIRST_VALUE = "first"; + public static final java.lang.String SECOND_VALUE = "second"; + + private final java.lang.String value; + + private Embedded(java.lang.String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static Embedded toEnum(java.lang.String value) { + return toOptional(value).orElseThrow(() -> new IllegalArgumentException("Unknown value '" + value + "'.")); + } + + public static java.util.Optional toOptional(java.lang.String value) { + return java.util.Arrays + .stream(values()) + .filter(e -> e.value.equals(value)) + .findAny(); + } + + @com.fasterxml.jackson.annotation.JsonValue + public java.lang.String getValue() { + return value; + } +} + +public enum EmbeddedDefault { + + THREE("three"), + FOUR("four"); + + public static final java.lang.String THREE_VALUE = "three"; + public static final java.lang.String FOUR_VALUE = "four"; + + private final java.lang.String value; + + private EmbeddedDefault(java.lang.String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static EmbeddedDefault toEnum(java.lang.String value) { + return toOptional(value).orElseThrow(() -> new IllegalArgumentException("Unknown value '" + value + "'.")); + } + + public static java.util.Optional toOptional(java.lang.String value) { + return java.util.Arrays + .stream(values()) + .filter(e -> e.value.equals(value)) + .findAny(); + } + + @com.fasterxml.jackson.annotation.JsonValue + public java.lang.String getValue() { + return value; + } +} +} diff --git a/gen/main/java/testmodel/micronaut_pojo_constants/EnumerationNumber.java b/gen/main/java/testmodel/micronaut_pojo_constants/EnumerationNumber.java new file mode 100644 index 00000000..4eac093a --- /dev/null +++ b/gen/main/java/testmodel/micronaut_pojo_constants/EnumerationNumber.java @@ -0,0 +1,36 @@ +package testmodel.micronaut_pojo_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +public enum EnumerationNumber { + + NUMBER_MINUS_1(-1D), + NUMBER_0(0D), + NUMBER_1(1D); + + public static final java.lang.Double NUMBER_MINUS_1_VALUE = -1D; + public static final java.lang.Double NUMBER_0_VALUE = 0D; + public static final java.lang.Double NUMBER_1_VALUE = 1D; + + private final java.lang.Double value; + + private EnumerationNumber(java.lang.Double value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static EnumerationNumber toEnum(java.lang.Double value) { + return toOptional(value).orElseThrow(() -> new IllegalArgumentException("Unknown value '" + value + "'.")); + } + + public static java.util.Optional toOptional(java.lang.Double value) { + return java.util.Arrays + .stream(values()) + .filter(e -> e.value.equals(value)) + .findAny(); + } + + @com.fasterxml.jackson.annotation.JsonValue + public java.lang.Double getValue() { + return value; + } +} diff --git a/gen/main/java/testmodel/micronaut_pojo_constants/EnumerationString.java b/gen/main/java/testmodel/micronaut_pojo_constants/EnumerationString.java new file mode 100644 index 00000000..baac8a33 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_pojo_constants/EnumerationString.java @@ -0,0 +1,34 @@ +package testmodel.micronaut_pojo_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +public enum EnumerationString { + + ONE("one"), + TWO("two"); + + public static final java.lang.String ONE_VALUE = "one"; + public static final java.lang.String TWO_VALUE = "two"; + + private final java.lang.String value; + + private EnumerationString(java.lang.String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static EnumerationString toEnum(java.lang.String value) { + return toOptional(value).orElseThrow(() -> new IllegalArgumentException("Unknown value '" + value + "'.")); + } + + public static java.util.Optional toOptional(java.lang.String value) { + return java.util.Arrays + .stream(values()) + .filter(e -> e.value.equals(value)) + .findAny(); + } + + @com.fasterxml.jackson.annotation.JsonValue + public java.lang.String getValue() { + return value; + } +} diff --git a/gen/main/java/testmodel/micronaut_pojo_constants/EnumerationStringDefault.java b/gen/main/java/testmodel/micronaut_pojo_constants/EnumerationStringDefault.java new file mode 100644 index 00000000..7ac4a5f7 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_pojo_constants/EnumerationStringDefault.java @@ -0,0 +1,34 @@ +package testmodel.micronaut_pojo_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +public enum EnumerationStringDefault { + + THREE("three"), + FOUR("four"); + + public static final java.lang.String THREE_VALUE = "three"; + public static final java.lang.String FOUR_VALUE = "four"; + + private final java.lang.String value; + + private EnumerationStringDefault(java.lang.String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static EnumerationStringDefault toEnum(java.lang.String value) { + return toOptional(value).orElseThrow(() -> new IllegalArgumentException("Unknown value '" + value + "'.")); + } + + public static java.util.Optional toOptional(java.lang.String value) { + return java.util.Arrays + .stream(values()) + .filter(e -> e.value.equals(value)) + .findAny(); + } + + @com.fasterxml.jackson.annotation.JsonValue + public java.lang.String getValue() { + return value; + } +} diff --git a/gen/main/java/testmodel/micronaut_pojo_constants/FirstModel.java b/gen/main/java/testmodel/micronaut_pojo_constants/FirstModel.java new file mode 100644 index 00000000..1fa33011 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_pojo_constants/FirstModel.java @@ -0,0 +1,98 @@ +package testmodel.micronaut_pojo_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public final class FirstModel implements OneOfModel { + + public static final java.lang.String JSON_PROPERTY_TYPE = "type"; + public static final java.lang.String JSON_PROPERTY_FIRST = "first"; + public static final java.lang.String JSON_PROPERTY_SECOND_LEVEL = "secondLevel"; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.String type; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FIRST) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.String first; + + @jakarta.validation.Valid + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_SECOND_LEVEL) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private SecondLevelModel secondLevel; + + // methods + + @Override + public boolean equals(Object object) { + if (object == this) { + return true; + } + if (object == null || getClass() != object.getClass()) { + return false; + } + FirstModel other = (FirstModel) object; + return java.util.Objects.equals(type, other.type) + && java.util.Objects.equals(first, other.first) + && java.util.Objects.equals(secondLevel, other.secondLevel); + } + + @Override + public int hashCode() { + return java.util.Objects.hash(type, first, secondLevel); + } + + @Override + public java.lang.String toString() { + return new java.lang.StringBuilder() + .append("FirstModel[") + .append("type=").append(type).append(",") + .append("first=").append(first).append(",") + .append("secondLevel=").append(secondLevel) + .append("]") + .toString(); + } + + // fluent + + public FirstModel type(java.lang.String newType) { + this.type = newType; + return this; + } + + public FirstModel first(java.lang.String newFirst) { + this.first = newFirst; + return this; + } + + public FirstModel secondLevel(SecondLevelModel newSecondLevel) { + this.secondLevel = newSecondLevel; + return this; + } + + // getter/setter + + public java.lang.String getType() { + return type; + } + + public void setType(java.lang.String newType) { + this.type = newType; + } + + public java.lang.String getFirst() { + return first; + } + + public void setFirst(java.lang.String newFirst) { + this.first = newFirst; + } + + public SecondLevelModel getSecondLevel() { + return secondLevel; + } + + public void setSecondLevel(SecondLevelModel newSecondLevel) { + this.secondLevel = newSecondLevel; + } +} diff --git a/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceExtended.java b/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceExtended.java new file mode 100644 index 00000000..bf1be845 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceExtended.java @@ -0,0 +1,78 @@ +package testmodel.micronaut_pojo_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public final class InheritanceExtended implements InheritanceSimple { + + public static final java.lang.String JSON_PROPERTY_BAR = "bar"; + + @jakarta.validation.constraints.NotNull + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) + private java.lang.String foo; + + @jakarta.validation.constraints.NotNull + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BAR) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) + private java.lang.String bar; + + // methods + + @Override + public boolean equals(Object object) { + if (object == this) { + return true; + } + if (object == null || getClass() != object.getClass()) { + return false; + } + InheritanceExtended other = (InheritanceExtended) object; + return java.util.Objects.equals(foo, other.foo) + && java.util.Objects.equals(bar, other.bar); + } + + @Override + public int hashCode() { + return java.util.Objects.hash(foo, bar); + } + + @Override + public java.lang.String toString() { + return new java.lang.StringBuilder() + .append("InheritanceExtended[") + .append("foo=").append(foo).append(",") + .append("bar=").append(bar) + .append("]") + .toString(); + } + + // fluent + + public InheritanceExtended foo(java.lang.String newFoo) { + this.foo = newFoo; + return this; + } + + public InheritanceExtended bar(java.lang.String newBar) { + this.bar = newBar; + return this; + } + + // getter/setter + + public java.lang.String getFoo() { + return foo; + } + + public void setFoo(java.lang.String newFoo) { + this.foo = newFoo; + } + + public java.lang.String getBar() { + return bar; + } + + public void setBar(java.lang.String newBar) { + this.bar = newBar; + } +} diff --git a/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceSimple.java b/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceSimple.java new file mode 100644 index 00000000..57999a65 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceSimple.java @@ -0,0 +1,15 @@ +package testmodel.micronaut_pojo_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@com.fasterxml.jackson.databind.annotation.JsonDeserialize(as = InheritanceSimpleDefault.class) +public sealed interface InheritanceSimple permits InheritanceExtended, InheritanceSimpleDefault { + + java.lang.String JSON_PROPERTY_FOO = "foo"; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) + java.lang.String getFoo(); + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + void setFoo(java.lang.String newFoo); +} diff --git a/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceSimpleDefault.java b/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceSimpleDefault.java new file mode 100644 index 00000000..132fe6c5 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceSimpleDefault.java @@ -0,0 +1,56 @@ +package testmodel.micronaut_pojo_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public final class InheritanceSimpleDefault implements InheritanceSimple { + + @jakarta.validation.constraints.NotNull + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) + private java.lang.String foo; + + // methods + + @Override + public boolean equals(Object object) { + if (object == this) { + return true; + } + if (object == null || getClass() != object.getClass()) { + return false; + } + InheritanceSimpleDefault other = (InheritanceSimpleDefault) object; + return java.util.Objects.equals(foo, other.foo); + } + + @Override + public int hashCode() { + return java.util.Objects.hash(foo); + } + + @Override + public java.lang.String toString() { + return new java.lang.StringBuilder() + .append("InheritanceSimpleDefault[") + .append("foo=").append(foo) + .append("]") + .toString(); + } + + // fluent + + public InheritanceSimpleDefault foo(java.lang.String newFoo) { + this.foo = newFoo; + return this; + } + + // getter/setter + + public java.lang.String getFoo() { + return foo; + } + + public void setFoo(java.lang.String newFoo) { + this.foo = newFoo; + } +} diff --git a/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithEnumType.java b/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithEnumType.java new file mode 100644 index 00000000..144e4c03 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithEnumType.java @@ -0,0 +1,16 @@ +package testmodel.micronaut_pojo_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = InheritanceWithEnumType.JSON_DISCRIMINATOR) +@com.fasterxml.jackson.annotation.JsonSubTypes({ + @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithEnumType1.class, name = "Inheritance1"), + @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithEnumType2.class, name = "Inheritance2"), + @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithEnumType3.class, name = "Inheritance3") +}) +public sealed interface InheritanceWithEnumType permits InheritanceWithEnumType1, InheritanceWithEnumType2, InheritanceWithEnumType3 { + + java.lang.String JSON_DISCRIMINATOR = "type"; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_DISCRIMINATOR) + InheritanceWithEnumTypeEnum getType(); +} diff --git a/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithEnumType1.java b/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithEnumType1.java new file mode 100644 index 00000000..c481cb4c --- /dev/null +++ b/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithEnumType1.java @@ -0,0 +1,62 @@ +package testmodel.micronaut_pojo_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public final class InheritanceWithEnumType1 implements InheritanceWithEnumType { + + public static final java.lang.String JSON_PROPERTY_D = "d"; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_D) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.String d; + + @Override + public InheritanceWithEnumTypeEnum getType() { + return InheritanceWithEnumTypeEnum.INHERITANCE1; + } + + // methods + + @Override + public boolean equals(Object object) { + if (object == this) { + return true; + } + if (object == null || getClass() != object.getClass()) { + return false; + } + InheritanceWithEnumType1 other = (InheritanceWithEnumType1) object; + return java.util.Objects.equals(d, other.d); + } + + @Override + public int hashCode() { + return java.util.Objects.hash(d); + } + + @Override + public java.lang.String toString() { + return new java.lang.StringBuilder() + .append("InheritanceWithEnumType1[") + .append("d=").append(d) + .append("]") + .toString(); + } + + // fluent + + public InheritanceWithEnumType1 d(java.lang.String newD) { + this.d = newD; + return this; + } + + // getter/setter + + public java.lang.String getD() { + return d; + } + + public void setD(java.lang.String newD) { + this.d = newD; + } +} diff --git a/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithEnumType2.java b/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithEnumType2.java new file mode 100644 index 00000000..5463ee0f --- /dev/null +++ b/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithEnumType2.java @@ -0,0 +1,62 @@ +package testmodel.micronaut_pojo_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public final class InheritanceWithEnumType2 implements InheritanceWithEnumType { + + public static final java.lang.String JSON_PROPERTY_E = "e"; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_E) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.String e; + + @Override + public InheritanceWithEnumTypeEnum getType() { + return InheritanceWithEnumTypeEnum.INHERITANCE2; + } + + // methods + + @Override + public boolean equals(Object object) { + if (object == this) { + return true; + } + if (object == null || getClass() != object.getClass()) { + return false; + } + InheritanceWithEnumType2 other = (InheritanceWithEnumType2) object; + return java.util.Objects.equals(e, other.e); + } + + @Override + public int hashCode() { + return java.util.Objects.hash(e); + } + + @Override + public java.lang.String toString() { + return new java.lang.StringBuilder() + .append("InheritanceWithEnumType2[") + .append("e=").append(e) + .append("]") + .toString(); + } + + // fluent + + public InheritanceWithEnumType2 e(java.lang.String newE) { + this.e = newE; + return this; + } + + // getter/setter + + public java.lang.String getE() { + return e; + } + + public void setE(java.lang.String newE) { + this.e = newE; + } +} diff --git a/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithEnumType3.java b/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithEnumType3.java new file mode 100644 index 00000000..e32d2dab --- /dev/null +++ b/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithEnumType3.java @@ -0,0 +1,37 @@ +package testmodel.micronaut_pojo_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public final class InheritanceWithEnumType3 implements InheritanceWithEnumType { + + @Override + public InheritanceWithEnumTypeEnum getType() { + return InheritanceWithEnumTypeEnum.INHERITANCE3; + } + + // methods + + @Override + public boolean equals(Object object) { + if (object == this) { + return true; + } + if (object == null || getClass() != object.getClass()) { + return false; + } + return super.equals(object); + } + + @Override + public int hashCode() { + return java.util.Objects.hash(); + } + + @Override + public java.lang.String toString() { + return new java.lang.StringBuilder() + .append("InheritanceWithEnumType3[") + .append("]") + .toString(); + } +} diff --git a/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithEnumTypeEnum.java b/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithEnumTypeEnum.java new file mode 100644 index 00000000..3a31c15d --- /dev/null +++ b/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithEnumTypeEnum.java @@ -0,0 +1,36 @@ +package testmodel.micronaut_pojo_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +public enum InheritanceWithEnumTypeEnum { + + INHERITANCE1("Inheritance1"), + INHERITANCE2("Inheritance2"), + INHERITANCE3("Inheritance3"); + + public static final java.lang.String INHERITANCE1_VALUE = "Inheritance1"; + public static final java.lang.String INHERITANCE2_VALUE = "Inheritance2"; + public static final java.lang.String INHERITANCE3_VALUE = "Inheritance3"; + + private final java.lang.String value; + + private InheritanceWithEnumTypeEnum(java.lang.String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static InheritanceWithEnumTypeEnum toEnum(java.lang.String value) { + return toOptional(value).orElseThrow(() -> new IllegalArgumentException("Unknown value '" + value + "'.")); + } + + public static java.util.Optional toOptional(java.lang.String value) { + return java.util.Arrays + .stream(values()) + .filter(e -> e.value.equals(value)) + .findAny(); + } + + @com.fasterxml.jackson.annotation.JsonValue + public java.lang.String getValue() { + return value; + } +} diff --git a/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithStringType.java b/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithStringType.java new file mode 100644 index 00000000..cedc5a75 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithStringType.java @@ -0,0 +1,23 @@ +package testmodel.micronaut_pojo_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = InheritanceWithStringType.JSON_DISCRIMINATOR) +@com.fasterxml.jackson.annotation.JsonSubTypes({ + @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithStringType1.class, name = "Inheritance1"), + @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithStringType2.class, name = "Inheritance2") +}) +public sealed interface InheritanceWithStringType permits InheritanceWithStringType1, InheritanceWithStringType2 { + + java.lang.String JSON_DISCRIMINATOR = "type"; + java.lang.String JSON_PROPERTY_A = "a"; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_DISCRIMINATOR) + java.lang.String getType(); + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.lang.String getA(); + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + void setA(java.lang.String newA); +} diff --git a/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithStringType1.java b/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithStringType1.java new file mode 100644 index 00000000..96307d37 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithStringType1.java @@ -0,0 +1,81 @@ +package testmodel.micronaut_pojo_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public final class InheritanceWithStringType1 implements InheritanceWithStringType { + + public static final java.lang.String JSON_PROPERTY_B = "b"; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.String a; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_B) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.String b; + + @Override + public java.lang.String getType() { + return "Inheritance1"; + } + + // methods + + @Override + public boolean equals(Object object) { + if (object == this) { + return true; + } + if (object == null || getClass() != object.getClass()) { + return false; + } + InheritanceWithStringType1 other = (InheritanceWithStringType1) object; + return java.util.Objects.equals(a, other.a) + && java.util.Objects.equals(b, other.b); + } + + @Override + public int hashCode() { + return java.util.Objects.hash(a, b); + } + + @Override + public java.lang.String toString() { + return new java.lang.StringBuilder() + .append("InheritanceWithStringType1[") + .append("a=").append(a).append(",") + .append("b=").append(b) + .append("]") + .toString(); + } + + // fluent + + public InheritanceWithStringType1 a(java.lang.String newA) { + this.a = newA; + return this; + } + + public InheritanceWithStringType1 b(java.lang.String newB) { + this.b = newB; + return this; + } + + // getter/setter + + public java.lang.String getA() { + return a; + } + + public void setA(java.lang.String newA) { + this.a = newA; + } + + public java.lang.String getB() { + return b; + } + + public void setB(java.lang.String newB) { + this.b = newB; + } +} diff --git a/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithStringType2.java b/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithStringType2.java new file mode 100644 index 00000000..10383f5b --- /dev/null +++ b/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithStringType2.java @@ -0,0 +1,81 @@ +package testmodel.micronaut_pojo_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public final class InheritanceWithStringType2 implements InheritanceWithStringType { + + public static final java.lang.String JSON_PROPERTY_C = "c"; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.String a; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_C) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.String c; + + @Override + public java.lang.String getType() { + return "Inheritance2"; + } + + // methods + + @Override + public boolean equals(Object object) { + if (object == this) { + return true; + } + if (object == null || getClass() != object.getClass()) { + return false; + } + InheritanceWithStringType2 other = (InheritanceWithStringType2) object; + return java.util.Objects.equals(a, other.a) + && java.util.Objects.equals(c, other.c); + } + + @Override + public int hashCode() { + return java.util.Objects.hash(a, c); + } + + @Override + public java.lang.String toString() { + return new java.lang.StringBuilder() + .append("InheritanceWithStringType2[") + .append("a=").append(a).append(",") + .append("c=").append(c) + .append("]") + .toString(); + } + + // fluent + + public InheritanceWithStringType2 a(java.lang.String newA) { + this.a = newA; + return this; + } + + public InheritanceWithStringType2 c(java.lang.String newC) { + this.c = newC; + return this; + } + + // getter/setter + + public java.lang.String getA() { + return a; + } + + public void setA(java.lang.String newA) { + this.a = newA; + } + + public java.lang.String getC() { + return c; + } + + public void setC(java.lang.String newC) { + this.c = newC; + } +} diff --git a/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithoutType.java b/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithoutType.java new file mode 100644 index 00000000..3fe6e9ef --- /dev/null +++ b/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithoutType.java @@ -0,0 +1,23 @@ +package testmodel.micronaut_pojo_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = InheritanceWithoutType.JSON_DISCRIMINATOR) +@com.fasterxml.jackson.annotation.JsonSubTypes({ + @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithoutType1.class, name = "Inheritance1"), + @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithoutType2.class, name = "Inheritance2") +}) +public sealed interface InheritanceWithoutType permits InheritanceWithoutType1, InheritanceWithoutType2 { + + java.lang.String JSON_DISCRIMINATOR = "type"; + java.lang.String JSON_PROPERTY_E = "e"; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_DISCRIMINATOR) + java.lang.String getType(); + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_E) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.lang.String getE(); + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_E) + void setE(java.lang.String newE); +} diff --git a/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithoutType1.java b/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithoutType1.java new file mode 100644 index 00000000..fb08680f --- /dev/null +++ b/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithoutType1.java @@ -0,0 +1,81 @@ +package testmodel.micronaut_pojo_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public final class InheritanceWithoutType1 implements InheritanceWithoutType { + + public static final java.lang.String JSON_PROPERTY_F = "f"; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_E) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.String e; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_F) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.String f; + + @Override + public java.lang.String getType() { + return "Inheritance1"; + } + + // methods + + @Override + public boolean equals(Object object) { + if (object == this) { + return true; + } + if (object == null || getClass() != object.getClass()) { + return false; + } + InheritanceWithoutType1 other = (InheritanceWithoutType1) object; + return java.util.Objects.equals(e, other.e) + && java.util.Objects.equals(f, other.f); + } + + @Override + public int hashCode() { + return java.util.Objects.hash(e, f); + } + + @Override + public java.lang.String toString() { + return new java.lang.StringBuilder() + .append("InheritanceWithoutType1[") + .append("e=").append(e).append(",") + .append("f=").append(f) + .append("]") + .toString(); + } + + // fluent + + public InheritanceWithoutType1 e(java.lang.String newE) { + this.e = newE; + return this; + } + + public InheritanceWithoutType1 f(java.lang.String newF) { + this.f = newF; + return this; + } + + // getter/setter + + public java.lang.String getE() { + return e; + } + + public void setE(java.lang.String newE) { + this.e = newE; + } + + public java.lang.String getF() { + return f; + } + + public void setF(java.lang.String newF) { + this.f = newF; + } +} diff --git a/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithoutType2.java b/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithoutType2.java new file mode 100644 index 00000000..f18c54b6 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_pojo_constants/InheritanceWithoutType2.java @@ -0,0 +1,81 @@ +package testmodel.micronaut_pojo_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public final class InheritanceWithoutType2 implements InheritanceWithoutType { + + public static final java.lang.String JSON_PROPERTY_G = "g"; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_E) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.String e; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_G) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.String g; + + @Override + public java.lang.String getType() { + return "Inheritance2"; + } + + // methods + + @Override + public boolean equals(Object object) { + if (object == this) { + return true; + } + if (object == null || getClass() != object.getClass()) { + return false; + } + InheritanceWithoutType2 other = (InheritanceWithoutType2) object; + return java.util.Objects.equals(e, other.e) + && java.util.Objects.equals(g, other.g); + } + + @Override + public int hashCode() { + return java.util.Objects.hash(e, g); + } + + @Override + public java.lang.String toString() { + return new java.lang.StringBuilder() + .append("InheritanceWithoutType2[") + .append("e=").append(e).append(",") + .append("g=").append(g) + .append("]") + .toString(); + } + + // fluent + + public InheritanceWithoutType2 e(java.lang.String newE) { + this.e = newE; + return this; + } + + public InheritanceWithoutType2 g(java.lang.String newG) { + this.g = newG; + return this; + } + + // getter/setter + + public java.lang.String getE() { + return e; + } + + public void setE(java.lang.String newE) { + this.e = newE; + } + + public java.lang.String getG() { + return g; + } + + public void setG(java.lang.String newG) { + this.g = newG; + } +} diff --git a/gen/main/java/testmodel/micronaut_pojo_constants/Model.java b/gen/main/java/testmodel/micronaut_pojo_constants/Model.java new file mode 100644 index 00000000..1e05b87d --- /dev/null +++ b/gen/main/java/testmodel/micronaut_pojo_constants/Model.java @@ -0,0 +1,828 @@ +package testmodel.micronaut_pojo_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public class Model { + + public static final java.lang.String JSON_PROPERTY_ID = "id"; + public static final java.lang.String JSON_PROPERTY_ID_WITH_EXAMPLE = "idWithExample"; + public static final java.lang.String JSON_PROPERTY_ID_WITH_DEFAULT = "idWithDefault"; + public static final java.lang.String JSON_PROPERTY_NAME = "name"; + public static final java.lang.String JSON_PROPERTY_NAME_WITH_EXAMPLE = "nameWithExample"; + public static final java.lang.String JSON_PROPERTY_NAME_WITH_DEFAULT = "nameWithDefault"; + public static final java.lang.String JSON_PROPERTY_DATE = "date"; + public static final java.lang.String JSON_PROPERTY_DATE_WITH_EXAMPLE = "dateWithExample"; + public static final java.lang.String JSON_PROPERTY_DATE_TIME = "date-time"; + public static final java.lang.String JSON_PROPERTY_DATE_TIME_WITH_EXAMPLE = "date-timeWithExample"; + public static final java.lang.String JSON_PROPERTY_NUMBER = "number"; + public static final java.lang.String JSON_PROPERTY_BINARY = "binary"; + public static final java.lang.String JSON_PROPERTY_BYTES = "bytes"; + public static final java.lang.String JSON_PROPERTY_ANY = "any"; + public static final java.lang.String JSON_PROPERTY_ARRAY = "array"; + public static final java.lang.String JSON_PROPERTY_ARRAY_WITH_EXAMPLE = "arrayWithExample"; + public static final java.lang.String JSON_PROPERTY_SET = "set"; + public static final java.lang.String JSON_PROPERTY_SET_WITH_EXAMPLES = "setWithExamples"; + public static final java.lang.String JSON_PROPERTY_MAP = "map"; + public static final java.lang.String JSON_PROPERTY_MAP_WITH_EXAMPLE = "mapWithExample"; + public static final java.lang.String JSON_PROPERTY_OPTIONAL_ARRAY = "optionalArray"; + public static final java.lang.String JSON_PROPERTY_OPTIONAL_SET = "optionalSet"; + public static final java.lang.String JSON_PROPERTY_OPTIONAL_MAP = "optionalMap"; + public static final java.lang.String JSON_PROPERTY_NULLABLE_STRING = "nullableString"; + public static final java.lang.String JSON_PROPERTY_NULLABLE_ARRAY = "nullableArray"; + public static final java.lang.String JSON_PROPERTY_NULLABLE_SET = "nullableSet"; + public static final java.lang.String JSON_PROPERTY_DEFAULT_STRING = "defaultString"; + public static final java.lang.String JSON_PROPERTY_DEFAULT_INTEGER = "defaultInteger"; + public static final java.lang.String JSON_PROPERTY_DEFAULT_LONG = "defaultLong"; + public static final java.lang.String JSON_PROPERTY_DEFAULT_NULLABLE = "defaultNullable"; + public static final java.lang.String JSON_PROPERTY_REFERENED_MODEL = "referenedModel"; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ID) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.Integer id; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ID_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.Integer idWithExample; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ID_WITH_DEFAULT) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.Integer idWithDefault = 32; + + @jakarta.validation.constraints.NotNull + @jakarta.validation.constraints.Size(max = 36) + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NAME) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) + private java.lang.String name; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NAME_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.String nameWithExample; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NAME_WITH_DEFAULT) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.String nameWithDefault = "MyDefaultName"; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.time.LocalDate date; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.time.LocalDate dateWithExample; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE_TIME) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.time.Instant dateTime; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE_TIME_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.time.Instant dateTimeWithExample; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NUMBER) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.Double number; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BINARY) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private byte[] binary; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BYTES) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private byte[] bytes; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ANY) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT) + private org.openapitools.jackson.nullable.JsonNullable any = org.openapitools.jackson.nullable.JsonNullable.of(null); + + @jakarta.validation.constraints.NotNull + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ARRAY) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) + private java.util.List array = new java.util.ArrayList<>(); + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ARRAY_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.util.List arrayWithExample; + + @jakarta.validation.constraints.NotNull + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_SET) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) + private java.util.Set set = new java.util.LinkedHashSet<>(); + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_SET_WITH_EXAMPLES) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.util.Set setWithExamples; + + @jakarta.validation.constraints.NotNull + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_MAP) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) + private java.util.Map map = new java.util.HashMap<>(); + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_MAP_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.util.Map mapWithExample; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_OPTIONAL_ARRAY) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.util.List optionalArray; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_OPTIONAL_SET) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.util.Set optionalSet; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_OPTIONAL_MAP) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.util.Map optionalMap; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NULLABLE_STRING) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT) + private org.openapitools.jackson.nullable.JsonNullable nullableString = org.openapitools.jackson.nullable.JsonNullable.undefined(); + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NULLABLE_ARRAY) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT) + private org.openapitools.jackson.nullable.JsonNullable> nullableArray = org.openapitools.jackson.nullable.JsonNullable.undefined(); + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NULLABLE_SET) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT) + private org.openapitools.jackson.nullable.JsonNullable> nullableSet = org.openapitools.jackson.nullable.JsonNullable.undefined(); + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DEFAULT_STRING) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.String defaultString = "defaultStringValue"; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DEFAULT_INTEGER) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.Integer defaultInteger = 1234; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DEFAULT_LONG) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.Long defaultLong = 5678l; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DEFAULT_NULLABLE) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT) + private org.openapitools.jackson.nullable.JsonNullable defaultNullable = org.openapitools.jackson.nullable.JsonNullable.of("defaultNullableValue"); + + @jakarta.validation.Valid + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_REFERENED_MODEL) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private EnumerationModel referenedModel; + + // methods + + @Override + public boolean equals(Object object) { + if (object == this) { + return true; + } + if (object == null || getClass() != object.getClass()) { + return false; + } + Model other = (Model) object; + return java.util.Objects.equals(id, other.id) + && java.util.Objects.equals(idWithExample, other.idWithExample) + && java.util.Objects.equals(idWithDefault, other.idWithDefault) + && java.util.Objects.equals(name, other.name) + && java.util.Objects.equals(nameWithExample, other.nameWithExample) + && java.util.Objects.equals(nameWithDefault, other.nameWithDefault) + && java.util.Objects.equals(date, other.date) + && java.util.Objects.equals(dateWithExample, other.dateWithExample) + && java.util.Objects.equals(dateTime, other.dateTime) + && java.util.Objects.equals(dateTimeWithExample, other.dateTimeWithExample) + && java.util.Objects.equals(number, other.number) + && java.util.Arrays.equals(binary, other.binary) + && java.util.Arrays.equals(bytes, other.bytes) + && java.util.Objects.equals(any, other.any) + && java.util.Objects.equals(array, other.array) + && java.util.Objects.equals(arrayWithExample, other.arrayWithExample) + && java.util.Objects.equals(set, other.set) + && java.util.Objects.equals(setWithExamples, other.setWithExamples) + && java.util.Objects.equals(map, other.map) + && java.util.Objects.equals(mapWithExample, other.mapWithExample) + && java.util.Objects.equals(optionalArray, other.optionalArray) + && java.util.Objects.equals(optionalSet, other.optionalSet) + && java.util.Objects.equals(optionalMap, other.optionalMap) + && java.util.Objects.equals(nullableString, other.nullableString) + && java.util.Objects.equals(nullableArray, other.nullableArray) + && java.util.Objects.equals(nullableSet, other.nullableSet) + && java.util.Objects.equals(defaultString, other.defaultString) + && java.util.Objects.equals(defaultInteger, other.defaultInteger) + && java.util.Objects.equals(defaultLong, other.defaultLong) + && java.util.Objects.equals(defaultNullable, other.defaultNullable) + && java.util.Objects.equals(referenedModel, other.referenedModel); + } + + @Override + public int hashCode() { + return java.util.Objects.hash(id, idWithExample, idWithDefault, name, nameWithExample, nameWithDefault, date, dateWithExample, dateTime, dateTimeWithExample, number, java.util.Arrays.hashCode(binary), java.util.Arrays.hashCode(bytes), any, array, arrayWithExample, set, setWithExamples, map, mapWithExample, optionalArray, optionalSet, optionalMap, nullableString, nullableArray, nullableSet, defaultString, defaultInteger, defaultLong, defaultNullable, referenedModel); + } + + @Override + public java.lang.String toString() { + return new java.lang.StringBuilder() + .append("Model[") + .append("id=").append(id).append(",") + .append("idWithExample=").append(idWithExample).append(",") + .append("idWithDefault=").append(idWithDefault).append(",") + .append("name=").append(name).append(",") + .append("nameWithExample=").append(nameWithExample).append(",") + .append("nameWithDefault=").append(nameWithDefault).append(",") + .append("date=").append(date).append(",") + .append("dateWithExample=").append(dateWithExample).append(",") + .append("dateTime=").append(dateTime).append(",") + .append("dateTimeWithExample=").append(dateTimeWithExample).append(",") + .append("number=").append(number).append(",") + .append("binary=").append(binary).append(",") + .append("bytes.length=").append(bytes == null ? null : bytes.length).append(",") + .append("any=").append(any).append(",") + .append("array=").append(array).append(",") + .append("arrayWithExample=").append(arrayWithExample).append(",") + .append("set=").append(set).append(",") + .append("setWithExamples=").append(setWithExamples).append(",") + .append("map=").append(map).append(",") + .append("mapWithExample=").append(mapWithExample).append(",") + .append("optionalArray=").append(optionalArray).append(",") + .append("optionalSet=").append(optionalSet).append(",") + .append("optionalMap=").append(optionalMap).append(",") + .append("nullableString=").append(nullableString).append(",") + .append("nullableArray=").append(nullableArray).append(",") + .append("nullableSet=").append(nullableSet).append(",") + .append("defaultString=").append(defaultString).append(",") + .append("defaultInteger=").append(defaultInteger).append(",") + .append("defaultLong=").append(defaultLong).append(",") + .append("defaultNullable=").append(defaultNullable).append(",") + .append("referenedModel=").append(referenedModel) + .append("]") + .toString(); + } + + // fluent + + public Model id(java.lang.Integer newId) { + this.id = newId; + return this; + } + + public Model idWithExample(java.lang.Integer newIdWithExample) { + this.idWithExample = newIdWithExample; + return this; + } + + public Model idWithDefault(java.lang.Integer newIdWithDefault) { + this.idWithDefault = newIdWithDefault; + return this; + } + + public Model name(java.lang.String newName) { + this.name = newName; + return this; + } + + public Model nameWithExample(java.lang.String newNameWithExample) { + this.nameWithExample = newNameWithExample; + return this; + } + + public Model nameWithDefault(java.lang.String newNameWithDefault) { + this.nameWithDefault = newNameWithDefault; + return this; + } + + public Model date(java.time.LocalDate newDate) { + this.date = newDate; + return this; + } + + public Model dateWithExample(java.time.LocalDate newDateWithExample) { + this.dateWithExample = newDateWithExample; + return this; + } + + public Model dateTime(java.time.Instant newDateTime) { + this.dateTime = newDateTime; + return this; + } + + public Model dateTimeWithExample(java.time.Instant newDateTimeWithExample) { + this.dateTimeWithExample = newDateTimeWithExample; + return this; + } + + public Model number(java.lang.Double newNumber) { + this.number = newNumber; + return this; + } + + public Model binary(byte[] newBinary) { + this.binary = newBinary; + return this; + } + + public Model bytes(byte[] newBytes) { + this.bytes = newBytes; + return this; + } + + public Model any(org.openapitools.jackson.nullable.JsonNullable newAny) { + this.any = newAny; + return this; + } + + public Model array(java.util.List newArray) { + this.array = newArray; + return this; + } + + public Model addArrayItem(java.lang.String arrayItem) { + if (this.array == null) { + this.array = new java.util.ArrayList<>(); + } + this.array.add(arrayItem); + return this; + } + + public Model removeArrayItem(java.lang.String arrayItem) { + if (this.array != null) { + this.array.remove(arrayItem); + } + return this; + } + + public Model arrayWithExample(java.util.List newArrayWithExample) { + this.arrayWithExample = newArrayWithExample; + return this; + } + + public Model addArrayWithExampleItem(java.lang.String arrayWithExampleItem) { + if (this.arrayWithExample == null) { + this.arrayWithExample = new java.util.ArrayList<>(); + } + this.arrayWithExample.add(arrayWithExampleItem); + return this; + } + + public Model removeArrayWithExampleItem(java.lang.String arrayWithExampleItem) { + if (this.arrayWithExample != null) { + this.arrayWithExample.remove(arrayWithExampleItem); + } + return this; + } + + public Model set(java.util.Set newSet) { + this.set = newSet; + return this; + } + + public Model addSetItem(java.lang.String setItem) { + if (this.set == null) { + this.set = new java.util.LinkedHashSet<>(); + } + this.set.add(setItem); + return this; + } + + public Model removeSetItem(java.lang.String setItem) { + if (this.set != null) { + this.set.remove(setItem); + } + return this; + } + + public Model setWithExamples(java.util.Set newSetWithExamples) { + this.setWithExamples = newSetWithExamples; + return this; + } + + public Model addSetWithExamplesItem(java.lang.String setWithExamplesItem) { + if (this.setWithExamples == null) { + this.setWithExamples = new java.util.LinkedHashSet<>(); + } + this.setWithExamples.add(setWithExamplesItem); + return this; + } + + public Model removeSetWithExamplesItem(java.lang.String setWithExamplesItem) { + if (this.setWithExamples != null) { + this.setWithExamples.remove(setWithExamplesItem); + } + return this; + } + + public Model map(java.util.Map newMap) { + this.map = newMap; + return this; + } + + public Model putMapItem(java.lang.String key, java.lang.String mapItem) { + if (this.map == null) { + this.map = new java.util.HashMap<>(); + } + this.map.put(key, mapItem); + return this; + } + + public Model removeMapItem(java.lang.String key) { + if (this.map != null) { + this.map.remove(key); + } + return this; + } + + public Model mapWithExample(java.util.Map newMapWithExample) { + this.mapWithExample = newMapWithExample; + return this; + } + + public Model putMapWithExampleItem(java.lang.String key, java.lang.String mapWithExampleItem) { + if (this.mapWithExample == null) { + this.mapWithExample = new java.util.HashMap<>(); + } + this.mapWithExample.put(key, mapWithExampleItem); + return this; + } + + public Model removeMapWithExampleItem(java.lang.String key) { + if (this.mapWithExample != null) { + this.mapWithExample.remove(key); + } + return this; + } + + public Model optionalArray(java.util.List newOptionalArray) { + this.optionalArray = newOptionalArray; + return this; + } + + public Model addOptionalArrayItem(java.lang.String optionalArrayItem) { + if (this.optionalArray == null) { + this.optionalArray = new java.util.ArrayList<>(); + } + this.optionalArray.add(optionalArrayItem); + return this; + } + + public Model removeOptionalArrayItem(java.lang.String optionalArrayItem) { + if (this.optionalArray != null) { + this.optionalArray.remove(optionalArrayItem); + } + return this; + } + + public Model optionalSet(java.util.Set newOptionalSet) { + this.optionalSet = newOptionalSet; + return this; + } + + public Model addOptionalSetItem(java.lang.String optionalSetItem) { + if (this.optionalSet == null) { + this.optionalSet = new java.util.LinkedHashSet<>(); + } + this.optionalSet.add(optionalSetItem); + return this; + } + + public Model removeOptionalSetItem(java.lang.String optionalSetItem) { + if (this.optionalSet != null) { + this.optionalSet.remove(optionalSetItem); + } + return this; + } + + public Model optionalMap(java.util.Map newOptionalMap) { + this.optionalMap = newOptionalMap; + return this; + } + + public Model putOptionalMapItem(java.lang.String key, java.lang.String optionalMapItem) { + if (this.optionalMap == null) { + this.optionalMap = new java.util.HashMap<>(); + } + this.optionalMap.put(key, optionalMapItem); + return this; + } + + public Model removeOptionalMapItem(java.lang.String key) { + if (this.optionalMap != null) { + this.optionalMap.remove(key); + } + return this; + } + + public Model nullableString(org.openapitools.jackson.nullable.JsonNullable newNullableString) { + this.nullableString = newNullableString; + return this; + } + + public Model nullableArray(org.openapitools.jackson.nullable.JsonNullable> newNullableArray) { + this.nullableArray = newNullableArray; + return this; + } + + public Model addNullableArrayItem(java.lang.String nullableArrayItem) { + if (this.nullableArray == null || !this.nullableArray.isPresent()) { + this.nullableArray = org.openapitools.jackson.nullable.JsonNullable.>of(new java.util.ArrayList<>()); + } + this.nullableArray.get().add(nullableArrayItem); + return this; + } + + public Model removeNullableArrayItem(java.lang.String nullableArrayItem) { + if (this.nullableArray != null && this.nullableArray.isPresent()) { + this.nullableArray.get().remove(nullableArrayItem); + } + return this; + } + + public Model nullableSet(org.openapitools.jackson.nullable.JsonNullable> newNullableSet) { + this.nullableSet = newNullableSet; + return this; + } + + public Model addNullableSetItem(java.lang.String nullableSetItem) { + if (this.nullableSet == null || !this.nullableSet.isPresent()) { + this.nullableSet = org.openapitools.jackson.nullable.JsonNullable.>of(new java.util.LinkedHashSet<>()); + } + this.nullableSet.get().add(nullableSetItem); + return this; + } + + public Model removeNullableSetItem(java.lang.String nullableSetItem) { + if (this.nullableSet != null && this.nullableSet.isPresent()) { + this.nullableSet.get().remove(nullableSetItem); + } + return this; + } + + public Model defaultString(java.lang.String newDefaultString) { + this.defaultString = newDefaultString; + return this; + } + + public Model defaultInteger(java.lang.Integer newDefaultInteger) { + this.defaultInteger = newDefaultInteger; + return this; + } + + public Model defaultLong(java.lang.Long newDefaultLong) { + this.defaultLong = newDefaultLong; + return this; + } + + public Model defaultNullable(org.openapitools.jackson.nullable.JsonNullable newDefaultNullable) { + this.defaultNullable = newDefaultNullable; + return this; + } + + public Model referenedModel(EnumerationModel newReferenedModel) { + this.referenedModel = newReferenedModel; + return this; + } + + // getter/setter + + public java.lang.Integer getId() { + return id; + } + + public void setId(java.lang.Integer newId) { + this.id = newId; + } + + public java.lang.Integer getIdWithExample() { + return idWithExample; + } + + public void setIdWithExample(java.lang.Integer newIdWithExample) { + this.idWithExample = newIdWithExample; + } + + public java.lang.Integer getIdWithDefault() { + return idWithDefault; + } + + public void setIdWithDefault(java.lang.Integer newIdWithDefault) { + this.idWithDefault = newIdWithDefault; + } + + public java.lang.String getName() { + return name; + } + + public void setName(java.lang.String newName) { + this.name = newName; + } + + public java.lang.String getNameWithExample() { + return nameWithExample; + } + + public void setNameWithExample(java.lang.String newNameWithExample) { + this.nameWithExample = newNameWithExample; + } + + public java.lang.String getNameWithDefault() { + return nameWithDefault; + } + + public void setNameWithDefault(java.lang.String newNameWithDefault) { + this.nameWithDefault = newNameWithDefault; + } + + public java.time.LocalDate getDate() { + return date; + } + + public void setDate(java.time.LocalDate newDate) { + this.date = newDate; + } + + public java.time.LocalDate getDateWithExample() { + return dateWithExample; + } + + public void setDateWithExample(java.time.LocalDate newDateWithExample) { + this.dateWithExample = newDateWithExample; + } + + public java.time.Instant getDateTime() { + return dateTime; + } + + public void setDateTime(java.time.Instant newDateTime) { + this.dateTime = newDateTime; + } + + public java.time.Instant getDateTimeWithExample() { + return dateTimeWithExample; + } + + public void setDateTimeWithExample(java.time.Instant newDateTimeWithExample) { + this.dateTimeWithExample = newDateTimeWithExample; + } + + public java.lang.Double getNumber() { + return number; + } + + public void setNumber(java.lang.Double newNumber) { + this.number = newNumber; + } + + public byte[] getBinary() { + return binary; + } + + public void setBinary(byte[] newBinary) { + this.binary = newBinary; + } + + public byte[] getBytes() { + return bytes; + } + + public void setBytes(byte[] newBytes) { + this.bytes = newBytes; + } + + public org.openapitools.jackson.nullable.JsonNullable getAny() { + return any; + } + + public void setAny(org.openapitools.jackson.nullable.JsonNullable newAny) { + this.any = newAny; + } + + public java.util.List getArray() { + return array; + } + + public void setArray(java.util.List newArray) { + this.array = newArray; + } + + public java.util.List getArrayWithExample() { + return arrayWithExample; + } + + public void setArrayWithExample(java.util.List newArrayWithExample) { + this.arrayWithExample = newArrayWithExample; + } + + public java.util.Set getSet() { + return set; + } + + public void setSet(java.util.Set newSet) { + this.set = newSet; + } + + public java.util.Set getSetWithExamples() { + return setWithExamples; + } + + public void setSetWithExamples(java.util.Set newSetWithExamples) { + this.setWithExamples = newSetWithExamples; + } + + public java.util.Map getMap() { + return map; + } + + public void setMap(java.util.Map newMap) { + this.map = newMap; + } + + public java.util.Map getMapWithExample() { + return mapWithExample; + } + + public void setMapWithExample(java.util.Map newMapWithExample) { + this.mapWithExample = newMapWithExample; + } + + public java.util.List getOptionalArray() { + return optionalArray; + } + + public void setOptionalArray(java.util.List newOptionalArray) { + this.optionalArray = newOptionalArray; + } + + public java.util.Set getOptionalSet() { + return optionalSet; + } + + public void setOptionalSet(java.util.Set newOptionalSet) { + this.optionalSet = newOptionalSet; + } + + public java.util.Map getOptionalMap() { + return optionalMap; + } + + public void setOptionalMap(java.util.Map newOptionalMap) { + this.optionalMap = newOptionalMap; + } + + public org.openapitools.jackson.nullable.JsonNullable getNullableString() { + return nullableString; + } + + public void setNullableString(org.openapitools.jackson.nullable.JsonNullable newNullableString) { + this.nullableString = newNullableString; + } + + public org.openapitools.jackson.nullable.JsonNullable> getNullableArray() { + return nullableArray; + } + + public void setNullableArray(org.openapitools.jackson.nullable.JsonNullable> newNullableArray) { + this.nullableArray = newNullableArray; + } + + public org.openapitools.jackson.nullable.JsonNullable> getNullableSet() { + return nullableSet; + } + + public void setNullableSet(org.openapitools.jackson.nullable.JsonNullable> newNullableSet) { + this.nullableSet = newNullableSet; + } + + public java.lang.String getDefaultString() { + return defaultString; + } + + public void setDefaultString(java.lang.String newDefaultString) { + this.defaultString = newDefaultString; + } + + public java.lang.Integer getDefaultInteger() { + return defaultInteger; + } + + public void setDefaultInteger(java.lang.Integer newDefaultInteger) { + this.defaultInteger = newDefaultInteger; + } + + public java.lang.Long getDefaultLong() { + return defaultLong; + } + + public void setDefaultLong(java.lang.Long newDefaultLong) { + this.defaultLong = newDefaultLong; + } + + public org.openapitools.jackson.nullable.JsonNullable getDefaultNullable() { + return defaultNullable; + } + + public void setDefaultNullable(org.openapitools.jackson.nullable.JsonNullable newDefaultNullable) { + this.defaultNullable = newDefaultNullable; + } + + public EnumerationModel getReferenedModel() { + return referenedModel; + } + + public void setReferenedModel(EnumerationModel newReferenedModel) { + this.referenedModel = newReferenedModel; + } +} diff --git a/gen/main/java/testmodel/micronaut_pojo_constants/OneOfImplementor1.java b/gen/main/java/testmodel/micronaut_pojo_constants/OneOfImplementor1.java new file mode 100644 index 00000000..60727b30 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_pojo_constants/OneOfImplementor1.java @@ -0,0 +1,62 @@ +package testmodel.micronaut_pojo_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public final class OneOfImplementor1 implements OneOfInterface { + + public static final java.lang.String JSON_PROPERTY_PROPERTY = "property"; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_PROPERTY) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.String property; + + @Override + public java.lang.String getType() { + return "Implementation1"; + } + + // methods + + @Override + public boolean equals(Object object) { + if (object == this) { + return true; + } + if (object == null || getClass() != object.getClass()) { + return false; + } + OneOfImplementor1 other = (OneOfImplementor1) object; + return java.util.Objects.equals(property, other.property); + } + + @Override + public int hashCode() { + return java.util.Objects.hash(property); + } + + @Override + public java.lang.String toString() { + return new java.lang.StringBuilder() + .append("OneOfImplementor1[") + .append("property=").append(property) + .append("]") + .toString(); + } + + // fluent + + public OneOfImplementor1 property(java.lang.String newProperty) { + this.property = newProperty; + return this; + } + + // getter/setter + + public java.lang.String getProperty() { + return property; + } + + public void setProperty(java.lang.String newProperty) { + this.property = newProperty; + } +} diff --git a/gen/main/java/testmodel/micronaut_pojo_constants/OneOfImplementor2.java b/gen/main/java/testmodel/micronaut_pojo_constants/OneOfImplementor2.java new file mode 100644 index 00000000..e4afcce0 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_pojo_constants/OneOfImplementor2.java @@ -0,0 +1,62 @@ +package testmodel.micronaut_pojo_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public final class OneOfImplementor2 implements OneOfInterface { + + public static final java.lang.String JSON_PROPERTY_PROPERTY = "property"; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_PROPERTY) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.Double property; + + @Override + public java.lang.String getType() { + return "Implementation2"; + } + + // methods + + @Override + public boolean equals(Object object) { + if (object == this) { + return true; + } + if (object == null || getClass() != object.getClass()) { + return false; + } + OneOfImplementor2 other = (OneOfImplementor2) object; + return java.util.Objects.equals(property, other.property); + } + + @Override + public int hashCode() { + return java.util.Objects.hash(property); + } + + @Override + public java.lang.String toString() { + return new java.lang.StringBuilder() + .append("OneOfImplementor2[") + .append("property=").append(property) + .append("]") + .toString(); + } + + // fluent + + public OneOfImplementor2 property(java.lang.Double newProperty) { + this.property = newProperty; + return this; + } + + // getter/setter + + public java.lang.Double getProperty() { + return property; + } + + public void setProperty(java.lang.Double newProperty) { + this.property = newProperty; + } +} diff --git a/gen/main/java/testmodel/micronaut_pojo_constants/OneOfInterface.java b/gen/main/java/testmodel/micronaut_pojo_constants/OneOfInterface.java new file mode 100644 index 00000000..f663ffdb --- /dev/null +++ b/gen/main/java/testmodel/micronaut_pojo_constants/OneOfInterface.java @@ -0,0 +1,15 @@ +package testmodel.micronaut_pojo_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = OneOfInterface.JSON_DISCRIMINATOR) +@com.fasterxml.jackson.annotation.JsonSubTypes({ + @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = OneOfImplementor1.class, name = "Implementation1"), + @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = OneOfImplementor2.class, name = "Implementation2"), +}) +public sealed interface OneOfInterface permits OneOfImplementor1, OneOfImplementor2 { + + java.lang.String JSON_DISCRIMINATOR = "type"; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_DISCRIMINATOR) + java.lang.String getType(); +} diff --git a/gen/main/java/testmodel/micronaut_pojo_constants/OneOfModel.java b/gen/main/java/testmodel/micronaut_pojo_constants/OneOfModel.java new file mode 100644 index 00000000..05a18cc5 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_pojo_constants/OneOfModel.java @@ -0,0 +1,9 @@ +package testmodel.micronaut_pojo_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.DEDUCTION, visible = true) +@com.fasterxml.jackson.annotation.JsonSubTypes({ + @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = FirstModel.class), + @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = SecondLevelModel.class) +}) +public sealed interface OneOfModel permits FirstModel, SecondLevelModel {} diff --git a/gen/main/java/testmodel/micronaut_pojo_constants/PropertyTypeOne.java b/gen/main/java/testmodel/micronaut_pojo_constants/PropertyTypeOne.java new file mode 100644 index 00000000..7ed93ea9 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_pojo_constants/PropertyTypeOne.java @@ -0,0 +1,87 @@ +package testmodel.micronaut_pojo_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public final class PropertyTypeOne implements AdditionalPropertiesModelValue { + + public static final java.lang.String JSON_PROPERTY_TYPE = "type"; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private Type type; + + // methods + + @Override + public boolean equals(Object object) { + if (object == this) { + return true; + } + if (object == null || getClass() != object.getClass()) { + return false; + } + PropertyTypeOne other = (PropertyTypeOne) object; + return java.util.Objects.equals(type, other.type); + } + + @Override + public int hashCode() { + return java.util.Objects.hash(type); + } + + @Override + public java.lang.String toString() { + return new java.lang.StringBuilder() + .append("PropertyTypeOne[") + .append("type=").append(type) + .append("]") + .toString(); + } + + // fluent + + public PropertyTypeOne type(Type newType) { + this.type = newType; + return this; + } + + // getter/setter + + public Type getType() { + return type; + } + + public void setType(Type newType) { + this.type = newType; + } + +public enum Type { + + ONE("one"); + + public static final java.lang.String ONE_VALUE = "one"; + + private final java.lang.String value; + + private Type(java.lang.String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static Type toEnum(java.lang.String value) { + return toOptional(value).orElseThrow(() -> new IllegalArgumentException("Unknown value '" + value + "'.")); + } + + public static java.util.Optional toOptional(java.lang.String value) { + return java.util.Arrays + .stream(values()) + .filter(e -> e.value.equals(value)) + .findAny(); + } + + @com.fasterxml.jackson.annotation.JsonValue + public java.lang.String getValue() { + return value; + } +} +} diff --git a/gen/main/java/testmodel/micronaut_pojo_constants/PropertyTypeTwo.java b/gen/main/java/testmodel/micronaut_pojo_constants/PropertyTypeTwo.java new file mode 100644 index 00000000..89fbcd44 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_pojo_constants/PropertyTypeTwo.java @@ -0,0 +1,87 @@ +package testmodel.micronaut_pojo_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public final class PropertyTypeTwo implements AdditionalPropertiesModelValue { + + public static final java.lang.String JSON_PROPERTY_TYPE = "type"; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private Type type; + + // methods + + @Override + public boolean equals(Object object) { + if (object == this) { + return true; + } + if (object == null || getClass() != object.getClass()) { + return false; + } + PropertyTypeTwo other = (PropertyTypeTwo) object; + return java.util.Objects.equals(type, other.type); + } + + @Override + public int hashCode() { + return java.util.Objects.hash(type); + } + + @Override + public java.lang.String toString() { + return new java.lang.StringBuilder() + .append("PropertyTypeTwo[") + .append("type=").append(type) + .append("]") + .toString(); + } + + // fluent + + public PropertyTypeTwo type(Type newType) { + this.type = newType; + return this; + } + + // getter/setter + + public Type getType() { + return type; + } + + public void setType(Type newType) { + this.type = newType; + } + +public enum Type { + + TWO("two"); + + public static final java.lang.String TWO_VALUE = "two"; + + private final java.lang.String value; + + private Type(java.lang.String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static Type toEnum(java.lang.String value) { + return toOptional(value).orElseThrow(() -> new IllegalArgumentException("Unknown value '" + value + "'.")); + } + + public static java.util.Optional toOptional(java.lang.String value) { + return java.util.Arrays + .stream(values()) + .filter(e -> e.value.equals(value)) + .findAny(); + } + + @com.fasterxml.jackson.annotation.JsonValue + public java.lang.String getValue() { + return value; + } +} +} diff --git a/gen/main/java/testmodel/micronaut_pojo_constants/SecondLevelModel.java b/gen/main/java/testmodel/micronaut_pojo_constants/SecondLevelModel.java new file mode 100644 index 00000000..281aa4ec --- /dev/null +++ b/gen/main/java/testmodel/micronaut_pojo_constants/SecondLevelModel.java @@ -0,0 +1,9 @@ +package testmodel.micronaut_pojo_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.DEDUCTION, visible = true) +@com.fasterxml.jackson.annotation.JsonSubTypes({ + @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = SecondLevelOneModel.class), + @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = SecondLevelTwoModel.class) +}) +public sealed interface SecondLevelModel extends OneOfModel permits SecondLevelOneModel, SecondLevelTwoModel {} diff --git a/gen/main/java/testmodel/micronaut_pojo_constants/SecondLevelOneModel.java b/gen/main/java/testmodel/micronaut_pojo_constants/SecondLevelOneModel.java new file mode 100644 index 00000000..e038d134 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_pojo_constants/SecondLevelOneModel.java @@ -0,0 +1,77 @@ +package testmodel.micronaut_pojo_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public final class SecondLevelOneModel implements SecondLevelModel { + + public static final java.lang.String JSON_PROPERTY_TYPE = "type"; + public static final java.lang.String JSON_PROPERTY_ONE = "one"; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.String type; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ONE) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.String one; + + // methods + + @Override + public boolean equals(Object object) { + if (object == this) { + return true; + } + if (object == null || getClass() != object.getClass()) { + return false; + } + SecondLevelOneModel other = (SecondLevelOneModel) object; + return java.util.Objects.equals(type, other.type) + && java.util.Objects.equals(one, other.one); + } + + @Override + public int hashCode() { + return java.util.Objects.hash(type, one); + } + + @Override + public java.lang.String toString() { + return new java.lang.StringBuilder() + .append("SecondLevelOneModel[") + .append("type=").append(type).append(",") + .append("one=").append(one) + .append("]") + .toString(); + } + + // fluent + + public SecondLevelOneModel type(java.lang.String newType) { + this.type = newType; + return this; + } + + public SecondLevelOneModel one(java.lang.String newOne) { + this.one = newOne; + return this; + } + + // getter/setter + + public java.lang.String getType() { + return type; + } + + public void setType(java.lang.String newType) { + this.type = newType; + } + + public java.lang.String getOne() { + return one; + } + + public void setOne(java.lang.String newOne) { + this.one = newOne; + } +} diff --git a/gen/main/java/testmodel/micronaut_pojo_constants/SecondLevelTwoModel.java b/gen/main/java/testmodel/micronaut_pojo_constants/SecondLevelTwoModel.java new file mode 100644 index 00000000..604ea572 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_pojo_constants/SecondLevelTwoModel.java @@ -0,0 +1,77 @@ +package testmodel.micronaut_pojo_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public final class SecondLevelTwoModel implements SecondLevelModel { + + public static final java.lang.String JSON_PROPERTY_TYPE = "type"; + public static final java.lang.String JSON_PROPERTY_TWO = "two"; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.String type; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TWO) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + private java.lang.String two; + + // methods + + @Override + public boolean equals(Object object) { + if (object == this) { + return true; + } + if (object == null || getClass() != object.getClass()) { + return false; + } + SecondLevelTwoModel other = (SecondLevelTwoModel) object; + return java.util.Objects.equals(type, other.type) + && java.util.Objects.equals(two, other.two); + } + + @Override + public int hashCode() { + return java.util.Objects.hash(type, two); + } + + @Override + public java.lang.String toString() { + return new java.lang.StringBuilder() + .append("SecondLevelTwoModel[") + .append("type=").append(type).append(",") + .append("two=").append(two) + .append("]") + .toString(); + } + + // fluent + + public SecondLevelTwoModel type(java.lang.String newType) { + this.type = newType; + return this; + } + + public SecondLevelTwoModel two(java.lang.String newTwo) { + this.two = newTwo; + return this; + } + + // getter/setter + + public java.lang.String getType() { + return type; + } + + public void setType(java.lang.String newType) { + this.type = newType; + } + + public java.lang.String getTwo() { + return two; + } + + public void setTwo(java.lang.String newTwo) { + this.two = newTwo; + } +} diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/AdditionalPropertiesModel.java b/gen/main/java/testmodel/micronaut_pojo_nullable/AdditionalPropertiesModel.java index 509f6243..76d2b45d 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/AdditionalPropertiesModel.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/AdditionalPropertiesModel.java @@ -4,9 +4,7 @@ @io.micronaut.serde.annotation.Serdeable public class AdditionalPropertiesModel { - public static final java.lang.String JSON_PROPERTY_ID = "id"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ID) + @com.fasterxml.jackson.annotation.JsonProperty("id") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String id; diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/EnumerationModel.java b/gen/main/java/testmodel/micronaut_pojo_nullable/EnumerationModel.java index e64c690b..0d960309 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/EnumerationModel.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/EnumerationModel.java @@ -4,24 +4,19 @@ @io.micronaut.serde.annotation.Serdeable public class EnumerationModel { - public static final java.lang.String JSON_PROPERTY_STRING = "string"; - public static final java.lang.String JSON_PROPERTY_STRING_DEFAULT = "string-default"; - public static final java.lang.String JSON_PROPERTY_EMBEDDED = "embedded"; - public static final java.lang.String JSON_PROPERTY_EMBEDDED_DEFAULT = "embedded-default"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_STRING) + @com.fasterxml.jackson.annotation.JsonProperty("string") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private EnumerationString string; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_STRING_DEFAULT) + @com.fasterxml.jackson.annotation.JsonProperty("string-default") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private EnumerationStringDefault stringDefault = EnumerationStringDefault.THREE; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_EMBEDDED) + @com.fasterxml.jackson.annotation.JsonProperty("embedded") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private Embedded embedded; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_EMBEDDED_DEFAULT) + @com.fasterxml.jackson.annotation.JsonProperty("embedded-default") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private EmbeddedDefault embeddedDefault = EmbeddedDefault.FOUR; diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/FirstModel.java b/gen/main/java/testmodel/micronaut_pojo_nullable/FirstModel.java index 6940aeda..2c670196 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/FirstModel.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/FirstModel.java @@ -4,20 +4,16 @@ @io.micronaut.serde.annotation.Serdeable public final class FirstModel implements OneOfModel { - public static final java.lang.String JSON_PROPERTY_TYPE = "type"; - public static final java.lang.String JSON_PROPERTY_FIRST = "first"; - public static final java.lang.String JSON_PROPERTY_SECOND_LEVEL = "secondLevel"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE) + @com.fasterxml.jackson.annotation.JsonProperty("type") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String type; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FIRST) + @com.fasterxml.jackson.annotation.JsonProperty("first") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String first; @jakarta.validation.Valid - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_SECOND_LEVEL) + @com.fasterxml.jackson.annotation.JsonProperty("secondLevel") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private SecondLevelModel secondLevel; diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceExtended.java b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceExtended.java index a6d1fd04..8311339e 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceExtended.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceExtended.java @@ -4,15 +4,13 @@ @io.micronaut.serde.annotation.Serdeable public final class InheritanceExtended implements InheritanceSimple { - public static final java.lang.String JSON_PROPERTY_BAR = "bar"; - @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + @com.fasterxml.jackson.annotation.JsonProperty("foo") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.lang.String foo; @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BAR) + @com.fasterxml.jackson.annotation.JsonProperty("bar") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.lang.String bar; diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceSimple.java b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceSimple.java index 2e8dd937..3721ec65 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceSimple.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceSimple.java @@ -4,12 +4,11 @@ @com.fasterxml.jackson.databind.annotation.JsonDeserialize(as = InheritanceSimpleDefault.class) public sealed interface InheritanceSimple permits InheritanceExtended, InheritanceSimpleDefault { - java.lang.String JSON_PROPERTY_FOO = "foo"; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + @com.fasterxml.jackson.annotation.JsonProperty("foo") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) java.lang.String getFoo(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + @com.fasterxml.jackson.annotation.JsonProperty("foo") void setFoo(java.lang.String newFoo); } diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceSimpleDefault.java b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceSimpleDefault.java index 648e05e9..85c2bd06 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceSimpleDefault.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceSimpleDefault.java @@ -5,7 +5,7 @@ public final class InheritanceSimpleDefault implements InheritanceSimple { @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + @com.fasterxml.jackson.annotation.JsonProperty("foo") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.lang.String foo; diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType.java b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType.java index 8d84508a..a901b049 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType.java @@ -1,7 +1,7 @@ package testmodel.micronaut_pojo_nullable; @jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") -@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = InheritanceWithEnumType.JSON_DISCRIMINATOR) +@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = "type") @com.fasterxml.jackson.annotation.JsonSubTypes({ @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithEnumType1.class, name = "Inheritance1"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithEnumType2.class, name = "Inheritance2"), @@ -9,8 +9,6 @@ }) public sealed interface InheritanceWithEnumType permits InheritanceWithEnumType1, InheritanceWithEnumType2, InheritanceWithEnumType3 { - java.lang.String JSON_DISCRIMINATOR = "type"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_DISCRIMINATOR) + @com.fasterxml.jackson.annotation.JsonProperty("type") InheritanceWithEnumTypeEnum getType(); } diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType1.java b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType1.java index 3d5206ed..dbb2d0e6 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType1.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType1.java @@ -4,9 +4,7 @@ @io.micronaut.serde.annotation.Serdeable public final class InheritanceWithEnumType1 implements InheritanceWithEnumType { - public static final java.lang.String JSON_PROPERTY_D = "d"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_D) + @com.fasterxml.jackson.annotation.JsonProperty("d") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String d; diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType2.java b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType2.java index e07a533c..68eaa0d6 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType2.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithEnumType2.java @@ -4,9 +4,7 @@ @io.micronaut.serde.annotation.Serdeable public final class InheritanceWithEnumType2 implements InheritanceWithEnumType { - public static final java.lang.String JSON_PROPERTY_E = "e"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_E) + @com.fasterxml.jackson.annotation.JsonProperty("e") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String e; diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithStringType.java b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithStringType.java index 71e0fe15..0aad183b 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithStringType.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithStringType.java @@ -1,23 +1,20 @@ package testmodel.micronaut_pojo_nullable; @jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") -@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = InheritanceWithStringType.JSON_DISCRIMINATOR) +@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = "type") @com.fasterxml.jackson.annotation.JsonSubTypes({ @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithStringType1.class, name = "Inheritance1"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithStringType2.class, name = "Inheritance2") }) public sealed interface InheritanceWithStringType permits InheritanceWithStringType1, InheritanceWithStringType2 { - java.lang.String JSON_DISCRIMINATOR = "type"; - java.lang.String JSON_PROPERTY_A = "a"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_DISCRIMINATOR) + @com.fasterxml.jackson.annotation.JsonProperty("type") java.lang.String getType(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + @com.fasterxml.jackson.annotation.JsonProperty("a") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.lang.String getA(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + @com.fasterxml.jackson.annotation.JsonProperty("a") void setA(java.lang.String newA); } diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithStringType1.java b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithStringType1.java index dff389d3..ff7551c6 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithStringType1.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithStringType1.java @@ -4,13 +4,11 @@ @io.micronaut.serde.annotation.Serdeable public final class InheritanceWithStringType1 implements InheritanceWithStringType { - public static final java.lang.String JSON_PROPERTY_B = "b"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + @com.fasterxml.jackson.annotation.JsonProperty("a") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String a; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_B) + @com.fasterxml.jackson.annotation.JsonProperty("b") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String b; diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithStringType2.java b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithStringType2.java index 804e1c34..24915aaa 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithStringType2.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithStringType2.java @@ -4,13 +4,11 @@ @io.micronaut.serde.annotation.Serdeable public final class InheritanceWithStringType2 implements InheritanceWithStringType { - public static final java.lang.String JSON_PROPERTY_C = "c"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + @com.fasterxml.jackson.annotation.JsonProperty("a") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String a; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_C) + @com.fasterxml.jackson.annotation.JsonProperty("c") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String c; diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithoutType.java b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithoutType.java index 21c03c52..d165dcaf 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithoutType.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithoutType.java @@ -1,23 +1,20 @@ package testmodel.micronaut_pojo_nullable; @jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") -@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = InheritanceWithoutType.JSON_DISCRIMINATOR) +@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = "type") @com.fasterxml.jackson.annotation.JsonSubTypes({ @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithoutType1.class, name = "Inheritance1"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithoutType2.class, name = "Inheritance2") }) public sealed interface InheritanceWithoutType permits InheritanceWithoutType1, InheritanceWithoutType2 { - java.lang.String JSON_DISCRIMINATOR = "type"; - java.lang.String JSON_PROPERTY_E = "e"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_DISCRIMINATOR) + @com.fasterxml.jackson.annotation.JsonProperty("type") java.lang.String getType(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_E) + @com.fasterxml.jackson.annotation.JsonProperty("e") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.lang.String getE(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_E) + @com.fasterxml.jackson.annotation.JsonProperty("e") void setE(java.lang.String newE); } diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithoutType1.java b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithoutType1.java index 4f259a72..9b8ad534 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithoutType1.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithoutType1.java @@ -4,13 +4,11 @@ @io.micronaut.serde.annotation.Serdeable public final class InheritanceWithoutType1 implements InheritanceWithoutType { - public static final java.lang.String JSON_PROPERTY_F = "f"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_E) + @com.fasterxml.jackson.annotation.JsonProperty("e") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String e; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_F) + @com.fasterxml.jackson.annotation.JsonProperty("f") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String f; diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithoutType2.java b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithoutType2.java index a4733ea2..6eb1709c 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithoutType2.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/InheritanceWithoutType2.java @@ -4,13 +4,11 @@ @io.micronaut.serde.annotation.Serdeable public final class InheritanceWithoutType2 implements InheritanceWithoutType { - public static final java.lang.String JSON_PROPERTY_G = "g"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_E) + @com.fasterxml.jackson.annotation.JsonProperty("e") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String e; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_G) + @com.fasterxml.jackson.annotation.JsonProperty("g") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String g; diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/Model.java b/gen/main/java/testmodel/micronaut_pojo_nullable/Model.java index 25eac3d7..987446ec 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/Model.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/Model.java @@ -4,165 +4,133 @@ @io.micronaut.serde.annotation.Serdeable public class Model { - public static final java.lang.String JSON_PROPERTY_ID = "id"; - public static final java.lang.String JSON_PROPERTY_ID_WITH_EXAMPLE = "idWithExample"; - public static final java.lang.String JSON_PROPERTY_ID_WITH_DEFAULT = "idWithDefault"; - public static final java.lang.String JSON_PROPERTY_NAME = "name"; - public static final java.lang.String JSON_PROPERTY_NAME_WITH_EXAMPLE = "nameWithExample"; - public static final java.lang.String JSON_PROPERTY_NAME_WITH_DEFAULT = "nameWithDefault"; - public static final java.lang.String JSON_PROPERTY_DATE = "date"; - public static final java.lang.String JSON_PROPERTY_DATE_WITH_EXAMPLE = "dateWithExample"; - public static final java.lang.String JSON_PROPERTY_DATE_TIME = "date-time"; - public static final java.lang.String JSON_PROPERTY_DATE_TIME_WITH_EXAMPLE = "date-timeWithExample"; - public static final java.lang.String JSON_PROPERTY_NUMBER = "number"; - public static final java.lang.String JSON_PROPERTY_BINARY = "binary"; - public static final java.lang.String JSON_PROPERTY_BYTES = "bytes"; - public static final java.lang.String JSON_PROPERTY_ANY = "any"; - public static final java.lang.String JSON_PROPERTY_ARRAY = "array"; - public static final java.lang.String JSON_PROPERTY_ARRAY_WITH_EXAMPLE = "arrayWithExample"; - public static final java.lang.String JSON_PROPERTY_SET = "set"; - public static final java.lang.String JSON_PROPERTY_SET_WITH_EXAMPLES = "setWithExamples"; - public static final java.lang.String JSON_PROPERTY_MAP = "map"; - public static final java.lang.String JSON_PROPERTY_MAP_WITH_EXAMPLE = "mapWithExample"; - public static final java.lang.String JSON_PROPERTY_OPTIONAL_ARRAY = "optionalArray"; - public static final java.lang.String JSON_PROPERTY_OPTIONAL_SET = "optionalSet"; - public static final java.lang.String JSON_PROPERTY_OPTIONAL_MAP = "optionalMap"; - public static final java.lang.String JSON_PROPERTY_NULLABLE_STRING = "nullableString"; - public static final java.lang.String JSON_PROPERTY_NULLABLE_ARRAY = "nullableArray"; - public static final java.lang.String JSON_PROPERTY_NULLABLE_SET = "nullableSet"; - public static final java.lang.String JSON_PROPERTY_DEFAULT_STRING = "defaultString"; - public static final java.lang.String JSON_PROPERTY_DEFAULT_INTEGER = "defaultInteger"; - public static final java.lang.String JSON_PROPERTY_DEFAULT_LONG = "defaultLong"; - public static final java.lang.String JSON_PROPERTY_DEFAULT_NULLABLE = "defaultNullable"; - public static final java.lang.String JSON_PROPERTY_REFERENED_MODEL = "referenedModel"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ID) + @com.fasterxml.jackson.annotation.JsonProperty("id") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer id; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ID_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonProperty("idWithExample") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer idWithExample; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ID_WITH_DEFAULT) + @com.fasterxml.jackson.annotation.JsonProperty("idWithDefault") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer idWithDefault = 32; @jakarta.validation.constraints.NotNull @jakarta.validation.constraints.Size(max = 36) - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NAME) + @com.fasterxml.jackson.annotation.JsonProperty("name") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.lang.String name; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NAME_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonProperty("nameWithExample") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String nameWithExample; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NAME_WITH_DEFAULT) + @com.fasterxml.jackson.annotation.JsonProperty("nameWithDefault") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String nameWithDefault = "MyDefaultName"; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE) + @com.fasterxml.jackson.annotation.JsonProperty("date") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.time.LocalDate date; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonProperty("dateWithExample") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.time.LocalDate dateWithExample; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE_TIME) + @com.fasterxml.jackson.annotation.JsonProperty("date-time") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.time.Instant dateTime; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE_TIME_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonProperty("date-timeWithExample") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.time.Instant dateTimeWithExample; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NUMBER) + @com.fasterxml.jackson.annotation.JsonProperty("number") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Double number; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BINARY) + @com.fasterxml.jackson.annotation.JsonProperty("binary") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private byte[] binary; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BYTES) + @com.fasterxml.jackson.annotation.JsonProperty("bytes") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private byte[] bytes; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ANY) + @com.fasterxml.jackson.annotation.JsonProperty("any") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT) private org.openapitools.jackson.nullable.JsonNullable any = org.openapitools.jackson.nullable.JsonNullable.of(null); @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ARRAY) + @com.fasterxml.jackson.annotation.JsonProperty("array") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.util.List array = new java.util.ArrayList<>(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ARRAY_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonProperty("arrayWithExample") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.List arrayWithExample; @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_SET) + @com.fasterxml.jackson.annotation.JsonProperty("set") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.util.Set set = new java.util.LinkedHashSet<>(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_SET_WITH_EXAMPLES) + @com.fasterxml.jackson.annotation.JsonProperty("setWithExamples") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.Set setWithExamples; @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_MAP) + @com.fasterxml.jackson.annotation.JsonProperty("map") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.util.Map map = new java.util.HashMap<>(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_MAP_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonProperty("mapWithExample") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.Map mapWithExample; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_OPTIONAL_ARRAY) + @com.fasterxml.jackson.annotation.JsonProperty("optionalArray") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.List optionalArray; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_OPTIONAL_SET) + @com.fasterxml.jackson.annotation.JsonProperty("optionalSet") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.Set optionalSet; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_OPTIONAL_MAP) + @com.fasterxml.jackson.annotation.JsonProperty("optionalMap") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.Map optionalMap; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NULLABLE_STRING) + @com.fasterxml.jackson.annotation.JsonProperty("nullableString") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT) private org.openapitools.jackson.nullable.JsonNullable nullableString = org.openapitools.jackson.nullable.JsonNullable.undefined(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NULLABLE_ARRAY) + @com.fasterxml.jackson.annotation.JsonProperty("nullableArray") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT) private org.openapitools.jackson.nullable.JsonNullable> nullableArray = org.openapitools.jackson.nullable.JsonNullable.undefined(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NULLABLE_SET) + @com.fasterxml.jackson.annotation.JsonProperty("nullableSet") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT) private org.openapitools.jackson.nullable.JsonNullable> nullableSet = org.openapitools.jackson.nullable.JsonNullable.undefined(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DEFAULT_STRING) + @com.fasterxml.jackson.annotation.JsonProperty("defaultString") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String defaultString = "defaultStringValue"; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DEFAULT_INTEGER) + @com.fasterxml.jackson.annotation.JsonProperty("defaultInteger") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer defaultInteger = 1234; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DEFAULT_LONG) + @com.fasterxml.jackson.annotation.JsonProperty("defaultLong") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Long defaultLong = 5678l; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DEFAULT_NULLABLE) + @com.fasterxml.jackson.annotation.JsonProperty("defaultNullable") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT) private org.openapitools.jackson.nullable.JsonNullable defaultNullable = org.openapitools.jackson.nullable.JsonNullable.of("defaultNullableValue"); @jakarta.validation.Valid - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_REFERENED_MODEL) + @com.fasterxml.jackson.annotation.JsonProperty("referenedModel") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private EnumerationModel referenedModel; diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/OneOfImplementor1.java b/gen/main/java/testmodel/micronaut_pojo_nullable/OneOfImplementor1.java index e437259b..70dec547 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/OneOfImplementor1.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/OneOfImplementor1.java @@ -4,9 +4,7 @@ @io.micronaut.serde.annotation.Serdeable public final class OneOfImplementor1 implements OneOfInterface { - public static final java.lang.String JSON_PROPERTY_PROPERTY = "property"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_PROPERTY) + @com.fasterxml.jackson.annotation.JsonProperty("property") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String property; diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/OneOfImplementor2.java b/gen/main/java/testmodel/micronaut_pojo_nullable/OneOfImplementor2.java index 1880b3d2..3c88604f 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/OneOfImplementor2.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/OneOfImplementor2.java @@ -4,9 +4,7 @@ @io.micronaut.serde.annotation.Serdeable public final class OneOfImplementor2 implements OneOfInterface { - public static final java.lang.String JSON_PROPERTY_PROPERTY = "property"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_PROPERTY) + @com.fasterxml.jackson.annotation.JsonProperty("property") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Double property; diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/OneOfInterface.java b/gen/main/java/testmodel/micronaut_pojo_nullable/OneOfInterface.java index 2402c169..f118cd3e 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/OneOfInterface.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/OneOfInterface.java @@ -1,15 +1,13 @@ package testmodel.micronaut_pojo_nullable; @jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") -@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = OneOfInterface.JSON_DISCRIMINATOR) +@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = "type") @com.fasterxml.jackson.annotation.JsonSubTypes({ @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = OneOfImplementor1.class, name = "Implementation1"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = OneOfImplementor2.class, name = "Implementation2"), }) public sealed interface OneOfInterface permits OneOfImplementor1, OneOfImplementor2 { - java.lang.String JSON_DISCRIMINATOR = "type"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_DISCRIMINATOR) + @com.fasterxml.jackson.annotation.JsonProperty("type") java.lang.String getType(); } diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/PropertyTypeOne.java b/gen/main/java/testmodel/micronaut_pojo_nullable/PropertyTypeOne.java index 0331ff61..0bc9a223 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/PropertyTypeOne.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/PropertyTypeOne.java @@ -4,9 +4,7 @@ @io.micronaut.serde.annotation.Serdeable public final class PropertyTypeOne implements AdditionalPropertiesModelValue { - public static final java.lang.String JSON_PROPERTY_TYPE = "type"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE) + @com.fasterxml.jackson.annotation.JsonProperty("type") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private Type type; diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/PropertyTypeTwo.java b/gen/main/java/testmodel/micronaut_pojo_nullable/PropertyTypeTwo.java index fb893727..490d624b 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/PropertyTypeTwo.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/PropertyTypeTwo.java @@ -4,9 +4,7 @@ @io.micronaut.serde.annotation.Serdeable public final class PropertyTypeTwo implements AdditionalPropertiesModelValue { - public static final java.lang.String JSON_PROPERTY_TYPE = "type"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE) + @com.fasterxml.jackson.annotation.JsonProperty("type") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private Type type; diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/SecondLevelOneModel.java b/gen/main/java/testmodel/micronaut_pojo_nullable/SecondLevelOneModel.java index 3d74b6f5..9015f3e4 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/SecondLevelOneModel.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/SecondLevelOneModel.java @@ -4,14 +4,11 @@ @io.micronaut.serde.annotation.Serdeable public final class SecondLevelOneModel implements SecondLevelModel { - public static final java.lang.String JSON_PROPERTY_TYPE = "type"; - public static final java.lang.String JSON_PROPERTY_ONE = "one"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE) + @com.fasterxml.jackson.annotation.JsonProperty("type") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String type; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ONE) + @com.fasterxml.jackson.annotation.JsonProperty("one") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String one; diff --git a/gen/main/java/testmodel/micronaut_pojo_nullable/SecondLevelTwoModel.java b/gen/main/java/testmodel/micronaut_pojo_nullable/SecondLevelTwoModel.java index 5052a05d..9ab32f64 100644 --- a/gen/main/java/testmodel/micronaut_pojo_nullable/SecondLevelTwoModel.java +++ b/gen/main/java/testmodel/micronaut_pojo_nullable/SecondLevelTwoModel.java @@ -4,14 +4,11 @@ @io.micronaut.serde.annotation.Serdeable public final class SecondLevelTwoModel implements SecondLevelModel { - public static final java.lang.String JSON_PROPERTY_TYPE = "type"; - public static final java.lang.String JSON_PROPERTY_TWO = "two"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE) + @com.fasterxml.jackson.annotation.JsonProperty("type") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String type; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TWO) + @com.fasterxml.jackson.annotation.JsonProperty("two") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String two; diff --git a/gen/main/java/testmodel/micronaut_pojo_unsealed/AdditionalPropertiesModel.java b/gen/main/java/testmodel/micronaut_pojo_unsealed/AdditionalPropertiesModel.java index 6fb19f5e..fffd0327 100644 --- a/gen/main/java/testmodel/micronaut_pojo_unsealed/AdditionalPropertiesModel.java +++ b/gen/main/java/testmodel/micronaut_pojo_unsealed/AdditionalPropertiesModel.java @@ -4,9 +4,7 @@ @io.micronaut.serde.annotation.Serdeable public class AdditionalPropertiesModel { - public static final java.lang.String JSON_PROPERTY_ID = "id"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ID) + @com.fasterxml.jackson.annotation.JsonProperty("id") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String id; diff --git a/gen/main/java/testmodel/micronaut_pojo_unsealed/EnumerationModel.java b/gen/main/java/testmodel/micronaut_pojo_unsealed/EnumerationModel.java index 17748a9a..ed61524b 100644 --- a/gen/main/java/testmodel/micronaut_pojo_unsealed/EnumerationModel.java +++ b/gen/main/java/testmodel/micronaut_pojo_unsealed/EnumerationModel.java @@ -4,24 +4,19 @@ @io.micronaut.serde.annotation.Serdeable public class EnumerationModel { - public static final java.lang.String JSON_PROPERTY_STRING = "string"; - public static final java.lang.String JSON_PROPERTY_STRING_DEFAULT = "string-default"; - public static final java.lang.String JSON_PROPERTY_EMBEDDED = "embedded"; - public static final java.lang.String JSON_PROPERTY_EMBEDDED_DEFAULT = "embedded-default"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_STRING) + @com.fasterxml.jackson.annotation.JsonProperty("string") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private EnumerationString string; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_STRING_DEFAULT) + @com.fasterxml.jackson.annotation.JsonProperty("string-default") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private EnumerationStringDefault stringDefault = EnumerationStringDefault.THREE; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_EMBEDDED) + @com.fasterxml.jackson.annotation.JsonProperty("embedded") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private Embedded embedded; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_EMBEDDED_DEFAULT) + @com.fasterxml.jackson.annotation.JsonProperty("embedded-default") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private EmbeddedDefault embeddedDefault = EmbeddedDefault.FOUR; diff --git a/gen/main/java/testmodel/micronaut_pojo_unsealed/FirstModel.java b/gen/main/java/testmodel/micronaut_pojo_unsealed/FirstModel.java index de5c9426..eb1c40ed 100644 --- a/gen/main/java/testmodel/micronaut_pojo_unsealed/FirstModel.java +++ b/gen/main/java/testmodel/micronaut_pojo_unsealed/FirstModel.java @@ -4,20 +4,16 @@ @io.micronaut.serde.annotation.Serdeable public class FirstModel implements OneOfModel { - public static final java.lang.String JSON_PROPERTY_TYPE = "type"; - public static final java.lang.String JSON_PROPERTY_FIRST = "first"; - public static final java.lang.String JSON_PROPERTY_SECOND_LEVEL = "secondLevel"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE) + @com.fasterxml.jackson.annotation.JsonProperty("type") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String type; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FIRST) + @com.fasterxml.jackson.annotation.JsonProperty("first") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String first; @jakarta.validation.Valid - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_SECOND_LEVEL) + @com.fasterxml.jackson.annotation.JsonProperty("secondLevel") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private SecondLevelModel secondLevel; diff --git a/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceExtended.java b/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceExtended.java index eb284503..144c0bfb 100644 --- a/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceExtended.java +++ b/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceExtended.java @@ -4,15 +4,13 @@ @io.micronaut.serde.annotation.Serdeable public class InheritanceExtended implements InheritanceSimple { - public static final java.lang.String JSON_PROPERTY_BAR = "bar"; - @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + @com.fasterxml.jackson.annotation.JsonProperty("foo") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.lang.String foo; @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BAR) + @com.fasterxml.jackson.annotation.JsonProperty("bar") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.lang.String bar; diff --git a/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceSimple.java b/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceSimple.java index e8bf3763..643aa65d 100644 --- a/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceSimple.java +++ b/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceSimple.java @@ -4,12 +4,11 @@ @com.fasterxml.jackson.databind.annotation.JsonDeserialize(as = InheritanceSimpleDefault.class) public interface InheritanceSimple { - java.lang.String JSON_PROPERTY_FOO = "foo"; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + @com.fasterxml.jackson.annotation.JsonProperty("foo") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) java.lang.String getFoo(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + @com.fasterxml.jackson.annotation.JsonProperty("foo") void setFoo(java.lang.String newFoo); } diff --git a/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceSimpleDefault.java b/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceSimpleDefault.java index bef42d3c..b66c4e9a 100644 --- a/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceSimpleDefault.java +++ b/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceSimpleDefault.java @@ -5,7 +5,7 @@ public class InheritanceSimpleDefault implements InheritanceSimple { @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + @com.fasterxml.jackson.annotation.JsonProperty("foo") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.lang.String foo; diff --git a/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithEnumType.java b/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithEnumType.java index 310b885e..1223e2d5 100644 --- a/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithEnumType.java +++ b/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithEnumType.java @@ -1,7 +1,7 @@ package testmodel.micronaut_pojo_unsealed; @jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") -@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = InheritanceWithEnumType.JSON_DISCRIMINATOR) +@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = "type") @com.fasterxml.jackson.annotation.JsonSubTypes({ @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithEnumType1.class, name = "Inheritance1"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithEnumType2.class, name = "Inheritance2"), @@ -9,8 +9,6 @@ }) public interface InheritanceWithEnumType { - java.lang.String JSON_DISCRIMINATOR = "type"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_DISCRIMINATOR) + @com.fasterxml.jackson.annotation.JsonProperty("type") InheritanceWithEnumTypeEnum getType(); } diff --git a/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithEnumType1.java b/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithEnumType1.java index 3d4559cf..9352bd78 100644 --- a/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithEnumType1.java +++ b/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithEnumType1.java @@ -4,9 +4,7 @@ @io.micronaut.serde.annotation.Serdeable public class InheritanceWithEnumType1 implements InheritanceWithEnumType { - public static final java.lang.String JSON_PROPERTY_D = "d"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_D) + @com.fasterxml.jackson.annotation.JsonProperty("d") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String d; diff --git a/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithEnumType2.java b/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithEnumType2.java index eb888732..ff7f759c 100644 --- a/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithEnumType2.java +++ b/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithEnumType2.java @@ -4,9 +4,7 @@ @io.micronaut.serde.annotation.Serdeable public class InheritanceWithEnumType2 implements InheritanceWithEnumType { - public static final java.lang.String JSON_PROPERTY_E = "e"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_E) + @com.fasterxml.jackson.annotation.JsonProperty("e") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String e; diff --git a/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithStringType.java b/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithStringType.java index b4fdd1f6..b80e8a8b 100644 --- a/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithStringType.java +++ b/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithStringType.java @@ -1,23 +1,20 @@ package testmodel.micronaut_pojo_unsealed; @jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") -@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = InheritanceWithStringType.JSON_DISCRIMINATOR) +@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = "type") @com.fasterxml.jackson.annotation.JsonSubTypes({ @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithStringType1.class, name = "Inheritance1"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithStringType2.class, name = "Inheritance2") }) public interface InheritanceWithStringType { - java.lang.String JSON_DISCRIMINATOR = "type"; - java.lang.String JSON_PROPERTY_A = "a"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_DISCRIMINATOR) + @com.fasterxml.jackson.annotation.JsonProperty("type") java.lang.String getType(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + @com.fasterxml.jackson.annotation.JsonProperty("a") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.lang.String getA(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + @com.fasterxml.jackson.annotation.JsonProperty("a") void setA(java.lang.String newA); } diff --git a/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithStringType1.java b/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithStringType1.java index f10a7ec5..ef5e53b2 100644 --- a/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithStringType1.java +++ b/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithStringType1.java @@ -4,13 +4,11 @@ @io.micronaut.serde.annotation.Serdeable public class InheritanceWithStringType1 implements InheritanceWithStringType { - public static final java.lang.String JSON_PROPERTY_B = "b"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + @com.fasterxml.jackson.annotation.JsonProperty("a") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String a; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_B) + @com.fasterxml.jackson.annotation.JsonProperty("b") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String b; diff --git a/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithStringType2.java b/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithStringType2.java index 54b84b28..813d9c02 100644 --- a/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithStringType2.java +++ b/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithStringType2.java @@ -4,13 +4,11 @@ @io.micronaut.serde.annotation.Serdeable public class InheritanceWithStringType2 implements InheritanceWithStringType { - public static final java.lang.String JSON_PROPERTY_C = "c"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + @com.fasterxml.jackson.annotation.JsonProperty("a") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String a; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_C) + @com.fasterxml.jackson.annotation.JsonProperty("c") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String c; diff --git a/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithoutType.java b/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithoutType.java index 8cb736b9..396a1e95 100644 --- a/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithoutType.java +++ b/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithoutType.java @@ -1,23 +1,20 @@ package testmodel.micronaut_pojo_unsealed; @jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") -@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = InheritanceWithoutType.JSON_DISCRIMINATOR) +@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = "type") @com.fasterxml.jackson.annotation.JsonSubTypes({ @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithoutType1.class, name = "Inheritance1"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithoutType2.class, name = "Inheritance2") }) public interface InheritanceWithoutType { - java.lang.String JSON_DISCRIMINATOR = "type"; - java.lang.String JSON_PROPERTY_E = "e"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_DISCRIMINATOR) + @com.fasterxml.jackson.annotation.JsonProperty("type") java.lang.String getType(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_E) + @com.fasterxml.jackson.annotation.JsonProperty("e") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.lang.String getE(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_E) + @com.fasterxml.jackson.annotation.JsonProperty("e") void setE(java.lang.String newE); } diff --git a/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithoutType1.java b/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithoutType1.java index f6232bfb..3ad13e3b 100644 --- a/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithoutType1.java +++ b/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithoutType1.java @@ -4,13 +4,11 @@ @io.micronaut.serde.annotation.Serdeable public class InheritanceWithoutType1 implements InheritanceWithoutType { - public static final java.lang.String JSON_PROPERTY_F = "f"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_E) + @com.fasterxml.jackson.annotation.JsonProperty("e") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String e; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_F) + @com.fasterxml.jackson.annotation.JsonProperty("f") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String f; diff --git a/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithoutType2.java b/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithoutType2.java index 1d19b5d2..67b069b1 100644 --- a/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithoutType2.java +++ b/gen/main/java/testmodel/micronaut_pojo_unsealed/InheritanceWithoutType2.java @@ -4,13 +4,11 @@ @io.micronaut.serde.annotation.Serdeable public class InheritanceWithoutType2 implements InheritanceWithoutType { - public static final java.lang.String JSON_PROPERTY_G = "g"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_E) + @com.fasterxml.jackson.annotation.JsonProperty("e") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String e; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_G) + @com.fasterxml.jackson.annotation.JsonProperty("g") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String g; diff --git a/gen/main/java/testmodel/micronaut_pojo_unsealed/Model.java b/gen/main/java/testmodel/micronaut_pojo_unsealed/Model.java index 11309c4c..10f818e4 100644 --- a/gen/main/java/testmodel/micronaut_pojo_unsealed/Model.java +++ b/gen/main/java/testmodel/micronaut_pojo_unsealed/Model.java @@ -4,165 +4,133 @@ @io.micronaut.serde.annotation.Serdeable public class Model { - public static final java.lang.String JSON_PROPERTY_ID = "id"; - public static final java.lang.String JSON_PROPERTY_ID_WITH_EXAMPLE = "idWithExample"; - public static final java.lang.String JSON_PROPERTY_ID_WITH_DEFAULT = "idWithDefault"; - public static final java.lang.String JSON_PROPERTY_NAME = "name"; - public static final java.lang.String JSON_PROPERTY_NAME_WITH_EXAMPLE = "nameWithExample"; - public static final java.lang.String JSON_PROPERTY_NAME_WITH_DEFAULT = "nameWithDefault"; - public static final java.lang.String JSON_PROPERTY_DATE = "date"; - public static final java.lang.String JSON_PROPERTY_DATE_WITH_EXAMPLE = "dateWithExample"; - public static final java.lang.String JSON_PROPERTY_DATE_TIME = "date-time"; - public static final java.lang.String JSON_PROPERTY_DATE_TIME_WITH_EXAMPLE = "date-timeWithExample"; - public static final java.lang.String JSON_PROPERTY_NUMBER = "number"; - public static final java.lang.String JSON_PROPERTY_BINARY = "binary"; - public static final java.lang.String JSON_PROPERTY_BYTES = "bytes"; - public static final java.lang.String JSON_PROPERTY_ANY = "any"; - public static final java.lang.String JSON_PROPERTY_ARRAY = "array"; - public static final java.lang.String JSON_PROPERTY_ARRAY_WITH_EXAMPLE = "arrayWithExample"; - public static final java.lang.String JSON_PROPERTY_SET = "set"; - public static final java.lang.String JSON_PROPERTY_SET_WITH_EXAMPLES = "setWithExamples"; - public static final java.lang.String JSON_PROPERTY_MAP = "map"; - public static final java.lang.String JSON_PROPERTY_MAP_WITH_EXAMPLE = "mapWithExample"; - public static final java.lang.String JSON_PROPERTY_OPTIONAL_ARRAY = "optionalArray"; - public static final java.lang.String JSON_PROPERTY_OPTIONAL_SET = "optionalSet"; - public static final java.lang.String JSON_PROPERTY_OPTIONAL_MAP = "optionalMap"; - public static final java.lang.String JSON_PROPERTY_NULLABLE_STRING = "nullableString"; - public static final java.lang.String JSON_PROPERTY_NULLABLE_ARRAY = "nullableArray"; - public static final java.lang.String JSON_PROPERTY_NULLABLE_SET = "nullableSet"; - public static final java.lang.String JSON_PROPERTY_DEFAULT_STRING = "defaultString"; - public static final java.lang.String JSON_PROPERTY_DEFAULT_INTEGER = "defaultInteger"; - public static final java.lang.String JSON_PROPERTY_DEFAULT_LONG = "defaultLong"; - public static final java.lang.String JSON_PROPERTY_DEFAULT_NULLABLE = "defaultNullable"; - public static final java.lang.String JSON_PROPERTY_REFERENED_MODEL = "referenedModel"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ID) + @com.fasterxml.jackson.annotation.JsonProperty("id") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer id; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ID_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonProperty("idWithExample") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer idWithExample; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ID_WITH_DEFAULT) + @com.fasterxml.jackson.annotation.JsonProperty("idWithDefault") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer idWithDefault = 32; @jakarta.validation.constraints.NotNull @jakarta.validation.constraints.Size(max = 36) - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NAME) + @com.fasterxml.jackson.annotation.JsonProperty("name") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.lang.String name; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NAME_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonProperty("nameWithExample") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String nameWithExample; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NAME_WITH_DEFAULT) + @com.fasterxml.jackson.annotation.JsonProperty("nameWithDefault") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String nameWithDefault = "MyDefaultName"; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE) + @com.fasterxml.jackson.annotation.JsonProperty("date") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.time.LocalDate date; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonProperty("dateWithExample") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.time.LocalDate dateWithExample; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE_TIME) + @com.fasterxml.jackson.annotation.JsonProperty("date-time") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.time.Instant dateTime; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE_TIME_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonProperty("date-timeWithExample") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.time.Instant dateTimeWithExample; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NUMBER) + @com.fasterxml.jackson.annotation.JsonProperty("number") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Double number; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BINARY) + @com.fasterxml.jackson.annotation.JsonProperty("binary") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private byte[] binary; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BYTES) + @com.fasterxml.jackson.annotation.JsonProperty("bytes") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private byte[] bytes; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ANY) + @com.fasterxml.jackson.annotation.JsonProperty("any") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT) private org.openapitools.jackson.nullable.JsonNullable any = org.openapitools.jackson.nullable.JsonNullable.of(null); @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ARRAY) + @com.fasterxml.jackson.annotation.JsonProperty("array") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.util.List array = new java.util.ArrayList<>(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ARRAY_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonProperty("arrayWithExample") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.List arrayWithExample; @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_SET) + @com.fasterxml.jackson.annotation.JsonProperty("set") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.util.Set set = new java.util.LinkedHashSet<>(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_SET_WITH_EXAMPLES) + @com.fasterxml.jackson.annotation.JsonProperty("setWithExamples") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.Set setWithExamples; @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_MAP) + @com.fasterxml.jackson.annotation.JsonProperty("map") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.util.Map map = new java.util.HashMap<>(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_MAP_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonProperty("mapWithExample") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.Map mapWithExample; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_OPTIONAL_ARRAY) + @com.fasterxml.jackson.annotation.JsonProperty("optionalArray") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.List optionalArray; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_OPTIONAL_SET) + @com.fasterxml.jackson.annotation.JsonProperty("optionalSet") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.Set optionalSet; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_OPTIONAL_MAP) + @com.fasterxml.jackson.annotation.JsonProperty("optionalMap") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.Map optionalMap; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NULLABLE_STRING) + @com.fasterxml.jackson.annotation.JsonProperty("nullableString") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT) private org.openapitools.jackson.nullable.JsonNullable nullableString = org.openapitools.jackson.nullable.JsonNullable.undefined(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NULLABLE_ARRAY) + @com.fasterxml.jackson.annotation.JsonProperty("nullableArray") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT) private org.openapitools.jackson.nullable.JsonNullable> nullableArray = org.openapitools.jackson.nullable.JsonNullable.undefined(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NULLABLE_SET) + @com.fasterxml.jackson.annotation.JsonProperty("nullableSet") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT) private org.openapitools.jackson.nullable.JsonNullable> nullableSet = org.openapitools.jackson.nullable.JsonNullable.undefined(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DEFAULT_STRING) + @com.fasterxml.jackson.annotation.JsonProperty("defaultString") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String defaultString = "defaultStringValue"; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DEFAULT_INTEGER) + @com.fasterxml.jackson.annotation.JsonProperty("defaultInteger") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer defaultInteger = 1234; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DEFAULT_LONG) + @com.fasterxml.jackson.annotation.JsonProperty("defaultLong") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Long defaultLong = 5678l; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DEFAULT_NULLABLE) + @com.fasterxml.jackson.annotation.JsonProperty("defaultNullable") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT) private org.openapitools.jackson.nullable.JsonNullable defaultNullable = org.openapitools.jackson.nullable.JsonNullable.of("defaultNullableValue"); @jakarta.validation.Valid - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_REFERENED_MODEL) + @com.fasterxml.jackson.annotation.JsonProperty("referenedModel") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private EnumerationModel referenedModel; diff --git a/gen/main/java/testmodel/micronaut_pojo_unsealed/OneOfImplementor1.java b/gen/main/java/testmodel/micronaut_pojo_unsealed/OneOfImplementor1.java index 6e529678..09737230 100644 --- a/gen/main/java/testmodel/micronaut_pojo_unsealed/OneOfImplementor1.java +++ b/gen/main/java/testmodel/micronaut_pojo_unsealed/OneOfImplementor1.java @@ -4,9 +4,7 @@ @io.micronaut.serde.annotation.Serdeable public class OneOfImplementor1 implements OneOfInterface { - public static final java.lang.String JSON_PROPERTY_PROPERTY = "property"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_PROPERTY) + @com.fasterxml.jackson.annotation.JsonProperty("property") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String property; diff --git a/gen/main/java/testmodel/micronaut_pojo_unsealed/OneOfImplementor2.java b/gen/main/java/testmodel/micronaut_pojo_unsealed/OneOfImplementor2.java index 96fef007..9629b8d5 100644 --- a/gen/main/java/testmodel/micronaut_pojo_unsealed/OneOfImplementor2.java +++ b/gen/main/java/testmodel/micronaut_pojo_unsealed/OneOfImplementor2.java @@ -4,9 +4,7 @@ @io.micronaut.serde.annotation.Serdeable public class OneOfImplementor2 implements OneOfInterface { - public static final java.lang.String JSON_PROPERTY_PROPERTY = "property"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_PROPERTY) + @com.fasterxml.jackson.annotation.JsonProperty("property") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Double property; diff --git a/gen/main/java/testmodel/micronaut_pojo_unsealed/OneOfInterface.java b/gen/main/java/testmodel/micronaut_pojo_unsealed/OneOfInterface.java index dfa4942b..3e465b23 100644 --- a/gen/main/java/testmodel/micronaut_pojo_unsealed/OneOfInterface.java +++ b/gen/main/java/testmodel/micronaut_pojo_unsealed/OneOfInterface.java @@ -1,15 +1,13 @@ package testmodel.micronaut_pojo_unsealed; @jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") -@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = OneOfInterface.JSON_DISCRIMINATOR) +@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = "type") @com.fasterxml.jackson.annotation.JsonSubTypes({ @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = OneOfImplementor1.class, name = "Implementation1"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = OneOfImplementor2.class, name = "Implementation2"), }) public interface OneOfInterface { - java.lang.String JSON_DISCRIMINATOR = "type"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_DISCRIMINATOR) + @com.fasterxml.jackson.annotation.JsonProperty("type") java.lang.String getType(); } diff --git a/gen/main/java/testmodel/micronaut_pojo_unsealed/PropertyTypeOne.java b/gen/main/java/testmodel/micronaut_pojo_unsealed/PropertyTypeOne.java index b33d030c..4ec0b373 100644 --- a/gen/main/java/testmodel/micronaut_pojo_unsealed/PropertyTypeOne.java +++ b/gen/main/java/testmodel/micronaut_pojo_unsealed/PropertyTypeOne.java @@ -4,9 +4,7 @@ @io.micronaut.serde.annotation.Serdeable public class PropertyTypeOne implements AdditionalPropertiesModelValue { - public static final java.lang.String JSON_PROPERTY_TYPE = "type"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE) + @com.fasterxml.jackson.annotation.JsonProperty("type") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private Type type; diff --git a/gen/main/java/testmodel/micronaut_pojo_unsealed/PropertyTypeTwo.java b/gen/main/java/testmodel/micronaut_pojo_unsealed/PropertyTypeTwo.java index 74ab3c40..d29f1495 100644 --- a/gen/main/java/testmodel/micronaut_pojo_unsealed/PropertyTypeTwo.java +++ b/gen/main/java/testmodel/micronaut_pojo_unsealed/PropertyTypeTwo.java @@ -4,9 +4,7 @@ @io.micronaut.serde.annotation.Serdeable public class PropertyTypeTwo implements AdditionalPropertiesModelValue { - public static final java.lang.String JSON_PROPERTY_TYPE = "type"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE) + @com.fasterxml.jackson.annotation.JsonProperty("type") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private Type type; diff --git a/gen/main/java/testmodel/micronaut_pojo_unsealed/SecondLevelOneModel.java b/gen/main/java/testmodel/micronaut_pojo_unsealed/SecondLevelOneModel.java index e5c097ad..a57631ae 100644 --- a/gen/main/java/testmodel/micronaut_pojo_unsealed/SecondLevelOneModel.java +++ b/gen/main/java/testmodel/micronaut_pojo_unsealed/SecondLevelOneModel.java @@ -4,14 +4,11 @@ @io.micronaut.serde.annotation.Serdeable public class SecondLevelOneModel implements SecondLevelModel { - public static final java.lang.String JSON_PROPERTY_TYPE = "type"; - public static final java.lang.String JSON_PROPERTY_ONE = "one"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE) + @com.fasterxml.jackson.annotation.JsonProperty("type") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String type; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ONE) + @com.fasterxml.jackson.annotation.JsonProperty("one") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String one; diff --git a/gen/main/java/testmodel/micronaut_pojo_unsealed/SecondLevelTwoModel.java b/gen/main/java/testmodel/micronaut_pojo_unsealed/SecondLevelTwoModel.java index c64e9b53..2be84b57 100644 --- a/gen/main/java/testmodel/micronaut_pojo_unsealed/SecondLevelTwoModel.java +++ b/gen/main/java/testmodel/micronaut_pojo_unsealed/SecondLevelTwoModel.java @@ -4,14 +4,11 @@ @io.micronaut.serde.annotation.Serdeable public class SecondLevelTwoModel implements SecondLevelModel { - public static final java.lang.String JSON_PROPERTY_TYPE = "type"; - public static final java.lang.String JSON_PROPERTY_TWO = "two"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE) + @com.fasterxml.jackson.annotation.JsonProperty("type") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String type; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TWO) + @com.fasterxml.jackson.annotation.JsonProperty("two") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String two; diff --git a/gen/main/java/testmodel/micronaut_record/AdditionalPropertiesModel.java b/gen/main/java/testmodel/micronaut_record/AdditionalPropertiesModel.java index 9342a0b1..d6fd8410 100644 --- a/gen/main/java/testmodel/micronaut_record/AdditionalPropertiesModel.java +++ b/gen/main/java/testmodel/micronaut_record/AdditionalPropertiesModel.java @@ -4,9 +4,6 @@ @io.micronaut.serde.annotation.Serdeable public record AdditionalPropertiesModel( - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ID) + @com.fasterxml.jackson.annotation.JsonProperty("id") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) - java.lang.String id) { - - public static final java.lang.String JSON_PROPERTY_ID = "id"; -} + java.lang.String id) {} diff --git a/gen/main/java/testmodel/micronaut_record/EnumerationModel.java b/gen/main/java/testmodel/micronaut_record/EnumerationModel.java index f128edc8..fac21d6c 100644 --- a/gen/main/java/testmodel/micronaut_record/EnumerationModel.java +++ b/gen/main/java/testmodel/micronaut_record/EnumerationModel.java @@ -4,27 +4,21 @@ @io.micronaut.serde.annotation.Serdeable public record EnumerationModel( - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_STRING) + @com.fasterxml.jackson.annotation.JsonProperty("string") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) EnumerationString string, - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_STRING_DEFAULT) + @com.fasterxml.jackson.annotation.JsonProperty("string-default") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) EnumerationStringDefault stringDefault, - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_EMBEDDED) + @com.fasterxml.jackson.annotation.JsonProperty("embedded") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) Embedded embedded, - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_EMBEDDED_DEFAULT) + @com.fasterxml.jackson.annotation.JsonProperty("embedded-default") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) EmbeddedDefault embeddedDefault) { - - public static final java.lang.String JSON_PROPERTY_STRING = "string"; - public static final java.lang.String JSON_PROPERTY_STRING_DEFAULT = "string-default"; - public static final java.lang.String JSON_PROPERTY_EMBEDDED = "embedded"; - public static final java.lang.String JSON_PROPERTY_EMBEDDED_DEFAULT = "embedded-default"; - public enum Embedded { FIRST("first"), @@ -56,7 +50,6 @@ public java.lang.String getValue() { return value; } } - public enum EmbeddedDefault { THREE("three"), diff --git a/gen/main/java/testmodel/micronaut_record/FirstModel.java b/gen/main/java/testmodel/micronaut_record/FirstModel.java index 73f3763b..91ecf38d 100644 --- a/gen/main/java/testmodel/micronaut_record/FirstModel.java +++ b/gen/main/java/testmodel/micronaut_record/FirstModel.java @@ -4,20 +4,15 @@ @io.micronaut.serde.annotation.Serdeable public record FirstModel( - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE) + @com.fasterxml.jackson.annotation.JsonProperty("type") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.lang.String type, - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FIRST) + @com.fasterxml.jackson.annotation.JsonProperty("first") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.lang.String first, @jakarta.validation.Valid - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_SECOND_LEVEL) + @com.fasterxml.jackson.annotation.JsonProperty("secondLevel") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) - SecondLevelModel secondLevel) implements OneOfModel { - - public static final java.lang.String JSON_PROPERTY_TYPE = "type"; - public static final java.lang.String JSON_PROPERTY_FIRST = "first"; - public static final java.lang.String JSON_PROPERTY_SECOND_LEVEL = "secondLevel"; -} + SecondLevelModel secondLevel) implements OneOfModel {} diff --git a/gen/main/java/testmodel/micronaut_record/InheritanceExtended.java b/gen/main/java/testmodel/micronaut_record/InheritanceExtended.java index 900ba162..7baba067 100644 --- a/gen/main/java/testmodel/micronaut_record/InheritanceExtended.java +++ b/gen/main/java/testmodel/micronaut_record/InheritanceExtended.java @@ -5,14 +5,11 @@ public record InheritanceExtended( @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + @com.fasterxml.jackson.annotation.JsonProperty("foo") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) java.lang.String foo, @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BAR) + @com.fasterxml.jackson.annotation.JsonProperty("bar") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) - java.lang.String bar) implements InheritanceSimple { - - public static final java.lang.String JSON_PROPERTY_BAR = "bar"; -} + java.lang.String bar) implements InheritanceSimple {} diff --git a/gen/main/java/testmodel/micronaut_record/InheritanceSimple.java b/gen/main/java/testmodel/micronaut_record/InheritanceSimple.java index 814f27b0..978bb6d6 100644 --- a/gen/main/java/testmodel/micronaut_record/InheritanceSimple.java +++ b/gen/main/java/testmodel/micronaut_record/InheritanceSimple.java @@ -4,10 +4,8 @@ @com.fasterxml.jackson.databind.annotation.JsonDeserialize(as = InheritanceSimpleDefault.class) public sealed interface InheritanceSimple permits InheritanceExtended, InheritanceSimpleDefault { - java.lang.String JSON_PROPERTY_FOO = "foo"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + @com.fasterxml.jackson.annotation.JsonProperty("foo") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) java.lang.String foo(); } diff --git a/gen/main/java/testmodel/micronaut_record/InheritanceSimpleDefault.java b/gen/main/java/testmodel/micronaut_record/InheritanceSimpleDefault.java index e5f93d2d..9230cd3d 100644 --- a/gen/main/java/testmodel/micronaut_record/InheritanceSimpleDefault.java +++ b/gen/main/java/testmodel/micronaut_record/InheritanceSimpleDefault.java @@ -5,8 +5,6 @@ public record InheritanceSimpleDefault( @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + @com.fasterxml.jackson.annotation.JsonProperty("foo") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) - java.lang.String foo) implements InheritanceSimple { - -} + java.lang.String foo) implements InheritanceSimple {} diff --git a/gen/main/java/testmodel/micronaut_record/InheritanceWithEnumType.java b/gen/main/java/testmodel/micronaut_record/InheritanceWithEnumType.java index dacb2a82..586d9365 100644 --- a/gen/main/java/testmodel/micronaut_record/InheritanceWithEnumType.java +++ b/gen/main/java/testmodel/micronaut_record/InheritanceWithEnumType.java @@ -1,7 +1,7 @@ package testmodel.micronaut_record; @jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") -@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = InheritanceWithEnumType.JSON_DISCRIMINATOR) +@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = "type") @com.fasterxml.jackson.annotation.JsonSubTypes({ @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithEnumType1.class, name = "Inheritance1"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithEnumType2.class, name = "Inheritance2"), @@ -9,8 +9,6 @@ }) public sealed interface InheritanceWithEnumType permits InheritanceWithEnumType1, InheritanceWithEnumType2, InheritanceWithEnumType3 { - java.lang.String JSON_DISCRIMINATOR = "type"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_DISCRIMINATOR) + @com.fasterxml.jackson.annotation.JsonProperty("type") InheritanceWithEnumTypeEnum type(); } diff --git a/gen/main/java/testmodel/micronaut_record/InheritanceWithEnumType1.java b/gen/main/java/testmodel/micronaut_record/InheritanceWithEnumType1.java index 33be17f4..badc61ba 100644 --- a/gen/main/java/testmodel/micronaut_record/InheritanceWithEnumType1.java +++ b/gen/main/java/testmodel/micronaut_record/InheritanceWithEnumType1.java @@ -4,12 +4,10 @@ @io.micronaut.serde.annotation.Serdeable public record InheritanceWithEnumType1( - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_D) + @com.fasterxml.jackson.annotation.JsonProperty("d") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.lang.String d) implements InheritanceWithEnumType { - public static final java.lang.String JSON_PROPERTY_D = "d"; - @Override public InheritanceWithEnumTypeEnum type() { return InheritanceWithEnumTypeEnum.INHERITANCE1; diff --git a/gen/main/java/testmodel/micronaut_record/InheritanceWithEnumType2.java b/gen/main/java/testmodel/micronaut_record/InheritanceWithEnumType2.java index f9fb9fb5..b47d725b 100644 --- a/gen/main/java/testmodel/micronaut_record/InheritanceWithEnumType2.java +++ b/gen/main/java/testmodel/micronaut_record/InheritanceWithEnumType2.java @@ -4,12 +4,10 @@ @io.micronaut.serde.annotation.Serdeable public record InheritanceWithEnumType2( - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_E) + @com.fasterxml.jackson.annotation.JsonProperty("e") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.lang.String e) implements InheritanceWithEnumType { - public static final java.lang.String JSON_PROPERTY_E = "e"; - @Override public InheritanceWithEnumTypeEnum type() { return InheritanceWithEnumTypeEnum.INHERITANCE2; diff --git a/gen/main/java/testmodel/micronaut_record/InheritanceWithEnumType3.java b/gen/main/java/testmodel/micronaut_record/InheritanceWithEnumType3.java index 116deb56..450544a2 100644 --- a/gen/main/java/testmodel/micronaut_record/InheritanceWithEnumType3.java +++ b/gen/main/java/testmodel/micronaut_record/InheritanceWithEnumType3.java @@ -4,7 +4,6 @@ @io.micronaut.serde.annotation.Serdeable public record InheritanceWithEnumType3() implements InheritanceWithEnumType { - @Override public InheritanceWithEnumTypeEnum type() { return InheritanceWithEnumTypeEnum.INHERITANCE3; diff --git a/gen/main/java/testmodel/micronaut_record/InheritanceWithStringType.java b/gen/main/java/testmodel/micronaut_record/InheritanceWithStringType.java index c83c6bf0..3ad61195 100644 --- a/gen/main/java/testmodel/micronaut_record/InheritanceWithStringType.java +++ b/gen/main/java/testmodel/micronaut_record/InheritanceWithStringType.java @@ -1,21 +1,17 @@ package testmodel.micronaut_record; @jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") -@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = InheritanceWithStringType.JSON_DISCRIMINATOR) +@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = "type") @com.fasterxml.jackson.annotation.JsonSubTypes({ @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithStringType1.class, name = "Inheritance1"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithStringType2.class, name = "Inheritance2") }) public sealed interface InheritanceWithStringType permits InheritanceWithStringType1, InheritanceWithStringType2 { - java.lang.String JSON_DISCRIMINATOR = "type"; - java.lang.String JSON_PROPERTY_A = "a"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_DISCRIMINATOR) + @com.fasterxml.jackson.annotation.JsonProperty("type") java.lang.String type(); - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + @com.fasterxml.jackson.annotation.JsonProperty("a") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.lang.String a(); } diff --git a/gen/main/java/testmodel/micronaut_record/InheritanceWithStringType1.java b/gen/main/java/testmodel/micronaut_record/InheritanceWithStringType1.java index 4de519cd..406af1fd 100644 --- a/gen/main/java/testmodel/micronaut_record/InheritanceWithStringType1.java +++ b/gen/main/java/testmodel/micronaut_record/InheritanceWithStringType1.java @@ -4,16 +4,14 @@ @io.micronaut.serde.annotation.Serdeable public record InheritanceWithStringType1( - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + @com.fasterxml.jackson.annotation.JsonProperty("a") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.lang.String a, - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_B) + @com.fasterxml.jackson.annotation.JsonProperty("b") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.lang.String b) implements InheritanceWithStringType { - public static final java.lang.String JSON_PROPERTY_B = "b"; - @Override public java.lang.String type() { return "Inheritance1"; diff --git a/gen/main/java/testmodel/micronaut_record/InheritanceWithStringType2.java b/gen/main/java/testmodel/micronaut_record/InheritanceWithStringType2.java index 551e8b25..94dae4e1 100644 --- a/gen/main/java/testmodel/micronaut_record/InheritanceWithStringType2.java +++ b/gen/main/java/testmodel/micronaut_record/InheritanceWithStringType2.java @@ -4,16 +4,14 @@ @io.micronaut.serde.annotation.Serdeable public record InheritanceWithStringType2( - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + @com.fasterxml.jackson.annotation.JsonProperty("a") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.lang.String a, - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_C) + @com.fasterxml.jackson.annotation.JsonProperty("c") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.lang.String c) implements InheritanceWithStringType { - public static final java.lang.String JSON_PROPERTY_C = "c"; - @Override public java.lang.String type() { return "Inheritance2"; diff --git a/gen/main/java/testmodel/micronaut_record/InheritanceWithoutType.java b/gen/main/java/testmodel/micronaut_record/InheritanceWithoutType.java index 30e7c78e..8a4b515f 100644 --- a/gen/main/java/testmodel/micronaut_record/InheritanceWithoutType.java +++ b/gen/main/java/testmodel/micronaut_record/InheritanceWithoutType.java @@ -1,21 +1,17 @@ package testmodel.micronaut_record; @jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") -@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = InheritanceWithoutType.JSON_DISCRIMINATOR) +@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = "type") @com.fasterxml.jackson.annotation.JsonSubTypes({ @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithoutType1.class, name = "Inheritance1"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithoutType2.class, name = "Inheritance2") }) public sealed interface InheritanceWithoutType permits InheritanceWithoutType1, InheritanceWithoutType2 { - java.lang.String JSON_DISCRIMINATOR = "type"; - java.lang.String JSON_PROPERTY_E = "e"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_DISCRIMINATOR) + @com.fasterxml.jackson.annotation.JsonProperty("type") java.lang.String type(); - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_E) + @com.fasterxml.jackson.annotation.JsonProperty("e") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.lang.String e(); } diff --git a/gen/main/java/testmodel/micronaut_record/InheritanceWithoutType1.java b/gen/main/java/testmodel/micronaut_record/InheritanceWithoutType1.java index b21f5694..1bdfb449 100644 --- a/gen/main/java/testmodel/micronaut_record/InheritanceWithoutType1.java +++ b/gen/main/java/testmodel/micronaut_record/InheritanceWithoutType1.java @@ -4,16 +4,14 @@ @io.micronaut.serde.annotation.Serdeable public record InheritanceWithoutType1( - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_E) + @com.fasterxml.jackson.annotation.JsonProperty("e") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.lang.String e, - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_F) + @com.fasterxml.jackson.annotation.JsonProperty("f") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.lang.String f) implements InheritanceWithoutType { - public static final java.lang.String JSON_PROPERTY_F = "f"; - @Override public java.lang.String type() { return "Inheritance1"; diff --git a/gen/main/java/testmodel/micronaut_record/InheritanceWithoutType2.java b/gen/main/java/testmodel/micronaut_record/InheritanceWithoutType2.java index c5188c18..c1711e64 100644 --- a/gen/main/java/testmodel/micronaut_record/InheritanceWithoutType2.java +++ b/gen/main/java/testmodel/micronaut_record/InheritanceWithoutType2.java @@ -4,16 +4,14 @@ @io.micronaut.serde.annotation.Serdeable public record InheritanceWithoutType2( - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_E) + @com.fasterxml.jackson.annotation.JsonProperty("e") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.lang.String e, - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_G) + @com.fasterxml.jackson.annotation.JsonProperty("g") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.lang.String g) implements InheritanceWithoutType { - public static final java.lang.String JSON_PROPERTY_G = "g"; - @Override public java.lang.String type() { return "Inheritance2"; diff --git a/gen/main/java/testmodel/micronaut_record/Model.java b/gen/main/java/testmodel/micronaut_record/Model.java index dc42131b..ab49c4a1 100644 --- a/gen/main/java/testmodel/micronaut_record/Model.java +++ b/gen/main/java/testmodel/micronaut_record/Model.java @@ -4,165 +4,132 @@ @io.micronaut.serde.annotation.Serdeable public record Model( - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ID) + @com.fasterxml.jackson.annotation.JsonProperty("id") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.lang.Integer id, - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ID_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonProperty("idWithExample") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.lang.Integer idWithExample, - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ID_WITH_DEFAULT) + @com.fasterxml.jackson.annotation.JsonProperty("idWithDefault") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.lang.Integer idWithDefault, @jakarta.validation.constraints.NotNull @jakarta.validation.constraints.Size(max = 36) - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NAME) + @com.fasterxml.jackson.annotation.JsonProperty("name") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) java.lang.String name, - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NAME_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonProperty("nameWithExample") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.lang.String nameWithExample, - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NAME_WITH_DEFAULT) + @com.fasterxml.jackson.annotation.JsonProperty("nameWithDefault") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.lang.String nameWithDefault, - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE) + @com.fasterxml.jackson.annotation.JsonProperty("date") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.time.LocalDate date, - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonProperty("dateWithExample") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.time.LocalDate dateWithExample, - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE_TIME) + @com.fasterxml.jackson.annotation.JsonProperty("date-time") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.time.Instant dateTime, - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE_TIME_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonProperty("date-timeWithExample") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.time.Instant dateTimeWithExample, - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NUMBER) + @com.fasterxml.jackson.annotation.JsonProperty("number") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.lang.Double number, - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BINARY) + @com.fasterxml.jackson.annotation.JsonProperty("binary") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) byte[] binary, - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BYTES) + @com.fasterxml.jackson.annotation.JsonProperty("bytes") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) byte[] bytes, - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ANY) + @com.fasterxml.jackson.annotation.JsonProperty("any") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT) java.lang.Object any, @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ARRAY) + @com.fasterxml.jackson.annotation.JsonProperty("array") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) java.util.List array, - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ARRAY_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonProperty("arrayWithExample") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.util.List arrayWithExample, @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_SET) + @com.fasterxml.jackson.annotation.JsonProperty("set") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) java.util.Set set, - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_SET_WITH_EXAMPLES) + @com.fasterxml.jackson.annotation.JsonProperty("setWithExamples") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.util.Set setWithExamples, @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_MAP) + @com.fasterxml.jackson.annotation.JsonProperty("map") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) java.util.Map map, - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_MAP_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonProperty("mapWithExample") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.util.Map mapWithExample, - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_OPTIONAL_ARRAY) + @com.fasterxml.jackson.annotation.JsonProperty("optionalArray") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.util.List optionalArray, - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_OPTIONAL_SET) + @com.fasterxml.jackson.annotation.JsonProperty("optionalSet") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.util.Set optionalSet, - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_OPTIONAL_MAP) + @com.fasterxml.jackson.annotation.JsonProperty("optionalMap") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.util.Map optionalMap, - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NULLABLE_STRING) + @com.fasterxml.jackson.annotation.JsonProperty("nullableString") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT) java.lang.String nullableString, - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NULLABLE_ARRAY) + @com.fasterxml.jackson.annotation.JsonProperty("nullableArray") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT) java.util.List nullableArray, - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NULLABLE_SET) + @com.fasterxml.jackson.annotation.JsonProperty("nullableSet") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT) java.util.Set nullableSet, - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DEFAULT_STRING) + @com.fasterxml.jackson.annotation.JsonProperty("defaultString") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.lang.String defaultString, - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DEFAULT_INTEGER) + @com.fasterxml.jackson.annotation.JsonProperty("defaultInteger") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.lang.Integer defaultInteger, - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DEFAULT_LONG) + @com.fasterxml.jackson.annotation.JsonProperty("defaultLong") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.lang.Long defaultLong, - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DEFAULT_NULLABLE) + @com.fasterxml.jackson.annotation.JsonProperty("defaultNullable") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT) java.lang.String defaultNullable, @jakarta.validation.Valid - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_REFERENED_MODEL) - @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) - EnumerationModel referenedModel) { - - public static final java.lang.String JSON_PROPERTY_ID = "id"; - public static final java.lang.String JSON_PROPERTY_ID_WITH_EXAMPLE = "idWithExample"; - public static final java.lang.String JSON_PROPERTY_ID_WITH_DEFAULT = "idWithDefault"; - public static final java.lang.String JSON_PROPERTY_NAME = "name"; - public static final java.lang.String JSON_PROPERTY_NAME_WITH_EXAMPLE = "nameWithExample"; - public static final java.lang.String JSON_PROPERTY_NAME_WITH_DEFAULT = "nameWithDefault"; - public static final java.lang.String JSON_PROPERTY_DATE = "date"; - public static final java.lang.String JSON_PROPERTY_DATE_WITH_EXAMPLE = "dateWithExample"; - public static final java.lang.String JSON_PROPERTY_DATE_TIME = "date-time"; - public static final java.lang.String JSON_PROPERTY_DATE_TIME_WITH_EXAMPLE = "date-timeWithExample"; - public static final java.lang.String JSON_PROPERTY_NUMBER = "number"; - public static final java.lang.String JSON_PROPERTY_BINARY = "binary"; - public static final java.lang.String JSON_PROPERTY_BYTES = "bytes"; - public static final java.lang.String JSON_PROPERTY_ANY = "any"; - public static final java.lang.String JSON_PROPERTY_ARRAY = "array"; - public static final java.lang.String JSON_PROPERTY_ARRAY_WITH_EXAMPLE = "arrayWithExample"; - public static final java.lang.String JSON_PROPERTY_SET = "set"; - public static final java.lang.String JSON_PROPERTY_SET_WITH_EXAMPLES = "setWithExamples"; - public static final java.lang.String JSON_PROPERTY_MAP = "map"; - public static final java.lang.String JSON_PROPERTY_MAP_WITH_EXAMPLE = "mapWithExample"; - public static final java.lang.String JSON_PROPERTY_OPTIONAL_ARRAY = "optionalArray"; - public static final java.lang.String JSON_PROPERTY_OPTIONAL_SET = "optionalSet"; - public static final java.lang.String JSON_PROPERTY_OPTIONAL_MAP = "optionalMap"; - public static final java.lang.String JSON_PROPERTY_NULLABLE_STRING = "nullableString"; - public static final java.lang.String JSON_PROPERTY_NULLABLE_ARRAY = "nullableArray"; - public static final java.lang.String JSON_PROPERTY_NULLABLE_SET = "nullableSet"; - public static final java.lang.String JSON_PROPERTY_DEFAULT_STRING = "defaultString"; - public static final java.lang.String JSON_PROPERTY_DEFAULT_INTEGER = "defaultInteger"; - public static final java.lang.String JSON_PROPERTY_DEFAULT_LONG = "defaultLong"; - public static final java.lang.String JSON_PROPERTY_DEFAULT_NULLABLE = "defaultNullable"; - public static final java.lang.String JSON_PROPERTY_REFERENED_MODEL = "referenedModel"; -} + @com.fasterxml.jackson.annotation.JsonProperty("referenedModel") + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + EnumerationModel referenedModel) {} diff --git a/gen/main/java/testmodel/micronaut_record/OneOfImplementor1.java b/gen/main/java/testmodel/micronaut_record/OneOfImplementor1.java index 0ad3a4b0..0b32e08f 100644 --- a/gen/main/java/testmodel/micronaut_record/OneOfImplementor1.java +++ b/gen/main/java/testmodel/micronaut_record/OneOfImplementor1.java @@ -4,12 +4,10 @@ @io.micronaut.serde.annotation.Serdeable public record OneOfImplementor1( - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_PROPERTY) + @com.fasterxml.jackson.annotation.JsonProperty("property") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.lang.String property) implements OneOfInterface { - public static final java.lang.String JSON_PROPERTY_PROPERTY = "property"; - @Override public java.lang.String type() { return "Implementation1"; diff --git a/gen/main/java/testmodel/micronaut_record/OneOfImplementor2.java b/gen/main/java/testmodel/micronaut_record/OneOfImplementor2.java index 3ec443e0..faf6e8d9 100644 --- a/gen/main/java/testmodel/micronaut_record/OneOfImplementor2.java +++ b/gen/main/java/testmodel/micronaut_record/OneOfImplementor2.java @@ -4,12 +4,10 @@ @io.micronaut.serde.annotation.Serdeable public record OneOfImplementor2( - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_PROPERTY) + @com.fasterxml.jackson.annotation.JsonProperty("property") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.lang.Double property) implements OneOfInterface { - public static final java.lang.String JSON_PROPERTY_PROPERTY = "property"; - @Override public java.lang.String type() { return "Implementation2"; diff --git a/gen/main/java/testmodel/micronaut_record/OneOfInterface.java b/gen/main/java/testmodel/micronaut_record/OneOfInterface.java index 56531ca7..6fc56566 100644 --- a/gen/main/java/testmodel/micronaut_record/OneOfInterface.java +++ b/gen/main/java/testmodel/micronaut_record/OneOfInterface.java @@ -1,15 +1,13 @@ package testmodel.micronaut_record; @jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") -@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = OneOfInterface.JSON_DISCRIMINATOR) +@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = "type") @com.fasterxml.jackson.annotation.JsonSubTypes({ @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = OneOfImplementor1.class, name = "Implementation1"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = OneOfImplementor2.class, name = "Implementation2"), }) public sealed interface OneOfInterface permits OneOfImplementor1, OneOfImplementor2 { - java.lang.String JSON_DISCRIMINATOR = "type"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_DISCRIMINATOR) + @com.fasterxml.jackson.annotation.JsonProperty("type") java.lang.String type(); } diff --git a/gen/main/java/testmodel/micronaut_record/PropertyTypeOne.java b/gen/main/java/testmodel/micronaut_record/PropertyTypeOne.java index 96b9f37e..c09c7b7f 100644 --- a/gen/main/java/testmodel/micronaut_record/PropertyTypeOne.java +++ b/gen/main/java/testmodel/micronaut_record/PropertyTypeOne.java @@ -4,12 +4,9 @@ @io.micronaut.serde.annotation.Serdeable public record PropertyTypeOne( - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE) + @com.fasterxml.jackson.annotation.JsonProperty("type") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) Type type) implements AdditionalPropertiesModelValue { - - public static final java.lang.String JSON_PROPERTY_TYPE = "type"; - public enum Type { ONE("one"); diff --git a/gen/main/java/testmodel/micronaut_record/PropertyTypeTwo.java b/gen/main/java/testmodel/micronaut_record/PropertyTypeTwo.java index 265493e1..b3e847c7 100644 --- a/gen/main/java/testmodel/micronaut_record/PropertyTypeTwo.java +++ b/gen/main/java/testmodel/micronaut_record/PropertyTypeTwo.java @@ -4,12 +4,9 @@ @io.micronaut.serde.annotation.Serdeable public record PropertyTypeTwo( - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE) + @com.fasterxml.jackson.annotation.JsonProperty("type") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) Type type) implements AdditionalPropertiesModelValue { - - public static final java.lang.String JSON_PROPERTY_TYPE = "type"; - public enum Type { TWO("two"); diff --git a/gen/main/java/testmodel/micronaut_record/SecondLevelOneModel.java b/gen/main/java/testmodel/micronaut_record/SecondLevelOneModel.java index 5213faf2..071e9f37 100644 --- a/gen/main/java/testmodel/micronaut_record/SecondLevelOneModel.java +++ b/gen/main/java/testmodel/micronaut_record/SecondLevelOneModel.java @@ -4,14 +4,10 @@ @io.micronaut.serde.annotation.Serdeable public record SecondLevelOneModel( - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE) + @com.fasterxml.jackson.annotation.JsonProperty("type") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.lang.String type, - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ONE) + @com.fasterxml.jackson.annotation.JsonProperty("one") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) - java.lang.String one) implements SecondLevelModel { - - public static final java.lang.String JSON_PROPERTY_TYPE = "type"; - public static final java.lang.String JSON_PROPERTY_ONE = "one"; -} + java.lang.String one) implements SecondLevelModel {} diff --git a/gen/main/java/testmodel/micronaut_record/SecondLevelTwoModel.java b/gen/main/java/testmodel/micronaut_record/SecondLevelTwoModel.java index d114082c..da75efe1 100644 --- a/gen/main/java/testmodel/micronaut_record/SecondLevelTwoModel.java +++ b/gen/main/java/testmodel/micronaut_record/SecondLevelTwoModel.java @@ -4,14 +4,10 @@ @io.micronaut.serde.annotation.Serdeable public record SecondLevelTwoModel( - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE) + @com.fasterxml.jackson.annotation.JsonProperty("type") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.lang.String type, - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TWO) + @com.fasterxml.jackson.annotation.JsonProperty("two") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) - java.lang.String two) implements SecondLevelModel { - - public static final java.lang.String JSON_PROPERTY_TYPE = "type"; - public static final java.lang.String JSON_PROPERTY_TWO = "two"; -} + java.lang.String two) implements SecondLevelModel {} diff --git a/gen/main/java/testmodel/micronaut_record_constants/AdditionalPropertiesModel.java b/gen/main/java/testmodel/micronaut_record_constants/AdditionalPropertiesModel.java new file mode 100644 index 00000000..09c6b291 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_record_constants/AdditionalPropertiesModel.java @@ -0,0 +1,12 @@ +package testmodel.micronaut_record_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public record AdditionalPropertiesModel( + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ID) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.lang.String id) { + + public static final java.lang.String JSON_PROPERTY_ID = "id"; +} diff --git a/gen/main/java/testmodel/micronaut_record_constants/AdditionalPropertiesModelValue.java b/gen/main/java/testmodel/micronaut_record_constants/AdditionalPropertiesModelValue.java new file mode 100644 index 00000000..9c3938cb --- /dev/null +++ b/gen/main/java/testmodel/micronaut_record_constants/AdditionalPropertiesModelValue.java @@ -0,0 +1,9 @@ +package testmodel.micronaut_record_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.DEDUCTION, visible = true) +@com.fasterxml.jackson.annotation.JsonSubTypes({ + @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = PropertyTypeOne.class), + @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = PropertyTypeTwo.class) +}) +public sealed interface AdditionalPropertiesModelValue permits PropertyTypeOne, PropertyTypeTwo {} diff --git a/gen/main/java/testmodel/micronaut_record_constants/EnumerationInteger.java b/gen/main/java/testmodel/micronaut_record_constants/EnumerationInteger.java new file mode 100644 index 00000000..d04956d4 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_record_constants/EnumerationInteger.java @@ -0,0 +1,40 @@ +package testmodel.micronaut_record_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +public enum EnumerationInteger { + + NUMBER_MINUS_2147483648(-2147483648), + NUMBER_MINUS_1(-1), + NUMBER_0(0), + NUMBER_1(1), + NUMBER_2147483647(2147483647); + + public static final java.lang.Integer NUMBER_MINUS_2147483648_VALUE = -2147483648; + public static final java.lang.Integer NUMBER_MINUS_1_VALUE = -1; + public static final java.lang.Integer NUMBER_0_VALUE = 0; + public static final java.lang.Integer NUMBER_1_VALUE = 1; + public static final java.lang.Integer NUMBER_2147483647_VALUE = 2147483647; + + private final java.lang.Integer value; + + private EnumerationInteger(java.lang.Integer value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static EnumerationInteger toEnum(java.lang.Integer value) { + return toOptional(value).orElseThrow(() -> new IllegalArgumentException("Unknown value '" + value + "'.")); + } + + public static java.util.Optional toOptional(java.lang.Integer value) { + return java.util.Arrays + .stream(values()) + .filter(e -> e.value.equals(value)) + .findAny(); + } + + @com.fasterxml.jackson.annotation.JsonValue + public java.lang.Integer getValue() { + return value; + } +} diff --git a/gen/main/java/testmodel/micronaut_record_constants/EnumerationModel.java b/gen/main/java/testmodel/micronaut_record_constants/EnumerationModel.java new file mode 100644 index 00000000..0c7fb934 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_record_constants/EnumerationModel.java @@ -0,0 +1,90 @@ +package testmodel.micronaut_record_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public record EnumerationModel( + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_STRING) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + EnumerationString string, + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_STRING_DEFAULT) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + EnumerationStringDefault stringDefault, + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_EMBEDDED) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + Embedded embedded, + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_EMBEDDED_DEFAULT) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + EmbeddedDefault embeddedDefault) { + + public static final java.lang.String JSON_PROPERTY_STRING = "string"; + public static final java.lang.String JSON_PROPERTY_STRING_DEFAULT = "string-default"; + public static final java.lang.String JSON_PROPERTY_EMBEDDED = "embedded"; + public static final java.lang.String JSON_PROPERTY_EMBEDDED_DEFAULT = "embedded-default"; + +public enum Embedded { + + FIRST("first"), + SECOND("second"); + + public static final java.lang.String FIRST_VALUE = "first"; + public static final java.lang.String SECOND_VALUE = "second"; + + private final java.lang.String value; + + private Embedded(java.lang.String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static Embedded toEnum(java.lang.String value) { + return toOptional(value).orElseThrow(() -> new IllegalArgumentException("Unknown value '" + value + "'.")); + } + + public static java.util.Optional toOptional(java.lang.String value) { + return java.util.Arrays + .stream(values()) + .filter(e -> e.value.equals(value)) + .findAny(); + } + + @com.fasterxml.jackson.annotation.JsonValue + public java.lang.String getValue() { + return value; + } +} +public enum EmbeddedDefault { + + THREE("three"), + FOUR("four"); + + public static final java.lang.String THREE_VALUE = "three"; + public static final java.lang.String FOUR_VALUE = "four"; + + private final java.lang.String value; + + private EmbeddedDefault(java.lang.String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static EmbeddedDefault toEnum(java.lang.String value) { + return toOptional(value).orElseThrow(() -> new IllegalArgumentException("Unknown value '" + value + "'.")); + } + + public static java.util.Optional toOptional(java.lang.String value) { + return java.util.Arrays + .stream(values()) + .filter(e -> e.value.equals(value)) + .findAny(); + } + + @com.fasterxml.jackson.annotation.JsonValue + public java.lang.String getValue() { + return value; + } +} +} diff --git a/gen/main/java/testmodel/micronaut_record_constants/EnumerationNumber.java b/gen/main/java/testmodel/micronaut_record_constants/EnumerationNumber.java new file mode 100644 index 00000000..0d90a65b --- /dev/null +++ b/gen/main/java/testmodel/micronaut_record_constants/EnumerationNumber.java @@ -0,0 +1,36 @@ +package testmodel.micronaut_record_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +public enum EnumerationNumber { + + NUMBER_MINUS_1(-1D), + NUMBER_0(0D), + NUMBER_1(1D); + + public static final java.lang.Double NUMBER_MINUS_1_VALUE = -1D; + public static final java.lang.Double NUMBER_0_VALUE = 0D; + public static final java.lang.Double NUMBER_1_VALUE = 1D; + + private final java.lang.Double value; + + private EnumerationNumber(java.lang.Double value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static EnumerationNumber toEnum(java.lang.Double value) { + return toOptional(value).orElseThrow(() -> new IllegalArgumentException("Unknown value '" + value + "'.")); + } + + public static java.util.Optional toOptional(java.lang.Double value) { + return java.util.Arrays + .stream(values()) + .filter(e -> e.value.equals(value)) + .findAny(); + } + + @com.fasterxml.jackson.annotation.JsonValue + public java.lang.Double getValue() { + return value; + } +} diff --git a/gen/main/java/testmodel/micronaut_record_constants/EnumerationString.java b/gen/main/java/testmodel/micronaut_record_constants/EnumerationString.java new file mode 100644 index 00000000..6dd5058c --- /dev/null +++ b/gen/main/java/testmodel/micronaut_record_constants/EnumerationString.java @@ -0,0 +1,34 @@ +package testmodel.micronaut_record_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +public enum EnumerationString { + + ONE("one"), + TWO("two"); + + public static final java.lang.String ONE_VALUE = "one"; + public static final java.lang.String TWO_VALUE = "two"; + + private final java.lang.String value; + + private EnumerationString(java.lang.String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static EnumerationString toEnum(java.lang.String value) { + return toOptional(value).orElseThrow(() -> new IllegalArgumentException("Unknown value '" + value + "'.")); + } + + public static java.util.Optional toOptional(java.lang.String value) { + return java.util.Arrays + .stream(values()) + .filter(e -> e.value.equals(value)) + .findAny(); + } + + @com.fasterxml.jackson.annotation.JsonValue + public java.lang.String getValue() { + return value; + } +} diff --git a/gen/main/java/testmodel/micronaut_record_constants/EnumerationStringDefault.java b/gen/main/java/testmodel/micronaut_record_constants/EnumerationStringDefault.java new file mode 100644 index 00000000..d6843300 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_record_constants/EnumerationStringDefault.java @@ -0,0 +1,34 @@ +package testmodel.micronaut_record_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +public enum EnumerationStringDefault { + + THREE("three"), + FOUR("four"); + + public static final java.lang.String THREE_VALUE = "three"; + public static final java.lang.String FOUR_VALUE = "four"; + + private final java.lang.String value; + + private EnumerationStringDefault(java.lang.String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static EnumerationStringDefault toEnum(java.lang.String value) { + return toOptional(value).orElseThrow(() -> new IllegalArgumentException("Unknown value '" + value + "'.")); + } + + public static java.util.Optional toOptional(java.lang.String value) { + return java.util.Arrays + .stream(values()) + .filter(e -> e.value.equals(value)) + .findAny(); + } + + @com.fasterxml.jackson.annotation.JsonValue + public java.lang.String getValue() { + return value; + } +} diff --git a/gen/main/java/testmodel/micronaut_record_constants/FirstModel.java b/gen/main/java/testmodel/micronaut_record_constants/FirstModel.java new file mode 100644 index 00000000..cd606c07 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_record_constants/FirstModel.java @@ -0,0 +1,23 @@ +package testmodel.micronaut_record_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public record FirstModel( + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.lang.String type, + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FIRST) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.lang.String first, + + @jakarta.validation.Valid + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_SECOND_LEVEL) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + SecondLevelModel secondLevel) implements OneOfModel { + + public static final java.lang.String JSON_PROPERTY_TYPE = "type"; + public static final java.lang.String JSON_PROPERTY_FIRST = "first"; + public static final java.lang.String JSON_PROPERTY_SECOND_LEVEL = "secondLevel"; +} diff --git a/gen/main/java/testmodel/micronaut_record_constants/InheritanceExtended.java b/gen/main/java/testmodel/micronaut_record_constants/InheritanceExtended.java new file mode 100644 index 00000000..9c83272c --- /dev/null +++ b/gen/main/java/testmodel/micronaut_record_constants/InheritanceExtended.java @@ -0,0 +1,18 @@ +package testmodel.micronaut_record_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public record InheritanceExtended( + + @jakarta.validation.constraints.NotNull + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) + java.lang.String foo, + + @jakarta.validation.constraints.NotNull + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BAR) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) + java.lang.String bar) implements InheritanceSimple { + + public static final java.lang.String JSON_PROPERTY_BAR = "bar"; +} diff --git a/gen/main/java/testmodel/micronaut_record_constants/InheritanceSimple.java b/gen/main/java/testmodel/micronaut_record_constants/InheritanceSimple.java new file mode 100644 index 00000000..955bf5f5 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_record_constants/InheritanceSimple.java @@ -0,0 +1,12 @@ +package testmodel.micronaut_record_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@com.fasterxml.jackson.databind.annotation.JsonDeserialize(as = InheritanceSimpleDefault.class) +public sealed interface InheritanceSimple permits InheritanceExtended, InheritanceSimpleDefault { + + java.lang.String JSON_PROPERTY_FOO = "foo"; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) + java.lang.String foo(); +} diff --git a/gen/main/java/testmodel/micronaut_record_constants/InheritanceSimpleDefault.java b/gen/main/java/testmodel/micronaut_record_constants/InheritanceSimpleDefault.java new file mode 100644 index 00000000..b6f3fcf1 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_record_constants/InheritanceSimpleDefault.java @@ -0,0 +1,11 @@ +package testmodel.micronaut_record_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public record InheritanceSimpleDefault( + + @jakarta.validation.constraints.NotNull + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) + java.lang.String foo) implements InheritanceSimple { +} diff --git a/gen/main/java/testmodel/micronaut_record_constants/InheritanceWithEnumType.java b/gen/main/java/testmodel/micronaut_record_constants/InheritanceWithEnumType.java new file mode 100644 index 00000000..b3dde74e --- /dev/null +++ b/gen/main/java/testmodel/micronaut_record_constants/InheritanceWithEnumType.java @@ -0,0 +1,16 @@ +package testmodel.micronaut_record_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = InheritanceWithEnumType.JSON_DISCRIMINATOR) +@com.fasterxml.jackson.annotation.JsonSubTypes({ + @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithEnumType1.class, name = "Inheritance1"), + @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithEnumType2.class, name = "Inheritance2"), + @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithEnumType3.class, name = "Inheritance3") +}) +public sealed interface InheritanceWithEnumType permits InheritanceWithEnumType1, InheritanceWithEnumType2, InheritanceWithEnumType3 { + + java.lang.String JSON_DISCRIMINATOR = "type"; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_DISCRIMINATOR) + InheritanceWithEnumTypeEnum type(); +} diff --git a/gen/main/java/testmodel/micronaut_record_constants/InheritanceWithEnumType1.java b/gen/main/java/testmodel/micronaut_record_constants/InheritanceWithEnumType1.java new file mode 100644 index 00000000..4fad0b7e --- /dev/null +++ b/gen/main/java/testmodel/micronaut_record_constants/InheritanceWithEnumType1.java @@ -0,0 +1,17 @@ +package testmodel.micronaut_record_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public record InheritanceWithEnumType1( + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_D) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.lang.String d) implements InheritanceWithEnumType { + + public static final java.lang.String JSON_PROPERTY_D = "d"; + + @Override + public InheritanceWithEnumTypeEnum type() { + return InheritanceWithEnumTypeEnum.INHERITANCE1; + } +} diff --git a/gen/main/java/testmodel/micronaut_record_constants/InheritanceWithEnumType2.java b/gen/main/java/testmodel/micronaut_record_constants/InheritanceWithEnumType2.java new file mode 100644 index 00000000..72b1c8c6 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_record_constants/InheritanceWithEnumType2.java @@ -0,0 +1,17 @@ +package testmodel.micronaut_record_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public record InheritanceWithEnumType2( + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_E) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.lang.String e) implements InheritanceWithEnumType { + + public static final java.lang.String JSON_PROPERTY_E = "e"; + + @Override + public InheritanceWithEnumTypeEnum type() { + return InheritanceWithEnumTypeEnum.INHERITANCE2; + } +} diff --git a/gen/main/java/testmodel/micronaut_record_constants/InheritanceWithEnumType3.java b/gen/main/java/testmodel/micronaut_record_constants/InheritanceWithEnumType3.java new file mode 100644 index 00000000..4e183168 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_record_constants/InheritanceWithEnumType3.java @@ -0,0 +1,11 @@ +package testmodel.micronaut_record_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public record InheritanceWithEnumType3() implements InheritanceWithEnumType { + + @Override + public InheritanceWithEnumTypeEnum type() { + return InheritanceWithEnumTypeEnum.INHERITANCE3; + } +} diff --git a/gen/main/java/testmodel/micronaut_record_constants/InheritanceWithEnumTypeEnum.java b/gen/main/java/testmodel/micronaut_record_constants/InheritanceWithEnumTypeEnum.java new file mode 100644 index 00000000..37691a8e --- /dev/null +++ b/gen/main/java/testmodel/micronaut_record_constants/InheritanceWithEnumTypeEnum.java @@ -0,0 +1,36 @@ +package testmodel.micronaut_record_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +public enum InheritanceWithEnumTypeEnum { + + INHERITANCE1("Inheritance1"), + INHERITANCE2("Inheritance2"), + INHERITANCE3("Inheritance3"); + + public static final java.lang.String INHERITANCE1_VALUE = "Inheritance1"; + public static final java.lang.String INHERITANCE2_VALUE = "Inheritance2"; + public static final java.lang.String INHERITANCE3_VALUE = "Inheritance3"; + + private final java.lang.String value; + + private InheritanceWithEnumTypeEnum(java.lang.String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static InheritanceWithEnumTypeEnum toEnum(java.lang.String value) { + return toOptional(value).orElseThrow(() -> new IllegalArgumentException("Unknown value '" + value + "'.")); + } + + public static java.util.Optional toOptional(java.lang.String value) { + return java.util.Arrays + .stream(values()) + .filter(e -> e.value.equals(value)) + .findAny(); + } + + @com.fasterxml.jackson.annotation.JsonValue + public java.lang.String getValue() { + return value; + } +} diff --git a/gen/main/java/testmodel/micronaut_record_constants/InheritanceWithStringType.java b/gen/main/java/testmodel/micronaut_record_constants/InheritanceWithStringType.java new file mode 100644 index 00000000..b5064a11 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_record_constants/InheritanceWithStringType.java @@ -0,0 +1,20 @@ +package testmodel.micronaut_record_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = InheritanceWithStringType.JSON_DISCRIMINATOR) +@com.fasterxml.jackson.annotation.JsonSubTypes({ + @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithStringType1.class, name = "Inheritance1"), + @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithStringType2.class, name = "Inheritance2") +}) +public sealed interface InheritanceWithStringType permits InheritanceWithStringType1, InheritanceWithStringType2 { + + java.lang.String JSON_DISCRIMINATOR = "type"; + java.lang.String JSON_PROPERTY_A = "a"; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_DISCRIMINATOR) + java.lang.String type(); + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.lang.String a(); +} diff --git a/gen/main/java/testmodel/micronaut_record_constants/InheritanceWithStringType1.java b/gen/main/java/testmodel/micronaut_record_constants/InheritanceWithStringType1.java new file mode 100644 index 00000000..daf49cfd --- /dev/null +++ b/gen/main/java/testmodel/micronaut_record_constants/InheritanceWithStringType1.java @@ -0,0 +1,21 @@ +package testmodel.micronaut_record_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public record InheritanceWithStringType1( + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.lang.String a, + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_B) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.lang.String b) implements InheritanceWithStringType { + + public static final java.lang.String JSON_PROPERTY_B = "b"; + + @Override + public java.lang.String type() { + return "Inheritance1"; + } +} diff --git a/gen/main/java/testmodel/micronaut_record_constants/InheritanceWithStringType2.java b/gen/main/java/testmodel/micronaut_record_constants/InheritanceWithStringType2.java new file mode 100644 index 00000000..7e6e8d4d --- /dev/null +++ b/gen/main/java/testmodel/micronaut_record_constants/InheritanceWithStringType2.java @@ -0,0 +1,21 @@ +package testmodel.micronaut_record_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public record InheritanceWithStringType2( + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.lang.String a, + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_C) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.lang.String c) implements InheritanceWithStringType { + + public static final java.lang.String JSON_PROPERTY_C = "c"; + + @Override + public java.lang.String type() { + return "Inheritance2"; + } +} diff --git a/gen/main/java/testmodel/micronaut_record_constants/InheritanceWithoutType.java b/gen/main/java/testmodel/micronaut_record_constants/InheritanceWithoutType.java new file mode 100644 index 00000000..21ed07b7 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_record_constants/InheritanceWithoutType.java @@ -0,0 +1,20 @@ +package testmodel.micronaut_record_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = InheritanceWithoutType.JSON_DISCRIMINATOR) +@com.fasterxml.jackson.annotation.JsonSubTypes({ + @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithoutType1.class, name = "Inheritance1"), + @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithoutType2.class, name = "Inheritance2") +}) +public sealed interface InheritanceWithoutType permits InheritanceWithoutType1, InheritanceWithoutType2 { + + java.lang.String JSON_DISCRIMINATOR = "type"; + java.lang.String JSON_PROPERTY_E = "e"; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_DISCRIMINATOR) + java.lang.String type(); + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_E) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.lang.String e(); +} diff --git a/gen/main/java/testmodel/micronaut_record_constants/InheritanceWithoutType1.java b/gen/main/java/testmodel/micronaut_record_constants/InheritanceWithoutType1.java new file mode 100644 index 00000000..a30d5069 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_record_constants/InheritanceWithoutType1.java @@ -0,0 +1,21 @@ +package testmodel.micronaut_record_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public record InheritanceWithoutType1( + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_E) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.lang.String e, + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_F) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.lang.String f) implements InheritanceWithoutType { + + public static final java.lang.String JSON_PROPERTY_F = "f"; + + @Override + public java.lang.String type() { + return "Inheritance1"; + } +} diff --git a/gen/main/java/testmodel/micronaut_record_constants/InheritanceWithoutType2.java b/gen/main/java/testmodel/micronaut_record_constants/InheritanceWithoutType2.java new file mode 100644 index 00000000..3a5641dd --- /dev/null +++ b/gen/main/java/testmodel/micronaut_record_constants/InheritanceWithoutType2.java @@ -0,0 +1,21 @@ +package testmodel.micronaut_record_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public record InheritanceWithoutType2( + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_E) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.lang.String e, + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_G) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.lang.String g) implements InheritanceWithoutType { + + public static final java.lang.String JSON_PROPERTY_G = "g"; + + @Override + public java.lang.String type() { + return "Inheritance2"; + } +} diff --git a/gen/main/java/testmodel/micronaut_record_constants/Model.java b/gen/main/java/testmodel/micronaut_record_constants/Model.java new file mode 100644 index 00000000..455791f3 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_record_constants/Model.java @@ -0,0 +1,168 @@ +package testmodel.micronaut_record_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public record Model( + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ID) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.lang.Integer id, + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ID_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.lang.Integer idWithExample, + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ID_WITH_DEFAULT) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.lang.Integer idWithDefault, + + @jakarta.validation.constraints.NotNull + @jakarta.validation.constraints.Size(max = 36) + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NAME) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) + java.lang.String name, + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NAME_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.lang.String nameWithExample, + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NAME_WITH_DEFAULT) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.lang.String nameWithDefault, + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.time.LocalDate date, + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.time.LocalDate dateWithExample, + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE_TIME) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.time.Instant dateTime, + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE_TIME_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.time.Instant dateTimeWithExample, + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NUMBER) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.lang.Double number, + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BINARY) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + byte[] binary, + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BYTES) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + byte[] bytes, + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ANY) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT) + org.openapitools.jackson.nullable.JsonNullable any, + + @jakarta.validation.constraints.NotNull + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ARRAY) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) + java.util.List array, + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ARRAY_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.util.List arrayWithExample, + + @jakarta.validation.constraints.NotNull + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_SET) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) + java.util.Set set, + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_SET_WITH_EXAMPLES) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.util.Set setWithExamples, + + @jakarta.validation.constraints.NotNull + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_MAP) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) + java.util.Map map, + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_MAP_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.util.Map mapWithExample, + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_OPTIONAL_ARRAY) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.util.List optionalArray, + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_OPTIONAL_SET) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.util.Set optionalSet, + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_OPTIONAL_MAP) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.util.Map optionalMap, + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NULLABLE_STRING) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT) + org.openapitools.jackson.nullable.JsonNullable nullableString, + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NULLABLE_ARRAY) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT) + org.openapitools.jackson.nullable.JsonNullable> nullableArray, + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NULLABLE_SET) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT) + org.openapitools.jackson.nullable.JsonNullable> nullableSet, + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DEFAULT_STRING) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.lang.String defaultString, + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DEFAULT_INTEGER) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.lang.Integer defaultInteger, + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DEFAULT_LONG) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.lang.Long defaultLong, + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DEFAULT_NULLABLE) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT) + org.openapitools.jackson.nullable.JsonNullable defaultNullable, + + @jakarta.validation.Valid + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_REFERENED_MODEL) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + EnumerationModel referenedModel) { + + public static final java.lang.String JSON_PROPERTY_ID = "id"; + public static final java.lang.String JSON_PROPERTY_ID_WITH_EXAMPLE = "idWithExample"; + public static final java.lang.String JSON_PROPERTY_ID_WITH_DEFAULT = "idWithDefault"; + public static final java.lang.String JSON_PROPERTY_NAME = "name"; + public static final java.lang.String JSON_PROPERTY_NAME_WITH_EXAMPLE = "nameWithExample"; + public static final java.lang.String JSON_PROPERTY_NAME_WITH_DEFAULT = "nameWithDefault"; + public static final java.lang.String JSON_PROPERTY_DATE = "date"; + public static final java.lang.String JSON_PROPERTY_DATE_WITH_EXAMPLE = "dateWithExample"; + public static final java.lang.String JSON_PROPERTY_DATE_TIME = "date-time"; + public static final java.lang.String JSON_PROPERTY_DATE_TIME_WITH_EXAMPLE = "date-timeWithExample"; + public static final java.lang.String JSON_PROPERTY_NUMBER = "number"; + public static final java.lang.String JSON_PROPERTY_BINARY = "binary"; + public static final java.lang.String JSON_PROPERTY_BYTES = "bytes"; + public static final java.lang.String JSON_PROPERTY_ANY = "any"; + public static final java.lang.String JSON_PROPERTY_ARRAY = "array"; + public static final java.lang.String JSON_PROPERTY_ARRAY_WITH_EXAMPLE = "arrayWithExample"; + public static final java.lang.String JSON_PROPERTY_SET = "set"; + public static final java.lang.String JSON_PROPERTY_SET_WITH_EXAMPLES = "setWithExamples"; + public static final java.lang.String JSON_PROPERTY_MAP = "map"; + public static final java.lang.String JSON_PROPERTY_MAP_WITH_EXAMPLE = "mapWithExample"; + public static final java.lang.String JSON_PROPERTY_OPTIONAL_ARRAY = "optionalArray"; + public static final java.lang.String JSON_PROPERTY_OPTIONAL_SET = "optionalSet"; + public static final java.lang.String JSON_PROPERTY_OPTIONAL_MAP = "optionalMap"; + public static final java.lang.String JSON_PROPERTY_NULLABLE_STRING = "nullableString"; + public static final java.lang.String JSON_PROPERTY_NULLABLE_ARRAY = "nullableArray"; + public static final java.lang.String JSON_PROPERTY_NULLABLE_SET = "nullableSet"; + public static final java.lang.String JSON_PROPERTY_DEFAULT_STRING = "defaultString"; + public static final java.lang.String JSON_PROPERTY_DEFAULT_INTEGER = "defaultInteger"; + public static final java.lang.String JSON_PROPERTY_DEFAULT_LONG = "defaultLong"; + public static final java.lang.String JSON_PROPERTY_DEFAULT_NULLABLE = "defaultNullable"; + public static final java.lang.String JSON_PROPERTY_REFERENED_MODEL = "referenedModel"; +} diff --git a/gen/main/java/testmodel/micronaut_record_constants/OneOfImplementor1.java b/gen/main/java/testmodel/micronaut_record_constants/OneOfImplementor1.java new file mode 100644 index 00000000..6f236d5f --- /dev/null +++ b/gen/main/java/testmodel/micronaut_record_constants/OneOfImplementor1.java @@ -0,0 +1,17 @@ +package testmodel.micronaut_record_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public record OneOfImplementor1( + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_PROPERTY) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.lang.String property) implements OneOfInterface { + + public static final java.lang.String JSON_PROPERTY_PROPERTY = "property"; + + @Override + public java.lang.String type() { + return "Implementation1"; + } +} diff --git a/gen/main/java/testmodel/micronaut_record_constants/OneOfImplementor2.java b/gen/main/java/testmodel/micronaut_record_constants/OneOfImplementor2.java new file mode 100644 index 00000000..6163a62b --- /dev/null +++ b/gen/main/java/testmodel/micronaut_record_constants/OneOfImplementor2.java @@ -0,0 +1,17 @@ +package testmodel.micronaut_record_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public record OneOfImplementor2( + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_PROPERTY) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.lang.Double property) implements OneOfInterface { + + public static final java.lang.String JSON_PROPERTY_PROPERTY = "property"; + + @Override + public java.lang.String type() { + return "Implementation2"; + } +} diff --git a/gen/main/java/testmodel/micronaut_record_constants/OneOfInterface.java b/gen/main/java/testmodel/micronaut_record_constants/OneOfInterface.java new file mode 100644 index 00000000..6ca4ec89 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_record_constants/OneOfInterface.java @@ -0,0 +1,15 @@ +package testmodel.micronaut_record_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = OneOfInterface.JSON_DISCRIMINATOR) +@com.fasterxml.jackson.annotation.JsonSubTypes({ + @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = OneOfImplementor1.class, name = "Implementation1"), + @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = OneOfImplementor2.class, name = "Implementation2"), +}) +public sealed interface OneOfInterface permits OneOfImplementor1, OneOfImplementor2 { + + java.lang.String JSON_DISCRIMINATOR = "type"; + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_DISCRIMINATOR) + java.lang.String type(); +} diff --git a/gen/main/java/testmodel/micronaut_record_constants/OneOfModel.java b/gen/main/java/testmodel/micronaut_record_constants/OneOfModel.java new file mode 100644 index 00000000..8fbe9468 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_record_constants/OneOfModel.java @@ -0,0 +1,9 @@ +package testmodel.micronaut_record_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.DEDUCTION, visible = true) +@com.fasterxml.jackson.annotation.JsonSubTypes({ + @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = FirstModel.class), + @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = SecondLevelModel.class) +}) +public sealed interface OneOfModel permits FirstModel, SecondLevelModel {} diff --git a/gen/main/java/testmodel/micronaut_record_constants/PropertyTypeOne.java b/gen/main/java/testmodel/micronaut_record_constants/PropertyTypeOne.java new file mode 100644 index 00000000..18913d58 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_record_constants/PropertyTypeOne.java @@ -0,0 +1,42 @@ +package testmodel.micronaut_record_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public record PropertyTypeOne( + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + Type type) implements AdditionalPropertiesModelValue { + + public static final java.lang.String JSON_PROPERTY_TYPE = "type"; + +public enum Type { + + ONE("one"); + + public static final java.lang.String ONE_VALUE = "one"; + + private final java.lang.String value; + + private Type(java.lang.String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static Type toEnum(java.lang.String value) { + return toOptional(value).orElseThrow(() -> new IllegalArgumentException("Unknown value '" + value + "'.")); + } + + public static java.util.Optional toOptional(java.lang.String value) { + return java.util.Arrays + .stream(values()) + .filter(e -> e.value.equals(value)) + .findAny(); + } + + @com.fasterxml.jackson.annotation.JsonValue + public java.lang.String getValue() { + return value; + } +} +} diff --git a/gen/main/java/testmodel/micronaut_record_constants/PropertyTypeTwo.java b/gen/main/java/testmodel/micronaut_record_constants/PropertyTypeTwo.java new file mode 100644 index 00000000..f0c16282 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_record_constants/PropertyTypeTwo.java @@ -0,0 +1,42 @@ +package testmodel.micronaut_record_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public record PropertyTypeTwo( + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + Type type) implements AdditionalPropertiesModelValue { + + public static final java.lang.String JSON_PROPERTY_TYPE = "type"; + +public enum Type { + + TWO("two"); + + public static final java.lang.String TWO_VALUE = "two"; + + private final java.lang.String value; + + private Type(java.lang.String value) { + this.value = value; + } + + @com.fasterxml.jackson.annotation.JsonCreator + public static Type toEnum(java.lang.String value) { + return toOptional(value).orElseThrow(() -> new IllegalArgumentException("Unknown value '" + value + "'.")); + } + + public static java.util.Optional toOptional(java.lang.String value) { + return java.util.Arrays + .stream(values()) + .filter(e -> e.value.equals(value)) + .findAny(); + } + + @com.fasterxml.jackson.annotation.JsonValue + public java.lang.String getValue() { + return value; + } +} +} diff --git a/gen/main/java/testmodel/micronaut_record_constants/SecondLevelModel.java b/gen/main/java/testmodel/micronaut_record_constants/SecondLevelModel.java new file mode 100644 index 00000000..009ea6a5 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_record_constants/SecondLevelModel.java @@ -0,0 +1,9 @@ +package testmodel.micronaut_record_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.DEDUCTION, visible = true) +@com.fasterxml.jackson.annotation.JsonSubTypes({ + @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = SecondLevelOneModel.class), + @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = SecondLevelTwoModel.class) +}) +public sealed interface SecondLevelModel extends OneOfModel permits SecondLevelOneModel, SecondLevelTwoModel {} diff --git a/gen/main/java/testmodel/micronaut_record_constants/SecondLevelOneModel.java b/gen/main/java/testmodel/micronaut_record_constants/SecondLevelOneModel.java new file mode 100644 index 00000000..e3fdd780 --- /dev/null +++ b/gen/main/java/testmodel/micronaut_record_constants/SecondLevelOneModel.java @@ -0,0 +1,17 @@ +package testmodel.micronaut_record_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public record SecondLevelOneModel( + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.lang.String type, + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ONE) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.lang.String one) implements SecondLevelModel { + + public static final java.lang.String JSON_PROPERTY_TYPE = "type"; + public static final java.lang.String JSON_PROPERTY_ONE = "one"; +} diff --git a/gen/main/java/testmodel/micronaut_record_constants/SecondLevelTwoModel.java b/gen/main/java/testmodel/micronaut_record_constants/SecondLevelTwoModel.java new file mode 100644 index 00000000..c164e54c --- /dev/null +++ b/gen/main/java/testmodel/micronaut_record_constants/SecondLevelTwoModel.java @@ -0,0 +1,17 @@ +package testmodel.micronaut_record_constants; + +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.serde.annotation.Serdeable +public record SecondLevelTwoModel( + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.lang.String type, + + @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TWO) + @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) + java.lang.String two) implements SecondLevelModel { + + public static final java.lang.String JSON_PROPERTY_TYPE = "type"; + public static final java.lang.String JSON_PROPERTY_TWO = "two"; +} diff --git a/gen/main/java/testmodel/nomicronaut/AdditionalPropertiesModel.java b/gen/main/java/testmodel/nomicronaut/AdditionalPropertiesModel.java index 7974a1a3..284ffb5e 100644 --- a/gen/main/java/testmodel/nomicronaut/AdditionalPropertiesModel.java +++ b/gen/main/java/testmodel/nomicronaut/AdditionalPropertiesModel.java @@ -2,9 +2,7 @@ public class AdditionalPropertiesModel { - public static final java.lang.String JSON_PROPERTY_ID = "id"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ID) + @com.fasterxml.jackson.annotation.JsonProperty("id") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String id; diff --git a/gen/main/java/testmodel/nomicronaut/EnumerationModel.java b/gen/main/java/testmodel/nomicronaut/EnumerationModel.java index 39e33ff1..05702eeb 100644 --- a/gen/main/java/testmodel/nomicronaut/EnumerationModel.java +++ b/gen/main/java/testmodel/nomicronaut/EnumerationModel.java @@ -2,24 +2,19 @@ public class EnumerationModel { - public static final java.lang.String JSON_PROPERTY_STRING = "string"; - public static final java.lang.String JSON_PROPERTY_STRING_DEFAULT = "string-default"; - public static final java.lang.String JSON_PROPERTY_EMBEDDED = "embedded"; - public static final java.lang.String JSON_PROPERTY_EMBEDDED_DEFAULT = "embedded-default"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_STRING) + @com.fasterxml.jackson.annotation.JsonProperty("string") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private EnumerationString string; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_STRING_DEFAULT) + @com.fasterxml.jackson.annotation.JsonProperty("string-default") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private EnumerationStringDefault stringDefault = EnumerationStringDefault.THREE; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_EMBEDDED) + @com.fasterxml.jackson.annotation.JsonProperty("embedded") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private Embedded embedded; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_EMBEDDED_DEFAULT) + @com.fasterxml.jackson.annotation.JsonProperty("embedded-default") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private EmbeddedDefault embeddedDefault = EmbeddedDefault.FOUR; diff --git a/gen/main/java/testmodel/nomicronaut/FirstModel.java b/gen/main/java/testmodel/nomicronaut/FirstModel.java index ebdc3e65..0fa7fdf2 100644 --- a/gen/main/java/testmodel/nomicronaut/FirstModel.java +++ b/gen/main/java/testmodel/nomicronaut/FirstModel.java @@ -2,20 +2,16 @@ public final class FirstModel implements OneOfModel { - public static final java.lang.String JSON_PROPERTY_TYPE = "type"; - public static final java.lang.String JSON_PROPERTY_FIRST = "first"; - public static final java.lang.String JSON_PROPERTY_SECOND_LEVEL = "secondLevel"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE) + @com.fasterxml.jackson.annotation.JsonProperty("type") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String type; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FIRST) + @com.fasterxml.jackson.annotation.JsonProperty("first") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String first; @jakarta.validation.Valid - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_SECOND_LEVEL) + @com.fasterxml.jackson.annotation.JsonProperty("secondLevel") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private SecondLevelModel secondLevel; diff --git a/gen/main/java/testmodel/nomicronaut/InheritanceExtended.java b/gen/main/java/testmodel/nomicronaut/InheritanceExtended.java index 61331eae..26ac92f1 100644 --- a/gen/main/java/testmodel/nomicronaut/InheritanceExtended.java +++ b/gen/main/java/testmodel/nomicronaut/InheritanceExtended.java @@ -2,15 +2,13 @@ public final class InheritanceExtended implements InheritanceSimple { - public static final java.lang.String JSON_PROPERTY_BAR = "bar"; - @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + @com.fasterxml.jackson.annotation.JsonProperty("foo") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.lang.String foo; @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BAR) + @com.fasterxml.jackson.annotation.JsonProperty("bar") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.lang.String bar; diff --git a/gen/main/java/testmodel/nomicronaut/InheritanceSimple.java b/gen/main/java/testmodel/nomicronaut/InheritanceSimple.java index 562d27c2..c4400dbb 100644 --- a/gen/main/java/testmodel/nomicronaut/InheritanceSimple.java +++ b/gen/main/java/testmodel/nomicronaut/InheritanceSimple.java @@ -3,12 +3,11 @@ @com.fasterxml.jackson.databind.annotation.JsonDeserialize(as = InheritanceSimpleDefault.class) public sealed interface InheritanceSimple permits InheritanceExtended, InheritanceSimpleDefault { - java.lang.String JSON_PROPERTY_FOO = "foo"; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + @com.fasterxml.jackson.annotation.JsonProperty("foo") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) java.lang.String getFoo(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + @com.fasterxml.jackson.annotation.JsonProperty("foo") void setFoo(java.lang.String newFoo); } diff --git a/gen/main/java/testmodel/nomicronaut/InheritanceSimpleDefault.java b/gen/main/java/testmodel/nomicronaut/InheritanceSimpleDefault.java index 20b0d40f..095ed823 100644 --- a/gen/main/java/testmodel/nomicronaut/InheritanceSimpleDefault.java +++ b/gen/main/java/testmodel/nomicronaut/InheritanceSimpleDefault.java @@ -3,7 +3,7 @@ public final class InheritanceSimpleDefault implements InheritanceSimple { @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_FOO) + @com.fasterxml.jackson.annotation.JsonProperty("foo") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.lang.String foo; diff --git a/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType.java b/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType.java index 2b4bb65e..1dcad655 100644 --- a/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType.java +++ b/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType.java @@ -1,6 +1,6 @@ package testmodel.nomicronaut; -@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = InheritanceWithEnumType.JSON_DISCRIMINATOR) +@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = "type") @com.fasterxml.jackson.annotation.JsonSubTypes({ @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithEnumType1.class, name = "Inheritance1"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithEnumType2.class, name = "Inheritance2"), @@ -8,8 +8,6 @@ }) public sealed interface InheritanceWithEnumType permits InheritanceWithEnumType1, InheritanceWithEnumType2, InheritanceWithEnumType3 { - java.lang.String JSON_DISCRIMINATOR = "type"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_DISCRIMINATOR) + @com.fasterxml.jackson.annotation.JsonProperty("type") InheritanceWithEnumTypeEnum getType(); } diff --git a/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType1.java b/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType1.java index 0a41205f..6fcd450d 100644 --- a/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType1.java +++ b/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType1.java @@ -2,9 +2,7 @@ public final class InheritanceWithEnumType1 implements InheritanceWithEnumType { - public static final java.lang.String JSON_PROPERTY_D = "d"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_D) + @com.fasterxml.jackson.annotation.JsonProperty("d") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String d; diff --git a/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType2.java b/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType2.java index 75a45332..ad60fa52 100644 --- a/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType2.java +++ b/gen/main/java/testmodel/nomicronaut/InheritanceWithEnumType2.java @@ -2,9 +2,7 @@ public final class InheritanceWithEnumType2 implements InheritanceWithEnumType { - public static final java.lang.String JSON_PROPERTY_E = "e"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_E) + @com.fasterxml.jackson.annotation.JsonProperty("e") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String e; diff --git a/gen/main/java/testmodel/nomicronaut/InheritanceWithStringType.java b/gen/main/java/testmodel/nomicronaut/InheritanceWithStringType.java index 02ab0b2f..87567b79 100644 --- a/gen/main/java/testmodel/nomicronaut/InheritanceWithStringType.java +++ b/gen/main/java/testmodel/nomicronaut/InheritanceWithStringType.java @@ -1,22 +1,19 @@ package testmodel.nomicronaut; -@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = InheritanceWithStringType.JSON_DISCRIMINATOR) +@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = "type") @com.fasterxml.jackson.annotation.JsonSubTypes({ @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithStringType1.class, name = "Inheritance1"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithStringType2.class, name = "Inheritance2") }) public sealed interface InheritanceWithStringType permits InheritanceWithStringType1, InheritanceWithStringType2 { - java.lang.String JSON_DISCRIMINATOR = "type"; - java.lang.String JSON_PROPERTY_A = "a"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_DISCRIMINATOR) + @com.fasterxml.jackson.annotation.JsonProperty("type") java.lang.String getType(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + @com.fasterxml.jackson.annotation.JsonProperty("a") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.lang.String getA(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + @com.fasterxml.jackson.annotation.JsonProperty("a") void setA(java.lang.String newA); } diff --git a/gen/main/java/testmodel/nomicronaut/InheritanceWithStringType1.java b/gen/main/java/testmodel/nomicronaut/InheritanceWithStringType1.java index c65ba517..dd4c127f 100644 --- a/gen/main/java/testmodel/nomicronaut/InheritanceWithStringType1.java +++ b/gen/main/java/testmodel/nomicronaut/InheritanceWithStringType1.java @@ -2,13 +2,11 @@ public final class InheritanceWithStringType1 implements InheritanceWithStringType { - public static final java.lang.String JSON_PROPERTY_B = "b"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + @com.fasterxml.jackson.annotation.JsonProperty("a") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String a; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_B) + @com.fasterxml.jackson.annotation.JsonProperty("b") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String b; diff --git a/gen/main/java/testmodel/nomicronaut/InheritanceWithStringType2.java b/gen/main/java/testmodel/nomicronaut/InheritanceWithStringType2.java index 68dc587c..2b770a63 100644 --- a/gen/main/java/testmodel/nomicronaut/InheritanceWithStringType2.java +++ b/gen/main/java/testmodel/nomicronaut/InheritanceWithStringType2.java @@ -2,13 +2,11 @@ public final class InheritanceWithStringType2 implements InheritanceWithStringType { - public static final java.lang.String JSON_PROPERTY_C = "c"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_A) + @com.fasterxml.jackson.annotation.JsonProperty("a") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String a; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_C) + @com.fasterxml.jackson.annotation.JsonProperty("c") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String c; diff --git a/gen/main/java/testmodel/nomicronaut/InheritanceWithoutType.java b/gen/main/java/testmodel/nomicronaut/InheritanceWithoutType.java index dd111de9..d64aacc0 100644 --- a/gen/main/java/testmodel/nomicronaut/InheritanceWithoutType.java +++ b/gen/main/java/testmodel/nomicronaut/InheritanceWithoutType.java @@ -1,22 +1,19 @@ package testmodel.nomicronaut; -@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = InheritanceWithoutType.JSON_DISCRIMINATOR) +@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = "type") @com.fasterxml.jackson.annotation.JsonSubTypes({ @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithoutType1.class, name = "Inheritance1"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = InheritanceWithoutType2.class, name = "Inheritance2") }) public sealed interface InheritanceWithoutType permits InheritanceWithoutType1, InheritanceWithoutType2 { - java.lang.String JSON_DISCRIMINATOR = "type"; - java.lang.String JSON_PROPERTY_E = "e"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_DISCRIMINATOR) + @com.fasterxml.jackson.annotation.JsonProperty("type") java.lang.String getType(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_E) + @com.fasterxml.jackson.annotation.JsonProperty("e") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) java.lang.String getE(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_E) + @com.fasterxml.jackson.annotation.JsonProperty("e") void setE(java.lang.String newE); } diff --git a/gen/main/java/testmodel/nomicronaut/InheritanceWithoutType1.java b/gen/main/java/testmodel/nomicronaut/InheritanceWithoutType1.java index 06ac640d..458f9cf1 100644 --- a/gen/main/java/testmodel/nomicronaut/InheritanceWithoutType1.java +++ b/gen/main/java/testmodel/nomicronaut/InheritanceWithoutType1.java @@ -2,13 +2,11 @@ public final class InheritanceWithoutType1 implements InheritanceWithoutType { - public static final java.lang.String JSON_PROPERTY_F = "f"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_E) + @com.fasterxml.jackson.annotation.JsonProperty("e") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String e; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_F) + @com.fasterxml.jackson.annotation.JsonProperty("f") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String f; diff --git a/gen/main/java/testmodel/nomicronaut/InheritanceWithoutType2.java b/gen/main/java/testmodel/nomicronaut/InheritanceWithoutType2.java index dd1d5048..6ee90f6c 100644 --- a/gen/main/java/testmodel/nomicronaut/InheritanceWithoutType2.java +++ b/gen/main/java/testmodel/nomicronaut/InheritanceWithoutType2.java @@ -2,13 +2,11 @@ public final class InheritanceWithoutType2 implements InheritanceWithoutType { - public static final java.lang.String JSON_PROPERTY_G = "g"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_E) + @com.fasterxml.jackson.annotation.JsonProperty("e") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String e; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_G) + @com.fasterxml.jackson.annotation.JsonProperty("g") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String g; diff --git a/gen/main/java/testmodel/nomicronaut/Model.java b/gen/main/java/testmodel/nomicronaut/Model.java index f9647203..b4fd5c56 100644 --- a/gen/main/java/testmodel/nomicronaut/Model.java +++ b/gen/main/java/testmodel/nomicronaut/Model.java @@ -2,165 +2,133 @@ public class Model { - public static final java.lang.String JSON_PROPERTY_ID = "id"; - public static final java.lang.String JSON_PROPERTY_ID_WITH_EXAMPLE = "idWithExample"; - public static final java.lang.String JSON_PROPERTY_ID_WITH_DEFAULT = "idWithDefault"; - public static final java.lang.String JSON_PROPERTY_NAME = "name"; - public static final java.lang.String JSON_PROPERTY_NAME_WITH_EXAMPLE = "nameWithExample"; - public static final java.lang.String JSON_PROPERTY_NAME_WITH_DEFAULT = "nameWithDefault"; - public static final java.lang.String JSON_PROPERTY_DATE = "date"; - public static final java.lang.String JSON_PROPERTY_DATE_WITH_EXAMPLE = "dateWithExample"; - public static final java.lang.String JSON_PROPERTY_DATE_TIME = "date-time"; - public static final java.lang.String JSON_PROPERTY_DATE_TIME_WITH_EXAMPLE = "date-timeWithExample"; - public static final java.lang.String JSON_PROPERTY_NUMBER = "number"; - public static final java.lang.String JSON_PROPERTY_BINARY = "binary"; - public static final java.lang.String JSON_PROPERTY_BYTES = "bytes"; - public static final java.lang.String JSON_PROPERTY_ANY = "any"; - public static final java.lang.String JSON_PROPERTY_ARRAY = "array"; - public static final java.lang.String JSON_PROPERTY_ARRAY_WITH_EXAMPLE = "arrayWithExample"; - public static final java.lang.String JSON_PROPERTY_SET = "set"; - public static final java.lang.String JSON_PROPERTY_SET_WITH_EXAMPLES = "setWithExamples"; - public static final java.lang.String JSON_PROPERTY_MAP = "map"; - public static final java.lang.String JSON_PROPERTY_MAP_WITH_EXAMPLE = "mapWithExample"; - public static final java.lang.String JSON_PROPERTY_OPTIONAL_ARRAY = "optionalArray"; - public static final java.lang.String JSON_PROPERTY_OPTIONAL_SET = "optionalSet"; - public static final java.lang.String JSON_PROPERTY_OPTIONAL_MAP = "optionalMap"; - public static final java.lang.String JSON_PROPERTY_NULLABLE_STRING = "nullableString"; - public static final java.lang.String JSON_PROPERTY_NULLABLE_ARRAY = "nullableArray"; - public static final java.lang.String JSON_PROPERTY_NULLABLE_SET = "nullableSet"; - public static final java.lang.String JSON_PROPERTY_DEFAULT_STRING = "defaultString"; - public static final java.lang.String JSON_PROPERTY_DEFAULT_INTEGER = "defaultInteger"; - public static final java.lang.String JSON_PROPERTY_DEFAULT_LONG = "defaultLong"; - public static final java.lang.String JSON_PROPERTY_DEFAULT_NULLABLE = "defaultNullable"; - public static final java.lang.String JSON_PROPERTY_REFERENED_MODEL = "referenedModel"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ID) + @com.fasterxml.jackson.annotation.JsonProperty("id") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer id; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ID_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonProperty("idWithExample") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer idWithExample; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ID_WITH_DEFAULT) + @com.fasterxml.jackson.annotation.JsonProperty("idWithDefault") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer idWithDefault = 32; @jakarta.validation.constraints.NotNull @jakarta.validation.constraints.Size(max = 36) - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NAME) + @com.fasterxml.jackson.annotation.JsonProperty("name") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.lang.String name; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NAME_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonProperty("nameWithExample") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String nameWithExample; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NAME_WITH_DEFAULT) + @com.fasterxml.jackson.annotation.JsonProperty("nameWithDefault") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String nameWithDefault = "MyDefaultName"; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE) + @com.fasterxml.jackson.annotation.JsonProperty("date") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.time.LocalDate date; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonProperty("dateWithExample") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.time.LocalDate dateWithExample; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE_TIME) + @com.fasterxml.jackson.annotation.JsonProperty("date-time") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.time.Instant dateTime; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DATE_TIME_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonProperty("date-timeWithExample") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.time.Instant dateTimeWithExample; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NUMBER) + @com.fasterxml.jackson.annotation.JsonProperty("number") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Double number; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BINARY) + @com.fasterxml.jackson.annotation.JsonProperty("binary") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private byte[] binary; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_BYTES) + @com.fasterxml.jackson.annotation.JsonProperty("bytes") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private byte[] bytes; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ANY) + @com.fasterxml.jackson.annotation.JsonProperty("any") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT) private org.openapitools.jackson.nullable.JsonNullable any = org.openapitools.jackson.nullable.JsonNullable.of(null); @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ARRAY) + @com.fasterxml.jackson.annotation.JsonProperty("array") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.util.List array = new java.util.ArrayList<>(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ARRAY_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonProperty("arrayWithExample") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.List arrayWithExample; @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_SET) + @com.fasterxml.jackson.annotation.JsonProperty("set") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.util.Set set = new java.util.LinkedHashSet<>(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_SET_WITH_EXAMPLES) + @com.fasterxml.jackson.annotation.JsonProperty("setWithExamples") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.Set setWithExamples; @jakarta.validation.constraints.NotNull - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_MAP) + @com.fasterxml.jackson.annotation.JsonProperty("map") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.ALWAYS) private java.util.Map map = new java.util.HashMap<>(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_MAP_WITH_EXAMPLE) + @com.fasterxml.jackson.annotation.JsonProperty("mapWithExample") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.Map mapWithExample; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_OPTIONAL_ARRAY) + @com.fasterxml.jackson.annotation.JsonProperty("optionalArray") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.List optionalArray; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_OPTIONAL_SET) + @com.fasterxml.jackson.annotation.JsonProperty("optionalSet") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.Set optionalSet; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_OPTIONAL_MAP) + @com.fasterxml.jackson.annotation.JsonProperty("optionalMap") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.util.Map optionalMap; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NULLABLE_STRING) + @com.fasterxml.jackson.annotation.JsonProperty("nullableString") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT) private org.openapitools.jackson.nullable.JsonNullable nullableString = org.openapitools.jackson.nullable.JsonNullable.undefined(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NULLABLE_ARRAY) + @com.fasterxml.jackson.annotation.JsonProperty("nullableArray") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT) private org.openapitools.jackson.nullable.JsonNullable> nullableArray = org.openapitools.jackson.nullable.JsonNullable.undefined(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_NULLABLE_SET) + @com.fasterxml.jackson.annotation.JsonProperty("nullableSet") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT) private org.openapitools.jackson.nullable.JsonNullable> nullableSet = org.openapitools.jackson.nullable.JsonNullable.undefined(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DEFAULT_STRING) + @com.fasterxml.jackson.annotation.JsonProperty("defaultString") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String defaultString = "defaultStringValue"; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DEFAULT_INTEGER) + @com.fasterxml.jackson.annotation.JsonProperty("defaultInteger") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Integer defaultInteger = 1234; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DEFAULT_LONG) + @com.fasterxml.jackson.annotation.JsonProperty("defaultLong") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Long defaultLong = 5678l; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_DEFAULT_NULLABLE) + @com.fasterxml.jackson.annotation.JsonProperty("defaultNullable") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_ABSENT) private org.openapitools.jackson.nullable.JsonNullable defaultNullable = org.openapitools.jackson.nullable.JsonNullable.of("defaultNullableValue"); @jakarta.validation.Valid - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_REFERENED_MODEL) + @com.fasterxml.jackson.annotation.JsonProperty("referenedModel") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private EnumerationModel referenedModel; diff --git a/gen/main/java/testmodel/nomicronaut/OneOfImplementor1.java b/gen/main/java/testmodel/nomicronaut/OneOfImplementor1.java index 4965da53..a1bc9cf2 100644 --- a/gen/main/java/testmodel/nomicronaut/OneOfImplementor1.java +++ b/gen/main/java/testmodel/nomicronaut/OneOfImplementor1.java @@ -2,9 +2,7 @@ public final class OneOfImplementor1 implements OneOfInterface { - public static final java.lang.String JSON_PROPERTY_PROPERTY = "property"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_PROPERTY) + @com.fasterxml.jackson.annotation.JsonProperty("property") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String property; diff --git a/gen/main/java/testmodel/nomicronaut/OneOfImplementor2.java b/gen/main/java/testmodel/nomicronaut/OneOfImplementor2.java index 62beed5b..caac1bff 100644 --- a/gen/main/java/testmodel/nomicronaut/OneOfImplementor2.java +++ b/gen/main/java/testmodel/nomicronaut/OneOfImplementor2.java @@ -2,9 +2,7 @@ public final class OneOfImplementor2 implements OneOfInterface { - public static final java.lang.String JSON_PROPERTY_PROPERTY = "property"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_PROPERTY) + @com.fasterxml.jackson.annotation.JsonProperty("property") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.Double property; diff --git a/gen/main/java/testmodel/nomicronaut/OneOfInterface.java b/gen/main/java/testmodel/nomicronaut/OneOfInterface.java index c5901c22..318c99ff 100644 --- a/gen/main/java/testmodel/nomicronaut/OneOfInterface.java +++ b/gen/main/java/testmodel/nomicronaut/OneOfInterface.java @@ -1,14 +1,12 @@ package testmodel.nomicronaut; -@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = OneOfInterface.JSON_DISCRIMINATOR) +@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = "type") @com.fasterxml.jackson.annotation.JsonSubTypes({ @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = OneOfImplementor1.class, name = "Implementation1"), @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = OneOfImplementor2.class, name = "Implementation2"), }) public sealed interface OneOfInterface permits OneOfImplementor1, OneOfImplementor2 { - java.lang.String JSON_DISCRIMINATOR = "type"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_DISCRIMINATOR) + @com.fasterxml.jackson.annotation.JsonProperty("type") java.lang.String getType(); } diff --git a/gen/main/java/testmodel/nomicronaut/PropertyTypeOne.java b/gen/main/java/testmodel/nomicronaut/PropertyTypeOne.java index 3ebf67c2..0e6ada8c 100644 --- a/gen/main/java/testmodel/nomicronaut/PropertyTypeOne.java +++ b/gen/main/java/testmodel/nomicronaut/PropertyTypeOne.java @@ -2,9 +2,7 @@ public final class PropertyTypeOne implements AdditionalPropertiesModelValue { - public static final java.lang.String JSON_PROPERTY_TYPE = "type"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE) + @com.fasterxml.jackson.annotation.JsonProperty("type") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private Type type; diff --git a/gen/main/java/testmodel/nomicronaut/PropertyTypeTwo.java b/gen/main/java/testmodel/nomicronaut/PropertyTypeTwo.java index 1ef8876d..021f32be 100644 --- a/gen/main/java/testmodel/nomicronaut/PropertyTypeTwo.java +++ b/gen/main/java/testmodel/nomicronaut/PropertyTypeTwo.java @@ -2,9 +2,7 @@ public final class PropertyTypeTwo implements AdditionalPropertiesModelValue { - public static final java.lang.String JSON_PROPERTY_TYPE = "type"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE) + @com.fasterxml.jackson.annotation.JsonProperty("type") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private Type type; diff --git a/gen/main/java/testmodel/nomicronaut/SecondLevelOneModel.java b/gen/main/java/testmodel/nomicronaut/SecondLevelOneModel.java index 97d83aa2..2a4bdd01 100644 --- a/gen/main/java/testmodel/nomicronaut/SecondLevelOneModel.java +++ b/gen/main/java/testmodel/nomicronaut/SecondLevelOneModel.java @@ -2,14 +2,11 @@ public final class SecondLevelOneModel implements SecondLevelModel { - public static final java.lang.String JSON_PROPERTY_TYPE = "type"; - public static final java.lang.String JSON_PROPERTY_ONE = "one"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE) + @com.fasterxml.jackson.annotation.JsonProperty("type") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String type; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_ONE) + @com.fasterxml.jackson.annotation.JsonProperty("one") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String one; diff --git a/gen/main/java/testmodel/nomicronaut/SecondLevelTwoModel.java b/gen/main/java/testmodel/nomicronaut/SecondLevelTwoModel.java index fc30e80a..0dff7d58 100644 --- a/gen/main/java/testmodel/nomicronaut/SecondLevelTwoModel.java +++ b/gen/main/java/testmodel/nomicronaut/SecondLevelTwoModel.java @@ -2,14 +2,11 @@ public final class SecondLevelTwoModel implements SecondLevelModel { - public static final java.lang.String JSON_PROPERTY_TYPE = "type"; - public static final java.lang.String JSON_PROPERTY_TWO = "two"; - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TYPE) + @com.fasterxml.jackson.annotation.JsonProperty("type") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String type; - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_TWO) + @com.fasterxml.jackson.annotation.JsonProperty("two") @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL) private java.lang.String two; diff --git a/gen/main/java/testsecurity/auth/server/SecurityApi.java b/gen/main/java/testsecurity/auth/server/SecurityApi.java index df5328bf..83542bd6 100644 --- a/gen/main/java/testsecurity/auth/server/SecurityApi.java +++ b/gen/main/java/testsecurity/auth/server/SecurityApi.java @@ -4,14 +4,10 @@ @io.micronaut.validation.Validated public interface SecurityApi { - 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.annotation.Get("/anonymous") io.micronaut.http.HttpResponse anonymous(); - @io.micronaut.http.annotation.Get(PATH_AUTHENTICATED_WITH_PARAM) + @io.micronaut.http.annotation.Get("/authenticated/with-param") io.micronaut.http.HttpResponse authenticatedWithParam( @io.micronaut.core.annotation.NonNull io.micronaut.security.authentication.Authentication authentication, @@ -19,6 +15,6 @@ io.micronaut.http.HttpResponse authenticatedWithParam( @io.micronaut.http.annotation.QueryValue(value = "queryParam") java.util.Optional queryParam); - @io.micronaut.http.annotation.Get(PATH_AUTHENTICATED_WITHOUT_PARAM) + @io.micronaut.http.annotation.Get("/authenticated/without-param") io.micronaut.http.HttpResponse authenticatedWithoutParam(); } diff --git a/gen/main/java/testsecurity/defaults/server/SecurityApi.java b/gen/main/java/testsecurity/defaults/server/SecurityApi.java index 18aad59d..7512507c 100644 --- a/gen/main/java/testsecurity/defaults/server/SecurityApi.java +++ b/gen/main/java/testsecurity/defaults/server/SecurityApi.java @@ -4,19 +4,15 @@ @io.micronaut.validation.Validated public interface SecurityApi { - 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.annotation.Get("/anonymous") io.micronaut.http.HttpResponse anonymous(); - @io.micronaut.http.annotation.Get(PATH_AUTHENTICATED_WITH_PARAM) + @io.micronaut.http.annotation.Get("/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(PATH_AUTHENTICATED_WITHOUT_PARAM) + @io.micronaut.http.annotation.Get("/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 4d0d9e3e..68a652f0 100644 --- a/gen/main/java/testsecurity/types/SecurityApi.java +++ b/gen/main/java/testsecurity/types/SecurityApi.java @@ -4,14 +4,10 @@ @io.micronaut.validation.Validated public interface SecurityApi { - 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.annotation.Get("/anonymous") io.micronaut.http.HttpResponse anonymous(); - @io.micronaut.http.annotation.Get(PATH_AUTHENTICATED_WITH_PARAM) + @io.micronaut.http.annotation.Get("/authenticated/with-param") io.micronaut.http.HttpResponse authenticatedWithParam( @io.micronaut.core.annotation.NonNull java.security.Principal authentication, @@ -19,6 +15,6 @@ io.micronaut.http.HttpResponse authenticatedWithParam( @io.micronaut.http.annotation.QueryValue(value = "queryParam") java.util.Optional queryParam); - @io.micronaut.http.annotation.Get(PATH_AUTHENTICATED_WITHOUT_PARAM) + @io.micronaut.http.annotation.Get("/authenticated/without-param") io.micronaut.http.HttpResponse authenticatedWithoutParam(); } diff --git a/gen/test/java/testapi/constants/MediatypeApiTestClient.java b/gen/test/java/testapi/constants/MediatypeApiTestClient.java new file mode 100644 index 00000000..f6170fe4 --- /dev/null +++ b/gen/test/java/testapi/constants/MediatypeApiTestClient.java @@ -0,0 +1,62 @@ +package testapi.constants; + +/** Test client for {@link MediatypeApi}. **/ +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.http.client.annotation.Client("/") +public interface MediatypeApiTestClient { + + @io.micronaut.http.annotation.Post("/mediatype/consumes-and-produces") + @io.micronaut.http.annotation.Produces({ "application/octet-stream" }) + @io.micronaut.http.annotation.Consumes({ "application/xml" }) + io.micronaut.http.HttpResponse mediatypeConsumesAndProduces( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.Body + byte[] body); + + @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-with-fileupload") + @io.micronaut.http.annotation.Produces({ "multipart/form-data" }) + @io.micronaut.http.annotation.Consumes({ "application/json" }) + io.micronaut.http.HttpResponse 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.Produces({ "multipart/form-data" }) + @io.micronaut.http.annotation.Consumes({ "application/json" }) + io.micronaut.http.HttpResponse 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.Produces({ "application/octet-stream" }) + @io.micronaut.http.annotation.Consumes({ "application/json" }) + io.micronaut.http.HttpResponse mediatypeConsumesOctetStream( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.Body + byte[] body); + + @io.micronaut.http.annotation.Post("/mediatype/consumes-plain") + @io.micronaut.http.annotation.Produces({ "text/plain" }) + @io.micronaut.http.annotation.Consumes({ "application/json" }) + io.micronaut.http.HttpResponse mediatypeConsumesPlain( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.Body + java.lang.String body); + + @io.micronaut.http.annotation.Get("/mediatype/produces-with-different-model") + @io.micronaut.http.annotation.Consumes({ "application/json", "text/plain" }) + io.micronaut.http.HttpResponse mediatypeProducesDifferentModel( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "value") + java.lang.String value, + @io.micronaut.core.annotation.Nullable + @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.Consumes({ "application/json", "application/xml" }) + io.micronaut.http.HttpResponse mediatypeProducesSameModel( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "value") + java.lang.String value); +} diff --git a/gen/test/java/testapi/constants/MediatypeApiTestSpec.java b/gen/test/java/testapi/constants/MediatypeApiTestSpec.java new file mode 100644 index 00000000..e0cef7d6 --- /dev/null +++ b/gen/test/java/testapi/constants/MediatypeApiTestSpec.java @@ -0,0 +1,34 @@ +package testapi.constants; + +/** Test for {@link MediatypeApi}. */ +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +public interface MediatypeApiTestSpec { + + // mediatypeConsumesAndProduces + + void mediatypeConsumesAndProduces200() throws java.lang.Exception; + + // mediatypeConsumesMultipartWithFileUpload + + void mediatypeConsumesMultipartWithFileUpload200() throws java.lang.Exception; + + // mediatypeConsumesMultipartWithoutFileUpload + + void mediatypeConsumesMultipartWithoutFileUpload200() throws java.lang.Exception; + + // mediatypeConsumesOctetStream + + void mediatypeConsumesOctetStream200() throws java.lang.Exception; + + // mediatypeConsumesPlain + + void mediatypeConsumesPlain200() throws java.lang.Exception; + + // mediatypeProducesDifferentModel + + void mediatypeProducesDifferentModel200() throws java.lang.Exception; + + // mediatypeProducesSameModel + + void mediatypeProducesSameModel200() throws java.lang.Exception; +} diff --git a/gen/test/java/testapi/constants/ParameterApiTestClient.java b/gen/test/java/testapi/constants/ParameterApiTestClient.java new file mode 100644 index 00000000..e28845bc --- /dev/null +++ b/gen/test/java/testapi/constants/ParameterApiTestClient.java @@ -0,0 +1,234 @@ +package testapi.constants; + +/** Test client for {@link ParameterApi}. **/ +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.http.client.annotation.Client("/") +public interface ParameterApiTestClient { + + @io.micronaut.http.annotation.Get("/param/all/{path}") + @io.micronaut.http.annotation.Consumes({ "application/json" }) + io.micronaut.http.HttpResponse paramAll( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.PathVariable(value = "path") + java.lang.String path, + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "uuid") + java.util.UUID uuid, + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "date") + java.time.LocalDate date, + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.Header(value = "integer") + java.lang.Integer integer); + + @io.micronaut.http.annotation.Post("/param/body/optional") + @io.micronaut.http.annotation.Produces({ "application/json" }) + @io.micronaut.http.annotation.Consumes({ "application/json" }) + io.micronaut.http.HttpResponse paramBodyOptional( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.Body + ParameterModel parameterModel); + + @io.micronaut.http.annotation.Post("/param/body/required") + @io.micronaut.http.annotation.Produces({ "application/json" }) + @io.micronaut.http.annotation.Consumes({ "application/json" }) + io.micronaut.http.HttpResponse paramBodyRequired( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.Body + ParameterModel parameterModel); + + @io.micronaut.http.annotation.Get("/param/cookie/optionalWithDefault") + @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.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.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.Consumes({ "application/json" }) + io.micronaut.http.HttpResponse paramCookieRequiredWithoutDefault( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.CookieValue(value = "string") + java.lang.String string); + + @io.micronaut.http.annotation.Get("/param/header/optionalWithDefault") + @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.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.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.Consumes({ "application/json" }) + io.micronaut.http.HttpResponse paramHeaderRequiredWithoutDefault( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.Header(value = "string") + java.lang.String string); + + @io.micronaut.http.annotation.Get("/param/path/overlay/{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.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.Consumes({ "application/json" }) + io.micronaut.http.HttpResponse paramPathRequiredWithDefault( + @io.micronaut.core.annotation.NonNull + @io.micronaut.http.annotation.PathVariable(value = "string") + java.lang.String string); + + @io.micronaut.http.annotation.Get("/param/path/requiredWithoutDefault/{string}") + @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.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.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.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.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.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.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.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.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.Consumes({ "application/json" }) + io.micronaut.http.HttpResponse paramQueryMultipleLists( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "a") + java.util.List a, + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "b") + java.util.List b, + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "c") + java.util.List c); + + @io.micronaut.http.annotation.Get("/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.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.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.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.Consumes({ "application/json" }) + io.micronaut.http.HttpResponse paramQueryRequiredWithoutDefault( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "string") + java.lang.String string); + + @io.micronaut.http.annotation.Get("/param/query/uuid") + @io.micronaut.http.annotation.Consumes({ "application/json" }) + io.micronaut.http.HttpResponse paramQueryUuid( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "date") + java.util.UUID date); +} diff --git a/gen/test/java/testapi/constants/ParameterApiTestSpec.java b/gen/test/java/testapi/constants/ParameterApiTestSpec.java new file mode 100644 index 00000000..b28dd2ff --- /dev/null +++ b/gen/test/java/testapi/constants/ParameterApiTestSpec.java @@ -0,0 +1,134 @@ +package testapi.constants; + +/** Test for {@link ParameterApi}. */ +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +public interface ParameterApiTestSpec { + + // paramAll + + void paramAll200() throws java.lang.Exception; + + // paramBodyOptional + + void paramBodyOptional200() throws java.lang.Exception; + + // paramBodyRequired + + void paramBodyRequired200() throws java.lang.Exception; + + void paramBodyRequired400() throws java.lang.Exception; + + // paramCookieOptionalWithDefault + + void paramCookieOptionalWithDefault200() throws java.lang.Exception; + + // paramCookieOptionalWithoutDefault + + void paramCookieOptionalWithoutDefault200() throws java.lang.Exception; + + // paramCookieRequiredWithDefault + + void paramCookieRequiredWithDefault200() throws java.lang.Exception; + + // paramCookieRequiredWithoutDefault + + void paramCookieRequiredWithoutDefault200() throws java.lang.Exception; + + void paramCookieRequiredWithoutDefault400() throws java.lang.Exception; + + // paramHeaderOptionalWithDefault + + void paramHeaderOptionalWithDefault200() throws java.lang.Exception; + + // paramHeaderOptionalWithoutDefault + + void paramHeaderOptionalWithoutDefault200() throws java.lang.Exception; + + // paramHeaderRequiredWithDefault + + void paramHeaderRequiredWithDefault200() throws java.lang.Exception; + + // paramHeaderRequiredWithoutDefault + + void paramHeaderRequiredWithoutDefault200() throws java.lang.Exception; + + void paramHeaderRequiredWithoutDefault400() throws java.lang.Exception; + + // paramPathOverlayWithString + + void paramPathOverlayWithString200() throws java.lang.Exception; + + // paramPathOverlayWithUuid + + void paramPathOverlayWithUuid200() throws java.lang.Exception; + + // paramPathRequiredWithDefault + + void paramPathRequiredWithDefault200() throws java.lang.Exception; + + // paramPathRequiredWithoutDefault + + void paramPathRequiredWithoutDefault200() throws java.lang.Exception; + + // paramPathWithBoolean + + void paramPathWithBoolean200() throws java.lang.Exception; + + // paramPathWithInteger + + void paramPathWithInteger200() throws java.lang.Exception; + + // paramPathWithLong + + void paramPathWithLong200() throws java.lang.Exception; + + // paramPathWithMaxLength + + void paramPathWithMaxLength200() throws java.lang.Exception; + + // paramPathWithPattern + + void paramPathWithPattern200() throws java.lang.Exception; + + // paramPathWithUuid + + void paramPathWithUuid200() throws java.lang.Exception; + + // paramQueryDate + + void paramQueryDate200() throws java.lang.Exception; + + // paramQueryDateTime + + void paramQueryDateTime200() throws java.lang.Exception; + + // paramQueryMultipleLists + + void paramQueryMultipleLists200() throws java.lang.Exception; + + // paramQueryNumber + + void paramQueryNumber200() throws java.lang.Exception; + + // paramQueryOptionalWithDefault + + void paramQueryOptionalWithDefault200() throws java.lang.Exception; + + // paramQueryOptionalWithoutDefault + + void paramQueryOptionalWithoutDefault200() throws java.lang.Exception; + + // paramQueryRequiredWithDefault + + void paramQueryRequiredWithDefault200() throws java.lang.Exception; + + // paramQueryRequiredWithoutDefault + + void paramQueryRequiredWithoutDefault200() throws java.lang.Exception; + + void paramQueryRequiredWithoutDefault400() throws java.lang.Exception; + + // paramQueryUuid + + void paramQueryUuid200() throws java.lang.Exception; +} diff --git a/gen/test/java/testapi/constants/RequestApiTestClient.java b/gen/test/java/testapi/constants/RequestApiTestClient.java new file mode 100644 index 00000000..fab917c6 --- /dev/null +++ b/gen/test/java/testapi/constants/RequestApiTestClient.java @@ -0,0 +1,10 @@ +package testapi.constants; + +/** Test client for {@link RequestApi}. **/ +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.http.client.annotation.Client("/") +public interface RequestApiTestClient { + + @io.micronaut.http.annotation.Get("/no-operation-id") + io.micronaut.http.HttpResponse noOperationIdGet(); +} diff --git a/gen/test/java/testapi/constants/RequestApiTestSpec.java b/gen/test/java/testapi/constants/RequestApiTestSpec.java new file mode 100644 index 00000000..6ea9b8ce --- /dev/null +++ b/gen/test/java/testapi/constants/RequestApiTestSpec.java @@ -0,0 +1,10 @@ +package testapi.constants; + +/** Test for {@link RequestApi}. */ +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +public interface RequestApiTestSpec { + + // noOperationIdGet + + void noOperationIdGet204() throws java.lang.Exception; +} diff --git a/gen/test/java/testapi/constants/ResponseApiTestClient.java b/gen/test/java/testapi/constants/ResponseApiTestClient.java new file mode 100644 index 00000000..9cb9b457 --- /dev/null +++ b/gen/test/java/testapi/constants/ResponseApiTestClient.java @@ -0,0 +1,93 @@ +package testapi.constants; + +/** Test client for {@link ResponseApi}. **/ +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.http.client.annotation.Client("/") +public interface ResponseApiTestClient { + + @io.micronaut.http.annotation.Get("/response/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.Consumes({ "application/json" }) + io.micronaut.http.HttpResponse> arrayComplexNotFound( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "found") + java.lang.Boolean found); + + @io.micronaut.http.annotation.Get("/response/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.Consumes({ "application/json" }) + io.micronaut.http.HttpResponse> arraySimpleEmpty(); + + @io.micronaut.http.annotation.Get("/response/array-simple-not-found") + @io.micronaut.http.annotation.Consumes({ "application/json" }) + io.micronaut.http.HttpResponse> arraySimpleNotFound( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "found") + java.lang.Boolean found); + + @io.micronaut.http.annotation.Get("/response/header") + io.micronaut.http.HttpResponse header(); + + @io.micronaut.http.annotation.Get("/response/multiple-datatypes") + @io.micronaut.http.annotation.Consumes({ "application/json" }) + io.micronaut.http.HttpResponse multipleDataTypes( + @io.micronaut.core.annotation.Nullable + @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.Consumes({ "application/json" }) + io.micronaut.http.HttpResponse multipleDataTypesNotFound( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "redirect") + java.lang.Boolean redirect, + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "found") + java.lang.Boolean found); + + @io.micronaut.http.annotation.Get("/response/multiple-response-codes") + @io.micronaut.http.annotation.Consumes({ "application/json" }) + io.micronaut.http.HttpResponse multipleResponseCodes( + @io.micronaut.core.annotation.Nullable + @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.Consumes({ "application/json" }) + io.micronaut.http.HttpResponse multipleResponseCodesNotFound( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "redirect") + java.lang.Boolean redirect, + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "found") + java.lang.Boolean found); + + @io.micronaut.http.annotation.Get("/response/optional") + @io.micronaut.http.annotation.Consumes({ "application/json" }) + io.micronaut.http.HttpResponse optional( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "found") + java.lang.Boolean found); + + @io.micronaut.http.annotation.Get("/response/single") + @io.micronaut.http.annotation.Consumes({ "application/json" }) + io.micronaut.http.HttpResponse single(); + + @io.micronaut.http.annotation.Get("/response/void") + io.micronaut.http.HttpResponse voidFound(); + + @io.micronaut.http.annotation.Get("/response/void-not-found") + io.micronaut.http.HttpResponse voidNotFound( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "found") + java.lang.Boolean found); + + @io.micronaut.http.annotation.Get("/response/default") + io.micronaut.http.HttpResponse withDefault(); +} diff --git a/gen/test/java/testapi/constants/ResponseApiTestSpec.java b/gen/test/java/testapi/constants/ResponseApiTestSpec.java new file mode 100644 index 00000000..7a3a2778 --- /dev/null +++ b/gen/test/java/testapi/constants/ResponseApiTestSpec.java @@ -0,0 +1,86 @@ +package testapi.constants; + +/** Test for {@link ResponseApi}. */ +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +public interface ResponseApiTestSpec { + + // arrayComplex + + void arrayComplex200() throws java.lang.Exception; + + // arrayComplexNotFound + + void arrayComplexNotFound200() throws java.lang.Exception; + + void arrayComplexNotFound404() throws java.lang.Exception; + + // arraySimple + + void arraySimple200() throws java.lang.Exception; + + // arraySimpleEmpty + + void arraySimpleEmpty200() throws java.lang.Exception; + + // arraySimpleNotFound + + void arraySimpleNotFound200() throws java.lang.Exception; + + void arraySimpleNotFound404() throws java.lang.Exception; + + // header + + void header200() throws java.lang.Exception; + + // multipleDataTypes + + void multipleDataTypes200() throws java.lang.Exception; + + void multipleDataTypes300() throws java.lang.Exception; + + // multipleDataTypesNotFound + + void multipleDataTypesNotFound200() throws java.lang.Exception; + + void multipleDataTypesNotFound300() throws java.lang.Exception; + + void multipleDataTypesNotFound404() throws java.lang.Exception; + + // multipleResponseCodes + + void multipleResponseCodes200() throws java.lang.Exception; + + void multipleResponseCodes300() throws java.lang.Exception; + + // multipleResponseCodesNotFound + + void multipleResponseCodesNotFound200() throws java.lang.Exception; + + void multipleResponseCodesNotFound300() throws java.lang.Exception; + + void multipleResponseCodesNotFound404() throws java.lang.Exception; + + // optional + + void optional200() throws java.lang.Exception; + + void optional404() throws java.lang.Exception; + + // single + + void single200() throws java.lang.Exception; + + // voidFound + + void voidFound204() throws java.lang.Exception; + + // voidNotFound + + void voidNotFound204() throws java.lang.Exception; + + void voidNotFound404() throws java.lang.Exception; + + // withDefault + + void withDefault204() throws java.lang.Exception; +} diff --git a/gen/test/java/testapi/constants/ValidationApiTestClient.java b/gen/test/java/testapi/constants/ValidationApiTestClient.java new file mode 100644 index 00000000..c3e6046b --- /dev/null +++ b/gen/test/java/testapi/constants/ValidationApiTestClient.java @@ -0,0 +1,135 @@ +package testapi.constants; + +/** Test client for {@link ValidationApi}. **/ +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +@io.micronaut.http.client.annotation.Client("/") +public interface ValidationApiTestClient { + + @io.micronaut.http.annotation.Get("/validation/double/max") + io.micronaut.http.HttpResponse validationDoubleMax( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "number") + java.lang.Double number); + + @io.micronaut.http.annotation.Get("/validation/double/min") + io.micronaut.http.HttpResponse validationDoubleMin( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "number") + java.lang.Double number); + + @io.micronaut.http.annotation.Get("/validation/double/range") + io.micronaut.http.HttpResponse validationDoubleRange( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "number") + java.lang.Double number); + + @io.micronaut.http.annotation.Get("/validation/float/max") + io.micronaut.http.HttpResponse validationFloatMax( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "number") + java.lang.Float number); + + @io.micronaut.http.annotation.Get("/validation/float/min") + io.micronaut.http.HttpResponse validationFloatMin( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "number") + java.lang.Float number); + + @io.micronaut.http.annotation.Get("/validation/float/range") + io.micronaut.http.HttpResponse validationFloatRange( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "number") + java.lang.Float number); + + @io.micronaut.http.annotation.Get("/validation/integer/max") + io.micronaut.http.HttpResponse validationIntegerMax( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "integer") + java.lang.Integer integer); + + @io.micronaut.http.annotation.Get("/validation/integer/min") + io.micronaut.http.HttpResponse validationIntegerMin( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "integer") + java.lang.Integer integer); + + @io.micronaut.http.annotation.Get("/validation/integer/range") + io.micronaut.http.HttpResponse validationIntegerRange( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "integer") + java.lang.Integer integer); + + @io.micronaut.http.annotation.Get("/validation/list/max?{&list*}") + io.micronaut.http.HttpResponse validationListMax( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "list") + java.util.List list); + + @io.micronaut.http.annotation.Get("/validation/list/min?{&list*}") + io.micronaut.http.HttpResponse validationListMin( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "list") + java.util.List list); + + @io.micronaut.http.annotation.Post("/validation/list/model") + @io.micronaut.http.annotation.Produces({ "application/json" }) + io.micronaut.http.HttpResponse validationListModel( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.Body + java.util.List stringModel); + + @io.micronaut.http.annotation.Post("/validation/list/range?{&list*}") + io.micronaut.http.HttpResponse validationListRange( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "list") + java.util.List list); + + @io.micronaut.http.annotation.Get("/validation/long/max") + io.micronaut.http.HttpResponse validationLongMax( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "integer") + java.lang.Long integer); + + @io.micronaut.http.annotation.Get("/validation/long/min") + io.micronaut.http.HttpResponse validationLongMin( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "integer") + java.lang.Long integer); + + @io.micronaut.http.annotation.Get("/validation/long/range") + io.micronaut.http.HttpResponse validationLongRange( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "integer") + java.lang.Long integer); + + @io.micronaut.http.annotation.Post("/validation/model") + @io.micronaut.http.annotation.Produces({ "application/json" }) + io.micronaut.http.HttpResponse validationModel( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.Body + StringModel stringModel); + + @io.micronaut.http.annotation.Get("/validation/string/max") + io.micronaut.http.HttpResponse validationStringMax( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "string") + java.lang.String string); + + @io.micronaut.http.annotation.Get("/validation/string/min") + io.micronaut.http.HttpResponse validationStringMin( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "string") + java.lang.String string); + + @io.micronaut.http.annotation.Get("/validation/string/pattern") + io.micronaut.http.HttpResponse validationStringPattern( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "string") + java.lang.String string); + + @io.micronaut.http.annotation.Get("/validation/string/range") + io.micronaut.http.HttpResponse validationStringRange( + @io.micronaut.core.annotation.Nullable + @io.micronaut.http.annotation.QueryValue(value = "string") + java.lang.String string); +} diff --git a/gen/test/java/testapi/constants/ValidationApiTestSpec.java b/gen/test/java/testapi/constants/ValidationApiTestSpec.java new file mode 100644 index 00000000..f9366b8f --- /dev/null +++ b/gen/test/java/testapi/constants/ValidationApiTestSpec.java @@ -0,0 +1,132 @@ +package testapi.constants; + +/** Test for {@link ValidationApi}. */ +@jakarta.annotation.Generated("org.openapitools.codegen.languages.MicronautCodegen") +public interface ValidationApiTestSpec { + + // validationDoubleMax + + void validationDoubleMax204() throws java.lang.Exception; + + void validationDoubleMax400() throws java.lang.Exception; + + // validationDoubleMin + + void validationDoubleMin204() throws java.lang.Exception; + + void validationDoubleMin400() throws java.lang.Exception; + + // validationDoubleRange + + void validationDoubleRange204() throws java.lang.Exception; + + void validationDoubleRange400() throws java.lang.Exception; + + // validationFloatMax + + void validationFloatMax204() throws java.lang.Exception; + + void validationFloatMax400() throws java.lang.Exception; + + // validationFloatMin + + void validationFloatMin204() throws java.lang.Exception; + + void validationFloatMin400() throws java.lang.Exception; + + // validationFloatRange + + void validationFloatRange204() throws java.lang.Exception; + + void validationFloatRange400() throws java.lang.Exception; + + // validationIntegerMax + + void validationIntegerMax204() throws java.lang.Exception; + + void validationIntegerMax400() throws java.lang.Exception; + + // validationIntegerMin + + void validationIntegerMin204() throws java.lang.Exception; + + void validationIntegerMin400() throws java.lang.Exception; + + // validationIntegerRange + + void validationIntegerRange204() throws java.lang.Exception; + + void validationIntegerRange400() throws java.lang.Exception; + + // validationListMax + + void validationListMax204() throws java.lang.Exception; + + void validationListMax400() throws java.lang.Exception; + + // validationListMin + + void validationListMin204() throws java.lang.Exception; + + void validationListMin400() throws java.lang.Exception; + + // validationListModel + + void validationListModel204() throws java.lang.Exception; + + void validationListModel400() throws java.lang.Exception; + + // validationListRange + + void validationListRange204() throws java.lang.Exception; + + void validationListRange400() throws java.lang.Exception; + + // validationLongMax + + void validationLongMax204() throws java.lang.Exception; + + void validationLongMax400() throws java.lang.Exception; + + // validationLongMin + + void validationLongMin204() throws java.lang.Exception; + + void validationLongMin400() throws java.lang.Exception; + + // validationLongRange + + void validationLongRange204() throws java.lang.Exception; + + void validationLongRange400() throws java.lang.Exception; + + // validationModel + + void validationModel204() throws java.lang.Exception; + + void validationModel400() throws java.lang.Exception; + + // validationStringMax + + void validationStringMax204() throws java.lang.Exception; + + void validationStringMax400() throws java.lang.Exception; + + // validationStringMin + + void validationStringMin204() throws java.lang.Exception; + + void validationStringMin400() throws java.lang.Exception; + + // validationStringPattern + + void validationStringPattern204() throws java.lang.Exception; + + void validationStringPattern400() throws java.lang.Exception; + + // validationStringRange + + void validationStringRange204() throws java.lang.Exception; + + void validationStringRange400() throws java.lang.Exception; +} diff --git a/src/it/pom.xml b/src/it/pom.xml index 17ee9f17..5366adcc 100644 --- a/src/it/pom.xml +++ b/src/it/pom.xml @@ -189,6 +189,9 @@ ${project.build.directory} ${project.basedir}/../.openapi-generator codegen + + true + diff --git a/src/it/test-model-only-jackson-without-nullable/pom.xml b/src/it/test-model-only-jackson-without-nullable/pom.xml index 47a481d8..a3e02dd7 100644 --- a/src/it/test-model-only-jackson-without-nullable/pom.xml +++ b/src/it/test-model-only-jackson-without-nullable/pom.xml @@ -37,6 +37,7 @@ false false + false false false diff --git a/src/it/test-model-only-jackson/pom.xml b/src/it/test-model-only-jackson/pom.xml index 5a294e20..0b0c7ae8 100644 --- a/src/it/test-model-only-jackson/pom.xml +++ b/src/it/test-model-only-jackson/pom.xml @@ -33,6 +33,7 @@ false false + false false diff --git a/src/main/java/org/openapitools/codegen/languages/MicronautCodegen.java b/src/main/java/org/openapitools/codegen/languages/MicronautCodegen.java index bd4378b0..161c4b59 100644 --- a/src/main/java/org/openapitools/codegen/languages/MicronautCodegen.java +++ b/src/main/java/org/openapitools/codegen/languages/MicronautCodegen.java @@ -51,6 +51,7 @@ public class MicronautCodegen extends AbstractJavaCodegen public static final String RECORD = "record"; public static final String GENERATE_AUTHENTICATION = "generateAuthentication"; public static final String GENERATE_EXAMPLES = "generateExamples"; + public static final String GENERATE_CONSTANTS = "generateConstants"; public static final String SEALED = "sealed"; // '{' or '}' is not allowed according to https://datatracker.ietf.org/doc/html/rfc6570#section-3.2 @@ -66,6 +67,7 @@ public class MicronautCodegen extends AbstractJavaCodegen private boolean generateApiTests = true; private boolean generateAuthentication = false; private boolean generateExamples = false; + private boolean generateConstants = false; private boolean useBeanValidation = true; private boolean useGenericResponse = true; private boolean useOptional = true; @@ -96,6 +98,7 @@ public MicronautCodegen() { cliOptions.add(CliOption.newBoolean(GENERATE_AUTHENTICATION, "Generate authentication into apis with return code 401.", generateAuthentication)); cliOptions.add(CliOption.newBoolean(GENERATE_EXAMPLES, "Generate examples for tests.", generateExamples)); + cliOptions.add(CliOption.newBoolean(GENERATE_CONSTANTS, "Generate model/api constants.", generateConstants)); cliOptions.add(CliOption.newString(CLIENT_ID, "ClientId to use.")); cliOptions.add(CliOption.newString(SOURCE_FOLDER, SOURCE_FOLDER_DESC)); cliOptions.add(CliOption.newString("testFolder", "test folder for generated code")); @@ -120,8 +123,10 @@ public MicronautCodegen() { additionalProperties.put(PAGEABLE, pageable); additionalProperties.put(GENERATE_AUTHENTICATION, generateAuthentication); additionalProperties.put(GENERATE_EXAMPLES, generateExamples); + additionalProperties.put(GENERATE_CONSTANTS, generateConstants); additionalProperties.put(SEALED, sealed); additionalProperties.put(RECORD, record); + additionalProperties.put("curly", "{"); // add custom type mappings @@ -239,6 +244,9 @@ record = convertPropertyToBooleanAndWriteBack(RECORD); if (additionalProperties.containsKey(GENERATE_EXAMPLES)) { generateExamples = convertPropertyToBooleanAndWriteBack(GENERATE_EXAMPLES); } + if (additionalProperties.containsKey(GENERATE_CONSTANTS)) { + generateConstants = convertPropertyToBooleanAndWriteBack(GENERATE_CONSTANTS); + } // we do not generate projects, only api, set source and test folder diff --git a/src/main/resources/Micronaut/apiServer.mustache b/src/main/resources/Micronaut/apiServer.mustache index 5d3c0779..d27de5d1 100644 --- a/src/main/resources/Micronaut/apiServer.mustache +++ b/src/main/resources/Micronaut/apiServer.mustache @@ -3,11 +3,10 @@ package {{package}}; {{#isModelImport}}import {{modelPackage}}.*; {{/isModelImport}}{{>generated}}{{#useBeanValidation}}@io.micronaut.validation.Validated -{{/useBeanValidation}}public interface {{classname}} { -{{#operations}}{{#operation}} - java.lang.String PATH_{{vendorExtensions.operationIdUpperCase}} = "{{{vendorExtensions.serverPath}}}";{{/operation}}{{/operations}}{{#operations}}{{#operation}} +{{/useBeanValidation}}public interface {{classname}} {{curly}}{{#generateConstants}}{{#operations}}{{#operation}} + java.lang.String PATH_{{vendorExtensions.operationIdUpperCase}} = "{{vendorExtensions.serverPath}}";{{/operation}}{{/operations}}{{/generateConstants}}{{#operations}}{{#operation}} - @io.micronaut.http.annotation.{{vendorExtensions.httpMethod}}(PATH_{{vendorExtensions.operationIdUpperCase}}){{^vendorExtensions.generic}} + @io.micronaut.http.annotation.{{vendorExtensions.httpMethod}}({{#generateConstants}}PATH_{{vendorExtensions.operationIdUpperCase}}{{/generateConstants}}{{^generateConstants}}"{{{vendorExtensions.serverPath}}}"{{/generateConstants}}){{^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}} diff --git a/src/main/resources/Micronaut/modelInterface.mustache b/src/main/resources/Micronaut/modelInterface.mustache index 38dffd8b..47a3f07a 100644 --- a/src/main/resources/Micronaut/modelInterface.mustache +++ b/src/main/resources/Micronaut/modelInterface.mustache @@ -1,4 +1,4 @@ -{{^vendorExtensions.x-is-one-of-interface}}{{#discriminator}}@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = {{classname}}.JSON_DISCRIMINATOR) +{{^vendorExtensions.x-is-one-of-interface}}{{#discriminator}}@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = {{#generateConstants}}{{classname}}.JSON_DISCRIMINATOR{{/generateConstants}}{{^generateConstants}}"{{propertyBaseName}}"{{/generateConstants}}) @com.fasterxml.jackson.annotation.JsonSubTypes({ {{#discriminator.mappedModels}} @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = {{modelName}}.class, name = "{{^vendorExtensions.x-discriminator-value}}{{mappingName}}{{/vendorExtensions.x-discriminator-value}}{{#vendorExtensions.x-discriminator-value}}{{{vendorExtensions.x-discriminator-value}}}{{/vendorExtensions.x-discriminator-value}}"){{^-last}},{{/-last}} @@ -7,12 +7,12 @@ {{/discriminator}}{{^discriminator}}@com.fasterxml.jackson.databind.annotation.JsonDeserialize(as = {{classname}}Default.class) {{/discriminator}} public{{#sealed}} sealed{{/sealed}} interface {{classname}}{{#interfaces}}{{#-first}} extends {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{/interfaces}}{{#sealed}} permits {{#children}}{{name}}{{^-last}}, {{/-last}}{{/children}}{{/sealed}} { -{{#discriminator}} - +{{#generateConstants}}{{#discriminator}} java.lang.String JSON_DISCRIMINATOR = "{{propertyBaseName}}";{{/discriminator}}{{#vars}} - java.lang.String JSON_PROPERTY_{{nameInSnakeCase}} = "{{baseName}}";{{/vars}}{{#discriminator}} + java.lang.String JSON_PROPERTY_{{nameInSnakeCase}} = "{{baseName}}";{{/vars}}{{/generateConstants}}{{#discriminator}}{{#generateConstants}} +{{/generateConstants}} - @com.fasterxml.jackson.annotation.JsonProperty(JSON_DISCRIMINATOR) + @com.fasterxml.jackson.annotation.JsonProperty({{#generateConstants}}JSON_DISCRIMINATOR{{/generateConstants}}{{^generateConstants}}"{{propertyBaseName}}"{{/generateConstants}}) {{discriminator.propertyType}} {{^record}}{{discriminator.propertyGetter}}{{/record}}{{#record}}{{propertyName}}{{/record}}();{{/discriminator}}{{#vendorExtensions.additionalPropertiesMap}} @com.fasterxml.jackson.annotation.JsonAnyGetter java.util.Map<{{{vendorExtensions.additionalPropertiesMap.keyType}}}, {{{vendorExtensions.additionalPropertiesMap.valueType}}}> getAdditionalProperties(); @@ -22,13 +22,11 @@ public{{#sealed}} sealed{{/sealed}} interface {{classname}}{{#interfaces}}{{#-fi {{/vendorExtensions.additionalPropertiesMap}}{{#hasVars}}{{#vars}} {{#description}} /** {{description}} */ -{{/description}}{{^record}}{{>modelPropertyJackson}} - {{>modelPropertyType}} {{getter}}(); +{{/description}}{{>modelPropertyJackson}} +{{^record}} {{>modelPropertyType}} {{getter}}(); - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_{{nameInSnakeCase}}) - void {{setter}}({{>modelPropertyType}} new{{nameInCamelCase}});{{/record}}{{#record}} -{{>modelPropertyJackson}} - {{>modelPropertyType}} {{name}}();{{/record}}{{/vars}}{{#vars}}{{#isEnum}} + @com.fasterxml.jackson.annotation.JsonProperty({{#generateConstants}}JSON_PROPERTY_{{nameInSnakeCase}}{{/generateConstants}}{{^generateConstants}}"{{baseName}}"{{/generateConstants}}) + void {{setter}}({{>modelPropertyType}} new{{nameInCamelCase}});{{/record}}{{#record}} {{>modelPropertyType}} {{name}}();{{/record}}{{/vars}}{{#vars}}{{#isEnum}} {{>modelEnum}}{{/isEnum}}{{/vars}}{{/hasVars}} }{{/vendorExtensions.x-is-one-of-interface}}{{#vendorExtensions.x-is-one-of-interface}}{{^discriminator}}@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.DEDUCTION, visible = true) @@ -37,7 +35,7 @@ public{{#sealed}} sealed{{/sealed}} interface {{classname}}{{#interfaces}}{{#-fi @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = {{{.}}}.class){{^-last}},{{/-last}} {{/oneOf}} }) -{{/discriminator}}{{#discriminator}}@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = {{classname}}.JSON_DISCRIMINATOR) +{{/discriminator}}{{#discriminator}}@com.fasterxml.jackson.annotation.JsonTypeInfo(use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME, include = com.fasterxml.jackson.annotation.JsonTypeInfo.As.EXISTING_PROPERTY, property = {{#generateConstants}}{{classname}}.JSON_DISCRIMINATOR{{/generateConstants}}{{^generateConstants}}"{{propertyBaseName}}"{{/generateConstants}}) @com.fasterxml.jackson.annotation.JsonSubTypes({ {{#discriminator.mappedModels}} @com.fasterxml.jackson.annotation.JsonSubTypes.Type(value = {{modelName}}.class, name = "{{^vendorExtensions.x-discriminator-value}}{{mappingName}}{{/vendorExtensions.x-discriminator-value}}{{#vendorExtensions.x-discriminator-value}}{{{vendorExtensions.x-discriminator-value}}}{{/vendorExtensions.x-discriminator-value}}"), @@ -45,10 +43,9 @@ public{{#sealed}} sealed{{/sealed}} interface {{classname}}{{#interfaces}}{{#-fi }) {{/discriminator}} public{{#sealed}} sealed{{/sealed}} interface {{classname}}{{#vendorExtensions.x-implements}}{{#-first}} extends {{{.}}}{{/-first}}{{^-first}}, {{{.}}}{{/-first}}{{/vendorExtensions.x-implements}}{{#sealed}} permits {{#children}}{{name}}{{^-last}}, {{/-last}}{{/children}}{{/sealed}}{{^discriminator}} {}{{/discriminator}}{{#discriminator}} { -{{#discriminator}} - - java.lang.String JSON_DISCRIMINATOR = "{{propertyBaseName}}";{{/discriminator}} - - @com.fasterxml.jackson.annotation.JsonProperty(JSON_DISCRIMINATOR) +{{#generateConstants}}{{#discriminator}} + java.lang.String JSON_DISCRIMINATOR = "{{propertyBaseName}}"; +{{/discriminator}}{{/generateConstants}} + @com.fasterxml.jackson.annotation.JsonProperty({{#generateConstants}}JSON_DISCRIMINATOR{{/generateConstants}}{{^generateConstants}}"{{propertyBaseName}}"{{/generateConstants}}) {{discriminator.propertyType}} {{^record}}{{discriminator.propertyGetter}}{{/record}}{{#record}}{{propertyName}}{{/record}}(); }{{/discriminator}}{{/vendorExtensions.x-is-one-of-interface}} \ No newline at end of file diff --git a/src/main/resources/Micronaut/modelPojo.mustache b/src/main/resources/Micronaut/modelPojo.mustache index 170dfef6..5f803c05 100644 --- a/src/main/resources/Micronaut/modelPojo.mustache +++ b/src/main/resources/Micronaut/modelPojo.mustache @@ -1,9 +1,10 @@ {{#serdeable}}@io.micronaut.serde.annotation.Serdeable {{/serdeable}} public{{#sealed}}{{#interfaceModels}} final{{/interfaceModels}}{{/sealed}} class {{classname}}{{#interfaceModels}}{{#-first}} implements{{/-first}} {{classname}}{{^-last}}, {{/-last}}{{/interfaceModels}} { -{{#vars}}{{#-first}} +{{#generateConstants}}{{#vars}}{{#-first}} {{/-first}} public static final java.lang.String JSON_PROPERTY_{{nameInSnakeCase}} = "{{baseName}}"; {{/vars}} +{{/generateConstants}} {{#allVars}}{{#description}} /** {{description}} */ {{/description}}{{#useBeanValidation}}{{>modelPropertyValidation}}{{/useBeanValidation}}{{>modelPropertyJackson}} diff --git a/src/main/resources/Micronaut/modelPropertyJackson.mustache b/src/main/resources/Micronaut/modelPropertyJackson.mustache index 092afe60..29447d2f 100644 --- a/src/main/resources/Micronaut/modelPropertyJackson.mustache +++ b/src/main/resources/Micronaut/modelPropertyJackson.mustache @@ -1,2 +1,2 @@ - @com.fasterxml.jackson.annotation.JsonProperty(JSON_PROPERTY_{{nameInSnakeCase}}) + @com.fasterxml.jackson.annotation.JsonProperty({{#generateConstants}}JSON_PROPERTY_{{nameInSnakeCase}}{{/generateConstants}}{{^generateConstants}}"{{baseName}}"{{/generateConstants}}) @com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.{{#required}}ALWAYS{{/required}}{{^required}}{{#isNullable}}NON_ABSENT{{/isNullable}}{{^isNullable}}NON_NULL{{/isNullable}}{{/required}}) \ No newline at end of file diff --git a/src/main/resources/Micronaut/modelRecord.mustache b/src/main/resources/Micronaut/modelRecord.mustache index ce52d8a2..6ae5edf4 100644 --- a/src/main/resources/Micronaut/modelRecord.mustache +++ b/src/main/resources/Micronaut/modelRecord.mustache @@ -3,15 +3,16 @@ {{#description}} /** {{description}} */ {{/description}}{{#useBeanValidation}}{{>modelPropertyValidation}}{{/useBeanValidation}}{{>modelPropertyJackson}} - {{>modelPropertyType}} {{name}}{{^-last}},{{/-last}}{{/allVars}}){{#interfaceModels}}{{#-first}} implements{{/-first}} {{classname}}{{^-last}}, {{/-last}}{{/interfaceModels}} { + {{>modelPropertyType}} {{name}}{{^-last}},{{/-last}}{{/allVars}}){{#interfaceModels}}{{#-first}} implements{{/-first}} {{classname}}{{^-last}}, {{/-last}}{{/interfaceModels}} {{curly}}{{#generateConstants}} {{#vars}}{{#-first}} -{{/-first}} public static final java.lang.String JSON_PROPERTY_{{nameInSnakeCase}} = "{{baseName}}";{{^-last}} -{{/-last}}{{/vars}}{{#vendorExtensions.discriminatorPropertyValue}} +{{/-first}} public static final java.lang.String JSON_PROPERTY_{{nameInSnakeCase}} = "{{baseName}}"; +{{/vars}}{{/generateConstants}}{{#vendorExtensions.discriminatorPropertyValue}}{{^generateConstants}} +{{/generateConstants}} @Override public {{vendorExtensions.discriminatorPropertyType}} {{vendorExtensions.discriminatorPropertyName}}() { return {{{vendorExtensions.discriminatorPropertyValue}}}; - }{{/vendorExtensions.discriminatorPropertyValue}}{{#allVars}}{{#isEnum}} - -{{>modelEnum}}{{/isEnum}}{{/allVars}} -} \ No newline at end of file + } +{{/vendorExtensions.discriminatorPropertyValue}}{{#allVars}}{{#isEnum}} +{{>modelEnum}}{{#-last}} +{{/-last}}{{/isEnum}}{{/allVars}}} \ No newline at end of file diff --git a/src/test/java/org/openapitools/codegen/languages/MicronautCodegenTest.java b/src/test/java/org/openapitools/codegen/languages/MicronautCodegenTest.java index 86c9f4c4..2233c9e4 100644 --- a/src/test/java/org/openapitools/codegen/languages/MicronautCodegenTest.java +++ b/src/test/java/org/openapitools/codegen/languages/MicronautCodegenTest.java @@ -70,6 +70,13 @@ void apiWithTypes() { .addInstantiationType("map", java.util.TreeMap.class.getName())); } + @DisplayName("api with constants") + @Test + void apiWithConstants() { + generate(configurator(SPEC_API, "testapi.constants") + .addAdditionalProperty(MicronautCodegen.GENERATE_CONSTANTS, true)); + } + @DisplayName("api with async") @Test void apiWithAsyncReactor() { @@ -142,6 +149,13 @@ void modelPojoWithoutSealed() { .addAdditionalProperty(MicronautCodegen.SEALED, false)); } + @DisplayName("model pojo with constants") + @Test + void modelPojoWithConstants() { + generate(configurator(SPEC_MODEL, "testmodel.micronaut_pojo_constants") + .addAdditionalProperty(MicronautCodegen.GENERATE_CONSTANTS, true)); + } + @DisplayName("model records without JsonNullable") @Test void modelRecordsWithoutJsonNullable() { @@ -150,6 +164,14 @@ void modelRecordsWithoutJsonNullable() { .addAdditionalProperty(MicronautCodegen.RECORD, true)); } + @DisplayName("model records with constants") + @Test + void modelRecordsWithConstants() { + generate(configurator(SPEC_MODEL, "testmodel.micronaut_record_constants") + .addAdditionalProperty(MicronautCodegen.RECORD, true) + .addAdditionalProperty(MicronautCodegen.GENERATE_CONSTANTS, true)); + } + @DisplayName("model without micronaut annotations") @Test void modelWithoutMicronaut() {