From 9fdd6768adc1830b4816c62f1d4c1d000d501cdb Mon Sep 17 00:00:00 2001 From: jpfinne Date: Sat, 1 Aug 2026 19:56:47 +0200 Subject: [PATCH 01/19] 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/19] 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/19] 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/19] 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/19] 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/19] 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/19] 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/19] 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/19] 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/19] 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/19] 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/19] 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 From 3f3a174cb0ca4d901183a8fbefc47eeba7e249de Mon Sep 17 00:00:00 2001 From: jpfinne Date: Mon, 3 Aug 2026 10:40:27 +0200 Subject: [PATCH 13/19] Add assertion for optionalAcceptNullable=true/false --- .../openapitools/codegen/java/spring/SpringCodegenTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 a0b7aa72758b..c8d289dc2320 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 @@ -7225,11 +7225,11 @@ public void testJspecify_useOptional(String library, int springBootVersion, Stri ); if (optionalAcceptNullable) { fooAssert.fileContains( - "Foo dt(java.time.@Nullable Instant dt) {", + "Foo dt(java.time.@Nullable Instant dt) {\n this.dt = Optional.ofNullable(dt);", "Foo.Builder dt(java.time.@Nullable Instant dt) {"); } else { fooAssert.fileContains( - "Foo dt(java.time.Instant dt) {", + "Foo dt(java.time.Instant dt) {\n this.dt = Optional.of(dt);", "Foo.Builder dt(java.time.Instant dt) {"); } JavaFileAssert.assertThat(files.get(fooApiFilename)) From 2dd81fd70f0ce92e75eb5bfdf18549810d9b5b6b Mon Sep 17 00:00:00 2001 From: jpfinne Date: Tue, 4 Aug 2026 08:38:31 +0200 Subject: [PATCH 14/19] Add Jspecify in builder of java clients --- .../workflows/samples-java-client-jdk17.yaml | 3 + .../java-native-jackson3-jspecify.yaml | 2 +- ...ot4-jackson3-jspecify-openapiNullable.yaml | 18 + ...tclient-springBoot4-jackson3-jspecify.yaml | 1 + ...emplate-springBoot4-jackson3-jspecify.yaml | 1 + ...bclient-springBoot4-jackson3-jspecify.yaml | 1 + .../main/resources/Java/javaBuilder.mustache | 4 +- .../Java/libraries/feign/pojo.mustache | 2 +- .../Java/libraries/jersey2/pojo.mustache | 2 +- .../Java/libraries/jersey3/pojo.mustache | 2 +- .../Java/libraries/native/pojo.mustache | 2 +- .../Java/libraries/okhttp-gson/pojo.mustache | 2 +- .../Java/libraries/resttemplate/pojo.mustache | 2 +- .../Java/libraries/webclient/pojo.mustache | 2 +- .../Java/nullableArgument_builder.mustache | 1 + .../Java/nullable_var_annotations.mustache | 2 +- .../src/main/resources/Java/pojo.mustache | 2 +- .../codegen/java/JavaClientCodegenTest.java | 12 +- .../org/openapitools/client/model/Foo.java | 24 +- .../.github/workflows/maven.yml | 30 + .../.gitignore | 21 + .../.openapi-generator-ignore | 23 + .../.openapi-generator/FILES | 36 + .../.openapi-generator/VERSION | 1 + .../.travis.yml | 22 + .../README.md | 140 +++ .../api/openapi.yaml | 165 ++++ .../build.gradle | 133 +++ .../build.sbt | 1 + .../docs/DefaultApi.md | 207 +++++ .../docs/Foo.md | 25 + .../git_push.sh | 57 ++ .../gradle.properties | 6 + .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43453 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + .../gradlew | 249 +++++ .../gradlew.bat | 92 ++ .../pom.xml | 270 ++++++ .../settings.gradle | 1 + .../src/main/AndroidManifest.xml | 3 + .../org/openapitools/client/ApiClient.java | 859 ++++++++++++++++++ .../client/ExceptionProvider.java | 80 ++ .../client/JavaTimeFormatter.java | 68 ++ .../client/RFC3339DateFormat.java | 57 ++ .../client/ServerConfiguration.java | 72 ++ .../openapitools/client/ServerVariable.java | 37 + .../org/openapitools/client/StringUtil.java | 83 ++ .../openapitools/client/api/DefaultApi.java | 276 ++++++ .../openapitools/client/api/package-info.java | 2 + .../openapitools/client/auth/ApiKeyAuth.java | 75 ++ .../client/auth/Authentication.java | 29 + .../client/auth/HttpBasicAuth.java | 51 ++ .../client/auth/HttpBearerAuth.java | 69 ++ .../org/openapitools/client/model/Foo.java | 710 +++++++++++++++ .../client/model/package-info.java | 2 + .../org/openapitools/client/package-info.java | 2 + .../client/api/DefaultApiTest.java | 80 ++ .../openapitools/client/model/FooTest.java | 153 ++++ .../org/openapitools/client/model/Foo.java | 114 +++ .../org/openapitools/client/model/Foo.java | 116 ++- .../org/openapitools/client/model/Foo.java | 116 ++- 61 files changed, 4595 insertions(+), 30 deletions(-) create mode 100644 bin/configs/java-restclient-springBoot4-jackson3-jspecify-openapiNullable.yaml create mode 100644 modules/openapi-generator/src/main/resources/Java/nullableArgument_builder.mustache create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/.github/workflows/maven.yml create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/.gitignore create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/.openapi-generator-ignore create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/.openapi-generator/FILES create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/.openapi-generator/VERSION create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/.travis.yml create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/README.md create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/api/openapi.yaml create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/build.gradle create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/build.sbt create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/docs/DefaultApi.md create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/docs/Foo.md create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/git_push.sh create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/gradle.properties create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/gradle/wrapper/gradle-wrapper.jar create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/gradle/wrapper/gradle-wrapper.properties create mode 100755 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/gradlew create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/gradlew.bat create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/pom.xml create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/settings.gradle create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/AndroidManifest.xml create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/ApiClient.java create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/ExceptionProvider.java create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/JavaTimeFormatter.java create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/RFC3339DateFormat.java create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/ServerConfiguration.java create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/ServerVariable.java create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/StringUtil.java create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/api/DefaultApi.java create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/api/package-info.java create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/auth/Authentication.java create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/model/Foo.java create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/model/package-info.java create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/package-info.java create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/test/java/org/openapitools/client/api/DefaultApiTest.java create mode 100644 samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/test/java/org/openapitools/client/model/FooTest.java diff --git a/.github/workflows/samples-java-client-jdk17.yaml b/.github/workflows/samples-java-client-jdk17.yaml index 1baddcb92d72..bf05b7568b85 100644 --- a/.github/workflows/samples-java-client-jdk17.yaml +++ b/.github/workflows/samples-java-client-jdk17.yaml @@ -11,6 +11,7 @@ on: - samples/client/petstore/java/apache-httpclient-jackson3/** - samples/client/petstore/java/native-jackson3-jspecify/** - samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/** + - samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/** - samples/client/others/java/webclient-sealedInterface/** - samples/client/others/java/webclient-sealedInterface_3_1/** - samples/client/petstore/java/webclient-useSingleRequestParameter/** @@ -30,6 +31,7 @@ on: - samples/client/petstore/java/apache-httpclient-jackson3/** - samples/client/petstore/java/native-jackson3-jspecify/** - samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/** + - samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/** - samples/client/others/java/webclient-sealedInterface/** - samples/client/others/java/webclient-sealedInterface_3_1/** - samples/client/petstore/java/webclient-useSingleRequestParameter/** @@ -57,6 +59,7 @@ jobs: - samples/client/petstore/java/restclient-springBoot4-jackson2 - samples/client/petstore/java/restclient-springBoot4-jackson3 - samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify + - samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable - samples/client/petstore/java/native-jackson3-jspecify - samples/client/petstore/java/restclient-swagger2 - samples/client/petstore/java/restclient-useSingleRequestParameter diff --git a/bin/configs/java-native-jackson3-jspecify.yaml b/bin/configs/java-native-jackson3-jspecify.yaml index 44f7c56c6683..9046a44d17b0 100644 --- a/bin/configs/java-native-jackson3-jspecify.yaml +++ b/bin/configs/java-native-jackson3-jspecify.yaml @@ -7,11 +7,11 @@ validateSpec: false additionalProperties: artifactId: petstore-native-jackson3 hideGenerationTimestamp: "true" - generateBuilders: true useReflectionEqualsHashCode: "true" useJackson3: "true" openApiNullable: "false" useJspecify: true + generateBuilders: true typeMappings: OffsetDateTime: java.time.Instant BigDecimal: java.math.BigDecimal \ No newline at end of file diff --git a/bin/configs/java-restclient-springBoot4-jackson3-jspecify-openapiNullable.yaml b/bin/configs/java-restclient-springBoot4-jackson3-jspecify-openapiNullable.yaml new file mode 100644 index 000000000000..91c870baddcc --- /dev/null +++ b/bin/configs/java-restclient-springBoot4-jackson3-jspecify-openapiNullable.yaml @@ -0,0 +1,18 @@ +generatorName: java +outputDir: samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable +library: restclient +inputSpec: modules/openapi-generator/src/test/resources/3_0/java/jspecify.yaml +templateDir: modules/openapi-generator/src/main/resources/Java +validateSpec: false +additionalProperties: + artifactId: petstore-restclient + hideGenerationTimestamp: "true" + containerDefaultToNull: "true" + useSpringBoot4: true + useJackson3: true + openApiNullable: true + useJspecify: true + generateBuilders: true +typeMappings: + OffsetDateTime: java.time.Instant + BigDecimal: java.math.BigDecimal diff --git a/bin/configs/java-restclient-springBoot4-jackson3-jspecify.yaml b/bin/configs/java-restclient-springBoot4-jackson3-jspecify.yaml index 11150147eba2..48335c2dfc81 100644 --- a/bin/configs/java-restclient-springBoot4-jackson3-jspecify.yaml +++ b/bin/configs/java-restclient-springBoot4-jackson3-jspecify.yaml @@ -12,6 +12,7 @@ additionalProperties: useJackson3: true openApiNullable: false useJspecify: true + generateBuilders: true typeMappings: OffsetDateTime: java.time.Instant BigDecimal: java.math.BigDecimal diff --git a/bin/configs/java-resttemplate-springBoot4-jackson3-jspecify.yaml b/bin/configs/java-resttemplate-springBoot4-jackson3-jspecify.yaml index 623f419d546d..51d0f268faa2 100644 --- a/bin/configs/java-resttemplate-springBoot4-jackson3-jspecify.yaml +++ b/bin/configs/java-resttemplate-springBoot4-jackson3-jspecify.yaml @@ -13,6 +13,7 @@ additionalProperties: useJackson3: true openApiNullable: false useJspecify: true + generateBuilders: true typeMappings: OffsetDateTime: java.time.Instant BigDecimal: java.math.BigDecimal \ No newline at end of file diff --git a/bin/configs/java-webclient-springBoot4-jackson3-jspecify.yaml b/bin/configs/java-webclient-springBoot4-jackson3-jspecify.yaml index a743cd70e273..abfdc39d6d19 100644 --- a/bin/configs/java-webclient-springBoot4-jackson3-jspecify.yaml +++ b/bin/configs/java-webclient-springBoot4-jackson3-jspecify.yaml @@ -12,6 +12,7 @@ additionalProperties: useJackson3: true openApiNullable: false useJspecify: true + generateBuilders: true typeMappings: OffsetDateTime: java.time.Instant BigDecimal: java.math.BigDecimal diff --git a/modules/openapi-generator/src/main/resources/Java/javaBuilder.mustache b/modules/openapi-generator/src/main/resources/Java/javaBuilder.mustache index 4a0e102b893b..a60997a1bf7f 100644 --- a/modules/openapi-generator/src/main/resources/Java/javaBuilder.mustache +++ b/modules/openapi-generator/src/main/resources/Java/javaBuilder.mustache @@ -14,7 +14,7 @@ public static class Builder {{#parentModel}}extends {{classname}}.Builder {{/par } {{#vars}} - public {{classname}}.Builder {{name}}({{#removeAnnotations}}{{{datatypeWithEnum}}}{{/removeAnnotations}} {{name}}) { + public {{classname}}.Builder {{name}}({{>nullableArgument_builder}} {{name}}) { {{#vendorExtensions.x-is-jackson-optional-nullable}} this.instance.{{name}} = JsonNullable.<{{#removeAnnotations}}{{{datatypeWithEnum}}}{{/removeAnnotations}}>of({{name}}); {{/vendorExtensions.x-is-jackson-optional-nullable}} @@ -32,7 +32,7 @@ public static class Builder {{#parentModel}}extends {{classname}}.Builder {{/par {{/vars}} {{#parentVars}} - public {{classname}}.Builder {{name}}({{#removeAnnotations}}{{{datatypeWithEnum}}}{{/removeAnnotations}} {{name}}) { // inherited: {{isInherited}} + public {{classname}}.Builder {{name}}({{>nullableArgument_builder}} {{name}}) { // inherited: {{isInherited}} super.{{name}}({{name}}); return this; } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pojo.mustache index 6552166eaecf..3f8b20e3b33a 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pojo.mustache @@ -317,7 +317,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private{{#jsonb}} static{{/jsonb}} String toIndentedString(Object o) { + private{{#jsonb}} static{{/jsonb}} String toIndentedString({{#useJspecify}}@Nullable {{/useJspecify}}Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } {{#supportUrlQuery}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache index b14cc844cb56..4e8ec3e538b5 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pojo.mustache @@ -337,7 +337,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens * 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({{#useJspecify}}@Nullable {{/useJspecify}}Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache index b14cc844cb56..4e8ec3e538b5 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey3/pojo.mustache @@ -337,7 +337,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens * 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({{#useJspecify}}@Nullable {{/useJspecify}}Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache index 36d2f52f0ede..a1aaeb6f12d4 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/pojo.mustache @@ -341,7 +341,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens * 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({{#useJspecify}}@Nullable {{/useJspecify}}Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } {{#supportUrlQuery}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache index 349e6fc6a798..17b31d7ab6aa 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pojo.mustache @@ -254,7 +254,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens * 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({{#useJspecify}}@Nullable {{/useJspecify}}Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache index 7ec14493ef56..dd48e2e30be5 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache @@ -363,7 +363,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private{{#jsonb}} static{{/jsonb}} String toIndentedString(Object o) { + private{{#jsonb}} static{{/jsonb}} String toIndentedString({{#useJspecify}}@Nullable {{/useJspecify}}Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } {{#supportUrlQuery}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pojo.mustache index 4ffe46114fa6..6192f0d202c2 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pojo.mustache @@ -363,7 +363,7 @@ public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#v * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private{{#jsonb}} static{{/jsonb}} String toIndentedString(Object o) { + private{{#jsonb}} static{{/jsonb}} String toIndentedString({{#useJspecify}}@Nullable {{/useJspecify}}Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } {{#supportUrlQuery}} diff --git a/modules/openapi-generator/src/main/resources/Java/nullableArgument_builder.mustache b/modules/openapi-generator/src/main/resources/Java/nullableArgument_builder.mustache new file mode 100644 index 000000000000..9700dc1a75b7 --- /dev/null +++ b/modules/openapi-generator/src/main/resources/Java/nullableArgument_builder.mustache @@ -0,0 +1 @@ +{{#useJspecify}}{{#lambda.jSpecifyNullable}}{{^required}}@{{javaxPackage}}.annotation.Nullable{{/required}}{{/lambda.jSpecifyNullable}}{{#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/Java/nullable_var_annotations.mustache b/modules/openapi-generator/src/main/resources/Java/nullable_var_annotations.mustache index ef4e208fefb5..765a75fda277 100644 --- a/modules/openapi-generator/src/main/resources/Java/nullable_var_annotations.mustache +++ b/modules/openapi-generator/src/main/resources/Java/nullable_var_annotations.mustache @@ -1 +1 @@ -{{#lambda.jSpecifyNullable}}{{#required}}{{#isNullable}}@{{javaxPackage}}.annotation.Nullable{{/isNullable}}{{^useJspecify}}{{^isNullable}}@{{javaxPackage}}.annotation.Nonnull{{/isNullable}}{{/useJspecify}}{{/required}}{{^required}}@{{javaxPackage}}.annotation.Nullable{{/required}}{{/lambda.jSpecifyNullable}} \ No newline at end of file +{{^useJspecify}}{{#required}}{{#isNullable}}@{{javaxPackage}}.annotation.Nullable{{/isNullable}}{{^isNullable}}@{{javaxPackage}}.annotation.Nonnull{{/isNullable}}{{/required}}{{^required}}@{{javaxPackage}}.annotation.Nullable{{/required}}{{/useJspecify}}{{#useJspecify}}{{#lambda.jSpecifyNullable}}{{^required}}@{{javaxPackage}}.annotation.Nullable{{/required}}{{/lambda.jSpecifyNullable}}{{/useJspecify}} \ No newline at end of file diff --git a/modules/openapi-generator/src/main/resources/Java/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/pojo.mustache index 2c1ff7e32cf3..5492002ac3ee 100644 --- a/modules/openapi-generator/src/main/resources/Java/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/pojo.mustache @@ -362,7 +362,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private{{#jsonb}} static{{/jsonb}} String toIndentedString(Object o) { + private{{#jsonb}} static{{/jsonb}} String toIndentedString({{#useJspecify}}@Nullable {{/useJspecify}}Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } {{#supportUrlQuery}} 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 810fdb1fb22f..eb0c927db99d 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 @@ -4656,7 +4656,8 @@ public void testJspecify(String library, boolean useSpringBoot4, boolean hasJspe "containerDefaultToNull", true, USE_SPRING_BOOT4, useSpringBoot4, JavaClientCodegen.OPENAPI_NULLABLE, false, - GENERATE_CONSTRUCTOR_WITH_ALL_ARGS, true + GENERATE_CONSTRUCTOR_WITH_ALL_ARGS, true, + GENERATE_BUILDERS, true ), codegenConfigurator -> codegenConfigurator @@ -4691,7 +4692,8 @@ public void testJspecify(String library, boolean useSpringBoot4, boolean hasJspe "@Nullable List getListOfDt()", "private java.time.@Nullable Instant nullableDt;", "private @Nullable List listOfDt;", - "setListOfDt(@Nullable List listOfDt)"); + "setListOfDt(@Nullable List listOfDt)", + "String toIndentedString(@Nullable Object object)"); if (!NATIVE.equals(library)) { // native library does not generate all arg constructors JavaFileAssert.assertThat(files.get("Foo.java")) .fileContains( @@ -4719,7 +4721,8 @@ public void testJspecify_openapiNullable(String library, boolean useSpringBoot4, "containerDefaultToNull", true, USE_SPRING_BOOT4, useSpringBoot4, JavaClientCodegen.OPENAPI_NULLABLE, true, - GENERATE_CONSTRUCTOR_WITH_ALL_ARGS, true + GENERATE_CONSTRUCTOR_WITH_ALL_ARGS, true, + GENERATE_BUILDERS, true ), codegenConfigurator -> codegenConfigurator @@ -4754,7 +4757,8 @@ public void testJspecify_openapiNullable(String library, boolean useSpringBoot4, "@Nullable List getListOfDt()", "setListOfDt(@Nullable List listOfDt)", "JsonNullable nullableDt = JsonNullable.undefined()", - "private JsonNullable nullableBinary = JsonNullable.undefined();"); + "private JsonNullable nullableBinary = JsonNullable.undefined();", + "String toIndentedString(@Nullable Object object)"); if (!NATIVE.equals(library)) { // native library does not generate all arg constructors JavaFileAssert.assertThat(files.get("Foo.java")) .fileContains( 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 5e512e3675f9..7d01e8c95dae 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 @@ -485,7 +485,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 "); } @@ -619,31 +619,31 @@ protected Builder(Foo instance) { this.instance = instance; } - 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(File binary) { + public Foo.Builder binary(@Nullable File binary) { this.instance.binary = binary; return this; } - public Foo.Builder nullableBinary(File nullableBinary) { + public Foo.Builder nullableBinary(@Nullable File 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; } @@ -651,15 +651,15 @@ public Foo.Builder requiredDt(java.time.Instant requiredDt) { this.instance.requiredDt = 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; } @@ -667,7 +667,7 @@ public Foo.Builder requiredColor(String requiredColor) { this.instance.requiredColor = 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/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/.github/workflows/maven.yml b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/.github/workflows/maven.yml new file mode 100644 index 000000000000..4cdd3d63e3e4 --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/.github/workflows/maven.yml @@ -0,0 +1,30 @@ +# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven +# +# This file is auto-generated by OpenAPI Generator (https://openapi-generator.tech) + +name: Java CI with Maven + +on: + push: + branches: [ main, master ] + pull_request: + branches: [ main, master ] + +jobs: + build: + name: Build jspecify + runs-on: ubuntu-latest + strategy: + matrix: + java: [ 17, 21 ] + steps: + - uses: actions/checkout@v4 + - name: Set up JDK + uses: actions/setup-java@v4 + with: + java-version: ${{ matrix.java }} + distribution: 'temurin' + cache: maven + - name: Build with Maven + run: mvn -B package --no-transfer-progress --file pom.xml diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/.gitignore b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/.gitignore new file mode 100644 index 000000000000..a530464afa1b --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/.gitignore @@ -0,0 +1,21 @@ +*.class + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.ear + +# exclude jar for gradle wrapper +!gradle/wrapper/*.jar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +# build files +**/target +target +.gradle +build diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/.openapi-generator-ignore b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/.openapi-generator-ignore new file mode 100644 index 000000000000..7484ee590a38 --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-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/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/.openapi-generator/FILES b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/.openapi-generator/FILES new file mode 100644 index 000000000000..58529ad3488b --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/.openapi-generator/FILES @@ -0,0 +1,36 @@ +.github/workflows/maven.yml +.gitignore +.travis.yml +README.md +api/openapi.yaml +build.gradle +build.sbt +docs/DefaultApi.md +docs/Foo.md +git_push.sh +gradle.properties +gradle/wrapper/gradle-wrapper.jar +gradle/wrapper/gradle-wrapper.properties +gradlew +gradlew.bat +pom.xml +settings.gradle +src/main/AndroidManifest.xml +src/main/java/org/openapitools/client/ApiClient.java +src/main/java/org/openapitools/client/ExceptionProvider.java +src/main/java/org/openapitools/client/JavaTimeFormatter.java +src/main/java/org/openapitools/client/RFC3339DateFormat.java +src/main/java/org/openapitools/client/ServerConfiguration.java +src/main/java/org/openapitools/client/ServerVariable.java +src/main/java/org/openapitools/client/StringUtil.java +src/main/java/org/openapitools/client/api/DefaultApi.java +src/main/java/org/openapitools/client/api/package-info.java +src/main/java/org/openapitools/client/auth/ApiKeyAuth.java +src/main/java/org/openapitools/client/auth/Authentication.java +src/main/java/org/openapitools/client/auth/HttpBasicAuth.java +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-openapiNullable/.openapi-generator/VERSION b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/.openapi-generator/VERSION new file mode 100644 index 000000000000..8fc8df61083a --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/.openapi-generator/VERSION @@ -0,0 +1 @@ +7.25.0-SNAPSHOT diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/.travis.yml b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/.travis.yml new file mode 100644 index 000000000000..1b6741c083c7 --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/.travis.yml @@ -0,0 +1,22 @@ +# +# Generated by OpenAPI Generator: https://openapi-generator.tech +# +# Ref: https://docs.travis-ci.com/user/languages/java/ +# +language: java +jdk: + - openjdk12 + - openjdk11 + - openjdk10 + - openjdk9 + - openjdk8 +before_install: + # ensure gradlew has proper permission + - chmod a+x ./gradlew +script: + # test using maven + #- mvn test + # test using gradle + - gradle test + # test using sbt + # - sbt test diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/README.md b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/README.md new file mode 100644 index 000000000000..1e2c7733049b --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/README.md @@ -0,0 +1,140 @@ +# petstore-restclient + +jspecify + +- API version: 1.0.0 + +- Generator version: 7.25.0-SNAPSHOT + +test fully qualified name and jspecify + + +*Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)* + +## Requirements + +Building the API client library requires: + +1. Java 17+ +2. Maven/Gradle + +## Installation + +To install the API client library to your local Maven repository, simply execute: + +```shell +mvn clean install +``` + +To deploy it to a remote Maven repository instead, configure the settings of the repository and execute: + +```shell +mvn clean deploy +``` + +Refer to the [OSSRH Guide](http://central.sonatype.org/pages/ossrh-guide.html) for more information. + +### Maven users + +Add this dependency to your project's POM: + +```xml + + org.openapitools + petstore-restclient + 1.0.0 + compile + +``` + +### Gradle users + +Add this dependency to your project's build file: + +```groovy + repositories { + mavenCentral() // Needed if the 'petstore-restclient' jar has been published to maven central. + mavenLocal() // Needed if the 'petstore-restclient' jar has been published to the local maven repo. + } + + dependencies { + implementation "org.openapitools:petstore-restclient:1.0.0" + } +``` + +### Others + +At first generate the JAR by executing: + +```shell +mvn clean package +``` + +Then manually install the following JARs: + +- `target/petstore-restclient-1.0.0.jar` +- `target/lib/*.jar` + +## Getting Started + +Please follow the [installation](#installation) instruction and execute the following Java code: + +```java + +import org.openapitools.client.*; +import org.openapitools.client.auth.*; +import org.openapitools.client.model.*; +import org.openapitools.client.api.DefaultApi; + +public class DefaultApiExample { + + public static void main(String[] args) { + ApiClient defaultClient = new ApiClient(); + defaultClient.setBasePath("http://localhost"); + + DefaultApi apiInstance = new DefaultApi(defaultClient); + String id = "id_example"; // String | + try { + apiInstance.fileIdGet(id); + } catch (HttpStatusCodeException e) { + System.err.println("Exception when calling DefaultApi#fileIdGet"); + System.err.println("Status code: " + e.getStatusCode().value()); + System.err.println("Reason: " + e.getResponseBodyAsString()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } +} + +``` + +## Documentation for API Endpoints + +All URIs are relative to *http://localhost* + +Class | Method | HTTP request | Description +------------ | ------------- | ------------- | ------------- +*DefaultApi* | [**fileIdGet**](docs/DefaultApi.md#fileIdGet) | **GET** /file/{id} | +*DefaultApi* | [**fooDtParamGet**](docs/DefaultApi.md#fooDtParamGet) | **GET** /foo/{dtParam} | +*DefaultApi* | [**uploadPost**](docs/DefaultApi.md#uploadPost) | **POST** /upload | + + +## Documentation for Models + + - [Foo](docs/Foo.md) + + + +## Documentation for Authorization + +Endpoints do not require authorization. + + +## Recommendation + +It's recommended to create an instance of `ApiClient` per thread in a multithreaded environment to avoid any potential issues. + +## Author + + + diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/api/openapi.yaml b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/api/openapi.yaml new file mode 100644 index 000000000000..1ad95379176c --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/api/openapi.yaml @@ -0,0 +1,165 @@ +openapi: 3.0.0 +info: + description: test fully qualified name and jspecify + title: jspecify + version: 1.0.0 +servers: +- url: / +paths: + /foo/{dtParam}: + get: + parameters: + - explode: false + in: path + name: dtParam + required: false + schema: + format: date-time + type: string + style: simple + - explode: true + in: query + name: dtQuery + required: false + schema: + format: date-time + type: string + style: form + - explode: true + in: cookie + name: dtCookie + required: false + schema: + 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: + application/json: + schema: + $ref: "#/components/schemas/Foo" + description: response + x-accepts: + - application/json + /upload: + post: + requestBody: + content: + multipart/form-data: + schema: + $ref: "#/components/schemas/_upload_post_request" + description: file + responses: + default: + description: ok + x-content-type: multipart/form-data + x-accepts: + - application/json + /file/{id}: + get: + parameters: + - explode: false + in: path + name: id + required: true + schema: + type: string + style: simple + responses: + "200": + description: ok + x-accepts: + - application/json +components: + schemas: + 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 + type: string + type: array + listMinIntems: + items: + format: date-time + 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: + file: + format: binary + type: string + type: object + diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/build.gradle b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/build.gradle new file mode 100644 index 000000000000..93b0827bccf1 --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/build.gradle @@ -0,0 +1,133 @@ +apply plugin: 'idea' +apply plugin: 'eclipse' + +group = 'org.openapitools' +version = '1.0.0' + +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:1.5.+' + classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3' + } +} + +repositories { + mavenCentral() +} + + +if(hasProperty('target') && target == 'android') { + + apply plugin: 'com.android.library' + apply plugin: 'com.github.dcendents.android-maven' + + android { + compileSdkVersion 23 + buildToolsVersion '23.0.2' + defaultConfig { + minSdkVersion 14 + targetSdkVersion 22 + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + + // Rename the aar correctly + libraryVariants.all { variant -> + variant.outputs.each { output -> + def outputFile = output.outputFile + if (outputFile != null && outputFile.name.endsWith('.aar')) { + def fileName = "${project.name}-${variant.baseName}-${version}.aar" + output.outputFile = new File(outputFile.parent, fileName) + } + } + } + + dependencies { + provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" + } + } + + afterEvaluate { + android.libraryVariants.all { variant -> + def task = project.tasks.create "jar${variant.name.capitalize()}", Jar + task.description = "Create jar artifact for ${variant.name}" + task.dependsOn variant.javaCompile + task.from variant.javaCompile.destinationDirectory + task.destinationDirectory = project.file("${project.buildDir}/outputs/jar") + task.archiveFileName = "${project.name}-${variant.baseName}-${version}.jar" + artifacts.add('archives', task); + } + } + + task sourcesJar(type: Jar) { + from android.sourceSets.main.java.srcDirs + archiveClassifier = 'sources' + } + + artifacts { + archives sourcesJar + } + +} else { + + apply plugin: 'java' + apply plugin: 'maven-publish' + + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + + publishing { + publications { + maven(MavenPublication) { + artifactId = 'petstore-restclient' + from components.java + } + } + } + + task execute(type:JavaExec) { + mainClass = System.getProperty('mainClass') + classpath = sourceSets.main.runtimeClasspath + } +} + +ext { + jackson_version = "3.1.5" + jackson_annotations_version = "2.21" + jackson_databind_nullable_version = "0.2.11" + spring_web_version = "7.0.5" + jakarta_annotation_version = "3.0.0" + bean_validation_version = "3.1.1" + jodatime_version = "2.14.0" + junit_version = "5.10.2" +} + +dependencies { + implementation "org.springframework:spring-web:$spring_web_version" + implementation "org.springframework:spring-context:$spring_web_version" + implementation "tools.jackson.core:jackson-core:$jackson_version" + implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_annotations_version" + implementation "tools.jackson.core:jackson-databind:$jackson_version" + implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version" + implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version" + testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version" + testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version" +} + +test { + // Enable JUnit 5 (Gradle 4.6+). + useJUnitPlatform() + + // Always run tests, even when nothing changed. + dependsOn 'cleanTest' + + // Show test results. + testLogging { + events "passed", "skipped", "failed" + } +} diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/build.sbt b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/build.sbt new file mode 100644 index 000000000000..464090415c47 --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/build.sbt @@ -0,0 +1 @@ +# TODO diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/docs/DefaultApi.md b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/docs/DefaultApi.md new file mode 100644 index 000000000000..92116b800182 --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/docs/DefaultApi.md @@ -0,0 +1,207 @@ +# DefaultApi + +All URIs are relative to *http://localhost* + +| Method | HTTP request | Description | +|------------- | ------------- | -------------| +| [**fileIdGet**](DefaultApi.md#fileIdGet) | **GET** /file/{id} | | +| [**fooDtParamGet**](DefaultApi.md#fooDtParamGet) | **GET** /foo/{dtParam} | | +| [**uploadPost**](DefaultApi.md#uploadPost) | **POST** /upload | | + + + +## fileIdGet + +> fileIdGet(id) + + + +### Example + +```java +// Import classes: +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.DefaultApi; + +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://localhost"); + + DefaultApi apiInstance = new DefaultApi(defaultClient); + String id = "id_example"; // String | + try { + apiInstance.fileIdGet(id); + } catch (ApiException e) { + System.err.println("Exception when calling DefaultApi#fileIdGet"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } +} +``` + +### Parameters + + +| Name | Type | Description | Notes | +|------------- | ------------- | ------------- | -------------| +| **id** | **String**| | | + +### Return type + +null (empty response body) + +### Authorization + +No authorization required + +### HTTP request headers + +- **Content-Type**: Not defined +- **Accept**: Not defined + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **200** | ok | - | + + +## fooDtParamGet + +> Foo fooDtParamGet(dtParam, dtQuery, dtCookie, color) + + + +### Example + +```java +// Import classes: +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.DefaultApi; + +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://localhost"); + + DefaultApi apiInstance = new DefaultApi(defaultClient); + 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, color); + System.out.println(result); + } catch (ApiException e) { + System.err.println("Exception when calling DefaultApi#fooDtParamGet"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } +} +``` + +### Parameters + + +| Name | Type | Description | Notes | +|------------- | ------------- | ------------- | -------------| +| **dtParam** | **java.time.Instant**| | [optional] | +| **dtQuery** | **java.time.Instant**| | [optional] | +| **dtCookie** | **java.time.Instant**| | [optional] | +| **color** | **String**| | [optional] [default to red] | + +### Return type + +[**Foo**](Foo.md) + +### Authorization + +No authorization required + +### HTTP request headers + +- **Content-Type**: Not defined +- **Accept**: application/json + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **0** | response | - | + + +## uploadPost + +> uploadPost(_file) + + + +### Example + +```java +// Import classes: +import org.openapitools.client.ApiClient; +import org.openapitools.client.ApiException; +import org.openapitools.client.Configuration; +import org.openapitools.client.models.*; +import org.openapitools.client.api.DefaultApi; + +public class Example { + public static void main(String[] args) { + ApiClient defaultClient = Configuration.getDefaultApiClient(); + defaultClient.setBasePath("http://localhost"); + + DefaultApi apiInstance = new DefaultApi(defaultClient); + File _file = new File("/path/to/file"); // File | + try { + apiInstance.uploadPost(_file); + } catch (ApiException e) { + System.err.println("Exception when calling DefaultApi#uploadPost"); + System.err.println("Status code: " + e.getCode()); + System.err.println("Reason: " + e.getResponseBody()); + System.err.println("Response headers: " + e.getResponseHeaders()); + e.printStackTrace(); + } + } +} +``` + +### Parameters + + +| Name | Type | Description | Notes | +|------------- | ------------- | ------------- | -------------| +| **_file** | **File**| | [optional] | + +### Return type + +null (empty response body) + +### Authorization + +No authorization required + +### HTTP request headers + +- **Content-Type**: multipart/form-data +- **Accept**: Not defined + + +### HTTP response details +| Status code | Description | Response headers | +|-------------|-------------|------------------| +| **0** | ok | - | + diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/docs/Foo.md b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/docs/Foo.md new file mode 100644 index 000000000000..9237adf1033e --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/docs/Foo.md @@ -0,0 +1,25 @@ + + +# Foo + + +## Properties + +| 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-openapiNullable/git_push.sh b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/git_push.sh new file mode 100644 index 000000000000..f53a75d4fabe --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/git_push.sh @@ -0,0 +1,57 @@ +#!/bin/sh +# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/ +# +# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com" + +git_user_id=$1 +git_repo_id=$2 +release_note=$3 +git_host=$4 + +if [ "$git_host" = "" ]; then + git_host="github.com" + echo "[INFO] No command line input provided. Set \$git_host to $git_host" +fi + +if [ "$git_user_id" = "" ]; then + git_user_id="GIT_USER_ID" + echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id" +fi + +if [ "$git_repo_id" = "" ]; then + git_repo_id="GIT_REPO_ID" + echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id" +fi + +if [ "$release_note" = "" ]; then + release_note="Minor update" + echo "[INFO] No command line input provided. Set \$release_note to $release_note" +fi + +# Initialize the local directory as a Git repository +git init + +# Adds the files in the local repository and stages them for commit. +git add . + +# Commits the tracked changes and prepares them to be pushed to a remote repository. +git commit -m "$release_note" + +# Sets the new remote +git_remote=$(git remote) +if [ "$git_remote" = "" ]; then # git remote not defined + + if [ "$GIT_TOKEN" = "" ]; then + echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment." + git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git + else + git remote add origin https://${git_user_id}:"${GIT_TOKEN}"@${git_host}/${git_user_id}/${git_repo_id}.git + fi + +fi + +git pull origin master + +# Pushes (Forces) the changes in the local repository up to the remote repository +echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git" +git push origin master 2>&1 | grep -v 'To https' diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/gradle.properties b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/gradle.properties new file mode 100644 index 000000000000..a3408578278a --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/gradle.properties @@ -0,0 +1,6 @@ +# This file is automatically generated by OpenAPI Generator (https://github.com/openAPITools/openapi-generator). +# To include other gradle properties as part of the code generation process, please use the `gradleProperties` option. +# +# Gradle properties reference: https://docs.gradle.org/current/userguide/build_environment.html#sec:gradle_configuration_properties +# For example, uncomment below to build for Android +#target = android diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/gradle/wrapper/gradle-wrapper.jar b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e6441136f3d4ba8a0da8d277868979cfbc8ad796 GIT binary patch literal 43453 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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
NnX)EH+Nua)3Y(c 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 '} +case $link in #( +/*) app_path=$link ;; #( +*) app_path=$APP_HOME$link ;; +esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { +echo "$*" +} >&2 + +die () { +echo +echo "$*" +echo +exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( +CYGWIN* ) cygwin=true ;; #( +Darwin* ) darwin=true ;; #( +MSYS* | MINGW* ) msys=true ;; #( +NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then +if [ -x "$JAVA_HOME/jre/sh/java" ] ; then +# IBM's JDK on AIX uses strange locations for the executables +JAVACMD=$JAVA_HOME/jre/sh/java +else +JAVACMD=$JAVA_HOME/bin/java +fi +if [ ! -x "$JAVACMD" ] ; then +die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi +else +JAVACMD=java +if ! command -v java >/dev/null 2>&1 +then +die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then +case $MAX_FD in #( +max*) +# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. +# shellcheck disable=SC2039,SC3045 +MAX_FD=$( ulimit -H -n ) || +warn "Could not query maximum file descriptor limit" +esac +case $MAX_FD in #( +'' | soft) :;; #( +*) +# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. +# shellcheck disable=SC2039,SC3045 +ulimit -n "$MAX_FD" || +warn "Could not set maximum file descriptor limit to $MAX_FD" +esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then +APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) +CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + +JAVACMD=$( cygpath --unix "$JAVACMD" ) + +# Now convert the arguments - kludge to limit ourselves to /bin/sh +for arg do +if +case $arg in #( +-*) false ;; # don't mess with options #( +/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath +[ -e "$t" ] ;; #( +*) false ;; +esac +then +arg=$( cygpath --path --ignore --mixed "$arg" ) +fi +# Roll the args list around exactly as many times as the number of +# args, so each arg winds up back in the position where it started, but +# possibly modified. +# +# NB: a `for` loop captures its iteration list before it begins, so +# changing the positional parameters here affects neither the number of +# iterations, nor the values presented in `arg`. +shift # remove old arg +set -- "$@" "$arg" # push replacement arg +done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ +"-Dorg.gradle.appname=$APP_BASE_NAME" \ +-classpath "$CLASSPATH" \ +org.gradle.wrapper.GradleWrapperMain \ +"$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then +die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( +printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | +xargs -n1 | +sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | +tr '\n' ' ' +)" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/gradlew.bat b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/gradlew.bat new file mode 100644 index 000000000000..25da30dbdeee --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/pom.xml b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/pom.xml new file mode 100644 index 000000000000..a97109fe3fbf --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/pom.xml @@ -0,0 +1,270 @@ + + 4.0.0 + org.openapitools + petstore-restclient + jar + petstore-restclient + 1.0.0 + https://github.com/openapitools/openapi-generator + OpenAPI Java + + scm:git:git@github.com:openapitools/openapi-generator.git + scm:git:git@github.com:openapitools/openapi-generator.git + https://github.com/openapitools/openapi-generator + + + + + Unlicense + http://unlicense.org + repo + + + + + + OpenAPI-Generator Contributors + team@openapitools.org + OpenAPITools.org + http://openapitools.org + + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + 3.6.2 + + + enforce-maven + + enforce + + + + + 2.2.0 + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.5.4 + + + + loggerPath + conf/log4j.properties + + + -Xms512m -Xmx1500m + methods + false + true + + + + maven-dependency-plugin + + + package + + copy-dependencies + + + ${project.build.directory}/lib + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.5.0 + + + + test-jar + + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 3.6.1 + + + add_sources + generate-sources + + add-source + + + + src/main/java + + + + + add_test_sources + generate-test-sources + + add-test-source + + + + src/test/java + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.15.0 + + 17 + 17 + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.12.0 + + none + + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-source-plugin + 3.4.0 + + + attach-sources + + jar-no-fork + + + + + + + + + + sign-artifacts + + + + org.apache.maven.plugins + maven-gpg-plugin + 3.2.8 + + + sign-artifacts + verify + + sign + + + + + + + + + + + + + + org.springframework + spring-web + ${spring-web-version} + + + org.springframework + spring-context + ${spring-web-version} + + + + + tools.jackson.core + jackson-core + ${jackson-version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson-annotations-version} + + + tools.jackson.core + jackson-databind + ${jackson-version} + + + tools.jackson.jakarta.rs + jackson-jakarta-rs-json-provider + ${jackson-version} + + + org.openapitools + jackson-databind-nullable + ${jackson-databind-nullable-version} + + + + + + jakarta.annotation + jakarta.annotation-api + ${jakarta-annotation-version} + provided + + + + + org.junit.jupiter + junit-jupiter-engine + ${junit-version} + test + + + + UTF-8 + + 7.0.5 + 3.1.5 + 3.0.0 + + 2.21 + 0.2.11 + 3.1.1 + 5.10.2 + + diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/settings.gradle b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/settings.gradle new file mode 100644 index 000000000000..fad96959c01e --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/settings.gradle @@ -0,0 +1 @@ +rootProject.name = "petstore-restclient" \ No newline at end of file diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/AndroidManifest.xml b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/AndroidManifest.xml new file mode 100644 index 000000000000..54fbcb3da1e8 --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/AndroidManifest.xml @@ -0,0 +1,3 @@ + + + diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/ApiClient.java new file mode 100644 index 000000000000..7e075ab920af --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/ApiClient.java @@ -0,0 +1,859 @@ +/* + * jspecify + * test fully qualified name and jspecify + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client; + + +import tools.jackson.databind.DeserializationFeature; + +import tools.jackson.core.JacksonException; +import tools.jackson.databind.json.JsonMapper; +import org.springframework.http.converter.HttpMessageConverters; +import org.springframework.http.converter.json.JacksonJsonHttpMessageConverter; + +import java.util.function.Consumer; +import org.openapitools.jackson.nullable.JsonNullableJackson3Module; +import org.springframework.core.ParameterizedTypeReference; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.InvalidMediaTypeException; +import org.springframework.http.MediaType; +import org.springframework.http.converter.HttpMessageConverter; +import org.springframework.util.CollectionUtils; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; +import org.springframework.util.StringUtils; +import org.springframework.web.client.RestClientException; +import org.springframework.web.util.UriComponentsBuilder; +import org.springframework.web.client.RestClient; +import org.springframework.web.client.RestClient.ResponseSpec; +import java.util.Optional; + +import java.text.DateFormat; +import java.text.ParseException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.TimeZone; +import java.util.function.Supplier; + +import org.jspecify.annotations.Nullable; + +import java.time.OffsetDateTime; + +import org.openapitools.client.auth.Authentication; +import org.openapitools.client.auth.HttpBasicAuth; +import org.openapitools.client.auth.HttpBearerAuth; +import org.openapitools.client.auth.ApiKeyAuth; + +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") +public class ApiClient extends JavaTimeFormatter { + public enum CollectionFormat { + CSV(","), TSV("\t"), SSV(" "), PIPES("|"), MULTI(null); + + protected final String separator; + CollectionFormat(String separator) { + this.separator = separator; + } + + protected String collectionToString(Collection collection) { + return StringUtils.collectionToDelimitedString(collection, separator); + } + } + + protected final HttpHeaders defaultHeaders = new HttpHeaders(); + protected final MultiValueMap defaultCookies = new LinkedMultiValueMap<>(); + + protected String basePath = "http://localhost"; + protected List servers = new ArrayList(Arrays.asList( + new ServerConfiguration( + "", + "No description provided", + new HashMap() + ) + )); + protected Integer serverIndex = 0; + protected Map serverVariables = null; + + protected final RestClient restClient; + protected final DateFormat dateFormat; + protected final JsonMapper mapper; + protected Map authentications; + + /** + * The {@link ExceptionProvider} used to create exceptions thrown by this client. + * Defaults to {@link ExceptionProvider#DEFAULT}. Can be replaced to customize the exceptions + * thrown by this client by calling {@link #setExceptionProvider(ExceptionProvider)}. + */ + protected ExceptionProvider exceptionProvider = ExceptionProvider.DEFAULT; + + + public ApiClient() { + this(null); + } + + public ApiClient(RestClient restClient) { + this(restClient, createDefaultDateFormat()); + } + + public ApiClient(JsonMapper mapper, DateFormat format) { + this(null, mapper, format); + } + + public ApiClient(RestClient restClient, JsonMapper mapper, DateFormat format) { + this.mapper = mapper; + this.restClient = Optional.ofNullable(restClient).orElseGet(() -> buildRestClient(this.mapper)); + this.dateFormat = format; + this.init(); + } + + protected ApiClient(RestClient restClient, DateFormat format) { + this(restClient, createDefaultMapper(format), format); + } + + public static DateFormat createDefaultDateFormat() { + DateFormat dateFormat = new RFC3339DateFormat(); + dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + return dateFormat; + } + + public static JsonMapper createDefaultMapper(@Nullable DateFormat dateFormat) { + return JsonMapper.builder() + .defaultDateFormat(dateFormat) + .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) + .addModule(new JsonNullableJackson3Module()) + .build(); + } + + protected void init() { + // Setup authentications (key: authentication name, value: authentication). + authentications = new HashMap<>(); + // Prevent the authentications from being modified. + authentications = Collections.unmodifiableMap(authentications); + } + + /** + * Build the RestClientBuilder used to make RestClient. + * @param mapper JsonMapper used for serialize/deserialize + * @return RestClient + */ + public static RestClient.Builder buildRestClientBuilder(JsonMapper mapper) { + + Consumer messageConverters = builder -> { + builder.addCustomConverter(new JacksonJsonHttpMessageConverter(mapper)); + }; + + return RestClient.builder().configureMessageConverters(messageConverters); + } + + /** + * Build the RestClientBuilder used to make RestClient. + * @return RestClient + */ + public static RestClient.Builder buildRestClientBuilder() { + return buildRestClientBuilder(createDefaultMapper(null)); + } + + /** + * Build the RestClient used to make HTTP requests. + * @param mapper JsonMapper used for serialize/deserialize + * @return RestClient + */ + public static RestClient buildRestClient(JsonMapper mapper) { + return buildRestClientBuilder(mapper).build(); + } + + /** + * Build the RestClient used to make HTTP requests. + * @return RestClient + */ + public static RestClient buildRestClient() { + return buildRestClientBuilder(createDefaultMapper(null)).build(); + } + + /** + * Get the current base path + * @return String the base path + */ + public String getBasePath() { + return basePath; + } + + /** + * Set the base path, which should include the host + * @param basePath the base path + * @return ApiClient this client + */ + public ApiClient setBasePath(String basePath) { + this.basePath = basePath; + this.serverIndex = null; + return this; + } + + public List getServers() { + return servers; + } + + public ApiClient setServers(List servers) { + this.servers = servers; + return this; + } + + public Integer getServerIndex() { + return serverIndex; + } + + public ApiClient setServerIndex(Integer serverIndex) { + this.serverIndex = serverIndex; + return this; + } + + public Map getServerVariables() { + return serverVariables; + } + + public ApiClient setServerVariables(Map serverVariables) { + this.serverVariables = serverVariables; + return this; + } + + /** + * Get authentications (key: authentication name, value: authentication). + * @return Map the currently configured authentication types + */ + public Map getAuthentications() { + return authentications; + } + + /** + * Get the current {@link ExceptionProvider}. + * @return the exception provider + */ + public ExceptionProvider getExceptionProvider() { + return exceptionProvider; + } + + /** + * Set a custom {@link ExceptionProvider} to control which exception types are thrown + * by this client. + * @param exceptionProvider the exception provider + * @return this client instance + */ + public ApiClient setExceptionProvider(ExceptionProvider exceptionProvider) { + this.exceptionProvider = exceptionProvider; + return this; + } + + /** + * Get authentication for the given name. + * + * @param authName The authentication name + * @return The authentication, null if not found + */ + public Authentication getAuthentication(String authName) { + return authentications.get(authName); + } + + /** + * Helper method to set access token for the first Bearer authentication. + * @param bearerToken Bearer token + */ + public void setBearerToken(String bearerToken) { + for (Authentication auth : authentications.values()) { + if (auth instanceof HttpBearerAuth) { + ((HttpBearerAuth) auth).setBearerToken(bearerToken); + return; + } + } + throw exceptionProvider.bearerAuthException(); + } + + /** + * Helper method to set the supplier of access tokens for Bearer authentication. + * + * @param tokenSupplier the token supplier function + */ + public void setBearerToken(Supplier tokenSupplier) { + for (Authentication auth : authentications.values()) { + if (auth instanceof HttpBearerAuth) { + ((HttpBearerAuth) auth).setBearerToken(tokenSupplier); + return; + } + } + throw exceptionProvider.bearerAuthException(); + } + + /** + * Helper method to set username for the first HTTP basic authentication. + * @param username the username + */ + public void setUsername(String username) { + for (Authentication auth : authentications.values()) { + if (auth instanceof HttpBasicAuth) { + ((HttpBasicAuth) auth).setUsername(username); + return; + } + } + throw exceptionProvider.httpBasicAuthException(); + } + + /** + * Helper method to set password for the first HTTP basic authentication. + * @param password the password + */ + public void setPassword(String password) { + for (Authentication auth : authentications.values()) { + if (auth instanceof HttpBasicAuth) { + ((HttpBasicAuth) auth).setPassword(password); + return; + } + } + throw exceptionProvider.httpBasicAuthException(); + } + + /** + * Helper method to set API key value for the first API key authentication. + * @param apiKey the API key + */ + public void setApiKey(String apiKey) { + for (Authentication auth : authentications.values()) { + if (auth instanceof ApiKeyAuth) { + ((ApiKeyAuth) auth).setApiKey(apiKey); + return; + } + } + throw exceptionProvider.apiKeyAuthException(); + } + + /** + * Helper method to set API key prefix for the first API key authentication. + * @param apiKeyPrefix the API key prefix + */ + public void setApiKeyPrefix(String apiKeyPrefix) { + for (Authentication auth : authentications.values()) { + if (auth instanceof ApiKeyAuth) { + ((ApiKeyAuth) auth).setApiKeyPrefix(apiKeyPrefix); + return; + } + } + throw exceptionProvider.apiKeyAuthException(); + } + + /** + * Set the User-Agent header's value (by adding to the default header map). + * @param userAgent the user agent string + * @return ApiClient this client + */ + public ApiClient setUserAgent(String userAgent) { + addDefaultHeader("User-Agent", userAgent); + return this; + } + + /** + * Add a default header. + * + * @param name The header's name + * @param value The header's value + * @return ApiClient this client + */ + public ApiClient addDefaultHeader(String name, String value) { + defaultHeaders.set(name, value); + return this; + } + + /** + * Add a default cookie. + * + * @param name The cookie's name + * @param value The cookie's value + * @return ApiClient this client + */ + public ApiClient addDefaultCookie(String name, String value) { + if (defaultCookies.containsKey(name)) { + defaultCookies.remove(name); + } + defaultCookies.add(name, value); + return this; + } + + /** + * Get the date format used to parse/format date parameters. + * @return DateFormat format + */ + public DateFormat getDateFormat() { + return dateFormat; + } + + /** + * Parse the given string into Date object. + */ + public Date parseDate(String str) { + try { + return dateFormat.parse(str); + } catch (ParseException e) { + throw exceptionProvider.dateTimeException(e); + } + } + + /** + * Format the given Date object into string. + */ + public String formatDate(Date date) { + return dateFormat.format(date); + } + + /** + * Get the JsonMapper used to make HTTP requests. + * @return JsonMapper mapper + */ + public JsonMapper getJsonMapper() { + return mapper; + } + + /** + * Get the RestClient used to make HTTP requests. + * @return RestClient restClient + */ + public RestClient getRestClient() { + return restClient; + } + + /** + * Format the given parameter object into string. + * @param param the object to convert + * @return String the parameter represented as a String + */ + public String parameterToString(Object param) { + if (param == null) { + return ""; + } else if (param instanceof Date) { + return formatDate( (Date) param); + } else if (param instanceof OffsetDateTime) { + return formatOffsetDateTime((OffsetDateTime) param); + } else if (param instanceof Collection) { + StringBuilder b = new StringBuilder(); + for(Object o : (Collection) param) { + if(b.length() > 0) { + b.append(","); + } + b.append(String.valueOf(o)); + } + return b.toString(); + } else { + return String.valueOf(param); + } + } + + /** + * Converts a parameter to a {@link MultiValueMap} containing Json-serialized values for use in REST requests + * @param collectionFormat The format to convert to + * @param name The name of the parameter + * @param value The parameter's value + * @return a Map containing the Json-serialized String value(s) of the input parameter + */ + public MultiValueMap parameterToMultiValueMapJson(CollectionFormat collectionFormat, String name, Object value) { + Collection valueCollection; + if (value instanceof Collection) { + valueCollection = (Collection) value; + } else { + try { + return parameterToMultiValueMap(collectionFormat, name, mapper.writeValueAsString(value)); + } catch (JacksonException e) { + throw exceptionProvider.jacksonException(e); + } + } + + List values = new ArrayList<>(); + for(Object o : valueCollection) { + try { + values.add(mapper.writeValueAsString(o)); + } catch (JacksonException e) { + throw exceptionProvider.jacksonException(e); + } + } + return parameterToMultiValueMap(collectionFormat, name, "[" + StringUtils.collectionToDelimitedString(values, collectionFormat.separator) + "]"); + } + + /** + * Converts a parameter to a {@link MultiValueMap} for use in REST requests + * @param collectionFormat The format to convert to + * @param name The name of the parameter + * @param value The parameter's value + * @return a Map containing the String value(s) of the input parameter + */ + public MultiValueMap parameterToMultiValueMap(CollectionFormat collectionFormat, String name, Object value) { + final MultiValueMap params = new LinkedMultiValueMap<>(); + + if (name == null || name.isEmpty() || value == null) { + return params; + } + + if(collectionFormat == null) { + collectionFormat = CollectionFormat.CSV; + } + + if (value instanceof Map) { + @SuppressWarnings("unchecked") + final Map valuesMap = (Map) value; + for (final Entry entry : valuesMap.entrySet()) { + params.add(entry.getKey(), parameterToString(entry.getValue())); + } + return params; + } + + Collection valueCollection = null; + if (value instanceof Collection) { + valueCollection = (Collection) value; + } else { + params.add(name, parameterToString(value)); + return params; + } + + if (valueCollection.isEmpty()){ + return params; + } + + if (collectionFormat.equals(CollectionFormat.MULTI)) { + for (Object item : valueCollection) { + params.add(name, parameterToString(item)); + } + return params; + } + + List values = new ArrayList<>(); + for(Object o : valueCollection) { + values.add(parameterToString(o)); + } + params.add(name, collectionFormat.collectionToString(values)); + + return params; + } + + /** + * Check if the given {@code String} is a JSON MIME. + * @param mediaType the input MediaType + * @return boolean true if the MediaType represents JSON, false otherwise + */ + public boolean isJsonMime(String mediaType) { + // "* / *" is default to JSON + if ("*/*".equals(mediaType)) { + return true; + } + + try { + return isJsonMime(MediaType.parseMediaType(mediaType)); + } catch (InvalidMediaTypeException e) { + } + return false; + } + + /** + * Check if the given MIME is a JSON MIME. + * JSON MIME examples: + * application/json + * application/json; charset=UTF8 + * APPLICATION/JSON + * @param mediaType the input MediaType + * @return boolean true if the MediaType represents JSON, false otherwise + */ + public boolean isJsonMime(MediaType mediaType) { + return mediaType != null && (MediaType.APPLICATION_JSON.isCompatibleWith(mediaType) || mediaType.getSubtype().matches("^.*(\\+json|ndjson)[;]?\\s*$")); + } + + /** + * Check if the given {@code String} is a Problem JSON MIME (RFC-7807). + * @param mediaType the input MediaType + * @return boolean true if the MediaType represents Problem JSON, false otherwise + */ + public boolean isProblemJsonMime(String mediaType) { + return "application/problem+json".equalsIgnoreCase(mediaType); + } + + /** + * Select the Accept header's value from the given accepts array: + * if JSON exists in the given array, use it; + * otherwise use all of them (joining into a string) + * + * @param accepts The accepts array to select from + * @return List The list of MediaTypes to use for the Accept header + */ + public List selectHeaderAccept(String[] accepts) { + if (accepts.length == 0) { + return null; + } + for (String accept : accepts) { + MediaType mediaType = MediaType.parseMediaType(accept); + if (isJsonMime(mediaType) && !isProblemJsonMime(accept)) { + return Collections.singletonList(mediaType); + } + } + return MediaType.parseMediaTypes(StringUtils.arrayToCommaDelimitedString(accepts)); + } + + /** + * Select the Content-Type header's value from the given array: + * if JSON exists in the given array, use it; + * otherwise use the first non-wildcard one of the array. + * + * @param contentTypes The Content-Type array to select from + * @return MediaType The Content-Type header to use. If the given array is empty, null will be returned; if it only contains wildcard media types, JSON will be used. + */ + public MediaType selectHeaderContentType(String[] contentTypes) { + if (contentTypes.length == 0) { + return null; + } + for (String contentType : contentTypes) { + MediaType mediaType = MediaType.parseMediaType(contentType); + if (isJsonMime(mediaType)) { + // A wildcard media type (e.g. "*/*" or "application/*") is treated as + // JSON-compatible but cannot be used as a request Content-Type header, + // so fall back to concrete JSON in that case. + return mediaType.isWildcardType() || mediaType.isWildcardSubtype() ? MediaType.APPLICATION_JSON : mediaType; + } + } + // No JSON type found; use the first concrete (non-wildcard) media type instead. + for (String contentType : contentTypes) { + MediaType mediaType = MediaType.parseMediaType(contentType); + if (!mediaType.isWildcardType() && !mediaType.isWildcardSubtype()) { + return mediaType; + } + } + return MediaType.APPLICATION_JSON; + } + + /** + * Select the body to use for the request + * + * @param obj the body object + * @param formParams the form parameters + * @param contentType the content type of the request + * @return Object the selected body + */ + protected Object selectBody(Object obj, MultiValueMap formParams, MediaType contentType) { + boolean isForm = MediaType.MULTIPART_FORM_DATA.isCompatibleWith(contentType) || MediaType.APPLICATION_FORM_URLENCODED.isCompatibleWith(contentType); + return isForm ? formParams : obj; + } + + /** + * Invoke API by sending HTTP request with the given options. + * + * @param the return type to use + * @param path The sub-path of the HTTP URL + * @param method The request method + * @param pathParams The path parameters + * @param queryParams The query parameters + * @param body The request body object + * @param headerParams The header parameters + * @param formParams The form parameters + * @param accept The request's Accept header + * @param contentType The request's Content-Type header + * @param authNames The authentications to apply + * @param returnType The return type into which to deserialize the response + * @return The response body in chosen type + */ + public ResponseSpec invokeAPI(String path, HttpMethod method, Map pathParams, MultiValueMap queryParams, Object body, HttpHeaders headerParams, MultiValueMap cookieParams, MultiValueMap formParams, List accept, MediaType contentType, String[] authNames, ParameterizedTypeReference returnType) throws RestClientException { + final RestClient.RequestBodySpec requestBuilder = prepareRequest(path, method, pathParams, queryParams, body, headerParams, cookieParams, formParams, accept, contentType, authNames); + return requestBuilder.retrieve(); + } + + /** + * Include queryParams in uriParams taking into account the paramName + * @param queryParams The query parameters + * @param uriParams The path parameters + * return templatized query string + */ + protected String generateQueryUri(MultiValueMap queryParams, Map uriParams) { + StringBuilder queryBuilder = new StringBuilder(); + queryParams.forEach((name, values) -> { + if (CollectionUtils.isEmpty(values)) { + if (queryBuilder.length() != 0) { + queryBuilder.append('&'); + } + queryBuilder.append(name); + } else { + int valueItemCounter = 0; + for (Object value : values) { + if (queryBuilder.length() != 0) { + queryBuilder.append('&'); + } + queryBuilder.append(name); + if (value != null) { + String templatizedKey = name + valueItemCounter++; + uriParams.put(templatizedKey, value.toString()); + queryBuilder.append('=').append("{").append(templatizedKey).append("}"); + } + } + } + }); + return queryBuilder.toString(); + } + + protected RestClient.RequestBodySpec prepareRequest(String path, HttpMethod method, Map pathParams, + MultiValueMap queryParams, Object body, HttpHeaders headerParams, + MultiValueMap cookieParams, MultiValueMap formParams, List accept, + MediaType contentType, String[] authNames) { + updateParamsForAuth(authNames, queryParams, headerParams, cookieParams); + + String baseUrl = basePath; + if (serverIndex != null) { + if (serverIndex < 0 || serverIndex >= servers.size()) { + throw new ArrayIndexOutOfBoundsException(String.format( + java.util.Locale.ROOT, + "Invalid index %d when selecting the host settings. Must be less than %d", serverIndex, servers.size() + )); + } + baseUrl = servers.get(serverIndex).URL(serverVariables); + } + + final UriComponentsBuilder builder = UriComponentsBuilder + .fromUriString(baseUrl) + .path(path); + + String finalUri = builder.build(false).toUriString(); + Map uriParams = new HashMap<>(); + uriParams.putAll(pathParams); + + if (queryParams != null && !queryParams.isEmpty()) { + //Include queryParams in uriParams taking into account the paramName + String queryUri = generateQueryUri(queryParams, uriParams); + //Append to finalUri the templatized query string like "?param1={param1Value}&....... + finalUri += "?" + queryUri; + } + + final RestClient.RequestBodySpec requestBuilder = restClient.method(method).uri(finalUri, uriParams); + + if (accept != null) { + requestBuilder.accept(accept.toArray(new MediaType[accept.size()])); + } + if(contentType != null) { + requestBuilder.contentType(contentType); + } + + addHeadersToRequest(headerParams, requestBuilder); + addHeadersToRequest(defaultHeaders, requestBuilder); + addCookiesToRequest(cookieParams, requestBuilder); + addCookiesToRequest(defaultCookies, requestBuilder); + + if (MediaType.MULTIPART_FORM_DATA.isCompatibleWith(contentType)) { + formParams.forEach( + (k, v) -> { + if (v instanceof java.util.ArrayList && !v.isEmpty()) { + Object first = v.get(0); + if (first != null && first.getClass().isEnum()) { + v.set(0, first.toString()); + } + } + }); + } + + var selectedBody = selectBody(body, formParams, contentType); + if (selectedBody != null) { + requestBuilder.body(selectedBody); + } + + return requestBuilder; + } + + /** + * Add headers to the request that is being built + * @param headers The headers to add + * @param requestBuilder The current request + */ + protected void addHeadersToRequest(HttpHeaders headers, RestClient.RequestBodySpec requestBuilder) { + for (Entry> entry : headers.headerSet()) { + List values = entry.getValue(); + for(String value : values) { + if (value != null) { + requestBuilder.header(entry.getKey(), value); + } + } + } + } + + /** + * Add cookies to the request that is being built + * + * @param cookies The cookies to add + * @param requestBuilder The current request + */ + protected void addCookiesToRequest(MultiValueMap cookies, RestClient.RequestBodySpec requestBuilder) { + if (!cookies.isEmpty()) { + requestBuilder.header("Cookie", buildCookieHeader(cookies)); + } + } + + /** + * Build cookie header. Keeps a single value per cookie (as per + * RFC6265 section 5.3). + * + * @param cookies map all cookies + * @return header string for cookies. + */ + protected String buildCookieHeader(MultiValueMap cookies) { + final StringBuilder cookieValue = new StringBuilder(); + String delimiter = ""; + for (final Map.Entry> entry : cookies.entrySet()) { + final String value = entry.getValue().get(entry.getValue().size() - 1); + cookieValue.append(String.format(java.util.Locale.ROOT, "%s%s=%s", delimiter, entry.getKey(), value)); + delimiter = "; "; + } + return cookieValue.toString(); + } + + /** + * Update query and header parameters based on authentication settings. + * + * @param authNames The authentications to apply + * @param queryParams The query parameters + * @param headerParams The header parameters + * @param cookieParams the cookie parameters + */ + protected void updateParamsForAuth(String[] authNames, MultiValueMap queryParams, HttpHeaders headerParams, MultiValueMap cookieParams) { + for (String authName : authNames) { + Authentication auth = authentications.get(authName); + if (auth == null) { + throw exceptionProvider.undefinedAuthenticationException(authName); + } + auth.applyToParams(queryParams, headerParams, cookieParams); + } + } + + /** + * Formats the specified collection path parameter to a string value. + * + * @param collectionFormat The collection format of the parameter. + * @param values The values of the parameter. + * @return String representation of the parameter + */ + public String collectionPathParameterToString(CollectionFormat collectionFormat, Collection values) { + // create the value based on the collection format + if (CollectionFormat.MULTI.equals(collectionFormat)) { + // not valid for path params + return parameterToString(values); + } + + // collectionFormat is assumed to be "csv" by default + if(collectionFormat == null) { + collectionFormat = CollectionFormat.CSV; + } + + return collectionFormat.collectionToString(values); + } +} diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/ExceptionProvider.java b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/ExceptionProvider.java new file mode 100644 index 000000000000..e69577bd2b15 --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/ExceptionProvider.java @@ -0,0 +1,80 @@ +/* + * jspecify + * test fully qualified name and jspecify + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client; + +import org.springframework.web.client.RestClientException; +import java.text.ParseException; + +/** + * Extension point for customizing exceptions thrown by the generated API client. + *

+ * The default implementation throws {@link RuntimeException}. To use custom exception + * types, implement this interface and pass the instance to + * {@link ApiClient#setExceptionProvider(ExceptionProvider)}. + *

+ * 
{@code
+ * apiClient.setExceptionProvider(new ExceptionProvider() {
+ *     public RuntimeException bearerAuthException() {
+ *         return new MyAuthException("No Bearer authentication configured!");
+ *     }
+ * });
+ * }
+ */ +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") +public interface ExceptionProvider { + + /** Returns an exception indicating that no Bearer authentication is configured. */ + default RuntimeException bearerAuthException() { + return new RuntimeException("No Bearer authentication configured!"); + } + + /** Returns an exception indicating that no HTTP basic authentication is configured. */ + default RuntimeException httpBasicAuthException() { + return new RuntimeException("No HTTP basic authentication configured!"); + } + + /** Returns an exception indicating that no API key authentication is configured. */ + default RuntimeException apiKeyAuthException() { + return new RuntimeException("No API key authentication configured!"); + } + + /** Returns an exception indicating that no OAuth2 authentication is configured. */ + default RuntimeException oAuth2Exception() { + return new RuntimeException("No OAuth2 authentication configured!"); + } + + /** Wraps a date/time parse exception. */ + default RuntimeException dateTimeException(ParseException e) { + return new RuntimeException(e); + } + + /** Wraps a Jackson serialization/deserialization exception. */ + default RuntimeException jacksonException(Exception e) { + return new RuntimeException(e); + } + + /** + * Returns an exception indicating that the requested authentication scheme is not configured. + * + * @param authName the name of the authentication scheme that could not be found + * @return a {@link RestClientException} describing the missing authentication + */ + default RestClientException undefinedAuthenticationException(String authName) { + return new RestClientException("Authentication undefined: " + authName); + } + + /** The default {@link ExceptionProvider} instance. */ + ExceptionProvider DEFAULT = new ExceptionProvider() {}; + +} \ No newline at end of file diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/JavaTimeFormatter.java b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/JavaTimeFormatter.java new file mode 100644 index 000000000000..96463ebdee2f --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/JavaTimeFormatter.java @@ -0,0 +1,68 @@ +/* + * jspecify + * test fully qualified name and jspecify + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.client; + +import java.time.OffsetDateTime; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeParseException; + +/** + * Class that add parsing/formatting support for Java 8+ {@code OffsetDateTime} class. + * It's generated for java clients when {@code AbstractJavaCodegen#dateLibrary} specified as {@code java8}. + */ +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") +public class JavaTimeFormatter { + private DateTimeFormatter offsetDateTimeFormatter = DateTimeFormatter.ISO_OFFSET_DATE_TIME; + + /** + * Get the date format used to parse/format {@code OffsetDateTime} parameters. + * + * @return DateTimeFormatter + */ + public DateTimeFormatter getOffsetDateTimeFormatter() { + return offsetDateTimeFormatter; + } + + /** + * Set the date format used to parse/format {@code OffsetDateTime} parameters. + * + * @param offsetDateTimeFormatter {@code DateTimeFormatter} + */ + public void setOffsetDateTimeFormatter(DateTimeFormatter offsetDateTimeFormatter) { + this.offsetDateTimeFormatter = offsetDateTimeFormatter; + } + + /** + * Parse the given string into {@code OffsetDateTime} object. + * + * @param str String + * @return {@code OffsetDateTime} + */ + public OffsetDateTime parseOffsetDateTime(String str) { + try { + return OffsetDateTime.parse(str, offsetDateTimeFormatter); + } catch (DateTimeParseException e) { + throw new RuntimeException(e); + } + } + + /** + * Format the given {@code OffsetDateTime} object into string. + * + * @param offsetDateTime {@code OffsetDateTime} + * @return {@code OffsetDateTime} in string format + */ + public String formatOffsetDateTime(OffsetDateTime offsetDateTime) { + return offsetDateTimeFormatter.format(offsetDateTime); + } +} \ No newline at end of file diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/RFC3339DateFormat.java b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/RFC3339DateFormat.java new file mode 100644 index 000000000000..07bbdd002992 --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/RFC3339DateFormat.java @@ -0,0 +1,57 @@ +/* + * jspecify + * test fully qualified name and jspecify + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +package org.openapitools.client; + +import java.text.DateFormat; +import java.text.FieldPosition; +import java.text.ParsePosition; +import java.util.Date; +import java.text.DecimalFormat; +import java.util.GregorianCalendar; +import java.util.TimeZone; +import tools.jackson.databind.util.StdDateFormat; + +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") +public class RFC3339DateFormat extends DateFormat { + private static final long serialVersionUID = 1L; + private static final TimeZone TIMEZONE_Z = TimeZone.getTimeZone("UTC"); + + private final StdDateFormat fmt = new StdDateFormat() + .withTimeZone(TIMEZONE_Z) + .withColonInTimeZone(true); + + public RFC3339DateFormat() { + this.calendar = new GregorianCalendar(); + this.numberFormat = new DecimalFormat(); + } + + @Override + public Date parse(String source) { + return parse(source, new ParsePosition(0)); + } + + @Override + public Date parse(String source, ParsePosition pos) { + return fmt.parse(source, pos); + } + + @Override + public StringBuffer format(Date date, StringBuffer toAppendTo, FieldPosition fieldPosition) { + return fmt.format(date, toAppendTo, fieldPosition); + } + + @Override + public Object clone() { + return super.clone(); + } +} diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/ServerConfiguration.java b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/ServerConfiguration.java new file mode 100644 index 000000000000..05a6de2af25d --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/ServerConfiguration.java @@ -0,0 +1,72 @@ +/* + * jspecify + * test fully qualified name and jspecify + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client; + +import java.util.Map; + +/** + * Representing a Server configuration. + */ +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") +public class ServerConfiguration { + public String URL; + public String description; + public Map variables; + + /** + * @param URL A URL to the target host. + * @param description A description of the host designated by the URL. + * @param variables A map between a variable name and its value. The value is used for substitution in the server's URL template. + */ + public ServerConfiguration(String URL, String description, Map variables) { + this.URL = URL; + this.description = description; + this.variables = variables; + } + + /** + * Format URL template using given variables. + * + * @param variables A map between a variable name and its value. + * @return Formatted URL. + */ + public String URL(Map variables) { + String url = this.URL; + + // go through variables and replace placeholders + for (Map.Entry variable: this.variables.entrySet()) { + String name = variable.getKey(); + ServerVariable serverVariable = variable.getValue(); + String value = serverVariable.defaultValue; + + if (variables != null && variables.containsKey(name)) { + value = variables.get(name); + if (serverVariable.enumValues.size() > 0 && !serverVariable.enumValues.contains(value)) { + throw new IllegalArgumentException("The variable " + name + " in the server URL has invalid value " + value + "."); + } + } + url = url.replace("{" + name + "}", value); + } + return url; + } + + /** + * Format URL template using default server variables. + * + * @return Formatted URL. + */ + public String URL() { + return URL(null); + } +} diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/ServerVariable.java b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/ServerVariable.java new file mode 100644 index 000000000000..7f984316bde1 --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/ServerVariable.java @@ -0,0 +1,37 @@ +/* + * jspecify + * test fully qualified name and jspecify + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client; + +import java.util.HashSet; + +/** + * Representing a Server Variable for server URL template substitution. + */ +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") +public class ServerVariable { + public String description; + public String defaultValue; + public HashSet enumValues = null; + + /** + * @param description A description for the server variable. + * @param defaultValue The default value to use for substitution. + * @param enumValues An enumeration of string values to be used if the substitution options are from a limited set. + */ + public ServerVariable(String description, String defaultValue, HashSet enumValues) { + this.description = description; + this.defaultValue = defaultValue; + this.enumValues = enumValues; + } +} diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/StringUtil.java b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/StringUtil.java new file mode 100644 index 000000000000..d1b2ebaf974c --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/StringUtil.java @@ -0,0 +1,83 @@ +/* + * jspecify + * test fully qualified name and jspecify + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client; + +import java.util.Collection; +import java.util.Iterator; + +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") +public class StringUtil { + /** + * Check if the given array contains the given value (with case-insensitive comparison). + * + * @param array The array + * @param value The value to search + * @return true if the array contains the value + */ + public static boolean containsIgnoreCase(String[] array, String value) { + for (String str : array) { + if (value == null && str == null) { + return true; + } + if (value != null && value.equalsIgnoreCase(str)) { + return true; + } + } + return false; + } + + /** + * Join an array of strings with the given separator. + *

+ * Note: This might be replaced by utility method from commons-lang or guava someday + * if one of those libraries is added as dependency. + *

+ * + * @param array The array of strings + * @param separator The separator + * @return the resulting string + */ + public static String join(String[] array, String separator) { + int len = array.length; + if (len == 0) { + return ""; + } + + StringBuilder out = new StringBuilder(); + out.append(array[0]); + for (int i = 1; i < len; i++) { + out.append(separator).append(array[i]); + } + return out.toString(); + } + + /** + * Join a list of strings with the given separator. + * + * @param list The list of strings + * @param separator The separator + * @return the resulting string + */ + public static String join(Collection list, String separator) { + Iterator iterator = list.iterator(); + StringBuilder out = new StringBuilder(); + if (iterator.hasNext()) { + out.append(iterator.next()); + } + while (iterator.hasNext()) { + out.append(separator).append(iterator.next()); + } + return out.toString(); + } +} diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/api/DefaultApi.java b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/api/DefaultApi.java new file mode 100644 index 000000000000..b8f342a4af8e --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/api/DefaultApi.java @@ -0,0 +1,276 @@ +package org.openapitools.client.api; + +import org.openapitools.client.ApiClient; + +import java.io.File; +import org.openapitools.client.model.Foo; +import org.jspecify.annotations.Nullable; +import java.time.OffsetDateTime; + +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Objects; +import java.util.Arrays; +import java.util.stream.Collectors; + +import org.springframework.core.io.FileSystemResource; +import org.springframework.core.ParameterizedTypeReference; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; +import org.springframework.web.client.RestClient.ResponseSpec; +import org.springframework.web.client.RestClientResponseException; + +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") +public class DefaultApi { + private ApiClient apiClient; + + public DefaultApi() { + this(new ApiClient()); + } + + public DefaultApi(ApiClient apiClient) { + this.apiClient = apiClient; + } + + public ApiClient getApiClient() { + return apiClient; + } + + public void setApiClient(ApiClient apiClient) { + this.apiClient = apiClient; + } + + /** + * + * + *

200 - ok + * @param id The id parameter + * @throws RestClientResponseException if an error occurs while attempting to invoke the API + */ + private ResponseSpec fileIdGetRequestCreation(String id) throws RestClientResponseException { + Object postBody = null; + // verify the required parameter 'id' is set + if (id == null) { + throw new RestClientResponseException("Missing the required parameter 'id' when calling fileIdGet", HttpStatus.BAD_REQUEST.value(), HttpStatus.BAD_REQUEST.getReasonPhrase(), null, null, null); + } + // create path and map variables + final Map pathParams = new HashMap<>(); + + pathParams.put("id", id); + + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); + final HttpHeaders headerParams = new HttpHeaders(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); + + final String[] localVarAccepts = { }; + final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); + final String[] localVarContentTypes = { }; + final MediaType localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); + + String[] localVarAuthNames = new String[] { }; + + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/file/{id}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + } + + /** + * + * + *

200 - ok + * @param id The id parameter + * @throws RestClientResponseException if an error occurs while attempting to invoke the API + */ + public void fileIdGet(String id) throws RestClientResponseException { + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + fileIdGetRequestCreation(id).body(localVarReturnType); + } + + /** + * + * + *

200 - ok + * @param id The id parameter + * @throws RestClientResponseException if an error occurs while attempting to invoke the API + */ + public ResponseEntity fileIdGetWithHttpInfo(String id) throws RestClientResponseException { + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return fileIdGetRequestCreation(id).toEntity(localVarReturnType); + } + + /** + * + * + *

200 - ok + * @param id The id parameter + * @return ResponseSpec + * @throws RestClientResponseException if an error occurs while attempting to invoke the API + */ + public ResponseSpec fileIdGetWithResponseSpec(String id) throws RestClientResponseException { + return fileIdGetRequestCreation(id); + } + + /** + * + * + *

0 - response + * @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, @Nullable String color) throws RestClientResponseException { + Object postBody = null; + // create path and map variables + final Map pathParams = new HashMap<>(); + + pathParams.put("dtParam", dtParam); + + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); + final HttpHeaders headerParams = new HttpHeaders(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + 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)); + + final String[] localVarAccepts = { + "application/json" + }; + final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); + final String[] localVarContentTypes = { }; + final MediaType localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); + + String[] localVarAuthNames = new String[] { }; + + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/foo/{dtParam}", HttpMethod.GET, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + } + + /** + * + * + *

0 - response + * @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, @Nullable String color) throws RestClientResponseException { + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return fooDtParamGetRequestCreation(dtParam, dtQuery, dtCookie, color).body(localVarReturnType); + } + + /** + * + * + *

0 - response + * @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, @Nullable String color) throws RestClientResponseException { + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return fooDtParamGetRequestCreation(dtParam, dtQuery, dtCookie, color).toEntity(localVarReturnType); + } + + /** + * + * + *

0 - response + * @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, @Nullable String color) throws RestClientResponseException { + return fooDtParamGetRequestCreation(dtParam, dtQuery, dtCookie, color); + } + + /** + * + * + *

0 - ok + * @param _file The _file parameter + * @throws RestClientResponseException if an error occurs while attempting to invoke the API + */ + private ResponseSpec uploadPostRequestCreation(@Nullable File _file) throws RestClientResponseException { + Object postBody = null; + // create path and map variables + final Map pathParams = new HashMap<>(); + + final MultiValueMap localVarQueryParams = new LinkedMultiValueMap<>(); + final HttpHeaders headerParams = new HttpHeaders(); + final MultiValueMap cookieParams = new LinkedMultiValueMap<>(); + final MultiValueMap formParams = new LinkedMultiValueMap<>(); + + if (_file != null) + formParams.add("file", new FileSystemResource(_file)); + + final String[] localVarAccepts = { }; + final List localVarAccept = apiClient.selectHeaderAccept(localVarAccepts); + final String[] localVarContentTypes = { + "multipart/form-data" + }; + final MediaType localVarContentType = apiClient.selectHeaderContentType(localVarContentTypes); + + String[] localVarAuthNames = new String[] { }; + + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return apiClient.invokeAPI("/upload", HttpMethod.POST, pathParams, localVarQueryParams, postBody, headerParams, cookieParams, formParams, localVarAccept, localVarContentType, localVarAuthNames, localVarReturnType); + } + + /** + * + * + *

0 - ok + * @param _file The _file parameter + * @throws RestClientResponseException if an error occurs while attempting to invoke the API + */ + public void uploadPost(@Nullable File _file) throws RestClientResponseException { + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + uploadPostRequestCreation(_file).body(localVarReturnType); + } + + /** + * + * + *

0 - ok + * @param _file The _file parameter + * @throws RestClientResponseException if an error occurs while attempting to invoke the API + */ + public ResponseEntity uploadPostWithHttpInfo(@Nullable File _file) throws RestClientResponseException { + ParameterizedTypeReference localVarReturnType = new ParameterizedTypeReference<>() {}; + return uploadPostRequestCreation(_file).toEntity(localVarReturnType); + } + + /** + * + * + *

0 - ok + * @param _file The _file parameter + * @return ResponseSpec + * @throws RestClientResponseException if an error occurs while attempting to invoke the API + */ + public ResponseSpec uploadPostWithResponseSpec(@Nullable File _file) throws RestClientResponseException { + return uploadPostRequestCreation(_file); + } +} diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/api/package-info.java b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/api/package-info.java new file mode 100644 index 000000000000..6d0d02339408 --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/api/package-info.java @@ -0,0 +1,2 @@ +@org.jspecify.annotations.NullMarked +package org.openapitools.client.api; diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java new file mode 100644 index 000000000000..b79ac2ca2224 --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/auth/ApiKeyAuth.java @@ -0,0 +1,75 @@ +/* + * jspecify + * test fully qualified name and jspecify + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.auth; + +import org.springframework.http.HttpHeaders; +import org.springframework.util.MultiValueMap; + +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") +public class ApiKeyAuth implements Authentication { + private final String location; + private final String paramName; + + private String apiKey; + private String apiKeyPrefix; + + public ApiKeyAuth(String location, String paramName) { + this.location = location; + this.paramName = paramName; + } + + public String getLocation() { + return location; + } + + public String getParamName() { + return paramName; + } + + public String getApiKey() { + return apiKey; + } + + public void setApiKey(String apiKey) { + this.apiKey = apiKey; + } + + public String getApiKeyPrefix() { + return apiKeyPrefix; + } + + public void setApiKeyPrefix(String apiKeyPrefix) { + this.apiKeyPrefix = apiKeyPrefix; + } + + @Override + public void applyToParams(MultiValueMap queryParams, HttpHeaders headerParams, MultiValueMap cookieParams) { + if (apiKey == null) { + return; + } + String value; + if (apiKeyPrefix != null) { + value = apiKeyPrefix + " " + apiKey; + } else { + value = apiKey; + } + if (location.equals("query")) { + queryParams.add(paramName, value); + } else if (location.equals("header")) { + headerParams.add(paramName, value); + } else if (location.equals("cookie")) { + cookieParams.add(paramName, value); + } + } +} diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/auth/Authentication.java b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/auth/Authentication.java new file mode 100644 index 000000000000..6c10a7b585ae --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/auth/Authentication.java @@ -0,0 +1,29 @@ +/* + * jspecify + * test fully qualified name and jspecify + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.auth; + +import org.springframework.http.HttpHeaders; +import org.springframework.util.MultiValueMap; + +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") +public interface Authentication { + /** + * Apply authentication settings to header and / or query parameters. + * + * @param queryParams The query parameters for the request + * @param headerParams The header parameters for the request + * @param cookieParams The cookie parameters for the request + */ + void applyToParams(MultiValueMap queryParams, HttpHeaders headerParams, MultiValueMap cookieParams); +} diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java new file mode 100644 index 000000000000..42afe54f2ff5 --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/auth/HttpBasicAuth.java @@ -0,0 +1,51 @@ +/* + * jspecify + * test fully qualified name and jspecify + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.auth; + +import java.nio.charset.StandardCharsets; +import java.util.Base64; + +import org.springframework.http.HttpHeaders; +import org.springframework.util.MultiValueMap; + +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") +public class HttpBasicAuth implements Authentication { + private String username; + private String password; + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + @Override + public void applyToParams(MultiValueMap queryParams, HttpHeaders headerParams, MultiValueMap cookieParams) { + if (username == null && password == null) { + return; + } + String str = (username == null ? "" : username) + ":" + (password == null ? "" : password); + headerParams.add(HttpHeaders.AUTHORIZATION, "Basic " + Base64.getEncoder().encodeToString(str.getBytes(StandardCharsets.UTF_8))); + } +} diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java new file mode 100644 index 000000000000..21be5e164fc5 --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/auth/HttpBearerAuth.java @@ -0,0 +1,69 @@ +/* + * jspecify + * test fully qualified name and jspecify + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.auth; + +import java.util.Optional; +import java.util.function.Supplier; +import org.springframework.http.HttpHeaders; +import org.springframework.util.MultiValueMap; + +@jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.25.0-SNAPSHOT") +public class HttpBearerAuth implements Authentication { + private final String scheme; + private Supplier tokenSupplier; + + public HttpBearerAuth(String scheme) { + this.scheme = scheme; + } + + /** + * Gets the token, which together with the scheme, will be sent as the value of the Authorization header. + * + * @return The bearer token + */ + public String getBearerToken() { + return tokenSupplier.get(); + } + + /** + * Sets the token, which together with the scheme, will be sent as the value of the Authorization header. + * + * @param bearerToken The bearer token to send in the Authorization header + */ + public void setBearerToken(String bearerToken) { + this.tokenSupplier = () -> bearerToken; + } + + /** + * Sets the supplier of tokens, which together with the scheme, will be sent as the value of the Authorization header. + * + * @param tokenSupplier The supplier of bearer tokens to send in the Authorization header + */ + public void setBearerToken(Supplier tokenSupplier) { + this.tokenSupplier = tokenSupplier; + } + + @Override + public void applyToParams(MultiValueMap queryParams, HttpHeaders headerParams, MultiValueMap cookieParams) { + String bearerToken = Optional.ofNullable(tokenSupplier).map(Supplier::get).orElse(null); + if (bearerToken == null) { + return; + } + headerParams.add(HttpHeaders.AUTHORIZATION, (scheme != null ? upperCaseBearer(scheme) + " " : "") + bearerToken); + } + + private static String upperCaseBearer(String scheme) { + return ("bearer".equalsIgnoreCase(scheme)) ? "Bearer" : scheme; + } +} diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/model/Foo.java b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/model/Foo.java new file mode 100644 index 000000000000..bfbec8e52a78 --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/model/Foo.java @@ -0,0 +1,710 @@ +/* + * jspecify + * test fully qualified name and jspecify + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import java.io.File; +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 com.fasterxml.jackson.annotation.JsonIgnore; +import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonIgnore; + +/** + * Foo + */ +@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_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 { + public static final String JSON_PROPERTY_DT = "dt"; + + private java.time.@Nullable Instant dt; + + public static final String JSON_PROPERTY_NULLABLE_DT = "nullableDt"; + + private JsonNullable nullableDt = JsonNullable.undefined(); + + public static final String JSON_PROPERTY_BINARY = "binary"; + + private @Nullable File binary; + + public static final String JSON_PROPERTY_NULLABLE_BINARY = "nullableBinary"; + + private JsonNullable nullableBinary = JsonNullable.undefined(); + + public static final String JSON_PROPERTY_LIST_OF_DT = "listOfDt"; + + private @Nullable List listOfDt; + + public static final String JSON_PROPERTY_LIST_MIN_INTEMS = "listMinIntems"; + + private @Nullable List listMinIntems; + + public static final String JSON_PROPERTY_NULLABLE_LIST_MIN_INTEMS = "nullableListMinIntems"; + + private JsonNullable> nullableListMinIntems = JsonNullable.>undefined(); + + public static final String JSON_PROPERTY_REQUIRED_DT = "requiredDt"; + + private java.time.Instant requiredDt; + + public static final String JSON_PROPERTY_NUMBER = "number"; + + private java.math.@Nullable BigDecimal number; + + public static final String JSON_PROPERTY_NULLABLE_NUMBER = "nullableNumber"; + + private JsonNullable nullableNumber = JsonNullable.undefined(); + + 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 JsonNullable nullableColor = JsonNullable.of("red"); + + public Foo() { + } + + public Foo dt(java.time.@Nullable Instant dt) { + + this.dt = dt; + return this; + } + + /** + * Get dt + * @return dt + */ + + @JsonProperty(value = JSON_PROPERTY_DT, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public java.time.@Nullable Instant getDt() { + return dt; + } + + + @JsonProperty(value = JSON_PROPERTY_DT, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + 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 + */ + + @JsonIgnore + + public java.time.@Nullable Instant getNullableDt() { + return nullableDt.orElse(null); + } + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_DT, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public JsonNullable getNullableDt_JsonNullable() { + return nullableDt; + } + + @JsonProperty(JSON_PROPERTY_NULLABLE_DT) + public void setNullableDt_JsonNullable(JsonNullable nullableDt) { + this.nullableDt = nullableDt; + } + + public void setNullableDt(java.time.@Nullable Instant nullableDt) { + this.nullableDt = JsonNullable.of(nullableDt); + } + + public Foo binary(@Nullable File binary) { + + this.binary = binary; + return this; + } + + /** + * Get binary + * @return binary + */ + + @JsonProperty(value = JSON_PROPERTY_BINARY, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public @Nullable File getBinary() { + return binary; + } + + + @JsonProperty(value = JSON_PROPERTY_BINARY, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setBinary(@Nullable File binary) { + this.binary = binary; + } + + public Foo nullableBinary(@Nullable File nullableBinary) { + this.nullableBinary = JsonNullable.of(nullableBinary); + + return this; + } + + /** + * Get nullableBinary + * @return nullableBinary + */ + + @JsonIgnore + + public @Nullable File getNullableBinary() { + return nullableBinary.orElse(null); + } + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_BINARY, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public JsonNullable getNullableBinary_JsonNullable() { + return nullableBinary; + } + + @JsonProperty(JSON_PROPERTY_NULLABLE_BINARY) + public void setNullableBinary_JsonNullable(JsonNullable nullableBinary) { + this.nullableBinary = nullableBinary; + } + + public void setNullableBinary(@Nullable File nullableBinary) { + this.nullableBinary = JsonNullable.of(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 + */ + + @JsonProperty(value = JSON_PROPERTY_LIST_OF_DT, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public @Nullable List getListOfDt() { + return listOfDt; + } + + + @JsonProperty(value = JSON_PROPERTY_LIST_OF_DT, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + 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 + */ + + @JsonProperty(value = JSON_PROPERTY_LIST_MIN_INTEMS, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public @Nullable List getListMinIntems() { + return listMinIntems; + } + + + @JsonProperty(value = JSON_PROPERTY_LIST_MIN_INTEMS, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + 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<>()); + } + try { + this.nullableListMinIntems.get().add(nullableListMinIntemsItem); + } catch (java.util.NoSuchElementException e) { + // this can never happen, as we make sure above that the value is present + } + return this; + } + + /** + * Get nullableListMinIntems + * @return nullableListMinIntems + */ + + @JsonIgnore + + public @Nullable List getNullableListMinIntems() { + return nullableListMinIntems.orElse(null); + } + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_LIST_MIN_INTEMS, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public JsonNullable> getNullableListMinIntems_JsonNullable() { + return nullableListMinIntems; + } + + @JsonProperty(JSON_PROPERTY_NULLABLE_LIST_MIN_INTEMS) + public void setNullableListMinIntems_JsonNullable(JsonNullable> nullableListMinIntems) { + this.nullableListMinIntems = nullableListMinIntems; + } + + public void setNullableListMinIntems(@Nullable List nullableListMinIntems) { + this.nullableListMinIntems = JsonNullable.>of(nullableListMinIntems); + } + + public Foo requiredDt(java.time.Instant requiredDt) { + + this.requiredDt = requiredDt; + return this; + } + + /** + * Get requiredDt + * @return requiredDt + */ + + @JsonProperty(value = JSON_PROPERTY_REQUIRED_DT, required = true) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + + public java.time.Instant getRequiredDt() { + return requiredDt; + } + + + @JsonProperty(value = JSON_PROPERTY_REQUIRED_DT, required = true) + @JsonInclude(value = JsonInclude.Include.ALWAYS) + 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 + */ + + @JsonProperty(value = JSON_PROPERTY_NUMBER, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public java.math.@Nullable BigDecimal getNumber() { + return number; + } + + + @JsonProperty(value = JSON_PROPERTY_NUMBER, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + 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 + */ + + @JsonIgnore + + public java.math.@Nullable BigDecimal getNullableNumber() { + return nullableNumber.orElse(null); + } + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_NUMBER, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public JsonNullable getNullableNumber_JsonNullable() { + return nullableNumber; + } + + @JsonProperty(JSON_PROPERTY_NULLABLE_NUMBER) + public void setNullableNumber_JsonNullable(JsonNullable nullableNumber) { + this.nullableNumber = nullableNumber; + } + + public void setNullableNumber(java.math.@Nullable BigDecimal nullableNumber) { + this.nullableNumber = JsonNullable.of(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 = JsonNullable.of(nullableColor); + + return this; + } + + /** + * Get nullableColor + * @return nullableColor + */ + + @JsonIgnore + + public @Nullable String getNullableColor() { + return nullableColor.orElse(null); + } + + @JsonProperty(value = JSON_PROPERTY_NULLABLE_COLOR, required = false) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public JsonNullable getNullableColor_JsonNullable() { + return nullableColor; + } + + @JsonProperty(JSON_PROPERTY_NULLABLE_COLOR) + public void setNullableColor_JsonNullable(JsonNullable nullableColor) { + this.nullableColor = nullableColor; + } + + public void setNullableColor(@Nullable String nullableColor) { + this.nullableColor = JsonNullable.of(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(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; + } + + 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 = JsonNullable.of(nullableDt); + return this; + } + public Foo.Builder nullableDt(JsonNullable nullableDt) { + this.instance.nullableDt = nullableDt; + return this; + } + public Foo.Builder binary(@Nullable File binary) { + this.instance.binary = binary; + return this; + } + public Foo.Builder nullableBinary(@Nullable File nullableBinary) { + this.instance.nullableBinary = JsonNullable.of(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 = JsonNullable.>of(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 = JsonNullable.of(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 = JsonNullable.of(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. + */ + 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. + */ + public static Foo.Builder builder() { + return new Foo.Builder(); + } + + /** + * Create a builder with a shallow copy of this instance. + */ + 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()) + .nullableNumber(getNullableNumber()) + .color(getColor()) + .requiredColor(getRequiredColor()) + .nullableColor(getNullableColor()); + } + + +} + diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/model/package-info.java b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/model/package-info.java new file mode 100644 index 000000000000..774ca336f509 --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/model/package-info.java @@ -0,0 +1,2 @@ +@org.jspecify.annotations.NullMarked +package org.openapitools.client.model; diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/package-info.java b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/package-info.java new file mode 100644 index 000000000000..9c547369c362 --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/package-info.java @@ -0,0 +1,2 @@ +@org.jspecify.annotations.NullMarked +package org.openapitools.client; diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/test/java/org/openapitools/client/api/DefaultApiTest.java b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/test/java/org/openapitools/client/api/DefaultApiTest.java new file mode 100644 index 000000000000..28def9f0bec1 --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/test/java/org/openapitools/client/api/DefaultApiTest.java @@ -0,0 +1,80 @@ +/* + * jspecify + * test fully qualified name and jspecify + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.api; + +import java.io.File; +import org.openapitools.client.model.Foo; +import org.jspecify.annotations.Nullable; +import java.time.OffsetDateTime; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * API tests for DefaultApi + */ +@Disabled +public class DefaultApiTest { + + private final DefaultApi api = new DefaultApi(); + + + /** + * + * + * + */ + @Test + public void fileIdGetTest() { + String id = null; + api.fileIdGet(id); + + // TODO: test validations + } + + /** + * + * + * + */ + @Test + public 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, color); + + // TODO: test validations + } + + /** + * + * + * + */ + @Test + public void uploadPostTest() { + File _file = null; + api.uploadPost(_file); + + // TODO: test validations + } + +} diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/test/java/org/openapitools/client/model/FooTest.java b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/test/java/org/openapitools/client/model/FooTest.java new file mode 100644 index 000000000000..04cb19752d44 --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/test/java/org/openapitools/client/model/FooTest.java @@ -0,0 +1,153 @@ +/* + * jspecify + * test fully qualified name and jspecify + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import java.io.File; +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 com.fasterxml.jackson.annotation.JsonIgnore; +import org.openapitools.jackson.nullable.JsonNullable; +import java.util.NoSuchElementException; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + +/** + * Model tests for Foo + */ +class FooTest { + private final Foo model = new Foo(); + + /** + * Model tests for Foo + */ + @Test + void testFoo() { + // TODO: test Foo + } + + /** + * Test the property 'dt' + */ + @Test + void dtTest() { + // TODO: test dt + } + + /** + * Test the property 'nullableDt' + */ + @Test + void nullableDtTest() { + // TODO: test nullableDt + } + + /** + * Test the property 'binary' + */ + @Test + void binaryTest() { + // TODO: test binary + } + + /** + * Test the property 'nullableBinary' + */ + @Test + void nullableBinaryTest() { + // TODO: test nullableBinary + } + + /** + * Test the property 'listOfDt' + */ + @Test + void listOfDtTest() { + // TODO: test listOfDt + } + + /** + * Test the property 'listMinIntems' + */ + @Test + void listMinIntemsTest() { + // TODO: test listMinIntems + } + + /** + * Test the property 'nullableListMinIntems' + */ + @Test + void nullableListMinIntemsTest() { + // TODO: test nullableListMinIntems + } + + /** + * Test the property 'requiredDt' + */ + @Test + void requiredDtTest() { + // TODO: test requiredDt + } + + /** + * Test the property 'number' + */ + @Test + 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/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 76554d7d83ef..cedc7b176b4e 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 @@ -513,5 +513,119 @@ private String toIndentedString(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; + } + + 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 binary(@Nullable File binary) { + this.instance.binary = binary; + return this; + } + public Foo.Builder nullableBinary(@Nullable File 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 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 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; + } + + + /** + * returns a built Foo instance. + * + * The builder is not reusable. + */ + 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. + */ + public static Foo.Builder builder() { + return new Foo.Builder(); + } + + /** + * Create a builder with a shallow copy of this instance. + */ + 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()) + .nullableNumber(getNullableNumber()) + .color(getColor()) + .requiredColor(getRequiredColor()) + .nullableColor(getNullableColor()); + } + + } 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 76554d7d83ef..6fe4d8e26440 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 @@ -509,9 +509,123 @@ 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 "); } + public static class Builder { + + private Foo instance; + + public Builder() { + this(new Foo()); + } + + protected Builder(Foo instance) { + this.instance = instance; + } + + 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 binary(@Nullable File binary) { + this.instance.binary = binary; + return this; + } + public Foo.Builder nullableBinary(@Nullable File 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 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 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; + } + + + /** + * returns a built Foo instance. + * + * The builder is not reusable. + */ + 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. + */ + public static Foo.Builder builder() { + return new Foo.Builder(); + } + + /** + * Create a builder with a shallow copy of this instance. + */ + 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()) + .nullableNumber(getNullableNumber()) + .color(getColor()) + .requiredColor(getRequiredColor()) + .nullableColor(getNullableColor()); + } + + } 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 ff8c30b1514c..818921e8cbe4 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 @@ -508,9 +508,123 @@ 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 "); } + public static class Builder { + + private Foo instance; + + public Builder() { + this(new Foo()); + } + + protected Builder(Foo instance) { + this.instance = instance; + } + + 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 binary(@Nullable File binary) { + this.instance.binary = binary; + return this; + } + public Foo.Builder nullableBinary(@Nullable File 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 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 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; + } + + + /** + * returns a built Foo instance. + * + * The builder is not reusable. + */ + 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. + */ + public static Foo.Builder builder() { + return new Foo.Builder(); + } + + /** + * Create a builder with a shallow copy of this instance. + */ + 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()) + .nullableNumber(getNullableNumber()) + .color(getColor()) + .requiredColor(getRequiredColor()) + .nullableColor(getNullableColor()); + } + + } From 0d1019c2c765793057d522fceaf37eb1d3373205 Mon Sep 17 00:00:00 2001 From: jpfinne Date: Tue, 4 Aug 2026 11:15:22 +0200 Subject: [PATCH 15/19] Fix @Nullable to toIndentedString --- .../main/resources/Java/libraries/restclient/pojo.mustache | 2 +- .../org/openapitools/codegen/java/JavaClientCodegenTest.java | 4 ++-- .../src/main/java/org/openapitools/client/model/Foo.java | 2 +- .../src/main/java/org/openapitools/client/model/Foo.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/pojo.mustache index d507b60ec467..db4c3504ba4d 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/pojo.mustache @@ -363,7 +363,7 @@ public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#v * Convert the given object to string with each line indented by 4 spaces * (except the first line). */ - private{{#jsonb}} static{{/jsonb}} String toIndentedString(Object o) { + private{{#jsonb}} static{{/jsonb}} String toIndentedString({{#useJspecify}}@Nullable {{/useJspecify}}Object o) { return o == null ? "null" : o.toString().replace("\n", "\n "); } {{#supportUrlQuery}} 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 eb0c927db99d..bc2878522e92 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 @@ -4693,7 +4693,7 @@ public void testJspecify(String library, boolean useSpringBoot4, boolean hasJspe "private java.time.@Nullable Instant nullableDt;", "private @Nullable List listOfDt;", "setListOfDt(@Nullable List listOfDt)", - "String toIndentedString(@Nullable Object object)"); + "String toIndentedString(@Nullable Object o)"); if (!NATIVE.equals(library)) { // native library does not generate all arg constructors JavaFileAssert.assertThat(files.get("Foo.java")) .fileContains( @@ -4758,7 +4758,7 @@ public void testJspecify_openapiNullable(String library, boolean useSpringBoot4, "setListOfDt(@Nullable List listOfDt)", "JsonNullable nullableDt = JsonNullable.undefined()", "private JsonNullable nullableBinary = JsonNullable.undefined();", - "String toIndentedString(@Nullable Object object)"); + "String toIndentedString(@Nullable Object o)"); if (!NATIVE.equals(library)) { // native library does not generate all arg constructors JavaFileAssert.assertThat(files.get("Foo.java")) .fileContains( diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/model/Foo.java b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/model/Foo.java index bfbec8e52a78..42aabfc0fe5f 100644 --- a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/model/Foo.java +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/model/Foo.java @@ -568,7 +568,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/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 cedc7b176b4e..6fe4d8e26440 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 @@ -509,7 +509,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 fb8e2a1e4d020a71e6f3d0abc9391f76f1bd370c Mon Sep 17 00:00:00 2001 From: jpfinne Date: Tue, 4 Aug 2026 11:34:21 +0200 Subject: [PATCH 16/19] Remove tests from FILES --- .../.openapi-generator/FILES | 2 -- 1 file changed, 2 deletions(-) diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/.openapi-generator/FILES b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/.openapi-generator/FILES index 58529ad3488b..0360f20c7340 100644 --- a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/.openapi-generator/FILES +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/.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 From a61e0ce4e6fd7d91651c609531a680c0414f0c42 Mon Sep 17 00:00:00 2001 From: jpfinne Date: Tue, 4 Aug 2026 15:22:02 +0200 Subject: [PATCH 17/19] Force rebuild Fix for: The following artifacts could not be resolved: org.apache.maven.plugins:maven-enforcer-plugin:pom:3.4.0 (absent): Could not transfer artifact org.apache.maven.plugins:maven-enforcer-plugin:pom:3.4.0 from/to central (https://repo.maven.apache.org/maven2): status code: 429, reason phrase: Too Many Requests (429) --- bin/configs/java-resttemplate-springBoot4-jackson2.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/bin/configs/java-resttemplate-springBoot4-jackson2.yaml b/bin/configs/java-resttemplate-springBoot4-jackson2.yaml index f303b6ea2f69..b50455a5e389 100644 --- a/bin/configs/java-resttemplate-springBoot4-jackson2.yaml +++ b/bin/configs/java-resttemplate-springBoot4-jackson2.yaml @@ -9,4 +9,3 @@ additionalProperties: containerDefaultToNull: "true" useJakartaEe: true useSpringBoot4: true - From c7cbd25b1b5801e44c9c9a2fa1af1efec2a453a4 Mon Sep 17 00:00:00 2001 From: jpfinne Date: Tue, 4 Aug 2026 17:25:59 +0200 Subject: [PATCH 18/19] force rebuild --- bin/configs/java-native-jackson3-jspecify.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/configs/java-native-jackson3-jspecify.yaml b/bin/configs/java-native-jackson3-jspecify.yaml index 9046a44d17b0..19d1198405cc 100644 --- a/bin/configs/java-native-jackson3-jspecify.yaml +++ b/bin/configs/java-native-jackson3-jspecify.yaml @@ -14,4 +14,4 @@ additionalProperties: generateBuilders: true typeMappings: OffsetDateTime: java.time.Instant - BigDecimal: java.math.BigDecimal \ No newline at end of file + BigDecimal: java.math.BigDecimal From 34a1819fe91b7fc312198d7426d87a5c43e9d32b Mon Sep 17 00:00:00 2001 From: jpfinne Date: Tue, 4 Aug 2026 18:13:36 +0200 Subject: [PATCH 19/19] Regenerate restClients with generateConstructorWithAllArgs --- ...ot4-jackson3-jspecify-openapiNullable.yaml | 1 + ...tclient-springBoot4-jackson3-jspecify.yaml | 1 + .../org/openapitools/client/model/Foo.java | 19 +++++++++++++++++++ .../org/openapitools/client/model/Foo.java | 19 +++++++++++++++++++ 4 files changed, 40 insertions(+) diff --git a/bin/configs/java-restclient-springBoot4-jackson3-jspecify-openapiNullable.yaml b/bin/configs/java-restclient-springBoot4-jackson3-jspecify-openapiNullable.yaml index 91c870baddcc..6d825392c77e 100644 --- a/bin/configs/java-restclient-springBoot4-jackson3-jspecify-openapiNullable.yaml +++ b/bin/configs/java-restclient-springBoot4-jackson3-jspecify-openapiNullable.yaml @@ -13,6 +13,7 @@ additionalProperties: openApiNullable: true useJspecify: true generateBuilders: true + generateConstructorWithAllArgs: true typeMappings: OffsetDateTime: java.time.Instant BigDecimal: java.math.BigDecimal diff --git a/bin/configs/java-restclient-springBoot4-jackson3-jspecify.yaml b/bin/configs/java-restclient-springBoot4-jackson3-jspecify.yaml index 48335c2dfc81..9c7885d3eca4 100644 --- a/bin/configs/java-restclient-springBoot4-jackson3-jspecify.yaml +++ b/bin/configs/java-restclient-springBoot4-jackson3-jspecify.yaml @@ -13,6 +13,7 @@ additionalProperties: openApiNullable: false useJspecify: true generateBuilders: true + generateConstructorWithAllArgs: true typeMappings: OffsetDateTime: java.time.Instant BigDecimal: java.math.BigDecimal diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/model/Foo.java b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/model/Foo.java index 42aabfc0fe5f..a7dafe94fa88 100644 --- a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/model/Foo.java +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/model/Foo.java @@ -109,6 +109,25 @@ public class Foo { public Foo() { } + /** + * Constructor with all args parameters + */ + 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) { + this.dt = dt; + this.nullableDt = nullableDt == null ? JsonNullable.undefined() : JsonNullable.of(nullableDt); + this.binary = binary; + this.nullableBinary = nullableBinary == null ? JsonNullable.undefined() : JsonNullable.of(nullableBinary); + this.listOfDt = listOfDt; + this.listMinIntems = listMinIntems; + this.nullableListMinIntems = nullableListMinIntems == null ? JsonNullable.>undefined() : JsonNullable.of(nullableListMinIntems); + this.requiredDt = requiredDt; + this.number = number; + this.nullableNumber = nullableNumber == null ? JsonNullable.undefined() : JsonNullable.of(nullableNumber); + this.color = color; + this.requiredColor = requiredColor; + this.nullableColor = nullableColor == null ? JsonNullable.undefined() : JsonNullable.of(nullableColor); + } + public Foo dt(java.time.@Nullable Instant dt) { this.dt = dt; 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 6fe4d8e26440..5305c57daf3e 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 @@ -105,6 +105,25 @@ public class Foo { public Foo() { } + /** + * Constructor with all args parameters + */ + 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) { + 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(java.time.@Nullable Instant dt) { this.dt = dt;