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/.github/workflows/samples-spring-jdk17.yaml b/.github/workflows/samples-spring-jdk17.yaml index 1eb6fd318b51..a006049c536b 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/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/** @@ -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/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/** @@ -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/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 diff --git a/bin/configs/java-native-jackson3-jspecify.yaml b/bin/configs/java-native-jackson3-jspecify.yaml index 44f7c56c6683..19d1198405cc 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 + BigDecimal: java.math.BigDecimal 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..6d825392c77e --- /dev/null +++ b/bin/configs/java-restclient-springBoot4-jackson3-jspecify-openapiNullable.yaml @@ -0,0 +1,19 @@ +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 + 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 11150147eba2..9c7885d3eca4 100644 --- a/bin/configs/java-restclient-springBoot4-jackson3-jspecify.yaml +++ b/bin/configs/java-restclient-springBoot4-jackson3-jspecify.yaml @@ -12,6 +12,8 @@ additionalProperties: useJackson3: true openApiNullable: false useJspecify: true + generateBuilders: true + generateConstructorWithAllArgs: true typeMappings: OffsetDateTime: java.time.Instant BigDecimal: java.math.BigDecimal 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 - 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/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/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/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/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/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/nullableArgumentWithEnum.mustache b/modules/openapi-generator/src/main/resources/Java/nullableArgumentWithEnum.mustache index c044a5474084..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}} {{#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/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/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/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 6dd2e6da00d2..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}}{{>nullableAnnotation}}{{{datatypeWithEnum}}} {{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}}({{>nullableAnnotation}}{{{datatypeWithEnum}}} {{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 b22e1e347317..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 @@ -4654,7 +4654,10 @@ 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, + GENERATE_BUILDERS, true ), codegenConfigurator -> codegenConfigurator @@ -4683,17 +4686,24 @@ 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)", + "String toIndentedString(@Nullable Object o)"); + 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)" + "(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")) @@ -4702,7 +4712,72 @@ 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, + GENERATE_BUILDERS, 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();", + "String toIndentedString(@Nullable Object o)"); + 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, @Nullable String color)" + ); + } + 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..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 @@ -7045,7 +7045,77 @@ 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, + GENERATE_BUILDERS, true, + 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)", + "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) {", + "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", + " @RequestParam(value = \"color\", required = false, defaultValue = \"red\") String color" + ); + 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_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, + GENERATE_BUILDERS, true, springVersionProperty, springBootVersion > 2 ), codegenConfigurator -> @@ -7069,7 +7139,16 @@ 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)", + "Foo nullableDt(java.time.@Nullable Instant nullableDt) {", + "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() @@ -7092,6 +7171,88 @@ public void testJspecify(String library, int springBootVersion, String fooApiFil } } + @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, + SpringCodegen.USE_OPTIONAL, true, + OPTIONAL_ACCEPT_NULLABLE, optionalAcceptNullable, + INTERFACE_ONLY, false, + GENERATE_BUILDERS, true, + 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 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)", + "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) {\n this.dt = Optional.ofNullable(dt);", + "Foo.Builder dt(java.time.@Nullable Instant dt) {"); + } else { + fooAssert.fileContains( + "Foo dt(java.time.Instant dt) {\n this.dt = Optional.of(dt);", + "Foo.Builder dt(java.time.Instant dt) {"); + } + 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..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 @@ -64,13 +69,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 +96,32 @@ 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: + type: string + default: red + requiredColor: + default: red + type: string + nullableColor: + type: string + default: red + 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..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: @@ -76,22 +84,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 +128,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/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/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/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/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..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 @@ -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(); } @@ -267,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 "); } @@ -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(); } @@ -360,30 +619,58 @@ 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 binary(File binary) { + 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 listOfDt(List listOfDt) { + 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(List listMinIntems) { + 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.BigDecimal number) { + 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; + } /** @@ -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/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/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-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..0360f20c7340 --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/.openapi-generator/FILES @@ -0,0 +1,34 @@ +.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 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 000000000000..e6441136f3d4 Binary files /dev/null and b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/gradle/wrapper/gradle-wrapper.jar differ diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/gradle/wrapper/gradle-wrapper.properties b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000000..4f5eb9dcc0ef --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/gradlew b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/gradlew new file mode 100755 index 000000000000..9d0ce634cb11 --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while +APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path +[ -h "$app_path" ] +do +ls=$( ls -ld "$app_path" ) +link=${ls#*' -> '} +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..a7dafe94fa88 --- /dev/null +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify-openapiNullable/src/main/java/org/openapitools/client/model/Foo.java @@ -0,0 +1,729 @@ +/* + * 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() { + } + + /** + * 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; + 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(@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 = 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/api/openapi.yaml b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/api/openapi.yaml index 14c4c1ed2afc..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: @@ -76,22 +84,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 +128,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/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/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/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/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..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 @@ -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,9 +86,44 @@ 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() { } + /** + * 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; @@ -95,6 +149,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 +199,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 +246,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 +279,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 +373,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 +484,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 +508,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(); } @@ -277,9 +528,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/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/api/openapi.yaml b/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/api/openapi.yaml index 14c4c1ed2afc..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: @@ -76,22 +84,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 +128,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/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/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/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/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..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 @@ -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(); } @@ -277,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/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/api/openapi.yaml b/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/api/openapi.yaml index 14c4c1ed2afc..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: @@ -76,22 +84,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 +128,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/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/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/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); } /** 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..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 @@ -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(); } @@ -276,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()); + } + + } 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 + } + } 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..632e71aef704 --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-4-jspecify-openapiNullable/.openapi-generator/FILES @@ -0,0 +1,9 @@ +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..632e71aef704 --- /dev/null +++ b/samples/openapi3/server/petstore/springboot-4-jspecify-useOptional/.openapi-generator/FILES @@ -0,0 +1,9 @@ +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 8e068a12f2e3..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( @@ -68,14 +69,15 @@ 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, + @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\", \"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..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 @@ -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 @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; @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 @Nullable 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 @Nullable 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(@Nullable 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 @Nullable 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(@Nullable 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 @Nullable String getColor() { + return color; + } + + @JsonSetter(nulls = Nulls.SKIP) + @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 = 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(); } @@ -288,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 "); } @@ -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.@Nullable Instant dt) { this.instance.dt(dt); return this; } - public Foo.Builder binary(org.springframework.core.io.Resource binary) { + public Foo.Builder nullableDt(java.time.@Nullable Instant 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 listOfDt(List listOfDt) { + public Foo.Builder nullableBinary(org.springframework.core.io.@Nullable Resource nullableBinary) { + this.instance.nullableBinary(nullableBinary); + return this; + } + + 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 requiredDt(OffsetDateTime requiredDt) { + 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(BigDecimal number) { + 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. * 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 "); }