diff --git a/gen/main/java/testapi/async/reactor/MediatypeApi.java b/gen/main/java/testapi/async/reactor/MediatypeApi.java index 93bf02ac..eb3cbff3 100644 --- a/gen/main/java/testapi/async/reactor/MediatypeApi.java +++ b/gen/main/java/testapi/async/reactor/MediatypeApi.java @@ -31,7 +31,6 @@ reactor.core.publisher.Mono> mediatype @io.micronaut.http.annotation.Part(value = "userId") java.lang.Integer userId, @io.micronaut.core.annotation.NonNull - @io.micronaut.http.annotation.Part(value = "file") io.micronaut.http.multipart.StreamingFileUpload file); @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") diff --git a/gen/main/java/testapi/async/simple/MediatypeApi.java b/gen/main/java/testapi/async/simple/MediatypeApi.java index 3de91cee..9d18bcc1 100644 --- a/gen/main/java/testapi/async/simple/MediatypeApi.java +++ b/gen/main/java/testapi/async/simple/MediatypeApi.java @@ -33,7 +33,6 @@ reactor.core.publisher.Mono mediatypeConsumesMultipartWithFileUpload( @io.micronaut.http.annotation.Part(value = "userId") java.lang.Integer userId, @io.micronaut.core.annotation.NonNull - @io.micronaut.http.annotation.Part(value = "file") io.micronaut.http.multipart.StreamingFileUpload file); @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") diff --git a/gen/main/java/testapi/defaults/MediatypeApi.java b/gen/main/java/testapi/defaults/MediatypeApi.java index fe8785d1..6f829273 100644 --- a/gen/main/java/testapi/defaults/MediatypeApi.java +++ b/gen/main/java/testapi/defaults/MediatypeApi.java @@ -31,7 +31,6 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUplo @io.micronaut.http.annotation.Part(value = "userId") java.lang.Integer userId, @io.micronaut.core.annotation.NonNull - @io.micronaut.http.annotation.Part(value = "file") io.micronaut.http.multipart.CompletedFileUpload file); @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") diff --git a/gen/main/java/testapi/modelsuffix/MediatypeApi.java b/gen/main/java/testapi/modelsuffix/MediatypeApi.java index 93a4b649..c992e96b 100644 --- a/gen/main/java/testapi/modelsuffix/MediatypeApi.java +++ b/gen/main/java/testapi/modelsuffix/MediatypeApi.java @@ -31,7 +31,6 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUp @io.micronaut.http.annotation.Part(value = "userId") java.lang.Integer userId, @io.micronaut.core.annotation.NonNull - @io.micronaut.http.annotation.Part(value = "file") io.micronaut.http.multipart.CompletedFileUpload file); @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") diff --git a/gen/main/java/testapi/nogeneric/MediatypeApi.java b/gen/main/java/testapi/nogeneric/MediatypeApi.java index 6329cb6a..5dad8771 100644 --- a/gen/main/java/testapi/nogeneric/MediatypeApi.java +++ b/gen/main/java/testapi/nogeneric/MediatypeApi.java @@ -33,7 +33,6 @@ Multipart mediatypeConsumesMultipartWithFileUpload( @io.micronaut.http.annotation.Part(value = "userId") java.lang.Integer userId, @io.micronaut.core.annotation.NonNull - @io.micronaut.http.annotation.Part(value = "file") io.micronaut.http.multipart.CompletedFileUpload file); @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") diff --git a/gen/main/java/testapi/nooptional/MediatypeApi.java b/gen/main/java/testapi/nooptional/MediatypeApi.java index 6f204c02..8ab7967b 100644 --- a/gen/main/java/testapi/nooptional/MediatypeApi.java +++ b/gen/main/java/testapi/nooptional/MediatypeApi.java @@ -31,7 +31,6 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUplo @io.micronaut.http.annotation.Part(value = "userId") java.lang.Integer userId, @io.micronaut.core.annotation.NonNull - @io.micronaut.http.annotation.Part(value = "file") io.micronaut.http.multipart.CompletedFileUpload file); @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") diff --git a/gen/main/java/testapi/novalidation/MediatypeApi.java b/gen/main/java/testapi/novalidation/MediatypeApi.java index 741fd15b..3590459d 100644 --- a/gen/main/java/testapi/novalidation/MediatypeApi.java +++ b/gen/main/java/testapi/novalidation/MediatypeApi.java @@ -30,7 +30,6 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUplo @io.micronaut.http.annotation.Part(value = "userId") java.lang.Integer userId, @io.micronaut.core.annotation.NonNull - @io.micronaut.http.annotation.Part(value = "file") io.micronaut.http.multipart.CompletedFileUpload file); @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") diff --git a/gen/main/java/testapi/packages/api/MediatypeApi.java b/gen/main/java/testapi/packages/api/MediatypeApi.java index 5e3de36c..e8c57751 100644 --- a/gen/main/java/testapi/packages/api/MediatypeApi.java +++ b/gen/main/java/testapi/packages/api/MediatypeApi.java @@ -33,7 +33,6 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUplo @io.micronaut.http.annotation.Part(value = "userId") java.lang.Integer userId, @io.micronaut.core.annotation.NonNull - @io.micronaut.http.annotation.Part(value = "file") io.micronaut.http.multipart.CompletedFileUpload file); @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") diff --git a/gen/main/java/testapi/types/MediatypeApi.java b/gen/main/java/testapi/types/MediatypeApi.java index 124d8859..b5c3ddb9 100644 --- a/gen/main/java/testapi/types/MediatypeApi.java +++ b/gen/main/java/testapi/types/MediatypeApi.java @@ -30,7 +30,6 @@ io.micronaut.http.HttpResponse mediatypeConsumesMultipartWithFileUplo @io.micronaut.http.annotation.Part(value = "userId") java.lang.Integer userId, @io.micronaut.core.annotation.NonNull - @io.micronaut.http.annotation.Part(value = "file") io.micronaut.http.multipart.CompletedFileUpload file); @io.micronaut.http.annotation.Post("/mediatype/consumes-multipart-without-fileupload") diff --git a/pom.xml b/pom.xml index ba4b9727..ec2c88a9 100644 --- a/pom.xml +++ b/pom.xml @@ -67,31 +67,56 @@ 17 17 - -Xlint:all,-processing,-unchecked,-rawtypes,-serial - 3.10.0 - 3.11.1 - 5.10.0 + 4.0.3 7.0.0-beta 0.2.6 + + + + io.micronaut.platform + micronaut-platform + ${version.io.micronaut.platform} + pom + import + + + + + + org.openapitools + openapi-generator + ${version.org.openapitools.generator} + provided + + + org.openapitools + jackson-databind-nullable + ${version.org.openapitools.jackson.nullable} + test + + io.micronaut micronaut-http - ${version.io.micronaut} io.micronaut - micronaut-inject + micronaut-context + + + io.micronaut + micronaut-context-propagation io.micronaut @@ -110,7 +135,6 @@ io.micronaut micronaut-core - ${version.io.micronaut} provided @@ -119,150 +143,54 @@ + + - io.micronaut - micronaut-http-client-core - ${version.io.micronaut} + org.junit.jupiter + junit-jupiter-api test - - - io.micronaut - micronaut-core-reactive - - - io.micronaut - micronaut-runtime - - - org.slf4j - slf4j-api - - - io.projectreactor - reactor-core - - + + - io.micronaut - micronaut-inject - ${version.io.micronaut} + jakarta.annotation + jakarta.annotation-api test - - - org.slf4j - slf4j-api - - - io.micronaut - micronaut-core - - - org.yaml - snakeyaml - - - io.micronaut - micronaut-validation - ${version.io.micronaut} + jakarta.validation + jakarta.validation-api test - - - io.micronaut - micronaut-core-reactive - - - io.micronaut - micronaut-inject - - - io.projectreactor - reactor-core - - - org.reactivestreams - reactive-streams - - - org.slf4j - slf4j-api - - - org.yaml - snakeyaml - - - io.micronaut.security - micronaut-security - ${version.io.micronaut.security} + javax.annotation + javax.annotation-api test - - - io.micronaut - micronaut-inject - - - io.micronaut - micronaut-http-server - - - io.micronaut - micronaut-validation - - - io.micronaut - micronaut-http - - - org.reactivestreams - reactive-streams - - - - - org.openapitools - openapi-generator - ${version.org.openapitools.generator} - provided + javax.validation + validation-api + 2.0.1.Final + test - org.openapitools - jackson-databind-nullable - ${version.org.openapitools.jackson.nullable} + io.micronaut + micronaut-http-client-core test - - - com.fasterxml.jackson.core - jackson-databind - - - - - org.junit.jupiter - junit-jupiter-api - ${version.org.junit.jupiter} + io.micronaut.security + micronaut-security test - - - jakarta.validation - jakarta.validation-api - 3.0.2 + io.micronaut.serde + micronaut-serde-api test org.springframework spring-context - 5.3.25 test @@ -318,6 +246,7 @@ testCompile + -Xlint:none ${skipTests} diff --git a/src/it/pom.xml b/src/it/pom.xml index 02520b06..17ee9f17 100644 --- a/src/it/pom.xml +++ b/src/it/pom.xml @@ -29,7 +29,8 @@ - @version.io.micronaut@ + @version.io.micronaut.platform@ + 2.2.0 @version.org.openapitools.generator@ @version.org.openapitools.jackson.nullable@ @@ -48,9 +49,9 @@ - io.micronaut - micronaut-bom - ${version.io.micronaut} + io.micronaut.platform + micronaut-platform + ${version.io.micronaut.platform} pom import @@ -64,11 +65,16 @@ - + - com.google.code.findbugs - jsr305 - provided + org.slf4j + slf4j-simple + test + + + org.yaml + snakeyaml + test diff --git a/src/it/test-api-async-reactor-generic/pom.xml b/src/it/test-api-async-reactor-generic/pom.xml index 8cd55071..d6155987 100644 --- a/src/it/test-api-async-reactor-generic/pom.xml +++ b/src/it/test-api-async-reactor-generic/pom.xml @@ -26,6 +26,10 @@ micronaut-http-server-netty runtime + + io.micronaut.serde + micronaut-serde-jackson + io.micronaut.xml micronaut-jackson-xml @@ -81,7 +85,12 @@ io.micronaut micronaut-inject-java - ${version.io.micronaut} + ${version.io.micronaut.platform} + + + io.micronaut.serde + micronaut-serde-processor + ${version.io.micronaut.serde} diff --git a/src/it/test-api-async-reactor-nogeneric/pom.xml b/src/it/test-api-async-reactor-nogeneric/pom.xml index 9a8ef9dc..5e9d0e94 100644 --- a/src/it/test-api-async-reactor-nogeneric/pom.xml +++ b/src/it/test-api-async-reactor-nogeneric/pom.xml @@ -26,6 +26,10 @@ micronaut-http-server-netty runtime + + io.micronaut.serde + micronaut-serde-jackson + io.micronaut.xml micronaut-jackson-xml @@ -81,7 +85,12 @@ io.micronaut micronaut-inject-java - ${version.io.micronaut} + ${version.io.micronaut.platform} + + + io.micronaut.serde + micronaut-serde-processor + ${version.io.micronaut.serde} diff --git a/src/it/test-api-async-rxjava2-generic/pom.xml b/src/it/test-api-async-rxjava2-generic/pom.xml index 70614804..3b54cd4b 100644 --- a/src/it/test-api-async-rxjava2-generic/pom.xml +++ b/src/it/test-api-async-rxjava2-generic/pom.xml @@ -26,6 +26,10 @@ micronaut-http-server-netty runtime + + io.micronaut.serde + micronaut-serde-jackson + io.micronaut.xml micronaut-jackson-xml @@ -81,7 +85,12 @@ io.micronaut micronaut-inject-java - ${version.io.micronaut} + ${version.io.micronaut.platform} + + + io.micronaut.serde + micronaut-serde-processor + ${version.io.micronaut.serde} diff --git a/src/it/test-api-async-rxjava2-nogeneric/pom.xml b/src/it/test-api-async-rxjava2-nogeneric/pom.xml index 84b496a6..06ce56b6 100644 --- a/src/it/test-api-async-rxjava2-nogeneric/pom.xml +++ b/src/it/test-api-async-rxjava2-nogeneric/pom.xml @@ -26,6 +26,10 @@ micronaut-http-server-netty runtime + + io.micronaut.serde + micronaut-serde-jackson + io.micronaut.xml micronaut-jackson-xml @@ -81,7 +85,12 @@ io.micronaut micronaut-inject-java - ${version.io.micronaut} + ${version.io.micronaut.platform} + + + io.micronaut.serde + micronaut-serde-processor + ${version.io.micronaut.serde} diff --git a/src/it/test-api-async-rxjava3-generic/pom.xml b/src/it/test-api-async-rxjava3-generic/pom.xml index b5a5ef07..9b49e808 100644 --- a/src/it/test-api-async-rxjava3-generic/pom.xml +++ b/src/it/test-api-async-rxjava3-generic/pom.xml @@ -26,6 +26,10 @@ micronaut-http-server-netty runtime + + io.micronaut.serde + micronaut-serde-jackson + io.micronaut.xml micronaut-jackson-xml @@ -81,7 +85,12 @@ io.micronaut micronaut-inject-java - ${version.io.micronaut} + ${version.io.micronaut.platform} + + + io.micronaut.serde + micronaut-serde-processor + ${version.io.micronaut.serde} diff --git a/src/it/test-api-async-rxjava3-nogeneric/pom.xml b/src/it/test-api-async-rxjava3-nogeneric/pom.xml index 803cbc84..1d380380 100644 --- a/src/it/test-api-async-rxjava3-nogeneric/pom.xml +++ b/src/it/test-api-async-rxjava3-nogeneric/pom.xml @@ -26,6 +26,10 @@ micronaut-http-server-netty runtime + + io.micronaut.serde + micronaut-serde-jackson + io.micronaut.xml micronaut-jackson-xml @@ -81,7 +85,12 @@ io.micronaut micronaut-inject-java - ${version.io.micronaut} + ${version.io.micronaut.platform} + + + io.micronaut.serde + micronaut-serde-processor + ${version.io.micronaut.serde} diff --git a/src/it/test-api-nogeneric/pom.xml b/src/it/test-api-nogeneric/pom.xml index 34db3e06..ba0b4e5f 100644 --- a/src/it/test-api-nogeneric/pom.xml +++ b/src/it/test-api-nogeneric/pom.xml @@ -13,10 +13,6 @@ - - io.micronaut - micronaut-validation - io.micronaut micronaut-http-client @@ -26,6 +22,14 @@ micronaut-http-server-netty runtime + + io.micronaut.serde + micronaut-serde-jackson + + + io.micronaut.validation + micronaut-validation + io.micronaut.xml micronaut-jackson-xml @@ -79,17 +83,12 @@ io.micronaut micronaut-inject-java - ${version.io.micronaut} - - - io.micronaut - micronaut-validation - ${version.io.micronaut} + ${version.io.micronaut.platform} - io.micronaut - micronaut-http-validation - ${version.io.micronaut} + io.micronaut.serde + micronaut-serde-processor + ${version.io.micronaut.serde} diff --git a/src/it/test-api-nooptional/pom.xml b/src/it/test-api-nooptional/pom.xml index 153067fa..1e9c7132 100644 --- a/src/it/test-api-nooptional/pom.xml +++ b/src/it/test-api-nooptional/pom.xml @@ -13,10 +13,6 @@ - - io.micronaut - micronaut-validation - io.micronaut micronaut-http-client @@ -26,6 +22,14 @@ micronaut-http-server-netty runtime + + io.micronaut.serde + micronaut-serde-jackson + + + io.micronaut.validation + micronaut-validation + io.micronaut.xml micronaut-jackson-xml @@ -82,17 +86,12 @@ io.micronaut micronaut-inject-java - ${version.io.micronaut} - - - io.micronaut - micronaut-validation - ${version.io.micronaut} + ${version.io.micronaut.platform} - io.micronaut - micronaut-http-validation - ${version.io.micronaut} + io.micronaut.serde + micronaut-serde-processor + ${version.io.micronaut.serde} diff --git a/src/it/test-api-novalidation/pom.xml b/src/it/test-api-novalidation/pom.xml index a156355e..17c33259 100644 --- a/src/it/test-api-novalidation/pom.xml +++ b/src/it/test-api-novalidation/pom.xml @@ -16,18 +16,16 @@ io.micronaut micronaut-http-client - - - javax.validation - validation-api - - io.micronaut micronaut-http-server-netty runtime + + io.micronaut.serde + micronaut-serde-jackson + io.micronaut.xml micronaut-jackson-xml @@ -80,7 +78,12 @@ io.micronaut micronaut-inject-java - ${version.io.micronaut} + ${version.io.micronaut.platform} + + + io.micronaut.serde + micronaut-serde-processor + ${version.io.micronaut.serde} diff --git a/src/it/test-api/pom.xml b/src/it/test-api/pom.xml index 30b92233..b44c69ee 100644 --- a/src/it/test-api/pom.xml +++ b/src/it/test-api/pom.xml @@ -13,10 +13,6 @@ - - io.micronaut - micronaut-validation - io.micronaut micronaut-http-client @@ -26,6 +22,14 @@ micronaut-http-server-netty runtime + + io.micronaut.serde + micronaut-serde-jackson + + + io.micronaut.validation + micronaut-validation + io.micronaut.xml micronaut-jackson-xml @@ -53,17 +57,12 @@ io.micronaut micronaut-inject-java - ${version.io.micronaut} - - - io.micronaut - micronaut-validation - ${version.io.micronaut} + ${version.io.micronaut.platform} - io.micronaut - micronaut-http-validation - ${version.io.micronaut} + io.micronaut.serde + micronaut-serde-processor + ${version.io.micronaut.serde} diff --git a/src/it/test-custom-output/pom.xml b/src/it/test-custom-output/pom.xml index 1269a748..343a6bd9 100644 --- a/src/it/test-custom-output/pom.xml +++ b/src/it/test-custom-output/pom.xml @@ -17,6 +17,10 @@ io.micronaut micronaut-http-client + + io.micronaut.serde + micronaut-serde-jackson + diff --git a/src/it/test-security/pom.xml b/src/it/test-security/pom.xml index fa23564b..0a136543 100644 --- a/src/it/test-security/pom.xml +++ b/src/it/test-security/pom.xml @@ -31,6 +31,10 @@ micronaut-security-jwt runtime + + io.micronaut.serde + micronaut-serde-jackson + @@ -53,7 +57,7 @@ io.micronaut micronaut-inject-java - ${version.io.micronaut} + ${version.io.micronaut.platform} @@ -66,6 +70,9 @@ codegen.server @project.basedir@/src/test/resources/openapi/test-security.yaml + + false + diff --git a/src/main/java/org/openapitools/codegen/languages/MicronautCodegen.java b/src/main/java/org/openapitools/codegen/languages/MicronautCodegen.java index 60f6b4a2..7ef7daf5 100644 --- a/src/main/java/org/openapitools/codegen/languages/MicronautCodegen.java +++ b/src/main/java/org/openapitools/codegen/languages/MicronautCodegen.java @@ -504,6 +504,7 @@ public boolean isDataTypeString(String dataType) { return "java.lang.String".equals(dataType) || "String".equals(dataType); } + @SuppressWarnings("rawtypes") @Override public String toDefaultValue(Schema schema) { if (ModelUtils.isGenerateAliasAsModel() && schema.get$ref() != null) { @@ -512,6 +513,7 @@ public String toDefaultValue(Schema schema) { return super.toDefaultValue(schema); } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public String toExampleValue(Schema schema) { diff --git a/src/main/resources/Micronaut/apiServerParams.mustache b/src/main/resources/Micronaut/apiServerParams.mustache index 1e9d3f2a..3c624ffc 100644 --- a/src/main/resources/Micronaut/apiServerParams.mustache +++ b/src/main/resources/Micronaut/apiServerParams.mustache @@ -4,8 +4,8 @@ {{/required}}{{^required}}{{^useOptional}} @{{type.Nullable}} {{/useOptional}}{{#useOptional}} @{{type.Nonnull}} {{/useOptional}}{{/required}}{{#isBodyParam}} @io.micronaut.http.annotation.Body -{{/isBodyParam}}{{#isFormParam}} @io.micronaut.http.annotation.Part(value = "{{baseName}}") -{{/isFormParam}}{{#isQueryParam}} @io.micronaut.http.annotation.QueryValue{{^isArray}}(value = "{{baseName}}"{{^isContainer}}{{#defaultValue}}, defaultValue = "{{defaultValue}}"{{/defaultValue}}{{/isContainer}}){{/isArray}} +{{/isBodyParam}}{{#isFormParam}}{{^isFile}} @io.micronaut.http.annotation.Part(value = "{{baseName}}") +{{/isFile}}{{/isFormParam}}{{#isQueryParam}} @io.micronaut.http.annotation.QueryValue{{^isArray}}(value = "{{baseName}}"{{^isContainer}}{{#defaultValue}}, defaultValue = "{{defaultValue}}"{{/defaultValue}}{{/isContainer}}){{/isArray}} {{/isQueryParam}}{{#isCookieParam}} @io.micronaut.http.annotation.CookieValue(value = "{{baseName}}"{{#defaultValue}}, defaultValue = "{{defaultValue}}"{{/defaultValue}}) {{/isCookieParam}}{{#isPathParam}} @io.micronaut.http.annotation.PathVariable(value = "{{baseName}}"{{#defaultValue}}, defaultValue = "{{defaultValue}}"{{/defaultValue}}) {{/isPathParam}}{{#isHeaderParam}} @io.micronaut.http.annotation.Header(value = "{{baseName}}"{{#defaultValue}}, defaultValue = "{{defaultValue}}"{{/defaultValue}}) diff --git a/src/main/resources/Micronaut/support/TimeTypeConverterRegistrar.mustache b/src/main/resources/Micronaut/support/TimeTypeConverterRegistrar.mustache index af394573..bc88daa6 100644 --- a/src/main/resources/Micronaut/support/TimeTypeConverterRegistrar.mustache +++ b/src/main/resources/Micronaut/support/TimeTypeConverterRegistrar.mustache @@ -9,7 +9,7 @@ import java.time.format.DateTimeParseException; import java.util.Optional; import io.micronaut.context.annotation.BootstrapContextCompatible; -import io.micronaut.core.convert.ConversionService; +import io.micronaut.core.convert.MutableConversionService; import io.micronaut.core.convert.TypeConverterRegistrar; {{>generated}}@{{type.Singleton}} @@ -17,7 +17,7 @@ import io.micronaut.core.convert.TypeConverterRegistrar; public class TimeTypeConverterRegistrar implements TypeConverterRegistrar { @Override - public void register(ConversionService conversionService) { + public void register(MutableConversionService conversionService) { conversionService.addConverter(Instant.class, String.class, Instant::toString); conversionService.addConverter(String.class, Instant.class, (object, type, context) -> {