From 9fdd6768adc1830b4816c62f1d4c1d000d501cdb Mon Sep 17 00:00:00 2001 From: jpfinne Date: Sat, 1 Aug 2026 19:56:47 +0200 Subject: [PATCH 01/12] Jspecify improvement * handling of @Nullable List * add @nullable for Spring all arg constructor + chain setter (only if useJspecify) --- bin/configs/spring-boot-4-jspecify.yaml | 5 +- .../languages/AbstractJavaCodegen.java | 10 +- .../nullableArgumentWithEnum.mustache | 1 + .../main/resources/JavaSpring/pojo.mustache | 4 +- .../codegen/java/JavaClientCodegenTest.java | 83 ++++- .../java/assertions/JavaFileAssert.java | 8 +- .../java/spring/SpringCodegenTest.java | 122 ++++++- .../src/test/resources/3_0/java/jspecify.yaml | 30 ++ .../native-jackson3-jspecify/api/openapi.yaml | 38 +++ .../java/native-jackson3-jspecify/docs/Foo.md | 7 + .../org/openapitools/client/model/Foo.java | 314 ++++++++++++++++- .../api/openapi.yaml | 38 +++ .../docs/Foo.md | 7 + .../org/openapitools/client/model/Foo.java | 254 +++++++++++++- .../api/openapi.yaml | 38 +++ .../docs/Foo.md | 7 + .../org/openapitools/client/model/Foo.java | 254 +++++++++++++- .../api/openapi.yaml | 38 +++ .../docs/Foo.md | 7 + .../org/openapitools/client/model/Foo.java | 254 +++++++++++++- .../java/org/openapitools/api/FooApi.java | 8 +- .../main/java/org/openapitools/model/Foo.java | 323 ++++++++++++++++-- 22 files changed, 1759 insertions(+), 91 deletions(-) create mode 100644 modules/openapi-generator/src/main/resources/JavaSpring/nullableArgumentWithEnum.mustache diff --git a/bin/configs/spring-boot-4-jspecify.yaml b/bin/configs/spring-boot-4-jspecify.yaml index 50b78bf923b8..ea3415840a3d 100644 --- a/bin/configs/spring-boot-4-jspecify.yaml +++ b/bin/configs/spring-boot-4-jspecify.yaml @@ -18,4 +18,7 @@ additionalProperties: generateConstructorWithAllArgs: true generateBuilders: true openApiNullable: false - useJspecify: true \ No newline at end of file + useJspecify: true +typeMappings: + OffsetDateTime: java.time.Instant + BigDecimal: java.math.BigDecimal \ No newline at end of file diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java index 4191a29dfaa6..ec6d25ed5ff3 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java @@ -2866,7 +2866,7 @@ protected ImmutableMap.Builder addMustacheLambdas() { Mustache.Lambda jSpecifyDatatypeLambda = (fragment, writer) -> { String dataType = fragment.execute(); if (jSpecifyNullableLambda.isSetAndClear()) { - int idx = dataType.lastIndexOf('.'); + int idx = getLastIndex(dataType); if (idx > 0) { // generate declaration like java.time.@Nullable Timestamp writer.write(dataType.substring(0, idx + 1)); @@ -2886,6 +2886,14 @@ protected ImmutableMap.Builder addMustacheLambdas() { } + private int getLastIndex(String dataType) { + int index = dataType.indexOf('<'); + if (index >= 0) { + dataType = dataType.substring(0, index); + } + return dataType.lastIndexOf('.'); + } + /** * for Jspecify, remove @Nullable before the datatype and set keptNullable to true if done. */ diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/nullableArgumentWithEnum.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/nullableArgumentWithEnum.mustache new file mode 100644 index 000000000000..79f9c74ff5a5 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/JavaSpring/nullableArgumentWithEnum.mustache @@ -0,0 +1 @@ +{{#useJspecify}}{{#lambda.jSpecifyNullable}}{{^required}}@Nullable {{/required}}{{/lambda.jSpecifyNullable}}{{#lambda.jSpecifyDatatype}}{{{datatypeWithEnum}}}{{/lambda.jSpecifyDatatype}}{{/useJspecify}}{{^useJspecify}}{{>nullableAnnotation}}{{{datatypeWithEnum}}}{{/useJspecify}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache index 6dd2e6da00d2..69b1d5694e89 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache @@ -134,7 +134,7 @@ public {{>sealed}}class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}} /** * Constructor with all args parameters */ - public {{classname}}({{#vendorExtensions.x-java-all-args-constructor-vars}}{{>nullableAnnotation}}{{{datatypeWithEnum}}} {{name}}{{^-last}}, {{/-last}}{{/vendorExtensions.x-java-all-args-constructor-vars}}) { + public {{classname}}({{#vendorExtensions.x-java-all-args-constructor-vars}}{{>nullableArgumentWithEnum}} {{name}}{{^-last}}, {{/-last}}{{/vendorExtensions.x-java-all-args-constructor-vars}}) { {{#parent}} super({{#parentVars}}{{name}}{{^-last}}, {{/-last}}{{/parentVars}}); {{/parent}} @@ -153,7 +153,7 @@ public {{>sealed}}class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}} {{^lombok.Data}} {{! begin feature: fluent setter methods }} - public {{classname}} {{name}}({{>nullableAnnotation}}{{{datatypeWithEnum}}} {{name}}) { + public {{classname}} {{name}}({{>nullableArgumentWithEnum}} {{name}}) { {{#openApiNullable}} this.{{name}} = {{#isNullable}}JsonNullable.of({{/isNullable}}{{#useOptional}}{{^required}}{{^isNullable}}{{^isContainer}}Optional.of{{#optionalAcceptNullable}}Nullable{{/optionalAcceptNullable}}({{/isContainer}}{{/isNullable}}{{/required}}{{/useOptional}}{{name}}{{#isNullable}}){{/isNullable}}{{#useOptional}}{{^required}}{{^isNullable}}{{^isContainer}}){{/isContainer}}{{/isNullable}}{{/required}}{{/useOptional}}; {{/openApiNullable}} diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java index b22e1e347317..3cf8e016aca9 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java @@ -34,6 +34,7 @@ import io.swagger.v3.parser.util.SchemaTypeUtil; import lombok.Getter; import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Assertions; import org.openapitools.codegen.*; import org.openapitools.codegen.config.CodegenConfigurator; @@ -74,6 +75,7 @@ import static org.openapitools.codegen.languages.JavaClientCodegen.*; import static org.testng.Assert.*; +@Slf4j public class JavaClientCodegenTest { private static final String JAVA_GENERATOR = "java"; @@ -4654,7 +4656,9 @@ public void testJspecify(String library, boolean useSpringBoot4, boolean hasJspe final Map files = generateFromContract("src/test/resources/3_0/java/jspecify.yaml", library, Map.of(USE_JSPECIFY, true, "containerDefaultToNull", true, - USE_SPRING_BOOT4, useSpringBoot4 + USE_SPRING_BOOT4, useSpringBoot4, + JavaClientCodegen.OPENAPI_NULLABLE, false, + GENERATE_CONSTRUCTOR_WITH_ALL_ARGS, true ), codegenConfigurator -> codegenConfigurator @@ -4683,12 +4687,18 @@ public void testJspecify(String library, boolean useSpringBoot4, boolean hasJspe "import org.jspecify.annotations.Nullable;", "private java.time.@Nullable Instant dt;", "setDt(java.time.@Nullable Instant dt)", - "dt(java.time.@Nullable Instant dt)", + "Foo dt(java.time.@Nullable Instant dt)", "setBinary(@Nullable File binary)", "public @Nullable File getBinary()", - "List getListOfDt()", - "setListOfDt(List listOfDt)" - ); + "@Nullable List getListOfDt()", + "private java.time.@Nullable Instant nullableDt;", + "private @Nullable List listOfDt;", + "setListOfDt(@Nullable List listOfDt)"); + if (!NATIVE.equals(library)) { // native library does not generate all arg constructors + JavaFileAssert.assertThat(files.get("Foo.java")) + .fileContains( + "public Foo(@JsonProperty(JSON_PROPERTY_DT) java.time.@Nullable Instant dt, @JsonProperty(JSON_PROPERTY_NULLABLE_DT) java.time.@Nullable Instant nullableDt, @JsonProperty(JSON_PROPERTY_BINARY) @Nullable File binary, @JsonProperty(JSON_PROPERTY_NULLABLE_BINARY) @Nullable File nullableBinary, @JsonProperty(JSON_PROPERTY_LIST_OF_DT) @Nullable List listOfDt, @JsonProperty(JSON_PROPERTY_LIST_MIN_INTEMS) @Nullable List listMinIntems, @JsonProperty(JSON_PROPERTY_NULLABLE_LIST_MIN_INTEMS) @Nullable List nullableListMinIntems, @JsonProperty(JSON_PROPERTY_REQUIRED_DT) java.time.Instant requiredDt, @JsonProperty(JSON_PROPERTY_NUMBER) java.math.@Nullable BigDecimal number, @JsonProperty(JSON_PROPERTY_NULLABLE_NUMBER) java.math.@Nullable BigDecimal nullableNumber, @JsonProperty(JSON_PROPERTY_COLOR) @Nullable String color, @JsonProperty(JSON_PROPERTY_REQUIRED_COLOR) String requiredColor, @JsonProperty(JSON_PROPERTY_NULLABLE_COLOR) @Nullable String nullableColor) {"); + } if (!RESTTEMPLATE.equals(library)) { JavaFileAssert.assertThat(files.get("DefaultApi.java")) .fileContains( @@ -4702,7 +4712,70 @@ public void testJspecify(String library, boolean useSpringBoot4, boolean hasJspe .fileContains("@org.jspecify.annotations.NullMarked"); JavaFileAssert.assertThat(files.get("client/package-info.java")) .fileContains("@org.jspecify.annotations.NullMarked"); + } + @Test(dataProvider = "jspecifyLibraries") + public void testJspecify_openapiNullable(String library, boolean useSpringBoot4, boolean hasJspecifyDependency) throws IOException { + final Map files = generateFromContract("src/test/resources/3_0/java/jspecify.yaml", library, + Map.of(USE_JSPECIFY, true, + "containerDefaultToNull", true, + USE_SPRING_BOOT4, useSpringBoot4, + JavaClientCodegen.OPENAPI_NULLABLE, true, + GENERATE_CONSTRUCTOR_WITH_ALL_ARGS, true + ), + codegenConfigurator -> + codegenConfigurator + .setValidateSpec(false) + .addTypeMapping("OffsetDateTime", "java.time.Instant") + .addTypeMapping("BigDecimal", "java.math.BigDecimal")); + + if (hasJspecifyDependency) { + assertThat(files.get("build.gradle")).content() + .contains("implementation \"org.jspecify:jspecify:1.0.0\"") + .doesNotContain("findbugs"); + assertThat(files.get("pom.xml")).content() + .contains( + "org.jspecify", + "jspecify", + "1.0.0") + .doesNotContain("findbugs"); + } else { + assertThat(files.get("build.gradle")).content() + .doesNotContain("org.jspecify"); + assertThat(files.get("pom.xml")).content() + .doesNotContain("org.jspecify"); + } + JavaFileAssert.assertThat(files.get("Foo.java")) + .fileContains( + "import org.jspecify.annotations.Nullable;", + "private java.time.@Nullable Instant dt;", + "setDt(java.time.@Nullable Instant dt)", + "Foo dt(java.time.@Nullable Instant dt)", + "setBinary(@Nullable File binary)", + "public @Nullable File getBinary()", + "@Nullable List getListOfDt()", + "setListOfDt(@Nullable List listOfDt)", + "JsonNullable nullableDt = JsonNullable.undefined()", + "private JsonNullable nullableBinary = JsonNullable.undefined();"); + if (!NATIVE.equals(library)) { // native library does not generate all arg constructors + JavaFileAssert.assertThat(files.get("Foo.java")) + .fileContains( + "public Foo(@JsonProperty(JSON_PROPERTY_DT) java.time.@Nullable Instant dt, @JsonProperty(JSON_PROPERTY_NULLABLE_DT) java.time.@Nullable Instant nullableDt, @JsonProperty(JSON_PROPERTY_BINARY) @Nullable File binary, @JsonProperty(JSON_PROPERTY_NULLABLE_BINARY) @Nullable File nullableBinary, @JsonProperty(JSON_PROPERTY_LIST_OF_DT) @Nullable List listOfDt, @JsonProperty(JSON_PROPERTY_LIST_MIN_INTEMS) @Nullable List listMinIntems, @JsonProperty(JSON_PROPERTY_NULLABLE_LIST_MIN_INTEMS) @Nullable List nullableListMinIntems, @JsonProperty(JSON_PROPERTY_REQUIRED_DT) java.time.Instant requiredDt, @JsonProperty(JSON_PROPERTY_NUMBER) java.math.@Nullable BigDecimal number, @JsonProperty(JSON_PROPERTY_NULLABLE_NUMBER) java.math.@Nullable BigDecimal nullableNumber, @JsonProperty(JSON_PROPERTY_COLOR) @Nullable String color, @JsonProperty(JSON_PROPERTY_REQUIRED_COLOR) String requiredColor, @JsonProperty(JSON_PROPERTY_NULLABLE_COLOR) @Nullable String nullableColor) {" + ); + } + if (!RESTTEMPLATE.equals(library)) { + JavaFileAssert.assertThat(files.get("DefaultApi.java")) + .fileContains( + "import org.jspecify.annotations.Nullable;", + "(java.time.@Nullable Instant dtParam, java.time.@Nullable Instant dtQuery, java.time.@Nullable Instant dtCookie)" + ); + } + JavaFileAssert.assertThat(files.get("api/package-info.java")) + .fileContains("@org.jspecify.annotations.NullMarked"); + JavaFileAssert.assertThat(files.get("model/package-info.java")) + .fileContains("@org.jspecify.annotations.NullMarked"); + JavaFileAssert.assertThat(files.get("client/package-info.java")) + .fileContains("@org.jspecify.annotations.NullMarked"); } @DataProvider(name = "replaceOneOf") diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/assertions/JavaFileAssert.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/assertions/JavaFileAssert.java index 05bce1b9e534..bd9c5b17922d 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/assertions/JavaFileAssert.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/assertions/JavaFileAssert.java @@ -235,7 +235,9 @@ public JavaFileAssert fileContains(final String... lines) { Assertions.assertThat(actualBody) .withFailMessage( "File should contain lines\n====\n%s\n====\nbut actually was\n====\n%s\n====", - Arrays.stream(lines).collect(Collectors.joining(System.lineSeparator())), actualBody + Arrays.stream(lines) + .filter(line -> !actualBody.contains(line)) + .collect(Collectors.joining(System.lineSeparator())), actualBody ) .contains(lines); @@ -249,7 +251,9 @@ public JavaFileAssert fileDoesNotContain(final String... lines) { Assertions.assertThat(actualBody) .withFailMessage( "File should not contain lines\n====\n%s\n====\nbut actually was\n====\n%s\n====", - Arrays.stream(lines).collect(Collectors.joining(System.lineSeparator())), actualBody + Arrays.stream(lines) + .filter(line -> actualBody.contains(line)) + .collect(Collectors.joining(System.lineSeparator())), actualBody ) .doesNotContain(lines); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java index 2193ee5c9f9f..4ba6fea43f73 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java @@ -7045,6 +7045,7 @@ public void testJspecify(String library, int springBootVersion, String fooApiFil CONTAINER_DEFAULT_TO_NULL, true, SpringCodegen.OPENAPI_NULLABLE, false, USE_BEANVALIDATION, true, + GENERATE_CONSTRUCTOR_WITH_ALL_ARGS, true, INTERFACE_ONLY, false, springVersionProperty, springBootVersion > 2 ), @@ -7069,7 +7070,9 @@ public void testJspecify(String library, int springBootVersion, String fooApiFil .fileContains( "private java.time.@Nullable Instant dt;", "private org.springframework.core.io.@Nullable Resource binary", - "setBinary(org.springframework.core.io.@Nullable Resource binary)" + "setBinary(org.springframework.core.io.@Nullable Resource binary)", + "public Foo(java.time.@Nullable Instant dt, java.time.@Nullable Instant nullableDt, org.springframework.core.io.@Nullable Resource binary, org.springframework.core.io.@Nullable Resource nullableBinary, @Nullable List listOfDt, @Nullable List listMinIntems, @Nullable List nullableListMinIntems, java.time.Instant requiredDt, @Nullable BigDecimal number, @Nullable BigDecimal nullableNumber, @Nullable String color, String requiredColor, @Nullable String nullableColor) {", + "Foo listOfDt(@Nullable List listOfDt) {" ); JavaFileAssert.assertThat(files.get(fooApiFilename)) .assertTypeAnnotations().doesImportAnnotation("org.jspecify.annotations.Nullable").toType() @@ -7092,6 +7095,123 @@ public void testJspecify(String library, int springBootVersion, String fooApiFil } } + @Test(dataProvider = "jspecifyLibraries") + public void testJspecify_openapiNullable(String library, int springBootVersion, String fooApiFilename) throws IOException { + String springVersionProperty = springBootVersion == 4? USE_SPRING_BOOT4: USE_SPRING_BOOT3; + final Map files = generateFromContract("src/test/resources/3_0/java/jspecify.yaml", library, + Map.of(USE_JSPECIFY, true, + CONTAINER_DEFAULT_TO_NULL, true, + USE_BEANVALIDATION, true, + GENERATE_CONSTRUCTOR_WITH_ALL_ARGS, true, + CodegenConstants.OPENAPI_NULLABLE, true, + INTERFACE_ONLY, false, + springVersionProperty, springBootVersion > 2 + ), + codegenConfigurator -> + codegenConfigurator + .addTypeMapping("OffsetDateTime", "java.time.Instant")); + + if (springBootVersion == 4) { + assertThat(files.get("pom.xml")).content() + .doesNotContain("jspecify") + .doesNotContain("findbugs"); + } else { + assertThat(files.get("pom.xml")).content() + .contains( + "org.jspecify", + "jspecify", + "1.0.0") + .doesNotContain("findbugs"); + } + JavaFileAssert.assertThat(files.get("Foo.java")) + .assertTypeAnnotations().doesImportAnnotation("org.jspecify.annotations.Nullable").toType() + .fileContains( + "private java.time.@Nullable Instant dt;", + "private org.springframework.core.io.@Nullable Resource binary", + "setBinary(org.springframework.core.io.@Nullable Resource binary)", + "Foo nullableDt(java.time.@Nullable Instant nullableDt) {", + "public Foo(java.time.@Nullable Instant dt, java.time.@Nullable Instant nullableDt, org.springframework.core.io.@Nullable Resource binary, org.springframework.core.io.@Nullable Resource nullableBinary, @Nullable List listOfDt, @Nullable List listMinIntems, @Nullable List nullableListMinIntems, java.time.Instant requiredDt, @Nullable BigDecimal number, @Nullable BigDecimal nullableNumber, @Nullable String color, String requiredColor, @Nullable String nullableColor) {" + ); + JavaFileAssert.assertThat(files.get(fooApiFilename)) + .assertTypeAnnotations().doesImportAnnotation("org.jspecify.annotations.Nullable").toType() + .fileContains( + "java.time.@Nullable Instant dtParam", + "java.time.@Nullable Instant dtQuery", + "java.time.@Nullable Instant dtCookie" + ); + JavaFileAssert.assertThat(files.get("api/package-info.java")) + .fileContains("@org.jspecify.annotations.NullMarked"); + JavaFileAssert.assertThat(files.get("model/package-info.java")) + .fileContains("@org.jspecify.annotations.NullMarked"); + + if (SPRING_BOOT.equals(library)) { + // Nullable annotation is not (yet) put on NativeWebRequest, but still present as import when useJspecify=true + JavaFileAssert.assertThat(files.get("UploadApiController.java").toPath()) + .assertTypeAnnotations() + .doesNotContainWithName("Nullable") + .doesImportAnnotation("org.jspecify.annotations.Nullable"); + } + } + + @Test(dataProvider = "jspecifyLibraries") + public void testJspecify_useOptional(String library, int springBootVersion, String fooApiFilename) throws IOException { + String springVersionProperty = springBootVersion == 4? USE_SPRING_BOOT4: USE_SPRING_BOOT3; + final Map files = generateFromContract("src/test/resources/3_0/java/jspecify.yaml", library, + Map.of(USE_JSPECIFY, true, + CONTAINER_DEFAULT_TO_NULL, true, + USE_BEANVALIDATION, true, + GENERATE_CONSTRUCTOR_WITH_ALL_ARGS, true, +// CodegenConstants.OPENAPI_NULLABLE, true, + SpringCodegen.USE_OPTIONAL, true, + INTERFACE_ONLY, false, + springVersionProperty, springBootVersion > 2 + ), + codegenConfigurator -> + codegenConfigurator + .addTypeMapping("OffsetDateTime", "java.time.Instant")); + + if (springBootVersion == 4) { + assertThat(files.get("pom.xml")).content() + .doesNotContain("jspecify") + .doesNotContain("findbugs"); + } else { + assertThat(files.get("pom.xml")).content() + .contains( + "org.jspecify", + "jspecify", + "1.0.0") + .doesNotContain("findbugs"); + } + JavaFileAssert.assertThat(files.get("Foo.java")) + .assertTypeAnnotations().doesImportAnnotation("org.jspecify.annotations.Nullable").toType() + .fileContains( + "private Optional dt = Optional.empty()", + "private JsonNullable nullableBinary = JsonNullable.undefined();", + "setBinary(Optional binary)", + "Foo nullableDt(java.time.@Nullable Instant nullableDt) {", + "public Foo(java.time.@Nullable Instant dt, java.time.@Nullable Instant nullableDt, org.springframework.core.io.@Nullable Resource binary, org.springframework.core.io.@Nullable Resource nullableBinary, @Nullable List listOfDt, @Nullable List listMinIntems, @Nullable List nullableListMinIntems, java.time.Instant requiredDt, @Nullable BigDecimal number, @Nullable BigDecimal nullableNumber, @Nullable String color, String requiredColor, @Nullable String nullableColor) {" + ); + JavaFileAssert.assertThat(files.get(fooApiFilename)) + .assertTypeAnnotations().doesImportAnnotation("org.jspecify.annotations.Nullable").toType() + .fileContains( + "Optional dtParam", + "Optional dtQuery", + "Optional dtCookie" + ); + JavaFileAssert.assertThat(files.get("api/package-info.java")) + .fileContains("@org.jspecify.annotations.NullMarked"); + JavaFileAssert.assertThat(files.get("model/package-info.java")) + .fileContains("@org.jspecify.annotations.NullMarked"); + + if (SPRING_BOOT.equals(library)) { + // Nullable annotation is not (yet) put on NativeWebRequest, but still present as import when useJspecify=true + JavaFileAssert.assertThat(files.get("UploadApiController.java").toPath()) + .assertTypeAnnotations() + .doesNotContainWithName("Nullable") + .doesImportAnnotation("org.jspecify.annotations.Nullable"); + } + } + // ------------------------------------------------------------------------- // autoXSpringPaginated tests // ------------------------------------------------------------------------- diff --git a/modules/openapi-generator/src/test/resources/3_0/java/jspecify.yaml b/modules/openapi-generator/src/test/resources/3_0/java/jspecify.yaml index bd890dfd5b85..0727afff939d 100644 --- a/modules/openapi-generator/src/test/resources/3_0/java/jspecify.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/java/jspecify.yaml @@ -64,13 +64,22 @@ components: Foo: required: - requiredDt + - requiredColor properties: dt: type: string format: date-time + nullableDt: + nullable: true + type: string + format: date-time binary: type: string format: binary + nullableBinary: + type: string + format: binary + nullable: true listOfDt: type: array items: @@ -82,8 +91,29 @@ components: items: type: string format: date-time + nullableListMinIntems: + type: array + minItems: 1 + nullable: true + items: + type: string + format: date-time requiredDt: type: string format: date-time number: type: number + nullableNumber: + type: number + nullable: true + color: + default: red + type: string + requiredColor: + default: red + type: string + nullableColor: + default: red + type: string + nullable: true + diff --git a/samples/client/petstore/java/native-jackson3-jspecify/api/openapi.yaml b/samples/client/petstore/java/native-jackson3-jspecify/api/openapi.yaml index 14c4c1ed2afc..34b32c5cccdf 100644 --- a/samples/client/petstore/java/native-jackson3-jspecify/api/openapi.yaml +++ b/samples/client/petstore/java/native-jackson3-jspecify/api/openapi.yaml @@ -76,22 +76,39 @@ components: Foo: example: dt: 2000-01-23T04:56:07.000+00:00 + nullableDt: 2000-01-23T04:56:07.000+00:00 binary: "" + nullableBinary: "" listOfDt: - 2000-01-23T04:56:07.000+00:00 - 2000-01-23T04:56:07.000+00:00 listMinIntems: - 2000-01-23T04:56:07.000+00:00 - 2000-01-23T04:56:07.000+00:00 + nullableListMinIntems: + - 2000-01-23T04:56:07.000+00:00 + - 2000-01-23T04:56:07.000+00:00 requiredDt: 2000-01-23T04:56:07.000+00:00 number: 0.8008281904610115 + nullableNumber: 6.027456183070403 + color: red + requiredColor: red + nullableColor: red properties: dt: format: date-time type: string + nullableDt: + format: date-time + nullable: true + type: string binary: format: binary type: string + nullableBinary: + format: binary + nullable: true + type: string listOfDt: items: format: date-time @@ -103,12 +120,33 @@ components: type: string minItems: 1 type: array + nullableListMinIntems: + items: + format: date-time + type: string + minItems: 1 + nullable: true + type: array requiredDt: format: date-time type: string number: type: number + nullableNumber: + nullable: true + type: number + color: + default: red + type: string + requiredColor: + default: red + type: string + nullableColor: + default: red + nullable: true + type: string required: + - requiredColor - requiredDt _upload_post_request: properties: diff --git a/samples/client/petstore/java/native-jackson3-jspecify/docs/Foo.md b/samples/client/petstore/java/native-jackson3-jspecify/docs/Foo.md index d03d21cd097d..9237adf1033e 100644 --- a/samples/client/petstore/java/native-jackson3-jspecify/docs/Foo.md +++ b/samples/client/petstore/java/native-jackson3-jspecify/docs/Foo.md @@ -8,11 +8,18 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| |**dt** | **java.time.Instant** | | [optional] | +|**nullableDt** | **java.time.Instant** | | [optional] | |**binary** | **File** | | [optional] | +|**nullableBinary** | **File** | | [optional] | |**listOfDt** | **List<java.time.Instant>** | | [optional] | |**listMinIntems** | **List<java.time.Instant>** | | [optional] | +|**nullableListMinIntems** | **List<java.time.Instant>** | | [optional] | |**requiredDt** | **java.time.Instant** | | | |**number** | **java.math.BigDecimal** | | [optional] | +|**nullableNumber** | **java.math.BigDecimal** | | [optional] | +|**color** | **String** | | [optional] | +|**requiredColor** | **String** | | | +|**nullableColor** | **String** | | [optional] | diff --git a/samples/client/petstore/java/native-jackson3-jspecify/src/main/java/org/openapitools/client/model/Foo.java b/samples/client/petstore/java/native-jackson3-jspecify/src/main/java/org/openapitools/client/model/Foo.java index 8b89d1dd0f3f..5e512e3675f9 100644 --- a/samples/client/petstore/java/native-jackson3-jspecify/src/main/java/org/openapitools/client/model/Foo.java +++ b/samples/client/petstore/java/native-jackson3-jspecify/src/main/java/org/openapitools/client/model/Foo.java @@ -41,11 +41,18 @@ */ @JsonPropertyOrder({ Foo.JSON_PROPERTY_DT, + Foo.JSON_PROPERTY_NULLABLE_DT, Foo.JSON_PROPERTY_BINARY, + Foo.JSON_PROPERTY_NULLABLE_BINARY, Foo.JSON_PROPERTY_LIST_OF_DT, Foo.JSON_PROPERTY_LIST_MIN_INTEMS, + Foo.JSON_PROPERTY_NULLABLE_LIST_MIN_INTEMS, Foo.JSON_PROPERTY_REQUIRED_DT, - Foo.JSON_PROPERTY_NUMBER + Foo.JSON_PROPERTY_NUMBER, + Foo.JSON_PROPERTY_NULLABLE_NUMBER, + Foo.JSON_PROPERTY_COLOR, + Foo.JSON_PROPERTY_REQUIRED_COLOR, + Foo.JSON_PROPERTY_NULLABLE_COLOR }) @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Foo { @@ -53,17 +60,29 @@ public class Foo { private java.time.@Nullable Instant dt; + public static final String JSON_PROPERTY_NULLABLE_DT = "nullableDt"; + + private java.time.@Nullable Instant nullableDt; + public static final String JSON_PROPERTY_BINARY = "binary"; private @Nullable File binary; + public static final String JSON_PROPERTY_NULLABLE_BINARY = "nullableBinary"; + + private @Nullable File nullableBinary; + public static final String JSON_PROPERTY_LIST_OF_DT = "listOfDt"; - private List listOfDt = new ArrayList<>(); + private @Nullable List listOfDt = new ArrayList<>(); public static final String JSON_PROPERTY_LIST_MIN_INTEMS = "listMinIntems"; - private List listMinIntems = new ArrayList<>(); + private @Nullable List listMinIntems = new ArrayList<>(); + + public static final String JSON_PROPERTY_NULLABLE_LIST_MIN_INTEMS = "nullableListMinIntems"; + + private @Nullable List nullableListMinIntems; public static final String JSON_PROPERTY_REQUIRED_DT = "requiredDt"; @@ -73,6 +92,22 @@ public class Foo { private java.math.@Nullable BigDecimal number; + public static final String JSON_PROPERTY_NULLABLE_NUMBER = "nullableNumber"; + + private java.math.@Nullable BigDecimal nullableNumber; + + public static final String JSON_PROPERTY_COLOR = "color"; + + private @Nullable String color = "red"; + + public static final String JSON_PROPERTY_REQUIRED_COLOR = "requiredColor"; + + private String requiredColor = "red"; + + public static final String JSON_PROPERTY_NULLABLE_COLOR = "nullableColor"; + + private @Nullable String nullableColor = "red"; + public Foo() { } @@ -100,6 +135,30 @@ public void setDt(java.time.@Nullable Instant dt) { } + public Foo nullableDt(java.time.@Nullable Instant nullableDt) { + this.nullableDt = nullableDt; + return this; + } + + /** + * Get nullableDt + * @return nullableDt + */ + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_DT, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public java.time.@Nullable Instant getNullableDt() { + return nullableDt; + } + + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_DT, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNullableDt(java.time.@Nullable Instant nullableDt) { + this.nullableDt = nullableDt; + } + + public Foo binary(@Nullable File binary) { this.binary = binary; return this; @@ -124,7 +183,31 @@ public void setBinary(@Nullable File binary) { } - public Foo listOfDt(List listOfDt) { + public Foo nullableBinary(@Nullable File nullableBinary) { + this.nullableBinary = nullableBinary; + return this; + } + + /** + * Get nullableBinary + * @return nullableBinary + */ + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_BINARY, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public @Nullable File getNullableBinary() { + return nullableBinary; + } + + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_BINARY, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNullableBinary(@Nullable File nullableBinary) { + this.nullableBinary = nullableBinary; + } + + + public Foo listOfDt(@Nullable List listOfDt) { this.listOfDt = listOfDt; return this; } @@ -144,19 +227,19 @@ public Foo addListOfDtItem(java.time.Instant listOfDtItem) { @JsonProperty(value = JSON_PROPERTY_LIST_OF_DT, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public List getListOfDt() { + public @Nullable List getListOfDt() { return listOfDt; } @JsonProperty(value = JSON_PROPERTY_LIST_OF_DT, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setListOfDt(List listOfDt) { + public void setListOfDt(@Nullable List listOfDt) { this.listOfDt = listOfDt; } - public Foo listMinIntems(List listMinIntems) { + public Foo listMinIntems(@Nullable List listMinIntems) { this.listMinIntems = listMinIntems; return this; } @@ -176,18 +259,50 @@ public Foo addListMinIntemsItem(java.time.Instant listMinIntemsItem) { @JsonProperty(value = JSON_PROPERTY_LIST_MIN_INTEMS, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public List getListMinIntems() { + public @Nullable List getListMinIntems() { return listMinIntems; } @JsonProperty(value = JSON_PROPERTY_LIST_MIN_INTEMS, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setListMinIntems(List listMinIntems) { + public void setListMinIntems(@Nullable List listMinIntems) { this.listMinIntems = listMinIntems; } + public Foo nullableListMinIntems(@Nullable List nullableListMinIntems) { + this.nullableListMinIntems = nullableListMinIntems; + return this; + } + + public Foo addNullableListMinIntemsItem(java.time.Instant nullableListMinIntemsItem) { + if (this.nullableListMinIntems == null) { + this.nullableListMinIntems = new ArrayList<>(); + } + this.nullableListMinIntems.add(nullableListMinIntemsItem); + return this; + } + + /** + * Get nullableListMinIntems + * @return nullableListMinIntems + */ + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_LIST_MIN_INTEMS, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public @Nullable List getNullableListMinIntems() { + return nullableListMinIntems; + } + + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_LIST_MIN_INTEMS, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNullableListMinIntems(@Nullable List nullableListMinIntems) { + this.nullableListMinIntems = nullableListMinIntems; + } + + public Foo requiredDt(java.time.Instant requiredDt) { this.requiredDt = requiredDt; return this; @@ -236,6 +351,102 @@ public void setNumber(java.math.@Nullable BigDecimal number) { } + public Foo nullableNumber(java.math.@Nullable BigDecimal nullableNumber) { + this.nullableNumber = nullableNumber; + return this; + } + + /** + * Get nullableNumber + * @return nullableNumber + */ + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_NUMBER, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public java.math.@Nullable BigDecimal getNullableNumber() { + return nullableNumber; + } + + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_NUMBER, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNullableNumber(java.math.@Nullable BigDecimal nullableNumber) { + this.nullableNumber = nullableNumber; + } + + + public Foo color(@Nullable String color) { + this.color = color; + return this; + } + + /** + * Get color + * @return color + */ + + @JsonProperty(value = JSON_PROPERTY_COLOR, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public @Nullable String getColor() { + return color; + } + + + @JsonProperty(value = JSON_PROPERTY_COLOR, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setColor(@Nullable String color) { + this.color = color; + } + + + public Foo requiredColor(String requiredColor) { + this.requiredColor = requiredColor; + return this; + } + + /** + * Get requiredColor + * @return requiredColor + */ + + @JsonProperty(value = JSON_PROPERTY_REQUIRED_COLOR, required = true) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public String getRequiredColor() { + return requiredColor; + } + + + @JsonProperty(value = JSON_PROPERTY_REQUIRED_COLOR, required = true) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setRequiredColor(String requiredColor) { + this.requiredColor = requiredColor; + } + + + public Foo nullableColor(@Nullable String nullableColor) { + this.nullableColor = nullableColor; + return this; + } + + /** + * Get nullableColor + * @return nullableColor + */ + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_COLOR, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public @Nullable String getNullableColor() { + return nullableColor; + } + + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_COLOR, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNullableColor(@Nullable String nullableColor) { + this.nullableColor = nullableColor; + } + + /** * Return true if this Foo object is equal to o. */ @@ -254,11 +465,18 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class Foo {\n"); sb.append(" dt: ").append(toIndentedString(dt)).append("\n"); + sb.append(" nullableDt: ").append(toIndentedString(nullableDt)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); + sb.append(" nullableBinary: ").append(toIndentedString(nullableBinary)).append("\n"); sb.append(" listOfDt: ").append(toIndentedString(listOfDt)).append("\n"); sb.append(" listMinIntems: ").append(toIndentedString(listMinIntems)).append("\n"); + sb.append(" nullableListMinIntems: ").append(toIndentedString(nullableListMinIntems)).append("\n"); sb.append(" requiredDt: ").append(toIndentedString(requiredDt)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); + sb.append(" nullableNumber: ").append(toIndentedString(nullableNumber)).append("\n"); + sb.append(" color: ").append(toIndentedString(color)).append("\n"); + sb.append(" requiredColor: ").append(toIndentedString(requiredColor)).append("\n"); + sb.append(" nullableColor: ").append(toIndentedString(nullableColor)).append("\n"); sb.append("}"); return sb.toString(); } @@ -308,11 +526,21 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%sdt%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getDt())))); } + // add `nullableDt` to the URL query string + if (getNullableDt() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%snullableDt%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getNullableDt())))); + } + // add `binary` to the URL query string if (getBinary() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%sbinary%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getBinary())))); } + // add `nullableBinary` to the URL query string + if (getNullableBinary() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%snullableBinary%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getNullableBinary())))); + } + // add `listOfDt` to the URL query string if (getListOfDt() != null) { for (int i = 0; i < getListOfDt().size(); i++) { @@ -335,6 +563,17 @@ public String toUrlQueryString(String prefix) { } } + // add `nullableListMinIntems` to the URL query string + if (getNullableListMinIntems() != null) { + for (int i = 0; i < getNullableListMinIntems().size(); i++) { + if (getNullableListMinIntems().get(i) != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%snullableListMinIntems%s%s=%s", prefix, suffix, + "".equals(suffix) ? "" : String.format(java.util.Locale.ROOT, "%s%d%s", containerPrefix, i, containerSuffix), + ApiClient.urlEncode(ApiClient.valueToString(getNullableListMinIntems().get(i))))); + } + } + } + // add `requiredDt` to the URL query string if (getRequiredDt() != null) { joiner.add(String.format(java.util.Locale.ROOT, "%srequiredDt%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getRequiredDt())))); @@ -345,6 +584,26 @@ public String toUrlQueryString(String prefix) { joiner.add(String.format(java.util.Locale.ROOT, "%snumber%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getNumber())))); } + // add `nullableNumber` to the URL query string + if (getNullableNumber() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%snullableNumber%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getNullableNumber())))); + } + + // add `color` to the URL query string + if (getColor() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%scolor%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getColor())))); + } + + // add `requiredColor` to the URL query string + if (getRequiredColor() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%srequiredColor%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getRequiredColor())))); + } + + // add `nullableColor` to the URL query string + if (getNullableColor() != null) { + joiner.add(String.format(java.util.Locale.ROOT, "%snullableColor%s=%s", prefix, suffix, ApiClient.urlEncode(ApiClient.valueToString(getNullableColor())))); + } + return joiner.toString(); } @@ -364,10 +623,18 @@ public Foo.Builder dt(java.time.Instant dt) { this.instance.dt = dt; return this; } + public Foo.Builder nullableDt(java.time.Instant nullableDt) { + this.instance.nullableDt = nullableDt; + return this; + } public Foo.Builder binary(File binary) { this.instance.binary = binary; return this; } + public Foo.Builder nullableBinary(File nullableBinary) { + this.instance.nullableBinary = nullableBinary; + return this; + } public Foo.Builder listOfDt(List listOfDt) { this.instance.listOfDt = listOfDt; return this; @@ -376,6 +643,10 @@ public Foo.Builder listMinIntems(List listMinIntems) { this.instance.listMinIntems = listMinIntems; return this; } + public Foo.Builder nullableListMinIntems(List nullableListMinIntems) { + this.instance.nullableListMinIntems = nullableListMinIntems; + return this; + } public Foo.Builder requiredDt(java.time.Instant requiredDt) { this.instance.requiredDt = requiredDt; return this; @@ -384,6 +655,22 @@ public Foo.Builder number(java.math.BigDecimal number) { this.instance.number = number; return this; } + public Foo.Builder nullableNumber(java.math.BigDecimal nullableNumber) { + this.instance.nullableNumber = nullableNumber; + return this; + } + public Foo.Builder color(String color) { + this.instance.color = color; + return this; + } + public Foo.Builder requiredColor(String requiredColor) { + this.instance.requiredColor = requiredColor; + return this; + } + public Foo.Builder nullableColor(String nullableColor) { + this.instance.nullableColor = nullableColor; + return this; + } /** @@ -419,11 +706,18 @@ public static Foo.Builder builder() { public Foo.Builder toBuilder() { return new Foo.Builder() .dt(getDt()) + .nullableDt(getNullableDt()) .binary(getBinary()) + .nullableBinary(getNullableBinary()) .listOfDt(getListOfDt()) .listMinIntems(getListMinIntems()) + .nullableListMinIntems(getNullableListMinIntems()) .requiredDt(getRequiredDt()) - .number(getNumber()); + .number(getNumber()) + .nullableNumber(getNullableNumber()) + .color(getColor()) + .requiredColor(getRequiredColor()) + .nullableColor(getNullableColor()); } } diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/api/openapi.yaml b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/api/openapi.yaml index 14c4c1ed2afc..34b32c5cccdf 100644 --- a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/api/openapi.yaml +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/api/openapi.yaml @@ -76,22 +76,39 @@ components: Foo: example: dt: 2000-01-23T04:56:07.000+00:00 + nullableDt: 2000-01-23T04:56:07.000+00:00 binary: "" + nullableBinary: "" listOfDt: - 2000-01-23T04:56:07.000+00:00 - 2000-01-23T04:56:07.000+00:00 listMinIntems: - 2000-01-23T04:56:07.000+00:00 - 2000-01-23T04:56:07.000+00:00 + nullableListMinIntems: + - 2000-01-23T04:56:07.000+00:00 + - 2000-01-23T04:56:07.000+00:00 requiredDt: 2000-01-23T04:56:07.000+00:00 number: 0.8008281904610115 + nullableNumber: 6.027456183070403 + color: red + requiredColor: red + nullableColor: red properties: dt: format: date-time type: string + nullableDt: + format: date-time + nullable: true + type: string binary: format: binary type: string + nullableBinary: + format: binary + nullable: true + type: string listOfDt: items: format: date-time @@ -103,12 +120,33 @@ components: type: string minItems: 1 type: array + nullableListMinIntems: + items: + format: date-time + type: string + minItems: 1 + nullable: true + type: array requiredDt: format: date-time type: string number: type: number + nullableNumber: + nullable: true + type: number + color: + default: red + type: string + requiredColor: + default: red + type: string + nullableColor: + default: red + nullable: true + type: string required: + - requiredColor - requiredDt _upload_post_request: properties: diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/docs/Foo.md b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/docs/Foo.md index d03d21cd097d..9237adf1033e 100644 --- a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/docs/Foo.md +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/docs/Foo.md @@ -8,11 +8,18 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| |**dt** | **java.time.Instant** | | [optional] | +|**nullableDt** | **java.time.Instant** | | [optional] | |**binary** | **File** | | [optional] | +|**nullableBinary** | **File** | | [optional] | |**listOfDt** | **List<java.time.Instant>** | | [optional] | |**listMinIntems** | **List<java.time.Instant>** | | [optional] | +|**nullableListMinIntems** | **List<java.time.Instant>** | | [optional] | |**requiredDt** | **java.time.Instant** | | | |**number** | **java.math.BigDecimal** | | [optional] | +|**nullableNumber** | **java.math.BigDecimal** | | [optional] | +|**color** | **String** | | [optional] | +|**requiredColor** | **String** | | | +|**nullableColor** | **String** | | [optional] | diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/model/Foo.java b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/model/Foo.java index 6c5d1122d2c8..76554d7d83ef 100644 --- a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/model/Foo.java +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/model/Foo.java @@ -35,11 +35,18 @@ */ @JsonPropertyOrder({ Foo.JSON_PROPERTY_DT, + Foo.JSON_PROPERTY_NULLABLE_DT, Foo.JSON_PROPERTY_BINARY, + Foo.JSON_PROPERTY_NULLABLE_BINARY, Foo.JSON_PROPERTY_LIST_OF_DT, Foo.JSON_PROPERTY_LIST_MIN_INTEMS, + Foo.JSON_PROPERTY_NULLABLE_LIST_MIN_INTEMS, Foo.JSON_PROPERTY_REQUIRED_DT, - Foo.JSON_PROPERTY_NUMBER + Foo.JSON_PROPERTY_NUMBER, + Foo.JSON_PROPERTY_NULLABLE_NUMBER, + Foo.JSON_PROPERTY_COLOR, + Foo.JSON_PROPERTY_REQUIRED_COLOR, + Foo.JSON_PROPERTY_NULLABLE_COLOR }) @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Foo { @@ -47,17 +54,29 @@ public class Foo { private java.time.@Nullable Instant dt; + public static final String JSON_PROPERTY_NULLABLE_DT = "nullableDt"; + + private java.time.@Nullable Instant nullableDt; + public static final String JSON_PROPERTY_BINARY = "binary"; private @Nullable File binary; + public static final String JSON_PROPERTY_NULLABLE_BINARY = "nullableBinary"; + + private @Nullable File nullableBinary; + public static final String JSON_PROPERTY_LIST_OF_DT = "listOfDt"; - private List listOfDt; + private @Nullable List listOfDt; public static final String JSON_PROPERTY_LIST_MIN_INTEMS = "listMinIntems"; - private List listMinIntems; + private @Nullable List listMinIntems; + + public static final String JSON_PROPERTY_NULLABLE_LIST_MIN_INTEMS = "nullableListMinIntems"; + + private @Nullable List nullableListMinIntems; public static final String JSON_PROPERTY_REQUIRED_DT = "requiredDt"; @@ -67,6 +86,22 @@ public class Foo { private java.math.@Nullable BigDecimal number; + public static final String JSON_PROPERTY_NULLABLE_NUMBER = "nullableNumber"; + + private java.math.@Nullable BigDecimal nullableNumber; + + public static final String JSON_PROPERTY_COLOR = "color"; + + private @Nullable String color = "red"; + + public static final String JSON_PROPERTY_REQUIRED_COLOR = "requiredColor"; + + private String requiredColor = "red"; + + public static final String JSON_PROPERTY_NULLABLE_COLOR = "nullableColor"; + + private @Nullable String nullableColor = "red"; + public Foo() { } @@ -95,6 +130,31 @@ public void setDt(java.time.@Nullable Instant dt) { this.dt = dt; } + public Foo nullableDt(java.time.@Nullable Instant nullableDt) { + + this.nullableDt = nullableDt; + return this; + } + + /** + * Get nullableDt + * @return nullableDt + */ + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_DT, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public java.time.@Nullable Instant getNullableDt() { + return nullableDt; + } + + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_DT, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNullableDt(java.time.@Nullable Instant nullableDt) { + this.nullableDt = nullableDt; + } + public Foo binary(@Nullable File binary) { this.binary = binary; @@ -120,7 +180,32 @@ public void setBinary(@Nullable File binary) { this.binary = binary; } - public Foo listOfDt(List listOfDt) { + public Foo nullableBinary(@Nullable File nullableBinary) { + + this.nullableBinary = nullableBinary; + return this; + } + + /** + * Get nullableBinary + * @return nullableBinary + */ + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_BINARY, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public @Nullable File getNullableBinary() { + return nullableBinary; + } + + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_BINARY, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNullableBinary(@Nullable File nullableBinary) { + this.nullableBinary = nullableBinary; + } + + public Foo listOfDt(@Nullable List listOfDt) { this.listOfDt = listOfDt; return this; @@ -142,18 +227,18 @@ public Foo addListOfDtItem(java.time.Instant listOfDtItem) { @JsonProperty(value = JSON_PROPERTY_LIST_OF_DT, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public List getListOfDt() { + public @Nullable List getListOfDt() { return listOfDt; } @JsonProperty(value = JSON_PROPERTY_LIST_OF_DT, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setListOfDt(List listOfDt) { + public void setListOfDt(@Nullable List listOfDt) { this.listOfDt = listOfDt; } - public Foo listMinIntems(List listMinIntems) { + public Foo listMinIntems(@Nullable List listMinIntems) { this.listMinIntems = listMinIntems; return this; @@ -175,17 +260,50 @@ public Foo addListMinIntemsItem(java.time.Instant listMinIntemsItem) { @JsonProperty(value = JSON_PROPERTY_LIST_MIN_INTEMS, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public List getListMinIntems() { + public @Nullable List getListMinIntems() { return listMinIntems; } @JsonProperty(value = JSON_PROPERTY_LIST_MIN_INTEMS, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setListMinIntems(List listMinIntems) { + public void setListMinIntems(@Nullable List listMinIntems) { this.listMinIntems = listMinIntems; } + public Foo nullableListMinIntems(@Nullable List nullableListMinIntems) { + + this.nullableListMinIntems = nullableListMinIntems; + return this; + } + + public Foo addNullableListMinIntemsItem(java.time.Instant nullableListMinIntemsItem) { + if (this.nullableListMinIntems == null) { + this.nullableListMinIntems = new ArrayList<>(); + } + this.nullableListMinIntems.add(nullableListMinIntemsItem); + return this; + } + + /** + * Get nullableListMinIntems + * @return nullableListMinIntems + */ + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_LIST_MIN_INTEMS, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public @Nullable List getNullableListMinIntems() { + return nullableListMinIntems; + } + + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_LIST_MIN_INTEMS, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNullableListMinIntems(@Nullable List nullableListMinIntems) { + this.nullableListMinIntems = nullableListMinIntems; + } + public Foo requiredDt(java.time.Instant requiredDt) { this.requiredDt = requiredDt; @@ -236,6 +354,106 @@ public void setNumber(java.math.@Nullable BigDecimal number) { this.number = number; } + public Foo nullableNumber(java.math.@Nullable BigDecimal nullableNumber) { + + this.nullableNumber = nullableNumber; + return this; + } + + /** + * Get nullableNumber + * @return nullableNumber + */ + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_NUMBER, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public java.math.@Nullable BigDecimal getNullableNumber() { + return nullableNumber; + } + + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_NUMBER, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNullableNumber(java.math.@Nullable BigDecimal nullableNumber) { + this.nullableNumber = nullableNumber; + } + + public Foo color(@Nullable String color) { + + this.color = color; + return this; + } + + /** + * Get color + * @return color + */ + + @JsonProperty(value = JSON_PROPERTY_COLOR, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public @Nullable String getColor() { + return color; + } + + + @JsonProperty(value = JSON_PROPERTY_COLOR, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setColor(@Nullable String color) { + this.color = color; + } + + public Foo requiredColor(String requiredColor) { + + this.requiredColor = requiredColor; + return this; + } + + /** + * Get requiredColor + * @return requiredColor + */ + + @JsonProperty(value = JSON_PROPERTY_REQUIRED_COLOR, required = true) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + + public String getRequiredColor() { + return requiredColor; + } + + + @JsonProperty(value = JSON_PROPERTY_REQUIRED_COLOR, required = true) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setRequiredColor(String requiredColor) { + this.requiredColor = requiredColor; + } + + public Foo nullableColor(@Nullable String nullableColor) { + + this.nullableColor = nullableColor; + return this; + } + + /** + * Get nullableColor + * @return nullableColor + */ + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_COLOR, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public @Nullable String getNullableColor() { + return nullableColor; + } + + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_COLOR, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNullableColor(@Nullable String nullableColor) { + this.nullableColor = nullableColor; + } + @Override public boolean equals(Object o) { @@ -247,16 +465,23 @@ public boolean equals(Object o) { } Foo foo = (Foo) o; return Objects.equals(this.dt, foo.dt) && + Objects.equals(this.nullableDt, foo.nullableDt) && Objects.equals(this.binary, foo.binary) && + Objects.equals(this.nullableBinary, foo.nullableBinary) && Objects.equals(this.listOfDt, foo.listOfDt) && Objects.equals(this.listMinIntems, foo.listMinIntems) && + Objects.equals(this.nullableListMinIntems, foo.nullableListMinIntems) && Objects.equals(this.requiredDt, foo.requiredDt) && - Objects.equals(this.number, foo.number); + Objects.equals(this.number, foo.number) && + Objects.equals(this.nullableNumber, foo.nullableNumber) && + Objects.equals(this.color, foo.color) && + Objects.equals(this.requiredColor, foo.requiredColor) && + Objects.equals(this.nullableColor, foo.nullableColor); } @Override public int hashCode() { - return Objects.hash(dt, binary, listOfDt, listMinIntems, requiredDt, number); + return Objects.hash(dt, nullableDt, binary, nullableBinary, listOfDt, listMinIntems, nullableListMinIntems, requiredDt, number, nullableNumber, color, requiredColor, nullableColor); } @Override @@ -264,11 +489,18 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class Foo {\n"); sb.append(" dt: ").append(toIndentedString(dt)).append("\n"); + sb.append(" nullableDt: ").append(toIndentedString(nullableDt)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); + sb.append(" nullableBinary: ").append(toIndentedString(nullableBinary)).append("\n"); sb.append(" listOfDt: ").append(toIndentedString(listOfDt)).append("\n"); sb.append(" listMinIntems: ").append(toIndentedString(listMinIntems)).append("\n"); + sb.append(" nullableListMinIntems: ").append(toIndentedString(nullableListMinIntems)).append("\n"); sb.append(" requiredDt: ").append(toIndentedString(requiredDt)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); + sb.append(" nullableNumber: ").append(toIndentedString(nullableNumber)).append("\n"); + sb.append(" color: ").append(toIndentedString(color)).append("\n"); + sb.append(" requiredColor: ").append(toIndentedString(requiredColor)).append("\n"); + sb.append(" nullableColor: ").append(toIndentedString(nullableColor)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/api/openapi.yaml b/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/api/openapi.yaml index 14c4c1ed2afc..34b32c5cccdf 100644 --- a/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/api/openapi.yaml +++ b/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/api/openapi.yaml @@ -76,22 +76,39 @@ components: Foo: example: dt: 2000-01-23T04:56:07.000+00:00 + nullableDt: 2000-01-23T04:56:07.000+00:00 binary: "" + nullableBinary: "" listOfDt: - 2000-01-23T04:56:07.000+00:00 - 2000-01-23T04:56:07.000+00:00 listMinIntems: - 2000-01-23T04:56:07.000+00:00 - 2000-01-23T04:56:07.000+00:00 + nullableListMinIntems: + - 2000-01-23T04:56:07.000+00:00 + - 2000-01-23T04:56:07.000+00:00 requiredDt: 2000-01-23T04:56:07.000+00:00 number: 0.8008281904610115 + nullableNumber: 6.027456183070403 + color: red + requiredColor: red + nullableColor: red properties: dt: format: date-time type: string + nullableDt: + format: date-time + nullable: true + type: string binary: format: binary type: string + nullableBinary: + format: binary + nullable: true + type: string listOfDt: items: format: date-time @@ -103,12 +120,33 @@ components: type: string minItems: 1 type: array + nullableListMinIntems: + items: + format: date-time + type: string + minItems: 1 + nullable: true + type: array requiredDt: format: date-time type: string number: type: number + nullableNumber: + nullable: true + type: number + color: + default: red + type: string + requiredColor: + default: red + type: string + nullableColor: + default: red + nullable: true + type: string required: + - requiredColor - requiredDt _upload_post_request: properties: diff --git a/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/docs/Foo.md b/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/docs/Foo.md index d03d21cd097d..9237adf1033e 100644 --- a/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/docs/Foo.md +++ b/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/docs/Foo.md @@ -8,11 +8,18 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| |**dt** | **java.time.Instant** | | [optional] | +|**nullableDt** | **java.time.Instant** | | [optional] | |**binary** | **File** | | [optional] | +|**nullableBinary** | **File** | | [optional] | |**listOfDt** | **List<java.time.Instant>** | | [optional] | |**listMinIntems** | **List<java.time.Instant>** | | [optional] | +|**nullableListMinIntems** | **List<java.time.Instant>** | | [optional] | |**requiredDt** | **java.time.Instant** | | | |**number** | **java.math.BigDecimal** | | [optional] | +|**nullableNumber** | **java.math.BigDecimal** | | [optional] | +|**color** | **String** | | [optional] | +|**requiredColor** | **String** | | | +|**nullableColor** | **String** | | [optional] | diff --git a/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/model/Foo.java b/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/model/Foo.java index 6c5d1122d2c8..76554d7d83ef 100644 --- a/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/model/Foo.java +++ b/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/model/Foo.java @@ -35,11 +35,18 @@ */ @JsonPropertyOrder({ Foo.JSON_PROPERTY_DT, + Foo.JSON_PROPERTY_NULLABLE_DT, Foo.JSON_PROPERTY_BINARY, + Foo.JSON_PROPERTY_NULLABLE_BINARY, Foo.JSON_PROPERTY_LIST_OF_DT, Foo.JSON_PROPERTY_LIST_MIN_INTEMS, + Foo.JSON_PROPERTY_NULLABLE_LIST_MIN_INTEMS, Foo.JSON_PROPERTY_REQUIRED_DT, - Foo.JSON_PROPERTY_NUMBER + Foo.JSON_PROPERTY_NUMBER, + Foo.JSON_PROPERTY_NULLABLE_NUMBER, + Foo.JSON_PROPERTY_COLOR, + Foo.JSON_PROPERTY_REQUIRED_COLOR, + Foo.JSON_PROPERTY_NULLABLE_COLOR }) @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Foo { @@ -47,17 +54,29 @@ public class Foo { private java.time.@Nullable Instant dt; + public static final String JSON_PROPERTY_NULLABLE_DT = "nullableDt"; + + private java.time.@Nullable Instant nullableDt; + public static final String JSON_PROPERTY_BINARY = "binary"; private @Nullable File binary; + public static final String JSON_PROPERTY_NULLABLE_BINARY = "nullableBinary"; + + private @Nullable File nullableBinary; + public static final String JSON_PROPERTY_LIST_OF_DT = "listOfDt"; - private List listOfDt; + private @Nullable List listOfDt; public static final String JSON_PROPERTY_LIST_MIN_INTEMS = "listMinIntems"; - private List listMinIntems; + private @Nullable List listMinIntems; + + public static final String JSON_PROPERTY_NULLABLE_LIST_MIN_INTEMS = "nullableListMinIntems"; + + private @Nullable List nullableListMinIntems; public static final String JSON_PROPERTY_REQUIRED_DT = "requiredDt"; @@ -67,6 +86,22 @@ public class Foo { private java.math.@Nullable BigDecimal number; + public static final String JSON_PROPERTY_NULLABLE_NUMBER = "nullableNumber"; + + private java.math.@Nullable BigDecimal nullableNumber; + + public static final String JSON_PROPERTY_COLOR = "color"; + + private @Nullable String color = "red"; + + public static final String JSON_PROPERTY_REQUIRED_COLOR = "requiredColor"; + + private String requiredColor = "red"; + + public static final String JSON_PROPERTY_NULLABLE_COLOR = "nullableColor"; + + private @Nullable String nullableColor = "red"; + public Foo() { } @@ -95,6 +130,31 @@ public void setDt(java.time.@Nullable Instant dt) { this.dt = dt; } + public Foo nullableDt(java.time.@Nullable Instant nullableDt) { + + this.nullableDt = nullableDt; + return this; + } + + /** + * Get nullableDt + * @return nullableDt + */ + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_DT, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public java.time.@Nullable Instant getNullableDt() { + return nullableDt; + } + + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_DT, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNullableDt(java.time.@Nullable Instant nullableDt) { + this.nullableDt = nullableDt; + } + public Foo binary(@Nullable File binary) { this.binary = binary; @@ -120,7 +180,32 @@ public void setBinary(@Nullable File binary) { this.binary = binary; } - public Foo listOfDt(List listOfDt) { + public Foo nullableBinary(@Nullable File nullableBinary) { + + this.nullableBinary = nullableBinary; + return this; + } + + /** + * Get nullableBinary + * @return nullableBinary + */ + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_BINARY, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public @Nullable File getNullableBinary() { + return nullableBinary; + } + + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_BINARY, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNullableBinary(@Nullable File nullableBinary) { + this.nullableBinary = nullableBinary; + } + + public Foo listOfDt(@Nullable List listOfDt) { this.listOfDt = listOfDt; return this; @@ -142,18 +227,18 @@ public Foo addListOfDtItem(java.time.Instant listOfDtItem) { @JsonProperty(value = JSON_PROPERTY_LIST_OF_DT, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public List getListOfDt() { + public @Nullable List getListOfDt() { return listOfDt; } @JsonProperty(value = JSON_PROPERTY_LIST_OF_DT, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setListOfDt(List listOfDt) { + public void setListOfDt(@Nullable List listOfDt) { this.listOfDt = listOfDt; } - public Foo listMinIntems(List listMinIntems) { + public Foo listMinIntems(@Nullable List listMinIntems) { this.listMinIntems = listMinIntems; return this; @@ -175,17 +260,50 @@ public Foo addListMinIntemsItem(java.time.Instant listMinIntemsItem) { @JsonProperty(value = JSON_PROPERTY_LIST_MIN_INTEMS, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public List getListMinIntems() { + public @Nullable List getListMinIntems() { return listMinIntems; } @JsonProperty(value = JSON_PROPERTY_LIST_MIN_INTEMS, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setListMinIntems(List listMinIntems) { + public void setListMinIntems(@Nullable List listMinIntems) { this.listMinIntems = listMinIntems; } + public Foo nullableListMinIntems(@Nullable List nullableListMinIntems) { + + this.nullableListMinIntems = nullableListMinIntems; + return this; + } + + public Foo addNullableListMinIntemsItem(java.time.Instant nullableListMinIntemsItem) { + if (this.nullableListMinIntems == null) { + this.nullableListMinIntems = new ArrayList<>(); + } + this.nullableListMinIntems.add(nullableListMinIntemsItem); + return this; + } + + /** + * Get nullableListMinIntems + * @return nullableListMinIntems + */ + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_LIST_MIN_INTEMS, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public @Nullable List getNullableListMinIntems() { + return nullableListMinIntems; + } + + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_LIST_MIN_INTEMS, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNullableListMinIntems(@Nullable List nullableListMinIntems) { + this.nullableListMinIntems = nullableListMinIntems; + } + public Foo requiredDt(java.time.Instant requiredDt) { this.requiredDt = requiredDt; @@ -236,6 +354,106 @@ public void setNumber(java.math.@Nullable BigDecimal number) { this.number = number; } + public Foo nullableNumber(java.math.@Nullable BigDecimal nullableNumber) { + + this.nullableNumber = nullableNumber; + return this; + } + + /** + * Get nullableNumber + * @return nullableNumber + */ + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_NUMBER, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public java.math.@Nullable BigDecimal getNullableNumber() { + return nullableNumber; + } + + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_NUMBER, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNullableNumber(java.math.@Nullable BigDecimal nullableNumber) { + this.nullableNumber = nullableNumber; + } + + public Foo color(@Nullable String color) { + + this.color = color; + return this; + } + + /** + * Get color + * @return color + */ + + @JsonProperty(value = JSON_PROPERTY_COLOR, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public @Nullable String getColor() { + return color; + } + + + @JsonProperty(value = JSON_PROPERTY_COLOR, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setColor(@Nullable String color) { + this.color = color; + } + + public Foo requiredColor(String requiredColor) { + + this.requiredColor = requiredColor; + return this; + } + + /** + * Get requiredColor + * @return requiredColor + */ + + @JsonProperty(value = JSON_PROPERTY_REQUIRED_COLOR, required = true) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + + public String getRequiredColor() { + return requiredColor; + } + + + @JsonProperty(value = JSON_PROPERTY_REQUIRED_COLOR, required = true) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setRequiredColor(String requiredColor) { + this.requiredColor = requiredColor; + } + + public Foo nullableColor(@Nullable String nullableColor) { + + this.nullableColor = nullableColor; + return this; + } + + /** + * Get nullableColor + * @return nullableColor + */ + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_COLOR, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public @Nullable String getNullableColor() { + return nullableColor; + } + + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_COLOR, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNullableColor(@Nullable String nullableColor) { + this.nullableColor = nullableColor; + } + @Override public boolean equals(Object o) { @@ -247,16 +465,23 @@ public boolean equals(Object o) { } Foo foo = (Foo) o; return Objects.equals(this.dt, foo.dt) && + Objects.equals(this.nullableDt, foo.nullableDt) && Objects.equals(this.binary, foo.binary) && + Objects.equals(this.nullableBinary, foo.nullableBinary) && Objects.equals(this.listOfDt, foo.listOfDt) && Objects.equals(this.listMinIntems, foo.listMinIntems) && + Objects.equals(this.nullableListMinIntems, foo.nullableListMinIntems) && Objects.equals(this.requiredDt, foo.requiredDt) && - Objects.equals(this.number, foo.number); + Objects.equals(this.number, foo.number) && + Objects.equals(this.nullableNumber, foo.nullableNumber) && + Objects.equals(this.color, foo.color) && + Objects.equals(this.requiredColor, foo.requiredColor) && + Objects.equals(this.nullableColor, foo.nullableColor); } @Override public int hashCode() { - return Objects.hash(dt, binary, listOfDt, listMinIntems, requiredDt, number); + return Objects.hash(dt, nullableDt, binary, nullableBinary, listOfDt, listMinIntems, nullableListMinIntems, requiredDt, number, nullableNumber, color, requiredColor, nullableColor); } @Override @@ -264,11 +489,18 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class Foo {\n"); sb.append(" dt: ").append(toIndentedString(dt)).append("\n"); + sb.append(" nullableDt: ").append(toIndentedString(nullableDt)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); + sb.append(" nullableBinary: ").append(toIndentedString(nullableBinary)).append("\n"); sb.append(" listOfDt: ").append(toIndentedString(listOfDt)).append("\n"); sb.append(" listMinIntems: ").append(toIndentedString(listMinIntems)).append("\n"); + sb.append(" nullableListMinIntems: ").append(toIndentedString(nullableListMinIntems)).append("\n"); sb.append(" requiredDt: ").append(toIndentedString(requiredDt)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); + sb.append(" nullableNumber: ").append(toIndentedString(nullableNumber)).append("\n"); + sb.append(" color: ").append(toIndentedString(color)).append("\n"); + sb.append(" requiredColor: ").append(toIndentedString(requiredColor)).append("\n"); + sb.append(" nullableColor: ").append(toIndentedString(nullableColor)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/api/openapi.yaml b/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/api/openapi.yaml index 14c4c1ed2afc..34b32c5cccdf 100644 --- a/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/api/openapi.yaml +++ b/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/api/openapi.yaml @@ -76,22 +76,39 @@ components: Foo: example: dt: 2000-01-23T04:56:07.000+00:00 + nullableDt: 2000-01-23T04:56:07.000+00:00 binary: "" + nullableBinary: "" listOfDt: - 2000-01-23T04:56:07.000+00:00 - 2000-01-23T04:56:07.000+00:00 listMinIntems: - 2000-01-23T04:56:07.000+00:00 - 2000-01-23T04:56:07.000+00:00 + nullableListMinIntems: + - 2000-01-23T04:56:07.000+00:00 + - 2000-01-23T04:56:07.000+00:00 requiredDt: 2000-01-23T04:56:07.000+00:00 number: 0.8008281904610115 + nullableNumber: 6.027456183070403 + color: red + requiredColor: red + nullableColor: red properties: dt: format: date-time type: string + nullableDt: + format: date-time + nullable: true + type: string binary: format: binary type: string + nullableBinary: + format: binary + nullable: true + type: string listOfDt: items: format: date-time @@ -103,12 +120,33 @@ components: type: string minItems: 1 type: array + nullableListMinIntems: + items: + format: date-time + type: string + minItems: 1 + nullable: true + type: array requiredDt: format: date-time type: string number: type: number + nullableNumber: + nullable: true + type: number + color: + default: red + type: string + requiredColor: + default: red + type: string + nullableColor: + default: red + nullable: true + type: string required: + - requiredColor - requiredDt _upload_post_request: properties: diff --git a/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/docs/Foo.md b/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/docs/Foo.md index d03d21cd097d..9237adf1033e 100644 --- a/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/docs/Foo.md +++ b/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/docs/Foo.md @@ -8,11 +8,18 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| |**dt** | **java.time.Instant** | | [optional] | +|**nullableDt** | **java.time.Instant** | | [optional] | |**binary** | **File** | | [optional] | +|**nullableBinary** | **File** | | [optional] | |**listOfDt** | **List<java.time.Instant>** | | [optional] | |**listMinIntems** | **List<java.time.Instant>** | | [optional] | +|**nullableListMinIntems** | **List<java.time.Instant>** | | [optional] | |**requiredDt** | **java.time.Instant** | | | |**number** | **java.math.BigDecimal** | | [optional] | +|**nullableNumber** | **java.math.BigDecimal** | | [optional] | +|**color** | **String** | | [optional] | +|**requiredColor** | **String** | | | +|**nullableColor** | **String** | | [optional] | diff --git a/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/model/Foo.java b/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/model/Foo.java index cef084bc92a3..ff8c30b1514c 100644 --- a/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/model/Foo.java +++ b/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/model/Foo.java @@ -34,11 +34,18 @@ */ @JsonPropertyOrder({ Foo.JSON_PROPERTY_DT, + Foo.JSON_PROPERTY_NULLABLE_DT, Foo.JSON_PROPERTY_BINARY, + Foo.JSON_PROPERTY_NULLABLE_BINARY, Foo.JSON_PROPERTY_LIST_OF_DT, Foo.JSON_PROPERTY_LIST_MIN_INTEMS, + Foo.JSON_PROPERTY_NULLABLE_LIST_MIN_INTEMS, Foo.JSON_PROPERTY_REQUIRED_DT, - Foo.JSON_PROPERTY_NUMBER + Foo.JSON_PROPERTY_NUMBER, + Foo.JSON_PROPERTY_NULLABLE_NUMBER, + Foo.JSON_PROPERTY_COLOR, + Foo.JSON_PROPERTY_REQUIRED_COLOR, + Foo.JSON_PROPERTY_NULLABLE_COLOR }) @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") public class Foo { @@ -46,17 +53,29 @@ public class Foo { private java.time.@Nullable Instant dt; + public static final String JSON_PROPERTY_NULLABLE_DT = "nullableDt"; + + private java.time.@Nullable Instant nullableDt; + public static final String JSON_PROPERTY_BINARY = "binary"; private @Nullable File binary; + public static final String JSON_PROPERTY_NULLABLE_BINARY = "nullableBinary"; + + private @Nullable File nullableBinary; + public static final String JSON_PROPERTY_LIST_OF_DT = "listOfDt"; - private List listOfDt; + private @Nullable List listOfDt; public static final String JSON_PROPERTY_LIST_MIN_INTEMS = "listMinIntems"; - private List listMinIntems; + private @Nullable List listMinIntems; + + public static final String JSON_PROPERTY_NULLABLE_LIST_MIN_INTEMS = "nullableListMinIntems"; + + private @Nullable List nullableListMinIntems; public static final String JSON_PROPERTY_REQUIRED_DT = "requiredDt"; @@ -66,6 +85,22 @@ public class Foo { private java.math.@Nullable BigDecimal number; + public static final String JSON_PROPERTY_NULLABLE_NUMBER = "nullableNumber"; + + private java.math.@Nullable BigDecimal nullableNumber; + + public static final String JSON_PROPERTY_COLOR = "color"; + + private @Nullable String color = "red"; + + public static final String JSON_PROPERTY_REQUIRED_COLOR = "requiredColor"; + + private String requiredColor = "red"; + + public static final String JSON_PROPERTY_NULLABLE_COLOR = "nullableColor"; + + private @Nullable String nullableColor = "red"; + public Foo() { } @@ -94,6 +129,31 @@ public void setDt(java.time.@Nullable Instant dt) { this.dt = dt; } + public Foo nullableDt(java.time.@Nullable Instant nullableDt) { + + this.nullableDt = nullableDt; + return this; + } + + /** + * Get nullableDt + * @return nullableDt + */ + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_DT, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public java.time.@Nullable Instant getNullableDt() { + return nullableDt; + } + + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_DT, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNullableDt(java.time.@Nullable Instant nullableDt) { + this.nullableDt = nullableDt; + } + public Foo binary(@Nullable File binary) { this.binary = binary; @@ -119,7 +179,32 @@ public void setBinary(@Nullable File binary) { this.binary = binary; } - public Foo listOfDt(List listOfDt) { + public Foo nullableBinary(@Nullable File nullableBinary) { + + this.nullableBinary = nullableBinary; + return this; + } + + /** + * Get nullableBinary + * @return nullableBinary + */ + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_BINARY, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public @Nullable File getNullableBinary() { + return nullableBinary; + } + + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_BINARY, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNullableBinary(@Nullable File nullableBinary) { + this.nullableBinary = nullableBinary; + } + + public Foo listOfDt(@Nullable List listOfDt) { this.listOfDt = listOfDt; return this; @@ -141,18 +226,18 @@ public Foo addListOfDtItem(java.time.Instant listOfDtItem) { @JsonProperty(value = JSON_PROPERTY_LIST_OF_DT, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public List getListOfDt() { + public @Nullable List getListOfDt() { return listOfDt; } @JsonProperty(value = JSON_PROPERTY_LIST_OF_DT, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setListOfDt(List listOfDt) { + public void setListOfDt(@Nullable List listOfDt) { this.listOfDt = listOfDt; } - public Foo listMinIntems(List listMinIntems) { + public Foo listMinIntems(@Nullable List listMinIntems) { this.listMinIntems = listMinIntems; return this; @@ -174,17 +259,50 @@ public Foo addListMinIntemsItem(java.time.Instant listMinIntemsItem) { @JsonProperty(value = JSON_PROPERTY_LIST_MIN_INTEMS, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public List getListMinIntems() { + public @Nullable List getListMinIntems() { return listMinIntems; } @JsonProperty(value = JSON_PROPERTY_LIST_MIN_INTEMS, required = false) @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) - public void setListMinIntems(List listMinIntems) { + public void setListMinIntems(@Nullable List listMinIntems) { this.listMinIntems = listMinIntems; } + public Foo nullableListMinIntems(@Nullable List nullableListMinIntems) { + + this.nullableListMinIntems = nullableListMinIntems; + return this; + } + + public Foo addNullableListMinIntemsItem(java.time.Instant nullableListMinIntemsItem) { + if (this.nullableListMinIntems == null) { + this.nullableListMinIntems = new ArrayList<>(); + } + this.nullableListMinIntems.add(nullableListMinIntemsItem); + return this; + } + + /** + * Get nullableListMinIntems + * @return nullableListMinIntems + */ + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_LIST_MIN_INTEMS, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public @Nullable List getNullableListMinIntems() { + return nullableListMinIntems; + } + + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_LIST_MIN_INTEMS, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNullableListMinIntems(@Nullable List nullableListMinIntems) { + this.nullableListMinIntems = nullableListMinIntems; + } + public Foo requiredDt(java.time.Instant requiredDt) { this.requiredDt = requiredDt; @@ -235,6 +353,106 @@ public void setNumber(java.math.@Nullable BigDecimal number) { this.number = number; } + public Foo nullableNumber(java.math.@Nullable BigDecimal nullableNumber) { + + this.nullableNumber = nullableNumber; + return this; + } + + /** + * Get nullableNumber + * @return nullableNumber + */ + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_NUMBER, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public java.math.@Nullable BigDecimal getNullableNumber() { + return nullableNumber; + } + + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_NUMBER, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNullableNumber(java.math.@Nullable BigDecimal nullableNumber) { + this.nullableNumber = nullableNumber; + } + + public Foo color(@Nullable String color) { + + this.color = color; + return this; + } + + /** + * Get color + * @return color + */ + + @JsonProperty(value = JSON_PROPERTY_COLOR, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public @Nullable String getColor() { + return color; + } + + + @JsonProperty(value = JSON_PROPERTY_COLOR, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setColor(@Nullable String color) { + this.color = color; + } + + public Foo requiredColor(String requiredColor) { + + this.requiredColor = requiredColor; + return this; + } + + /** + * Get requiredColor + * @return requiredColor + */ + + @JsonProperty(value = JSON_PROPERTY_REQUIRED_COLOR, required = true) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + + public String getRequiredColor() { + return requiredColor; + } + + + @JsonProperty(value = JSON_PROPERTY_REQUIRED_COLOR, required = true) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + public void setRequiredColor(String requiredColor) { + this.requiredColor = requiredColor; + } + + public Foo nullableColor(@Nullable String nullableColor) { + + this.nullableColor = nullableColor; + return this; + } + + /** + * Get nullableColor + * @return nullableColor + */ + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_COLOR, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public @Nullable String getNullableColor() { + return nullableColor; + } + + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_COLOR, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setNullableColor(@Nullable String nullableColor) { + this.nullableColor = nullableColor; + } + @Override public boolean equals(Object o) { @@ -246,16 +464,23 @@ public boolean equals(Object o) { } Foo foo = (Foo) o; return Objects.equals(this.dt, foo.dt) && + Objects.equals(this.nullableDt, foo.nullableDt) && Objects.equals(this.binary, foo.binary) && + Objects.equals(this.nullableBinary, foo.nullableBinary) && Objects.equals(this.listOfDt, foo.listOfDt) && Objects.equals(this.listMinIntems, foo.listMinIntems) && + Objects.equals(this.nullableListMinIntems, foo.nullableListMinIntems) && Objects.equals(this.requiredDt, foo.requiredDt) && - Objects.equals(this.number, foo.number); + Objects.equals(this.number, foo.number) && + Objects.equals(this.nullableNumber, foo.nullableNumber) && + Objects.equals(this.color, foo.color) && + Objects.equals(this.requiredColor, foo.requiredColor) && + Objects.equals(this.nullableColor, foo.nullableColor); } @Override public int hashCode() { - return Objects.hash(dt, binary, listOfDt, listMinIntems, requiredDt, number); + return Objects.hash(dt, nullableDt, binary, nullableBinary, listOfDt, listMinIntems, nullableListMinIntems, requiredDt, number, nullableNumber, color, requiredColor, nullableColor); } @Override @@ -263,11 +488,18 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class Foo {\n"); sb.append(" dt: ").append(toIndentedString(dt)).append("\n"); + sb.append(" nullableDt: ").append(toIndentedString(nullableDt)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); + sb.append(" nullableBinary: ").append(toIndentedString(nullableBinary)).append("\n"); sb.append(" listOfDt: ").append(toIndentedString(listOfDt)).append("\n"); sb.append(" listMinIntems: ").append(toIndentedString(listMinIntems)).append("\n"); + sb.append(" nullableListMinIntems: ").append(toIndentedString(nullableListMinIntems)).append("\n"); sb.append(" requiredDt: ").append(toIndentedString(requiredDt)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); + sb.append(" nullableNumber: ").append(toIndentedString(nullableNumber)).append("\n"); + sb.append(" color: ").append(toIndentedString(color)).append("\n"); + sb.append(" requiredColor: ").append(toIndentedString(requiredColor)).append("\n"); + sb.append(" nullableColor: ").append(toIndentedString(nullableColor)).append("\n"); sb.append("}"); return sb.toString(); } diff --git a/samples/openapi3/server/petstore/springboot-4-jspecify/src/main/java/org/openapitools/api/FooApi.java b/samples/openapi3/server/petstore/springboot-4-jspecify/src/main/java/org/openapitools/api/FooApi.java index 8e068a12f2e3..ce792ccf56e7 100644 --- a/samples/openapi3/server/petstore/springboot-4-jspecify/src/main/java/org/openapitools/api/FooApi.java +++ b/samples/openapi3/server/petstore/springboot-4-jspecify/src/main/java/org/openapitools/api/FooApi.java @@ -68,14 +68,14 @@ default Optional getRequest() { produces = { "application/json" } ) default ResponseEntity fooDtParamGet( - @Parameter(name = "dtParam", description = "", in = ParameterIn.PATH) @PathVariable("dtParam") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) @Nullable OffsetDateTime dtParam, - @Parameter(name = "dtQuery", description = "", in = ParameterIn.QUERY) @Valid @RequestParam(value = "dtQuery", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) @Nullable OffsetDateTime dtQuery, - @Parameter(name = "dtCookie", description = "", in = ParameterIn.COOKIE) @CookieValue(name = "dtCookie", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) @Nullable OffsetDateTime dtCookie + @Parameter(name = "dtParam", description = "", in = ParameterIn.PATH) @PathVariable("dtParam") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) java.time.@Nullable Instant dtParam, + @Parameter(name = "dtQuery", description = "", in = ParameterIn.QUERY) @Valid @RequestParam(value = "dtQuery", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) java.time.@Nullable Instant dtQuery, + @Parameter(name = "dtCookie", description = "", in = ParameterIn.COOKIE) @CookieValue(name = "dtCookie", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) java.time.@Nullable Instant dtCookie ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"dt\" : \"2000-01-23T04:56:07.000+00:00\", \"binary\" : \"\", \"listOfDt\" : [ \"2000-01-23T04:56:07.000+00:00\", \"2000-01-23T04:56:07.000+00:00\" ], \"listMinIntems\" : [ \"2000-01-23T04:56:07.000+00:00\", \"2000-01-23T04:56:07.000+00:00\" ], \"requiredDt\" : \"2000-01-23T04:56:07.000+00:00\", \"number\" : 0.8008281904610115 }"; + String exampleString = "{ \"dt\" : \"2000-01-23T04:56:07.000+00:00\", \"nullableDt\" : \"2000-01-23T04:56:07.000+00:00\", \"binary\" : \"\", \"nullableBinary\" : \"\", \"listOfDt\" : [ \"2000-01-23T04:56:07.000+00:00\", \"2000-01-23T04:56:07.000+00:00\" ], \"listMinIntems\" : [ \"2000-01-23T04:56:07.000+00:00\", \"2000-01-23T04:56:07.000+00:00\" ], \"nullableListMinIntems\" : [ \"2000-01-23T04:56:07.000+00:00\", \"2000-01-23T04:56:07.000+00:00\" ], \"requiredDt\" : \"2000-01-23T04:56:07.000+00:00\", \"number\" : 0.8008281904610115, \"nullableNumber\" : 6.027456183070403, \"color\" : \"red\", \"requiredColor\" : \"red\", \"nullableColor\" : \"red\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/openapi3/server/petstore/springboot-4-jspecify/src/main/java/org/openapitools/model/Foo.java b/samples/openapi3/server/petstore/springboot-4-jspecify/src/main/java/org/openapitools/model/Foo.java index 38e257be4546..853134befa45 100644 --- a/samples/openapi3/server/petstore/springboot-4-jspecify/src/main/java/org/openapitools/model/Foo.java +++ b/samples/openapi3/server/petstore/springboot-4-jspecify/src/main/java/org/openapitools/model/Foo.java @@ -39,22 +39,38 @@ public class Foo { @JsonInclude(JsonInclude.Include.NON_NULL) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private @Nullable OffsetDateTime dt; + private java.time.@Nullable Instant dt; + + @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) + private java.time.@Nullable Instant nullableDt = null; @JsonInclude(JsonInclude.Include.NON_NULL) private org.springframework.core.io.@Nullable Resource binary; + private org.springframework.core.io.@Nullable Resource nullableBinary = null; + @JsonInclude(JsonInclude.Include.NON_NULL) - private List listOfDt = new ArrayList<>(); + private List listOfDt = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) - private List listMinIntems = new ArrayList<>(); + private List listMinIntems = new ArrayList<>(); + + private @Nullable List nullableListMinIntems; @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) - private OffsetDateTime requiredDt; + private java.time.Instant requiredDt; + + @JsonInclude(JsonInclude.Include.NON_NULL) + private java.math.@Nullable BigDecimal number; + + private java.math.@Nullable BigDecimal nullableNumber = null; @JsonInclude(JsonInclude.Include.NON_NULL) - private @Nullable BigDecimal number; + private String color = "red"; + + private String requiredColor = "red"; + + private @Nullable String nullableColor = null; public Foo() { super(); @@ -63,23 +79,31 @@ public Foo() { /** * Constructor with only required parameters */ - public Foo(OffsetDateTime requiredDt) { + public Foo(java.time.Instant requiredDt, String requiredColor) { this.requiredDt = requiredDt; + this.requiredColor = requiredColor; } /** * Constructor with all args parameters */ - public Foo(OffsetDateTime dt, org.springframework.core.io.Resource binary, List listOfDt, List listMinIntems, OffsetDateTime requiredDt, BigDecimal number) { + public Foo(java.time.@Nullable Instant dt, java.time.@Nullable Instant nullableDt, org.springframework.core.io.@Nullable Resource binary, org.springframework.core.io.@Nullable Resource nullableBinary, @Nullable List listOfDt, @Nullable List listMinIntems, @Nullable List nullableListMinIntems, java.time.Instant requiredDt, java.math.@Nullable BigDecimal number, java.math.@Nullable BigDecimal nullableNumber, @Nullable String color, String requiredColor, @Nullable String nullableColor) { this.dt = dt; + this.nullableDt = nullableDt; this.binary = binary; + this.nullableBinary = nullableBinary; this.listOfDt = listOfDt; this.listMinIntems = listMinIntems; + this.nullableListMinIntems = nullableListMinIntems; this.requiredDt = requiredDt; this.number = number; + this.nullableNumber = nullableNumber; + this.color = color; + this.requiredColor = requiredColor; + this.nullableColor = nullableColor; } - public Foo dt(OffsetDateTime dt) { + public Foo dt(java.time.@Nullable Instant dt) { this.dt = dt; return this; } @@ -93,18 +117,42 @@ public Foo dt(OffsetDateTime dt) { @JsonProperty("dt") @JacksonXmlProperty(localName = "dt") @XmlElement(name = "dt") - public @Nullable OffsetDateTime getDt() { + public java.time.@Nullable Instant getDt() { return dt; } @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("dt") @JacksonXmlProperty(localName = "dt") - public void setDt(@Nullable OffsetDateTime dt) { + public void setDt(java.time.@Nullable Instant dt) { this.dt = dt; } - public Foo binary(org.springframework.core.io.Resource binary) { + public Foo nullableDt(java.time.@Nullable Instant nullableDt) { + this.nullableDt = nullableDt; + return this; + } + + /** + * Get nullableDt + * @return nullableDt + */ + @Valid + @Schema(name = "nullableDt", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullableDt") + @JacksonXmlProperty(localName = "nullableDt") + @XmlElement(name = "nullableDt") + public java.time.@Nullable Instant getNullableDt() { + return nullableDt; + } + + @JsonProperty("nullableDt") + @JacksonXmlProperty(localName = "nullableDt") + public void setNullableDt(java.time.@Nullable Instant nullableDt) { + this.nullableDt = nullableDt; + } + + public Foo binary(org.springframework.core.io.@Nullable Resource binary) { this.binary = binary; return this; } @@ -129,12 +177,36 @@ public void setBinary(org.springframework.core.io.@Nullable Resource binary) { this.binary = binary; } - public Foo listOfDt(List listOfDt) { + public Foo nullableBinary(org.springframework.core.io.@Nullable Resource nullableBinary) { + this.nullableBinary = nullableBinary; + return this; + } + + /** + * Get nullableBinary + * @return nullableBinary + */ + @Valid + @Schema(name = "nullableBinary", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullableBinary") + @JacksonXmlProperty(localName = "nullableBinary") + @XmlElement(name = "nullableBinary") + public org.springframework.core.io.@Nullable Resource getNullableBinary() { + return nullableBinary; + } + + @JsonProperty("nullableBinary") + @JacksonXmlProperty(localName = "nullableBinary") + public void setNullableBinary(org.springframework.core.io.@Nullable Resource nullableBinary) { + this.nullableBinary = nullableBinary; + } + + public Foo listOfDt(@Nullable List listOfDt) { this.listOfDt = listOfDt; return this; } - public Foo addListOfDtItem(OffsetDateTime listOfDtItem) { + public Foo addListOfDtItem(java.time.Instant listOfDtItem) { if (this.listOfDt == null) { this.listOfDt = new ArrayList<>(); } @@ -152,7 +224,7 @@ public Foo addListOfDtItem(OffsetDateTime listOfDtItem) { @JacksonXmlProperty(localName = "listOfDt") @JacksonXmlElementWrapper(useWrapping = false) @XmlElement(name = "listOfDt") - public List getListOfDt() { + public List getListOfDt() { return listOfDt; } @@ -160,16 +232,16 @@ public List getListOfDt() { @JsonProperty("listOfDt") @JacksonXmlProperty(localName = "listOfDt") @JacksonXmlElementWrapper(useWrapping = false) - public void setListOfDt(List listOfDt) { + public void setListOfDt(List listOfDt) { this.listOfDt = listOfDt; } - public Foo listMinIntems(List listMinIntems) { + public Foo listMinIntems(@Nullable List listMinIntems) { this.listMinIntems = listMinIntems; return this; } - public Foo addListMinIntemsItem(OffsetDateTime listMinIntemsItem) { + public Foo addListMinIntemsItem(java.time.Instant listMinIntemsItem) { if (this.listMinIntems == null) { this.listMinIntems = new ArrayList<>(); } @@ -187,7 +259,7 @@ public Foo addListMinIntemsItem(OffsetDateTime listMinIntemsItem) { @JacksonXmlProperty(localName = "listMinIntems") @JacksonXmlElementWrapper(useWrapping = false) @XmlElement(name = "listMinIntems") - public List getListMinIntems() { + public List getListMinIntems() { return listMinIntems; } @@ -195,11 +267,45 @@ public List getListMinIntems() { @JsonProperty("listMinIntems") @JacksonXmlProperty(localName = "listMinIntems") @JacksonXmlElementWrapper(useWrapping = false) - public void setListMinIntems(List listMinIntems) { + public void setListMinIntems(List listMinIntems) { this.listMinIntems = listMinIntems; } - public Foo requiredDt(OffsetDateTime requiredDt) { + public Foo nullableListMinIntems(@Nullable List nullableListMinIntems) { + this.nullableListMinIntems = nullableListMinIntems; + return this; + } + + public Foo addNullableListMinIntemsItem(java.time.Instant nullableListMinIntemsItem) { + if (this.nullableListMinIntems == null) { + this.nullableListMinIntems = new ArrayList<>(); + } + this.nullableListMinIntems.add(nullableListMinIntemsItem); + return this; + } + + /** + * Get nullableListMinIntems + * @return nullableListMinIntems + */ + @Valid @Size(min = 1) + @Schema(name = "nullableListMinIntems", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullableListMinIntems") + @JacksonXmlProperty(localName = "nullableListMinIntems") + @JacksonXmlElementWrapper(useWrapping = false) + @XmlElement(name = "nullableListMinIntems") + public @Nullable List getNullableListMinIntems() { + return nullableListMinIntems; + } + + @JsonProperty("nullableListMinIntems") + @JacksonXmlProperty(localName = "nullableListMinIntems") + @JacksonXmlElementWrapper(useWrapping = false) + public void setNullableListMinIntems(@Nullable List nullableListMinIntems) { + this.nullableListMinIntems = nullableListMinIntems; + } + + public Foo requiredDt(java.time.Instant requiredDt) { this.requiredDt = requiredDt; return this; } @@ -213,17 +319,17 @@ public Foo requiredDt(OffsetDateTime requiredDt) { @JsonProperty("requiredDt") @JacksonXmlProperty(localName = "requiredDt") @XmlElement(name = "requiredDt") - public OffsetDateTime getRequiredDt() { + public java.time.Instant getRequiredDt() { return requiredDt; } @JsonProperty("requiredDt") @JacksonXmlProperty(localName = "requiredDt") - public void setRequiredDt(OffsetDateTime requiredDt) { + public void setRequiredDt(java.time.Instant requiredDt) { this.requiredDt = requiredDt; } - public Foo number(BigDecimal number) { + public Foo number(java.math.@Nullable BigDecimal number) { this.number = number; return this; } @@ -237,17 +343,114 @@ public Foo number(BigDecimal number) { @JsonProperty("number") @JacksonXmlProperty(localName = "number") @XmlElement(name = "number") - public @Nullable BigDecimal getNumber() { + public java.math.@Nullable BigDecimal getNumber() { return number; } @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("number") @JacksonXmlProperty(localName = "number") - public void setNumber(@Nullable BigDecimal number) { + public void setNumber(java.math.@Nullable BigDecimal number) { this.number = number; } + public Foo nullableNumber(java.math.@Nullable BigDecimal nullableNumber) { + this.nullableNumber = nullableNumber; + return this; + } + + /** + * Get nullableNumber + * @return nullableNumber + */ + @Valid + @Schema(name = "nullableNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullableNumber") + @JacksonXmlProperty(localName = "nullableNumber") + @XmlElement(name = "nullableNumber") + public java.math.@Nullable BigDecimal getNullableNumber() { + return nullableNumber; + } + + @JsonProperty("nullableNumber") + @JacksonXmlProperty(localName = "nullableNumber") + public void setNullableNumber(java.math.@Nullable BigDecimal nullableNumber) { + this.nullableNumber = nullableNumber; + } + + public Foo color(@Nullable String color) { + this.color = color; + return this; + } + + /** + * Get color + * @return color + */ + + @Schema(name = "color", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("color") + @JacksonXmlProperty(localName = "color") + @XmlElement(name = "color") + public String getColor() { + return color; + } + + @JsonSetter(nulls = Nulls.SKIP) + @JsonProperty("color") + @JacksonXmlProperty(localName = "color") + public void setColor(String color) { + this.color = color; + } + + public Foo requiredColor(String requiredColor) { + this.requiredColor = requiredColor; + return this; + } + + /** + * Get requiredColor + * @return requiredColor + */ + @NotNull + @Schema(name = "requiredColor", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("requiredColor") + @JacksonXmlProperty(localName = "requiredColor") + @XmlElement(name = "requiredColor") + public String getRequiredColor() { + return requiredColor; + } + + @JsonProperty("requiredColor") + @JacksonXmlProperty(localName = "requiredColor") + public void setRequiredColor(String requiredColor) { + this.requiredColor = requiredColor; + } + + public Foo nullableColor(@Nullable String nullableColor) { + this.nullableColor = nullableColor; + return this; + } + + /** + * Get nullableColor + * @return nullableColor + */ + + @Schema(name = "nullableColor", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullableColor") + @JacksonXmlProperty(localName = "nullableColor") + @XmlElement(name = "nullableColor") + public @Nullable String getNullableColor() { + return nullableColor; + } + + @JsonProperty("nullableColor") + @JacksonXmlProperty(localName = "nullableColor") + public void setNullableColor(@Nullable String nullableColor) { + this.nullableColor = nullableColor; + } + @Override public boolean equals(Object o) { if (this == o) { @@ -258,16 +461,23 @@ public boolean equals(Object o) { } Foo foo = (Foo) o; return Objects.equals(this.dt, foo.dt) && + Objects.equals(this.nullableDt, foo.nullableDt) && Objects.equals(this.binary, foo.binary) && + Objects.equals(this.nullableBinary, foo.nullableBinary) && Objects.equals(this.listOfDt, foo.listOfDt) && Objects.equals(this.listMinIntems, foo.listMinIntems) && + Objects.equals(this.nullableListMinIntems, foo.nullableListMinIntems) && Objects.equals(this.requiredDt, foo.requiredDt) && - Objects.equals(this.number, foo.number); + Objects.equals(this.number, foo.number) && + Objects.equals(this.nullableNumber, foo.nullableNumber) && + Objects.equals(this.color, foo.color) && + Objects.equals(this.requiredColor, foo.requiredColor) && + Objects.equals(this.nullableColor, foo.nullableColor); } @Override public int hashCode() { - return Objects.hash(dt, binary, listOfDt, listMinIntems, requiredDt, number); + return Objects.hash(dt, nullableDt, binary, nullableBinary, listOfDt, listMinIntems, nullableListMinIntems, requiredDt, number, nullableNumber, color, requiredColor, nullableColor); } @Override @@ -275,11 +485,18 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class Foo {\n"); sb.append(" dt: ").append(toIndentedString(dt)).append("\n"); + sb.append(" nullableDt: ").append(toIndentedString(nullableDt)).append("\n"); sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); + sb.append(" nullableBinary: ").append(toIndentedString(nullableBinary)).append("\n"); sb.append(" listOfDt: ").append(toIndentedString(listOfDt)).append("\n"); sb.append(" listMinIntems: ").append(toIndentedString(listMinIntems)).append("\n"); + sb.append(" nullableListMinIntems: ").append(toIndentedString(nullableListMinIntems)).append("\n"); sb.append(" requiredDt: ").append(toIndentedString(requiredDt)).append("\n"); sb.append(" number: ").append(toIndentedString(number)).append("\n"); + sb.append(" nullableNumber: ").append(toIndentedString(nullableNumber)).append("\n"); + sb.append(" color: ").append(toIndentedString(color)).append("\n"); + sb.append(" requiredColor: ").append(toIndentedString(requiredColor)).append("\n"); + sb.append(" nullableColor: ").append(toIndentedString(nullableColor)).append("\n"); sb.append("}"); return sb.toString(); } @@ -306,44 +523,86 @@ protected Builder(Foo instance) { protected Builder copyOf(Foo value) { this.instance.setDt(value.dt); + this.instance.setNullableDt(value.nullableDt); this.instance.setBinary(value.binary); + this.instance.setNullableBinary(value.nullableBinary); this.instance.setListOfDt(value.listOfDt); this.instance.setListMinIntems(value.listMinIntems); + this.instance.setNullableListMinIntems(value.nullableListMinIntems); this.instance.setRequiredDt(value.requiredDt); this.instance.setNumber(value.number); + this.instance.setNullableNumber(value.nullableNumber); + this.instance.setColor(value.color); + this.instance.setRequiredColor(value.requiredColor); + this.instance.setNullableColor(value.nullableColor); return this; } - public Foo.Builder dt(OffsetDateTime dt) { + public Foo.Builder dt(java.time.Instant dt) { this.instance.dt(dt); return this; } + public Foo.Builder nullableDt(java.time.Instant nullableDt) { + this.instance.nullableDt(nullableDt); + return this; + } + public Foo.Builder binary(org.springframework.core.io.Resource binary) { this.instance.binary(binary); return this; } - public Foo.Builder listOfDt(List listOfDt) { + public Foo.Builder nullableBinary(org.springframework.core.io.Resource nullableBinary) { + this.instance.nullableBinary(nullableBinary); + return this; + } + + public Foo.Builder listOfDt(List listOfDt) { this.instance.listOfDt(listOfDt); return this; } - public Foo.Builder listMinIntems(List listMinIntems) { + public Foo.Builder listMinIntems(List listMinIntems) { this.instance.listMinIntems(listMinIntems); return this; } - public Foo.Builder requiredDt(OffsetDateTime requiredDt) { + public Foo.Builder nullableListMinIntems(List nullableListMinIntems) { + this.instance.nullableListMinIntems(nullableListMinIntems); + return this; + } + + public Foo.Builder requiredDt(java.time.Instant requiredDt) { this.instance.requiredDt(requiredDt); return this; } - public Foo.Builder number(BigDecimal number) { + public Foo.Builder number(java.math.BigDecimal number) { this.instance.number(number); return this; } + public Foo.Builder nullableNumber(java.math.BigDecimal nullableNumber) { + this.instance.nullableNumber(nullableNumber); + return this; + } + + public Foo.Builder color(String color) { + this.instance.color(color); + return this; + } + + public Foo.Builder requiredColor(String requiredColor) { + this.instance.requiredColor(requiredColor); + return this; + } + + public Foo.Builder nullableColor(String nullableColor) { + this.instance.nullableColor(nullableColor); + return this; + } + /** * returns a built Foo instance. * From 8bcd7ea0b3639a64a36ef52538d11f8621b50565 Mon Sep 17 00:00:00 2001 From: jpfinne Date: Sun, 2 Aug 2026 15:27:57 +0200 Subject: [PATCH 02/12] Handling of openapiNullable and useOptional --- ...pring-boot-4-jspecify_openapiNullable.yaml | 24 + .../spring-boot-4-jspecify_useOptional.yaml | 25 + .../Java/nullableArgumentWithEnum.mustache | 2 +- .../resources/JavaSpring/javaBuilder.mustache | 4 +- .../JavaSpring/nullableAnnotation.mustache | 2 +- .../nullableAnnotation_default.mustache | 1 + .../nullableAnnotation_jspecify.mustache | 1 + .../nullableArgumentWithEnum.mustache | 1 - .../nullableArgument_builder.mustache | 1 + .../main/resources/JavaSpring/pojo.mustache | 6 +- .../codegen/java/JavaClientCodegenTest.java | 2 - .../java/spring/SpringCodegenTest.java | 61 +- .../src/test/resources/3_0/java/jspecify.yaml | 12 +- .../java/org/openapitools/model/Category.java | 2 +- .../openapitools/model/ModelApiResponse.java | 2 +- .../java/org/openapitools/model/Order.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 2 +- .../java/org/openapitools/model/User.java | 2 +- .../java/org/openapitools/model/Category.java | 2 +- .../openapitools/model/ModelApiResponse.java | 2 +- .../java/org/openapitools/model/Order.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 2 +- .../java/org/openapitools/model/User.java | 2 +- .../.openapi-generator-ignore | 23 + .../.openapi-generator/FILES | 10 + .../.openapi-generator/VERSION | 1 + .../README.md | 27 + .../pom.xml | 92 +++ .../java/org/openapitools/api/ApiUtil.java | 21 + .../java/org/openapitools/api/FileApi.java | 68 ++ .../java/org/openapitools/api/FooApi.java | 90 +++ .../java/org/openapitools/api/UploadApi.java | 70 ++ .../org/openapitools/api/package-info.java | 2 + .../main/java/org/openapitools/model/Foo.java | 667 ++++++++++++++++++ .../org/openapitools/model/package-info.java | 2 + .../.openapi-generator-ignore | 23 + .../.openapi-generator/FILES | 10 + .../.openapi-generator/VERSION | 1 + .../README.md | 27 + .../springboot-4-jspecify-useOptional/pom.xml | 92 +++ .../java/org/openapitools/api/ApiUtil.java | 21 + .../java/org/openapitools/api/FileApi.java | 68 ++ .../java/org/openapitools/api/FooApi.java | 90 +++ .../java/org/openapitools/api/UploadApi.java | 70 ++ .../org/openapitools/api/package-info.java | 2 + .../main/java/org/openapitools/model/Foo.java | 667 ++++++++++++++++++ .../org/openapitools/model/package-info.java | 2 + .../java/org/openapitools/api/FooApi.java | 4 +- .../main/java/org/openapitools/model/Foo.java | 42 +- .../model/AdditionalPropertiesAnyType.java | 2 +- .../model/AdditionalPropertiesArray.java | 2 +- .../model/AdditionalPropertiesBoolean.java | 2 +- .../model/AdditionalPropertiesClass.java | 2 +- .../model/AdditionalPropertiesInteger.java | 2 +- .../model/AdditionalPropertiesNumber.java | 2 +- .../model/AdditionalPropertiesObject.java | 2 +- .../model/AdditionalPropertiesString.java | 2 +- .../java/org/openapitools/model/Animal.java | 2 +- .../model/ArrayOfArrayOfNumberOnly.java | 2 +- .../openapitools/model/ArrayOfNumberOnly.java | 2 +- .../org/openapitools/model/ArrayTest.java | 2 +- .../java/org/openapitools/model/BigCat.java | 2 +- .../openapitools/model/Capitalization.java | 2 +- .../main/java/org/openapitools/model/Cat.java | 2 +- .../java/org/openapitools/model/Category.java | 2 +- .../openapitools/model/ChildWithNullable.java | 2 +- .../org/openapitools/model/ClassModel.java | 2 +- .../java/org/openapitools/model/Client.java | 2 +- .../model/ContainerDefaultValue.java | 2 +- .../main/java/org/openapitools/model/Dog.java | 2 +- .../org/openapitools/model/EnumArrays.java | 2 +- .../java/org/openapitools/model/EnumTest.java | 2 +- .../java/org/openapitools/model/File.java | 2 +- .../model/FileSchemaTestClass.java | 2 +- .../org/openapitools/model/FormatTest.java | 2 +- .../openapitools/model/HasOnlyReadOnly.java | 2 +- .../java/org/openapitools/model/MapTest.java | 2 +- ...ropertiesAndAdditionalPropertiesClass.java | 2 +- .../openapitools/model/Model200Response.java | 2 +- .../openapitools/model/ModelApiResponse.java | 2 +- .../org/openapitools/model/ModelList.java | 2 +- .../org/openapitools/model/ModelReturn.java | 2 +- .../java/org/openapitools/model/Name.java | 2 +- .../model/NullableMapProperty.java | 2 +- .../org/openapitools/model/NumberOnly.java | 2 +- .../java/org/openapitools/model/Order.java | 2 +- .../openapitools/model/OuterComposite.java | 2 +- .../model/ParentWithNullable.java | 2 +- .../main/java/org/openapitools/model/Pet.java | 2 +- .../org/openapitools/model/ReadOnlyFirst.java | 2 +- ...ResponseObjectWithDifferentFieldNames.java | 2 +- .../openapitools/model/SpecialModelName.java | 2 +- .../main/java/org/openapitools/model/Tag.java | 2 +- .../openapitools/model/TypeHolderDefault.java | 2 +- .../openapitools/model/TypeHolderExample.java | 2 +- .../java/org/openapitools/model/User.java | 2 +- .../java/org/openapitools/model/XmlItem.java | 2 +- 99 files changed, 2350 insertions(+), 104 deletions(-) create mode 100644 bin/configs/spring-boot-4-jspecify_openapiNullable.yaml create mode 100644 bin/configs/spring-boot-4-jspecify_useOptional.yaml create mode 100644 modules/openapi-generator/src/main/resources/JavaSpring/nullableAnnotation_default.mustache create mode 100644 modules/openapi-generator/src/main/resources/JavaSpring/nullableAnnotation_jspecify.mustache delete mode 100644 modules/openapi-generator/src/main/resources/JavaSpring/nullableArgumentWithEnum.mustache create mode 100644 modules/openapi-generator/src/main/resources/JavaSpring/nullableArgument_builder.mustache create mode 100644 samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/.openapi-generator-ignore create mode 100644 samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/.openapi-generator/FILES create mode 100644 samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/.openapi-generator/VERSION create mode 100644 samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/README.md create mode 100644 samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/pom.xml create mode 100644 samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/src/main/java/org/openapitools/api/ApiUtil.java create mode 100644 samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/src/main/java/org/openapitools/api/FileApi.java create mode 100644 samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/src/main/java/org/openapitools/api/FooApi.java create mode 100644 samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/src/main/java/org/openapitools/api/UploadApi.java create mode 100644 samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/src/main/java/org/openapitools/api/package-info.java create mode 100644 samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/src/main/java/org/openapitools/model/Foo.java create mode 100644 samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/src/main/java/org/openapitools/model/package-info.java create mode 100644 samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/.openapi-generator-ignore create mode 100644 samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/.openapi-generator/FILES create mode 100644 samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/.openapi-generator/VERSION create mode 100644 samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/README.md create mode 100644 samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/pom.xml create mode 100644 samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/src/main/java/org/openapitools/api/ApiUtil.java create mode 100644 samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/src/main/java/org/openapitools/api/FileApi.java create mode 100644 samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/src/main/java/org/openapitools/api/FooApi.java create mode 100644 samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/src/main/java/org/openapitools/api/UploadApi.java create mode 100644 samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/src/main/java/org/openapitools/api/package-info.java create mode 100644 samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/src/main/java/org/openapitools/model/Foo.java create mode 100644 samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/src/main/java/org/openapitools/model/package-info.java diff --git a/bin/configs/spring-boot-4-jspecify_openapiNullable.yaml b/bin/configs/spring-boot-4-jspecify_openapiNullable.yaml new file mode 100644 index 000000000000..3c92265b7c43 --- /dev/null +++ b/bin/configs/spring-boot-4-jspecify_openapiNullable.yaml @@ -0,0 +1,24 @@ +generatorName: spring +library: spring-boot +outputDir: samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable +inputSpec: modules/openapi-generator/src/test/resources/3_0/java/jspecify.yaml +templateDir: modules/openapi-generator/src/main/resources/JavaSpring +validateSpec: false +additionalProperties: + groupId: org.openapitools.openapi3 + documentationProvider: springdoc + interfaceOnly: true + artifactId: springboot + snapshotVersion: "true" + useSpringBoot4: true + useJackson3: true + useBeanValidation: true + withXml: true + hideGenerationTimestamp: "true" + generateConstructorWithAllArgs: true + generateBuilders: true + openApiNullable: true + useJspecify: true +typeMappings: + OffsetDateTime: java.time.Instant + BigDecimal: java.math.BigDecimal \ No newline at end of file diff --git a/bin/configs/spring-boot-4-jspecify_useOptional.yaml b/bin/configs/spring-boot-4-jspecify_useOptional.yaml new file mode 100644 index 000000000000..ac5277d5ac75 --- /dev/null +++ b/bin/configs/spring-boot-4-jspecify_useOptional.yaml @@ -0,0 +1,25 @@ +generatorName: spring +library: spring-boot +outputDir: samples/openapi3/server/petstore/springboot-4-jspecify-useOptional +inputSpec: modules/openapi-generator/src/test/resources/3_0/java/jspecify.yaml +templateDir: modules/openapi-generator/src/main/resources/JavaSpring +validateSpec: false +additionalProperties: + groupId: org.openapitools.openapi3 + documentationProvider: springdoc + interfaceOnly: true + artifactId: springboot + snapshotVersion: "true" + useSpringBoot4: true + useJackson3: true + useBeanValidation: true + withXml: true + hideGenerationTimestamp: "true" + generateConstructorWithAllArgs: true + generateBuilders: true + useOptional: true + optionalAcceptNullable: true + useJspecify: true +typeMappings: + OffsetDateTime: java.time.Instant + BigDecimal: java.math.BigDecimal \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/Java/nullableArgumentWithEnum.mustache b/modules/openapi-generator/src/main/resources/Java/nullableArgumentWithEnum.mustache index c044a5474084..4c0dc1a4a864 100644 --- a/modules/openapi-generator/src/main/resources/Java/nullableArgumentWithEnum.mustache +++ b/modules/openapi-generator/src/main/resources/Java/nullableArgumentWithEnum.mustache @@ -1 +1 @@ -{{#lambda.trim}}{{>nullable_var_annotations}} {{#lambda.jSpecifyDatatype}}{{{datatypeWithEnum}}}{{/lambda.jSpecifyDatatype}}{{/lambda.trim}} \ No newline at end of file +{{#lambda.trim}}{{>nullable_var_annotations}} {{>nullableDataTypeWithEnum}}{{/lambda.trim}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/javaBuilder.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/javaBuilder.mustache index 6814c2983c71..845a78172e3e 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/javaBuilder.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/javaBuilder.mustache @@ -24,7 +24,7 @@ {{#deprecated}} @Deprecated {{/deprecated}} - public {{classname}}.Builder {{name}}({{#removeAnnotations}}{{{datatypeWithEnum}}}{{/removeAnnotations}} {{name}}) { + public {{classname}}.Builder {{name}}({{>nullableArgument_builder}} {{name}}) { this.instance.{{name}}({{name}}); return this; } @@ -37,7 +37,7 @@ {{/vars}} {{#parentVars}} @Override - public {{classname}}.Builder {{name}}({{#removeAnnotations}}{{{datatypeWithEnum}}}{{/removeAnnotations}} {{name}}) { + public {{classname}}.Builder {{name}}({{>nullableArgument_builder}} {{name}}) { this.instance.{{name}}({{name}}); return this; } diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/nullableAnnotation.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/nullableAnnotation.mustache index a3ff1bad10e2..65c0e39b2ead 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/nullableAnnotation.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/nullableAnnotation.mustache @@ -1 +1 @@ -{{#lambda.jSpecifyNullable}}{{^required}}{{^defaultValue}}{{^useOptional}}{{#openApiNullable}}{{^isNullable}}@Nullable {{/isNullable}}{{/openApiNullable}}{{^openApiNullable}}@Nullable {{/openApiNullable}}{{/useOptional}}{{/defaultValue}}{{#defaultValue}}{{^openApiNullable}}{{#isNullable}}@Nullable {{/isNullable}}{{/openApiNullable}}{{/defaultValue}}{{/required}}{{/lambda.jSpecifyNullable}} \ No newline at end of file +{{#paramName}}{{>nullableAnnotation_default}}{{/paramName}}{{^paramName}}{{>nullableAnnotation_jspecify}}{{^useJspecify}}{{!backward compatibility}}{{>nullableAnnotation_default}}{{/useJspecify}}{{/paramName}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/nullableAnnotation_default.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/nullableAnnotation_default.mustache new file mode 100644 index 000000000000..a3ff1bad10e2 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/JavaSpring/nullableAnnotation_default.mustache @@ -0,0 +1 @@ +{{#lambda.jSpecifyNullable}}{{^required}}{{^defaultValue}}{{^useOptional}}{{#openApiNullable}}{{^isNullable}}@Nullable {{/isNullable}}{{/openApiNullable}}{{^openApiNullable}}@Nullable {{/openApiNullable}}{{/useOptional}}{{/defaultValue}}{{#defaultValue}}{{^openApiNullable}}{{#isNullable}}@Nullable {{/isNullable}}{{/openApiNullable}}{{/defaultValue}}{{/required}}{{/lambda.jSpecifyNullable}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/nullableAnnotation_jspecify.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/nullableAnnotation_jspecify.mustache new file mode 100644 index 000000000000..225d7f0ff62c --- /dev/null +++ b/modules/openapi-generator/src/main/resources/JavaSpring/nullableAnnotation_jspecify.mustache @@ -0,0 +1 @@ +{{#useJspecify}}{{#lambda.jSpecifyNullable}}{{^required}}{{^useOptional}}{{#openApiNullable}}{{^isNullable}}@Nullable {{/isNullable}}{{/openApiNullable}}{{^openApiNullable}}@Nullable {{/openApiNullable}}{{/useOptional}}{{/required}}{{/lambda.jSpecifyNullable}}{{/useJspecify}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/nullableArgumentWithEnum.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/nullableArgumentWithEnum.mustache deleted file mode 100644 index 79f9c74ff5a5..000000000000 --- a/modules/openapi-generator/src/main/resources/JavaSpring/nullableArgumentWithEnum.mustache +++ /dev/null @@ -1 +0,0 @@ -{{#useJspecify}}{{#lambda.jSpecifyNullable}}{{^required}}@Nullable {{/required}}{{/lambda.jSpecifyNullable}}{{#lambda.jSpecifyDatatype}}{{{datatypeWithEnum}}}{{/lambda.jSpecifyDatatype}}{{/useJspecify}}{{^useJspecify}}{{>nullableAnnotation}}{{{datatypeWithEnum}}}{{/useJspecify}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/nullableArgument_builder.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/nullableArgument_builder.mustache new file mode 100644 index 000000000000..e42e412e8730 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/JavaSpring/nullableArgument_builder.mustache @@ -0,0 +1 @@ +{{#useJspecify}}{{^required}}{{#lambda.jSpecifyNullable}}{{^useOptional}}@Nullable {{/useOptional}}{{#useOptional}}{{#optionalAcceptNullable}}@Nullable {{/optionalAcceptNullable}}{{/useOptional}}{{/lambda.jSpecifyNullable}}{{/required}}{{#lambda.jSpecifyDatatype}}{{#removeAnnotations}}{{{datatypeWithEnum}}}{{/removeAnnotations}}{{/lambda.jSpecifyDatatype}}{{/useJspecify}}{{^useJspecify}}{{#removeAnnotations}}{{{datatypeWithEnum}}}{{/removeAnnotations}}{{/useJspecify}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache index 69b1d5694e89..964db40884ac 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache @@ -134,7 +134,7 @@ public {{>sealed}}class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}} /** * Constructor with all args parameters */ - public {{classname}}({{#vendorExtensions.x-java-all-args-constructor-vars}}{{>nullableArgumentWithEnum}} {{name}}{{^-last}}, {{/-last}}{{/vendorExtensions.x-java-all-args-constructor-vars}}) { + public {{classname}}({{#vendorExtensions.x-java-all-args-constructor-vars}}{{#useJspecify}}{{#lambda.jSpecifyNullable}}{{^required}}@Nullable {{/required}}{{/lambda.jSpecifyNullable}}{{#lambda.jSpecifyDatatype}}{{{datatypeWithEnum}}}{{/lambda.jSpecifyDatatype}}{{/useJspecify}}{{^useJspecify}}{{>nullableAnnotation}}{{{datatypeWithEnum}}}{{/useJspecify}} {{name}}{{^-last}}, {{/-last}}{{/vendorExtensions.x-java-all-args-constructor-vars}}) { {{#parent}} super({{#parentVars}}{{name}}{{^-last}}, {{/-last}}{{/parentVars}}); {{/parent}} @@ -153,7 +153,7 @@ public {{>sealed}}class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}} {{^lombok.Data}} {{! begin feature: fluent setter methods }} - public {{classname}} {{name}}({{>nullableArgumentWithEnum}} {{name}}) { + public {{classname}} {{name}}({{#useJspecify}}{{#lambda.jSpecifyNullable}}{{^required}}{{^useOptional}}@Nullable {{/useOptional}}{{#useOptional}}{{#optionalAcceptNullable}}@Nullable {{/optionalAcceptNullable}}{{/useOptional}}{{/required}}{{/lambda.jSpecifyNullable}}{{#lambda.jSpecifyDatatype}}{{{datatypeWithEnum}}}{{/lambda.jSpecifyDatatype}}{{/useJspecify}}{{^useJspecify}}{{>nullableAnnotation_default}}{{{datatypeWithEnum}}}{{/useJspecify}} {{name}}) { {{#openApiNullable}} this.{{name}} = {{#isNullable}}JsonNullable.of({{/isNullable}}{{#useOptional}}{{^required}}{{^isNullable}}{{^isContainer}}Optional.of{{#optionalAcceptNullable}}Nullable{{/optionalAcceptNullable}}({{/isContainer}}{{/isNullable}}{{/required}}{{/useOptional}}{{name}}{{#isNullable}}){{/isNullable}}{{#useOptional}}{{^required}}{{^isNullable}}{{^isContainer}}){{/isContainer}}{{/isNullable}}{{/required}}{{/useOptional}}; {{/openApiNullable}} @@ -348,7 +348,7 @@ public {{>sealed}}class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}} * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString({{>nullableAnnotation}}Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } {{/lombok.ToString}} diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java index 3cf8e016aca9..524cdea33887 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java @@ -34,7 +34,6 @@ import io.swagger.v3.parser.util.SchemaTypeUtil; import lombok.Getter; import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Assertions; import org.openapitools.codegen.*; import org.openapitools.codegen.config.CodegenConfigurator; @@ -75,7 +74,6 @@ import static org.openapitools.codegen.languages.JavaClientCodegen.*; import static org.testng.Assert.*; -@Slf4j public class JavaClientCodegenTest { private static final String JAVA_GENERATOR = "java"; diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java index 4ba6fea43f73..50e76c21fa35 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java @@ -5537,7 +5537,7 @@ public void testCollectionTypesWithDefaults_issue_18102() throws IOException { .fileContains("@Nullable Set stringSet") .fileContains("private Set stringDefaultSet = new LinkedHashSet<>(Arrays.asList(\"A\", \"B\"));") .fileContains("private Set stringEmptyDefaultSet = new LinkedHashSet<>();") - .fileContains("private String toIndentedString(@Nullable Object o)") + .fileContains("private String toIndentedString(Object o)") .fileDoesNotContain("private List<@Valid TagDto> tags = new ArrayList<>()") .fileDoesNotContain("private Set<@Valid TagDto> tagsUnique = new LinkedHashSet<>()") .fileDoesNotContain("private List stringList = new ArrayList<>()") @@ -7047,6 +7047,7 @@ public void testJspecify(String library, int springBootVersion, String fooApiFil USE_BEANVALIDATION, true, GENERATE_CONSTRUCTOR_WITH_ALL_ARGS, true, INTERFACE_ONLY, false, + GENERATE_BUILDERS, true, springVersionProperty, springBootVersion > 2 ), codegenConfigurator -> @@ -7072,14 +7073,23 @@ public void testJspecify(String library, int springBootVersion, String fooApiFil "private org.springframework.core.io.@Nullable Resource binary", "setBinary(org.springframework.core.io.@Nullable Resource binary)", "public Foo(java.time.@Nullable Instant dt, java.time.@Nullable Instant nullableDt, org.springframework.core.io.@Nullable Resource binary, org.springframework.core.io.@Nullable Resource nullableBinary, @Nullable List listOfDt, @Nullable List listMinIntems, @Nullable List nullableListMinIntems, java.time.Instant requiredDt, @Nullable BigDecimal number, @Nullable BigDecimal nullableNumber, @Nullable String color, String requiredColor, @Nullable String nullableColor) {", - "Foo listOfDt(@Nullable List listOfDt) {" + "Foo listOfDt(@Nullable List listOfDt) {", + "private @Nullable String color = \"red\";", + "public @Nullable String getColor() {", + "public void setColor(@Nullable String color) {", + "Foo color(@Nullable String color) {", + "private String toIndentedString(@Nullable Object o)", + "Foo.Builder dt(java.time.@Nullable Instant dt)", + "Foo.Builder requiredDt(java.time.Instant requiredDt)", + "Foo.Builder nullableNumber(@Nullable BigDecimal nullableNumber)" ); JavaFileAssert.assertThat(files.get(fooApiFilename)) .assertTypeAnnotations().doesImportAnnotation("org.jspecify.annotations.Nullable").toType() .fileContains( "java.time.@Nullable Instant dtParam", "java.time.@Nullable Instant dtQuery", - "java.time.@Nullable Instant dtCookie" + "java.time.@Nullable Instant dtCookie", + " @RequestParam(value = \"color\", required = false, defaultValue = \"red\") String color" ); JavaFileAssert.assertThat(files.get("api/package-info.java")) .fileContains("@org.jspecify.annotations.NullMarked"); @@ -7105,6 +7115,7 @@ public void testJspecify_openapiNullable(String library, int springBootVersion, GENERATE_CONSTRUCTOR_WITH_ALL_ARGS, true, CodegenConstants.OPENAPI_NULLABLE, true, INTERFACE_ONLY, false, + GENERATE_BUILDERS, true, springVersionProperty, springBootVersion > 2 ), codegenConfigurator -> @@ -7130,7 +7141,14 @@ public void testJspecify_openapiNullable(String library, int springBootVersion, "private org.springframework.core.io.@Nullable Resource binary", "setBinary(org.springframework.core.io.@Nullable Resource binary)", "Foo nullableDt(java.time.@Nullable Instant nullableDt) {", - "public Foo(java.time.@Nullable Instant dt, java.time.@Nullable Instant nullableDt, org.springframework.core.io.@Nullable Resource binary, org.springframework.core.io.@Nullable Resource nullableBinary, @Nullable List listOfDt, @Nullable List listMinIntems, @Nullable List nullableListMinIntems, java.time.Instant requiredDt, @Nullable BigDecimal number, @Nullable BigDecimal nullableNumber, @Nullable String color, String requiredColor, @Nullable String nullableColor) {" + "private @Nullable String color = \"red\";", + "public Foo color(@Nullable String color) {", + "public @Nullable String getColor() {", + "public Foo(java.time.@Nullable Instant dt, java.time.@Nullable Instant nullableDt, org.springframework.core.io.@Nullable Resource binary, org.springframework.core.io.@Nullable Resource nullableBinary, @Nullable List listOfDt, @Nullable List listMinIntems, @Nullable List nullableListMinIntems, java.time.Instant requiredDt, @Nullable BigDecimal number, @Nullable BigDecimal nullableNumber, @Nullable String color, String requiredColor, @Nullable String nullableColor) {", + "Foo.Builder dt(java.time.@Nullable Instant dt)", + "Foo.Builder requiredDt(java.time.Instant requiredDt)", + "Foo.Builder nullableNumber(@Nullable BigDecimal nullableNumber)", + "Foo.Builder nullableNumber(JsonNullable nullableNumber)" ); JavaFileAssert.assertThat(files.get(fooApiFilename)) .assertTypeAnnotations().doesImportAnnotation("org.jspecify.annotations.Nullable").toType() @@ -7153,17 +7171,29 @@ public void testJspecify_openapiNullable(String library, int springBootVersion, } } - @Test(dataProvider = "jspecifyLibraries") - public void testJspecify_useOptional(String library, int springBootVersion, String fooApiFilename) throws IOException { + @DataProvider(name = "jspecifyLibrariesUseOptional") + public Object[][] jspecifyLibrariesUseOptional() { + return new Object[][]{ + {SPRING_BOOT, 4, "FooApi.java", false}, + {SPRING_BOOT, 4, "FooApi.java", true}, + {SPRING_CLOUD_LIBRARY, 3, "FooApi.java", false}, + {SPRING_CLOUD_LIBRARY, 3, "FooApi.java", true}, + {SPRING_HTTP_INTERFACE, 4, "DefaultApi.java", false}, + {SPRING_HTTP_INTERFACE, 4, "DefaultApi.java", true} + }; + } + @Test(dataProvider = "jspecifyLibrariesUseOptional") + public void testJspecify_useOptional(String library, int springBootVersion, String fooApiFilename, boolean optionalAcceptNullable) throws IOException { String springVersionProperty = springBootVersion == 4? USE_SPRING_BOOT4: USE_SPRING_BOOT3; final Map files = generateFromContract("src/test/resources/3_0/java/jspecify.yaml", library, Map.of(USE_JSPECIFY, true, CONTAINER_DEFAULT_TO_NULL, true, USE_BEANVALIDATION, true, GENERATE_CONSTRUCTOR_WITH_ALL_ARGS, true, -// CodegenConstants.OPENAPI_NULLABLE, true, SpringCodegen.USE_OPTIONAL, true, + OPTIONAL_ACCEPT_NULLABLE, optionalAcceptNullable, INTERFACE_ONLY, false, + GENERATE_BUILDERS, true, springVersionProperty, springBootVersion > 2 ), codegenConfigurator -> @@ -7182,15 +7212,26 @@ public void testJspecify_useOptional(String library, int springBootVersion, Stri "1.0.0") .doesNotContain("findbugs"); } - JavaFileAssert.assertThat(files.get("Foo.java")) + JavaFileAssert fooAssert = JavaFileAssert.assertThat(files.get("Foo.java")); + fooAssert .assertTypeAnnotations().doesImportAnnotation("org.jspecify.annotations.Nullable").toType() .fileContains( "private Optional dt = Optional.empty()", "private JsonNullable nullableBinary = JsonNullable.undefined();", "setBinary(Optional binary)", - "Foo nullableDt(java.time.@Nullable Instant nullableDt) {", - "public Foo(java.time.@Nullable Instant dt, java.time.@Nullable Instant nullableDt, org.springframework.core.io.@Nullable Resource binary, org.springframework.core.io.@Nullable Resource nullableBinary, @Nullable List listOfDt, @Nullable List listMinIntems, @Nullable List nullableListMinIntems, java.time.Instant requiredDt, @Nullable BigDecimal number, @Nullable BigDecimal nullableNumber, @Nullable String color, String requiredColor, @Nullable String nullableColor) {" + "public Foo(java.time.@Nullable Instant dt, java.time.@Nullable Instant nullableDt, org.springframework.core.io.@Nullable Resource binary, org.springframework.core.io.@Nullable Resource nullableBinary, @Nullable List listOfDt, @Nullable List listMinIntems, @Nullable List nullableListMinIntems, java.time.Instant requiredDt, @Nullable BigDecimal number, @Nullable BigDecimal nullableNumber, @Nullable String color, String requiredColor, @Nullable String nullableColor) {", + "Foo.Builder requiredDt(java.time.Instant requiredDt)", + "Foo.Builder nullableNumber(JsonNullable nullableNumber)" ); + if (optionalAcceptNullable) { + fooAssert.fileContains( + "Foo dt(java.time.@Nullable Instant dt) {", + "Foo.Builder dt(java.time.@Nullable Instant dt) {"); + } else { + fooAssert.fileContains( + "Foo dt(java.time.Instant dt) {", + "Foo.Builder dt(java.time.Instant dt) {"); + } JavaFileAssert.assertThat(files.get(fooApiFilename)) .assertTypeAnnotations().doesImportAnnotation("org.jspecify.annotations.Nullable").toType() .fileContains( diff --git a/modules/openapi-generator/src/test/resources/3_0/java/jspecify.yaml b/modules/openapi-generator/src/test/resources/3_0/java/jspecify.yaml index 0727afff939d..85a061be3c87 100644 --- a/modules/openapi-generator/src/test/resources/3_0/java/jspecify.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/java/jspecify.yaml @@ -24,6 +24,11 @@ paths: schema: type: string format: date-time + - in: query + name: color + schema: + type: string + default: red responses: default: description: response @@ -107,13 +112,16 @@ components: type: number nullable: true color: - default: red type: string + default: red requiredColor: default: red type: string nullableColor: - default: red type: string + default: red nullable: true + + + diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Category.java index 785088a60070..d5769fa5e666 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Category.java @@ -100,7 +100,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } } diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/ModelApiResponse.java index 97f67087df1b..045631fe1d54 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -127,7 +127,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } } diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Order.java index c0d85125abc2..5e3a900211f9 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Order.java @@ -241,7 +241,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } } diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Pet.java index 819444909ebb..4e2975bfa72e 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Pet.java @@ -276,7 +276,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } } diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Tag.java index 3d3b2de5b80a..3ac8f1630371 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Tag.java @@ -100,7 +100,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } } diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/User.java index c24c06fe7563..77dcf9825c86 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/User.java @@ -250,7 +250,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } } diff --git a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Category.java index 379ef08836f8..dbf469c8a29d 100644 --- a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Category.java @@ -103,7 +103,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } } diff --git a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/ModelApiResponse.java index 1822b26b00b8..adb817548950 100644 --- a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -131,7 +131,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } } diff --git a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Order.java index cd1bb401520a..d4ce7756adbf 100644 --- a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Order.java @@ -248,7 +248,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } } diff --git a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Pet.java index e7ed1e26b8fa..c21fc068dae5 100644 --- a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Pet.java @@ -281,7 +281,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } } diff --git a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Tag.java index 3a5389dc75b8..214ba439e558 100644 --- a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/Tag.java @@ -103,7 +103,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } } diff --git a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/User.java index d7384260b257..d41f0454d85d 100644 --- a/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/client/petstore/spring-cloud-4-with-optional/src/main/java/org/openapitools/model/User.java @@ -259,7 +259,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } } diff --git a/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/.openapi-generator-ignore b/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/.openapi-generator-ignore new file mode 100644 index 000000000000..7484ee590a38 --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/.openapi-generator-ignore @@ -0,0 +1,23 @@ +# OpenAPI Generator Ignore +# Generated by openapi-generator https://github.com/openapitools/openapi-generator + +# Use this file to prevent files from being overwritten by the generator. +# The patterns follow closely to .gitignore or .dockerignore. + +# As an example, the C# client generator defines ApiClient.cs. +# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: +#ApiClient.cs + +# You can match any string of characters against a directory, file or extension with a single asterisk (*): +#foo/*/qux +# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux + +# You can recursively match patterns against a directory, file or extension with a double asterisk (**): +#foo/**/qux +# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux + +# You can also negate patterns with an exclamation (!). +# For example, you can ignore all files in a docs folder with the file extension .md: +#docs/*.md +# Then explicitly reverse the ignore rule for a single file: +#!docs/README.md diff --git a/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/.openapi-generator/FILES b/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/.openapi-generator/FILES new file mode 100644 index 000000000000..25e6aa78765c --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/.openapi-generator/FILES @@ -0,0 +1,10 @@ +.openapi-generator-ignore +README.md +pom.xml +src/main/java/org/openapitools/api/ApiUtil.java +src/main/java/org/openapitools/api/FileApi.java +src/main/java/org/openapitools/api/FooApi.java +src/main/java/org/openapitools/api/UploadApi.java +src/main/java/org/openapitools/api/package-info.java +src/main/java/org/openapitools/model/Foo.java +src/main/java/org/openapitools/model/package-info.java diff --git a/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/.openapi-generator/VERSION b/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/.openapi-generator/VERSION new file mode 100644 index 000000000000..8fc8df61083a --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/.openapi-generator/VERSION @@ -0,0 +1 @@ +7.25.0-SNAPSHOT diff --git a/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/README.md b/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/README.md new file mode 100644 index 000000000000..d43a1de307df --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/README.md @@ -0,0 +1,27 @@ + +# OpenAPI generated API stub + +Spring Framework stub + + +## Overview +This code was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. +By using the [OpenAPI-Spec](https://openapis.org), you can easily generate an API stub. +This is an example of building API stub interfaces in Java using the Spring framework. + +The stubs generated can be used in your existing Spring-MVC or Spring-Boot application to create controller endpoints +by adding ```@Controller``` classes that implement the interface. Eg: +```java +@Controller +public class PetController implements PetApi { +// implement all PetApi methods +} +``` + +You can also use the interface to create [Spring-Cloud Feign clients](http://projects.spring.io/spring-cloud/spring-cloud.html#spring-cloud-feign-inheritance).Eg: +```java +@FeignClient(name="pet", url="http://petstore.swagger.io/v2") +public interface PetClient extends PetApi { + +} +``` diff --git a/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/pom.xml b/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/pom.xml new file mode 100644 index 000000000000..720b0f0cb884 --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/pom.xml @@ -0,0 +1,92 @@ + + 4.0.0 + org.openapitools.openapi3 + springboot + jar + springboot + 1.0.0-SNAPSHOT + + 17 + ${java.version} + UTF-8 + 2.6.0 + 5.17.14 + + + org.springframework.boot + spring-boot-starter-parent + 4.0.1 + + + + + src/main/java + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + + + + + + + org.springframework.boot + spring-boot-starter-webmvc + + + org.springframework.boot + spring-boot-starter-restclient + + + org.springframework.data + spring-data-commons + + + + org.springdoc + springdoc-openapi-starter-webmvc-ui + ${springdoc.version} + + + + jakarta.xml.bind + jakarta.xml.bind-api + + + tools.jackson.dataformat + jackson-dataformat-xml + + + org.openapitools + jackson-databind-nullable + 0.2.8 + + + + org.springframework.boot + spring-boot-starter-validation + + + tools.jackson.core + jackson-databind + + + org.springframework.boot + spring-boot-starter-webmvc-test + test + + + org.springframework.boot + spring-boot-starter-restclient + test + + + diff --git a/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/src/main/java/org/openapitools/api/ApiUtil.java b/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/src/main/java/org/openapitools/api/ApiUtil.java new file mode 100644 index 000000000000..44bf770ccc47 --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/src/main/java/org/openapitools/api/ApiUtil.java @@ -0,0 +1,21 @@ +package org.openapitools.api; + +import org.springframework.web.context.request.NativeWebRequest; + +import jakarta.servlet.http.HttpServletResponse; +import java.io.IOException; + +public class ApiUtil { + public static void setExampleResponse(NativeWebRequest req, String contentType, String example) { + try { + HttpServletResponse res = req.getNativeResponse(HttpServletResponse.class); + if (res != null) { + res.setCharacterEncoding("UTF-8"); + res.addHeader("Content-Type", contentType); + res.getWriter().print(example); + } + } catch (IOException e) { + throw new RuntimeException(e); + } + } +} diff --git a/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/src/main/java/org/openapitools/api/FileApi.java b/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/src/main/java/org/openapitools/api/FileApi.java new file mode 100644 index 000000000000..0c4ff45ac8b3 --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/src/main/java/org/openapitools/api/FileApi.java @@ -0,0 +1,68 @@ +/* + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.25.0-SNAPSHOT). + * https://openapi-generator.tech + * Do not edit the class manually. + */ +package org.openapitools.api; + +import io.swagger.v3.oas.annotations.ExternalDocumentation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.media.ArraySchema; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.enums.ParameterIn; +import io.swagger.v3.oas.annotations.media.ExampleObject; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.context.request.NativeWebRequest; +import org.springframework.web.multipart.MultipartFile; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.*; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import jakarta.annotation.Generated; + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") +@Validated +@Tag(name = "file", description = "the file API") +public interface FileApi { + + default Optional getRequest() { + return Optional.empty(); + } + + String PATH_FILE_ID_GET = "/file/{id}"; + /** + * GET /file/{id} + * + * @param id (required) + * @return ok (status code 200) + */ + @Operation( + operationId = "fileIdGet", + responses = { + @ApiResponse(responseCode = "200", description = "ok") + } + ) + @RequestMapping( + method = RequestMethod.GET, + value = FileApi.PATH_FILE_ID_GET + ) + default ResponseEntity fileIdGet( + @Parameter(name = "id", description = "", required = true, in = ParameterIn.PATH) @PathVariable("id") String id + ) { + return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + + } + +} diff --git a/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/src/main/java/org/openapitools/api/FooApi.java b/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/src/main/java/org/openapitools/api/FooApi.java new file mode 100644 index 000000000000..1b972b696c3d --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/src/main/java/org/openapitools/api/FooApi.java @@ -0,0 +1,90 @@ +/* + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.25.0-SNAPSHOT). + * https://openapi-generator.tech + * Do not edit the class manually. + */ +package org.openapitools.api; + +import org.springframework.format.annotation.DateTimeFormat; +import org.openapitools.model.Foo; +import org.jspecify.annotations.Nullable; +import java.time.OffsetDateTime; +import io.swagger.v3.oas.annotations.ExternalDocumentation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.media.ArraySchema; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.enums.ParameterIn; +import io.swagger.v3.oas.annotations.media.ExampleObject; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.context.request.NativeWebRequest; +import org.springframework.web.multipart.MultipartFile; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.*; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import jakarta.annotation.Generated; + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") +@Validated +@Tag(name = "foo", description = "the foo API") +public interface FooApi { + + default Optional getRequest() { + return Optional.empty(); + } + + String PATH_FOO_DT_PARAM_GET = "/foo/{dtParam}"; + /** + * GET /foo/{dtParam} + * + * @param dtParam (optional) + * @param dtQuery (optional) + * @param dtCookie (optional) + * @param color (optional, default to red) + * @return response (status code 200) + */ + @Operation( + operationId = "fooDtParamGet", + responses = { + @ApiResponse(responseCode = "default", description = "response", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = Foo.class)) + }) + } + ) + @RequestMapping( + method = RequestMethod.GET, + value = FooApi.PATH_FOO_DT_PARAM_GET, + produces = { "application/json" } + ) + default ResponseEntity fooDtParamGet( + @Parameter(name = "dtParam", description = "", in = ParameterIn.PATH) @PathVariable("dtParam") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) java.time.@Nullable Instant dtParam, + @Parameter(name = "dtQuery", description = "", in = ParameterIn.QUERY) @Valid @RequestParam(value = "dtQuery", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) java.time.@Nullable Instant dtQuery, + @Parameter(name = "dtCookie", description = "", in = ParameterIn.COOKIE) @CookieValue(name = "dtCookie", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) java.time.@Nullable Instant dtCookie, + @Parameter(name = "color", description = "", in = ParameterIn.QUERY) @Valid @RequestParam(value = "color", required = false, defaultValue = "red") String color + ) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"dt\" : \"2000-01-23T04:56:07.000+00:00\", \"nullableDt\" : \"2000-01-23T04:56:07.000+00:00\", \"binary\" : \"\", \"nullableBinary\" : \"\", \"listOfDt\" : [ \"2000-01-23T04:56:07.000+00:00\", \"2000-01-23T04:56:07.000+00:00\" ], \"listMinIntems\" : [ \"2000-01-23T04:56:07.000+00:00\", \"2000-01-23T04:56:07.000+00:00\" ], \"nullableListMinIntems\" : [ \"2000-01-23T04:56:07.000+00:00\", \"2000-01-23T04:56:07.000+00:00\" ], \"requiredDt\" : \"2000-01-23T04:56:07.000+00:00\", \"number\" : 0.8008281904610115, \"nullableNumber\" : 6.027456183070403, \"color\" : \"red\", \"requiredColor\" : \"red\", \"nullableColor\" : \"red\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + } + }); + return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + + } + +} diff --git a/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/src/main/java/org/openapitools/api/UploadApi.java b/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/src/main/java/org/openapitools/api/UploadApi.java new file mode 100644 index 000000000000..5d679bf128a3 --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/src/main/java/org/openapitools/api/UploadApi.java @@ -0,0 +1,70 @@ +/* + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.25.0-SNAPSHOT). + * https://openapi-generator.tech + * Do not edit the class manually. + */ +package org.openapitools.api; + +import org.jspecify.annotations.Nullable; +import io.swagger.v3.oas.annotations.ExternalDocumentation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.media.ArraySchema; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.enums.ParameterIn; +import io.swagger.v3.oas.annotations.media.ExampleObject; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.context.request.NativeWebRequest; +import org.springframework.web.multipart.MultipartFile; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.*; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import jakarta.annotation.Generated; + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") +@Validated +@Tag(name = "upload", description = "the upload API") +public interface UploadApi { + + default Optional getRequest() { + return Optional.empty(); + } + + String PATH_UPLOAD_POST = "/upload"; + /** + * POST /upload + * + * @param file (optional) + * @return ok (status code 200) + */ + @Operation( + operationId = "uploadPost", + responses = { + @ApiResponse(responseCode = "default", description = "ok") + } + ) + @RequestMapping( + method = RequestMethod.POST, + value = UploadApi.PATH_UPLOAD_POST, + consumes = { "multipart/form-data" } + ) + default ResponseEntity uploadPost( + @Parameter(name = "file", description = "") @RequestPart(value = "file", required = false) MultipartFile file + ) { + return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + + } + +} diff --git a/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/src/main/java/org/openapitools/api/package-info.java b/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/src/main/java/org/openapitools/api/package-info.java new file mode 100644 index 000000000000..46e4608c520d --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/src/main/java/org/openapitools/api/package-info.java @@ -0,0 +1,2 @@ +@org.jspecify.annotations.NullMarked +package org.openapitools.api; diff --git a/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/src/main/java/org/openapitools/model/Foo.java b/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/src/main/java/org/openapitools/model/Foo.java new file mode 100644 index 000000000000..8e024c35235d --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/src/main/java/org/openapitools/model/Foo.java @@ -0,0 +1,667 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import java.math.BigDecimal; +import java.time.OffsetDateTime; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import org.jspecify.annotations.Nullable; +import org.openapitools.jackson.nullable.JsonNullable; +import org.springframework.format.annotation.DateTimeFormat; +import java.util.NoSuchElementException; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import jakarta.validation.Valid; +import jakarta.validation.constraints.*; +import tools.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import tools.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import tools.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import io.swagger.v3.oas.annotations.media.Schema; + +import jakarta.xml.bind.annotation.*; + +import java.util.*; +import jakarta.annotation.Generated; + +/** + * Foo + */ + +@JacksonXmlRootElement(localName = "Foo") +@XmlRootElement(name = "Foo") +@XmlAccessorType(XmlAccessType.FIELD) +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") +public class Foo { + + @JsonInclude(JsonInclude.Include.NON_NULL) + @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) + private java.time.@Nullable Instant dt; + + @JsonInclude(JsonInclude.Include.NON_ABSENT) + @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) + private JsonNullable nullableDt = JsonNullable.undefined(); + + @JsonInclude(JsonInclude.Include.NON_NULL) + private org.springframework.core.io.@Nullable Resource binary; + + @JsonInclude(JsonInclude.Include.NON_ABSENT) + private JsonNullable nullableBinary = JsonNullable.undefined(); + + @JsonInclude(JsonInclude.Include.NON_NULL) + private @Nullable List listOfDt = new ArrayList<>(); + + @JsonInclude(JsonInclude.Include.NON_NULL) + private @Nullable List listMinIntems = new ArrayList<>(); + + @JsonInclude(JsonInclude.Include.NON_ABSENT) + private JsonNullable> nullableListMinIntems = JsonNullable.>undefined(); + + @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) + private java.time.Instant requiredDt; + + @JsonInclude(JsonInclude.Include.NON_NULL) + private java.math.@Nullable BigDecimal number; + + @JsonInclude(JsonInclude.Include.NON_ABSENT) + private JsonNullable nullableNumber = JsonNullable.undefined(); + + @JsonInclude(JsonInclude.Include.NON_NULL) + private @Nullable String color = "red"; + + private String requiredColor = "red"; + + @JsonInclude(JsonInclude.Include.NON_ABSENT) + private JsonNullable nullableColor = JsonNullable.undefined(); + + public Foo() { + super(); + } + + /** + * Constructor with only required parameters + */ + public Foo(java.time.Instant requiredDt, String requiredColor) { + this.requiredDt = requiredDt; + this.requiredColor = requiredColor; + } + + /** + * Constructor with all args parameters + */ + public Foo(java.time.@Nullable Instant dt, java.time.@Nullable Instant nullableDt, org.springframework.core.io.@Nullable Resource binary, org.springframework.core.io.@Nullable Resource nullableBinary, @Nullable List listOfDt, @Nullable List listMinIntems, @Nullable List nullableListMinIntems, java.time.Instant requiredDt, java.math.@Nullable BigDecimal number, java.math.@Nullable BigDecimal nullableNumber, @Nullable String color, String requiredColor, @Nullable String nullableColor) { + this.dt = dt; + this.nullableDt = JsonNullable.of(nullableDt); + this.binary = binary; + this.nullableBinary = JsonNullable.of(nullableBinary); + this.listOfDt = listOfDt; + this.listMinIntems = listMinIntems; + this.nullableListMinIntems = JsonNullable.of(nullableListMinIntems); + this.requiredDt = requiredDt; + this.number = number; + this.nullableNumber = JsonNullable.of(nullableNumber); + this.color = color; + this.requiredColor = requiredColor; + this.nullableColor = JsonNullable.of(nullableColor); + } + + public Foo dt(java.time.@Nullable Instant dt) { + this.dt = dt; + return this; + } + + /** + * Get dt + * @return dt + */ + @Valid + @Schema(name = "dt", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("dt") + @JacksonXmlProperty(localName = "dt") + @XmlElement(name = "dt") + public java.time.@Nullable Instant getDt() { + return dt; + } + + @JsonProperty("dt") + @JacksonXmlProperty(localName = "dt") + public void setDt(java.time.@Nullable Instant dt) { + this.dt = dt; + } + + public Foo nullableDt(java.time.@Nullable Instant nullableDt) { + this.nullableDt = JsonNullable.of(nullableDt); + return this; + } + + /** + * Get nullableDt + * @return nullableDt + */ + @Valid + @Schema(name = "nullableDt", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullableDt") + @JacksonXmlProperty(localName = "nullableDt") + @XmlElement(name = "nullableDt") + public JsonNullable getNullableDt() { + return nullableDt; + } + + public void setNullableDt(JsonNullable nullableDt) { + this.nullableDt = nullableDt; + } + + public Foo binary(org.springframework.core.io.@Nullable Resource binary) { + this.binary = binary; + return this; + } + + /** + * Get binary + * @return binary + */ + @Valid + @Schema(name = "binary", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("binary") + @JacksonXmlProperty(localName = "binary") + @XmlElement(name = "binary") + public org.springframework.core.io.@Nullable Resource getBinary() { + return binary; + } + + @JsonProperty("binary") + @JacksonXmlProperty(localName = "binary") + public void setBinary(org.springframework.core.io.@Nullable Resource binary) { + this.binary = binary; + } + + public Foo nullableBinary(org.springframework.core.io.@Nullable Resource nullableBinary) { + this.nullableBinary = JsonNullable.of(nullableBinary); + return this; + } + + /** + * Get nullableBinary + * @return nullableBinary + */ + @Valid + @Schema(name = "nullableBinary", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullableBinary") + @JacksonXmlProperty(localName = "nullableBinary") + @XmlElement(name = "nullableBinary") + public JsonNullable getNullableBinary() { + return nullableBinary; + } + + public void setNullableBinary(JsonNullable nullableBinary) { + this.nullableBinary = nullableBinary; + } + + public Foo listOfDt(@Nullable List listOfDt) { + this.listOfDt = listOfDt; + return this; + } + + public Foo addListOfDtItem(java.time.Instant listOfDtItem) { + if (this.listOfDt == null) { + this.listOfDt = new ArrayList<>(); + } + this.listOfDt.add(listOfDtItem); + return this; + } + + /** + * Get listOfDt + * @return listOfDt + */ + @Valid + @Schema(name = "listOfDt", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("listOfDt") + @JacksonXmlProperty(localName = "listOfDt") + @JacksonXmlElementWrapper(useWrapping = false) + @XmlElement(name = "listOfDt") + public @Nullable List getListOfDt() { + return listOfDt; + } + + @JsonProperty("listOfDt") + @JacksonXmlProperty(localName = "listOfDt") + @JacksonXmlElementWrapper(useWrapping = false) + public void setListOfDt(@Nullable List listOfDt) { + this.listOfDt = listOfDt; + } + + public Foo listMinIntems(@Nullable List listMinIntems) { + this.listMinIntems = listMinIntems; + return this; + } + + public Foo addListMinIntemsItem(java.time.Instant listMinIntemsItem) { + if (this.listMinIntems == null) { + this.listMinIntems = new ArrayList<>(); + } + this.listMinIntems.add(listMinIntemsItem); + return this; + } + + /** + * Get listMinIntems + * @return listMinIntems + */ + @Valid @Size(min = 1) + @Schema(name = "listMinIntems", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("listMinIntems") + @JacksonXmlProperty(localName = "listMinIntems") + @JacksonXmlElementWrapper(useWrapping = false) + @XmlElement(name = "listMinIntems") + public @Nullable List getListMinIntems() { + return listMinIntems; + } + + @JsonProperty("listMinIntems") + @JacksonXmlProperty(localName = "listMinIntems") + @JacksonXmlElementWrapper(useWrapping = false) + public void setListMinIntems(@Nullable List listMinIntems) { + this.listMinIntems = listMinIntems; + } + + public Foo nullableListMinIntems(@Nullable List nullableListMinIntems) { + this.nullableListMinIntems = JsonNullable.of(nullableListMinIntems); + return this; + } + + public Foo addNullableListMinIntemsItem(java.time.Instant nullableListMinIntemsItem) { + if (this.nullableListMinIntems == null || !this.nullableListMinIntems.isPresent()) { + this.nullableListMinIntems = JsonNullable.of(new ArrayList<>()); + } + this.nullableListMinIntems.get().add(nullableListMinIntemsItem); + return this; + } + + /** + * Get nullableListMinIntems + * @return nullableListMinIntems + */ + @Valid @Size(min = 1) + @Schema(name = "nullableListMinIntems", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullableListMinIntems") + @JacksonXmlProperty(localName = "nullableListMinIntems") + @JacksonXmlElementWrapper(useWrapping = false) + @XmlElement(name = "nullableListMinIntems") + public JsonNullable> getNullableListMinIntems() { + return nullableListMinIntems; + } + + public void setNullableListMinIntems(JsonNullable> nullableListMinIntems) { + this.nullableListMinIntems = nullableListMinIntems; + } + + public Foo requiredDt(java.time.Instant requiredDt) { + this.requiredDt = requiredDt; + return this; + } + + /** + * Get requiredDt + * @return requiredDt + */ + @NotNull @Valid + @Schema(name = "requiredDt", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("requiredDt") + @JacksonXmlProperty(localName = "requiredDt") + @XmlElement(name = "requiredDt") + public java.time.Instant getRequiredDt() { + return requiredDt; + } + + @JsonProperty("requiredDt") + @JacksonXmlProperty(localName = "requiredDt") + public void setRequiredDt(java.time.Instant requiredDt) { + this.requiredDt = requiredDt; + } + + public Foo number(java.math.@Nullable BigDecimal number) { + this.number = number; + return this; + } + + /** + * Get number + * @return number + */ + @Valid + @Schema(name = "number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("number") + @JacksonXmlProperty(localName = "number") + @XmlElement(name = "number") + public java.math.@Nullable BigDecimal getNumber() { + return number; + } + + @JsonProperty("number") + @JacksonXmlProperty(localName = "number") + public void setNumber(java.math.@Nullable BigDecimal number) { + this.number = number; + } + + public Foo nullableNumber(java.math.@Nullable BigDecimal nullableNumber) { + this.nullableNumber = JsonNullable.of(nullableNumber); + return this; + } + + /** + * Get nullableNumber + * @return nullableNumber + */ + @Valid + @Schema(name = "nullableNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullableNumber") + @JacksonXmlProperty(localName = "nullableNumber") + @XmlElement(name = "nullableNumber") + public JsonNullable getNullableNumber() { + return nullableNumber; + } + + public void setNullableNumber(JsonNullable nullableNumber) { + this.nullableNumber = nullableNumber; + } + + public Foo color(@Nullable String color) { + this.color = color; + return this; + } + + /** + * Get color + * @return color + */ + + @Schema(name = "color", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("color") + @JacksonXmlProperty(localName = "color") + @XmlElement(name = "color") + public @Nullable String getColor() { + return color; + } + + @JsonProperty("color") + @JacksonXmlProperty(localName = "color") + public void setColor(@Nullable String color) { + this.color = color; + } + + public Foo requiredColor(String requiredColor) { + this.requiredColor = requiredColor; + return this; + } + + /** + * Get requiredColor + * @return requiredColor + */ + @NotNull + @Schema(name = "requiredColor", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("requiredColor") + @JacksonXmlProperty(localName = "requiredColor") + @XmlElement(name = "requiredColor") + public String getRequiredColor() { + return requiredColor; + } + + @JsonProperty("requiredColor") + @JacksonXmlProperty(localName = "requiredColor") + public void setRequiredColor(String requiredColor) { + this.requiredColor = requiredColor; + } + + public Foo nullableColor(@Nullable String nullableColor) { + this.nullableColor = JsonNullable.of(nullableColor); + return this; + } + + /** + * Get nullableColor + * @return nullableColor + */ + + @Schema(name = "nullableColor", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullableColor") + @JacksonXmlProperty(localName = "nullableColor") + @XmlElement(name = "nullableColor") + public JsonNullable getNullableColor() { + return nullableColor; + } + + public void setNullableColor(JsonNullable nullableColor) { + this.nullableColor = nullableColor; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Foo foo = (Foo) o; + return Objects.equals(this.dt, foo.dt) && + equalsNullable(this.nullableDt, foo.nullableDt) && + Objects.equals(this.binary, foo.binary) && + equalsNullable(this.nullableBinary, foo.nullableBinary) && + Objects.equals(this.listOfDt, foo.listOfDt) && + Objects.equals(this.listMinIntems, foo.listMinIntems) && + equalsNullable(this.nullableListMinIntems, foo.nullableListMinIntems) && + Objects.equals(this.requiredDt, foo.requiredDt) && + Objects.equals(this.number, foo.number) && + equalsNullable(this.nullableNumber, foo.nullableNumber) && + Objects.equals(this.color, foo.color) && + Objects.equals(this.requiredColor, foo.requiredColor) && + equalsNullable(this.nullableColor, foo.nullableColor); + } + + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); + } + + @Override + public int hashCode() { + return Objects.hash(dt, hashCodeNullable(nullableDt), binary, hashCodeNullable(nullableBinary), listOfDt, listMinIntems, hashCodeNullable(nullableListMinIntems), requiredDt, number, hashCodeNullable(nullableNumber), color, requiredColor, hashCodeNullable(nullableColor)); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Foo {\n"); + sb.append(" dt: ").append(toIndentedString(dt)).append("\n"); + sb.append(" nullableDt: ").append(toIndentedString(nullableDt)).append("\n"); + sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); + sb.append(" nullableBinary: ").append(toIndentedString(nullableBinary)).append("\n"); + sb.append(" listOfDt: ").append(toIndentedString(listOfDt)).append("\n"); + sb.append(" listMinIntems: ").append(toIndentedString(listMinIntems)).append("\n"); + sb.append(" nullableListMinIntems: ").append(toIndentedString(nullableListMinIntems)).append("\n"); + sb.append(" requiredDt: ").append(toIndentedString(requiredDt)).append("\n"); + sb.append(" number: ").append(toIndentedString(number)).append("\n"); + sb.append(" nullableNumber: ").append(toIndentedString(nullableNumber)).append("\n"); + sb.append(" color: ").append(toIndentedString(color)).append("\n"); + sb.append(" requiredColor: ").append(toIndentedString(requiredColor)).append("\n"); + sb.append(" nullableColor: ").append(toIndentedString(nullableColor)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(@Nullable Object o) { + return o == null ? "null" : o.toString().replace("\n", "\n "); + } + + public static class Builder { + + private Foo instance; + + public Builder() { + this(new Foo()); + } + + protected Builder(Foo instance) { + this.instance = instance; + } + + protected Builder copyOf(Foo value) { + this.instance.setDt(value.dt); + this.instance.setNullableDt(value.nullableDt); + this.instance.setBinary(value.binary); + this.instance.setNullableBinary(value.nullableBinary); + this.instance.setListOfDt(value.listOfDt); + this.instance.setListMinIntems(value.listMinIntems); + this.instance.setNullableListMinIntems(value.nullableListMinIntems); + this.instance.setRequiredDt(value.requiredDt); + this.instance.setNumber(value.number); + this.instance.setNullableNumber(value.nullableNumber); + this.instance.setColor(value.color); + this.instance.setRequiredColor(value.requiredColor); + this.instance.setNullableColor(value.nullableColor); + return this; + } + + public Foo.Builder dt(java.time.@Nullable Instant dt) { + this.instance.dt(dt); + return this; + } + + public Foo.Builder nullableDt(java.time.@Nullable Instant nullableDt) { + this.instance.nullableDt(nullableDt); + return this; + } + + public Foo.Builder nullableDt(JsonNullable nullableDt) { + this.instance.nullableDt = nullableDt; + return this; + } + + public Foo.Builder binary(org.springframework.core.io.@Nullable Resource binary) { + this.instance.binary(binary); + return this; + } + + public Foo.Builder nullableBinary(org.springframework.core.io.@Nullable Resource nullableBinary) { + this.instance.nullableBinary(nullableBinary); + return this; + } + + public Foo.Builder nullableBinary(JsonNullable nullableBinary) { + this.instance.nullableBinary = nullableBinary; + return this; + } + + public Foo.Builder listOfDt(@Nullable List listOfDt) { + this.instance.listOfDt(listOfDt); + return this; + } + + public Foo.Builder listMinIntems(@Nullable List listMinIntems) { + this.instance.listMinIntems(listMinIntems); + return this; + } + + public Foo.Builder nullableListMinIntems(@Nullable List nullableListMinIntems) { + this.instance.nullableListMinIntems(nullableListMinIntems); + return this; + } + + public Foo.Builder nullableListMinIntems(JsonNullable> nullableListMinIntems) { + this.instance.nullableListMinIntems = nullableListMinIntems; + return this; + } + + public Foo.Builder requiredDt(java.time.Instant requiredDt) { + this.instance.requiredDt(requiredDt); + return this; + } + + public Foo.Builder number(java.math.@Nullable BigDecimal number) { + this.instance.number(number); + return this; + } + + public Foo.Builder nullableNumber(java.math.@Nullable BigDecimal nullableNumber) { + this.instance.nullableNumber(nullableNumber); + return this; + } + + public Foo.Builder nullableNumber(JsonNullable nullableNumber) { + this.instance.nullableNumber = nullableNumber; + return this; + } + + public Foo.Builder color(@Nullable String color) { + this.instance.color(color); + return this; + } + + public Foo.Builder requiredColor(String requiredColor) { + this.instance.requiredColor(requiredColor); + return this; + } + + public Foo.Builder nullableColor(@Nullable String nullableColor) { + this.instance.nullableColor(nullableColor); + return this; + } + + public Foo.Builder nullableColor(JsonNullable nullableColor) { + this.instance.nullableColor = nullableColor; + return this; + } + + /** + * returns a built Foo instance. + * + * The builder is not reusable (NullPointerException) + */ + public Foo build() { + try { + return this.instance; + } finally { + // ensure that this.instance is not reused + this.instance = null; + } + } + + @Override + public String toString() { + return getClass() + "=(" + instance + ")"; + } + } + + /** + * Create a builder with no initialized field (except for the default values). + */ + public static Foo.Builder builder() { + return new Foo.Builder(); + } + + /** + * Create a builder with a shallow copy of this instance. + */ + public Foo.Builder toBuilder() { + Foo.Builder builder = new Foo.Builder(); + return builder.copyOf(this); + } + +} + diff --git a/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/src/main/java/org/openapitools/model/package-info.java b/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/src/main/java/org/openapitools/model/package-info.java new file mode 100644 index 000000000000..d53d015a0286 --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/src/main/java/org/openapitools/model/package-info.java @@ -0,0 +1,2 @@ +@org.jspecify.annotations.NullMarked +package org.openapitools.model; diff --git a/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/.openapi-generator-ignore b/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/.openapi-generator-ignore new file mode 100644 index 000000000000..7484ee590a38 --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/.openapi-generator-ignore @@ -0,0 +1,23 @@ +# OpenAPI Generator Ignore +# Generated by openapi-generator https://github.com/openapitools/openapi-generator + +# Use this file to prevent files from being overwritten by the generator. +# The patterns follow closely to .gitignore or .dockerignore. + +# As an example, the C# client generator defines ApiClient.cs. +# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line: +#ApiClient.cs + +# You can match any string of characters against a directory, file or extension with a single asterisk (*): +#foo/*/qux +# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux + +# You can recursively match patterns against a directory, file or extension with a double asterisk (**): +#foo/**/qux +# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux + +# You can also negate patterns with an exclamation (!). +# For example, you can ignore all files in a docs folder with the file extension .md: +#docs/*.md +# Then explicitly reverse the ignore rule for a single file: +#!docs/README.md diff --git a/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/.openapi-generator/FILES b/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/.openapi-generator/FILES new file mode 100644 index 000000000000..25e6aa78765c --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/.openapi-generator/FILES @@ -0,0 +1,10 @@ +.openapi-generator-ignore +README.md +pom.xml +src/main/java/org/openapitools/api/ApiUtil.java +src/main/java/org/openapitools/api/FileApi.java +src/main/java/org/openapitools/api/FooApi.java +src/main/java/org/openapitools/api/UploadApi.java +src/main/java/org/openapitools/api/package-info.java +src/main/java/org/openapitools/model/Foo.java +src/main/java/org/openapitools/model/package-info.java diff --git a/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/.openapi-generator/VERSION b/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/.openapi-generator/VERSION new file mode 100644 index 000000000000..8fc8df61083a --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/.openapi-generator/VERSION @@ -0,0 +1 @@ +7.25.0-SNAPSHOT diff --git a/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/README.md b/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/README.md new file mode 100644 index 000000000000..d43a1de307df --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/README.md @@ -0,0 +1,27 @@ + +# OpenAPI generated API stub + +Spring Framework stub + + +## Overview +This code was generated by the [OpenAPI Generator](https://openapi-generator.tech) project. +By using the [OpenAPI-Spec](https://openapis.org), you can easily generate an API stub. +This is an example of building API stub interfaces in Java using the Spring framework. + +The stubs generated can be used in your existing Spring-MVC or Spring-Boot application to create controller endpoints +by adding ```@Controller``` classes that implement the interface. Eg: +```java +@Controller +public class PetController implements PetApi { +// implement all PetApi methods +} +``` + +You can also use the interface to create [Spring-Cloud Feign clients](http://projects.spring.io/spring-cloud/spring-cloud.html#spring-cloud-feign-inheritance).Eg: +```java +@FeignClient(name="pet", url="http://petstore.swagger.io/v2") +public interface PetClient extends PetApi { + +} +``` diff --git a/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/pom.xml b/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/pom.xml new file mode 100644 index 000000000000..720b0f0cb884 --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/pom.xml @@ -0,0 +1,92 @@ + + 4.0.0 + org.openapitools.openapi3 + springboot + jar + springboot + 1.0.0-SNAPSHOT + + 17 + ${java.version} + UTF-8 + 2.6.0 + 5.17.14 + + + org.springframework.boot + spring-boot-starter-parent + 4.0.1 + + + + + src/main/java + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + + + + + + + org.springframework.boot + spring-boot-starter-webmvc + + + org.springframework.boot + spring-boot-starter-restclient + + + org.springframework.data + spring-data-commons + + + + org.springdoc + springdoc-openapi-starter-webmvc-ui + ${springdoc.version} + + + + jakarta.xml.bind + jakarta.xml.bind-api + + + tools.jackson.dataformat + jackson-dataformat-xml + + + org.openapitools + jackson-databind-nullable + 0.2.8 + + + + org.springframework.boot + spring-boot-starter-validation + + + tools.jackson.core + jackson-databind + + + org.springframework.boot + spring-boot-starter-webmvc-test + test + + + org.springframework.boot + spring-boot-starter-restclient + test + + + diff --git a/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/src/main/java/org/openapitools/api/ApiUtil.java b/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/src/main/java/org/openapitools/api/ApiUtil.java new file mode 100644 index 000000000000..44bf770ccc47 --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/src/main/java/org/openapitools/api/ApiUtil.java @@ -0,0 +1,21 @@ +package org.openapitools.api; + +import org.springframework.web.context.request.NativeWebRequest; + +import jakarta.servlet.http.HttpServletResponse; +import java.io.IOException; + +public class ApiUtil { + public static void setExampleResponse(NativeWebRequest req, String contentType, String example) { + try { + HttpServletResponse res = req.getNativeResponse(HttpServletResponse.class); + if (res != null) { + res.setCharacterEncoding("UTF-8"); + res.addHeader("Content-Type", contentType); + res.getWriter().print(example); + } + } catch (IOException e) { + throw new RuntimeException(e); + } + } +} diff --git a/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/src/main/java/org/openapitools/api/FileApi.java b/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/src/main/java/org/openapitools/api/FileApi.java new file mode 100644 index 000000000000..0c4ff45ac8b3 --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/src/main/java/org/openapitools/api/FileApi.java @@ -0,0 +1,68 @@ +/* + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.25.0-SNAPSHOT). + * https://openapi-generator.tech + * Do not edit the class manually. + */ +package org.openapitools.api; + +import io.swagger.v3.oas.annotations.ExternalDocumentation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.media.ArraySchema; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.enums.ParameterIn; +import io.swagger.v3.oas.annotations.media.ExampleObject; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.context.request.NativeWebRequest; +import org.springframework.web.multipart.MultipartFile; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.*; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import jakarta.annotation.Generated; + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") +@Validated +@Tag(name = "file", description = "the file API") +public interface FileApi { + + default Optional getRequest() { + return Optional.empty(); + } + + String PATH_FILE_ID_GET = "/file/{id}"; + /** + * GET /file/{id} + * + * @param id (required) + * @return ok (status code 200) + */ + @Operation( + operationId = "fileIdGet", + responses = { + @ApiResponse(responseCode = "200", description = "ok") + } + ) + @RequestMapping( + method = RequestMethod.GET, + value = FileApi.PATH_FILE_ID_GET + ) + default ResponseEntity fileIdGet( + @Parameter(name = "id", description = "", required = true, in = ParameterIn.PATH) @PathVariable("id") String id + ) { + return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + + } + +} diff --git a/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/src/main/java/org/openapitools/api/FooApi.java b/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/src/main/java/org/openapitools/api/FooApi.java new file mode 100644 index 000000000000..c936850a40b9 --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/src/main/java/org/openapitools/api/FooApi.java @@ -0,0 +1,90 @@ +/* + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.25.0-SNAPSHOT). + * https://openapi-generator.tech + * Do not edit the class manually. + */ +package org.openapitools.api; + +import org.springframework.format.annotation.DateTimeFormat; +import org.openapitools.model.Foo; +import org.jspecify.annotations.Nullable; +import java.time.OffsetDateTime; +import io.swagger.v3.oas.annotations.ExternalDocumentation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.media.ArraySchema; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.enums.ParameterIn; +import io.swagger.v3.oas.annotations.media.ExampleObject; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.context.request.NativeWebRequest; +import org.springframework.web.multipart.MultipartFile; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.*; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import jakarta.annotation.Generated; + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") +@Validated +@Tag(name = "foo", description = "the foo API") +public interface FooApi { + + default Optional getRequest() { + return Optional.empty(); + } + + String PATH_FOO_DT_PARAM_GET = "/foo/{dtParam}"; + /** + * GET /foo/{dtParam} + * + * @param dtParam (optional) + * @param dtQuery (optional) + * @param dtCookie (optional) + * @param color (optional, default to red) + * @return response (status code 200) + */ + @Operation( + operationId = "fooDtParamGet", + responses = { + @ApiResponse(responseCode = "default", description = "response", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = Foo.class)) + }) + } + ) + @RequestMapping( + method = RequestMethod.GET, + value = FooApi.PATH_FOO_DT_PARAM_GET, + produces = { "application/json" } + ) + default ResponseEntity fooDtParamGet( + @Parameter(name = "dtParam", description = "", in = ParameterIn.PATH) @PathVariable("dtParam") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) Optional dtParam, + @Parameter(name = "dtQuery", description = "", in = ParameterIn.QUERY) @Valid @RequestParam(value = "dtQuery", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) Optional dtQuery, + @Parameter(name = "dtCookie", description = "", in = ParameterIn.COOKIE) @CookieValue(name = "dtCookie", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) Optional dtCookie, + @Parameter(name = "color", description = "", in = ParameterIn.QUERY) @Valid @RequestParam(value = "color", required = false, defaultValue = "red") Optional color + ) { + getRequest().ifPresent(request -> { + for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { + if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { + String exampleString = "{ \"dt\" : \"2000-01-23T04:56:07.000+00:00\", \"nullableDt\" : \"2000-01-23T04:56:07.000+00:00\", \"binary\" : \"\", \"nullableBinary\" : \"\", \"listOfDt\" : [ \"2000-01-23T04:56:07.000+00:00\", \"2000-01-23T04:56:07.000+00:00\" ], \"listMinIntems\" : [ \"2000-01-23T04:56:07.000+00:00\", \"2000-01-23T04:56:07.000+00:00\" ], \"nullableListMinIntems\" : [ \"2000-01-23T04:56:07.000+00:00\", \"2000-01-23T04:56:07.000+00:00\" ], \"requiredDt\" : \"2000-01-23T04:56:07.000+00:00\", \"number\" : 0.8008281904610115, \"nullableNumber\" : 6.027456183070403, \"color\" : \"red\", \"requiredColor\" : \"red\", \"nullableColor\" : \"red\" }"; + ApiUtil.setExampleResponse(request, "application/json", exampleString); + break; + } + } + }); + return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + + } + +} diff --git a/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/src/main/java/org/openapitools/api/UploadApi.java b/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/src/main/java/org/openapitools/api/UploadApi.java new file mode 100644 index 000000000000..5d679bf128a3 --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/src/main/java/org/openapitools/api/UploadApi.java @@ -0,0 +1,70 @@ +/* + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.25.0-SNAPSHOT). + * https://openapi-generator.tech + * Do not edit the class manually. + */ +package org.openapitools.api; + +import org.jspecify.annotations.Nullable; +import io.swagger.v3.oas.annotations.ExternalDocumentation; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.media.ArraySchema; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.enums.ParameterIn; +import io.swagger.v3.oas.annotations.media.ExampleObject; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.context.request.NativeWebRequest; +import org.springframework.web.multipart.MultipartFile; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.*; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import jakarta.annotation.Generated; + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") +@Validated +@Tag(name = "upload", description = "the upload API") +public interface UploadApi { + + default Optional getRequest() { + return Optional.empty(); + } + + String PATH_UPLOAD_POST = "/upload"; + /** + * POST /upload + * + * @param file (optional) + * @return ok (status code 200) + */ + @Operation( + operationId = "uploadPost", + responses = { + @ApiResponse(responseCode = "default", description = "ok") + } + ) + @RequestMapping( + method = RequestMethod.POST, + value = UploadApi.PATH_UPLOAD_POST, + consumes = { "multipart/form-data" } + ) + default ResponseEntity uploadPost( + @Parameter(name = "file", description = "") @RequestPart(value = "file", required = false) MultipartFile file + ) { + return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + + } + +} diff --git a/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/src/main/java/org/openapitools/api/package-info.java b/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/src/main/java/org/openapitools/api/package-info.java new file mode 100644 index 000000000000..46e4608c520d --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/src/main/java/org/openapitools/api/package-info.java @@ -0,0 +1,2 @@ +@org.jspecify.annotations.NullMarked +package org.openapitools.api; diff --git a/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/src/main/java/org/openapitools/model/Foo.java b/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/src/main/java/org/openapitools/model/Foo.java new file mode 100644 index 000000000000..5a9e1038639a --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/src/main/java/org/openapitools/model/Foo.java @@ -0,0 +1,667 @@ +package org.openapitools.model; + +import java.net.URI; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import java.math.BigDecimal; +import java.time.OffsetDateTime; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import org.jspecify.annotations.Nullable; +import org.openapitools.jackson.nullable.JsonNullable; +import org.springframework.format.annotation.DateTimeFormat; +import java.util.NoSuchElementException; +import org.openapitools.jackson.nullable.JsonNullable; +import java.time.OffsetDateTime; +import jakarta.validation.Valid; +import jakarta.validation.constraints.*; +import tools.jackson.dataformat.xml.annotation.JacksonXmlRootElement; +import tools.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import tools.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import io.swagger.v3.oas.annotations.media.Schema; + +import jakarta.xml.bind.annotation.*; + +import java.util.*; +import jakarta.annotation.Generated; + +/** + * Foo + */ + +@JacksonXmlRootElement(localName = "Foo") +@XmlRootElement(name = "Foo") +@XmlAccessorType(XmlAccessType.FIELD) +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") +public class Foo { + + @JsonInclude(JsonInclude.Include.NON_NULL) + @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) + private Optional dt = Optional.empty(); + + @JsonInclude(JsonInclude.Include.NON_ABSENT) + @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) + private JsonNullable nullableDt = JsonNullable.undefined(); + + @JsonInclude(JsonInclude.Include.NON_NULL) + private Optional binary = Optional.empty(); + + @JsonInclude(JsonInclude.Include.NON_ABSENT) + private JsonNullable nullableBinary = JsonNullable.undefined(); + + @JsonInclude(JsonInclude.Include.NON_NULL) + private List listOfDt = new ArrayList<>(); + + @JsonInclude(JsonInclude.Include.NON_NULL) + private List listMinIntems = new ArrayList<>(); + + @JsonInclude(JsonInclude.Include.NON_ABSENT) + private JsonNullable> nullableListMinIntems = JsonNullable.>undefined(); + + @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) + private java.time.Instant requiredDt; + + @JsonInclude(JsonInclude.Include.NON_NULL) + private Optional number = Optional.empty(); + + @JsonInclude(JsonInclude.Include.NON_ABSENT) + private JsonNullable nullableNumber = JsonNullable.undefined(); + + @JsonInclude(JsonInclude.Include.NON_NULL) + private Optional color = Optional.of("red"); + + private String requiredColor = "red"; + + @JsonInclude(JsonInclude.Include.NON_ABSENT) + private JsonNullable nullableColor = JsonNullable.undefined(); + + public Foo() { + super(); + } + + /** + * Constructor with only required parameters + */ + public Foo(java.time.Instant requiredDt, String requiredColor) { + this.requiredDt = requiredDt; + this.requiredColor = requiredColor; + } + + /** + * Constructor with all args parameters + */ + public Foo(java.time.@Nullable Instant dt, java.time.@Nullable Instant nullableDt, org.springframework.core.io.@Nullable Resource binary, org.springframework.core.io.@Nullable Resource nullableBinary, @Nullable List listOfDt, @Nullable List listMinIntems, @Nullable List nullableListMinIntems, java.time.Instant requiredDt, java.math.@Nullable BigDecimal number, java.math.@Nullable BigDecimal nullableNumber, @Nullable String color, String requiredColor, @Nullable String nullableColor) { + this.dt = Optional.ofNullable(dt); + this.nullableDt = JsonNullable.of(nullableDt); + this.binary = Optional.ofNullable(binary); + this.nullableBinary = JsonNullable.of(nullableBinary); + this.listOfDt = listOfDt; + this.listMinIntems = listMinIntems; + this.nullableListMinIntems = JsonNullable.of(nullableListMinIntems); + this.requiredDt = requiredDt; + this.number = Optional.ofNullable(number); + this.nullableNumber = JsonNullable.of(nullableNumber); + this.color = Optional.ofNullable(color); + this.requiredColor = requiredColor; + this.nullableColor = JsonNullable.of(nullableColor); + } + + public Foo dt(java.time.@Nullable Instant dt) { + this.dt = Optional.ofNullable(dt); + return this; + } + + /** + * Get dt + * @return dt + */ + @Valid + @Schema(name = "dt", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("dt") + @JacksonXmlProperty(localName = "dt") + @XmlElement(name = "dt") + public Optional getDt() { + return dt; + } + + @JsonProperty("dt") + @JacksonXmlProperty(localName = "dt") + public void setDt(Optional dt) { + this.dt = dt; + } + + public Foo nullableDt(java.time.@Nullable Instant nullableDt) { + this.nullableDt = JsonNullable.of(nullableDt); + return this; + } + + /** + * Get nullableDt + * @return nullableDt + */ + @Valid + @Schema(name = "nullableDt", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullableDt") + @JacksonXmlProperty(localName = "nullableDt") + @XmlElement(name = "nullableDt") + public JsonNullable getNullableDt() { + return nullableDt; + } + + public void setNullableDt(JsonNullable nullableDt) { + this.nullableDt = nullableDt; + } + + public Foo binary(org.springframework.core.io.@Nullable Resource binary) { + this.binary = Optional.ofNullable(binary); + return this; + } + + /** + * Get binary + * @return binary + */ + @Valid + @Schema(name = "binary", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("binary") + @JacksonXmlProperty(localName = "binary") + @XmlElement(name = "binary") + public Optional getBinary() { + return binary; + } + + @JsonProperty("binary") + @JacksonXmlProperty(localName = "binary") + public void setBinary(Optional binary) { + this.binary = binary; + } + + public Foo nullableBinary(org.springframework.core.io.@Nullable Resource nullableBinary) { + this.nullableBinary = JsonNullable.of(nullableBinary); + return this; + } + + /** + * Get nullableBinary + * @return nullableBinary + */ + @Valid + @Schema(name = "nullableBinary", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullableBinary") + @JacksonXmlProperty(localName = "nullableBinary") + @XmlElement(name = "nullableBinary") + public JsonNullable getNullableBinary() { + return nullableBinary; + } + + public void setNullableBinary(JsonNullable nullableBinary) { + this.nullableBinary = nullableBinary; + } + + public Foo listOfDt(@Nullable List listOfDt) { + this.listOfDt = listOfDt; + return this; + } + + public Foo addListOfDtItem(java.time.Instant listOfDtItem) { + if (this.listOfDt == null) { + this.listOfDt = new ArrayList<>(); + } + this.listOfDt.add(listOfDtItem); + return this; + } + + /** + * Get listOfDt + * @return listOfDt + */ + @Valid + @Schema(name = "listOfDt", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("listOfDt") + @JacksonXmlProperty(localName = "listOfDt") + @JacksonXmlElementWrapper(useWrapping = false) + @XmlElement(name = "listOfDt") + public List getListOfDt() { + return listOfDt; + } + + @JsonProperty("listOfDt") + @JacksonXmlProperty(localName = "listOfDt") + @JacksonXmlElementWrapper(useWrapping = false) + public void setListOfDt(List listOfDt) { + this.listOfDt = listOfDt; + } + + public Foo listMinIntems(@Nullable List listMinIntems) { + this.listMinIntems = listMinIntems; + return this; + } + + public Foo addListMinIntemsItem(java.time.Instant listMinIntemsItem) { + if (this.listMinIntems == null) { + this.listMinIntems = new ArrayList<>(); + } + this.listMinIntems.add(listMinIntemsItem); + return this; + } + + /** + * Get listMinIntems + * @return listMinIntems + */ + @Valid @Size(min = 1) + @Schema(name = "listMinIntems", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("listMinIntems") + @JacksonXmlProperty(localName = "listMinIntems") + @JacksonXmlElementWrapper(useWrapping = false) + @XmlElement(name = "listMinIntems") + public List getListMinIntems() { + return listMinIntems; + } + + @JsonProperty("listMinIntems") + @JacksonXmlProperty(localName = "listMinIntems") + @JacksonXmlElementWrapper(useWrapping = false) + public void setListMinIntems(List listMinIntems) { + this.listMinIntems = listMinIntems; + } + + public Foo nullableListMinIntems(@Nullable List nullableListMinIntems) { + this.nullableListMinIntems = JsonNullable.of(nullableListMinIntems); + return this; + } + + public Foo addNullableListMinIntemsItem(java.time.Instant nullableListMinIntemsItem) { + if (this.nullableListMinIntems == null || !this.nullableListMinIntems.isPresent()) { + this.nullableListMinIntems = JsonNullable.of(new ArrayList<>()); + } + this.nullableListMinIntems.get().add(nullableListMinIntemsItem); + return this; + } + + /** + * Get nullableListMinIntems + * @return nullableListMinIntems + */ + @Valid @Size(min = 1) + @Schema(name = "nullableListMinIntems", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullableListMinIntems") + @JacksonXmlProperty(localName = "nullableListMinIntems") + @JacksonXmlElementWrapper(useWrapping = false) + @XmlElement(name = "nullableListMinIntems") + public JsonNullable> getNullableListMinIntems() { + return nullableListMinIntems; + } + + public void setNullableListMinIntems(JsonNullable> nullableListMinIntems) { + this.nullableListMinIntems = nullableListMinIntems; + } + + public Foo requiredDt(java.time.Instant requiredDt) { + this.requiredDt = requiredDt; + return this; + } + + /** + * Get requiredDt + * @return requiredDt + */ + @NotNull @Valid + @Schema(name = "requiredDt", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("requiredDt") + @JacksonXmlProperty(localName = "requiredDt") + @XmlElement(name = "requiredDt") + public java.time.Instant getRequiredDt() { + return requiredDt; + } + + @JsonProperty("requiredDt") + @JacksonXmlProperty(localName = "requiredDt") + public void setRequiredDt(java.time.Instant requiredDt) { + this.requiredDt = requiredDt; + } + + public Foo number(java.math.@Nullable BigDecimal number) { + this.number = Optional.ofNullable(number); + return this; + } + + /** + * Get number + * @return number + */ + @Valid + @Schema(name = "number", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("number") + @JacksonXmlProperty(localName = "number") + @XmlElement(name = "number") + public Optional getNumber() { + return number; + } + + @JsonProperty("number") + @JacksonXmlProperty(localName = "number") + public void setNumber(Optional number) { + this.number = number; + } + + public Foo nullableNumber(java.math.@Nullable BigDecimal nullableNumber) { + this.nullableNumber = JsonNullable.of(nullableNumber); + return this; + } + + /** + * Get nullableNumber + * @return nullableNumber + */ + @Valid + @Schema(name = "nullableNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullableNumber") + @JacksonXmlProperty(localName = "nullableNumber") + @XmlElement(name = "nullableNumber") + public JsonNullable getNullableNumber() { + return nullableNumber; + } + + public void setNullableNumber(JsonNullable nullableNumber) { + this.nullableNumber = nullableNumber; + } + + public Foo color(@Nullable String color) { + this.color = Optional.ofNullable(color); + return this; + } + + /** + * Get color + * @return color + */ + + @Schema(name = "color", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("color") + @JacksonXmlProperty(localName = "color") + @XmlElement(name = "color") + public Optional getColor() { + return color; + } + + @JsonProperty("color") + @JacksonXmlProperty(localName = "color") + public void setColor(Optional color) { + this.color = color; + } + + public Foo requiredColor(String requiredColor) { + this.requiredColor = requiredColor; + return this; + } + + /** + * Get requiredColor + * @return requiredColor + */ + @NotNull + @Schema(name = "requiredColor", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("requiredColor") + @JacksonXmlProperty(localName = "requiredColor") + @XmlElement(name = "requiredColor") + public String getRequiredColor() { + return requiredColor; + } + + @JsonProperty("requiredColor") + @JacksonXmlProperty(localName = "requiredColor") + public void setRequiredColor(String requiredColor) { + this.requiredColor = requiredColor; + } + + public Foo nullableColor(@Nullable String nullableColor) { + this.nullableColor = JsonNullable.of(nullableColor); + return this; + } + + /** + * Get nullableColor + * @return nullableColor + */ + + @Schema(name = "nullableColor", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("nullableColor") + @JacksonXmlProperty(localName = "nullableColor") + @XmlElement(name = "nullableColor") + public JsonNullable getNullableColor() { + return nullableColor; + } + + public void setNullableColor(JsonNullable nullableColor) { + this.nullableColor = nullableColor; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Foo foo = (Foo) o; + return Objects.equals(this.dt, foo.dt) && + equalsNullable(this.nullableDt, foo.nullableDt) && + Objects.equals(this.binary, foo.binary) && + equalsNullable(this.nullableBinary, foo.nullableBinary) && + Objects.equals(this.listOfDt, foo.listOfDt) && + Objects.equals(this.listMinIntems, foo.listMinIntems) && + equalsNullable(this.nullableListMinIntems, foo.nullableListMinIntems) && + Objects.equals(this.requiredDt, foo.requiredDt) && + Objects.equals(this.number, foo.number) && + equalsNullable(this.nullableNumber, foo.nullableNumber) && + Objects.equals(this.color, foo.color) && + Objects.equals(this.requiredColor, foo.requiredColor) && + equalsNullable(this.nullableColor, foo.nullableColor); + } + + private static boolean equalsNullable(JsonNullable a, JsonNullable b) { + return a == b || (a != null && b != null && a.isPresent() && b.isPresent() && Objects.deepEquals(a.get(), b.get())); + } + + @Override + public int hashCode() { + return Objects.hash(dt, hashCodeNullable(nullableDt), binary, hashCodeNullable(nullableBinary), listOfDt, listMinIntems, hashCodeNullable(nullableListMinIntems), requiredDt, number, hashCodeNullable(nullableNumber), color, requiredColor, hashCodeNullable(nullableColor)); + } + + private static int hashCodeNullable(JsonNullable a) { + if (a == null) { + return 1; + } + return a.isPresent() ? Arrays.deepHashCode(new Object[]{a.get()}) : 31; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class Foo {\n"); + sb.append(" dt: ").append(toIndentedString(dt)).append("\n"); + sb.append(" nullableDt: ").append(toIndentedString(nullableDt)).append("\n"); + sb.append(" binary: ").append(toIndentedString(binary)).append("\n"); + sb.append(" nullableBinary: ").append(toIndentedString(nullableBinary)).append("\n"); + sb.append(" listOfDt: ").append(toIndentedString(listOfDt)).append("\n"); + sb.append(" listMinIntems: ").append(toIndentedString(listMinIntems)).append("\n"); + sb.append(" nullableListMinIntems: ").append(toIndentedString(nullableListMinIntems)).append("\n"); + sb.append(" requiredDt: ").append(toIndentedString(requiredDt)).append("\n"); + sb.append(" number: ").append(toIndentedString(number)).append("\n"); + sb.append(" nullableNumber: ").append(toIndentedString(nullableNumber)).append("\n"); + sb.append(" color: ").append(toIndentedString(color)).append("\n"); + sb.append(" requiredColor: ").append(toIndentedString(requiredColor)).append("\n"); + sb.append(" nullableColor: ").append(toIndentedString(nullableColor)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(@Nullable Object o) { + return o == null ? "null" : o.toString().replace("\n", "\n "); + } + + public static class Builder { + + private Foo instance; + + public Builder() { + this(new Foo()); + } + + protected Builder(Foo instance) { + this.instance = instance; + } + + protected Builder copyOf(Foo value) { + this.instance.setDt(value.dt); + this.instance.setNullableDt(value.nullableDt); + this.instance.setBinary(value.binary); + this.instance.setNullableBinary(value.nullableBinary); + this.instance.setListOfDt(value.listOfDt); + this.instance.setListMinIntems(value.listMinIntems); + this.instance.setNullableListMinIntems(value.nullableListMinIntems); + this.instance.setRequiredDt(value.requiredDt); + this.instance.setNumber(value.number); + this.instance.setNullableNumber(value.nullableNumber); + this.instance.setColor(value.color); + this.instance.setRequiredColor(value.requiredColor); + this.instance.setNullableColor(value.nullableColor); + return this; + } + + public Foo.Builder dt(java.time.@Nullable Instant dt) { + this.instance.dt(dt); + return this; + } + + public Foo.Builder nullableDt(java.time.@Nullable Instant nullableDt) { + this.instance.nullableDt(nullableDt); + return this; + } + + public Foo.Builder nullableDt(JsonNullable nullableDt) { + this.instance.nullableDt = nullableDt; + return this; + } + + public Foo.Builder binary(org.springframework.core.io.@Nullable Resource binary) { + this.instance.binary(binary); + return this; + } + + public Foo.Builder nullableBinary(org.springframework.core.io.@Nullable Resource nullableBinary) { + this.instance.nullableBinary(nullableBinary); + return this; + } + + public Foo.Builder nullableBinary(JsonNullable nullableBinary) { + this.instance.nullableBinary = nullableBinary; + return this; + } + + public Foo.Builder listOfDt(@Nullable List listOfDt) { + this.instance.listOfDt(listOfDt); + return this; + } + + public Foo.Builder listMinIntems(@Nullable List listMinIntems) { + this.instance.listMinIntems(listMinIntems); + return this; + } + + public Foo.Builder nullableListMinIntems(@Nullable List nullableListMinIntems) { + this.instance.nullableListMinIntems(nullableListMinIntems); + return this; + } + + public Foo.Builder nullableListMinIntems(JsonNullable> nullableListMinIntems) { + this.instance.nullableListMinIntems = nullableListMinIntems; + return this; + } + + public Foo.Builder requiredDt(java.time.Instant requiredDt) { + this.instance.requiredDt(requiredDt); + return this; + } + + public Foo.Builder number(java.math.@Nullable BigDecimal number) { + this.instance.number(number); + return this; + } + + public Foo.Builder nullableNumber(java.math.@Nullable BigDecimal nullableNumber) { + this.instance.nullableNumber(nullableNumber); + return this; + } + + public Foo.Builder nullableNumber(JsonNullable nullableNumber) { + this.instance.nullableNumber = nullableNumber; + return this; + } + + public Foo.Builder color(@Nullable String color) { + this.instance.color(color); + return this; + } + + public Foo.Builder requiredColor(String requiredColor) { + this.instance.requiredColor(requiredColor); + return this; + } + + public Foo.Builder nullableColor(@Nullable String nullableColor) { + this.instance.nullableColor(nullableColor); + return this; + } + + public Foo.Builder nullableColor(JsonNullable nullableColor) { + this.instance.nullableColor = nullableColor; + return this; + } + + /** + * returns a built Foo instance. + * + * The builder is not reusable (NullPointerException) + */ + public Foo build() { + try { + return this.instance; + } finally { + // ensure that this.instance is not reused + this.instance = null; + } + } + + @Override + public String toString() { + return getClass() + "=(" + instance + ")"; + } + } + + /** + * Create a builder with no initialized field (except for the default values). + */ + public static Foo.Builder builder() { + return new Foo.Builder(); + } + + /** + * Create a builder with a shallow copy of this instance. + */ + public Foo.Builder toBuilder() { + Foo.Builder builder = new Foo.Builder(); + return builder.copyOf(this); + } + +} + diff --git a/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/src/main/java/org/openapitools/model/package-info.java b/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/src/main/java/org/openapitools/model/package-info.java new file mode 100644 index 000000000000..d53d015a0286 --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/src/main/java/org/openapitools/model/package-info.java @@ -0,0 +1,2 @@ +@org.jspecify.annotations.NullMarked +package org.openapitools.model; diff --git a/samples/openapi3/server/petstore/springboot-4-jspecify/src/main/java/org/openapitools/api/FooApi.java b/samples/openapi3/server/petstore/springboot-4-jspecify/src/main/java/org/openapitools/api/FooApi.java index ce792ccf56e7..1b972b696c3d 100644 --- a/samples/openapi3/server/petstore/springboot-4-jspecify/src/main/java/org/openapitools/api/FooApi.java +++ b/samples/openapi3/server/petstore/springboot-4-jspecify/src/main/java/org/openapitools/api/FooApi.java @@ -52,6 +52,7 @@ default Optional getRequest() { * @param dtParam (optional) * @param dtQuery (optional) * @param dtCookie (optional) + * @param color (optional, default to red) * @return response (status code 200) */ @Operation( @@ -70,7 +71,8 @@ default Optional getRequest() { default ResponseEntity fooDtParamGet( @Parameter(name = "dtParam", description = "", in = ParameterIn.PATH) @PathVariable("dtParam") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) java.time.@Nullable Instant dtParam, @Parameter(name = "dtQuery", description = "", in = ParameterIn.QUERY) @Valid @RequestParam(value = "dtQuery", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) java.time.@Nullable Instant dtQuery, - @Parameter(name = "dtCookie", description = "", in = ParameterIn.COOKIE) @CookieValue(name = "dtCookie", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) java.time.@Nullable Instant dtCookie + @Parameter(name = "dtCookie", description = "", in = ParameterIn.COOKIE) @CookieValue(name = "dtCookie", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) java.time.@Nullable Instant dtCookie, + @Parameter(name = "color", description = "", in = ParameterIn.QUERY) @Valid @RequestParam(value = "color", required = false, defaultValue = "red") String color ) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { diff --git a/samples/openapi3/server/petstore/springboot-4-jspecify/src/main/java/org/openapitools/model/Foo.java b/samples/openapi3/server/petstore/springboot-4-jspecify/src/main/java/org/openapitools/model/Foo.java index 853134befa45..5afb0bd73c8c 100644 --- a/samples/openapi3/server/petstore/springboot-4-jspecify/src/main/java/org/openapitools/model/Foo.java +++ b/samples/openapi3/server/petstore/springboot-4-jspecify/src/main/java/org/openapitools/model/Foo.java @@ -50,10 +50,10 @@ public class Foo { private org.springframework.core.io.@Nullable Resource nullableBinary = null; @JsonInclude(JsonInclude.Include.NON_NULL) - private List listOfDt = new ArrayList<>(); + private @Nullable List listOfDt = new ArrayList<>(); @JsonInclude(JsonInclude.Include.NON_NULL) - private List listMinIntems = new ArrayList<>(); + private @Nullable List listMinIntems = new ArrayList<>(); private @Nullable List nullableListMinIntems; @@ -66,7 +66,7 @@ public class Foo { private java.math.@Nullable BigDecimal nullableNumber = null; @JsonInclude(JsonInclude.Include.NON_NULL) - private String color = "red"; + private @Nullable String color = "red"; private String requiredColor = "red"; @@ -224,7 +224,7 @@ public Foo addListOfDtItem(java.time.Instant listOfDtItem) { @JacksonXmlProperty(localName = "listOfDt") @JacksonXmlElementWrapper(useWrapping = false) @XmlElement(name = "listOfDt") - public List getListOfDt() { + public @Nullable List getListOfDt() { return listOfDt; } @@ -232,7 +232,7 @@ public List getListOfDt() { @JsonProperty("listOfDt") @JacksonXmlProperty(localName = "listOfDt") @JacksonXmlElementWrapper(useWrapping = false) - public void setListOfDt(List listOfDt) { + public void setListOfDt(@Nullable List listOfDt) { this.listOfDt = listOfDt; } @@ -259,7 +259,7 @@ public Foo addListMinIntemsItem(java.time.Instant listMinIntemsItem) { @JacksonXmlProperty(localName = "listMinIntems") @JacksonXmlElementWrapper(useWrapping = false) @XmlElement(name = "listMinIntems") - public List getListMinIntems() { + public @Nullable List getListMinIntems() { return listMinIntems; } @@ -267,7 +267,7 @@ public List getListMinIntems() { @JsonProperty("listMinIntems") @JacksonXmlProperty(localName = "listMinIntems") @JacksonXmlElementWrapper(useWrapping = false) - public void setListMinIntems(List listMinIntems) { + public void setListMinIntems(@Nullable List listMinIntems) { this.listMinIntems = listMinIntems; } @@ -392,14 +392,14 @@ public Foo color(@Nullable String color) { @JsonProperty("color") @JacksonXmlProperty(localName = "color") @XmlElement(name = "color") - public String getColor() { + public @Nullable String getColor() { return color; } @JsonSetter(nulls = Nulls.SKIP) @JsonProperty("color") @JacksonXmlProperty(localName = "color") - public void setColor(String color) { + public void setColor(@Nullable String color) { this.color = color; } @@ -505,7 +505,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } @@ -538,37 +538,37 @@ protected Builder copyOf(Foo value) { return this; } - public Foo.Builder dt(java.time.Instant dt) { + public Foo.Builder dt(java.time.@Nullable Instant dt) { this.instance.dt(dt); return this; } - public Foo.Builder nullableDt(java.time.Instant nullableDt) { + public Foo.Builder nullableDt(java.time.@Nullable Instant nullableDt) { this.instance.nullableDt(nullableDt); return this; } - public Foo.Builder binary(org.springframework.core.io.Resource binary) { + public Foo.Builder binary(org.springframework.core.io.@Nullable Resource binary) { this.instance.binary(binary); return this; } - public Foo.Builder nullableBinary(org.springframework.core.io.Resource nullableBinary) { + public Foo.Builder nullableBinary(org.springframework.core.io.@Nullable Resource nullableBinary) { this.instance.nullableBinary(nullableBinary); return this; } - public Foo.Builder listOfDt(List listOfDt) { + public Foo.Builder listOfDt(@Nullable List listOfDt) { this.instance.listOfDt(listOfDt); return this; } - public Foo.Builder listMinIntems(List listMinIntems) { + public Foo.Builder listMinIntems(@Nullable List listMinIntems) { this.instance.listMinIntems(listMinIntems); return this; } - public Foo.Builder nullableListMinIntems(List nullableListMinIntems) { + public Foo.Builder nullableListMinIntems(@Nullable List nullableListMinIntems) { this.instance.nullableListMinIntems(nullableListMinIntems); return this; } @@ -578,17 +578,17 @@ public Foo.Builder requiredDt(java.time.Instant requiredDt) { return this; } - public Foo.Builder number(java.math.BigDecimal number) { + public Foo.Builder number(java.math.@Nullable BigDecimal number) { this.instance.number(number); return this; } - public Foo.Builder nullableNumber(java.math.BigDecimal nullableNumber) { + public Foo.Builder nullableNumber(java.math.@Nullable BigDecimal nullableNumber) { this.instance.nullableNumber(nullableNumber); return this; } - public Foo.Builder color(String color) { + public Foo.Builder color(@Nullable String color) { this.instance.color(color); return this; } @@ -598,7 +598,7 @@ public Foo.Builder requiredColor(String requiredColor) { return this; } - public Foo.Builder nullableColor(String nullableColor) { + public Foo.Builder nullableColor(@Nullable String nullableColor) { this.instance.nullableColor(nullableColor); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index faba16f61598..9eb240d9d5a8 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -121,7 +121,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index be7f41a81d7c..1add36a533b8 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -122,7 +122,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index dca579c9121f..d9c3ae693371 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -121,7 +121,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 1b93d77f015d..f87316562344 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -418,7 +418,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 936cfb48c631..b0c102f5ae6f 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -121,7 +121,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 442516f4a9f6..a38cbaf03e13 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -122,7 +122,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index 0b99a6f53374..d0f101d44167 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -122,7 +122,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index ee462f8abdb3..ae19d7973934 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -121,7 +121,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java index 1f7e2da6b646..97abb84ee877 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java @@ -127,7 +127,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java index eb02803d61a2..f79439c6d20b 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java @@ -89,7 +89,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java index 908d304908fa..307bbe54543c 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java @@ -89,7 +89,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java index c30acc0cc68d..88eb053ee46c 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java @@ -157,7 +157,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java index 19008c1d5b60..6bf49bebde7f 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java @@ -150,7 +150,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java index 4fa1526c6c85..afe0b670d434 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java @@ -207,7 +207,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java index 181ba8ace110..3d40464498c1 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java @@ -113,7 +113,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java index 76970a34483f..f4193cd0ecbd 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java @@ -113,7 +113,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ChildWithNullable.java index 0d253af8ab1a..06b479c7551e 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ChildWithNullable.java @@ -108,7 +108,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java index 9ebf293ee1d6..ea4aa22ef7bb 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java @@ -78,7 +78,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java index d2ff498d1869..189d36a7f6db 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java @@ -77,7 +77,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java index ac5c31975e54..8ce588187e8a 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -211,7 +211,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java index 2c11947f2a4a..5b496c8bc108 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java @@ -105,7 +105,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java index 58a95aa7769e..08704f3320c3 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java @@ -185,7 +185,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java index 4d882356686c..ef550d16771d 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java @@ -339,7 +339,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java index c30f7a211b46..f75da12fd5aa 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java @@ -78,7 +78,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 429e0226689b..d8e285d7ce15 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -115,7 +115,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java index 0584bf0b3730..9d34a308ffd2 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java @@ -445,7 +445,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 48e42ebdf2bd..98038a2d21ce 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -105,7 +105,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java index 76f8c3918acc..c3b1171a3695 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java @@ -225,7 +225,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index 80f964b29671..b69fd3778180 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -144,7 +144,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java index e17ede77c408..143749e83676 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java @@ -106,7 +106,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java index 043c8b622adf..abd732c379af 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -131,7 +131,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java index 16f8f84a53d3..994c8addcf8b 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java @@ -79,7 +79,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java index 3de6333fb668..80cabaf2f12f 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java @@ -80,7 +80,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java index 390ab0989b32..5d29bd897318 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java @@ -166,7 +166,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NullableMapProperty.java index 9856b0d77cd6..7d40bce81d06 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -100,7 +100,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java index e63a1408d3e5..4aa1933864ce 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java @@ -78,7 +78,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java index 9bf54fd855e4..3f007c80c632 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java @@ -248,7 +248,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java index a2055ef94fc1..8923f202a80c 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java @@ -130,7 +130,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ParentWithNullable.java index 22db1d786cd5..b06d51faa49c 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ParentWithNullable.java @@ -162,7 +162,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java index 8d3f1d0cf422..0041b2cb06ae 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java @@ -287,7 +287,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java index 1443c07c9e28..3a3dfbad5671 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -103,7 +103,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java index ec09530ef0a1..08d6847e7eaa 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -155,7 +155,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java index 6ed2b125a106..87509132edd5 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java @@ -79,7 +79,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java index bf869af6a963..6d1d0f373127 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java @@ -103,7 +103,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java index 2a1d1c058908..db57b9b6e93a 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java @@ -202,7 +202,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java index 315db140f253..5bf6dd839642 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java @@ -228,7 +228,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java index 0214c2053d51..74bf917ba910 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java @@ -259,7 +259,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java index 253bd465588f..e52627ee08bf 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java @@ -881,7 +881,7 @@ public String toString() { * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private String toIndentedString(Object o) { + private String toIndentedString(@Nullable Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } From 7e2aba776820935b2bfb23b16cf8bae35c92a4d2 Mon Sep 17 00:00:00 2001 From: jpfinne Date: Sun, 2 Aug 2026 15:43:13 +0200 Subject: [PATCH 03/12] Regenerate java client (jspecify.yaml updated) --- .../native-jackson3-jspecify/api/openapi.yaml | 8 +++++++ .../docs/DefaultApi.md | 12 ++++++---- .../openapitools/client/api/DefaultApi.java | 24 ++++++++++++------- .../api/openapi.yaml | 8 +++++++ .../docs/DefaultApi.md | 6 +++-- .../openapitools/client/api/DefaultApi.java | 19 +++++++++------ .../api/openapi.yaml | 8 +++++++ .../docs/DefaultApi.md | 6 +++-- .../openapitools/client/api/DefaultApi.java | 9 ++++--- .../api/openapi.yaml | 8 +++++++ .../docs/DefaultApi.md | 6 +++-- .../openapitools/client/api/DefaultApi.java | 19 +++++++++------ 12 files changed, 97 insertions(+), 36 deletions(-) diff --git a/samples/client/petstore/java/native-jackson3-jspecify/api/openapi.yaml b/samples/client/petstore/java/native-jackson3-jspecify/api/openapi.yaml index 34b32c5cccdf..1ad95379176c 100644 --- a/samples/client/petstore/java/native-jackson3-jspecify/api/openapi.yaml +++ b/samples/client/petstore/java/native-jackson3-jspecify/api/openapi.yaml @@ -33,6 +33,14 @@ paths: format: date-time type: string style: form + - explode: true + in: query + name: color + required: false + schema: + default: red + type: string + style: form responses: default: content: diff --git a/samples/client/petstore/java/native-jackson3-jspecify/docs/DefaultApi.md b/samples/client/petstore/java/native-jackson3-jspecify/docs/DefaultApi.md index 63948852e85a..7940bc0098d6 100644 --- a/samples/client/petstore/java/native-jackson3-jspecify/docs/DefaultApi.md +++ b/samples/client/petstore/java/native-jackson3-jspecify/docs/DefaultApi.md @@ -143,7 +143,7 @@ No authorization required ## fooDtParamGet -> Foo fooDtParamGet(dtParam, dtQuery, dtCookie) +> Foo fooDtParamGet(dtParam, dtQuery, dtCookie, color) @@ -166,8 +166,9 @@ public class Example { java.time.Instant dtParam = new java.time.Instant(); // java.time.Instant | java.time.Instant dtQuery = new java.time.Instant(); // java.time.Instant | java.time.Instant dtCookie = new java.time.Instant(); // java.time.Instant | + String color = "red"; // String | try { - Foo result = apiInstance.fooDtParamGet(dtParam, dtQuery, dtCookie); + Foo result = apiInstance.fooDtParamGet(dtParam, dtQuery, dtCookie, color); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling DefaultApi#fooDtParamGet"); @@ -188,6 +189,7 @@ public class Example { | **dtParam** | **java.time.Instant**| | [optional] | | **dtQuery** | **java.time.Instant**| | [optional] | | **dtCookie** | **java.time.Instant**| | [optional] | +| **color** | **String**| | [optional] [default to red] | ### Return type @@ -210,7 +212,7 @@ No authorization required ## fooDtParamGetWithHttpInfo -> ApiResponse fooDtParamGetWithHttpInfo(dtParam, dtQuery, dtCookie) +> ApiResponse fooDtParamGetWithHttpInfo(dtParam, dtQuery, dtCookie, color) @@ -234,8 +236,9 @@ public class Example { java.time.Instant dtParam = new java.time.Instant(); // java.time.Instant | java.time.Instant dtQuery = new java.time.Instant(); // java.time.Instant | java.time.Instant dtCookie = new java.time.Instant(); // java.time.Instant | + String color = "red"; // String | try { - ApiResponse response = apiInstance.fooDtParamGetWithHttpInfo(dtParam, dtQuery, dtCookie); + ApiResponse response = apiInstance.fooDtParamGetWithHttpInfo(dtParam, dtQuery, dtCookie, color); System.out.println("Status code: " + response.getStatusCode()); System.out.println("Response headers: " + response.getHeaders()); System.out.println("Response body: " + response.getData()); @@ -258,6 +261,7 @@ public class Example { | **dtParam** | **java.time.Instant**| | [optional] | | **dtQuery** | **java.time.Instant**| | [optional] | | **dtCookie** | **java.time.Instant**| | [optional] | +| **color** | **String**| | [optional] [default to red] | ### Return type diff --git a/samples/client/petstore/java/native-jackson3-jspecify/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/native-jackson3-jspecify/src/main/java/org/openapitools/client/api/DefaultApi.java index 117712d425dc..e610d82bdad4 100644 --- a/samples/client/petstore/java/native-jackson3-jspecify/src/main/java/org/openapitools/client/api/DefaultApi.java +++ b/samples/client/petstore/java/native-jackson3-jspecify/src/main/java/org/openapitools/client/api/DefaultApi.java @@ -282,11 +282,12 @@ private HttpRequest.Builder fileIdGetRequestBuilder(String id, Map headers) throws ApiException { - ApiResponse localVarResponse = fooDtParamGetWithHttpInfo(dtParam, dtQuery, dtCookie, headers); + public Foo fooDtParamGet(java.time.@Nullable Instant dtParam, java.time.@Nullable Instant dtQuery, java.time.@Nullable Instant dtCookie, @Nullable String color, Map headers) throws ApiException { + ApiResponse localVarResponse = fooDtParamGetWithHttpInfo(dtParam, dtQuery, dtCookie, color, headers); return localVarResponse.getData(); } @@ -310,11 +312,12 @@ public Foo fooDtParamGet(java.time.@Nullable Instant dtParam, java.time.@Nullabl * @param dtParam (optional) * @param dtQuery (optional) * @param dtCookie (optional) + * @param color (optional, default to red) * @return ApiResponse<Foo> * @throws ApiException if fails to make API call */ - public ApiResponse fooDtParamGetWithHttpInfo(java.time.@Nullable Instant dtParam, java.time.@Nullable Instant dtQuery, java.time.@Nullable Instant dtCookie) throws ApiException { - return fooDtParamGetWithHttpInfo(dtParam, dtQuery, dtCookie, null); + public ApiResponse fooDtParamGetWithHttpInfo(java.time.@Nullable Instant dtParam, java.time.@Nullable Instant dtQuery, java.time.@Nullable Instant dtCookie, @Nullable String color) throws ApiException { + return fooDtParamGetWithHttpInfo(dtParam, dtQuery, dtCookie, color, null); } /** @@ -323,12 +326,13 @@ public ApiResponse fooDtParamGetWithHttpInfo(java.time.@Nullable Instant dt * @param dtParam (optional) * @param dtQuery (optional) * @param dtCookie (optional) + * @param color (optional, default to red) * @param headers Optional headers to include in the request * @return ApiResponse<Foo> * @throws ApiException if fails to make API call */ - public ApiResponse fooDtParamGetWithHttpInfo(java.time.@Nullable Instant dtParam, java.time.@Nullable Instant dtQuery, java.time.@Nullable Instant dtCookie, Map headers) throws ApiException { - HttpRequest.Builder localVarRequestBuilder = fooDtParamGetRequestBuilder(dtParam, dtQuery, dtCookie, headers); + public ApiResponse fooDtParamGetWithHttpInfo(java.time.@Nullable Instant dtParam, java.time.@Nullable Instant dtQuery, java.time.@Nullable Instant dtCookie, @Nullable String color, Map headers) throws ApiException { + HttpRequest.Builder localVarRequestBuilder = fooDtParamGetRequestBuilder(dtParam, dtQuery, dtCookie, color, headers); try { HttpResponse localVarResponse = memberVarHttpClient.send( localVarRequestBuilder.build(), @@ -375,7 +379,7 @@ public ApiResponse fooDtParamGetWithHttpInfo(java.time.@Nullable Instant dt } } - private HttpRequest.Builder fooDtParamGetRequestBuilder(java.time.@Nullable Instant dtParam, java.time.@Nullable Instant dtQuery, java.time.@Nullable Instant dtCookie, Map headers) throws ApiException { + private HttpRequest.Builder fooDtParamGetRequestBuilder(java.time.@Nullable Instant dtParam, java.time.@Nullable Instant dtQuery, java.time.@Nullable Instant dtCookie, @Nullable String color, Map headers) throws ApiException { HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder(); @@ -387,6 +391,8 @@ private HttpRequest.Builder fooDtParamGetRequestBuilder(java.time.@Nullable Inst String localVarQueryParameterBaseName; localVarQueryParameterBaseName = "dtQuery"; localVarQueryParams.addAll(ApiClient.parameterToPairs("dtQuery", dtQuery)); + localVarQueryParameterBaseName = "color"; + localVarQueryParams.addAll(ApiClient.parameterToPairs("color", color)); if (!localVarQueryParams.isEmpty() || localVarQueryStringJoiner.length() != 0) { StringJoiner queryJoiner = new StringJoiner("&"); diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/api/openapi.yaml b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/api/openapi.yaml index 34b32c5cccdf..1ad95379176c 100644 --- a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/api/openapi.yaml +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/api/openapi.yaml @@ -33,6 +33,14 @@ paths: format: date-time type: string style: form + - explode: true + in: query + name: color + required: false + schema: + default: red + type: string + style: form responses: default: content: diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/docs/DefaultApi.md b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/docs/DefaultApi.md index 7a0ddb006a06..92116b800182 100644 --- a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/docs/DefaultApi.md +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/docs/DefaultApi.md @@ -75,7 +75,7 @@ No authorization required ## fooDtParamGet -> Foo fooDtParamGet(dtParam, dtQuery, dtCookie) +> Foo fooDtParamGet(dtParam, dtQuery, dtCookie, color) @@ -98,8 +98,9 @@ public class Example { java.time.Instant dtParam = new java.time.Instant(); // java.time.Instant | java.time.Instant dtQuery = new java.time.Instant(); // java.time.Instant | java.time.Instant dtCookie = new java.time.Instant(); // java.time.Instant | + String color = "red"; // String | try { - Foo result = apiInstance.fooDtParamGet(dtParam, dtQuery, dtCookie); + Foo result = apiInstance.fooDtParamGet(dtParam, dtQuery, dtCookie, color); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling DefaultApi#fooDtParamGet"); @@ -120,6 +121,7 @@ public class Example { | **dtParam** | **java.time.Instant**| | [optional] | | **dtQuery** | **java.time.Instant**| | [optional] | | **dtCookie** | **java.time.Instant**| | [optional] | +| **color** | **String**| | [optional] [default to red] | ### Return type diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/DefaultApi.java index 416d0a561343..b8f342a4af8e 100644 --- a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/DefaultApi.java +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/DefaultApi.java @@ -124,10 +124,11 @@ public ResponseSpec fileIdGetWithResponseSpec(String id) throws RestClientRespon * @param dtParam The dtParam parameter * @param dtQuery The dtQuery parameter * @param dtCookie The dtCookie parameter + * @param color The color parameter * @return Foo * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ - private ResponseSpec fooDtParamGetRequestCreation(java.time.@Nullable Instant dtParam, java.time.@Nullable Instant dtQuery, java.time.@Nullable Instant dtCookie) throws RestClientResponseException { + private ResponseSpec fooDtParamGetRequestCreation(java.time.@Nullable Instant dtParam, java.time.@Nullable Instant dtQuery, java.time.@Nullable Instant dtCookie, @Nullable String color) throws RestClientResponseException { Object postBody = null; // create path and map variables final Map pathParams = new HashMap<>(); @@ -140,6 +141,7 @@ private ResponseSpec fooDtParamGetRequestCreation(java.time.@Nullable Instant dt final MultiValueMap formParams = new LinkedMultiValueMap<>(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "dtQuery", dtQuery)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "color", color)); cookieParams.putAll(apiClient.parameterToMultiValueMap(null, "dtCookie", dtCookie)); @@ -163,12 +165,13 @@ private ResponseSpec fooDtParamGetRequestCreation(java.time.@Nullable Instant dt * @param dtParam The dtParam parameter * @param dtQuery The dtQuery parameter * @param dtCookie The dtCookie parameter + * @param color The color parameter * @return Foo * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ - public Foo fooDtParamGet(java.time.@Nullable Instant dtParam, java.time.@Nullable Instant dtQuery, java.time.@Nullable Instant dtCookie) throws RestClientResponseException { + public Foo fooDtParamGet(java.time.@Nullable Instant dtParam, java.time.@Nullable Instant dtQuery, java.time.@Nullable Instant dtCookie, @Nullable String color) throws RestClientResponseException { ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return fooDtParamGetRequestCreation(dtParam, dtQuery, dtCookie).body(localVarReturnType); + return fooDtParamGetRequestCreation(dtParam, dtQuery, dtCookie, color).body(localVarReturnType); } /** @@ -178,12 +181,13 @@ public Foo fooDtParamGet(java.time.@Nullable Instant dtParam, java.time.@Nullabl * @param dtParam The dtParam parameter * @param dtQuery The dtQuery parameter * @param dtCookie The dtCookie parameter + * @param color The color parameter * @return ResponseEntity<Foo> * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ - public ResponseEntity fooDtParamGetWithHttpInfo(java.time.@Nullable Instant dtParam, java.time.@Nullable Instant dtQuery, java.time.@Nullable Instant dtCookie) throws RestClientResponseException { + public ResponseEntity fooDtParamGetWithHttpInfo(java.time.@Nullable Instant dtParam, java.time.@Nullable Instant dtQuery, java.time.@Nullable Instant dtCookie, @Nullable String color) throws RestClientResponseException { ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; - return fooDtParamGetRequestCreation(dtParam, dtQuery, dtCookie).toEntity(localVarReturnType); + return fooDtParamGetRequestCreation(dtParam, dtQuery, dtCookie, color).toEntity(localVarReturnType); } /** @@ -193,11 +197,12 @@ public ResponseEntity fooDtParamGetWithHttpInfo(java.time.@Nullable Instant * @param dtParam The dtParam parameter * @param dtQuery The dtQuery parameter * @param dtCookie The dtCookie parameter + * @param color The color parameter * @return ResponseSpec * @throws RestClientResponseException if an error occurs while attempting to invoke the API */ - public ResponseSpec fooDtParamGetWithResponseSpec(java.time.@Nullable Instant dtParam, java.time.@Nullable Instant dtQuery, java.time.@Nullable Instant dtCookie) throws RestClientResponseException { - return fooDtParamGetRequestCreation(dtParam, dtQuery, dtCookie); + public ResponseSpec fooDtParamGetWithResponseSpec(java.time.@Nullable Instant dtParam, java.time.@Nullable Instant dtQuery, java.time.@Nullable Instant dtCookie, @Nullable String color) throws RestClientResponseException { + return fooDtParamGetRequestCreation(dtParam, dtQuery, dtCookie, color); } /** diff --git a/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/api/openapi.yaml b/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/api/openapi.yaml index 34b32c5cccdf..1ad95379176c 100644 --- a/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/api/openapi.yaml +++ b/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/api/openapi.yaml @@ -33,6 +33,14 @@ paths: format: date-time type: string style: form + - explode: true + in: query + name: color + required: false + schema: + default: red + type: string + style: form responses: default: content: diff --git a/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/docs/DefaultApi.md b/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/docs/DefaultApi.md index 7a0ddb006a06..92116b800182 100644 --- a/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/docs/DefaultApi.md +++ b/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/docs/DefaultApi.md @@ -75,7 +75,7 @@ No authorization required ## fooDtParamGet -> Foo fooDtParamGet(dtParam, dtQuery, dtCookie) +> Foo fooDtParamGet(dtParam, dtQuery, dtCookie, color) @@ -98,8 +98,9 @@ public class Example { java.time.Instant dtParam = new java.time.Instant(); // java.time.Instant | java.time.Instant dtQuery = new java.time.Instant(); // java.time.Instant | java.time.Instant dtCookie = new java.time.Instant(); // java.time.Instant | + String color = "red"; // String | try { - Foo result = apiInstance.fooDtParamGet(dtParam, dtQuery, dtCookie); + Foo result = apiInstance.fooDtParamGet(dtParam, dtQuery, dtCookie, color); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling DefaultApi#fooDtParamGet"); @@ -120,6 +121,7 @@ public class Example { | **dtParam** | **java.time.Instant**| | [optional] | | **dtQuery** | **java.time.Instant**| | [optional] | | **dtCookie** | **java.time.Instant**| | [optional] | +| **color** | **String**| | [optional] [default to red] | ### Return type diff --git a/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/DefaultApi.java index 73dabfd35f1c..770155facb37 100644 --- a/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/DefaultApi.java +++ b/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/DefaultApi.java @@ -93,11 +93,12 @@ public ResponseEntity fileIdGetWithHttpInfo(String id) throws RestClientEx * @param dtParam (optional) * @param dtQuery (optional) * @param dtCookie (optional) + * @param color (optional, default to red) * @return Foo * @throws RestClientException if an error occurs while attempting to invoke the API */ - public Foo fooDtParamGet(java.time.Instant dtParam, java.time.Instant dtQuery, java.time.Instant dtCookie) throws RestClientException { - return fooDtParamGetWithHttpInfo(dtParam, dtQuery, dtCookie).getBody(); + public Foo fooDtParamGet(java.time.Instant dtParam, java.time.Instant dtQuery, java.time.Instant dtCookie, String color) throws RestClientException { + return fooDtParamGetWithHttpInfo(dtParam, dtQuery, dtCookie, color).getBody(); } /** @@ -107,10 +108,11 @@ public Foo fooDtParamGet(java.time.Instant dtParam, java.time.Instant dtQuery, j * @param dtParam (optional) * @param dtQuery (optional) * @param dtCookie (optional) + * @param color (optional, default to red) * @return ResponseEntity<Foo> * @throws RestClientException if an error occurs while attempting to invoke the API */ - public ResponseEntity fooDtParamGetWithHttpInfo(java.time.Instant dtParam, java.time.Instant dtQuery, java.time.Instant dtCookie) throws RestClientException { + public ResponseEntity fooDtParamGetWithHttpInfo(java.time.Instant dtParam, java.time.Instant dtQuery, java.time.Instant dtCookie, String color) throws RestClientException { Object localVarPostBody = null; // create path and map variables @@ -123,6 +125,7 @@ public ResponseEntity fooDtParamGetWithHttpInfo(java.time.Instant dtParam, final MultiValueMap localVarFormParams = new LinkedMultiValueMap(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "dtQuery", dtQuery)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "color", color)); if (dtCookie != null) diff --git a/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/api/openapi.yaml b/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/api/openapi.yaml index 34b32c5cccdf..1ad95379176c 100644 --- a/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/api/openapi.yaml +++ b/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/api/openapi.yaml @@ -33,6 +33,14 @@ paths: format: date-time type: string style: form + - explode: true + in: query + name: color + required: false + schema: + default: red + type: string + style: form responses: default: content: diff --git a/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/docs/DefaultApi.md b/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/docs/DefaultApi.md index 7a0ddb006a06..92116b800182 100644 --- a/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/docs/DefaultApi.md +++ b/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/docs/DefaultApi.md @@ -75,7 +75,7 @@ No authorization required ## fooDtParamGet -> Foo fooDtParamGet(dtParam, dtQuery, dtCookie) +> Foo fooDtParamGet(dtParam, dtQuery, dtCookie, color) @@ -98,8 +98,9 @@ public class Example { java.time.Instant dtParam = new java.time.Instant(); // java.time.Instant | java.time.Instant dtQuery = new java.time.Instant(); // java.time.Instant | java.time.Instant dtCookie = new java.time.Instant(); // java.time.Instant | + String color = "red"; // String | try { - Foo result = apiInstance.fooDtParamGet(dtParam, dtQuery, dtCookie); + Foo result = apiInstance.fooDtParamGet(dtParam, dtQuery, dtCookie, color); System.out.println(result); } catch (ApiException e) { System.err.println("Exception when calling DefaultApi#fooDtParamGet"); @@ -120,6 +121,7 @@ public class Example { | **dtParam** | **java.time.Instant**| | [optional] | | **dtQuery** | **java.time.Instant**| | [optional] | | **dtCookie** | **java.time.Instant**| | [optional] | +| **color** | **String**| | [optional] [default to red] | ### Return type diff --git a/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/DefaultApi.java index c543aec8924a..0435714c3f60 100644 --- a/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/DefaultApi.java +++ b/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/src/main/java/org/openapitools/client/api/DefaultApi.java @@ -126,10 +126,11 @@ public ResponseSpec fileIdGetWithResponseSpec(String id) throws WebClientRespons * @param dtParam The dtParam parameter * @param dtQuery The dtQuery parameter * @param dtCookie The dtCookie parameter + * @param color The color parameter * @return Foo * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ - private ResponseSpec fooDtParamGetRequestCreation(java.time.@Nullable Instant dtParam, java.time.@Nullable Instant dtQuery, java.time.@Nullable Instant dtCookie) throws WebClientResponseException { + private ResponseSpec fooDtParamGetRequestCreation(java.time.@Nullable Instant dtParam, java.time.@Nullable Instant dtQuery, java.time.@Nullable Instant dtCookie, @Nullable String color) throws WebClientResponseException { Object postBody = null; // create path and map variables final Map pathParams = new HashMap(); @@ -142,6 +143,7 @@ private ResponseSpec fooDtParamGetRequestCreation(java.time.@Nullable Instant dt final MultiValueMap formParams = new LinkedMultiValueMap(); localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "dtQuery", dtQuery)); + localVarQueryParams.putAll(apiClient.parameterToMultiValueMap(null, "color", color)); cookieParams.putAll(apiClient.parameterToMultiValueMap(null, "dtCookie", dtCookie)); @@ -165,12 +167,13 @@ private ResponseSpec fooDtParamGetRequestCreation(java.time.@Nullable Instant dt * @param dtParam The dtParam parameter * @param dtQuery The dtQuery parameter * @param dtCookie The dtCookie parameter + * @param color The color parameter * @return Foo * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ - public Mono fooDtParamGet(java.time.@Nullable Instant dtParam, java.time.@Nullable Instant dtQuery, java.time.@Nullable Instant dtCookie) throws WebClientResponseException { + public Mono fooDtParamGet(java.time.@Nullable Instant dtParam, java.time.@Nullable Instant dtQuery, java.time.@Nullable Instant dtCookie, @Nullable String color) throws WebClientResponseException { ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return fooDtParamGetRequestCreation(dtParam, dtQuery, dtCookie).bodyToMono(localVarReturnType); + return fooDtParamGetRequestCreation(dtParam, dtQuery, dtCookie, color).bodyToMono(localVarReturnType); } /** @@ -180,12 +183,13 @@ public Mono fooDtParamGet(java.time.@Nullable Instant dtParam, java.time.@N * @param dtParam The dtParam parameter * @param dtQuery The dtQuery parameter * @param dtCookie The dtCookie parameter + * @param color The color parameter * @return ResponseEntity<Foo> * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ - public Mono> fooDtParamGetWithHttpInfo(java.time.@Nullable Instant dtParam, java.time.@Nullable Instant dtQuery, java.time.@Nullable Instant dtCookie) throws WebClientResponseException { + public Mono> fooDtParamGetWithHttpInfo(java.time.@Nullable Instant dtParam, java.time.@Nullable Instant dtQuery, java.time.@Nullable Instant dtCookie, @Nullable String color) throws WebClientResponseException { ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference() {}; - return fooDtParamGetRequestCreation(dtParam, dtQuery, dtCookie).toEntity(localVarReturnType); + return fooDtParamGetRequestCreation(dtParam, dtQuery, dtCookie, color).toEntity(localVarReturnType); } /** @@ -195,11 +199,12 @@ public Mono> fooDtParamGetWithHttpInfo(java.time.@Nullable I * @param dtParam The dtParam parameter * @param dtQuery The dtQuery parameter * @param dtCookie The dtCookie parameter + * @param color The color parameter * @return ResponseSpec * @throws WebClientResponseException if an error occurs while attempting to invoke the API */ - public ResponseSpec fooDtParamGetWithResponseSpec(java.time.@Nullable Instant dtParam, java.time.@Nullable Instant dtQuery, java.time.@Nullable Instant dtCookie) throws WebClientResponseException { - return fooDtParamGetRequestCreation(dtParam, dtQuery, dtCookie); + public ResponseSpec fooDtParamGetWithResponseSpec(java.time.@Nullable Instant dtParam, java.time.@Nullable Instant dtQuery, java.time.@Nullable Instant dtCookie, @Nullable String color) throws WebClientResponseException { + return fooDtParamGetRequestCreation(dtParam, dtQuery, dtCookie, color); } /** From 987594948719a3130b0d5a80916336ac778ab2f5 Mon Sep 17 00:00:00 2001 From: jpfinne Date: Sun, 2 Aug 2026 16:03:15 +0200 Subject: [PATCH 04/12] Regenerate java client (jspecify.yaml updated) --- .../client/api/DefaultApiTest.java | 20 ++++++- .../openapitools/client/model/FooTest.java | 56 +++++++++++++++++++ .../.openapi-generator/FILES | 3 + .../client/api/DefaultApiTest.java | 18 +++++- .../openapitools/client/model/FooTest.java | 56 +++++++++++++++++++ .../.openapi-generator/FILES | 3 + .../client/api/DefaultApiTest.java | 20 ++++++- .../openapitools/client/model/FooTest.java | 56 +++++++++++++++++++ .../.openapi-generator/FILES | 3 + .../client/api/DefaultApiTest.java | 23 ++++++-- .../openapitools/client/model/FooTest.java | 56 +++++++++++++++++++ 11 files changed, 306 insertions(+), 8 deletions(-) diff --git a/samples/client/petstore/java/native-jackson3-jspecify/src/test/java/org/openapitools/client/api/DefaultApiTest.java b/samples/client/petstore/java/native-jackson3-jspecify/src/test/java/org/openapitools/client/api/DefaultApiTest.java index 44e06ea8c2ea..08ed79f776c1 100644 --- a/samples/client/petstore/java/native-jackson3-jspecify/src/test/java/org/openapitools/client/api/DefaultApiTest.java +++ b/samples/client/petstore/java/native-jackson3-jspecify/src/test/java/org/openapitools/client/api/DefaultApiTest.java @@ -37,6 +37,23 @@ public class DefaultApiTest { private final DefaultApi api = new DefaultApi(); + /** + * + * + * + * + * @throws ApiException + * if the Api call fails + */ + @Test + public void fileIdGetTest() throws ApiException { + String id = null; + + api.fileIdGet(id); + + // TODO: test validations + } + /** * * @@ -50,8 +67,9 @@ public void fooDtParamGetTest() throws ApiException { java.time.Instant dtParam = null; java.time.Instant dtQuery = null; java.time.Instant dtCookie = null; + String color = null; Foo response = - api.fooDtParamGet(dtParam, dtQuery, dtCookie); + api.fooDtParamGet(dtParam, dtQuery, dtCookie, color); // TODO: test validations } diff --git a/samples/client/petstore/java/native-jackson3-jspecify/src/test/java/org/openapitools/client/model/FooTest.java b/samples/client/petstore/java/native-jackson3-jspecify/src/test/java/org/openapitools/client/model/FooTest.java index 66ed819a0c83..ba69ad476107 100644 --- a/samples/client/petstore/java/native-jackson3-jspecify/src/test/java/org/openapitools/client/model/FooTest.java +++ b/samples/client/petstore/java/native-jackson3-jspecify/src/test/java/org/openapitools/client/model/FooTest.java @@ -50,6 +50,14 @@ void dtTest() { // TODO: test dt } + /** + * Test the property 'nullableDt' + */ + @Test + void nullableDtTest() { + // TODO: test nullableDt + } + /** * Test the property 'binary' */ @@ -58,6 +66,14 @@ void binaryTest() { // TODO: test binary } + /** + * Test the property 'nullableBinary' + */ + @Test + void nullableBinaryTest() { + // TODO: test nullableBinary + } + /** * Test the property 'listOfDt' */ @@ -74,6 +90,14 @@ void listMinIntemsTest() { // TODO: test listMinIntems } + /** + * Test the property 'nullableListMinIntems' + */ + @Test + void nullableListMinIntemsTest() { + // TODO: test nullableListMinIntems + } + /** * Test the property 'requiredDt' */ @@ -90,4 +114,36 @@ void numberTest() { // TODO: test number } + /** + * Test the property 'nullableNumber' + */ + @Test + void nullableNumberTest() { + // TODO: test nullableNumber + } + + /** + * Test the property 'color' + */ + @Test + void colorTest() { + // TODO: test color + } + + /** + * Test the property 'requiredColor' + */ + @Test + void requiredColorTest() { + // TODO: test requiredColor + } + + /** + * Test the property 'nullableColor' + */ + @Test + void nullableColorTest() { + // TODO: test nullableColor + } + } diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/.openapi-generator/FILES b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/.openapi-generator/FILES index 0360f20c7340..ace82f89f5ab 100644 --- a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/.openapi-generator/FILES +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/.openapi-generator/FILES @@ -1,5 +1,6 @@ .github/workflows/maven.yml .gitignore +.openapi-generator-ignore .travis.yml README.md api/openapi.yaml @@ -32,3 +33,5 @@ src/main/java/org/openapitools/client/auth/HttpBearerAuth.java src/main/java/org/openapitools/client/model/Foo.java src/main/java/org/openapitools/client/model/package-info.java src/main/java/org/openapitools/client/package-info.java +src/test/java/org/openapitools/client/api/DefaultApiTest.java +src/test/java/org/openapitools/client/model/FooTest.java diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/test/java/org/openapitools/client/api/DefaultApiTest.java b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/test/java/org/openapitools/client/api/DefaultApiTest.java index 2090a328d4a2..28def9f0bec1 100644 --- a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/test/java/org/openapitools/client/api/DefaultApiTest.java +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/test/java/org/openapitools/client/api/DefaultApiTest.java @@ -35,6 +35,19 @@ public class DefaultApiTest { private final DefaultApi api = new DefaultApi(); + /** + * + * + * + */ + @Test + public void fileIdGetTest() { + String id = null; + api.fileIdGet(id); + + // TODO: test validations + } + /** * * @@ -45,7 +58,8 @@ public void fooDtParamGetTest() { java.time.Instant dtParam = null; java.time.Instant dtQuery = null; java.time.Instant dtCookie = null; - Foo response = api.fooDtParamGet(dtParam, dtQuery, dtCookie); + String color = null; + Foo response = api.fooDtParamGet(dtParam, dtQuery, dtCookie, color); // TODO: test validations } @@ -63,4 +77,4 @@ public void uploadPostTest() { // TODO: test validations } -} \ No newline at end of file +} diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/test/java/org/openapitools/client/model/FooTest.java b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/test/java/org/openapitools/client/model/FooTest.java index 66ed819a0c83..ba69ad476107 100644 --- a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/test/java/org/openapitools/client/model/FooTest.java +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/src/test/java/org/openapitools/client/model/FooTest.java @@ -50,6 +50,14 @@ void dtTest() { // TODO: test dt } + /** + * Test the property 'nullableDt' + */ + @Test + void nullableDtTest() { + // TODO: test nullableDt + } + /** * Test the property 'binary' */ @@ -58,6 +66,14 @@ void binaryTest() { // TODO: test binary } + /** + * Test the property 'nullableBinary' + */ + @Test + void nullableBinaryTest() { + // TODO: test nullableBinary + } + /** * Test the property 'listOfDt' */ @@ -74,6 +90,14 @@ void listMinIntemsTest() { // TODO: test listMinIntems } + /** + * Test the property 'nullableListMinIntems' + */ + @Test + void nullableListMinIntemsTest() { + // TODO: test nullableListMinIntems + } + /** * Test the property 'requiredDt' */ @@ -90,4 +114,36 @@ void numberTest() { // TODO: test number } + /** + * Test the property 'nullableNumber' + */ + @Test + void nullableNumberTest() { + // TODO: test nullableNumber + } + + /** + * Test the property 'color' + */ + @Test + void colorTest() { + // TODO: test color + } + + /** + * Test the property 'requiredColor' + */ + @Test + void requiredColorTest() { + // TODO: test requiredColor + } + + /** + * Test the property 'nullableColor' + */ + @Test + void nullableColorTest() { + // TODO: test nullableColor + } + } diff --git a/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/.openapi-generator/FILES b/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/.openapi-generator/FILES index 56926e5b1c76..bab7c41f1fda 100644 --- a/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/.openapi-generator/FILES +++ b/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/.openapi-generator/FILES @@ -1,5 +1,6 @@ .github/workflows/maven.yml .gitignore +.openapi-generator-ignore .travis.yml README.md api/openapi.yaml @@ -33,3 +34,5 @@ src/main/java/org/openapitools/client/auth/HttpBearerAuth.java src/main/java/org/openapitools/client/model/Foo.java src/main/java/org/openapitools/client/model/package-info.java src/main/java/org/openapitools/client/package-info.java +src/test/java/org/openapitools/client/api/DefaultApiTest.java +src/test/java/org/openapitools/client/model/FooTest.java diff --git a/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/src/test/java/org/openapitools/client/api/DefaultApiTest.java b/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/src/test/java/org/openapitools/client/api/DefaultApiTest.java index 65ddba4827cf..3b61ece672b4 100644 --- a/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/src/test/java/org/openapitools/client/api/DefaultApiTest.java +++ b/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/src/test/java/org/openapitools/client/api/DefaultApiTest.java @@ -37,6 +37,23 @@ class DefaultApiTest { private final DefaultApi api = new DefaultApi(); + /** + * + * + * + * + * @throws RestClientException + * if the Api call fails + */ + @Test + void fileIdGetTest() { + String id = null; + + api.fileIdGet(id); + + // TODO: test validations + } + /** * * @@ -50,8 +67,9 @@ void fooDtParamGetTest() { java.time.Instant dtParam = null; java.time.Instant dtQuery = null; java.time.Instant dtCookie = null; + String color = null; - Foo response = api.fooDtParamGet(dtParam, dtQuery, dtCookie); + Foo response = api.fooDtParamGet(dtParam, dtQuery, dtCookie, color); // TODO: test validations } diff --git a/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/src/test/java/org/openapitools/client/model/FooTest.java b/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/src/test/java/org/openapitools/client/model/FooTest.java index 66ed819a0c83..ba69ad476107 100644 --- a/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/src/test/java/org/openapitools/client/model/FooTest.java +++ b/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/src/test/java/org/openapitools/client/model/FooTest.java @@ -50,6 +50,14 @@ void dtTest() { // TODO: test dt } + /** + * Test the property 'nullableDt' + */ + @Test + void nullableDtTest() { + // TODO: test nullableDt + } + /** * Test the property 'binary' */ @@ -58,6 +66,14 @@ void binaryTest() { // TODO: test binary } + /** + * Test the property 'nullableBinary' + */ + @Test + void nullableBinaryTest() { + // TODO: test nullableBinary + } + /** * Test the property 'listOfDt' */ @@ -74,6 +90,14 @@ void listMinIntemsTest() { // TODO: test listMinIntems } + /** + * Test the property 'nullableListMinIntems' + */ + @Test + void nullableListMinIntemsTest() { + // TODO: test nullableListMinIntems + } + /** * Test the property 'requiredDt' */ @@ -90,4 +114,36 @@ void numberTest() { // TODO: test number } + /** + * Test the property 'nullableNumber' + */ + @Test + void nullableNumberTest() { + // TODO: test nullableNumber + } + + /** + * Test the property 'color' + */ + @Test + void colorTest() { + // TODO: test color + } + + /** + * Test the property 'requiredColor' + */ + @Test + void requiredColorTest() { + // TODO: test requiredColor + } + + /** + * Test the property 'nullableColor' + */ + @Test + void nullableColorTest() { + // TODO: test nullableColor + } + } diff --git a/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/.openapi-generator/FILES b/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/.openapi-generator/FILES index fa0830b314a4..21b95b7b74ac 100644 --- a/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/.openapi-generator/FILES +++ b/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/.openapi-generator/FILES @@ -1,5 +1,6 @@ .github/workflows/maven.yml .gitignore +.openapi-generator-ignore .travis.yml README.md api/openapi.yaml @@ -34,3 +35,5 @@ src/main/java/org/openapitools/client/auth/HttpBearerAuth.java src/main/java/org/openapitools/client/model/Foo.java src/main/java/org/openapitools/client/model/package-info.java src/main/java/org/openapitools/client/package-info.java +src/test/java/org/openapitools/client/api/DefaultApiTest.java +src/test/java/org/openapitools/client/model/FooTest.java diff --git a/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/src/test/java/org/openapitools/client/api/DefaultApiTest.java b/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/src/test/java/org/openapitools/client/api/DefaultApiTest.java index 706e3b1b6de3..554ef1d35a63 100644 --- a/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/src/test/java/org/openapitools/client/api/DefaultApiTest.java +++ b/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/src/test/java/org/openapitools/client/api/DefaultApiTest.java @@ -36,6 +36,20 @@ public class DefaultApiTest { private final DefaultApi api = new DefaultApi(); + /** + * + * + * + */ + @Test + public void fileIdGetTest() { + // uncomment below to test the function + //String id = null; + //api.fileIdGet(id).block(); + + // TODO: test validations + } + /** * * @@ -44,10 +58,11 @@ public class DefaultApiTest { @Test public void fooDtParamGetTest() { // uncomment below to test the function - //OffsetDateTime dtParam = null; - //OffsetDateTime dtQuery = null; - //OffsetDateTime dtCookie = null; - //Foo response = api.fooDtParamGet(dtParam, dtQuery, dtCookie).block(); + //java.time.Instant dtParam = null; + //java.time.Instant dtQuery = null; + //java.time.Instant dtCookie = null; + //String color = null; + //Foo response = api.fooDtParamGet(dtParam, dtQuery, dtCookie, color).block(); // TODO: test validations } diff --git a/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/src/test/java/org/openapitools/client/model/FooTest.java b/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/src/test/java/org/openapitools/client/model/FooTest.java index 66ed819a0c83..ba69ad476107 100644 --- a/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/src/test/java/org/openapitools/client/model/FooTest.java +++ b/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/src/test/java/org/openapitools/client/model/FooTest.java @@ -50,6 +50,14 @@ void dtTest() { // TODO: test dt } + /** + * Test the property 'nullableDt' + */ + @Test + void nullableDtTest() { + // TODO: test nullableDt + } + /** * Test the property 'binary' */ @@ -58,6 +66,14 @@ void binaryTest() { // TODO: test binary } + /** + * Test the property 'nullableBinary' + */ + @Test + void nullableBinaryTest() { + // TODO: test nullableBinary + } + /** * Test the property 'listOfDt' */ @@ -74,6 +90,14 @@ void listMinIntemsTest() { // TODO: test listMinIntems } + /** + * Test the property 'nullableListMinIntems' + */ + @Test + void nullableListMinIntemsTest() { + // TODO: test nullableListMinIntems + } + /** * Test the property 'requiredDt' */ @@ -90,4 +114,36 @@ void numberTest() { // TODO: test number } + /** + * Test the property 'nullableNumber' + */ + @Test + void nullableNumberTest() { + // TODO: test nullableNumber + } + + /** + * Test the property 'color' + */ + @Test + void colorTest() { + // TODO: test color + } + + /** + * Test the property 'requiredColor' + */ + @Test + void requiredColorTest() { + // TODO: test requiredColor + } + + /** + * Test the property 'nullableColor' + */ + @Test + void nullableColorTest() { + // TODO: test nullableColor + } + } From e0e3d6f33cb8d67eeec6b3b3c3456bea6d3fdeb5 Mon Sep 17 00:00:00 2001 From: jpfinne Date: Sun, 2 Aug 2026 16:14:43 +0200 Subject: [PATCH 05/12] Regenerate java client (jspecify.yaml updated) --- .github/workflows/samples-spring-jdk17.yaml | 6 ++++++ .../openapitools/codegen/java/JavaClientCodegenTest.java | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/samples-spring-jdk17.yaml b/.github/workflows/samples-spring-jdk17.yaml index 1eb6fd318b51..664c2487fae3 100644 --- a/.github/workflows/samples-spring-jdk17.yaml +++ b/.github/workflows/samples-spring-jdk17.yaml @@ -9,6 +9,8 @@ on: - samples/openapi3/server/petstore/springboot-3/** - samples/openapi3/server/petstore/springboot-4/** - samples/openapi3/server/petstore/springboot-4-jspecify/** + - samples/openapi3/server/petstore/spring-boot-4-jspecify_openapiNullable/** + - samples/openapi3/server/petstore/spring-boot-4-jspecify_useOptional/** - samples/server/petstore/springboot-api-response-examples/** - samples/server/petstore/springboot-lombok-data/** - samples/server/petstore/springboot-lombok-tostring/** @@ -27,6 +29,8 @@ on: - samples/openapi3/server/petstore/springboot-3/** - samples/openapi3/server/petstore/springboot-4/** - samples/openapi3/server/petstore/springboot-4-jspecify/** + - samples/openapi3/server/petstore/spring-boot-4-jspecify_openapiNullable/** + - samples/openapi3/server/petstore/spring-boot-4-jspecify_useOptional/** - samples/server/petstore/springboot-api-response-examples/** - samples/server/petstore/springboot-lombok-data/** - samples/server/petstore/springboot-lombok-tostring/** @@ -53,6 +57,8 @@ jobs: - samples/openapi3/server/petstore/springboot-3 - samples/openapi3/server/petstore/springboot-4 - samples/openapi3/server/petstore/springboot-4-jspecify + - samples/openapi3/server/petstore/spring-boot-4-jspecify_openapiNullable + - samples/openapi3/server/petstore/spring-boot-4-jspecify_useOptional - samples/server/petstore/springboot-api-response-examples - samples/server/petstore/springboot-lombok-data - samples/server/petstore/springboot-lombok-tostring diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java index 524cdea33887..810fdb1fb22f 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java @@ -4701,7 +4701,7 @@ public void testJspecify(String library, boolean useSpringBoot4, boolean hasJspe JavaFileAssert.assertThat(files.get("DefaultApi.java")) .fileContains( "import org.jspecify.annotations.Nullable;", - "(java.time.@Nullable Instant dtParam, java.time.@Nullable Instant dtQuery, java.time.@Nullable Instant dtCookie)" + "(java.time.@Nullable Instant dtParam, java.time.@Nullable Instant dtQuery, java.time.@Nullable Instant dtCookie, @Nullable String color)" ); } JavaFileAssert.assertThat(files.get("api/package-info.java")) @@ -4765,7 +4765,7 @@ public void testJspecify_openapiNullable(String library, boolean useSpringBoot4, JavaFileAssert.assertThat(files.get("DefaultApi.java")) .fileContains( "import org.jspecify.annotations.Nullable;", - "(java.time.@Nullable Instant dtParam, java.time.@Nullable Instant dtQuery, java.time.@Nullable Instant dtCookie)" + "(java.time.@Nullable Instant dtParam, java.time.@Nullable Instant dtQuery, java.time.@Nullable Instant dtCookie, @Nullable String color)" ); } JavaFileAssert.assertThat(files.get("api/package-info.java")) From 6e09b1ccab52442bd106eb806b0c1b92c89ca40a Mon Sep 17 00:00:00 2001 From: jpfinne Date: Sun, 2 Aug 2026 16:25:58 +0200 Subject: [PATCH 06/12] fix Case of nullableDataTypeWithEnum --- ...atatypeWithEnum.mustache => nullableDataTypeWithEnum.mustache} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename modules/openapi-generator/src/main/resources/Java/{nullableDatatypeWithEnum.mustache => nullableDataTypeWithEnum.mustache} (100%) diff --git a/modules/openapi-generator/src/main/resources/Java/nullableDatatypeWithEnum.mustache b/modules/openapi-generator/src/main/resources/Java/nullableDataTypeWithEnum.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/Java/nullableDatatypeWithEnum.mustache rename to modules/openapi-generator/src/main/resources/Java/nullableDataTypeWithEnum.mustache From 58578cc2923e301d2ddb5d28ee584bc0851a335f Mon Sep 17 00:00:00 2001 From: jpfinne Date: Sun, 2 Aug 2026 17:14:17 +0200 Subject: [PATCH 07/12] fix Case of nullableDatatypeWithEnum --- .../src/main/resources/Java/nullableArgumentWithEnum.mustache | 2 +- ...aTypeWithEnum.mustache => nullableDatatypeWithEnum.mustache} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename modules/openapi-generator/src/main/resources/Java/{nullableDataTypeWithEnum.mustache => nullableDatatypeWithEnum.mustache} (100%) diff --git a/modules/openapi-generator/src/main/resources/Java/nullableArgumentWithEnum.mustache b/modules/openapi-generator/src/main/resources/Java/nullableArgumentWithEnum.mustache index 4c0dc1a4a864..2011292e4f5b 100644 --- a/modules/openapi-generator/src/main/resources/Java/nullableArgumentWithEnum.mustache +++ b/modules/openapi-generator/src/main/resources/Java/nullableArgumentWithEnum.mustache @@ -1 +1 @@ -{{#lambda.trim}}{{>nullable_var_annotations}} {{>nullableDataTypeWithEnum}}{{/lambda.trim}} \ No newline at end of file +{{#lambda.trim}}{{>nullable_var_annotations}} {{>nullableDatatypeWithEnum}}{{/lambda.trim}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/Java/nullableDataTypeWithEnum.mustache b/modules/openapi-generator/src/main/resources/Java/nullableDatatypeWithEnum.mustache similarity index 100% rename from modules/openapi-generator/src/main/resources/Java/nullableDataTypeWithEnum.mustache rename to modules/openapi-generator/src/main/resources/Java/nullableDatatypeWithEnum.mustache From 54ffb35d42a8233a9c2d4529161cf93fc4e7f186 Mon Sep 17 00:00:00 2001 From: jpfinne Date: Sun, 2 Aug 2026 17:32:45 +0200 Subject: [PATCH 08/12] fix toIndentedString --- .../org/openapitools/codegen/java/spring/SpringCodegenTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java index 50e76c21fa35..a0b7aa72758b 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java @@ -5537,7 +5537,7 @@ public void testCollectionTypesWithDefaults_issue_18102() throws IOException { .fileContains("@Nullable Set stringSet") .fileContains("private Set stringDefaultSet = new LinkedHashSet<>(Arrays.asList(\"A\", \"B\"));") .fileContains("private Set stringEmptyDefaultSet = new LinkedHashSet<>();") - .fileContains("private String toIndentedString(Object o)") + .fileContains("private String toIndentedString(@Nullable Object o)") .fileDoesNotContain("private List<@Valid TagDto> tags = new ArrayList<>()") .fileDoesNotContain("private Set<@Valid TagDto> tagsUnique = new LinkedHashSet<>()") .fileDoesNotContain("private List stringList = new ArrayList<>()") From 8e86fce8e4bf9db4d134f1fbf18d50b82663168f Mon Sep 17 00:00:00 2001 From: jpfinne Date: Sun, 2 Aug 2026 17:33:09 +0200 Subject: [PATCH 09/12] Fix FILES for generate clients --- .../java/native/test-regenerated/.openapi-generator/FILES | 1 - .../.openapi-generator/FILES | 1 - .../.openapi-generator/FILES | 1 - .../.openapi-generator/FILES | 1 - .../springboot-4-jspecify-useOptional/.openapi-generator/FILES | 1 - 5 files changed, 5 deletions(-) diff --git a/samples/client/petstore/java/native/test-regenerated/.openapi-generator/FILES b/samples/client/petstore/java/native/test-regenerated/.openapi-generator/FILES index 57d506c4c50b..2451a5dbb70b 100644 --- a/samples/client/petstore/java/native/test-regenerated/.openapi-generator/FILES +++ b/samples/client/petstore/java/native/test-regenerated/.openapi-generator/FILES @@ -1,6 +1,5 @@ .github/workflows/maven.yml .gitignore -.openapi-generator-ignore .travis.yml README.md api/openapi.yaml diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/.openapi-generator/FILES b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/.openapi-generator/FILES index ace82f89f5ab..58529ad3488b 100644 --- a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/.openapi-generator/FILES +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/.openapi-generator/FILES @@ -1,6 +1,5 @@ .github/workflows/maven.yml .gitignore -.openapi-generator-ignore .travis.yml README.md api/openapi.yaml diff --git a/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/.openapi-generator/FILES b/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/.openapi-generator/FILES index 21b95b7b74ac..1c7b6d057224 100644 --- a/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/.openapi-generator/FILES +++ b/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/.openapi-generator/FILES @@ -1,6 +1,5 @@ .github/workflows/maven.yml .gitignore -.openapi-generator-ignore .travis.yml README.md api/openapi.yaml diff --git a/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/.openapi-generator/FILES b/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/.openapi-generator/FILES index 25e6aa78765c..632e71aef704 100644 --- a/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/.openapi-generator/FILES +++ b/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/.openapi-generator/FILES @@ -1,4 +1,3 @@ -.openapi-generator-ignore README.md pom.xml src/main/java/org/openapitools/api/ApiUtil.java diff --git a/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/.openapi-generator/FILES b/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/.openapi-generator/FILES index 25e6aa78765c..632e71aef704 100644 --- a/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/.openapi-generator/FILES +++ b/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/.openapi-generator/FILES @@ -1,4 +1,3 @@ -.openapi-generator-ignore README.md pom.xml src/main/java/org/openapitools/api/ApiUtil.java From d722f1a57e628bfb4908ba5e84ef4fed4ad28022 Mon Sep 17 00:00:00 2001 From: jpfinne Date: Sun, 2 Aug 2026 17:51:12 +0200 Subject: [PATCH 10/12] Regenerate samples --- .../.openapi-generator/FILES | 2 -- .../.openapi-generator/FILES | 3 --- .../.openapi-generator/FILES | 2 -- 3 files changed, 7 deletions(-) diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/.openapi-generator/FILES b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/.openapi-generator/FILES index 58529ad3488b..0360f20c7340 100644 --- a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/.openapi-generator/FILES +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/.openapi-generator/FILES @@ -32,5 +32,3 @@ src/main/java/org/openapitools/client/auth/HttpBearerAuth.java src/main/java/org/openapitools/client/model/Foo.java src/main/java/org/openapitools/client/model/package-info.java src/main/java/org/openapitools/client/package-info.java -src/test/java/org/openapitools/client/api/DefaultApiTest.java -src/test/java/org/openapitools/client/model/FooTest.java diff --git a/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/.openapi-generator/FILES b/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/.openapi-generator/FILES index bab7c41f1fda..56926e5b1c76 100644 --- a/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/.openapi-generator/FILES +++ b/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/.openapi-generator/FILES @@ -1,6 +1,5 @@ .github/workflows/maven.yml .gitignore -.openapi-generator-ignore .travis.yml README.md api/openapi.yaml @@ -34,5 +33,3 @@ src/main/java/org/openapitools/client/auth/HttpBearerAuth.java src/main/java/org/openapitools/client/model/Foo.java src/main/java/org/openapitools/client/model/package-info.java src/main/java/org/openapitools/client/package-info.java -src/test/java/org/openapitools/client/api/DefaultApiTest.java -src/test/java/org/openapitools/client/model/FooTest.java diff --git a/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/.openapi-generator/FILES b/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/.openapi-generator/FILES index 1c7b6d057224..fa0830b314a4 100644 --- a/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/.openapi-generator/FILES +++ b/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/.openapi-generator/FILES @@ -34,5 +34,3 @@ src/main/java/org/openapitools/client/auth/HttpBearerAuth.java src/main/java/org/openapitools/client/model/Foo.java src/main/java/org/openapitools/client/model/package-info.java src/main/java/org/openapitools/client/package-info.java -src/test/java/org/openapitools/client/api/DefaultApiTest.java -src/test/java/org/openapitools/client/model/FooTest.java From 249e902f05214ae7878be08a8f17d15d6e0a832b Mon Sep 17 00:00:00 2001 From: jpfinne Date: Sun, 2 Aug 2026 18:00:41 +0200 Subject: [PATCH 11/12] Fix filename of spring-boot-4-jspecify --- .github/workflows/samples-spring-jdk17.yaml | 12 ++++++------ ...l => spring-boot-4-jspecify-openapiNullable.yaml} | 0 ....yaml => spring-boot-4-jspecify-useOptional.yaml} | 0 3 files changed, 6 insertions(+), 6 deletions(-) rename bin/configs/{spring-boot-4-jspecify_openapiNullable.yaml => spring-boot-4-jspecify-openapiNullable.yaml} (100%) rename bin/configs/{spring-boot-4-jspecify_useOptional.yaml => spring-boot-4-jspecify-useOptional.yaml} (100%) diff --git a/.github/workflows/samples-spring-jdk17.yaml b/.github/workflows/samples-spring-jdk17.yaml index 664c2487fae3..93776f6d115c 100644 --- a/.github/workflows/samples-spring-jdk17.yaml +++ b/.github/workflows/samples-spring-jdk17.yaml @@ -9,8 +9,8 @@ on: - samples/openapi3/server/petstore/springboot-3/** - samples/openapi3/server/petstore/springboot-4/** - samples/openapi3/server/petstore/springboot-4-jspecify/** - - samples/openapi3/server/petstore/spring-boot-4-jspecify_openapiNullable/** - - samples/openapi3/server/petstore/spring-boot-4-jspecify_useOptional/** + - samples/openapi3/server/petstore/spring-boot-4-jspecify-openapiNullable/** + - samples/openapi3/server/petstore/spring-boot-4-jspecify-useOptional/** - samples/server/petstore/springboot-api-response-examples/** - samples/server/petstore/springboot-lombok-data/** - samples/server/petstore/springboot-lombok-tostring/** @@ -29,8 +29,8 @@ on: - samples/openapi3/server/petstore/springboot-3/** - samples/openapi3/server/petstore/springboot-4/** - samples/openapi3/server/petstore/springboot-4-jspecify/** - - samples/openapi3/server/petstore/spring-boot-4-jspecify_openapiNullable/** - - samples/openapi3/server/petstore/spring-boot-4-jspecify_useOptional/** + - samples/openapi3/server/petstore/spring-boot-4-jspecify-openapiNullable/** + - samples/openapi3/server/petstore/spring-boot-4-jspecify-useOptional/** - samples/server/petstore/springboot-api-response-examples/** - samples/server/petstore/springboot-lombok-data/** - samples/server/petstore/springboot-lombok-tostring/** @@ -57,8 +57,8 @@ jobs: - samples/openapi3/server/petstore/springboot-3 - samples/openapi3/server/petstore/springboot-4 - samples/openapi3/server/petstore/springboot-4-jspecify - - samples/openapi3/server/petstore/spring-boot-4-jspecify_openapiNullable - - samples/openapi3/server/petstore/spring-boot-4-jspecify_useOptional + - samples/openapi3/server/petstore/spring-boot-4-jspecify-openapiNullable + - samples/openapi3/server/petstore/spring-boot-4-jspecify-useOptional - samples/server/petstore/springboot-api-response-examples - samples/server/petstore/springboot-lombok-data - samples/server/petstore/springboot-lombok-tostring diff --git a/bin/configs/spring-boot-4-jspecify_openapiNullable.yaml b/bin/configs/spring-boot-4-jspecify-openapiNullable.yaml similarity index 100% rename from bin/configs/spring-boot-4-jspecify_openapiNullable.yaml rename to bin/configs/spring-boot-4-jspecify-openapiNullable.yaml diff --git a/bin/configs/spring-boot-4-jspecify_useOptional.yaml b/bin/configs/spring-boot-4-jspecify-useOptional.yaml similarity index 100% rename from bin/configs/spring-boot-4-jspecify_useOptional.yaml rename to bin/configs/spring-boot-4-jspecify-useOptional.yaml From d3b338dab9b225cc7e793659964d412764fa2e1b Mon Sep 17 00:00:00 2001 From: jpfinne Date: Sun, 2 Aug 2026 18:25:45 +0200 Subject: [PATCH 12/12] Fix folder of springboot-4-jspecify --- .github/workflows/samples-spring-jdk17.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/samples-spring-jdk17.yaml b/.github/workflows/samples-spring-jdk17.yaml index 93776f6d115c..a006049c536b 100644 --- a/.github/workflows/samples-spring-jdk17.yaml +++ b/.github/workflows/samples-spring-jdk17.yaml @@ -9,8 +9,8 @@ on: - samples/openapi3/server/petstore/springboot-3/** - samples/openapi3/server/petstore/springboot-4/** - samples/openapi3/server/petstore/springboot-4-jspecify/** - - samples/openapi3/server/petstore/spring-boot-4-jspecify-openapiNullable/** - - samples/openapi3/server/petstore/spring-boot-4-jspecify-useOptional/** + - samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/** + - samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/** - samples/server/petstore/springboot-api-response-examples/** - samples/server/petstore/springboot-lombok-data/** - samples/server/petstore/springboot-lombok-tostring/** @@ -29,8 +29,8 @@ on: - samples/openapi3/server/petstore/springboot-3/** - samples/openapi3/server/petstore/springboot-4/** - samples/openapi3/server/petstore/springboot-4-jspecify/** - - samples/openapi3/server/petstore/spring-boot-4-jspecify-openapiNullable/** - - samples/openapi3/server/petstore/spring-boot-4-jspecify-useOptional/** + - samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/** + - samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/** - samples/server/petstore/springboot-api-response-examples/** - samples/server/petstore/springboot-lombok-data/** - samples/server/petstore/springboot-lombok-tostring/** @@ -57,8 +57,8 @@ jobs: - samples/openapi3/server/petstore/springboot-3 - samples/openapi3/server/petstore/springboot-4 - samples/openapi3/server/petstore/springboot-4-jspecify - - samples/openapi3/server/petstore/spring-boot-4-jspecify-openapiNullable - - samples/openapi3/server/petstore/spring-boot-4-jspecify-useOptional + - samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable + - samples/openapi3/server/petstore/springboot-4-jspecify-useOptional - samples/server/petstore/springboot-api-response-examples - samples/server/petstore/springboot-lombok-data - samples/server/petstore/springboot-lombok-tostring