diff --git a/bin/configs/java-resttemplate.yaml b/bin/configs/java-resttemplate.yaml index 9c61a34ba90c..477b09658db3 100644 --- a/bin/configs/java-resttemplate.yaml +++ b/bin/configs/java-resttemplate.yaml @@ -7,3 +7,4 @@ additionalProperties: artifactId: petstore-resttemplate hideGenerationTimestamp: "true" java8: true + containerDefaultToNull: true diff --git a/bin/configs/java-webclient.yaml b/bin/configs/java-webclient.yaml index a78b3f5e47dc..d05ea4bc14b4 100644 --- a/bin/configs/java-webclient.yaml +++ b/bin/configs/java-webclient.yaml @@ -6,3 +6,4 @@ templateDir: modules/openapi-generator/src/main/resources/Java additionalProperties: artifactId: petstore-webclient hideGenerationTimestamp: "true" + containerDefaultToNull: "true" diff --git a/docs/generators/groovy.md b/docs/generators/groovy.md index d42218a5f56c..6fb7665f64da 100644 --- a/docs/generators/groovy.md +++ b/docs/generators/groovy.md @@ -28,6 +28,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false| |booleanGetterPrefix|Set booleanGetterPrefix| |get| |camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false| +|containerDefaultToNull|Set containers (array, set, map) default to null| |false| |dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|legacy| |developerEmail|developer email in generated pom.xml| |team@openapitools.org| |developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors| diff --git a/docs/generators/java-camel.md b/docs/generators/java-camel.md index ae510a1033da..69b91e027bfa 100644 --- a/docs/generators/java-camel.md +++ b/docs/generators/java-camel.md @@ -42,6 +42,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |camelUseDefaultValidationErrorProcessor|generate default validation error processor| |true| |camelValidationErrorProcessor|validation error processor bean name| |validationErrorProcessor| |configPackage|configuration package for generated code| |org.openapitools.configuration| +|containerDefaultToNull|Set containers (array, set, map) default to null| |false| |dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|java8| |delegatePattern|Whether to generate the server files using the delegate pattern| |false| |developerEmail|developer email in generated pom.xml| |team@openapitools.org| diff --git a/docs/generators/java-helidon-client.md b/docs/generators/java-helidon-client.md index 5d4fb37757ff..485eb65eac17 100644 --- a/docs/generators/java-helidon-client.md +++ b/docs/generators/java-helidon-client.md @@ -31,6 +31,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |booleanGetterPrefix|Set booleanGetterPrefix| |get| |camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false| |configKey|Config key in @RegisterRestClient. Default to none.| |null| +|containerDefaultToNull|Set containers (array, set, map) default to null| |false| |dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|java8| |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
**false**
The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
**true**
Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
|true| |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true| diff --git a/docs/generators/java-helidon-server.md b/docs/generators/java-helidon-server.md index 9fd013b114c8..276a7ebc863f 100644 --- a/docs/generators/java-helidon-server.md +++ b/docs/generators/java-helidon-server.md @@ -30,6 +30,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false| |booleanGetterPrefix|Set booleanGetterPrefix| |get| |camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false| +|containerDefaultToNull|Set containers (array, set, map) default to null| |false| |dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|java8| |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|
**false**
The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.
**true**
Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.
|true| |discriminatorCaseSensitive|Whether the discriminator value lookup should be case-sensitive or not. This option only works for Java API client| |true| diff --git a/docs/generators/java-inflector.md b/docs/generators/java-inflector.md index c99e23f5f04a..d1d6d4ae89f9 100644 --- a/docs/generators/java-inflector.md +++ b/docs/generators/java-inflector.md @@ -30,6 +30,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false| |booleanGetterPrefix|Set booleanGetterPrefix| |get| |camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false| +|containerDefaultToNull|Set containers (array, set, map) default to null| |false| |dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|legacy| |developerEmail|developer email in generated pom.xml| |team@openapitools.org| |developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors| diff --git a/docs/generators/java-micronaut-client.md b/docs/generators/java-micronaut-client.md index 7078d72c7e48..2d5e55850503 100644 --- a/docs/generators/java-micronaut-client.md +++ b/docs/generators/java-micronaut-client.md @@ -34,6 +34,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |build|Specify for which build tool to generate files|
**gradle**
Gradle configuration is generated for the project
**all**
Both Gradle and Maven configurations are generated
**maven**
Maven configuration is generated for the project
|all| |camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false| |configureAuth|Configure all the authorization methods as specified in the file| |false| +|containerDefaultToNull|Set containers (array, set, map) default to null| |false| |dateFormat|Specify the format pattern of date as a string| |null| |dateLibrary|Option. Date library to use|
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|java8| |datetimeFormat|Specify the format pattern of date-time as a string| |null| diff --git a/docs/generators/java-micronaut-server.md b/docs/generators/java-micronaut-server.md index ce3c74cf026e..5aecff1e6a06 100644 --- a/docs/generators/java-micronaut-server.md +++ b/docs/generators/java-micronaut-server.md @@ -31,6 +31,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |booleanGetterPrefix|Set booleanGetterPrefix| |get| |build|Specify for which build tool to generate files|
**gradle**
Gradle configuration is generated for the project
**all**
Both Gradle and Maven configurations are generated
**maven**
Maven configuration is generated for the project
|all| |camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false| +|containerDefaultToNull|Set containers (array, set, map) default to null| |false| |controllerPackage|The package in which controllers will be generated| |org.openapitools.api| |dateFormat|Specify the format pattern of date as a string| |null| |dateLibrary|Option. Date library to use|
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|java8| diff --git a/docs/generators/java-msf4j.md b/docs/generators/java-msf4j.md index 685e0357e729..7d4532cab347 100644 --- a/docs/generators/java-msf4j.md +++ b/docs/generators/java-msf4j.md @@ -30,6 +30,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false| |booleanGetterPrefix|Set booleanGetterPrefix| |get| |camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false| +|containerDefaultToNull|Set containers (array, set, map) default to null| |false| |dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|legacy| |developerEmail|developer email in generated pom.xml| |team@openapitools.org| |developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors| diff --git a/docs/generators/java-pkmst.md b/docs/generators/java-pkmst.md index 30a48087f160..0a5ee14c2241 100644 --- a/docs/generators/java-pkmst.md +++ b/docs/generators/java-pkmst.md @@ -31,6 +31,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false| |booleanGetterPrefix|Set booleanGetterPrefix| |get| |camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false| +|containerDefaultToNull|Set containers (array, set, map) default to null| |false| |dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|java8| |developerEmail|developer email in generated pom.xml| |team@openapitools.org| |developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors| diff --git a/docs/generators/java-play-framework.md b/docs/generators/java-play-framework.md index 3fcaa8449c58..e41abb5b575c 100644 --- a/docs/generators/java-play-framework.md +++ b/docs/generators/java-play-framework.md @@ -32,6 +32,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |booleanGetterPrefix|Set booleanGetterPrefix| |get| |camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false| |configPackage|configuration package for generated code| |org.openapitools.configuration| +|containerDefaultToNull|Set containers (array, set, map) default to null| |false| |controllerOnly|Whether to generate only API interface stubs without the server files.| |false| |dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|java8| |developerEmail|developer email in generated pom.xml| |team@openapitools.org| diff --git a/docs/generators/java-undertow-server.md b/docs/generators/java-undertow-server.md index cf0eaf29204d..a4a74abd19ae 100644 --- a/docs/generators/java-undertow-server.md +++ b/docs/generators/java-undertow-server.md @@ -30,6 +30,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false| |booleanGetterPrefix|Set booleanGetterPrefix| |get| |camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false| +|containerDefaultToNull|Set containers (array, set, map) default to null| |false| |dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|legacy| |developerEmail|developer email in generated pom.xml| |team@openapitools.org| |developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors| diff --git a/docs/generators/java-vertx-web.md b/docs/generators/java-vertx-web.md index 0d46a523a504..93f60ef39cac 100644 --- a/docs/generators/java-vertx-web.md +++ b/docs/generators/java-vertx-web.md @@ -30,6 +30,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false| |booleanGetterPrefix|Set booleanGetterPrefix| |get| |camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false| +|containerDefaultToNull|Set containers (array, set, map) default to null| |false| |dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|java8| |developerEmail|developer email in generated pom.xml| |team@openapitools.org| |developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors| diff --git a/docs/generators/java-vertx.md b/docs/generators/java-vertx.md index a919b2b4045f..063da873d5ba 100644 --- a/docs/generators/java-vertx.md +++ b/docs/generators/java-vertx.md @@ -30,6 +30,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false| |booleanGetterPrefix|Set booleanGetterPrefix| |get| |camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false| +|containerDefaultToNull|Set containers (array, set, map) default to null| |false| |dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|java8| |developerEmail|developer email in generated pom.xml| |team@openapitools.org| |developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors| diff --git a/docs/generators/java.md b/docs/generators/java.md index 3a5aea732c43..3b299ddbd5f1 100644 --- a/docs/generators/java.md +++ b/docs/generators/java.md @@ -34,6 +34,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false| |caseInsensitiveResponseHeaders|Make API response's headers case-insensitive. Available on okhttp-gson, jersey2 libraries| |false| |configKey|Config key in @RegisterRestClient. Default to none. Only `microprofile` supports this option.| |null| +|containerDefaultToNull|Set containers (array, set, map) default to null| |false| |dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|java8| |developerEmail|developer email in generated pom.xml| |team@openapitools.org| |developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors| diff --git a/docs/generators/jaxrs-cxf-cdi.md b/docs/generators/jaxrs-cxf-cdi.md index 8e857d9fead6..aac09068b9be 100644 --- a/docs/generators/jaxrs-cxf-cdi.md +++ b/docs/generators/jaxrs-cxf-cdi.md @@ -30,6 +30,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false| |booleanGetterPrefix|Set booleanGetterPrefix| |get| |camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false| +|containerDefaultToNull|Set containers (array, set, map) default to null| |false| |dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|legacy| |developerEmail|developer email in generated pom.xml| |team@openapitools.org| |developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors| diff --git a/docs/generators/jaxrs-cxf-client.md b/docs/generators/jaxrs-cxf-client.md index ee6f46499dad..a9f89032ebe6 100644 --- a/docs/generators/jaxrs-cxf-client.md +++ b/docs/generators/jaxrs-cxf-client.md @@ -30,6 +30,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false| |booleanGetterPrefix|Set booleanGetterPrefix| |get| |camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false| +|containerDefaultToNull|Set containers (array, set, map) default to null| |false| |dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|legacy| |developerEmail|developer email in generated pom.xml| |team@openapitools.org| |developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors| diff --git a/docs/generators/jaxrs-cxf-extended.md b/docs/generators/jaxrs-cxf-extended.md index 88bad1716bca..dc00f40d5776 100644 --- a/docs/generators/jaxrs-cxf-extended.md +++ b/docs/generators/jaxrs-cxf-extended.md @@ -31,6 +31,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false| |booleanGetterPrefix|Set booleanGetterPrefix| |get| |camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false| +|containerDefaultToNull|Set containers (array, set, map) default to null| |false| |dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|legacy| |developerEmail|developer email in generated pom.xml| |team@openapitools.org| |developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors| diff --git a/docs/generators/jaxrs-cxf.md b/docs/generators/jaxrs-cxf.md index 414843f9b375..f1b0b294f79e 100644 --- a/docs/generators/jaxrs-cxf.md +++ b/docs/generators/jaxrs-cxf.md @@ -31,6 +31,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false| |booleanGetterPrefix|Set booleanGetterPrefix| |get| |camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false| +|containerDefaultToNull|Set containers (array, set, map) default to null| |false| |dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|legacy| |developerEmail|developer email in generated pom.xml| |team@openapitools.org| |developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors| diff --git a/docs/generators/jaxrs-jersey.md b/docs/generators/jaxrs-jersey.md index 9a8da73eee2b..be59dac624b2 100644 --- a/docs/generators/jaxrs-jersey.md +++ b/docs/generators/jaxrs-jersey.md @@ -30,6 +30,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false| |booleanGetterPrefix|Set booleanGetterPrefix| |get| |camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false| +|containerDefaultToNull|Set containers (array, set, map) default to null| |false| |dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|legacy| |developerEmail|developer email in generated pom.xml| |team@openapitools.org| |developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors| diff --git a/docs/generators/jaxrs-resteasy-eap.md b/docs/generators/jaxrs-resteasy-eap.md index d2802b42e826..0f5e5eed3d0b 100644 --- a/docs/generators/jaxrs-resteasy-eap.md +++ b/docs/generators/jaxrs-resteasy-eap.md @@ -30,6 +30,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false| |booleanGetterPrefix|Set booleanGetterPrefix| |get| |camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false| +|containerDefaultToNull|Set containers (array, set, map) default to null| |false| |dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|legacy| |developerEmail|developer email in generated pom.xml| |team@openapitools.org| |developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors| diff --git a/docs/generators/jaxrs-resteasy.md b/docs/generators/jaxrs-resteasy.md index 6f86b8a6427c..ce4320fc60d1 100644 --- a/docs/generators/jaxrs-resteasy.md +++ b/docs/generators/jaxrs-resteasy.md @@ -30,6 +30,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false| |booleanGetterPrefix|Set booleanGetterPrefix| |get| |camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false| +|containerDefaultToNull|Set containers (array, set, map) default to null| |false| |dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|legacy| |developerEmail|developer email in generated pom.xml| |team@openapitools.org| |developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors| diff --git a/docs/generators/jaxrs-spec.md b/docs/generators/jaxrs-spec.md index b043a13b8247..076c45813a1f 100644 --- a/docs/generators/jaxrs-spec.md +++ b/docs/generators/jaxrs-spec.md @@ -30,6 +30,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |bigDecimalAsString|Treat BigDecimal values as Strings to avoid precision loss.| |false| |booleanGetterPrefix|Set booleanGetterPrefix| |get| |camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false| +|containerDefaultToNull|Set containers (array, set, map) default to null| |false| |dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|legacy| |developerEmail|developer email in generated pom.xml| |team@openapitools.org| |developerName|developer name in generated pom.xml| |OpenAPI-Generator Contributors| diff --git a/docs/generators/spring.md b/docs/generators/spring.md index ad6cba9fa6f0..a18718cb0502 100644 --- a/docs/generators/spring.md +++ b/docs/generators/spring.md @@ -35,6 +35,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl |booleanGetterPrefix|Set booleanGetterPrefix| |get| |camelCaseDollarSign|Fix camelCase when starting with $ sign. when true : $Value when false : $value| |false| |configPackage|configuration package for generated code| |org.openapitools.configuration| +|containerDefaultToNull|Set containers (array, set, map) default to null| |false| |dateLibrary|Option. Date library to use|
**joda**
Joda (for legacy app only)
**legacy**
Legacy java.util.Date
**java8-localdatetime**
Java 8 using LocalDateTime (for legacy app only)
**java8**
Java 8 native JSR310 (preferred for jdk 1.8+)
|java8| |delegatePattern|Whether to generate the server files using the delegate pattern| |false| |developerEmail|developer email in generated pom.xml| |team@openapitools.org| diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index d0cd1f0e5fd8..b6ab78eac519 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -2188,6 +2188,21 @@ public String toDefaultValueWithParam(String name, Schema schema) { return " = data." + name + ";"; } + /** + * Return the default value of the property + *

+ * Return null if you do NOT want a default value. + * Any non-null value will cause {{#defaultValue} check to pass. + * + * @param schema Property schema + * @param codegenProperty Codegen property + * @return string presentation of the default value of the property + */ + public String toDefaultValue(CodegenProperty codegenProperty, Schema schema) { + // use toDefaultValue(schema) if generator has not overriden this method + return toDefaultValue(schema); + } + /** * returns the OpenAPI type for the property. Use getAlias to handle $ref of primitive type * @@ -3786,8 +3801,7 @@ public CodegenProperty fromProperty(String name, Schema p, boolean required, boo LOGGER.debug("Exception from toExampleValue: {}", e.getMessage()); property.example = "ERROR_TO_EXAMPLE_VALUE"; } - property.defaultValue = toDefaultValue(p); - property.defaultValueWithParam = toDefaultValueWithParam(name, p); + property.jsonSchema = Json.pretty(p); if (p.getDeprecated() != null) { @@ -3939,6 +3953,10 @@ public CodegenProperty fromProperty(String name, Schema p, boolean required, boo property.isModel = (ModelUtils.isComposedSchema(referencedSchema) || ModelUtils.isObjectSchema(referencedSchema)) && ModelUtils.isModel(referencedSchema); } + // set the default value + property.defaultValue = toDefaultValue(property, p); + property.defaultValueWithParam = toDefaultValueWithParam(name, p); + LOGGER.debug("debugging from property return: {}", property); schemaCodegenPropertyCache.put(ns, property); return property; 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 fd709d11eb69..8a2fdf7aa89f 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 @@ -85,6 +85,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code public static final String IMPLICIT_HEADERS_REGEX = "implicitHeadersRegex"; public static final String JAVAX_PACKAGE = "javaxPackage"; public static final String USE_JAKARTA_EE = "useJakartaEe"; + public static final String CONTAINER_DEFAULT_TO_NULL = "containerDefaultToNull"; public static final String CAMEL_CASE_DOLLAR_SIGN = "camelCaseDollarSign"; @@ -137,9 +138,9 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code protected AnnotationLibrary annotationLibrary; protected boolean implicitHeaders = false; protected String implicitHeadersRegex = null; - protected boolean camelCaseDollarSign = false; protected boolean useJakartaEe = false; + protected boolean containerDefaultToNull = false; private Map schemaKeyToModelNameCache = new HashMap<>(); @@ -276,6 +277,7 @@ public AbstractJavaCodegen() { cliOptions.add(CliOption.newString(IMPLICIT_HEADERS_REGEX, "Skip header parameters that matches given regex in the generated API methods using @ApiImplicitParams annotation. Note: this parameter is ignored when implicitHeaders=true")); cliOptions.add(CliOption.newBoolean(CAMEL_CASE_DOLLAR_SIGN, "Fix camelCase when starting with $ sign. when true : $Value when false : $value")); cliOptions.add(CliOption.newBoolean(USE_JAKARTA_EE, "whether to use Jakarta EE namespace instead of javax")); + cliOptions.add(CliOption.newBoolean(CONTAINER_DEFAULT_TO_NULL, "Set containers (array, set, map) default to null")); cliOptions.add(CliOption.newString(CodegenConstants.PARENT_GROUP_ID, CodegenConstants.PARENT_GROUP_ID_DESC)); cliOptions.add(CliOption.newString(CodegenConstants.PARENT_ARTIFACT_ID, CodegenConstants.PARENT_ARTIFACT_ID_DESC)); @@ -686,6 +688,11 @@ public void processOpts() { } else { applyJavaxPackage(); } + + if (additionalProperties.containsKey(CONTAINER_DEFAULT_TO_NULL)) { + this.setContainerDefaultToNull(Boolean.parseBoolean(additionalProperties.get(CONTAINER_DEFAULT_TO_NULL).toString())); + } + additionalProperties.put(CONTAINER_DEFAULT_TO_NULL, containerDefaultToNull); } @Override @@ -966,20 +973,84 @@ public String getAlias(String name) { return name; } + /** + * Return the default value of array property + *

+ * Return null if there's no default value. + * Any non-null value will cause {{#defaultValue} check to pass. + * + * @param cp Codegen property + * @param schema Property schema + * @return string presentation of the default value of the property + */ + public String toArrayDefaultValue(CodegenProperty cp, Schema schema) { + if (schema.getDefault() != null) { // has default value + if (cp.isArray && !cp.getUniqueItems()) { // array + List _values = new ArrayList<>(); + + if (schema.getDefault() instanceof ArrayNode) { // array of default values + ArrayNode _default = (ArrayNode) schema.getDefault(); + if (_default.isEmpty()) { + return "null"; + } + + List final_values = _values; + _default.elements().forEachRemaining((element) -> { + final_values.add(element.asText()); + }); + } else { // single value + _values = java.util.Collections.singletonList(String.valueOf(schema.getDefault())); + } + + String defaultValue = ""; + + if (cp.items.isEnum) { // enum + List defaultValues = new ArrayList<>(); + for (String _value : _values) { + defaultValues.add(cp.items.datatypeWithEnum + "." + toEnumVarName(_value, cp.items.dataType)); + } + defaultValue = StringUtils.join(defaultValues, ", "); + } else { + if (cp.items.isString) { // array item is string + defaultValue = String.format(Locale.ROOT, "\"%s\"", StringUtils.join(_values, "\", \"")); + } else { // array item is non-string, e.g. integer + defaultValue = StringUtils.join(_values, ", "); + } + } + return String.format(Locale.ROOT, "new ArrayList<>(Arrays.asList(%s))", defaultValue); + } else if (cp.isArray && cp.getUniqueItems()) { // set + // TODO + return null; + } else if (cp.isMap) { // map + // TODO + return null; + } else { + throw new RuntimeException("Error. Codegen Property must be array/set/map: " + cp); + } + } else { + return null; + } + } + @Override - public String toDefaultValue(Schema schema) { + public String toDefaultValue(CodegenProperty cp, Schema schema) { schema = ModelUtils.getReferencedSchema(this.openAPI, schema); if (ModelUtils.isArraySchema(schema)) { - final String pattern; - if (ModelUtils.isSet(schema)) { - String mapInstantiationType = instantiationTypes().getOrDefault("set", "LinkedHashSet"); - pattern = "new " + mapInstantiationType + "<%s>()"; - } else { - String arrInstantiationType = instantiationTypes().getOrDefault("array", "ArrayList"); - pattern = "new " + arrInstantiationType + "<%s>()"; + if (schema.getDefault() == null) { + if (cp.isNullable || containerDefaultToNull) { // nullable or containerDefaultToNull set to true + return "null"; + } else { + if (ModelUtils.isSet(schema)) { + return String.format(Locale.ROOT, "new %s<>()", + instantiationTypes().getOrDefault("set", "LinkedHashSet")); + } else { + return String.format(Locale.ROOT, "new %s<>()", + instantiationTypes().getOrDefault("array", "ArrayList")); + } + } + } else { // has default value + return toArrayDefaultValue(cp, schema); } - - return String.format(Locale.ROOT, pattern, ""); } else if (ModelUtils.isMapSchema(schema) && !(schema instanceof ComposedSchema)) { if (schema.getProperties() != null && schema.getProperties().size() > 0) { // object is complex object with free-form additional properties @@ -989,14 +1060,16 @@ public String toDefaultValue(Schema schema) { return null; } - String mapInstantiationType = instantiationTypes().getOrDefault("map", "HashMap"); - final String pattern = "new " + mapInstantiationType + "<%s>()"; + if (cp.isNullable || containerDefaultToNull) { // nullable or containerDefaultToNull set to true + return "null"; + } if (getAdditionalProperties(schema) == null) { return null; } - return String.format(Locale.ROOT, pattern, ""); + return String.format(Locale.ROOT, "new %s<>()", + instantiationTypes().getOrDefault("map", "HashMap")); } else if (ModelUtils.isIntegerSchema(schema)) { if (schema.getDefault() != null) { if (SchemaTypeUtil.INTEGER64_FORMAT.equals(schema.getFormat())) { @@ -1963,6 +2036,10 @@ public void setUseJakartaEe(boolean useJakartaEe) { this.useJakartaEe = useJakartaEe; } + public void setContainerDefaultToNull(boolean containerDefaultToNull) { + this.containerDefaultToNull = containerDefaultToNull; + } + @Override public String escapeQuotationMark(String input) { // remove " to avoid code injection 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 82e5582a11ec..64ea0694fe85 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 @@ -83,7 +83,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens {{/vendorExtensions.x-is-jackson-optional-nullable}} {{^vendorExtensions.x-is-jackson-optional-nullable}} {{#isContainer}} - private {{{datatypeWithEnum}}} {{name}}{{#required}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}{{/required}}{{^required}} = null{{/required}}; + private {{{datatypeWithEnum}}} {{name}}{{#required}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}{{/required}}{{^required}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}{{^defaultValue}} = null{{/defaultValue}}{{/required}}; {{/isContainer}} {{^isContainer}} private {{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}; @@ -148,7 +148,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens {{^vendorExtensions.x-is-jackson-optional-nullable}} {{^required}} if (this.{{name}} == null) { - this.{{name}} = {{{defaultValue}}}; + this.{{name}} = new ArrayList<>(); } {{/required}} this.{{name}}.add({{name}}Item); diff --git a/modules/openapi-generator/src/main/resources/Java/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/pojo.mustache index 45c8174e4d4b..94ef14a7e2ac 100644 --- a/modules/openapi-generator/src/main/resources/Java/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/pojo.mustache @@ -84,7 +84,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens {{/vendorExtensions.x-is-jackson-optional-nullable}} {{^vendorExtensions.x-is-jackson-optional-nullable}} {{#isContainer}} - private {{{datatypeWithEnum}}} {{name}}{{#required}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}{{/required}}{{^required}} = null{{/required}}; + private {{{datatypeWithEnum}}} {{name}}{{#required}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}{{/required}}{{^required}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}{{^defaultValue}} = null{{/defaultValue}}{{/required}}; {{/isContainer}} {{^isContainer}} {{#isDiscriminator}}protected{{/isDiscriminator}}{{^isDiscriminator}}private{{/isDiscriminator}} {{{datatypeWithEnum}}} {{name}}{{#defaultValue}} = {{{.}}}{{/defaultValue}}; @@ -111,7 +111,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens {{#jsonb}}@JsonbCreator{{/jsonb}}{{#jackson}}@JsonCreator{{/jackson}} public {{classname}}( {{#readOnlyVars}} - {{#jsonb}}@JsonbProperty(value = "{{baseName}}"{{^required}}, nillable = true{{/required}}){{/jsonb}}{{#jackson}}@JsonProperty(JSON_PROPERTY_{{nameInSnakeCase}}){{/jackson}} {{{datatypeWithEnum}}} {{name}}{{^-last}}, {{/-last}} + {{#jsonb}}@JsonbProperty(value = "{{baseName}}"{{^required}}, nullable = true{{/required}}){{/jsonb}}{{#jackson}}@JsonProperty(JSON_PROPERTY_{{nameInSnakeCase}}){{/jackson}} {{{datatypeWithEnum}}} {{name}}{{^-last}}, {{/-last}} {{/readOnlyVars}} ) { this(); @@ -134,7 +134,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens public {{classname}} add{{nameInCamelCase}}Item({{{items.datatypeWithEnum}}} {{name}}Item) { {{#vendorExtensions.x-is-jackson-optional-nullable}} if (this.{{name}} == null || !this.{{name}}.isPresent()) { - this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{{defaultValue}}}); + this.{{name}} = JsonNullable.<{{{datatypeWithEnum}}}>of({{{defaultValue}}}{{^defaultValue}}null{{/defaultValue}}); } try { this.{{name}}.get().add({{name}}Item); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java index 0e2817fd9b5a..22c55a4dba1a 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java @@ -23,14 +23,9 @@ import java.time.OffsetDateTime; import java.time.ZonedDateTime; -import java.util.HashSet; -import java.util.Set; - -import org.openapitools.codegen.CodegenConstants; -import org.openapitools.codegen.CodegenModel; -import org.openapitools.codegen.CodegenParameter; -import org.openapitools.codegen.CodegenType; -import org.openapitools.codegen.TestUtils; +import java.util.*; + +import org.openapitools.codegen.*; import org.openapitools.codegen.languages.AbstractJavaCodegen; import org.openapitools.codegen.utils.ModelUtils; import org.testng.Assert; @@ -39,10 +34,6 @@ import java.io.File; import java.time.LocalDate; import java.time.ZoneId; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Collections; public class AbstractJavaCodegenTest { @@ -564,24 +555,31 @@ public void toDefaultValueDateTimeLegacyTest() { codegen.setDateLibrary("legacy"); String defaultValue; - // Test default value for date format + // Test default value for date format (DateSchema) DateSchema dateSchema = new DateSchema(); - LocalDate defaultLocalDate = LocalDate.of(2019, 2, 15); + + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + LocalDate defaultLocalDate = LocalDate.of(2021, 5, 23); Date date = Date.from(defaultLocalDate.atStartOfDay(ZoneId.systemDefault()).toInstant()); + Assert.assertEquals(date.toString(), "Sun May 23 00:00:00 UTC 2021"); + dateSchema.setDefault(date); defaultValue = codegen.toDefaultValue(dateSchema); // dateLibrary <> java8 - Assert.assertNull(defaultValue); + Assert.assertEquals(defaultValue, "Sun May 23 00:00:00 UTC 2021"); + // Test default value for date format (DateTimeSchema) DateTimeSchema dateTimeSchema = new DateTimeSchema(); - OffsetDateTime defaultDateTime = OffsetDateTime.parse("1984-12-19T03:39:57-08:00"); - ZonedDateTime expectedDateTime = defaultDateTime.atZoneSameInstant(ZoneId.systemDefault()); + + OffsetDateTime defaultDateTime = OffsetDateTime.parse("1984-12-19T03:39:57-09:00"); + Assert.assertEquals(defaultDateTime.toString(), "1984-12-19T03:39:57-09:00"); + dateTimeSchema.setDefault(defaultDateTime); defaultValue = codegen.toDefaultValue(dateTimeSchema); // dateLibrary <> java8 - Assert.assertNull(defaultValue); + Assert.assertEquals(defaultValue, "1984-12-19T03:39:57-09:00"); } @Test @@ -592,7 +590,7 @@ public void toDefaultValueTest() { Schema schema = createObjectSchemaWithMinItems(); String defaultValue = codegen.toDefaultValue(schema); - Assert.assertNull(defaultValue); + Assert.assertEquals(defaultValue, "null"); // Create an alias to an array schema Schema nestedArraySchema = new ArraySchema().items(new IntegerSchema().format("int32")); @@ -602,22 +600,22 @@ public void toDefaultValueTest() { schema = new ArraySchema().items(new Schema().$ref("#/components/schemas/NestedArray")); ModelUtils.setGenerateAliasAsModel(false); - defaultValue = codegen.toDefaultValue(schema); + defaultValue = codegen.toDefaultValue(codegen.fromProperty("", schema), schema); Assert.assertEquals(defaultValue, "new ArrayList<>()"); ModelUtils.setGenerateAliasAsModel(true); - defaultValue = codegen.toDefaultValue(schema); + defaultValue = codegen.toDefaultValue(codegen.fromProperty("", schema), schema); Assert.assertEquals(defaultValue, "new ArrayList<>()"); // Create a map schema with additionalProperties type set to array alias schema = new MapSchema().additionalProperties(new Schema().$ref("#/components/schemas/NestedArray")); ModelUtils.setGenerateAliasAsModel(false); - defaultValue = codegen.toDefaultValue(schema); + defaultValue = codegen.toDefaultValue(codegen.fromProperty("", schema), schema); Assert.assertEquals(defaultValue, "new HashMap<>()"); ModelUtils.setGenerateAliasAsModel(true); - defaultValue = codegen.toDefaultValue(schema); + defaultValue = codegen.toDefaultValue(codegen.fromProperty("", schema), schema); Assert.assertEquals(defaultValue, "new HashMap<>()"); // Test default value for date format @@ -625,26 +623,26 @@ public void toDefaultValueTest() { LocalDate defaultLocalDate = LocalDate.of(2019, 2, 15); Date date = Date.from(defaultLocalDate.atStartOfDay(ZoneId.systemDefault()).toInstant()); dateSchema.setDefault(date); - defaultValue = codegen.toDefaultValue(dateSchema); + defaultValue = codegen.toDefaultValue(codegen.fromProperty("", schema), dateSchema); Assert.assertEquals(defaultValue, "LocalDate.parse(\"" + defaultLocalDate.toString() + "\")"); DateTimeSchema dateTimeSchema = new DateTimeSchema(); OffsetDateTime defaultDateTime = OffsetDateTime.parse("1984-12-19T03:39:57-08:00"); ZonedDateTime expectedDateTime = defaultDateTime.atZoneSameInstant(ZoneId.systemDefault()); dateTimeSchema.setDefault(defaultDateTime); - defaultValue = codegen.toDefaultValue(dateTimeSchema); + defaultValue = codegen.toDefaultValue(codegen.fromProperty("", schema), dateTimeSchema); Assert.assertTrue(defaultValue.startsWith("OffsetDateTime.parse(\"" + expectedDateTime.toString())); // Test default value for number without format NumberSchema numberSchema = new NumberSchema(); Double doubleValue = 100.0; numberSchema.setDefault(doubleValue); - defaultValue = codegen.toDefaultValue(numberSchema); + defaultValue = codegen.toDefaultValue(codegen.fromProperty("", schema), numberSchema); Assert.assertEquals(defaultValue, "new BigDecimal(\"" + doubleValue + "\")"); // Test default value for number with format set to double numberSchema.setFormat("double"); - defaultValue = codegen.toDefaultValue(numberSchema); + defaultValue = codegen.toDefaultValue(codegen.fromProperty("", schema), numberSchema); Assert.assertEquals(defaultValue, doubleValue + "d"); } @@ -811,7 +809,7 @@ public void nullDefaultValueForModelWithDynamicProperties() { Assert.assertNull(cm.defaultValue, "Expected no defined default value in spec"); String defaultValue = codegen.toDefaultValue(schema); - Assert.assertNull(defaultValue); + Assert.assertEquals(defaultValue, "null"); } @Test @@ -827,7 +825,7 @@ public void maplikeDefaultValueForModelWithStringToStringMapping() { Assert.assertNull(cm.defaultValue, "Expected no defined default value in spec"); String defaultValue = codegen.toDefaultValue(schema); - Assert.assertEquals(defaultValue, "new HashMap<>()", "Expected string-string map aliased model to default to new HashMap()"); + Assert.assertEquals(defaultValue, "null", "Expected string-string map aliased model to default to null since nullable is not set to true"); } @Test @@ -843,7 +841,7 @@ public void maplikeDefaultValueForModelWithStringToModelMapping() { Assert.assertNull(cm.defaultValue, "Expected no defined default value in spec"); String defaultValue = codegen.toDefaultValue(schema); - Assert.assertEquals(defaultValue, "new HashMap<>()", "Expected string-ref map aliased model to default to new HashMap()"); + Assert.assertEquals(defaultValue, "null", "Expected string-ref map aliased model to default to null since nullable is not set to tru"); } @Test diff --git a/modules/openapi-generator/src/test/resources/3_0/echo_api.yaml b/modules/openapi-generator/src/test/resources/3_0/echo_api.yaml index 82bfa963c102..3a1fb1d13a5c 100644 --- a/modules/openapi-generator/src/test/resources/3_0/echo_api.yaml +++ b/modules/openapi-generator/src/test/resources/3_0/echo_api.yaml @@ -288,6 +288,47 @@ components: - sold xml: name: pet + DefaultValue: + type: object + description: to test the default value of properties + properties: + array_string_enum_default: + type: array + items: + type: string + enum: + - success + - failure + - unclassified + default: + - success + - failure + array_string_default: + type: array + items: + type: string + default: + - failure + - skipped + array_integer_default: + type: array + items: + type: integer + default: + - 1 + - 3 + array_string: + type: array + items: + type: string + array_string_nullable: + nullable: true + type: array + items: + type: string + string_nullable: + type: string + nullable: true Bird: type: object properties: diff --git a/openapitools.json b/openapitools.json new file mode 100644 index 000000000000..f5f966a1030d --- /dev/null +++ b/openapitools.json @@ -0,0 +1,7 @@ +{ + "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json", + "spaces": 2, + "generator-cli": { + "version": "6.2.1" + } +} diff --git a/pom.xml b/pom.xml index 42fdcead022c..7ddc66c86bdb 100644 --- a/pom.xml +++ b/pom.xml @@ -1296,6 +1296,7 @@ samples/client/others/java/okhttp-gson-streaming samples/client/petstore/java/okhttp-gson samples/client/petstore/java-micronaut-client + samples/client/petstore/java/apache-httpclient diff --git a/samples/client/echo_api/java/apache-httpclient/.openapi-generator/FILES b/samples/client/echo_api/java/apache-httpclient/.openapi-generator/FILES index 211be50eebe4..d799647fefc9 100644 --- a/samples/client/echo_api/java/apache-httpclient/.openapi-generator/FILES +++ b/samples/client/echo_api/java/apache-httpclient/.openapi-generator/FILES @@ -10,6 +10,7 @@ docs/BodyApi.md docs/Category.md docs/DataQuery.md docs/DataQueryAllOf.md +docs/DefaultValue.md docs/PathApi.md docs/Pet.md docs/Query.md @@ -46,6 +47,7 @@ src/main/java/org/openapitools/client/model/Bird.java src/main/java/org/openapitools/client/model/Category.java src/main/java/org/openapitools/client/model/DataQuery.java src/main/java/org/openapitools/client/model/DataQueryAllOf.java +src/main/java/org/openapitools/client/model/DefaultValue.java src/main/java/org/openapitools/client/model/Pet.java src/main/java/org/openapitools/client/model/Query.java src/main/java/org/openapitools/client/model/Tag.java diff --git a/samples/client/echo_api/java/apache-httpclient/README.md b/samples/client/echo_api/java/apache-httpclient/README.md index 2b9dc39df252..4067df7d7349 100644 --- a/samples/client/echo_api/java/apache-httpclient/README.md +++ b/samples/client/echo_api/java/apache-httpclient/README.md @@ -122,6 +122,7 @@ Class | Method | HTTP request | Description - [Category](docs/Category.md) - [DataQuery](docs/DataQuery.md) - [DataQueryAllOf](docs/DataQueryAllOf.md) + - [DefaultValue](docs/DefaultValue.md) - [Pet](docs/Pet.md) - [Query](docs/Query.md) - [Tag](docs/Tag.md) diff --git a/samples/client/echo_api/java/apache-httpclient/api/openapi.yaml b/samples/client/echo_api/java/apache-httpclient/api/openapi.yaml index 3fc6ac3d6c89..44b2b84e6e2a 100644 --- a/samples/client/echo_api/java/apache-httpclient/api/openapi.yaml +++ b/samples/client/echo_api/java/apache-httpclient/api/openapi.yaml @@ -301,6 +301,47 @@ components: type: object xml: name: pet + DefaultValue: + description: to test the default value of properties + properties: + array_string_enum_default: + default: + - success + - failure + items: + enum: + - success + - failure + - unclassified + type: string + type: array + array_string_default: + default: + - failure + - skipped + items: + type: string + type: array + array_integer_default: + default: + - 1 + - 3 + items: + type: integer + type: array + array_string: + items: + type: string + type: array + array_string_nullable: + items: + type: string + nullable: true + type: array + string_nullable: + nullable: true + type: string + type: object Bird: properties: size: diff --git a/samples/client/echo_api/java/apache-httpclient/docs/DefaultValue.md b/samples/client/echo_api/java/apache-httpclient/docs/DefaultValue.md new file mode 100644 index 000000000000..ea7323bc04d1 --- /dev/null +++ b/samples/client/echo_api/java/apache-httpclient/docs/DefaultValue.md @@ -0,0 +1,29 @@ + + +# DefaultValue + +to test the default value of properties + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**arrayStringEnumDefault** | [**List<ArrayStringEnumDefaultEnum>**](#List<ArrayStringEnumDefaultEnum>) | | [optional] | +|**arrayStringDefault** | **List<String>** | | [optional] | +|**arrayIntegerDefault** | **List<Integer>** | | [optional] | +|**arrayString** | **List<String>** | | [optional] | +|**arrayStringNullable** | **List<String>** | | [optional] | +|**stringNullable** | **String** | | [optional] | + + + +## Enum: List<ArrayStringEnumDefaultEnum> + +| Name | Value | +|---- | -----| +| SUCCESS | "success" | +| FAILURE | "failure" | +| UNCLASSIFIED | "unclassified" | + + + diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DefaultValue.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DefaultValue.java new file mode 100644 index 000000000000..120f1c9152a6 --- /dev/null +++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DefaultValue.java @@ -0,0 +1,496 @@ +/* + * Echo Server API + * Echo Server API + * + * The version of the OpenAPI document: 0.1.0 + * Contact: team@openapitools.org + * + * 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.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.util.ArrayList; +import java.util.List; +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 java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.util.StringJoiner; + +/** + * to test the default value of properties + */ +@JsonPropertyOrder({ + DefaultValue.JSON_PROPERTY_ARRAY_STRING_ENUM_DEFAULT, + DefaultValue.JSON_PROPERTY_ARRAY_STRING_DEFAULT, + DefaultValue.JSON_PROPERTY_ARRAY_INTEGER_DEFAULT, + DefaultValue.JSON_PROPERTY_ARRAY_STRING, + DefaultValue.JSON_PROPERTY_ARRAY_STRING_NULLABLE, + DefaultValue.JSON_PROPERTY_STRING_NULLABLE +}) +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +public class DefaultValue { + /** + * Gets or Sets arrayStringEnumDefault + */ + public enum ArrayStringEnumDefaultEnum { + SUCCESS("success"), + + FAILURE("failure"), + + UNCLASSIFIED("unclassified"); + + private String value; + + ArrayStringEnumDefaultEnum(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static ArrayStringEnumDefaultEnum fromValue(String value) { + for (ArrayStringEnumDefaultEnum b : ArrayStringEnumDefaultEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + public static final String JSON_PROPERTY_ARRAY_STRING_ENUM_DEFAULT = "array_string_enum_default"; + private List arrayStringEnumDefault = new ArrayList<>(Arrays.asList(ArrayStringEnumDefaultEnum.SUCCESS, ArrayStringEnumDefaultEnum.FAILURE)); + + public static final String JSON_PROPERTY_ARRAY_STRING_DEFAULT = "array_string_default"; + private List arrayStringDefault = new ArrayList<>(Arrays.asList("failure", "skipped")); + + public static final String JSON_PROPERTY_ARRAY_INTEGER_DEFAULT = "array_integer_default"; + private List arrayIntegerDefault = new ArrayList<>(Arrays.asList(1, 3)); + + public static final String JSON_PROPERTY_ARRAY_STRING = "array_string"; + private List arrayString = new ArrayList<>(); + + public static final String JSON_PROPERTY_ARRAY_STRING_NULLABLE = "array_string_nullable"; + private JsonNullable> arrayStringNullable = JsonNullable.>undefined(); + + public static final String JSON_PROPERTY_STRING_NULLABLE = "string_nullable"; + private JsonNullable stringNullable = JsonNullable.undefined(); + + public DefaultValue() { + } + + public DefaultValue arrayStringEnumDefault(List arrayStringEnumDefault) { + + this.arrayStringEnumDefault = arrayStringEnumDefault; + return this; + } + + public DefaultValue addArrayStringEnumDefaultItem(ArrayStringEnumDefaultEnum arrayStringEnumDefaultItem) { + if (this.arrayStringEnumDefault == null) { + this.arrayStringEnumDefault = new ArrayList<>(Arrays.asList(ArrayStringEnumDefaultEnum.SUCCESS, ArrayStringEnumDefaultEnum.FAILURE)); + } + this.arrayStringEnumDefault.add(arrayStringEnumDefaultItem); + return this; + } + + /** + * Get arrayStringEnumDefault + * @return arrayStringEnumDefault + **/ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ARRAY_STRING_ENUM_DEFAULT) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public List getArrayStringEnumDefault() { + return arrayStringEnumDefault; + } + + + @JsonProperty(JSON_PROPERTY_ARRAY_STRING_ENUM_DEFAULT) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setArrayStringEnumDefault(List arrayStringEnumDefault) { + this.arrayStringEnumDefault = arrayStringEnumDefault; + } + + + public DefaultValue arrayStringDefault(List arrayStringDefault) { + + this.arrayStringDefault = arrayStringDefault; + return this; + } + + public DefaultValue addArrayStringDefaultItem(String arrayStringDefaultItem) { + if (this.arrayStringDefault == null) { + this.arrayStringDefault = new ArrayList<>(Arrays.asList("failure", "skipped")); + } + this.arrayStringDefault.add(arrayStringDefaultItem); + return this; + } + + /** + * Get arrayStringDefault + * @return arrayStringDefault + **/ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ARRAY_STRING_DEFAULT) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public List getArrayStringDefault() { + return arrayStringDefault; + } + + + @JsonProperty(JSON_PROPERTY_ARRAY_STRING_DEFAULT) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setArrayStringDefault(List arrayStringDefault) { + this.arrayStringDefault = arrayStringDefault; + } + + + public DefaultValue arrayIntegerDefault(List arrayIntegerDefault) { + + this.arrayIntegerDefault = arrayIntegerDefault; + return this; + } + + public DefaultValue addArrayIntegerDefaultItem(Integer arrayIntegerDefaultItem) { + if (this.arrayIntegerDefault == null) { + this.arrayIntegerDefault = new ArrayList<>(Arrays.asList(1, 3)); + } + this.arrayIntegerDefault.add(arrayIntegerDefaultItem); + return this; + } + + /** + * Get arrayIntegerDefault + * @return arrayIntegerDefault + **/ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ARRAY_INTEGER_DEFAULT) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public List getArrayIntegerDefault() { + return arrayIntegerDefault; + } + + + @JsonProperty(JSON_PROPERTY_ARRAY_INTEGER_DEFAULT) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setArrayIntegerDefault(List arrayIntegerDefault) { + this.arrayIntegerDefault = arrayIntegerDefault; + } + + + public DefaultValue arrayString(List arrayString) { + + this.arrayString = arrayString; + return this; + } + + public DefaultValue addArrayStringItem(String arrayStringItem) { + if (this.arrayString == null) { + this.arrayString = new ArrayList<>(); + } + this.arrayString.add(arrayStringItem); + return this; + } + + /** + * Get arrayString + * @return arrayString + **/ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ARRAY_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public List getArrayString() { + return arrayString; + } + + + @JsonProperty(JSON_PROPERTY_ARRAY_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setArrayString(List arrayString) { + this.arrayString = arrayString; + } + + + public DefaultValue arrayStringNullable(List arrayStringNullable) { + this.arrayStringNullable = JsonNullable.>of(arrayStringNullable); + + return this; + } + + public DefaultValue addArrayStringNullableItem(String arrayStringNullableItem) { + if (this.arrayStringNullable == null || !this.arrayStringNullable.isPresent()) { + this.arrayStringNullable = JsonNullable.>of(null); + } + try { + this.arrayStringNullable.get().add(arrayStringNullableItem); + } catch (java.util.NoSuchElementException e) { + // this can never happen, as we make sure above that the value is present + } + return this; + } + + /** + * Get arrayStringNullable + * @return arrayStringNullable + **/ + @javax.annotation.Nullable + @JsonIgnore + + public List getArrayStringNullable() { + return arrayStringNullable.orElse(null); + } + + @JsonProperty(JSON_PROPERTY_ARRAY_STRING_NULLABLE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public JsonNullable> getArrayStringNullable_JsonNullable() { + return arrayStringNullable; + } + + @JsonProperty(JSON_PROPERTY_ARRAY_STRING_NULLABLE) + public void setArrayStringNullable_JsonNullable(JsonNullable> arrayStringNullable) { + this.arrayStringNullable = arrayStringNullable; + } + + public void setArrayStringNullable(List arrayStringNullable) { + this.arrayStringNullable = JsonNullable.>of(arrayStringNullable); + } + + + public DefaultValue stringNullable(String stringNullable) { + this.stringNullable = JsonNullable.of(stringNullable); + + return this; + } + + /** + * Get stringNullable + * @return stringNullable + **/ + @javax.annotation.Nullable + @JsonIgnore + + public String getStringNullable() { + return stringNullable.orElse(null); + } + + @JsonProperty(JSON_PROPERTY_STRING_NULLABLE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public JsonNullable getStringNullable_JsonNullable() { + return stringNullable; + } + + @JsonProperty(JSON_PROPERTY_STRING_NULLABLE) + public void setStringNullable_JsonNullable(JsonNullable stringNullable) { + this.stringNullable = stringNullable; + } + + public void setStringNullable(String stringNullable) { + this.stringNullable = JsonNullable.of(stringNullable); + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + DefaultValue defaultValue = (DefaultValue) o; + return Objects.equals(this.arrayStringEnumDefault, defaultValue.arrayStringEnumDefault) && + Objects.equals(this.arrayStringDefault, defaultValue.arrayStringDefault) && + Objects.equals(this.arrayIntegerDefault, defaultValue.arrayIntegerDefault) && + Objects.equals(this.arrayString, defaultValue.arrayString) && + equalsNullable(this.arrayStringNullable, defaultValue.arrayStringNullable) && + equalsNullable(this.stringNullable, defaultValue.stringNullable); + } + + 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(arrayStringEnumDefault, arrayStringDefault, arrayIntegerDefault, arrayString, hashCodeNullable(arrayStringNullable), hashCodeNullable(stringNullable)); + } + + 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 DefaultValue {\n"); + sb.append(" arrayStringEnumDefault: ").append(toIndentedString(arrayStringEnumDefault)).append("\n"); + sb.append(" arrayStringDefault: ").append(toIndentedString(arrayStringDefault)).append("\n"); + sb.append(" arrayIntegerDefault: ").append(toIndentedString(arrayIntegerDefault)).append("\n"); + sb.append(" arrayString: ").append(toIndentedString(arrayString)).append("\n"); + sb.append(" arrayStringNullable: ").append(toIndentedString(arrayStringNullable)).append("\n"); + sb.append(" stringNullable: ").append(toIndentedString(stringNullable)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + + /** + * Convert the instance into URL query string. + * + * @return URL query string + */ + public String toUrlQueryString() { + return toUrlQueryString(null); + } + + /** + * Convert the instance into URL query string. + * + * @param prefix prefix of the query string + * @return URL query string + */ + public String toUrlQueryString(String prefix) { + String suffix = ""; + String containerSuffix = ""; + String containerPrefix = ""; + if (prefix == null) { + // style=form, explode=true, e.g. /pet?name=cat&type=manx + prefix = ""; + } else { + // deepObject style e.g. /pet?id[name]=cat&id[type]=manx + prefix = prefix + "["; + suffix = "]"; + containerSuffix = "]"; + containerPrefix = "["; + } + + StringJoiner joiner = new StringJoiner("&"); + + // add `array_string_enum_default` to the URL query string + if (getArrayStringEnumDefault() != null) { + for (int i = 0; i < getArrayStringEnumDefault().size(); i++) { + try { + joiner.add(String.format("%sarray_string_enum_default%s%s=%s", prefix, suffix, + "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), + URLEncoder.encode(String.valueOf(getArrayStringEnumDefault().get(i)), "UTF-8").replaceAll("\\+", "%20"))); + } catch (UnsupportedEncodingException e) { + // Should never happen, UTF-8 is always supported + throw new RuntimeException(e); + } + } + } + + // add `array_string_default` to the URL query string + if (getArrayStringDefault() != null) { + for (int i = 0; i < getArrayStringDefault().size(); i++) { + try { + joiner.add(String.format("%sarray_string_default%s%s=%s", prefix, suffix, + "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), + URLEncoder.encode(String.valueOf(getArrayStringDefault().get(i)), "UTF-8").replaceAll("\\+", "%20"))); + } catch (UnsupportedEncodingException e) { + // Should never happen, UTF-8 is always supported + throw new RuntimeException(e); + } + } + } + + // add `array_integer_default` to the URL query string + if (getArrayIntegerDefault() != null) { + for (int i = 0; i < getArrayIntegerDefault().size(); i++) { + try { + joiner.add(String.format("%sarray_integer_default%s%s=%s", prefix, suffix, + "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), + URLEncoder.encode(String.valueOf(getArrayIntegerDefault().get(i)), "UTF-8").replaceAll("\\+", "%20"))); + } catch (UnsupportedEncodingException e) { + // Should never happen, UTF-8 is always supported + throw new RuntimeException(e); + } + } + } + + // add `array_string` to the URL query string + if (getArrayString() != null) { + for (int i = 0; i < getArrayString().size(); i++) { + try { + joiner.add(String.format("%sarray_string%s%s=%s", prefix, suffix, + "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), + URLEncoder.encode(String.valueOf(getArrayString().get(i)), "UTF-8").replaceAll("\\+", "%20"))); + } catch (UnsupportedEncodingException e) { + // Should never happen, UTF-8 is always supported + throw new RuntimeException(e); + } + } + } + + // add `array_string_nullable` to the URL query string + if (getArrayStringNullable() != null) { + for (int i = 0; i < getArrayStringNullable().size(); i++) { + try { + joiner.add(String.format("%sarray_string_nullable%s%s=%s", prefix, suffix, + "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), + URLEncoder.encode(String.valueOf(getArrayStringNullable().get(i)), "UTF-8").replaceAll("\\+", "%20"))); + } catch (UnsupportedEncodingException e) { + // Should never happen, UTF-8 is always supported + throw new RuntimeException(e); + } + } + } + + // add `string_nullable` to the URL query string + if (getStringNullable() != null) { + try { + joiner.add(String.format("%sstring_nullable%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getStringNullable()), "UTF-8").replaceAll("\\+", "%20"))); + } catch (UnsupportedEncodingException e) { + // Should never happen, UTF-8 is always supported + throw new RuntimeException(e); + } + } + + return joiner.toString(); + } + +} + diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java index dbdb5ed4472d..ffb0408d05b2 100644 --- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java @@ -56,7 +56,7 @@ public class Pet { private List photoUrls = new ArrayList<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Query.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Query.java index 69afb02eb4cf..fc8dbda1c66f 100644 --- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Query.java +++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Query.java @@ -78,7 +78,7 @@ public static OutcomesEnum fromValue(String value) { } public static final String JSON_PROPERTY_OUTCOMES = "outcomes"; - private List outcomes = null; + private List outcomes = new ArrayList<>(Arrays.asList(OutcomesEnum.SUCCESS, OutcomesEnum.FAILURE)); public Query() { } @@ -117,7 +117,7 @@ public Query outcomes(List outcomes) { public Query addOutcomesItem(OutcomesEnum outcomesItem) { if (this.outcomes == null) { - this.outcomes = new ArrayList<>(); + this.outcomes = new ArrayList<>(Arrays.asList(OutcomesEnum.SUCCESS, OutcomesEnum.FAILURE)); } this.outcomes.add(outcomesItem); return this; diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java index c62cd859c369..0e5bfd5253aa 100644 --- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java +++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java @@ -38,7 +38,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter { public static final String JSON_PROPERTY_VALUES = "values"; - private List values = null; + private List values = new ArrayList<>(); public TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter() { } diff --git a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/CustomTest.java b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/CustomTest.java index b76e3601e328..97114ea98365 100644 --- a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/CustomTest.java +++ b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/CustomTest.java @@ -13,6 +13,7 @@ package org.openapitools.client; +import com.fasterxml.jackson.core.type.TypeReference; import org.junit.Assert; import org.openapitools.client.ApiException; import org.openapitools.client.api.*; @@ -20,6 +21,7 @@ import org.junit.Test; import org.junit.Ignore; +import java.io.IOException; import java.util.*; @@ -138,4 +140,106 @@ public void testQueryIntegerBooleanString() throws ApiException { Assert.assertEquals("/query/integer/boolean/string?integer_query=1&boolean_query=true&string_query=Hello%20World", p.path); } + @Test + public void testArrayDefaultValues() { + // test array default values + DefaultValue d = new DefaultValue(); + Assert.assertEquals(d.getArrayStringEnumDefault().size(), 2); + Assert.assertEquals(d.getArrayStringEnumDefault().get(0), DefaultValue.ArrayStringEnumDefaultEnum.SUCCESS); + Assert.assertEquals(d.getArrayStringEnumDefault().get(1), DefaultValue.ArrayStringEnumDefaultEnum.FAILURE); + + Assert.assertEquals(d.getArrayStringDefault().size(), 2); + Assert.assertEquals(d.getArrayStringDefault().get(0), "failure"); + Assert.assertEquals(d.getArrayStringDefault().get(1), "skipped"); + + Assert.assertEquals(d.getArrayIntegerDefault().size(), 2); + Assert.assertEquals(d.getArrayIntegerDefault().get(0), Integer.valueOf(1)); + Assert.assertEquals(d.getArrayIntegerDefault().get(1), Integer.valueOf(3)); + + Assert.assertNull(d.getArrayStringNullable()); + Assert.assertEquals(d.getArrayString().size(), 0); + + // test addItem + d.addArrayStringEnumDefaultItem(DefaultValue.ArrayStringEnumDefaultEnum.UNCLASSIFIED); + Assert.assertEquals(d.getArrayStringEnumDefault().size(), 3); + Assert.assertEquals(d.getArrayStringEnumDefault().get(2), DefaultValue.ArrayStringEnumDefaultEnum.UNCLASSIFIED); + + d.addArrayStringDefaultItem("new item"); + Assert.assertEquals(d.getArrayStringDefault().size(), 3); + Assert.assertEquals(d.getArrayStringDefault().get(2), "new item"); + + d.addArrayIntegerDefaultItem(5); + Assert.assertEquals(d.getArrayIntegerDefault().size(), 3); + Assert.assertEquals(d.getArrayIntegerDefault().get(2), Integer.valueOf(5)); + + } + + @Test + public void testDefaultValuesSerializationWithEmptyPayload() throws IOException { + ApiClient apiClient = new ApiClient(); + + String str = "{}"; + + DefaultValue d = apiClient.getObjectMapper().readValue(str, new TypeReference() { + }); + + Assert.assertEquals(d.getArrayStringEnumDefault().size(), 2); + Assert.assertEquals(d.getArrayStringEnumDefault().get(0), DefaultValue.ArrayStringEnumDefaultEnum.SUCCESS); + Assert.assertEquals(d.getArrayStringEnumDefault().get(1), DefaultValue.ArrayStringEnumDefaultEnum.FAILURE); + + Assert.assertEquals(d.getArrayStringDefault().size(), 2); + Assert.assertEquals(d.getArrayStringDefault().get(0), "failure"); + Assert.assertEquals(d.getArrayStringDefault().get(1), "skipped"); + + Assert.assertEquals(d.getArrayIntegerDefault().size(), 2); + Assert.assertEquals(d.getArrayIntegerDefault().get(0), Integer.valueOf(1)); + Assert.assertEquals(d.getArrayIntegerDefault().get(1), Integer.valueOf(3)); + + Assert.assertNull(d.getArrayStringNullable()); + Assert.assertEquals(d.getArrayString().size(), 0); + + Assert.assertEquals(apiClient.getObjectMapper().writeValueAsString(d), "{\"array_string_enum_default\":[\"success\",\"failure\"],\"array_string_default\":[\"failure\",\"skipped\"],\"array_integer_default\":[1,3],\"array_string\":[],\"array_string_nullable\":{\"present\":false},\"string_nullable\":{\"present\":false}}"); + } + + @Test + public void testDefaultValuesSerializationWithJSONString() throws IOException { + ApiClient apiClient = new ApiClient(); + + String str = "{ \"array_string_enum_default\": [\"unclassified\"], \"array_string_default\": [\"failure\"] }"; + + DefaultValue d = apiClient.getObjectMapper().readValue(str, new TypeReference() { + }); + + Assert.assertEquals(d.getArrayStringEnumDefault().size(), 1); + Assert.assertEquals(d.getArrayStringEnumDefault().get(0), DefaultValue.ArrayStringEnumDefaultEnum.UNCLASSIFIED); + + Assert.assertEquals(d.getArrayStringDefault().size(), 1); + Assert.assertEquals(d.getArrayStringDefault().get(0), "failure"); + + Assert.assertEquals(d.getArrayIntegerDefault().size(), 2); + Assert.assertEquals(d.getArrayIntegerDefault().get(0), Integer.valueOf(1)); + Assert.assertEquals(d.getArrayIntegerDefault().get(1), Integer.valueOf(3)); + + Assert.assertNull(d.getArrayStringNullable()); + Assert.assertEquals(d.getArrayString().size(), 0); + + Assert.assertEquals(apiClient.getObjectMapper().writeValueAsString(d), "{\"array_string_enum_default\":[\"unclassified\"],\"array_string_default\":[\"failure\"],\"array_integer_default\":[1,3],\"array_string\":[],\"array_string_nullable\":{\"present\":false},\"string_nullable\":{\"present\":false}}"); + } + + @Test + public void testDefaultValuesSerializationWithIncorrectDefaultValues() throws IOException { + ApiClient apiClient = new ApiClient(); + + String str = "{ \"array_string_enum_default\": [\"invalid\"] }"; + + try { + DefaultValue d = apiClient.getObjectMapper().readValue(str, new TypeReference() { + }); + Assert.assertTrue(false); // the test should not reach this line + } catch (com.fasterxml.jackson.databind.exc.ValueInstantiationException e) { + Assert.assertEquals(e.getMessage(), "Cannot construct instance of `org.openapitools.client.model.DefaultValue$ArrayStringEnumDefaultEnum`, problem: Unexpected value 'invalid'\n" + + " at [Source: (String)\"{ \"array_string_enum_default\": [\"invalid\"] }\"; line: 1, column: 33] (through reference chain: org.openapitools.client.model.DefaultValue[\"array_string_enum_default\"]->java.util.ArrayList[0])"); + } + } + } diff --git a/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/DefaultValueTest.java b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/DefaultValueTest.java new file mode 100644 index 000000000000..8adf113d6ea2 --- /dev/null +++ b/samples/client/echo_api/java/apache-httpclient/src/test/java/org/openapitools/client/model/DefaultValueTest.java @@ -0,0 +1,94 @@ +/* + * Echo Server API + * Echo Server API + * + * The version of the OpenAPI document: 0.1.0 + * Contact: team@openapitools.org + * + * 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.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.util.ArrayList; +import java.util.List; +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.Assert; +import org.junit.Ignore; +import org.junit.Test; + + +/** + * Model tests for DefaultValue + */ +public class DefaultValueTest { + private final DefaultValue model = new DefaultValue(); + + /** + * Model tests for DefaultValue + */ + @Test + public void testDefaultValue() { + // TODO: test DefaultValue + } + + /** + * Test the property 'arrayStringEnumDefault' + */ + @Test + public void arrayStringEnumDefaultTest() { + // TODO: test arrayStringEnumDefault + } + + /** + * Test the property 'arrayStringDefault' + */ + @Test + public void arrayStringDefaultTest() { + // TODO: test arrayStringDefault + } + + /** + * Test the property 'arrayIntegerDefault' + */ + @Test + public void arrayIntegerDefaultTest() { + // TODO: test arrayIntegerDefault + } + + /** + * Test the property 'arrayString' + */ + @Test + public void arrayStringTest() { + // TODO: test arrayString + } + + /** + * Test the property 'arrayStringNullable' + */ + @Test + public void arrayStringNullableTest() { + // TODO: test arrayStringNullable + } + + /** + * Test the property 'stringNullable' + */ + @Test + public void stringNullableTest() { + // TODO: test stringNullable + } + +} diff --git a/samples/client/echo_api/java/feign-gson/.openapi-generator/FILES b/samples/client/echo_api/java/feign-gson/.openapi-generator/FILES index 7a45316b5660..ccc1a3dbfd0b 100644 --- a/samples/client/echo_api/java/feign-gson/.openapi-generator/FILES +++ b/samples/client/echo_api/java/feign-gson/.openapi-generator/FILES @@ -30,6 +30,7 @@ src/main/java/org/openapitools/client/model/Bird.java src/main/java/org/openapitools/client/model/Category.java src/main/java/org/openapitools/client/model/DataQuery.java src/main/java/org/openapitools/client/model/DataQueryAllOf.java +src/main/java/org/openapitools/client/model/DefaultValue.java src/main/java/org/openapitools/client/model/Pet.java src/main/java/org/openapitools/client/model/Query.java src/main/java/org/openapitools/client/model/Tag.java diff --git a/samples/client/echo_api/java/feign-gson/api/openapi.yaml b/samples/client/echo_api/java/feign-gson/api/openapi.yaml index 3fc6ac3d6c89..44b2b84e6e2a 100644 --- a/samples/client/echo_api/java/feign-gson/api/openapi.yaml +++ b/samples/client/echo_api/java/feign-gson/api/openapi.yaml @@ -301,6 +301,47 @@ components: type: object xml: name: pet + DefaultValue: + description: to test the default value of properties + properties: + array_string_enum_default: + default: + - success + - failure + items: + enum: + - success + - failure + - unclassified + type: string + type: array + array_string_default: + default: + - failure + - skipped + items: + type: string + type: array + array_integer_default: + default: + - 1 + - 3 + items: + type: integer + type: array + array_string: + items: + type: string + type: array + array_string_nullable: + items: + type: string + nullable: true + type: array + string_nullable: + nullable: true + type: string + type: object Bird: properties: size: diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DefaultValue.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DefaultValue.java new file mode 100644 index 000000000000..192754a61bd5 --- /dev/null +++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DefaultValue.java @@ -0,0 +1,340 @@ +/* + * Echo Server API + * Echo Server API + * + * The version of the OpenAPI document: 0.1.0 + * Contact: team@openapitools.org + * + * 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.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import org.openapitools.jackson.nullable.JsonNullable; + +/** + * to test the default value of properties + */ +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +public class DefaultValue { + /** + * Gets or Sets arrayStringEnumDefault + */ + @JsonAdapter(ArrayStringEnumDefaultEnum.Adapter.class) + public enum ArrayStringEnumDefaultEnum { + SUCCESS("success"), + + FAILURE("failure"), + + UNCLASSIFIED("unclassified"); + + private String value; + + ArrayStringEnumDefaultEnum(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + public static ArrayStringEnumDefaultEnum fromValue(String value) { + for (ArrayStringEnumDefaultEnum b : ArrayStringEnumDefaultEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + + public static class Adapter extends TypeAdapter { + @Override + public void write(final JsonWriter jsonWriter, final ArrayStringEnumDefaultEnum enumeration) throws IOException { + jsonWriter.value(enumeration.getValue()); + } + + @Override + public ArrayStringEnumDefaultEnum read(final JsonReader jsonReader) throws IOException { + String value = jsonReader.nextString(); + return ArrayStringEnumDefaultEnum.fromValue(value); + } + } + } + + public static final String SERIALIZED_NAME_ARRAY_STRING_ENUM_DEFAULT = "array_string_enum_default"; + @SerializedName(SERIALIZED_NAME_ARRAY_STRING_ENUM_DEFAULT) + private List arrayStringEnumDefault = new ArrayList<>(Arrays.asList(ArrayStringEnumDefaultEnum.SUCCESS, ArrayStringEnumDefaultEnum.FAILURE)); + + public static final String SERIALIZED_NAME_ARRAY_STRING_DEFAULT = "array_string_default"; + @SerializedName(SERIALIZED_NAME_ARRAY_STRING_DEFAULT) + private List arrayStringDefault = new ArrayList<>(Arrays.asList("failure", "skipped")); + + public static final String SERIALIZED_NAME_ARRAY_INTEGER_DEFAULT = "array_integer_default"; + @SerializedName(SERIALIZED_NAME_ARRAY_INTEGER_DEFAULT) + private List arrayIntegerDefault = new ArrayList<>(Arrays.asList(1, 3)); + + public static final String SERIALIZED_NAME_ARRAY_STRING = "array_string"; + @SerializedName(SERIALIZED_NAME_ARRAY_STRING) + private List arrayString = new ArrayList<>(); + + public static final String SERIALIZED_NAME_ARRAY_STRING_NULLABLE = "array_string_nullable"; + @SerializedName(SERIALIZED_NAME_ARRAY_STRING_NULLABLE) + private List arrayStringNullable = null; + + public static final String SERIALIZED_NAME_STRING_NULLABLE = "string_nullable"; + @SerializedName(SERIALIZED_NAME_STRING_NULLABLE) + private String stringNullable; + + public DefaultValue() { + } + + public DefaultValue arrayStringEnumDefault(List arrayStringEnumDefault) { + + this.arrayStringEnumDefault = arrayStringEnumDefault; + return this; + } + + public DefaultValue addArrayStringEnumDefaultItem(ArrayStringEnumDefaultEnum arrayStringEnumDefaultItem) { + if (this.arrayStringEnumDefault == null) { + this.arrayStringEnumDefault = new ArrayList<>(Arrays.asList(ArrayStringEnumDefaultEnum.SUCCESS, ArrayStringEnumDefaultEnum.FAILURE)); + } + this.arrayStringEnumDefault.add(arrayStringEnumDefaultItem); + return this; + } + + /** + * Get arrayStringEnumDefault + * @return arrayStringEnumDefault + **/ + @javax.annotation.Nullable + + public List getArrayStringEnumDefault() { + return arrayStringEnumDefault; + } + + + public void setArrayStringEnumDefault(List arrayStringEnumDefault) { + this.arrayStringEnumDefault = arrayStringEnumDefault; + } + + + public DefaultValue arrayStringDefault(List arrayStringDefault) { + + this.arrayStringDefault = arrayStringDefault; + return this; + } + + public DefaultValue addArrayStringDefaultItem(String arrayStringDefaultItem) { + if (this.arrayStringDefault == null) { + this.arrayStringDefault = new ArrayList<>(Arrays.asList("failure", "skipped")); + } + this.arrayStringDefault.add(arrayStringDefaultItem); + return this; + } + + /** + * Get arrayStringDefault + * @return arrayStringDefault + **/ + @javax.annotation.Nullable + + public List getArrayStringDefault() { + return arrayStringDefault; + } + + + public void setArrayStringDefault(List arrayStringDefault) { + this.arrayStringDefault = arrayStringDefault; + } + + + public DefaultValue arrayIntegerDefault(List arrayIntegerDefault) { + + this.arrayIntegerDefault = arrayIntegerDefault; + return this; + } + + public DefaultValue addArrayIntegerDefaultItem(Integer arrayIntegerDefaultItem) { + if (this.arrayIntegerDefault == null) { + this.arrayIntegerDefault = new ArrayList<>(Arrays.asList(1, 3)); + } + this.arrayIntegerDefault.add(arrayIntegerDefaultItem); + return this; + } + + /** + * Get arrayIntegerDefault + * @return arrayIntegerDefault + **/ + @javax.annotation.Nullable + + public List getArrayIntegerDefault() { + return arrayIntegerDefault; + } + + + public void setArrayIntegerDefault(List arrayIntegerDefault) { + this.arrayIntegerDefault = arrayIntegerDefault; + } + + + public DefaultValue arrayString(List arrayString) { + + this.arrayString = arrayString; + return this; + } + + public DefaultValue addArrayStringItem(String arrayStringItem) { + if (this.arrayString == null) { + this.arrayString = new ArrayList<>(); + } + this.arrayString.add(arrayStringItem); + return this; + } + + /** + * Get arrayString + * @return arrayString + **/ + @javax.annotation.Nullable + + public List getArrayString() { + return arrayString; + } + + + public void setArrayString(List arrayString) { + this.arrayString = arrayString; + } + + + public DefaultValue arrayStringNullable(List arrayStringNullable) { + + this.arrayStringNullable = arrayStringNullable; + return this; + } + + public DefaultValue addArrayStringNullableItem(String arrayStringNullableItem) { + if (this.arrayStringNullable == null) { + this.arrayStringNullable = null; + } + this.arrayStringNullable.add(arrayStringNullableItem); + return this; + } + + /** + * Get arrayStringNullable + * @return arrayStringNullable + **/ + @javax.annotation.Nullable + + public List getArrayStringNullable() { + return arrayStringNullable; + } + + + public void setArrayStringNullable(List arrayStringNullable) { + this.arrayStringNullable = arrayStringNullable; + } + + + public DefaultValue stringNullable(String stringNullable) { + + this.stringNullable = stringNullable; + return this; + } + + /** + * Get stringNullable + * @return stringNullable + **/ + @javax.annotation.Nullable + + public String getStringNullable() { + return stringNullable; + } + + + public void setStringNullable(String stringNullable) { + this.stringNullable = stringNullable; + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + DefaultValue defaultValue = (DefaultValue) o; + return Objects.equals(this.arrayStringEnumDefault, defaultValue.arrayStringEnumDefault) && + Objects.equals(this.arrayStringDefault, defaultValue.arrayStringDefault) && + Objects.equals(this.arrayIntegerDefault, defaultValue.arrayIntegerDefault) && + Objects.equals(this.arrayString, defaultValue.arrayString) && + Objects.equals(this.arrayStringNullable, defaultValue.arrayStringNullable) && + Objects.equals(this.stringNullable, defaultValue.stringNullable); + } + + 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(arrayStringEnumDefault, arrayStringDefault, arrayIntegerDefault, arrayString, arrayStringNullable, stringNullable); + } + + 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 DefaultValue {\n"); + sb.append(" arrayStringEnumDefault: ").append(toIndentedString(arrayStringEnumDefault)).append("\n"); + sb.append(" arrayStringDefault: ").append(toIndentedString(arrayStringDefault)).append("\n"); + sb.append(" arrayIntegerDefault: ").append(toIndentedString(arrayIntegerDefault)).append("\n"); + sb.append(" arrayString: ").append(toIndentedString(arrayString)).append("\n"); + sb.append(" arrayStringNullable: ").append(toIndentedString(arrayStringNullable)).append("\n"); + sb.append(" stringNullable: ").append(toIndentedString(stringNullable)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Pet.java index 0f511d550b7c..23b255c290d0 100644 --- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Pet.java @@ -49,7 +49,7 @@ public class Pet { public static final String SERIALIZED_NAME_TAGS = "tags"; @SerializedName(SERIALIZED_NAME_TAGS) - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Query.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Query.java index ee7c8929fe78..a8e911881cc6 100644 --- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Query.java +++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Query.java @@ -84,7 +84,7 @@ public OutcomesEnum read(final JsonReader jsonReader) throws IOException { public static final String SERIALIZED_NAME_OUTCOMES = "outcomes"; @SerializedName(SERIALIZED_NAME_OUTCOMES) - private List outcomes = null; + private List outcomes = new ArrayList<>(Arrays.asList(OutcomesEnum.SUCCESS, OutcomesEnum.FAILURE)); public Query() { } @@ -119,7 +119,7 @@ public Query outcomes(List outcomes) { public Query addOutcomesItem(OutcomesEnum outcomesItem) { if (this.outcomes == null) { - this.outcomes = new ArrayList<>(); + this.outcomes = new ArrayList<>(Arrays.asList(OutcomesEnum.SUCCESS, OutcomesEnum.FAILURE)); } this.outcomes.add(outcomesItem); return this; diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java index 433e40e13764..845aab854230 100644 --- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java +++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java @@ -31,7 +31,7 @@ public class TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter { public static final String SERIALIZED_NAME_VALUES = "values"; @SerializedName(SERIALIZED_NAME_VALUES) - private List values = null; + private List values = new ArrayList<>(); public TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter() { } diff --git a/samples/client/echo_api/java/feign-gson/src/test/java/org/openapitools/client/model/DefaultValueTest.java b/samples/client/echo_api/java/feign-gson/src/test/java/org/openapitools/client/model/DefaultValueTest.java new file mode 100644 index 000000000000..b5f523bde621 --- /dev/null +++ b/samples/client/echo_api/java/feign-gson/src/test/java/org/openapitools/client/model/DefaultValueTest.java @@ -0,0 +1,90 @@ +/* + * Echo Server API + * Echo Server API + * + * The version of the OpenAPI document: 0.1.0 + * Contact: team@openapitools.org + * + * 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.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import org.openapitools.jackson.nullable.JsonNullable; +import org.junit.jupiter.api.Test; + + +/** + * Model tests for DefaultValue + */ +class DefaultValueTest { + private final DefaultValue model = new DefaultValue(); + + /** + * Model tests for DefaultValue + */ + @Test + void testDefaultValue() { + // TODO: test DefaultValue + } + + /** + * Test the property 'arrayStringEnumDefault' + */ + @Test + void arrayStringEnumDefaultTest() { + // TODO: test arrayStringEnumDefault + } + + /** + * Test the property 'arrayStringDefault' + */ + @Test + void arrayStringDefaultTest() { + // TODO: test arrayStringDefault + } + + /** + * Test the property 'arrayIntegerDefault' + */ + @Test + void arrayIntegerDefaultTest() { + // TODO: test arrayIntegerDefault + } + + /** + * Test the property 'arrayString' + */ + @Test + void arrayStringTest() { + // TODO: test arrayString + } + + /** + * Test the property 'arrayStringNullable' + */ + @Test + void arrayStringNullableTest() { + // TODO: test arrayStringNullable + } + + /** + * Test the property 'stringNullable' + */ + @Test + void stringNullableTest() { + // TODO: test stringNullable + } + +} diff --git a/samples/client/echo_api/java/native/.openapi-generator/FILES b/samples/client/echo_api/java/native/.openapi-generator/FILES index 90a697b6ff22..39773914b69f 100644 --- a/samples/client/echo_api/java/native/.openapi-generator/FILES +++ b/samples/client/echo_api/java/native/.openapi-generator/FILES @@ -10,6 +10,7 @@ docs/BodyApi.md docs/Category.md docs/DataQuery.md docs/DataQueryAllOf.md +docs/DefaultValue.md docs/PathApi.md docs/Pet.md docs/Query.md @@ -43,6 +44,7 @@ src/main/java/org/openapitools/client/model/Bird.java src/main/java/org/openapitools/client/model/Category.java src/main/java/org/openapitools/client/model/DataQuery.java src/main/java/org/openapitools/client/model/DataQueryAllOf.java +src/main/java/org/openapitools/client/model/DefaultValue.java src/main/java/org/openapitools/client/model/Pet.java src/main/java/org/openapitools/client/model/Query.java src/main/java/org/openapitools/client/model/Tag.java diff --git a/samples/client/echo_api/java/native/README.md b/samples/client/echo_api/java/native/README.md index 55864e1c18db..2a3b7e52c758 100644 --- a/samples/client/echo_api/java/native/README.md +++ b/samples/client/echo_api/java/native/README.md @@ -129,6 +129,7 @@ Class | Method | HTTP request | Description - [Category](docs/Category.md) - [DataQuery](docs/DataQuery.md) - [DataQueryAllOf](docs/DataQueryAllOf.md) + - [DefaultValue](docs/DefaultValue.md) - [Pet](docs/Pet.md) - [Query](docs/Query.md) - [Tag](docs/Tag.md) diff --git a/samples/client/echo_api/java/native/api/openapi.yaml b/samples/client/echo_api/java/native/api/openapi.yaml index 3fc6ac3d6c89..44b2b84e6e2a 100644 --- a/samples/client/echo_api/java/native/api/openapi.yaml +++ b/samples/client/echo_api/java/native/api/openapi.yaml @@ -301,6 +301,47 @@ components: type: object xml: name: pet + DefaultValue: + description: to test the default value of properties + properties: + array_string_enum_default: + default: + - success + - failure + items: + enum: + - success + - failure + - unclassified + type: string + type: array + array_string_default: + default: + - failure + - skipped + items: + type: string + type: array + array_integer_default: + default: + - 1 + - 3 + items: + type: integer + type: array + array_string: + items: + type: string + type: array + array_string_nullable: + items: + type: string + nullable: true + type: array + string_nullable: + nullable: true + type: string + type: object Bird: properties: size: diff --git a/samples/client/echo_api/java/native/docs/DefaultValue.md b/samples/client/echo_api/java/native/docs/DefaultValue.md new file mode 100644 index 000000000000..ea7323bc04d1 --- /dev/null +++ b/samples/client/echo_api/java/native/docs/DefaultValue.md @@ -0,0 +1,29 @@ + + +# DefaultValue + +to test the default value of properties + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**arrayStringEnumDefault** | [**List<ArrayStringEnumDefaultEnum>**](#List<ArrayStringEnumDefaultEnum>) | | [optional] | +|**arrayStringDefault** | **List<String>** | | [optional] | +|**arrayIntegerDefault** | **List<Integer>** | | [optional] | +|**arrayString** | **List<String>** | | [optional] | +|**arrayStringNullable** | **List<String>** | | [optional] | +|**stringNullable** | **String** | | [optional] | + + + +## Enum: List<ArrayStringEnumDefaultEnum> + +| Name | Value | +|---- | -----| +| SUCCESS | "success" | +| FAILURE | "failure" | +| UNCLASSIFIED | "unclassified" | + + + diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DefaultValue.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DefaultValue.java new file mode 100644 index 000000000000..4b8d34854ca8 --- /dev/null +++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DefaultValue.java @@ -0,0 +1,464 @@ +/* + * Echo Server API + * Echo Server API + * + * The version of the OpenAPI document: 0.1.0 + * Contact: team@openapitools.org + * + * 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.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.util.StringJoiner; +import java.util.Objects; +import java.util.Arrays; +import java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.util.ArrayList; +import java.util.List; +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; + + +/** + * to test the default value of properties + */ +@JsonPropertyOrder({ + DefaultValue.JSON_PROPERTY_ARRAY_STRING_ENUM_DEFAULT, + DefaultValue.JSON_PROPERTY_ARRAY_STRING_DEFAULT, + DefaultValue.JSON_PROPERTY_ARRAY_INTEGER_DEFAULT, + DefaultValue.JSON_PROPERTY_ARRAY_STRING, + DefaultValue.JSON_PROPERTY_ARRAY_STRING_NULLABLE, + DefaultValue.JSON_PROPERTY_STRING_NULLABLE +}) +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +public class DefaultValue { + /** + * Gets or Sets arrayStringEnumDefault + */ + public enum ArrayStringEnumDefaultEnum { + SUCCESS("success"), + + FAILURE("failure"), + + UNCLASSIFIED("unclassified"); + + private String value; + + ArrayStringEnumDefaultEnum(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static ArrayStringEnumDefaultEnum fromValue(String value) { + for (ArrayStringEnumDefaultEnum b : ArrayStringEnumDefaultEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + public static final String JSON_PROPERTY_ARRAY_STRING_ENUM_DEFAULT = "array_string_enum_default"; + private List arrayStringEnumDefault = new ArrayList<>(Arrays.asList(ArrayStringEnumDefaultEnum.SUCCESS, ArrayStringEnumDefaultEnum.FAILURE)); + + public static final String JSON_PROPERTY_ARRAY_STRING_DEFAULT = "array_string_default"; + private List arrayStringDefault = new ArrayList<>(Arrays.asList("failure", "skipped")); + + public static final String JSON_PROPERTY_ARRAY_INTEGER_DEFAULT = "array_integer_default"; + private List arrayIntegerDefault = new ArrayList<>(Arrays.asList(1, 3)); + + public static final String JSON_PROPERTY_ARRAY_STRING = "array_string"; + private List arrayString = new ArrayList<>(); + + public static final String JSON_PROPERTY_ARRAY_STRING_NULLABLE = "array_string_nullable"; + private JsonNullable> arrayStringNullable = JsonNullable.>undefined(); + + public static final String JSON_PROPERTY_STRING_NULLABLE = "string_nullable"; + private JsonNullable stringNullable = JsonNullable.undefined(); + + public DefaultValue() { + } + + public DefaultValue arrayStringEnumDefault(List arrayStringEnumDefault) { + this.arrayStringEnumDefault = arrayStringEnumDefault; + return this; + } + + public DefaultValue addArrayStringEnumDefaultItem(ArrayStringEnumDefaultEnum arrayStringEnumDefaultItem) { + if (this.arrayStringEnumDefault == null) { + this.arrayStringEnumDefault = new ArrayList<>(); + } + this.arrayStringEnumDefault.add(arrayStringEnumDefaultItem); + return this; + } + + /** + * Get arrayStringEnumDefault + * @return arrayStringEnumDefault + **/ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ARRAY_STRING_ENUM_DEFAULT) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public List getArrayStringEnumDefault() { + return arrayStringEnumDefault; + } + + + @JsonProperty(JSON_PROPERTY_ARRAY_STRING_ENUM_DEFAULT) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setArrayStringEnumDefault(List arrayStringEnumDefault) { + this.arrayStringEnumDefault = arrayStringEnumDefault; + } + + + public DefaultValue arrayStringDefault(List arrayStringDefault) { + this.arrayStringDefault = arrayStringDefault; + return this; + } + + public DefaultValue addArrayStringDefaultItem(String arrayStringDefaultItem) { + if (this.arrayStringDefault == null) { + this.arrayStringDefault = new ArrayList<>(); + } + this.arrayStringDefault.add(arrayStringDefaultItem); + return this; + } + + /** + * Get arrayStringDefault + * @return arrayStringDefault + **/ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ARRAY_STRING_DEFAULT) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public List getArrayStringDefault() { + return arrayStringDefault; + } + + + @JsonProperty(JSON_PROPERTY_ARRAY_STRING_DEFAULT) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setArrayStringDefault(List arrayStringDefault) { + this.arrayStringDefault = arrayStringDefault; + } + + + public DefaultValue arrayIntegerDefault(List arrayIntegerDefault) { + this.arrayIntegerDefault = arrayIntegerDefault; + return this; + } + + public DefaultValue addArrayIntegerDefaultItem(Integer arrayIntegerDefaultItem) { + if (this.arrayIntegerDefault == null) { + this.arrayIntegerDefault = new ArrayList<>(); + } + this.arrayIntegerDefault.add(arrayIntegerDefaultItem); + return this; + } + + /** + * Get arrayIntegerDefault + * @return arrayIntegerDefault + **/ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ARRAY_INTEGER_DEFAULT) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public List getArrayIntegerDefault() { + return arrayIntegerDefault; + } + + + @JsonProperty(JSON_PROPERTY_ARRAY_INTEGER_DEFAULT) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setArrayIntegerDefault(List arrayIntegerDefault) { + this.arrayIntegerDefault = arrayIntegerDefault; + } + + + public DefaultValue arrayString(List arrayString) { + this.arrayString = arrayString; + return this; + } + + public DefaultValue addArrayStringItem(String arrayStringItem) { + if (this.arrayString == null) { + this.arrayString = new ArrayList<>(); + } + this.arrayString.add(arrayStringItem); + return this; + } + + /** + * Get arrayString + * @return arrayString + **/ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ARRAY_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public List getArrayString() { + return arrayString; + } + + + @JsonProperty(JSON_PROPERTY_ARRAY_STRING) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setArrayString(List arrayString) { + this.arrayString = arrayString; + } + + + public DefaultValue arrayStringNullable(List arrayStringNullable) { + this.arrayStringNullable = JsonNullable.>of(arrayStringNullable); + return this; + } + + public DefaultValue addArrayStringNullableItem(String arrayStringNullableItem) { + if (this.arrayStringNullable == null || !this.arrayStringNullable.isPresent()) { + this.arrayStringNullable = JsonNullable.>of(null); + } + try { + this.arrayStringNullable.get().add(arrayStringNullableItem); + } catch (java.util.NoSuchElementException e) { + // this can never happen, as we make sure above that the value is present + } + return this; + } + + /** + * Get arrayStringNullable + * @return arrayStringNullable + **/ + @javax.annotation.Nullable + @JsonIgnore + + public List getArrayStringNullable() { + return arrayStringNullable.orElse(null); + } + + @JsonProperty(JSON_PROPERTY_ARRAY_STRING_NULLABLE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public JsonNullable> getArrayStringNullable_JsonNullable() { + return arrayStringNullable; + } + + @JsonProperty(JSON_PROPERTY_ARRAY_STRING_NULLABLE) + public void setArrayStringNullable_JsonNullable(JsonNullable> arrayStringNullable) { + this.arrayStringNullable = arrayStringNullable; + } + + public void setArrayStringNullable(List arrayStringNullable) { + this.arrayStringNullable = JsonNullable.>of(arrayStringNullable); + } + + + public DefaultValue stringNullable(String stringNullable) { + this.stringNullable = JsonNullable.of(stringNullable); + return this; + } + + /** + * Get stringNullable + * @return stringNullable + **/ + @javax.annotation.Nullable + @JsonIgnore + + public String getStringNullable() { + return stringNullable.orElse(null); + } + + @JsonProperty(JSON_PROPERTY_STRING_NULLABLE) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public JsonNullable getStringNullable_JsonNullable() { + return stringNullable; + } + + @JsonProperty(JSON_PROPERTY_STRING_NULLABLE) + public void setStringNullable_JsonNullable(JsonNullable stringNullable) { + this.stringNullable = stringNullable; + } + + public void setStringNullable(String stringNullable) { + this.stringNullable = JsonNullable.of(stringNullable); + } + + + /** + * Return true if this DefaultValue object is equal to o. + */ + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + DefaultValue defaultValue = (DefaultValue) o; + return Objects.equals(this.arrayStringEnumDefault, defaultValue.arrayStringEnumDefault) && + Objects.equals(this.arrayStringDefault, defaultValue.arrayStringDefault) && + Objects.equals(this.arrayIntegerDefault, defaultValue.arrayIntegerDefault) && + Objects.equals(this.arrayString, defaultValue.arrayString) && + equalsNullable(this.arrayStringNullable, defaultValue.arrayStringNullable) && + equalsNullable(this.stringNullable, defaultValue.stringNullable); + } + + 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(arrayStringEnumDefault, arrayStringDefault, arrayIntegerDefault, arrayString, hashCodeNullable(arrayStringNullable), hashCodeNullable(stringNullable)); + } + + 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 DefaultValue {\n"); + sb.append(" arrayStringEnumDefault: ").append(toIndentedString(arrayStringEnumDefault)).append("\n"); + sb.append(" arrayStringDefault: ").append(toIndentedString(arrayStringDefault)).append("\n"); + sb.append(" arrayIntegerDefault: ").append(toIndentedString(arrayIntegerDefault)).append("\n"); + sb.append(" arrayString: ").append(toIndentedString(arrayString)).append("\n"); + sb.append(" arrayStringNullable: ").append(toIndentedString(arrayStringNullable)).append("\n"); + sb.append(" stringNullable: ").append(toIndentedString(stringNullable)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + + /** + * Convert the instance into URL query string. + * + * @return URL query string + */ + public String toUrlQueryString() { + return toUrlQueryString(null); + } + + /** + * Convert the instance into URL query string. + * + * @param prefix prefix of the query string + * @return URL query string + */ + public String toUrlQueryString(String prefix) { + String suffix = ""; + String containerSuffix = ""; + String containerPrefix = ""; + if (prefix == null) { + // style=form, explode=true, e.g. /pet?name=cat&type=manx + prefix = ""; + } else { + // deepObject style e.g. /pet?id[name]=cat&id[type]=manx + prefix = prefix + "["; + suffix = "]"; + containerSuffix = "]"; + containerPrefix = "["; + } + + StringJoiner joiner = new StringJoiner("&"); + + // add `array_string_enum_default` to the URL query string + if (getArrayStringEnumDefault() != null) { + for (int i = 0; i < getArrayStringEnumDefault().size(); i++) { + joiner.add(String.format("%sarray_string_enum_default%s%s=%s", prefix, suffix, + "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), + URLEncoder.encode(String.valueOf(getArrayStringEnumDefault().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + } + } + + // add `array_string_default` to the URL query string + if (getArrayStringDefault() != null) { + for (int i = 0; i < getArrayStringDefault().size(); i++) { + joiner.add(String.format("%sarray_string_default%s%s=%s", prefix, suffix, + "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), + URLEncoder.encode(String.valueOf(getArrayStringDefault().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + } + } + + // add `array_integer_default` to the URL query string + if (getArrayIntegerDefault() != null) { + for (int i = 0; i < getArrayIntegerDefault().size(); i++) { + joiner.add(String.format("%sarray_integer_default%s%s=%s", prefix, suffix, + "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), + URLEncoder.encode(String.valueOf(getArrayIntegerDefault().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + } + } + + // add `array_string` to the URL query string + if (getArrayString() != null) { + for (int i = 0; i < getArrayString().size(); i++) { + joiner.add(String.format("%sarray_string%s%s=%s", prefix, suffix, + "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), + URLEncoder.encode(String.valueOf(getArrayString().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + } + } + + // add `array_string_nullable` to the URL query string + if (getArrayStringNullable() != null) { + for (int i = 0; i < getArrayStringNullable().size(); i++) { + joiner.add(String.format("%sarray_string_nullable%s%s=%s", prefix, suffix, + "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, i, containerSuffix), + URLEncoder.encode(String.valueOf(getArrayStringNullable().get(i)), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + } + } + + // add `string_nullable` to the URL query string + if (getStringNullable() != null) { + joiner.add(String.format("%sstring_nullable%s=%s", prefix, suffix, URLEncoder.encode(String.valueOf(getStringNullable()), StandardCharsets.UTF_8).replaceAll("\\+", "%20"))); + } + + return joiner.toString(); + } +} + diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Pet.java index 5e38df45aafa..9eab225992f6 100644 --- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Pet.java @@ -58,7 +58,7 @@ public class Pet { private List photoUrls = new ArrayList<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Query.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Query.java index 287716592f39..8e9d339067ae 100644 --- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Query.java +++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Query.java @@ -80,7 +80,7 @@ public static OutcomesEnum fromValue(String value) { } public static final String JSON_PROPERTY_OUTCOMES = "outcomes"; - private List outcomes = null; + private List outcomes = new ArrayList<>(Arrays.asList(OutcomesEnum.SUCCESS, OutcomesEnum.FAILURE)); public Query() { } diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java index efeaf3133ccf..bede74ea0ea0 100644 --- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java +++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java @@ -39,7 +39,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter { public static final String JSON_PROPERTY_VALUES = "values"; - private List values = null; + private List values = new ArrayList<>(); public TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter() { } diff --git a/samples/client/echo_api/java/native/src/test/java/org/openapitools/client/CustomTest.java b/samples/client/echo_api/java/native/src/test/java/org/openapitools/client/CustomTest.java index 1c6db656c4fd..58b55d72c810 100644 --- a/samples/client/echo_api/java/native/src/test/java/org/openapitools/client/CustomTest.java +++ b/samples/client/echo_api/java/native/src/test/java/org/openapitools/client/CustomTest.java @@ -13,6 +13,7 @@ package org.openapitools.client; +import com.fasterxml.jackson.core.type.TypeReference; import org.junit.Assert; import org.openapitools.client.ApiException; import org.openapitools.client.api.*; @@ -20,9 +21,9 @@ import org.junit.Test; import org.junit.Ignore; +import java.io.IOException; import java.util.*; - /** * API tests for QueryApi */ @@ -143,4 +144,105 @@ public void testQueryStyleFormExplodeTrueArrayString() throws ApiException { org.openapitools.client.EchoServerResponseParser p = new org.openapitools.client.EchoServerResponseParser(response); Assert.assertEquals("/query/style_form/explode_true/array_string?values=hello%20world%201&values=hello%20world%202", p.path); } + + @Test + public void testArrayDefaultValues() { + // test array default values + DefaultValue d = new DefaultValue(); + Assert.assertEquals(d.getArrayStringEnumDefault().size(), 2); + Assert.assertEquals(d.getArrayStringEnumDefault().get(0), DefaultValue.ArrayStringEnumDefaultEnum.SUCCESS); + Assert.assertEquals(d.getArrayStringEnumDefault().get(1), DefaultValue.ArrayStringEnumDefaultEnum.FAILURE); + + Assert.assertEquals(d.getArrayStringDefault().size(), 2); + Assert.assertEquals(d.getArrayStringDefault().get(0), "failure"); + Assert.assertEquals(d.getArrayStringDefault().get(1), "skipped"); + + Assert.assertEquals(d.getArrayIntegerDefault().size(), 2); + Assert.assertEquals(d.getArrayIntegerDefault().get(0), Integer.valueOf(1)); + Assert.assertEquals(d.getArrayIntegerDefault().get(1), Integer.valueOf(3)); + + Assert.assertNull(d.getArrayStringNullable()); + Assert.assertEquals(d.getArrayString().size(), 0); + + // test addItem + d.addArrayStringEnumDefaultItem(DefaultValue.ArrayStringEnumDefaultEnum.UNCLASSIFIED); + Assert.assertEquals(d.getArrayStringEnumDefault().size(), 3); + Assert.assertEquals(d.getArrayStringEnumDefault().get(2), DefaultValue.ArrayStringEnumDefaultEnum.UNCLASSIFIED); + + d.addArrayStringDefaultItem("new item"); + Assert.assertEquals(d.getArrayStringDefault().size(), 3); + Assert.assertEquals(d.getArrayStringDefault().get(2), "new item"); + + d.addArrayIntegerDefaultItem(5); + Assert.assertEquals(d.getArrayIntegerDefault().size(), 3); + Assert.assertEquals(d.getArrayIntegerDefault().get(2), Integer.valueOf(5)); + } + + @Test + public void testDefaultValuesSerializationWithEmptyPayload() throws IOException { + ApiClient apiClient = new ApiClient(); + + String str = "{}"; + + DefaultValue d = apiClient.getObjectMapper().readValue(str, new TypeReference() { + }); + + Assert.assertEquals(d.getArrayStringEnumDefault().size(), 2); + Assert.assertEquals(d.getArrayStringEnumDefault().get(0), DefaultValue.ArrayStringEnumDefaultEnum.SUCCESS); + Assert.assertEquals(d.getArrayStringEnumDefault().get(1), DefaultValue.ArrayStringEnumDefaultEnum.FAILURE); + + Assert.assertEquals(d.getArrayStringDefault().size(), 2); + Assert.assertEquals(d.getArrayStringDefault().get(0), "failure"); + Assert.assertEquals(d.getArrayStringDefault().get(1), "skipped"); + + Assert.assertEquals(d.getArrayIntegerDefault().size(), 2); + Assert.assertEquals(d.getArrayIntegerDefault().get(0), Integer.valueOf(1)); + Assert.assertEquals(d.getArrayIntegerDefault().get(1), Integer.valueOf(3)); + + Assert.assertNull(d.getArrayStringNullable()); + Assert.assertEquals(d.getArrayString().size(), 0); + + Assert.assertEquals(apiClient.getObjectMapper().writeValueAsString(d), "{\"array_string_enum_default\":[\"success\",\"failure\"],\"array_string_default\":[\"failure\",\"skipped\"],\"array_integer_default\":[1,3],\"array_string\":[]}"); + } + + @Test + public void testDefaultValuesSerializationWithJSONString() throws IOException { + ApiClient apiClient = new ApiClient(); + + String str = "{ \"array_string_enum_default\": [\"unclassified\"], \"array_string_default\": [\"failure\"] }"; + + DefaultValue d = apiClient.getObjectMapper().readValue(str, new TypeReference() { + }); + + Assert.assertEquals(d.getArrayStringEnumDefault().size(), 1); + Assert.assertEquals(d.getArrayStringEnumDefault().get(0), DefaultValue.ArrayStringEnumDefaultEnum.UNCLASSIFIED); + + Assert.assertEquals(d.getArrayStringDefault().size(), 1); + Assert.assertEquals(d.getArrayStringDefault().get(0), "failure"); + + Assert.assertEquals(d.getArrayIntegerDefault().size(), 2); + Assert.assertEquals(d.getArrayIntegerDefault().get(0), Integer.valueOf(1)); + Assert.assertEquals(d.getArrayIntegerDefault().get(1), Integer.valueOf(3)); + + Assert.assertNull(d.getArrayStringNullable()); + Assert.assertEquals(d.getArrayString().size(), 0); + + Assert.assertEquals(apiClient.getObjectMapper().writeValueAsString(d), "{\"array_string_enum_default\":[\"unclassified\"],\"array_string_default\":[\"failure\"],\"array_integer_default\":[1,3],\"array_string\":[]}"); + } + + @Test + public void testDefaultValuesSerializationWithIncorrectDefaultValues() throws IOException { + ApiClient apiClient = new ApiClient(); + + String str = "{ \"array_string_enum_default\": [\"invalid\"] }"; + + try { + DefaultValue d = apiClient.getObjectMapper().readValue(str, new TypeReference() { + }); + Assert.assertTrue(false); // the test should not reach this line + } catch (com.fasterxml.jackson.databind.exc.ValueInstantiationException e) { + Assert.assertEquals(e.getMessage(), "Cannot construct instance of `org.openapitools.client.model.DefaultValue$ArrayStringEnumDefaultEnum`, problem: Unexpected value 'invalid'\n" + + " at [Source: (String)\"{ \"array_string_enum_default\": [\"invalid\"] }\"; line: 1, column: 33] (through reference chain: org.openapitools.client.model.DefaultValue[\"array_string_enum_default\"]->java.util.ArrayList[0])"); + } + } } diff --git a/samples/client/echo_api/java/native/src/test/java/org/openapitools/client/model/DefaultValueTest.java b/samples/client/echo_api/java/native/src/test/java/org/openapitools/client/model/DefaultValueTest.java new file mode 100644 index 000000000000..809a14bb008b --- /dev/null +++ b/samples/client/echo_api/java/native/src/test/java/org/openapitools/client/model/DefaultValueTest.java @@ -0,0 +1,86 @@ +/* + * Echo Server API + * Echo Server API + * + * The version of the OpenAPI document: 0.1.0 + * Contact: team@openapitools.org + * + * 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.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.util.ArrayList; +import java.util.List; +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.Assert; +import org.junit.Ignore; +import org.junit.Test; + + +/** + * Model tests for DefaultValue + */ +public class DefaultValueTest { + private final DefaultValue model = new DefaultValue(); + + /** + * Model tests for DefaultValue + */ + @Test + public void testDefaultValue() { + // TODO: test DefaultValue + } + + /** + * Test the property 'arrayStringEnumDefault' + */ + @Test + public void arrayStringEnumDefaultTest() { + // TODO: test arrayStringEnumDefault + } + + /** + * Test the property 'arrayStringDefault' + */ + @Test + public void arrayStringDefaultTest() { + // TODO: test arrayStringDefault + } + + /** + * Test the property 'arrayString' + */ + @Test + public void arrayStringTest() { + // TODO: test arrayString + } + + /** + * Test the property 'arrayStringNullable' + */ + @Test + public void arrayStringNullableTest() { + // TODO: test arrayStringNullable + } + + /** + * Test the property 'stringNullable' + */ + @Test + public void stringNullableTest() { + // TODO: test stringNullable + } + +} diff --git a/samples/client/echo_api/java/okhttp-gson/.openapi-generator/FILES b/samples/client/echo_api/java/okhttp-gson/.openapi-generator/FILES index 0492026a89c0..625d04321f93 100644 --- a/samples/client/echo_api/java/okhttp-gson/.openapi-generator/FILES +++ b/samples/client/echo_api/java/okhttp-gson/.openapi-generator/FILES @@ -10,6 +10,7 @@ docs/BodyApi.md docs/Category.md docs/DataQuery.md docs/DataQueryAllOf.md +docs/DefaultValue.md docs/PathApi.md docs/Pet.md docs/Query.md @@ -51,6 +52,7 @@ src/main/java/org/openapitools/client/model/Bird.java src/main/java/org/openapitools/client/model/Category.java src/main/java/org/openapitools/client/model/DataQuery.java src/main/java/org/openapitools/client/model/DataQueryAllOf.java +src/main/java/org/openapitools/client/model/DefaultValue.java src/main/java/org/openapitools/client/model/Pet.java src/main/java/org/openapitools/client/model/Query.java src/main/java/org/openapitools/client/model/Tag.java diff --git a/samples/client/echo_api/java/okhttp-gson/README.md b/samples/client/echo_api/java/okhttp-gson/README.md index b9fb0fdd274b..bd4fe601a605 100644 --- a/samples/client/echo_api/java/okhttp-gson/README.md +++ b/samples/client/echo_api/java/okhttp-gson/README.md @@ -129,6 +129,7 @@ Class | Method | HTTP request | Description - [Category](docs/Category.md) - [DataQuery](docs/DataQuery.md) - [DataQueryAllOf](docs/DataQueryAllOf.md) + - [DefaultValue](docs/DefaultValue.md) - [Pet](docs/Pet.md) - [Query](docs/Query.md) - [Tag](docs/Tag.md) diff --git a/samples/client/echo_api/java/okhttp-gson/api/openapi.yaml b/samples/client/echo_api/java/okhttp-gson/api/openapi.yaml index 3fc6ac3d6c89..44b2b84e6e2a 100644 --- a/samples/client/echo_api/java/okhttp-gson/api/openapi.yaml +++ b/samples/client/echo_api/java/okhttp-gson/api/openapi.yaml @@ -301,6 +301,47 @@ components: type: object xml: name: pet + DefaultValue: + description: to test the default value of properties + properties: + array_string_enum_default: + default: + - success + - failure + items: + enum: + - success + - failure + - unclassified + type: string + type: array + array_string_default: + default: + - failure + - skipped + items: + type: string + type: array + array_integer_default: + default: + - 1 + - 3 + items: + type: integer + type: array + array_string: + items: + type: string + type: array + array_string_nullable: + items: + type: string + nullable: true + type: array + string_nullable: + nullable: true + type: string + type: object Bird: properties: size: diff --git a/samples/client/echo_api/java/okhttp-gson/docs/DefaultValue.md b/samples/client/echo_api/java/okhttp-gson/docs/DefaultValue.md new file mode 100644 index 000000000000..ea7323bc04d1 --- /dev/null +++ b/samples/client/echo_api/java/okhttp-gson/docs/DefaultValue.md @@ -0,0 +1,29 @@ + + +# DefaultValue + +to test the default value of properties + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**arrayStringEnumDefault** | [**List<ArrayStringEnumDefaultEnum>**](#List<ArrayStringEnumDefaultEnum>) | | [optional] | +|**arrayStringDefault** | **List<String>** | | [optional] | +|**arrayIntegerDefault** | **List<Integer>** | | [optional] | +|**arrayString** | **List<String>** | | [optional] | +|**arrayStringNullable** | **List<String>** | | [optional] | +|**stringNullable** | **String** | | [optional] | + + + +## Enum: List<ArrayStringEnumDefaultEnum> + +| Name | Value | +|---- | -----| +| SUCCESS | "success" | +| FAILURE | "failure" | +| UNCLASSIFIED | "unclassified" | + + + diff --git a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java index 89f5cec6d71a..8345513ed98f 100644 --- a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java +++ b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java @@ -97,6 +97,7 @@ private static Class getClassByDiscriminator(Map classByDiscriminatorValue, Stri gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.Category.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.DataQuery.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.DataQueryAllOf.CustomTypeAdapterFactory()); + gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.DefaultValue.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.Pet.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.Tag.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.CustomTypeAdapterFactory()); diff --git a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/DefaultValue.java b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/DefaultValue.java new file mode 100644 index 000000000000..a24a511f4d90 --- /dev/null +++ b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/DefaultValue.java @@ -0,0 +1,473 @@ +/* + * Echo Server API + * Echo Server API + * + * The version of the OpenAPI document: 0.1.0 + * Contact: team@openapitools.org + * + * 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.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import org.openapitools.jackson.nullable.JsonNullable; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonArray; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParseException; +import com.google.gson.TypeAdapterFactory; +import com.google.gson.reflect.TypeToken; + +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + +import org.openapitools.client.JSON; + +/** + * to test the default value of properties + */ +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +public class DefaultValue { + /** + * Gets or Sets arrayStringEnumDefault + */ + @JsonAdapter(ArrayStringEnumDefaultEnum.Adapter.class) + public enum ArrayStringEnumDefaultEnum { + SUCCESS("success"), + + FAILURE("failure"), + + UNCLASSIFIED("unclassified"); + + private String value; + + ArrayStringEnumDefaultEnum(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + public static ArrayStringEnumDefaultEnum fromValue(String value) { + for (ArrayStringEnumDefaultEnum b : ArrayStringEnumDefaultEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + + public static class Adapter extends TypeAdapter { + @Override + public void write(final JsonWriter jsonWriter, final ArrayStringEnumDefaultEnum enumeration) throws IOException { + jsonWriter.value(enumeration.getValue()); + } + + @Override + public ArrayStringEnumDefaultEnum read(final JsonReader jsonReader) throws IOException { + String value = jsonReader.nextString(); + return ArrayStringEnumDefaultEnum.fromValue(value); + } + } + } + + public static final String SERIALIZED_NAME_ARRAY_STRING_ENUM_DEFAULT = "array_string_enum_default"; + @SerializedName(SERIALIZED_NAME_ARRAY_STRING_ENUM_DEFAULT) + private List arrayStringEnumDefault = null; + + public static final String SERIALIZED_NAME_ARRAY_STRING_DEFAULT = "array_string_default"; + @SerializedName(SERIALIZED_NAME_ARRAY_STRING_DEFAULT) + private List arrayStringDefault = null; + + public static final String SERIALIZED_NAME_ARRAY_INTEGER_DEFAULT = "array_integer_default"; + @SerializedName(SERIALIZED_NAME_ARRAY_INTEGER_DEFAULT) + private List arrayIntegerDefault = null; + + public static final String SERIALIZED_NAME_ARRAY_STRING = "array_string"; + @SerializedName(SERIALIZED_NAME_ARRAY_STRING) + private List arrayString = null; + + public static final String SERIALIZED_NAME_ARRAY_STRING_NULLABLE = "array_string_nullable"; + @SerializedName(SERIALIZED_NAME_ARRAY_STRING_NULLABLE) + private List arrayStringNullable = null; + + public static final String SERIALIZED_NAME_STRING_NULLABLE = "string_nullable"; + @SerializedName(SERIALIZED_NAME_STRING_NULLABLE) + private String stringNullable; + + public DefaultValue() { + } + + public DefaultValue arrayStringEnumDefault(List arrayStringEnumDefault) { + + this.arrayStringEnumDefault = arrayStringEnumDefault; + return this; + } + + public DefaultValue addArrayStringEnumDefaultItem(ArrayStringEnumDefaultEnum arrayStringEnumDefaultItem) { + if (this.arrayStringEnumDefault == null) { + this.arrayStringEnumDefault = new ArrayList<>(Arrays.asList(ArrayStringEnumDefaultEnum.SUCCESS, ArrayStringEnumDefaultEnum.FAILURE)); + } + this.arrayStringEnumDefault.add(arrayStringEnumDefaultItem); + return this; + } + + /** + * Get arrayStringEnumDefault + * @return arrayStringEnumDefault + **/ + @javax.annotation.Nullable + + public List getArrayStringEnumDefault() { + return arrayStringEnumDefault; + } + + + public void setArrayStringEnumDefault(List arrayStringEnumDefault) { + this.arrayStringEnumDefault = arrayStringEnumDefault; + } + + + public DefaultValue arrayStringDefault(List arrayStringDefault) { + + this.arrayStringDefault = arrayStringDefault; + return this; + } + + public DefaultValue addArrayStringDefaultItem(String arrayStringDefaultItem) { + if (this.arrayStringDefault == null) { + this.arrayStringDefault = new ArrayList<>(Arrays.asList("failure", "skipped")); + } + this.arrayStringDefault.add(arrayStringDefaultItem); + return this; + } + + /** + * Get arrayStringDefault + * @return arrayStringDefault + **/ + @javax.annotation.Nullable + + public List getArrayStringDefault() { + return arrayStringDefault; + } + + + public void setArrayStringDefault(List arrayStringDefault) { + this.arrayStringDefault = arrayStringDefault; + } + + + public DefaultValue arrayIntegerDefault(List arrayIntegerDefault) { + + this.arrayIntegerDefault = arrayIntegerDefault; + return this; + } + + public DefaultValue addArrayIntegerDefaultItem(Integer arrayIntegerDefaultItem) { + if (this.arrayIntegerDefault == null) { + this.arrayIntegerDefault = new ArrayList<>(Arrays.asList(1, 3)); + } + this.arrayIntegerDefault.add(arrayIntegerDefaultItem); + return this; + } + + /** + * Get arrayIntegerDefault + * @return arrayIntegerDefault + **/ + @javax.annotation.Nullable + + public List getArrayIntegerDefault() { + return arrayIntegerDefault; + } + + + public void setArrayIntegerDefault(List arrayIntegerDefault) { + this.arrayIntegerDefault = arrayIntegerDefault; + } + + + public DefaultValue arrayString(List arrayString) { + + this.arrayString = arrayString; + return this; + } + + public DefaultValue addArrayStringItem(String arrayStringItem) { + if (this.arrayString == null) { + this.arrayString = new ArrayList<>(); + } + this.arrayString.add(arrayStringItem); + return this; + } + + /** + * Get arrayString + * @return arrayString + **/ + @javax.annotation.Nullable + + public List getArrayString() { + return arrayString; + } + + + public void setArrayString(List arrayString) { + this.arrayString = arrayString; + } + + + public DefaultValue arrayStringNullable(List arrayStringNullable) { + + this.arrayStringNullable = arrayStringNullable; + return this; + } + + public DefaultValue addArrayStringNullableItem(String arrayStringNullableItem) { + if (this.arrayStringNullable == null) { + this.arrayStringNullable = null; + } + this.arrayStringNullable.add(arrayStringNullableItem); + return this; + } + + /** + * Get arrayStringNullable + * @return arrayStringNullable + **/ + @javax.annotation.Nullable + + public List getArrayStringNullable() { + return arrayStringNullable; + } + + + public void setArrayStringNullable(List arrayStringNullable) { + this.arrayStringNullable = arrayStringNullable; + } + + + public DefaultValue stringNullable(String stringNullable) { + + this.stringNullable = stringNullable; + return this; + } + + /** + * Get stringNullable + * @return stringNullable + **/ + @javax.annotation.Nullable + + public String getStringNullable() { + return stringNullable; + } + + + public void setStringNullable(String stringNullable) { + this.stringNullable = stringNullable; + } + + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + DefaultValue defaultValue = (DefaultValue) o; + return Objects.equals(this.arrayStringEnumDefault, defaultValue.arrayStringEnumDefault) && + Objects.equals(this.arrayStringDefault, defaultValue.arrayStringDefault) && + Objects.equals(this.arrayIntegerDefault, defaultValue.arrayIntegerDefault) && + Objects.equals(this.arrayString, defaultValue.arrayString) && + Objects.equals(this.arrayStringNullable, defaultValue.arrayStringNullable) && + Objects.equals(this.stringNullable, defaultValue.stringNullable); + } + + 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(arrayStringEnumDefault, arrayStringDefault, arrayIntegerDefault, arrayString, arrayStringNullable, stringNullable); + } + + 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 DefaultValue {\n"); + sb.append(" arrayStringEnumDefault: ").append(toIndentedString(arrayStringEnumDefault)).append("\n"); + sb.append(" arrayStringDefault: ").append(toIndentedString(arrayStringDefault)).append("\n"); + sb.append(" arrayIntegerDefault: ").append(toIndentedString(arrayIntegerDefault)).append("\n"); + sb.append(" arrayString: ").append(toIndentedString(arrayString)).append("\n"); + sb.append(" arrayStringNullable: ").append(toIndentedString(arrayStringNullable)).append("\n"); + sb.append(" stringNullable: ").append(toIndentedString(stringNullable)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + + + public static HashSet openapiFields; + public static HashSet openapiRequiredFields; + + static { + // a set of all properties/fields (JSON key names) + openapiFields = new HashSet(); + openapiFields.add("array_string_enum_default"); + openapiFields.add("array_string_default"); + openapiFields.add("array_integer_default"); + openapiFields.add("array_string"); + openapiFields.add("array_string_nullable"); + openapiFields.add("string_nullable"); + + // a set of required properties/fields (JSON key names) + openapiRequiredFields = new HashSet(); + } + + /** + * Validates the JSON Object and throws an exception if issues found + * + * @param jsonObj JSON Object + * @throws IOException if the JSON Object is invalid with respect to DefaultValue + */ + public static void validateJsonObject(JsonObject jsonObj) throws IOException { + if (jsonObj == null) { + if (!DefaultValue.openapiRequiredFields.isEmpty()) { // has required fields but JSON object is null + throw new IllegalArgumentException(String.format("The required field(s) %s in DefaultValue is not found in the empty JSON string", DefaultValue.openapiRequiredFields.toString())); + } + } + + Set> entries = jsonObj.entrySet(); + // check to see if the JSON string contains additional fields + for (Entry entry : entries) { + if (!DefaultValue.openapiFields.contains(entry.getKey())) { + throw new IllegalArgumentException(String.format("The field `%s` in the JSON string is not defined in the `DefaultValue` properties. JSON: %s", entry.getKey(), jsonObj.toString())); + } + } + // ensure the optional json data is an array if present + if (jsonObj.get("array_string_enum_default") != null && !jsonObj.get("array_string_enum_default").isJsonArray()) { + throw new IllegalArgumentException(String.format("Expected the field `array_string_enum_default` to be an array in the JSON string but got `%s`", jsonObj.get("array_string_enum_default").toString())); + } + // ensure the optional json data is an array if present + if (jsonObj.get("array_string_default") != null && !jsonObj.get("array_string_default").isJsonArray()) { + throw new IllegalArgumentException(String.format("Expected the field `array_string_default` to be an array in the JSON string but got `%s`", jsonObj.get("array_string_default").toString())); + } + // ensure the optional json data is an array if present + if (jsonObj.get("array_integer_default") != null && !jsonObj.get("array_integer_default").isJsonArray()) { + throw new IllegalArgumentException(String.format("Expected the field `array_integer_default` to be an array in the JSON string but got `%s`", jsonObj.get("array_integer_default").toString())); + } + // ensure the optional json data is an array if present + if (jsonObj.get("array_string") != null && !jsonObj.get("array_string").isJsonArray()) { + throw new IllegalArgumentException(String.format("Expected the field `array_string` to be an array in the JSON string but got `%s`", jsonObj.get("array_string").toString())); + } + // ensure the optional json data is an array if present + if (jsonObj.get("array_string_nullable") != null && !jsonObj.get("array_string_nullable").isJsonArray()) { + throw new IllegalArgumentException(String.format("Expected the field `array_string_nullable` to be an array in the JSON string but got `%s`", jsonObj.get("array_string_nullable").toString())); + } + if ((jsonObj.get("string_nullable") != null && !jsonObj.get("string_nullable").isJsonNull()) && !jsonObj.get("string_nullable").isJsonPrimitive()) { + throw new IllegalArgumentException(String.format("Expected the field `string_nullable` to be a primitive type in the JSON string but got `%s`", jsonObj.get("string_nullable").toString())); + } + } + + public static class CustomTypeAdapterFactory implements TypeAdapterFactory { + @SuppressWarnings("unchecked") + @Override + public TypeAdapter create(Gson gson, TypeToken type) { + if (!DefaultValue.class.isAssignableFrom(type.getRawType())) { + return null; // this class only serializes 'DefaultValue' and its subtypes + } + final TypeAdapter elementAdapter = gson.getAdapter(JsonElement.class); + final TypeAdapter thisAdapter + = gson.getDelegateAdapter(this, TypeToken.get(DefaultValue.class)); + + return (TypeAdapter) new TypeAdapter() { + @Override + public void write(JsonWriter out, DefaultValue value) throws IOException { + JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); + elementAdapter.write(out, obj); + } + + @Override + public DefaultValue read(JsonReader in) throws IOException { + JsonObject jsonObj = elementAdapter.read(in).getAsJsonObject(); + validateJsonObject(jsonObj); + return thisAdapter.fromJsonTree(jsonObj); + } + + }.nullSafe(); + } + } + + /** + * Create an instance of DefaultValue given an JSON string + * + * @param jsonString JSON string + * @return An instance of DefaultValue + * @throws IOException if the JSON string is invalid with respect to DefaultValue + */ + public static DefaultValue fromJson(String jsonString) throws IOException { + return JSON.getGson().fromJson(jsonString, DefaultValue.class); + } + + /** + * Convert an instance of DefaultValue to an JSON string + * + * @return JSON string + */ + public String toJson() { + return JSON.getGson().toJson(this); + } +} + diff --git a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Query.java b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Query.java index 0e9e9a12fa18..4ec582888991 100644 --- a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Query.java +++ b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Query.java @@ -140,7 +140,7 @@ public Query outcomes(List outcomes) { public Query addOutcomesItem(OutcomesEnum outcomesItem) { if (this.outcomes == null) { - this.outcomes = new ArrayList<>(); + this.outcomes = new ArrayList<>(Arrays.asList(OutcomesEnum.SUCCESS, OutcomesEnum.FAILURE)); } this.outcomes.add(outcomesItem); return this; diff --git a/samples/client/echo_api/java/okhttp-gson/src/test/java/org/openapitools/client/model/DefaultValueTest.java b/samples/client/echo_api/java/okhttp-gson/src/test/java/org/openapitools/client/model/DefaultValueTest.java new file mode 100644 index 000000000000..9ef0b55db296 --- /dev/null +++ b/samples/client/echo_api/java/okhttp-gson/src/test/java/org/openapitools/client/model/DefaultValueTest.java @@ -0,0 +1,91 @@ +/* + * Echo Server API + * Echo Server API + * + * The version of the OpenAPI document: 0.1.0 + * Contact: team@openapitools.org + * + * 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.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import org.openapitools.jackson.nullable.JsonNullable; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + + +/** + * Model tests for DefaultValue + */ +public class DefaultValueTest { + private final DefaultValue model = new DefaultValue(); + + /** + * Model tests for DefaultValue + */ + @Test + public void testDefaultValue() { + // TODO: test DefaultValue + } + + /** + * Test the property 'arrayStringEnumDefault' + */ + @Test + public void arrayStringEnumDefaultTest() { + // TODO: test arrayStringEnumDefault + } + + /** + * Test the property 'arrayStringDefault' + */ + @Test + public void arrayStringDefaultTest() { + // TODO: test arrayStringDefault + } + + /** + * Test the property 'arrayIntegerDefault' + */ + @Test + public void arrayIntegerDefaultTest() { + // TODO: test arrayIntegerDefault + } + + /** + * Test the property 'arrayString' + */ + @Test + public void arrayStringTest() { + // TODO: test arrayString + } + + /** + * Test the property 'arrayStringNullable' + */ + @Test + public void arrayStringNullableTest() { + // TODO: test arrayStringNullable + } + + /** + * Test the property 'stringNullable' + */ + @Test + public void stringNullableTest() { + // TODO: test stringNullable + } + +} diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index ba15c9f60f04..adac805a3966 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -38,10 +38,10 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class AdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP_PROPERTY = "map_property"; - private Map mapProperty = null; + private Map mapProperty = new HashMap<>(); public static final String JSON_PROPERTY_MAP_OF_MAP_PROPERTY = "map_of_map_property"; - private Map> mapOfMapProperty = null; + private Map> mapOfMapProperty = new HashMap<>(); public AdditionalPropertiesClass() { } diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 28c52b250980..c0e0edadabb0 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -38,7 +38,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index b1b948208d8e..d17bdca91034 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -38,7 +38,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayTest.java index 1107b2d5c1be..832b2bd3ca86 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -40,13 +40,13 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest() { } diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumArrays.java index 98d930c37f7f..adc690cf3cc9 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -111,7 +111,7 @@ public static ArrayEnumEnum fromValue(String value) { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays() { } diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index f3f28bbd8d0d..f8b0436c2738 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -42,7 +42,7 @@ public class FileSchemaTestClass { private ModelFile _file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = null; + private List files = new ArrayList<>(); public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MapTest.java index 9470661d8fc2..3760d8ad9687 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MapTest.java @@ -40,7 +40,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MapTest { public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string"; - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -78,13 +78,13 @@ public static InnerEnum fromValue(String value) { } public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string"; - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map"; - private Map directMap = null; + private Map directMap = new HashMap<>(); public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map"; - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest() { } diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 689701a7d358..e2338e168549 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -48,7 +48,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private OffsetDateTime dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/NullableClass.java index 17de80dbc288..6c0930e4f2dd 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/NullableClass.java @@ -81,7 +81,7 @@ public class NullableClass extends HashMap { private JsonNullable> arrayAndItemsNullableProp = JsonNullable.>undefined(); public static final String JSON_PROPERTY_ARRAY_ITEMS_NULLABLE = "array_items_nullable"; - private List arrayItemsNullable = null; + private List arrayItemsNullable = new ArrayList<>(); public static final String JSON_PROPERTY_OBJECT_NULLABLE_PROP = "object_nullable_prop"; private JsonNullable> objectNullableProp = JsonNullable.>undefined(); @@ -90,7 +90,7 @@ public class NullableClass extends HashMap { private JsonNullable> objectAndItemsNullableProp = JsonNullable.>undefined(); public static final String JSON_PROPERTY_OBJECT_ITEMS_NULLABLE = "object_items_nullable"; - private Map objectItemsNullable = null; + private Map objectItemsNullable = new HashMap<>(); public NullableClass() { @@ -308,7 +308,7 @@ public NullableClass arrayNullableProp(List arrayNullableProp) { public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) { if (this.arrayNullableProp == null || !this.arrayNullableProp.isPresent()) { - this.arrayNullableProp = JsonNullable.>of(new ArrayList<>()); + this.arrayNullableProp = JsonNullable.>of(null); } try { this.arrayNullableProp.get().add(arrayNullablePropItem); @@ -354,7 +354,7 @@ public NullableClass arrayAndItemsNullableProp(List arrayAndItemsNullabl public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullablePropItem) { if (this.arrayAndItemsNullableProp == null || !this.arrayAndItemsNullableProp.isPresent()) { - this.arrayAndItemsNullableProp = JsonNullable.>of(new ArrayList<>()); + this.arrayAndItemsNullableProp = JsonNullable.>of(null); } try { this.arrayAndItemsNullableProp.get().add(arrayAndItemsNullablePropItem); @@ -434,7 +434,7 @@ public NullableClass objectNullableProp(Map objectNullableProp) public NullableClass putObjectNullablePropItem(String key, Object objectNullablePropItem) { if (this.objectNullableProp == null || !this.objectNullableProp.isPresent()) { - this.objectNullableProp = JsonNullable.>of(new HashMap<>()); + this.objectNullableProp = JsonNullable.>of(null); } try { this.objectNullableProp.get().put(key, objectNullablePropItem); @@ -480,7 +480,7 @@ public NullableClass objectAndItemsNullableProp(Map objectAndIte public NullableClass putObjectAndItemsNullablePropItem(String key, Object objectAndItemsNullablePropItem) { if (this.objectAndItemsNullableProp == null || !this.objectAndItemsNullableProp.isPresent()) { - this.objectAndItemsNullableProp = JsonNullable.>of(new HashMap<>()); + this.objectAndItemsNullableProp = JsonNullable.>of(null); } try { this.objectAndItemsNullableProp.get().put(key, objectAndItemsNullablePropItem); diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index eb1966fc5dbb..7abd9fefce3c 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -51,7 +51,7 @@ public class ObjectWithDeprecatedFields { private DeprecatedObject deprecatedRef; public static final String JSON_PROPERTY_BARS = "bars"; - private List bars = null; + private List bars = new ArrayList<>(); public ObjectWithDeprecatedFields() { } diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java index 23b6d160ed2d..50617daf217d 100644 --- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java @@ -59,7 +59,7 @@ public class Pet { private Set photoUrls = new LinkedHashSet<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 720b1d5bc4b2..87fb4f79616f 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -47,28 +47,28 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class AdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP_STRING = "map_string"; - private Map mapString = null; + private Map mapString = new HashMap<>(); public static final String JSON_PROPERTY_MAP_NUMBER = "map_number"; - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); public static final String JSON_PROPERTY_MAP_INTEGER = "map_integer"; - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); public static final String JSON_PROPERTY_MAP_BOOLEAN = "map_boolean"; - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); public static final String JSON_PROPERTY_MAP_ARRAY_INTEGER = "map_array_integer"; - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); public static final String JSON_PROPERTY_MAP_ARRAY_ANYTYPE = "map_array_anytype"; - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); public static final String JSON_PROPERTY_MAP_MAP_STRING = "map_map_string"; - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); public static final String JSON_PROPERTY_MAP_MAP_ANYTYPE = "map_map_anytype"; - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1"; private Object anytype1; diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 00a2c7e9c2f9..7a041781ff73 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -36,7 +36,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 1ada53b156ff..7a2edc838d5b 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -36,7 +36,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayTest.java index dab9398fb61f..98545291c9b9 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -38,13 +38,13 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest() { } diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumArrays.java index 5cd9dce0d5d0..9e3ff98d5b1d 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -109,7 +109,7 @@ public static ArrayEnumEnum fromValue(String value) { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays() { } diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 3ffa210b935d..58712d5d89bc 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -40,7 +40,7 @@ public class FileSchemaTestClass { private File file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = null; + private List files = new ArrayList<>(); public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MapTest.java index 6a233f385b92..45c189a73934 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MapTest.java @@ -38,7 +38,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MapTest { public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string"; - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -76,13 +76,13 @@ public static InnerEnum fromValue(String value) { } public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string"; - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map"; - private Map directMap = null; + private Map directMap = new HashMap<>(); public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map"; - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest() { } diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 1d61ad111857..1b5a969aa145 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -46,7 +46,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private OffsetDateTime dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Pet.java index 26323b10cdcb..0f583a5b30c1 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Pet.java @@ -57,7 +57,7 @@ public class Pet { private Set photoUrls = new LinkedHashSet<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/XmlItem.java index a728f6e71173..ff655010f92e 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/XmlItem.java @@ -76,7 +76,7 @@ public class XmlItem { private Boolean attributeBoolean; public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array"; - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAME_STRING = "name_string"; private String nameString; @@ -91,10 +91,10 @@ public class XmlItem { private Boolean nameBoolean; public static final String JSON_PROPERTY_NAME_ARRAY = "name_array"; - private List nameArray = null; + private List nameArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array"; - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string"; private String prefixString; @@ -109,10 +109,10 @@ public class XmlItem { private Boolean prefixBoolean; public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array"; - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string"; private String namespaceString; @@ -127,10 +127,10 @@ public class XmlItem { private Boolean namespaceBoolean; public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array"; - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string"; private String prefixNsString; @@ -145,10 +145,10 @@ public class XmlItem { private Boolean prefixNsBoolean; public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array"; - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem() { } diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 2bfa18f61d93..f3ffa9c153aa 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -35,10 +35,10 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class AdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP_PROPERTY = "map_property"; - private Map mapProperty = null; + private Map mapProperty = new HashMap<>(); public static final String JSON_PROPERTY_MAP_OF_MAP_PROPERTY = "map_of_map_property"; - private Map> mapOfMapProperty = null; + private Map> mapOfMapProperty = new HashMap<>(); public AdditionalPropertiesClass() { } diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 815ebdc15317..37fe0aed3ebc 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -35,7 +35,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 50dc83cf671e..39e27dda318b 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -35,7 +35,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java index 85da0bb3ea9f..dbfe323fd6c2 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -37,13 +37,13 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest() { } diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java index fd795d68cc8e..725496991005 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -108,7 +108,7 @@ public static ArrayEnumEnum fromValue(String value) { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays() { } diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 35f55acb82db..abb204abd00e 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -39,7 +39,7 @@ public class FileSchemaTestClass { private File file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = null; + private List files = new ArrayList<>(); public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MapTest.java index f890eccbbc60..045d7b8a085a 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MapTest.java @@ -37,7 +37,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MapTest { public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string"; - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -75,13 +75,13 @@ public static InnerEnum fromValue(String value) { } public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string"; - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map"; - private Map directMap = null; + private Map directMap = new HashMap<>(); public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map"; - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest() { } diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index f40b19fde4bb..b782bb90c220 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -45,7 +45,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private OffsetDateTime dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NullableClass.java index b3639949b03e..73fba7619e95 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NullableClass.java @@ -78,7 +78,7 @@ public class NullableClass extends HashMap { private JsonNullable> arrayAndItemsNullableProp = JsonNullable.>undefined(); public static final String JSON_PROPERTY_ARRAY_ITEMS_NULLABLE = "array_items_nullable"; - private List arrayItemsNullable = null; + private List arrayItemsNullable = new ArrayList<>(); public static final String JSON_PROPERTY_OBJECT_NULLABLE_PROP = "object_nullable_prop"; private JsonNullable> objectNullableProp = JsonNullable.>undefined(); @@ -87,7 +87,7 @@ public class NullableClass extends HashMap { private JsonNullable> objectAndItemsNullableProp = JsonNullable.>undefined(); public static final String JSON_PROPERTY_OBJECT_ITEMS_NULLABLE = "object_items_nullable"; - private Map objectItemsNullable = null; + private Map objectItemsNullable = new HashMap<>(); public NullableClass() { @@ -305,7 +305,7 @@ public NullableClass arrayNullableProp(List arrayNullableProp) { public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) { if (this.arrayNullableProp == null || !this.arrayNullableProp.isPresent()) { - this.arrayNullableProp = JsonNullable.>of(new ArrayList<>()); + this.arrayNullableProp = JsonNullable.>of(null); } try { this.arrayNullableProp.get().add(arrayNullablePropItem); @@ -351,7 +351,7 @@ public NullableClass arrayAndItemsNullableProp(List arrayAndItemsNullabl public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullablePropItem) { if (this.arrayAndItemsNullableProp == null || !this.arrayAndItemsNullableProp.isPresent()) { - this.arrayAndItemsNullableProp = JsonNullable.>of(new ArrayList<>()); + this.arrayAndItemsNullableProp = JsonNullable.>of(null); } try { this.arrayAndItemsNullableProp.get().add(arrayAndItemsNullablePropItem); @@ -431,7 +431,7 @@ public NullableClass objectNullableProp(Map objectNullableProp) public NullableClass putObjectNullablePropItem(String key, Object objectNullablePropItem) { if (this.objectNullableProp == null || !this.objectNullableProp.isPresent()) { - this.objectNullableProp = JsonNullable.>of(new HashMap<>()); + this.objectNullableProp = JsonNullable.>of(null); } try { this.objectNullableProp.get().put(key, objectNullablePropItem); @@ -477,7 +477,7 @@ public NullableClass objectAndItemsNullableProp(Map objectAndIte public NullableClass putObjectAndItemsNullablePropItem(String key, Object objectAndItemsNullablePropItem) { if (this.objectAndItemsNullableProp == null || !this.objectAndItemsNullableProp.isPresent()) { - this.objectAndItemsNullableProp = JsonNullable.>of(new HashMap<>()); + this.objectAndItemsNullableProp = JsonNullable.>of(null); } try { this.objectAndItemsNullableProp.get().put(key, objectAndItemsNullablePropItem); diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index 7f3f584ade0f..9fe55b6c03e1 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -48,7 +48,7 @@ public class ObjectWithDeprecatedFields { private DeprecatedObject deprecatedRef; public static final String JSON_PROPERTY_BARS = "bars"; - private List bars = null; + private List bars = new ArrayList<>(); public ObjectWithDeprecatedFields() { } diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java index 1cb9c104fde7..403bb06d3e9c 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java @@ -56,7 +56,7 @@ public class Pet { private Set photoUrls = new LinkedHashSet<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 3ff2f8823cc0..656bc5ced985 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -46,28 +46,28 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class AdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP_STRING = "map_string"; - private Map mapString = null; + private Map mapString = new HashMap<>(); public static final String JSON_PROPERTY_MAP_NUMBER = "map_number"; - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); public static final String JSON_PROPERTY_MAP_INTEGER = "map_integer"; - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); public static final String JSON_PROPERTY_MAP_BOOLEAN = "map_boolean"; - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); public static final String JSON_PROPERTY_MAP_ARRAY_INTEGER = "map_array_integer"; - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); public static final String JSON_PROPERTY_MAP_ARRAY_ANYTYPE = "map_array_anytype"; - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); public static final String JSON_PROPERTY_MAP_MAP_STRING = "map_map_string"; - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); public static final String JSON_PROPERTY_MAP_MAP_ANYTYPE = "map_map_anytype"; - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1"; private Object anytype1; diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 815ebdc15317..37fe0aed3ebc 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -35,7 +35,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 50dc83cf671e..39e27dda318b 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -35,7 +35,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayTest.java index 85da0bb3ea9f..dbfe323fd6c2 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -37,13 +37,13 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest() { } diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumArrays.java index fd795d68cc8e..725496991005 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -108,7 +108,7 @@ public static ArrayEnumEnum fromValue(String value) { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays() { } diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index c576d944c873..bd9704757703 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -39,7 +39,7 @@ public class FileSchemaTestClass { private ModelFile _file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = null; + private List files = new ArrayList<>(); public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MapTest.java index f890eccbbc60..045d7b8a085a 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MapTest.java @@ -37,7 +37,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MapTest { public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string"; - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -75,13 +75,13 @@ public static InnerEnum fromValue(String value) { } public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string"; - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map"; - private Map directMap = null; + private Map directMap = new HashMap<>(); public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map"; - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest() { } diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index f40b19fde4bb..b782bb90c220 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -45,7 +45,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private OffsetDateTime dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Pet.java index 1cb9c104fde7..403bb06d3e9c 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Pet.java @@ -56,7 +56,7 @@ public class Pet { private Set photoUrls = new LinkedHashSet<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/XmlItem.java index 88ea3b5c7e31..bc5780cb6325 100644 --- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/XmlItem.java @@ -75,7 +75,7 @@ public class XmlItem { private Boolean attributeBoolean; public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array"; - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAME_STRING = "name_string"; private String nameString; @@ -90,10 +90,10 @@ public class XmlItem { private Boolean nameBoolean; public static final String JSON_PROPERTY_NAME_ARRAY = "name_array"; - private List nameArray = null; + private List nameArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array"; - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string"; private String prefixString; @@ -108,10 +108,10 @@ public class XmlItem { private Boolean prefixBoolean; public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array"; - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string"; private String namespaceString; @@ -126,10 +126,10 @@ public class XmlItem { private Boolean namespaceBoolean; public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array"; - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string"; private String prefixNsString; @@ -144,10 +144,10 @@ public class XmlItem { private Boolean prefixNsBoolean; public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array"; - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem() { } diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 3ff2f8823cc0..656bc5ced985 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -46,28 +46,28 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class AdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP_STRING = "map_string"; - private Map mapString = null; + private Map mapString = new HashMap<>(); public static final String JSON_PROPERTY_MAP_NUMBER = "map_number"; - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); public static final String JSON_PROPERTY_MAP_INTEGER = "map_integer"; - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); public static final String JSON_PROPERTY_MAP_BOOLEAN = "map_boolean"; - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); public static final String JSON_PROPERTY_MAP_ARRAY_INTEGER = "map_array_integer"; - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); public static final String JSON_PROPERTY_MAP_ARRAY_ANYTYPE = "map_array_anytype"; - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); public static final String JSON_PROPERTY_MAP_MAP_STRING = "map_map_string"; - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); public static final String JSON_PROPERTY_MAP_MAP_ANYTYPE = "map_map_anytype"; - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1"; private Object anytype1; diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 815ebdc15317..37fe0aed3ebc 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -35,7 +35,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 50dc83cf671e..39e27dda318b 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -35,7 +35,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayTest.java index 85da0bb3ea9f..dbfe323fd6c2 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -37,13 +37,13 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest() { } diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumArrays.java index fd795d68cc8e..725496991005 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -108,7 +108,7 @@ public static ArrayEnumEnum fromValue(String value) { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays() { } diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index c576d944c873..bd9704757703 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -39,7 +39,7 @@ public class FileSchemaTestClass { private ModelFile _file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = null; + private List files = new ArrayList<>(); public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MapTest.java index f890eccbbc60..045d7b8a085a 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MapTest.java @@ -37,7 +37,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MapTest { public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string"; - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -75,13 +75,13 @@ public static InnerEnum fromValue(String value) { } public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string"; - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map"; - private Map directMap = null; + private Map directMap = new HashMap<>(); public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map"; - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest() { } diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index f40b19fde4bb..b782bb90c220 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -45,7 +45,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private OffsetDateTime dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Pet.java index 1cb9c104fde7..403bb06d3e9c 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Pet.java @@ -56,7 +56,7 @@ public class Pet { private Set photoUrls = new LinkedHashSet<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/XmlItem.java index 88ea3b5c7e31..bc5780cb6325 100644 --- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/XmlItem.java @@ -75,7 +75,7 @@ public class XmlItem { private Boolean attributeBoolean; public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array"; - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAME_STRING = "name_string"; private String nameString; @@ -90,10 +90,10 @@ public class XmlItem { private Boolean nameBoolean; public static final String JSON_PROPERTY_NAME_ARRAY = "name_array"; - private List nameArray = null; + private List nameArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array"; - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string"; private String prefixString; @@ -108,10 +108,10 @@ public class XmlItem { private Boolean prefixBoolean; public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array"; - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string"; private String namespaceString; @@ -126,10 +126,10 @@ public class XmlItem { private Boolean namespaceBoolean; public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array"; - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string"; private String prefixNsString; @@ -144,10 +144,10 @@ public class XmlItem { private Boolean prefixNsBoolean; public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array"; - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem() { } diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NullableClass.java index c2213cf0f083..9578c71d46bd 100644 --- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NullableClass.java @@ -304,7 +304,7 @@ public NullableClass arrayNullableProp(List arrayNullableProp) { public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) { if (this.arrayNullableProp == null || !this.arrayNullableProp.isPresent()) { - this.arrayNullableProp = JsonNullable.>of(new ArrayList<>()); + this.arrayNullableProp = JsonNullable.>of(null); } try { this.arrayNullableProp.get().add(arrayNullablePropItem); @@ -349,7 +349,7 @@ public NullableClass arrayAndItemsNullableProp(List arrayAndItemsNullabl public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullablePropItem) { if (this.arrayAndItemsNullableProp == null || !this.arrayAndItemsNullableProp.isPresent()) { - this.arrayAndItemsNullableProp = JsonNullable.>of(new ArrayList<>()); + this.arrayAndItemsNullableProp = JsonNullable.>of(null); } try { this.arrayAndItemsNullableProp.get().add(arrayAndItemsNullablePropItem); @@ -427,7 +427,7 @@ public NullableClass objectNullableProp(Map objectNullableProp) public NullableClass putObjectNullablePropItem(String key, Object objectNullablePropItem) { if (this.objectNullableProp == null || !this.objectNullableProp.isPresent()) { - this.objectNullableProp = JsonNullable.>of(new HashMap<>()); + this.objectNullableProp = JsonNullable.>of(null); } try { this.objectNullableProp.get().put(key, objectNullablePropItem); @@ -472,7 +472,7 @@ public NullableClass objectAndItemsNullableProp(Map objectAndIte public NullableClass putObjectAndItemsNullablePropItem(String key, Object objectAndItemsNullablePropItem) { if (this.objectAndItemsNullableProp == null || !this.objectAndItemsNullableProp.isPresent()) { - this.objectAndItemsNullableProp = JsonNullable.>of(new HashMap<>()); + this.objectAndItemsNullableProp = JsonNullable.>of(null); } try { this.objectAndItemsNullableProp.get().put(key, objectAndItemsNullablePropItem); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 720edddede3b..60ce9ac318e2 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -50,10 +50,10 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class AdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP_PROPERTY = "map_property"; - private Map mapProperty = null; + private Map mapProperty = new HashMap<>(); public static final String JSON_PROPERTY_MAP_OF_MAP_PROPERTY = "map_of_map_property"; - private Map> mapOfMapProperty = null; + private Map> mapOfMapProperty = new HashMap<>(); public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1"; private JsonNullable anytype1 = JsonNullable.of(null); @@ -65,13 +65,13 @@ public class AdditionalPropertiesClass { private Object mapWithUndeclaredPropertiesAnytype2; public static final String JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_ANYTYPE3 = "map_with_undeclared_properties_anytype_3"; - private Map mapWithUndeclaredPropertiesAnytype3 = null; + private Map mapWithUndeclaredPropertiesAnytype3 = new HashMap<>(); public static final String JSON_PROPERTY_EMPTY_MAP = "empty_map"; private Object emptyMap; public static final String JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_STRING = "map_with_undeclared_properties_string"; - private Map mapWithUndeclaredPropertiesString = null; + private Map mapWithUndeclaredPropertiesString = new HashMap<>(); public AdditionalPropertiesClass() { } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 43ab3107a497..06e670c331ed 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -40,7 +40,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index efa4b6f5c3bd..0acb932ad368 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -40,7 +40,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayTest.java index 0823c8861773..a43acb13b57c 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -42,13 +42,13 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest() { } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Drawing.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Drawing.java index f3199733c393..3b3908f19326 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Drawing.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Drawing.java @@ -65,7 +65,7 @@ public class Drawing extends HashMap { private JsonNullable nullableShape = JsonNullable.undefined(); public static final String JSON_PROPERTY_SHAPES = "shapes"; - private List shapes = null; + private List shapes = new ArrayList<>(); public Drawing() { } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumArrays.java index ce493352a363..ddcc6e0f217d 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -113,7 +113,7 @@ public static ArrayEnumEnum fromValue(String value) { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays() { } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 69f36a8b0fd4..fb6ea0715801 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -44,7 +44,7 @@ public class FileSchemaTestClass { private ModelFile _file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = null; + private List files = new ArrayList<>(); public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MapTest.java index f917d0265d04..8568cbb7163c 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MapTest.java @@ -42,7 +42,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MapTest { public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string"; - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -80,13 +80,13 @@ public static InnerEnum fromValue(String value) { } public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string"; - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map"; - private Map directMap = null; + private Map directMap = new HashMap<>(); public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map"; - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest() { } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index fe0b0e67c5f4..adf7bfa2ce32 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -50,7 +50,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private OffsetDateTime dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NullableClass.java index 9b541d230921..e4b797da53ad 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NullableClass.java @@ -87,7 +87,7 @@ public class NullableClass extends HashMap { private JsonNullable> arrayAndItemsNullableProp = JsonNullable.>undefined(); public static final String JSON_PROPERTY_ARRAY_ITEMS_NULLABLE = "array_items_nullable"; - private List arrayItemsNullable = null; + private List arrayItemsNullable = new ArrayList<>(); public static final String JSON_PROPERTY_OBJECT_NULLABLE_PROP = "object_nullable_prop"; private JsonNullable> objectNullableProp = JsonNullable.>undefined(); @@ -96,7 +96,7 @@ public class NullableClass extends HashMap { private JsonNullable> objectAndItemsNullableProp = JsonNullable.>undefined(); public static final String JSON_PROPERTY_OBJECT_ITEMS_NULLABLE = "object_items_nullable"; - private Map objectItemsNullable = null; + private Map objectItemsNullable = new HashMap<>(); public NullableClass() { } @@ -306,7 +306,7 @@ public NullableClass arrayNullableProp(List arrayNullableProp) { public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) { if (this.arrayNullableProp == null || !this.arrayNullableProp.isPresent()) { - this.arrayNullableProp = JsonNullable.>of(new ArrayList<>()); + this.arrayNullableProp = JsonNullable.>of(null); } try { this.arrayNullableProp.get().add(arrayNullablePropItem); @@ -351,7 +351,7 @@ public NullableClass arrayAndItemsNullableProp(List arrayAndItemsNullabl public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullablePropItem) { if (this.arrayAndItemsNullableProp == null || !this.arrayAndItemsNullableProp.isPresent()) { - this.arrayAndItemsNullableProp = JsonNullable.>of(new ArrayList<>()); + this.arrayAndItemsNullableProp = JsonNullable.>of(null); } try { this.arrayAndItemsNullableProp.get().add(arrayAndItemsNullablePropItem); @@ -429,7 +429,7 @@ public NullableClass objectNullableProp(Map objectNullableProp) public NullableClass putObjectNullablePropItem(String key, Object objectNullablePropItem) { if (this.objectNullableProp == null || !this.objectNullableProp.isPresent()) { - this.objectNullableProp = JsonNullable.>of(new HashMap<>()); + this.objectNullableProp = JsonNullable.>of(null); } try { this.objectNullableProp.get().put(key, objectNullablePropItem); @@ -474,7 +474,7 @@ public NullableClass objectAndItemsNullableProp(Map objectAndIte public NullableClass putObjectAndItemsNullablePropItem(String key, Object objectAndItemsNullablePropItem) { if (this.objectAndItemsNullableProp == null || !this.objectAndItemsNullableProp.isPresent()) { - this.objectAndItemsNullableProp = JsonNullable.>of(new HashMap<>()); + this.objectAndItemsNullableProp = JsonNullable.>of(null); } try { this.objectAndItemsNullableProp.get().put(key, objectAndItemsNullablePropItem); diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index 461b96adb1e5..febc37817e30 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -53,7 +53,7 @@ public class ObjectWithDeprecatedFields { private DeprecatedObject deprecatedRef; public static final String JSON_PROPERTY_BARS = "bars"; - private List bars = null; + private List bars = new ArrayList<>(); public ObjectWithDeprecatedFields() { } diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pet.java index d2a1eac9e428..5d3fbd208eef 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pet.java @@ -58,7 +58,7 @@ public class Pet { private List photoUrls = new ArrayList<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Pet.java index 77f6a63af299..c003989b3414 100644 --- a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Pet.java @@ -58,7 +58,7 @@ public class Pet { private List photoUrls = new ArrayList<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/client/petstore/java/native/docs/ArrayDefaultValue.md b/samples/client/petstore/java/native/docs/ArrayDefaultValue.md new file mode 100644 index 000000000000..b082390dc54b --- /dev/null +++ b/samples/client/petstore/java/native/docs/ArrayDefaultValue.md @@ -0,0 +1,24 @@ + + +# ArrayDefaultValue + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**id** | **Long** | id | [optional] | +|**outcomes** | [**List<OutcomesEnum>**](#List<OutcomesEnum>) | | [optional] | + + + +## Enum: List<OutcomesEnum> + +| Name | Value | +|---- | -----| +| SUCCESS | "SUCCESS" | +| FAILURE | "FAILURE" | +| SKIPPED | "SKIPPED" | + + + diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 720edddede3b..60ce9ac318e2 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -50,10 +50,10 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class AdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP_PROPERTY = "map_property"; - private Map mapProperty = null; + private Map mapProperty = new HashMap<>(); public static final String JSON_PROPERTY_MAP_OF_MAP_PROPERTY = "map_of_map_property"; - private Map> mapOfMapProperty = null; + private Map> mapOfMapProperty = new HashMap<>(); public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1"; private JsonNullable anytype1 = JsonNullable.of(null); @@ -65,13 +65,13 @@ public class AdditionalPropertiesClass { private Object mapWithUndeclaredPropertiesAnytype2; public static final String JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_ANYTYPE3 = "map_with_undeclared_properties_anytype_3"; - private Map mapWithUndeclaredPropertiesAnytype3 = null; + private Map mapWithUndeclaredPropertiesAnytype3 = new HashMap<>(); public static final String JSON_PROPERTY_EMPTY_MAP = "empty_map"; private Object emptyMap; public static final String JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_STRING = "map_with_undeclared_properties_string"; - private Map mapWithUndeclaredPropertiesString = null; + private Map mapWithUndeclaredPropertiesString = new HashMap<>(); public AdditionalPropertiesClass() { } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayDefaultValue.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayDefaultValue.java new file mode 100644 index 000000000000..18c17dc26072 --- /dev/null +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayDefaultValue.java @@ -0,0 +1,186 @@ +/* + * OpenAPI Petstore + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * 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 java.util.Map; +import java.util.HashMap; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.util.ArrayList; +import java.util.List; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; + + +/** + * ArrayDefaultValue + */ +@JsonPropertyOrder({ + ArrayDefaultValue.JSON_PROPERTY_ID, + ArrayDefaultValue.JSON_PROPERTY_OUTCOMES +}) +@javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +public class ArrayDefaultValue { + public static final String JSON_PROPERTY_ID = "id"; + private Long id; + + /** + * Gets or Sets outcomes + */ + public enum OutcomesEnum { + SUCCESS("SUCCESS"), + + FAILURE("FAILURE"), + + SKIPPED("SKIPPED"); + + private String value; + + OutcomesEnum(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static OutcomesEnum fromValue(String value) { + for (OutcomesEnum b : OutcomesEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + public static final String JSON_PROPERTY_OUTCOMES = "outcomes"; + private List outcomes = null; + + public ArrayDefaultValue() { + } + + public ArrayDefaultValue id(Long id) { + this.id = id; + return this; + } + + /** + * id + * @return id + **/ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_ID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public Long getId() { + return id; + } + + + @JsonProperty(JSON_PROPERTY_ID) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setId(Long id) { + this.id = id; + } + + + public ArrayDefaultValue outcomes(List outcomes) { + this.outcomes = outcomes; + return this; + } + + public ArrayDefaultValue addOutcomesItem(OutcomesEnum outcomesItem) { + if (this.outcomes == null) { + this.outcomes = new ArrayList<>(); + } + this.outcomes.add(outcomesItem); + return this; + } + + /** + * Get outcomes + * @return outcomes + **/ + @javax.annotation.Nullable + @JsonProperty(JSON_PROPERTY_OUTCOMES) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + + public List getOutcomes() { + return outcomes; + } + + + @JsonProperty(JSON_PROPERTY_OUTCOMES) + @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS) + public void setOutcomes(List outcomes) { + this.outcomes = outcomes; + } + + + /** + * Return true if this ArrayDefaultValue object is equal to o. + */ + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ArrayDefaultValue arrayDefaultValue = (ArrayDefaultValue) o; + return Objects.equals(this.id, arrayDefaultValue.id) && + Objects.equals(this.outcomes, arrayDefaultValue.outcomes); + } + + @Override + public int hashCode() { + return Objects.hash(id, outcomes); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ArrayDefaultValue {\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" outcomes: ").append(toIndentedString(outcomes)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + +} + diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 43ab3107a497..06e670c331ed 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -40,7 +40,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index efa4b6f5c3bd..0acb932ad368 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -40,7 +40,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayTest.java index 0823c8861773..a43acb13b57c 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -42,13 +42,13 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest() { } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Drawing.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Drawing.java index f3199733c393..3b3908f19326 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Drawing.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Drawing.java @@ -65,7 +65,7 @@ public class Drawing extends HashMap { private JsonNullable nullableShape = JsonNullable.undefined(); public static final String JSON_PROPERTY_SHAPES = "shapes"; - private List shapes = null; + private List shapes = new ArrayList<>(); public Drawing() { } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumArrays.java index ce493352a363..ddcc6e0f217d 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -113,7 +113,7 @@ public static ArrayEnumEnum fromValue(String value) { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays() { } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 69f36a8b0fd4..fb6ea0715801 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -44,7 +44,7 @@ public class FileSchemaTestClass { private ModelFile _file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = null; + private List files = new ArrayList<>(); public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MapTest.java index f917d0265d04..8568cbb7163c 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MapTest.java @@ -42,7 +42,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MapTest { public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string"; - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -80,13 +80,13 @@ public static InnerEnum fromValue(String value) { } public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string"; - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map"; - private Map directMap = null; + private Map directMap = new HashMap<>(); public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map"; - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest() { } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index fe0b0e67c5f4..adf7bfa2ce32 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -50,7 +50,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private OffsetDateTime dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableClass.java index 9b541d230921..e4b797da53ad 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NullableClass.java @@ -87,7 +87,7 @@ public class NullableClass extends HashMap { private JsonNullable> arrayAndItemsNullableProp = JsonNullable.>undefined(); public static final String JSON_PROPERTY_ARRAY_ITEMS_NULLABLE = "array_items_nullable"; - private List arrayItemsNullable = null; + private List arrayItemsNullable = new ArrayList<>(); public static final String JSON_PROPERTY_OBJECT_NULLABLE_PROP = "object_nullable_prop"; private JsonNullable> objectNullableProp = JsonNullable.>undefined(); @@ -96,7 +96,7 @@ public class NullableClass extends HashMap { private JsonNullable> objectAndItemsNullableProp = JsonNullable.>undefined(); public static final String JSON_PROPERTY_OBJECT_ITEMS_NULLABLE = "object_items_nullable"; - private Map objectItemsNullable = null; + private Map objectItemsNullable = new HashMap<>(); public NullableClass() { } @@ -306,7 +306,7 @@ public NullableClass arrayNullableProp(List arrayNullableProp) { public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) { if (this.arrayNullableProp == null || !this.arrayNullableProp.isPresent()) { - this.arrayNullableProp = JsonNullable.>of(new ArrayList<>()); + this.arrayNullableProp = JsonNullable.>of(null); } try { this.arrayNullableProp.get().add(arrayNullablePropItem); @@ -351,7 +351,7 @@ public NullableClass arrayAndItemsNullableProp(List arrayAndItemsNullabl public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullablePropItem) { if (this.arrayAndItemsNullableProp == null || !this.arrayAndItemsNullableProp.isPresent()) { - this.arrayAndItemsNullableProp = JsonNullable.>of(new ArrayList<>()); + this.arrayAndItemsNullableProp = JsonNullable.>of(null); } try { this.arrayAndItemsNullableProp.get().add(arrayAndItemsNullablePropItem); @@ -429,7 +429,7 @@ public NullableClass objectNullableProp(Map objectNullableProp) public NullableClass putObjectNullablePropItem(String key, Object objectNullablePropItem) { if (this.objectNullableProp == null || !this.objectNullableProp.isPresent()) { - this.objectNullableProp = JsonNullable.>of(new HashMap<>()); + this.objectNullableProp = JsonNullable.>of(null); } try { this.objectNullableProp.get().put(key, objectNullablePropItem); @@ -474,7 +474,7 @@ public NullableClass objectAndItemsNullableProp(Map objectAndIte public NullableClass putObjectAndItemsNullablePropItem(String key, Object objectAndItemsNullablePropItem) { if (this.objectAndItemsNullableProp == null || !this.objectAndItemsNullableProp.isPresent()) { - this.objectAndItemsNullableProp = JsonNullable.>of(new HashMap<>()); + this.objectAndItemsNullableProp = JsonNullable.>of(null); } try { this.objectAndItemsNullableProp.get().put(key, objectAndItemsNullablePropItem); diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index 461b96adb1e5..febc37817e30 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -53,7 +53,7 @@ public class ObjectWithDeprecatedFields { private DeprecatedObject deprecatedRef; public static final String JSON_PROPERTY_BARS = "bars"; - private List bars = null; + private List bars = new ArrayList<>(); public ObjectWithDeprecatedFields() { } diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pet.java index d2a1eac9e428..5d3fbd208eef 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pet.java @@ -58,7 +58,7 @@ public class Pet { private List photoUrls = new ArrayList<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ArrayDefaultValueTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ArrayDefaultValueTest.java new file mode 100644 index 000000000000..a7befd2fc71f --- /dev/null +++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ArrayDefaultValueTest.java @@ -0,0 +1,58 @@ +/* + * OpenAPI Petstore + * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ + * + * 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.JsonTypeName; +import com.fasterxml.jackson.annotation.JsonValue; +import java.util.ArrayList; +import java.util.List; +import org.junit.Assert; +import org.junit.Ignore; +import org.junit.Test; + + +/** + * Model tests for ArrayDefaultValue + */ +public class ArrayDefaultValueTest { + private final ArrayDefaultValue model = new ArrayDefaultValue(); + + /** + * Model tests for ArrayDefaultValue + */ + @Test + public void testArrayDefaultValue() { + // TODO: test ArrayDefaultValue + } + + /** + * Test the property 'id' + */ + @Test + public void idTest() { + // TODO: test id + } + + /** + * Test the property 'outcomes' + */ + @Test + public void outcomesTest() { + // TODO: test outcomes + } + +} diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NullableClass.java index eaa8c8fa2bda..3320fa1cd248 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NullableClass.java @@ -247,7 +247,7 @@ public NullableClass arrayNullableProp(List arrayNullableProp) { public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) { if (this.arrayNullableProp == null) { - this.arrayNullableProp = new ArrayList<>(); + this.arrayNullableProp = null; } this.arrayNullableProp.add(arrayNullablePropItem); return this; @@ -277,7 +277,7 @@ public NullableClass arrayAndItemsNullableProp(List arrayAndItemsNullabl public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullablePropItem) { if (this.arrayAndItemsNullableProp == null) { - this.arrayAndItemsNullableProp = new ArrayList<>(); + this.arrayAndItemsNullableProp = null; } this.arrayAndItemsNullableProp.add(arrayAndItemsNullablePropItem); return this; @@ -337,7 +337,7 @@ public NullableClass objectNullableProp(Map objectNullableProp) public NullableClass putObjectNullablePropItem(String key, Object objectNullablePropItem) { if (this.objectNullableProp == null) { - this.objectNullableProp = new HashMap<>(); + this.objectNullableProp = null; } this.objectNullableProp.put(key, objectNullablePropItem); return this; @@ -367,7 +367,7 @@ public NullableClass objectAndItemsNullableProp(Map objectAndIte public NullableClass putObjectAndItemsNullablePropItem(String key, Object objectAndItemsNullablePropItem) { if (this.objectAndItemsNullableProp == null) { - this.objectAndItemsNullableProp = new HashMap<>(); + this.objectAndItemsNullableProp = null; } this.objectAndItemsNullableProp.put(key, objectAndItemsNullablePropItem); return this; diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index b2e71c3aecd4..efe9d568afdb 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -49,28 +49,28 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class AdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP_STRING = "map_string"; - private Map mapString = null; + private Map mapString = new HashMap<>(); public static final String JSON_PROPERTY_MAP_NUMBER = "map_number"; - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); public static final String JSON_PROPERTY_MAP_INTEGER = "map_integer"; - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); public static final String JSON_PROPERTY_MAP_BOOLEAN = "map_boolean"; - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); public static final String JSON_PROPERTY_MAP_ARRAY_INTEGER = "map_array_integer"; - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); public static final String JSON_PROPERTY_MAP_ARRAY_ANYTYPE = "map_array_anytype"; - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); public static final String JSON_PROPERTY_MAP_MAP_STRING = "map_map_string"; - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); public static final String JSON_PROPERTY_MAP_MAP_ANYTYPE = "map_map_anytype"; - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1"; private Object anytype1; diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index d72659b9671f..233a700bfbf8 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -38,7 +38,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 843627eaafc8..6b22a4d6f3b3 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -38,7 +38,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayTest.java index 016c6655a863..2f632875382a 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -40,13 +40,13 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest() { } diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumArrays.java index d747049fd69a..3c61f8bcbf36 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -111,7 +111,7 @@ public static ArrayEnumEnum fromValue(String value) { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays() { } diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index b921ea68fc1f..9bf2e4dcb0ac 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -42,7 +42,7 @@ public class FileSchemaTestClass { private ModelFile _file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = null; + private List files = new ArrayList<>(); public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MapTest.java index 22cdf8a24704..4dec1f53ec4b 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MapTest.java @@ -40,7 +40,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MapTest { public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string"; - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -78,13 +78,13 @@ public static InnerEnum fromValue(String value) { } public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string"; - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map"; - private Map directMap = null; + private Map directMap = new HashMap<>(); public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map"; - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest() { } diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 4468623897cb..9e3dbdfff1e0 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -48,7 +48,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private OffsetDateTime dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Pet.java index 9704b23beea8..d9d8dcb7c43d 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Pet.java @@ -59,7 +59,7 @@ public class Pet { private Set photoUrls = new LinkedHashSet<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/XmlItem.java index 274e8209801b..bab16003b692 100644 --- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/XmlItem.java @@ -78,7 +78,7 @@ public class XmlItem { private Boolean attributeBoolean; public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array"; - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAME_STRING = "name_string"; private String nameString; @@ -93,10 +93,10 @@ public class XmlItem { private Boolean nameBoolean; public static final String JSON_PROPERTY_NAME_ARRAY = "name_array"; - private List nameArray = null; + private List nameArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array"; - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string"; private String prefixString; @@ -111,10 +111,10 @@ public class XmlItem { private Boolean prefixBoolean; public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array"; - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string"; private String namespaceString; @@ -129,10 +129,10 @@ public class XmlItem { private Boolean namespaceBoolean; public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array"; - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string"; private String prefixNsString; @@ -147,10 +147,10 @@ public class XmlItem { private Boolean prefixNsBoolean; public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array"; - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem() { } diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 4840d641d339..0d9b17e0fd30 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -36,35 +36,35 @@ public class AdditionalPropertiesClass { public static final String SERIALIZED_NAME_MAP_STRING = "map_string"; @SerializedName(SERIALIZED_NAME_MAP_STRING) - private Map mapString = null; + private Map mapString = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_NUMBER = "map_number"; @SerializedName(SERIALIZED_NAME_MAP_NUMBER) - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_INTEGER = "map_integer"; @SerializedName(SERIALIZED_NAME_MAP_INTEGER) - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_BOOLEAN = "map_boolean"; @SerializedName(SERIALIZED_NAME_MAP_BOOLEAN) - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_ARRAY_INTEGER = "map_array_integer"; @SerializedName(SERIALIZED_NAME_MAP_ARRAY_INTEGER) - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_ARRAY_ANYTYPE = "map_array_anytype"; @SerializedName(SERIALIZED_NAME_MAP_ARRAY_ANYTYPE) - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_MAP_STRING = "map_map_string"; @SerializedName(SERIALIZED_NAME_MAP_MAP_STRING) - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_MAP_ANYTYPE = "map_map_anytype"; @SerializedName(SERIALIZED_NAME_MAP_MAP_ANYTYPE) - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); public static final String SERIALIZED_NAME_ANYTYPE1 = "anytype_1"; @SerializedName(SERIALIZED_NAME_ANYTYPE1) diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index cd7a355c0168..ac55ea686eaf 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -35,7 +35,7 @@ public class ArrayOfArrayOfNumberOnly { public static final String SERIALIZED_NAME_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_NUMBER) - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 9e0b55172da6..ac26ff59b12d 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -35,7 +35,7 @@ public class ArrayOfNumberOnly { public static final String SERIALIZED_NAME_ARRAY_NUMBER = "ArrayNumber"; @SerializedName(SERIALIZED_NAME_ARRAY_NUMBER) - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java index ced6433f6c3e..ec76a81add05 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -35,15 +35,15 @@ public class ArrayTest { public static final String SERIALIZED_NAME_ARRAY_OF_STRING = "array_of_string"; @SerializedName(SERIALIZED_NAME_ARRAY_OF_STRING) - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); public static final String SERIALIZED_NAME_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_OF_INTEGER) - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); public static final String SERIALIZED_NAME_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_OF_MODEL) - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest() { } diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumArrays.java index 6f91912e2aaa..8ea142ace10e 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -132,7 +132,7 @@ public ArrayEnumEnum read(final JsonReader jsonReader) throws IOException { public static final String SERIALIZED_NAME_ARRAY_ENUM = "array_enum"; @SerializedName(SERIALIZED_NAME_ARRAY_ENUM) - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays() { } diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 8df9375f4b7a..886cd9c40536 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -39,7 +39,7 @@ public class FileSchemaTestClass { public static final String SERIALIZED_NAME_FILES = "files"; @SerializedName(SERIALIZED_NAME_FILES) - private List files = null; + private List files = new ArrayList<>(); public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MapTest.java index 22cdc7569189..74c9baaf297c 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MapTest.java @@ -34,7 +34,7 @@ public class MapTest { public static final String SERIALIZED_NAME_MAP_MAP_OF_STRING = "map_map_of_string"; @SerializedName(SERIALIZED_NAME_MAP_MAP_OF_STRING) - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -85,15 +85,15 @@ public InnerEnum read(final JsonReader jsonReader) throws IOException { public static final String SERIALIZED_NAME_MAP_OF_ENUM_STRING = "map_of_enum_string"; @SerializedName(SERIALIZED_NAME_MAP_OF_ENUM_STRING) - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); public static final String SERIALIZED_NAME_DIRECT_MAP = "direct_map"; @SerializedName(SERIALIZED_NAME_DIRECT_MAP) - private Map directMap = null; + private Map directMap = new HashMap<>(); public static final String SERIALIZED_NAME_INDIRECT_MAP = "indirect_map"; @SerializedName(SERIALIZED_NAME_INDIRECT_MAP) - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest() { } diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 15946adc9f6f..068accc90d0a 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -45,7 +45,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { public static final String SERIALIZED_NAME_MAP = "map"; @SerializedName(SERIALIZED_NAME_MAP) - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java index 18b13a32f65d..c61b7de72f55 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java @@ -54,7 +54,7 @@ public class Pet { public static final String SERIALIZED_NAME_TAGS = "tags"; @SerializedName(SERIALIZED_NAME_TAGS) - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/XmlItem.java index 001d3f102c11..674a2d09ff8d 100644 --- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/XmlItem.java @@ -51,7 +51,7 @@ public class XmlItem { public static final String SERIALIZED_NAME_WRAPPED_ARRAY = "wrapped_array"; @SerializedName(SERIALIZED_NAME_WRAPPED_ARRAY) - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); public static final String SERIALIZED_NAME_NAME_STRING = "name_string"; @SerializedName(SERIALIZED_NAME_NAME_STRING) @@ -71,11 +71,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_NAME_ARRAY = "name_array"; @SerializedName(SERIALIZED_NAME_NAME_ARRAY) - private List nameArray = null; + private List nameArray = new ArrayList<>(); public static final String SERIALIZED_NAME_NAME_WRAPPED_ARRAY = "name_wrapped_array"; @SerializedName(SERIALIZED_NAME_NAME_WRAPPED_ARRAY) - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); public static final String SERIALIZED_NAME_PREFIX_STRING = "prefix_string"; @SerializedName(SERIALIZED_NAME_PREFIX_STRING) @@ -95,11 +95,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_PREFIX_ARRAY = "prefix_array"; @SerializedName(SERIALIZED_NAME_PREFIX_ARRAY) - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); public static final String SERIALIZED_NAME_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; @SerializedName(SERIALIZED_NAME_PREFIX_WRAPPED_ARRAY) - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); public static final String SERIALIZED_NAME_NAMESPACE_STRING = "namespace_string"; @SerializedName(SERIALIZED_NAME_NAMESPACE_STRING) @@ -119,11 +119,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_NAMESPACE_ARRAY = "namespace_array"; @SerializedName(SERIALIZED_NAME_NAMESPACE_ARRAY) - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); public static final String SERIALIZED_NAME_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; @SerializedName(SERIALIZED_NAME_NAMESPACE_WRAPPED_ARRAY) - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); public static final String SERIALIZED_NAME_PREFIX_NS_STRING = "prefix_ns_string"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_STRING) @@ -143,11 +143,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_PREFIX_NS_ARRAY = "prefix_ns_array"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_ARRAY) - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); public static final String SERIALIZED_NAME_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_WRAPPED_ARRAY) - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem() { } diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 3ff2f8823cc0..656bc5ced985 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -46,28 +46,28 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class AdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP_STRING = "map_string"; - private Map mapString = null; + private Map mapString = new HashMap<>(); public static final String JSON_PROPERTY_MAP_NUMBER = "map_number"; - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); public static final String JSON_PROPERTY_MAP_INTEGER = "map_integer"; - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); public static final String JSON_PROPERTY_MAP_BOOLEAN = "map_boolean"; - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); public static final String JSON_PROPERTY_MAP_ARRAY_INTEGER = "map_array_integer"; - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); public static final String JSON_PROPERTY_MAP_ARRAY_ANYTYPE = "map_array_anytype"; - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); public static final String JSON_PROPERTY_MAP_MAP_STRING = "map_map_string"; - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); public static final String JSON_PROPERTY_MAP_MAP_ANYTYPE = "map_map_anytype"; - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1"; private Object anytype1; diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 815ebdc15317..37fe0aed3ebc 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -35,7 +35,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 50dc83cf671e..39e27dda318b 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -35,7 +35,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayTest.java index 85da0bb3ea9f..dbfe323fd6c2 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -37,13 +37,13 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest() { } diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumArrays.java index fd795d68cc8e..725496991005 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -108,7 +108,7 @@ public static ArrayEnumEnum fromValue(String value) { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays() { } diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index c576d944c873..bd9704757703 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -39,7 +39,7 @@ public class FileSchemaTestClass { private ModelFile _file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = null; + private List files = new ArrayList<>(); public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MapTest.java index f890eccbbc60..045d7b8a085a 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MapTest.java @@ -37,7 +37,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MapTest { public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string"; - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -75,13 +75,13 @@ public static InnerEnum fromValue(String value) { } public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string"; - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map"; - private Map directMap = null; + private Map directMap = new HashMap<>(); public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map"; - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest() { } diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index f40b19fde4bb..b782bb90c220 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -45,7 +45,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private OffsetDateTime dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java index 1cb9c104fde7..403bb06d3e9c 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java @@ -56,7 +56,7 @@ public class Pet { private Set photoUrls = new LinkedHashSet<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/XmlItem.java index 88ea3b5c7e31..bc5780cb6325 100644 --- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/XmlItem.java @@ -75,7 +75,7 @@ public class XmlItem { private Boolean attributeBoolean; public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array"; - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAME_STRING = "name_string"; private String nameString; @@ -90,10 +90,10 @@ public class XmlItem { private Boolean nameBoolean; public static final String JSON_PROPERTY_NAME_ARRAY = "name_array"; - private List nameArray = null; + private List nameArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array"; - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string"; private String prefixString; @@ -108,10 +108,10 @@ public class XmlItem { private Boolean prefixBoolean; public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array"; - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string"; private String namespaceString; @@ -126,10 +126,10 @@ public class XmlItem { private Boolean namespaceBoolean; public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array"; - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string"; private String prefixNsString; @@ -144,10 +144,10 @@ public class XmlItem { private Boolean prefixNsBoolean; public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array"; - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem() { } diff --git a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Pet.java index bb3962958cd2..5002324b3012 100644 --- a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Pet.java @@ -53,7 +53,7 @@ public class Pet { private List photoUrls = new ArrayList<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Pet.java index 06b3c33a1aa1..040ddedd0ba8 100644 --- a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Pet.java @@ -56,7 +56,7 @@ public class Pet { private List photoUrls = new ArrayList<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index a14a2a708528..5b8cb3220b20 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -57,56 +57,56 @@ public class AdditionalPropertiesClass { // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace= // items.example= items.type=String @XmlElement(name = "inner") - private Map mapString = null; + private Map mapString = new HashMap<>(); public static final String JSON_PROPERTY_MAP_NUMBER = "map_number"; // Is a container wrapped=false // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace= // items.example= items.type=BigDecimal @XmlElement(name = "inner") - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); public static final String JSON_PROPERTY_MAP_INTEGER = "map_integer"; // Is a container wrapped=false // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace= // items.example= items.type=Integer @XmlElement(name = "inner") - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); public static final String JSON_PROPERTY_MAP_BOOLEAN = "map_boolean"; // Is a container wrapped=false // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace= // items.example= items.type=Boolean @XmlElement(name = "inner") - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); public static final String JSON_PROPERTY_MAP_ARRAY_INTEGER = "map_array_integer"; // Is a container wrapped=false // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace= // items.example= items.type=List<Integer> @XmlElement(name = "inner") - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); public static final String JSON_PROPERTY_MAP_ARRAY_ANYTYPE = "map_array_anytype"; // Is a container wrapped=false // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace= // items.example= items.type=List<Object> @XmlElement(name = "inner") - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); public static final String JSON_PROPERTY_MAP_MAP_STRING = "map_map_string"; // Is a container wrapped=false // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace= // items.example= items.type=Map<String, String> @XmlElement(name = "inner") - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); public static final String JSON_PROPERTY_MAP_MAP_ANYTYPE = "map_map_anytype"; // Is a container wrapped=false // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace= // items.example= items.type=Map<String, Object> @XmlElement(name = "inner") - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1"; @XmlElement(name = "anytype_1") diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 00c54647ef5d..960bb779b356 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -46,7 +46,7 @@ public class ArrayOfArrayOfNumberOnly { // items.name=arrayArrayNumber items.baseName=arrayArrayNumber items.xmlName= items.xmlNamespace= // items.example= items.type=List<BigDecimal> @XmlElement(name = "arrayArrayNumber") - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 6bf40c102e91..3ff8fa2e779f 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -46,7 +46,7 @@ public class ArrayOfNumberOnly { // items.name=arrayNumber items.baseName=arrayNumber items.xmlName= items.xmlNamespace= // items.example= items.type=BigDecimal @XmlElement(name = "arrayNumber") - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayTest.java index 432855fb6b92..b2c1f7ea3d42 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -48,21 +48,21 @@ public class ArrayTest { // items.name=arrayOfString items.baseName=arrayOfString items.xmlName= items.xmlNamespace= // items.example= items.type=String @XmlElement(name = "arrayOfString") - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; // Is a container wrapped=false // items.name=arrayArrayOfInteger items.baseName=arrayArrayOfInteger items.xmlName= items.xmlNamespace= // items.example= items.type=List<Long> @XmlElement(name = "arrayArrayOfInteger") - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; // Is a container wrapped=false // items.name=arrayArrayOfModel items.baseName=arrayArrayOfModel items.xmlName= items.xmlNamespace= // items.example= items.type=List<ReadOnlyFirst> @XmlElement(name = "arrayArrayOfModel") - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest() { } diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumArrays.java index e1283a3ed80c..2c94312ead56 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -128,7 +128,7 @@ public static ArrayEnumEnum fromValue(String value) { // items.name=arrayEnum items.baseName=arrayEnum items.xmlName= items.xmlNamespace= // items.example= items.type=String @XmlElement(name = "arrayEnum") - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays() { } diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index e04178d8f751..89eaa3f6e881 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -51,7 +51,7 @@ public class FileSchemaTestClass { // items.name=files items.baseName=files items.xmlName= items.xmlNamespace= // items.example= items.type=ModelFile @XmlElement(name = "files") - private List files = null; + private List files = new ArrayList<>(); public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MapTest.java index f0f024ca4671..ccce10e4b481 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MapTest.java @@ -48,7 +48,7 @@ public class MapTest { // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace= // items.example= items.type=Map<String, String> @XmlElement(name = "inner") - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -94,21 +94,21 @@ public static InnerEnum fromValue(String value) { // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace= // items.example= items.type=String @XmlElement(name = "inner") - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map"; // Is a container wrapped=false // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace= // items.example= items.type=Boolean @XmlElement(name = "inner") - private Map directMap = null; + private Map directMap = new HashMap<>(); public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map"; // Is a container wrapped=false // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace= // items.example= items.type=Boolean @XmlElement(name = "inner") - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest() { } diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 2c99587f79f4..bab8f1621f1f 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -59,7 +59,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace= // items.example= items.type=Animal @XmlElement(name = "inner") - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java index 1a912b898fad..81128b586c28 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java @@ -76,7 +76,7 @@ public class Pet { // items.example= items.type=Tag @XmlElement(name = "tags") @XmlElementWrapper(name = "tag") - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/XmlItem.java index 1755a6ddc395..08a9c08c1206 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/XmlItem.java @@ -91,7 +91,7 @@ public class XmlItem { // items.example= items.type=Integer @XmlElement(name = "wrappedArray") @XmlElementWrapper(name = "wrapped_array") - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAME_STRING = "name_string"; @XmlElement(name = "xml_name_string") @@ -114,7 +114,7 @@ public class XmlItem { // items.name=nameArray items.baseName=nameArray items.xmlName=xml_name_array_item items.xmlNamespace= // items.example= items.type=Integer @XmlElement(name = "xml_name_array_item") - private List nameArray = null; + private List nameArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array"; // Is a container wrapped=true @@ -122,7 +122,7 @@ public class XmlItem { // items.example= items.type=Integer @XmlElement(name = "xml_name_wrapped_array_item") @XmlElementWrapper(name = "xml_name_wrapped_array") - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string"; @XmlElement(name = "prefix_string") @@ -145,7 +145,7 @@ public class XmlItem { // items.name=prefixArray items.baseName=prefixArray items.xmlName= items.xmlNamespace= // items.example= items.type=Integer @XmlElement(name = "prefixArray") - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; // Is a container wrapped=true @@ -153,7 +153,7 @@ public class XmlItem { // items.example= items.type=Integer @XmlElement(name = "prefixWrappedArray") @XmlElementWrapper(name = "prefix_wrapped_array") - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string"; @XmlElement(namespace="http://a.com/schema", name = "namespace_string") @@ -176,7 +176,7 @@ public class XmlItem { // items.name=namespaceArray items.baseName=namespaceArray items.xmlName= items.xmlNamespace=http://e.com/schema // items.example= items.type=Integer @XmlElement(namespace="http://e.com/schema", name = "namespaceArray") - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; // Is a container wrapped=true @@ -184,7 +184,7 @@ public class XmlItem { // items.example= items.type=Integer @XmlElement(namespace="http://g.com/schema", name = "namespaceWrappedArray") @XmlElementWrapper(namespace="http://f.com/schema", name = "namespace_wrapped_array") - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string"; @XmlElement(namespace="http://a.com/schema", name = "prefix_ns_string") @@ -207,7 +207,7 @@ public class XmlItem { // items.name=prefixNsArray items.baseName=prefixNsArray items.xmlName= items.xmlNamespace=http://e.com/schema // items.example= items.type=Integer @XmlElement(namespace="http://e.com/schema", name = "prefixNsArray") - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; // Is a container wrapped=true @@ -215,7 +215,7 @@ public class XmlItem { // items.example= items.type=Integer @XmlElement(namespace="http://g.com/schema", name = "prefixNsWrappedArray") @XmlElementWrapper(namespace="http://f.com/schema", name = "prefix_ns_wrapped_array") - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem() { } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 3ff2f8823cc0..ed8d48698b14 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -89,7 +89,7 @@ public AdditionalPropertiesClass mapString(Map mapString) { public AdditionalPropertiesClass putMapStringItem(String key, String mapStringItem) { if (this.mapString == null) { - this.mapString = new HashMap<>(); + this.mapString = null; } this.mapString.put(key, mapStringItem); return this; @@ -123,7 +123,7 @@ public AdditionalPropertiesClass mapNumber(Map mapNumber) { public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumberItem) { if (this.mapNumber == null) { - this.mapNumber = new HashMap<>(); + this.mapNumber = null; } this.mapNumber.put(key, mapNumberItem); return this; @@ -157,7 +157,7 @@ public AdditionalPropertiesClass mapInteger(Map mapInteger) { public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntegerItem) { if (this.mapInteger == null) { - this.mapInteger = new HashMap<>(); + this.mapInteger = null; } this.mapInteger.put(key, mapIntegerItem); return this; @@ -191,7 +191,7 @@ public AdditionalPropertiesClass mapBoolean(Map mapBoolean) { public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBooleanItem) { if (this.mapBoolean == null) { - this.mapBoolean = new HashMap<>(); + this.mapBoolean = null; } this.mapBoolean.put(key, mapBooleanItem); return this; @@ -225,7 +225,7 @@ public AdditionalPropertiesClass mapArrayInteger(Map> mapA public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List mapArrayIntegerItem) { if (this.mapArrayInteger == null) { - this.mapArrayInteger = new HashMap<>(); + this.mapArrayInteger = null; } this.mapArrayInteger.put(key, mapArrayIntegerItem); return this; @@ -259,7 +259,7 @@ public AdditionalPropertiesClass mapArrayAnytype(Map> mapAr public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List mapArrayAnytypeItem) { if (this.mapArrayAnytype == null) { - this.mapArrayAnytype = new HashMap<>(); + this.mapArrayAnytype = null; } this.mapArrayAnytype.put(key, mapArrayAnytypeItem); return this; @@ -293,7 +293,7 @@ public AdditionalPropertiesClass mapMapString(Map> m public AdditionalPropertiesClass putMapMapStringItem(String key, Map mapMapStringItem) { if (this.mapMapString == null) { - this.mapMapString = new HashMap<>(); + this.mapMapString = null; } this.mapMapString.put(key, mapMapStringItem); return this; @@ -327,7 +327,7 @@ public AdditionalPropertiesClass mapMapAnytype(Map> public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map mapMapAnytypeItem) { if (this.mapMapAnytype == null) { - this.mapMapAnytype = new HashMap<>(); + this.mapMapAnytype = null; } this.mapMapAnytype.put(key, mapMapAnytypeItem); return this; diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 815ebdc15317..7729eedac4b7 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -48,7 +48,7 @@ public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArr public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayArrayNumberItem) { if (this.arrayArrayNumber == null) { - this.arrayArrayNumber = new ArrayList<>(); + this.arrayArrayNumber = null; } this.arrayArrayNumber.add(arrayArrayNumberItem); return this; diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 50dc83cf671e..20fa6c02c339 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -48,7 +48,7 @@ public ArrayOfNumberOnly arrayNumber(List arrayNumber) { public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { if (this.arrayNumber == null) { - this.arrayNumber = new ArrayList<>(); + this.arrayNumber = null; } this.arrayNumber.add(arrayNumberItem); return this; diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayTest.java index 85da0bb3ea9f..fb1542f33ba2 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -56,7 +56,7 @@ public ArrayTest arrayOfString(List arrayOfString) { public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { if (this.arrayOfString == null) { - this.arrayOfString = new ArrayList<>(); + this.arrayOfString = null; } this.arrayOfString.add(arrayOfStringItem); return this; @@ -90,7 +90,7 @@ public ArrayTest arrayArrayOfInteger(List> arrayArrayOfInteger) { public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) { if (this.arrayArrayOfInteger == null) { - this.arrayArrayOfInteger = new ArrayList<>(); + this.arrayArrayOfInteger = null; } this.arrayArrayOfInteger.add(arrayArrayOfIntegerItem); return this; @@ -124,7 +124,7 @@ public ArrayTest arrayArrayOfModel(List> arrayArrayOfModel) public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelItem) { if (this.arrayArrayOfModel == null) { - this.arrayArrayOfModel = new ArrayList<>(); + this.arrayArrayOfModel = null; } this.arrayArrayOfModel.add(arrayArrayOfModelItem); return this; diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumArrays.java index fd795d68cc8e..46e76d1f7430 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -147,7 +147,7 @@ public EnumArrays arrayEnum(List arrayEnum) { public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { if (this.arrayEnum == null) { - this.arrayEnum = new ArrayList<>(); + this.arrayEnum = null; } this.arrayEnum.add(arrayEnumItem); return this; diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index c576d944c873..0db455cb6326 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -78,7 +78,7 @@ public FileSchemaTestClass files(List files) { public FileSchemaTestClass addFilesItem(ModelFile filesItem) { if (this.files == null) { - this.files = new ArrayList<>(); + this.files = null; } this.files.add(filesItem); return this; diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MapTest.java index f890eccbbc60..3d6c7ba4f45a 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MapTest.java @@ -94,7 +94,7 @@ public MapTest mapMapOfString(Map> mapMapOfString) { public MapTest putMapMapOfStringItem(String key, Map mapMapOfStringItem) { if (this.mapMapOfString == null) { - this.mapMapOfString = new HashMap<>(); + this.mapMapOfString = null; } this.mapMapOfString.put(key, mapMapOfStringItem); return this; @@ -128,7 +128,7 @@ public MapTest mapOfEnumString(Map mapOfEnumString) { public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) { if (this.mapOfEnumString == null) { - this.mapOfEnumString = new HashMap<>(); + this.mapOfEnumString = null; } this.mapOfEnumString.put(key, mapOfEnumStringItem); return this; @@ -162,7 +162,7 @@ public MapTest directMap(Map directMap) { public MapTest putDirectMapItem(String key, Boolean directMapItem) { if (this.directMap == null) { - this.directMap = new HashMap<>(); + this.directMap = null; } this.directMap.put(key, directMapItem); return this; @@ -196,7 +196,7 @@ public MapTest indirectMap(Map indirectMap) { public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { if (this.indirectMap == null) { - this.indirectMap = new HashMap<>(); + this.indirectMap = null; } this.indirectMap.put(key, indirectMapItem); return this; diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index f40b19fde4bb..340223cd1365 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -110,7 +110,7 @@ public MixedPropertiesAndAdditionalPropertiesClass map(Map map) public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { if (this.map == null) { - this.map = new HashMap<>(); + this.map = null; } this.map.put(key, mapItem); return this; diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java index 1cb9c104fde7..6c5498646bc8 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java @@ -53,7 +53,7 @@ public class Pet { private String name; public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls"; - private Set photoUrls = new LinkedHashSet<>(); + private Set photoUrls = null; public static final String JSON_PROPERTY_TAGS = "tags"; private List tags = null; @@ -219,7 +219,7 @@ public Pet tags(List tags) { public Pet addTagsItem(Tag tagsItem) { if (this.tags == null) { - this.tags = new ArrayList<>(); + this.tags = null; } this.tags.add(tagsItem); return this; diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderDefault.java index 7b8352d3c3bb..e5e89635ca8a 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderDefault.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderDefault.java @@ -51,7 +51,7 @@ public class TypeHolderDefault { private Boolean boolItem = true; public static final String JSON_PROPERTY_ARRAY_ITEM = "array_item"; - private List arrayItem = new ArrayList<>(); + private List arrayItem = null; public TypeHolderDefault() { } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderExample.java index af0b85f41180..9f3f9cb3f368 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderExample.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderExample.java @@ -55,7 +55,7 @@ public class TypeHolderExample { private Boolean boolItem; public static final String JSON_PROPERTY_ARRAY_ITEM = "array_item"; - private List arrayItem = new ArrayList<>(); + private List arrayItem = null; public TypeHolderExample() { } diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/XmlItem.java index 88ea3b5c7e31..78ada109ce7a 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/XmlItem.java @@ -264,7 +264,7 @@ public XmlItem wrappedArray(List wrappedArray) { public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) { if (this.wrappedArray == null) { - this.wrappedArray = new ArrayList<>(); + this.wrappedArray = null; } this.wrappedArray.add(wrappedArrayItem); return this; @@ -402,7 +402,7 @@ public XmlItem nameArray(List nameArray) { public XmlItem addNameArrayItem(Integer nameArrayItem) { if (this.nameArray == null) { - this.nameArray = new ArrayList<>(); + this.nameArray = null; } this.nameArray.add(nameArrayItem); return this; @@ -436,7 +436,7 @@ public XmlItem nameWrappedArray(List nameWrappedArray) { public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) { if (this.nameWrappedArray == null) { - this.nameWrappedArray = new ArrayList<>(); + this.nameWrappedArray = null; } this.nameWrappedArray.add(nameWrappedArrayItem); return this; @@ -574,7 +574,7 @@ public XmlItem prefixArray(List prefixArray) { public XmlItem addPrefixArrayItem(Integer prefixArrayItem) { if (this.prefixArray == null) { - this.prefixArray = new ArrayList<>(); + this.prefixArray = null; } this.prefixArray.add(prefixArrayItem); return this; @@ -608,7 +608,7 @@ public XmlItem prefixWrappedArray(List prefixWrappedArray) { public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) { if (this.prefixWrappedArray == null) { - this.prefixWrappedArray = new ArrayList<>(); + this.prefixWrappedArray = null; } this.prefixWrappedArray.add(prefixWrappedArrayItem); return this; @@ -746,7 +746,7 @@ public XmlItem namespaceArray(List namespaceArray) { public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) { if (this.namespaceArray == null) { - this.namespaceArray = new ArrayList<>(); + this.namespaceArray = null; } this.namespaceArray.add(namespaceArrayItem); return this; @@ -780,7 +780,7 @@ public XmlItem namespaceWrappedArray(List namespaceWrappedArray) { public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) { if (this.namespaceWrappedArray == null) { - this.namespaceWrappedArray = new ArrayList<>(); + this.namespaceWrappedArray = null; } this.namespaceWrappedArray.add(namespaceWrappedArrayItem); return this; @@ -918,7 +918,7 @@ public XmlItem prefixNsArray(List prefixNsArray) { public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) { if (this.prefixNsArray == null) { - this.prefixNsArray = new ArrayList<>(); + this.prefixNsArray = null; } this.prefixNsArray.add(prefixNsArrayItem); return this; @@ -952,7 +952,7 @@ public XmlItem prefixNsWrappedArray(List prefixNsWrappedArray) { public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) { if (this.prefixNsWrappedArray == null) { - this.prefixNsWrappedArray = new ArrayList<>(); + this.prefixNsWrappedArray = null; } this.prefixNsWrappedArray.add(prefixNsWrappedArrayItem); return this; diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index b13c7705075c..8e3262c9ca0d 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -48,28 +48,28 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class AdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP_STRING = "map_string"; - private Map mapString = null; + private Map mapString = new HashMap<>(); public static final String JSON_PROPERTY_MAP_NUMBER = "map_number"; - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); public static final String JSON_PROPERTY_MAP_INTEGER = "map_integer"; - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); public static final String JSON_PROPERTY_MAP_BOOLEAN = "map_boolean"; - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); public static final String JSON_PROPERTY_MAP_ARRAY_INTEGER = "map_array_integer"; - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); public static final String JSON_PROPERTY_MAP_ARRAY_ANYTYPE = "map_array_anytype"; - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); public static final String JSON_PROPERTY_MAP_MAP_STRING = "map_map_string"; - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); public static final String JSON_PROPERTY_MAP_MAP_ANYTYPE = "map_map_anytype"; - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1"; private Object anytype1; diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 9ef745281766..f21e248f733c 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -37,7 +37,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index e86c7da2a676..64b6b2ab61c8 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -37,7 +37,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java index b3ff8f6d15a0..5973087e5364 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -39,13 +39,13 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest() { } diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumArrays.java index 11bfa6e6140e..bc7874f42fbf 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -110,7 +110,7 @@ public static ArrayEnumEnum fromValue(String value) { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays() { } diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 1b7673284098..50c5aa83d7ec 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -41,7 +41,7 @@ public class FileSchemaTestClass { private ModelFile _file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = null; + private List files = new ArrayList<>(); public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MapTest.java index 9ac678cecd82..77ddaf9a501e 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MapTest.java @@ -39,7 +39,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MapTest { public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string"; - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -77,13 +77,13 @@ public static InnerEnum fromValue(String value) { } public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string"; - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map"; - private Map directMap = null; + private Map directMap = new HashMap<>(); public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map"; - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest() { } diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index 804bc9719001..a0dca748c468 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -47,7 +47,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private OffsetDateTime dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java index cdf878e02342..8d284276040e 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java @@ -58,7 +58,7 @@ public class Pet { private Set photoUrls = new LinkedHashSet<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/XmlItem.java index 75e399450d07..8a3c6d554ddf 100644 --- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/XmlItem.java @@ -77,7 +77,7 @@ public class XmlItem { private Boolean attributeBoolean; public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array"; - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAME_STRING = "name_string"; private String nameString; @@ -92,10 +92,10 @@ public class XmlItem { private Boolean nameBoolean; public static final String JSON_PROPERTY_NAME_ARRAY = "name_array"; - private List nameArray = null; + private List nameArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array"; - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string"; private String prefixString; @@ -110,10 +110,10 @@ public class XmlItem { private Boolean prefixBoolean; public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array"; - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string"; private String namespaceString; @@ -128,10 +128,10 @@ public class XmlItem { private Boolean namespaceBoolean; public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array"; - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string"; private String prefixNsString; @@ -146,10 +146,10 @@ public class XmlItem { private Boolean prefixNsBoolean; public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array"; - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem() { } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index fc93fa1e4b43..1051d3bdafc2 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -33,35 +33,35 @@ public class AdditionalPropertiesClass { public static final String SERIALIZED_NAME_MAP_STRING = "map_string"; @SerializedName(SERIALIZED_NAME_MAP_STRING) - private Map mapString = null; + private Map mapString = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_NUMBER = "map_number"; @SerializedName(SERIALIZED_NAME_MAP_NUMBER) - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_INTEGER = "map_integer"; @SerializedName(SERIALIZED_NAME_MAP_INTEGER) - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_BOOLEAN = "map_boolean"; @SerializedName(SERIALIZED_NAME_MAP_BOOLEAN) - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_ARRAY_INTEGER = "map_array_integer"; @SerializedName(SERIALIZED_NAME_MAP_ARRAY_INTEGER) - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_ARRAY_ANYTYPE = "map_array_anytype"; @SerializedName(SERIALIZED_NAME_MAP_ARRAY_ANYTYPE) - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_MAP_STRING = "map_map_string"; @SerializedName(SERIALIZED_NAME_MAP_MAP_STRING) - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_MAP_ANYTYPE = "map_map_anytype"; @SerializedName(SERIALIZED_NAME_MAP_MAP_ANYTYPE) - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); public static final String SERIALIZED_NAME_ANYTYPE1 = "anytype_1"; @SerializedName(SERIALIZED_NAME_ANYTYPE1) diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 8b606f0082cd..7d8ee05bce74 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -32,7 +32,7 @@ public class ArrayOfArrayOfNumberOnly { public static final String SERIALIZED_NAME_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_NUMBER) - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index fb0d04c0f1bf..85e904505321 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -32,7 +32,7 @@ public class ArrayOfNumberOnly { public static final String SERIALIZED_NAME_ARRAY_NUMBER = "ArrayNumber"; @SerializedName(SERIALIZED_NAME_ARRAY_NUMBER) - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayTest.java index 208978b8df8b..f064c823a7f5 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -32,15 +32,15 @@ public class ArrayTest { public static final String SERIALIZED_NAME_ARRAY_OF_STRING = "array_of_string"; @SerializedName(SERIALIZED_NAME_ARRAY_OF_STRING) - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); public static final String SERIALIZED_NAME_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_OF_INTEGER) - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); public static final String SERIALIZED_NAME_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_OF_MODEL) - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest() { } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumArrays.java index 51ea72d8520b..ed2e619beb96 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -129,7 +129,7 @@ public ArrayEnumEnum read(final JsonReader jsonReader) throws IOException { public static final String SERIALIZED_NAME_ARRAY_ENUM = "array_enum"; @SerializedName(SERIALIZED_NAME_ARRAY_ENUM) - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays() { } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 7fd560160e50..255d299b1ddc 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -36,7 +36,7 @@ public class FileSchemaTestClass { public static final String SERIALIZED_NAME_FILES = "files"; @SerializedName(SERIALIZED_NAME_FILES) - private List files = null; + private List files = new ArrayList<>(); public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MapTest.java index 5b55f852bf85..21f0bc158bd8 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MapTest.java @@ -31,7 +31,7 @@ public class MapTest { public static final String SERIALIZED_NAME_MAP_MAP_OF_STRING = "map_map_of_string"; @SerializedName(SERIALIZED_NAME_MAP_MAP_OF_STRING) - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -82,15 +82,15 @@ public InnerEnum read(final JsonReader jsonReader) throws IOException { public static final String SERIALIZED_NAME_MAP_OF_ENUM_STRING = "map_of_enum_string"; @SerializedName(SERIALIZED_NAME_MAP_OF_ENUM_STRING) - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); public static final String SERIALIZED_NAME_DIRECT_MAP = "direct_map"; @SerializedName(SERIALIZED_NAME_DIRECT_MAP) - private Map directMap = null; + private Map directMap = new HashMap<>(); public static final String SERIALIZED_NAME_INDIRECT_MAP = "indirect_map"; @SerializedName(SERIALIZED_NAME_INDIRECT_MAP) - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest() { } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index e50b2bf0e7ff..375ab7405d38 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -42,7 +42,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { public static final String SERIALIZED_NAME_MAP = "map"; @SerializedName(SERIALIZED_NAME_MAP) - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Pet.java index 0b3b3be3e1f6..619410ccedf2 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Pet.java @@ -51,7 +51,7 @@ public class Pet { public static final String SERIALIZED_NAME_TAGS = "tags"; @SerializedName(SERIALIZED_NAME_TAGS) - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/XmlItem.java index 66d864c0a25b..7f4526ae0ba3 100644 --- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/XmlItem.java @@ -48,7 +48,7 @@ public class XmlItem { public static final String SERIALIZED_NAME_WRAPPED_ARRAY = "wrapped_array"; @SerializedName(SERIALIZED_NAME_WRAPPED_ARRAY) - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); public static final String SERIALIZED_NAME_NAME_STRING = "name_string"; @SerializedName(SERIALIZED_NAME_NAME_STRING) @@ -68,11 +68,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_NAME_ARRAY = "name_array"; @SerializedName(SERIALIZED_NAME_NAME_ARRAY) - private List nameArray = null; + private List nameArray = new ArrayList<>(); public static final String SERIALIZED_NAME_NAME_WRAPPED_ARRAY = "name_wrapped_array"; @SerializedName(SERIALIZED_NAME_NAME_WRAPPED_ARRAY) - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); public static final String SERIALIZED_NAME_PREFIX_STRING = "prefix_string"; @SerializedName(SERIALIZED_NAME_PREFIX_STRING) @@ -92,11 +92,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_PREFIX_ARRAY = "prefix_array"; @SerializedName(SERIALIZED_NAME_PREFIX_ARRAY) - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); public static final String SERIALIZED_NAME_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; @SerializedName(SERIALIZED_NAME_PREFIX_WRAPPED_ARRAY) - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); public static final String SERIALIZED_NAME_NAMESPACE_STRING = "namespace_string"; @SerializedName(SERIALIZED_NAME_NAMESPACE_STRING) @@ -116,11 +116,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_NAMESPACE_ARRAY = "namespace_array"; @SerializedName(SERIALIZED_NAME_NAMESPACE_ARRAY) - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); public static final String SERIALIZED_NAME_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; @SerializedName(SERIALIZED_NAME_NAMESPACE_WRAPPED_ARRAY) - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); public static final String SERIALIZED_NAME_PREFIX_NS_STRING = "prefix_ns_string"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_STRING) @@ -140,11 +140,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_PREFIX_NS_ARRAY = "prefix_ns_array"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_ARRAY) - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); public static final String SERIALIZED_NAME_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_WRAPPED_ARRAY) - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem() { } diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index fc93fa1e4b43..1051d3bdafc2 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -33,35 +33,35 @@ public class AdditionalPropertiesClass { public static final String SERIALIZED_NAME_MAP_STRING = "map_string"; @SerializedName(SERIALIZED_NAME_MAP_STRING) - private Map mapString = null; + private Map mapString = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_NUMBER = "map_number"; @SerializedName(SERIALIZED_NAME_MAP_NUMBER) - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_INTEGER = "map_integer"; @SerializedName(SERIALIZED_NAME_MAP_INTEGER) - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_BOOLEAN = "map_boolean"; @SerializedName(SERIALIZED_NAME_MAP_BOOLEAN) - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_ARRAY_INTEGER = "map_array_integer"; @SerializedName(SERIALIZED_NAME_MAP_ARRAY_INTEGER) - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_ARRAY_ANYTYPE = "map_array_anytype"; @SerializedName(SERIALIZED_NAME_MAP_ARRAY_ANYTYPE) - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_MAP_STRING = "map_map_string"; @SerializedName(SERIALIZED_NAME_MAP_MAP_STRING) - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_MAP_ANYTYPE = "map_map_anytype"; @SerializedName(SERIALIZED_NAME_MAP_MAP_ANYTYPE) - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); public static final String SERIALIZED_NAME_ANYTYPE1 = "anytype_1"; @SerializedName(SERIALIZED_NAME_ANYTYPE1) diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 8b606f0082cd..7d8ee05bce74 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -32,7 +32,7 @@ public class ArrayOfArrayOfNumberOnly { public static final String SERIALIZED_NAME_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_NUMBER) - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index fb0d04c0f1bf..85e904505321 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -32,7 +32,7 @@ public class ArrayOfNumberOnly { public static final String SERIALIZED_NAME_ARRAY_NUMBER = "ArrayNumber"; @SerializedName(SERIALIZED_NAME_ARRAY_NUMBER) - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayTest.java index 208978b8df8b..f064c823a7f5 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -32,15 +32,15 @@ public class ArrayTest { public static final String SERIALIZED_NAME_ARRAY_OF_STRING = "array_of_string"; @SerializedName(SERIALIZED_NAME_ARRAY_OF_STRING) - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); public static final String SERIALIZED_NAME_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_OF_INTEGER) - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); public static final String SERIALIZED_NAME_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_OF_MODEL) - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest() { } diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumArrays.java index 51ea72d8520b..ed2e619beb96 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -129,7 +129,7 @@ public ArrayEnumEnum read(final JsonReader jsonReader) throws IOException { public static final String SERIALIZED_NAME_ARRAY_ENUM = "array_enum"; @SerializedName(SERIALIZED_NAME_ARRAY_ENUM) - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays() { } diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 7fd560160e50..255d299b1ddc 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -36,7 +36,7 @@ public class FileSchemaTestClass { public static final String SERIALIZED_NAME_FILES = "files"; @SerializedName(SERIALIZED_NAME_FILES) - private List files = null; + private List files = new ArrayList<>(); public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MapTest.java index 5b55f852bf85..21f0bc158bd8 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MapTest.java @@ -31,7 +31,7 @@ public class MapTest { public static final String SERIALIZED_NAME_MAP_MAP_OF_STRING = "map_map_of_string"; @SerializedName(SERIALIZED_NAME_MAP_MAP_OF_STRING) - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -82,15 +82,15 @@ public InnerEnum read(final JsonReader jsonReader) throws IOException { public static final String SERIALIZED_NAME_MAP_OF_ENUM_STRING = "map_of_enum_string"; @SerializedName(SERIALIZED_NAME_MAP_OF_ENUM_STRING) - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); public static final String SERIALIZED_NAME_DIRECT_MAP = "direct_map"; @SerializedName(SERIALIZED_NAME_DIRECT_MAP) - private Map directMap = null; + private Map directMap = new HashMap<>(); public static final String SERIALIZED_NAME_INDIRECT_MAP = "indirect_map"; @SerializedName(SERIALIZED_NAME_INDIRECT_MAP) - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest() { } diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index e50b2bf0e7ff..375ab7405d38 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -42,7 +42,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { public static final String SERIALIZED_NAME_MAP = "map"; @SerializedName(SERIALIZED_NAME_MAP) - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Pet.java index 0b3b3be3e1f6..619410ccedf2 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Pet.java @@ -51,7 +51,7 @@ public class Pet { public static final String SERIALIZED_NAME_TAGS = "tags"; @SerializedName(SERIALIZED_NAME_TAGS) - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/XmlItem.java index 66d864c0a25b..7f4526ae0ba3 100644 --- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/XmlItem.java @@ -48,7 +48,7 @@ public class XmlItem { public static final String SERIALIZED_NAME_WRAPPED_ARRAY = "wrapped_array"; @SerializedName(SERIALIZED_NAME_WRAPPED_ARRAY) - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); public static final String SERIALIZED_NAME_NAME_STRING = "name_string"; @SerializedName(SERIALIZED_NAME_NAME_STRING) @@ -68,11 +68,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_NAME_ARRAY = "name_array"; @SerializedName(SERIALIZED_NAME_NAME_ARRAY) - private List nameArray = null; + private List nameArray = new ArrayList<>(); public static final String SERIALIZED_NAME_NAME_WRAPPED_ARRAY = "name_wrapped_array"; @SerializedName(SERIALIZED_NAME_NAME_WRAPPED_ARRAY) - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); public static final String SERIALIZED_NAME_PREFIX_STRING = "prefix_string"; @SerializedName(SERIALIZED_NAME_PREFIX_STRING) @@ -92,11 +92,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_PREFIX_ARRAY = "prefix_array"; @SerializedName(SERIALIZED_NAME_PREFIX_ARRAY) - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); public static final String SERIALIZED_NAME_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; @SerializedName(SERIALIZED_NAME_PREFIX_WRAPPED_ARRAY) - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); public static final String SERIALIZED_NAME_NAMESPACE_STRING = "namespace_string"; @SerializedName(SERIALIZED_NAME_NAMESPACE_STRING) @@ -116,11 +116,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_NAMESPACE_ARRAY = "namespace_array"; @SerializedName(SERIALIZED_NAME_NAMESPACE_ARRAY) - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); public static final String SERIALIZED_NAME_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; @SerializedName(SERIALIZED_NAME_NAMESPACE_WRAPPED_ARRAY) - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); public static final String SERIALIZED_NAME_PREFIX_NS_STRING = "prefix_ns_string"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_STRING) @@ -140,11 +140,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_PREFIX_NS_ARRAY = "prefix_ns_array"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_ARRAY) - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); public static final String SERIALIZED_NAME_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_WRAPPED_ARRAY) - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem() { } diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index fc93fa1e4b43..1051d3bdafc2 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -33,35 +33,35 @@ public class AdditionalPropertiesClass { public static final String SERIALIZED_NAME_MAP_STRING = "map_string"; @SerializedName(SERIALIZED_NAME_MAP_STRING) - private Map mapString = null; + private Map mapString = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_NUMBER = "map_number"; @SerializedName(SERIALIZED_NAME_MAP_NUMBER) - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_INTEGER = "map_integer"; @SerializedName(SERIALIZED_NAME_MAP_INTEGER) - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_BOOLEAN = "map_boolean"; @SerializedName(SERIALIZED_NAME_MAP_BOOLEAN) - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_ARRAY_INTEGER = "map_array_integer"; @SerializedName(SERIALIZED_NAME_MAP_ARRAY_INTEGER) - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_ARRAY_ANYTYPE = "map_array_anytype"; @SerializedName(SERIALIZED_NAME_MAP_ARRAY_ANYTYPE) - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_MAP_STRING = "map_map_string"; @SerializedName(SERIALIZED_NAME_MAP_MAP_STRING) - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); public static final String SERIALIZED_NAME_MAP_MAP_ANYTYPE = "map_map_anytype"; @SerializedName(SERIALIZED_NAME_MAP_MAP_ANYTYPE) - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); public static final String SERIALIZED_NAME_ANYTYPE1 = "anytype_1"; @SerializedName(SERIALIZED_NAME_ANYTYPE1) diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 8b606f0082cd..7d8ee05bce74 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -32,7 +32,7 @@ public class ArrayOfArrayOfNumberOnly { public static final String SERIALIZED_NAME_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_NUMBER) - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index fb0d04c0f1bf..85e904505321 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -32,7 +32,7 @@ public class ArrayOfNumberOnly { public static final String SERIALIZED_NAME_ARRAY_NUMBER = "ArrayNumber"; @SerializedName(SERIALIZED_NAME_ARRAY_NUMBER) - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayTest.java index 208978b8df8b..f064c823a7f5 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -32,15 +32,15 @@ public class ArrayTest { public static final String SERIALIZED_NAME_ARRAY_OF_STRING = "array_of_string"; @SerializedName(SERIALIZED_NAME_ARRAY_OF_STRING) - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); public static final String SERIALIZED_NAME_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_OF_INTEGER) - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); public static final String SERIALIZED_NAME_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; @SerializedName(SERIALIZED_NAME_ARRAY_ARRAY_OF_MODEL) - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest() { } diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumArrays.java index 51ea72d8520b..ed2e619beb96 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -129,7 +129,7 @@ public ArrayEnumEnum read(final JsonReader jsonReader) throws IOException { public static final String SERIALIZED_NAME_ARRAY_ENUM = "array_enum"; @SerializedName(SERIALIZED_NAME_ARRAY_ENUM) - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays() { } diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 7fd560160e50..255d299b1ddc 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -36,7 +36,7 @@ public class FileSchemaTestClass { public static final String SERIALIZED_NAME_FILES = "files"; @SerializedName(SERIALIZED_NAME_FILES) - private List files = null; + private List files = new ArrayList<>(); public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MapTest.java index 5b55f852bf85..21f0bc158bd8 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MapTest.java @@ -31,7 +31,7 @@ public class MapTest { public static final String SERIALIZED_NAME_MAP_MAP_OF_STRING = "map_map_of_string"; @SerializedName(SERIALIZED_NAME_MAP_MAP_OF_STRING) - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -82,15 +82,15 @@ public InnerEnum read(final JsonReader jsonReader) throws IOException { public static final String SERIALIZED_NAME_MAP_OF_ENUM_STRING = "map_of_enum_string"; @SerializedName(SERIALIZED_NAME_MAP_OF_ENUM_STRING) - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); public static final String SERIALIZED_NAME_DIRECT_MAP = "direct_map"; @SerializedName(SERIALIZED_NAME_DIRECT_MAP) - private Map directMap = null; + private Map directMap = new HashMap<>(); public static final String SERIALIZED_NAME_INDIRECT_MAP = "indirect_map"; @SerializedName(SERIALIZED_NAME_INDIRECT_MAP) - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest() { } diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index e50b2bf0e7ff..375ab7405d38 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -42,7 +42,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { public static final String SERIALIZED_NAME_MAP = "map"; @SerializedName(SERIALIZED_NAME_MAP) - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Pet.java index 0b3b3be3e1f6..619410ccedf2 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Pet.java @@ -51,7 +51,7 @@ public class Pet { public static final String SERIALIZED_NAME_TAGS = "tags"; @SerializedName(SERIALIZED_NAME_TAGS) - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/XmlItem.java index 66d864c0a25b..7f4526ae0ba3 100644 --- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/XmlItem.java @@ -48,7 +48,7 @@ public class XmlItem { public static final String SERIALIZED_NAME_WRAPPED_ARRAY = "wrapped_array"; @SerializedName(SERIALIZED_NAME_WRAPPED_ARRAY) - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); public static final String SERIALIZED_NAME_NAME_STRING = "name_string"; @SerializedName(SERIALIZED_NAME_NAME_STRING) @@ -68,11 +68,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_NAME_ARRAY = "name_array"; @SerializedName(SERIALIZED_NAME_NAME_ARRAY) - private List nameArray = null; + private List nameArray = new ArrayList<>(); public static final String SERIALIZED_NAME_NAME_WRAPPED_ARRAY = "name_wrapped_array"; @SerializedName(SERIALIZED_NAME_NAME_WRAPPED_ARRAY) - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); public static final String SERIALIZED_NAME_PREFIX_STRING = "prefix_string"; @SerializedName(SERIALIZED_NAME_PREFIX_STRING) @@ -92,11 +92,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_PREFIX_ARRAY = "prefix_array"; @SerializedName(SERIALIZED_NAME_PREFIX_ARRAY) - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); public static final String SERIALIZED_NAME_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; @SerializedName(SERIALIZED_NAME_PREFIX_WRAPPED_ARRAY) - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); public static final String SERIALIZED_NAME_NAMESPACE_STRING = "namespace_string"; @SerializedName(SERIALIZED_NAME_NAMESPACE_STRING) @@ -116,11 +116,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_NAMESPACE_ARRAY = "namespace_array"; @SerializedName(SERIALIZED_NAME_NAMESPACE_ARRAY) - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); public static final String SERIALIZED_NAME_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; @SerializedName(SERIALIZED_NAME_NAMESPACE_WRAPPED_ARRAY) - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); public static final String SERIALIZED_NAME_PREFIX_NS_STRING = "prefix_ns_string"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_STRING) @@ -140,11 +140,11 @@ public class XmlItem { public static final String SERIALIZED_NAME_PREFIX_NS_ARRAY = "prefix_ns_array"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_ARRAY) - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); public static final String SERIALIZED_NAME_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; @SerializedName(SERIALIZED_NAME_PREFIX_NS_WRAPPED_ARRAY) - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem() { } diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 3ff2f8823cc0..656bc5ced985 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -46,28 +46,28 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class AdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP_STRING = "map_string"; - private Map mapString = null; + private Map mapString = new HashMap<>(); public static final String JSON_PROPERTY_MAP_NUMBER = "map_number"; - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); public static final String JSON_PROPERTY_MAP_INTEGER = "map_integer"; - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); public static final String JSON_PROPERTY_MAP_BOOLEAN = "map_boolean"; - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); public static final String JSON_PROPERTY_MAP_ARRAY_INTEGER = "map_array_integer"; - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); public static final String JSON_PROPERTY_MAP_ARRAY_ANYTYPE = "map_array_anytype"; - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); public static final String JSON_PROPERTY_MAP_MAP_STRING = "map_map_string"; - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); public static final String JSON_PROPERTY_MAP_MAP_ANYTYPE = "map_map_anytype"; - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1"; private Object anytype1; diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 815ebdc15317..37fe0aed3ebc 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -35,7 +35,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 50dc83cf671e..39e27dda318b 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -35,7 +35,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayTest.java index 85da0bb3ea9f..dbfe323fd6c2 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -37,13 +37,13 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest() { } diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumArrays.java index fd795d68cc8e..725496991005 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -108,7 +108,7 @@ public static ArrayEnumEnum fromValue(String value) { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays() { } diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index c576d944c873..bd9704757703 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -39,7 +39,7 @@ public class FileSchemaTestClass { private ModelFile _file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = null; + private List files = new ArrayList<>(); public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/MapTest.java index f890eccbbc60..045d7b8a085a 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/MapTest.java @@ -37,7 +37,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MapTest { public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string"; - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -75,13 +75,13 @@ public static InnerEnum fromValue(String value) { } public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string"; - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map"; - private Map directMap = null; + private Map directMap = new HashMap<>(); public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map"; - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest() { } diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index f40b19fde4bb..b782bb90c220 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -45,7 +45,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private OffsetDateTime dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Pet.java index 1cb9c104fde7..403bb06d3e9c 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Pet.java @@ -56,7 +56,7 @@ public class Pet { private Set photoUrls = new LinkedHashSet<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/XmlItem.java index 88ea3b5c7e31..bc5780cb6325 100644 --- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/XmlItem.java @@ -75,7 +75,7 @@ public class XmlItem { private Boolean attributeBoolean; public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array"; - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAME_STRING = "name_string"; private String nameString; @@ -90,10 +90,10 @@ public class XmlItem { private Boolean nameBoolean; public static final String JSON_PROPERTY_NAME_ARRAY = "name_array"; - private List nameArray = null; + private List nameArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array"; - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string"; private String prefixString; @@ -108,10 +108,10 @@ public class XmlItem { private Boolean prefixBoolean; public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array"; - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string"; private String namespaceString; @@ -126,10 +126,10 @@ public class XmlItem { private Boolean namespaceBoolean; public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array"; - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string"; private String prefixNsString; @@ -144,10 +144,10 @@ public class XmlItem { private Boolean prefixNsBoolean; public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array"; - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem() { } diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 3ff2f8823cc0..656bc5ced985 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -46,28 +46,28 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class AdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP_STRING = "map_string"; - private Map mapString = null; + private Map mapString = new HashMap<>(); public static final String JSON_PROPERTY_MAP_NUMBER = "map_number"; - private Map mapNumber = null; + private Map mapNumber = new HashMap<>(); public static final String JSON_PROPERTY_MAP_INTEGER = "map_integer"; - private Map mapInteger = null; + private Map mapInteger = new HashMap<>(); public static final String JSON_PROPERTY_MAP_BOOLEAN = "map_boolean"; - private Map mapBoolean = null; + private Map mapBoolean = new HashMap<>(); public static final String JSON_PROPERTY_MAP_ARRAY_INTEGER = "map_array_integer"; - private Map> mapArrayInteger = null; + private Map> mapArrayInteger = new HashMap<>(); public static final String JSON_PROPERTY_MAP_ARRAY_ANYTYPE = "map_array_anytype"; - private Map> mapArrayAnytype = null; + private Map> mapArrayAnytype = new HashMap<>(); public static final String JSON_PROPERTY_MAP_MAP_STRING = "map_map_string"; - private Map> mapMapString = null; + private Map> mapMapString = new HashMap<>(); public static final String JSON_PROPERTY_MAP_MAP_ANYTYPE = "map_map_anytype"; - private Map> mapMapAnytype = null; + private Map> mapMapAnytype = new HashMap<>(); public static final String JSON_PROPERTY_ANYTYPE1 = "anytype_1"; private Object anytype1; diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 815ebdc15317..37fe0aed3ebc 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -35,7 +35,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 50dc83cf671e..39e27dda318b 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -35,7 +35,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayTest.java index 85da0bb3ea9f..dbfe323fd6c2 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -37,13 +37,13 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest() { } diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumArrays.java index fd795d68cc8e..725496991005 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -108,7 +108,7 @@ public static ArrayEnumEnum fromValue(String value) { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays() { } diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index c576d944c873..bd9704757703 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -39,7 +39,7 @@ public class FileSchemaTestClass { private ModelFile _file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = null; + private List files = new ArrayList<>(); public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MapTest.java index f890eccbbc60..045d7b8a085a 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MapTest.java @@ -37,7 +37,7 @@ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MapTest { public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string"; - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -75,13 +75,13 @@ public static InnerEnum fromValue(String value) { } public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string"; - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map"; - private Map directMap = null; + private Map directMap = new HashMap<>(); public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map"; - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest() { } diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index f40b19fde4bb..b782bb90c220 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -45,7 +45,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private OffsetDateTime dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Pet.java index 1cb9c104fde7..403bb06d3e9c 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Pet.java @@ -56,7 +56,7 @@ public class Pet { private Set photoUrls = new LinkedHashSet<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/XmlItem.java index 88ea3b5c7e31..bc5780cb6325 100644 --- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/XmlItem.java +++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/XmlItem.java @@ -75,7 +75,7 @@ public class XmlItem { private Boolean attributeBoolean; public static final String JSON_PROPERTY_WRAPPED_ARRAY = "wrapped_array"; - private List wrappedArray = null; + private List wrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAME_STRING = "name_string"; private String nameString; @@ -90,10 +90,10 @@ public class XmlItem { private Boolean nameBoolean; public static final String JSON_PROPERTY_NAME_ARRAY = "name_array"; - private List nameArray = null; + private List nameArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAME_WRAPPED_ARRAY = "name_wrapped_array"; - private List nameWrappedArray = null; + private List nameWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_STRING = "prefix_string"; private String prefixString; @@ -108,10 +108,10 @@ public class XmlItem { private Boolean prefixBoolean; public static final String JSON_PROPERTY_PREFIX_ARRAY = "prefix_array"; - private List prefixArray = null; + private List prefixArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_WRAPPED_ARRAY = "prefix_wrapped_array"; - private List prefixWrappedArray = null; + private List prefixWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAMESPACE_STRING = "namespace_string"; private String namespaceString; @@ -126,10 +126,10 @@ public class XmlItem { private Boolean namespaceBoolean; public static final String JSON_PROPERTY_NAMESPACE_ARRAY = "namespace_array"; - private List namespaceArray = null; + private List namespaceArray = new ArrayList<>(); public static final String JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY = "namespace_wrapped_array"; - private List namespaceWrappedArray = null; + private List namespaceWrappedArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_NS_STRING = "prefix_ns_string"; private String prefixNsString; @@ -144,10 +144,10 @@ public class XmlItem { private Boolean prefixNsBoolean; public static final String JSON_PROPERTY_PREFIX_NS_ARRAY = "prefix_ns_array"; - private List prefixNsArray = null; + private List prefixNsArray = new ArrayList<>(); public static final String JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY = "prefix_ns_wrapped_array"; - private List prefixNsWrappedArray = null; + private List prefixNsWrappedArray = new ArrayList<>(); public XmlItem() { } diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 259c19348e8f..847501a73d17 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -35,10 +35,10 @@ @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class AdditionalPropertiesClass { public static final String JSON_PROPERTY_MAP_PROPERTY = "map_property"; - private Map mapProperty = null; + private Map mapProperty = new HashMap<>(); public static final String JSON_PROPERTY_MAP_OF_MAP_PROPERTY = "map_of_map_property"; - private Map> mapOfMapProperty = null; + private Map> mapOfMapProperty = new HashMap<>(); public AdditionalPropertiesClass() { } diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 5d9db7068fe2..85cfd25c4aae 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -35,7 +35,7 @@ @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber"; - private List> arrayArrayNumber = null; + private List> arrayArrayNumber = new ArrayList<>(); public ArrayOfArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index c2c1cc5ec8cd..1c03075765dc 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -35,7 +35,7 @@ @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfNumberOnly { public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber"; - private List arrayNumber = null; + private List arrayNumber = new ArrayList<>(); public ArrayOfNumberOnly() { } diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayTest.java index 4fb1bc9041f1..4a8f95567c65 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -37,13 +37,13 @@ @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayTest { public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string"; - private List arrayOfString = null; + private List arrayOfString = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer"; - private List> arrayArrayOfInteger = null; + private List> arrayArrayOfInteger = new ArrayList<>(); public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model"; - private List> arrayArrayOfModel = null; + private List> arrayArrayOfModel = new ArrayList<>(); public ArrayTest() { } diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumArrays.java index 7b9be55f4829..5da8c06a69f1 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -108,7 +108,7 @@ public static ArrayEnumEnum fromValue(String value) { } public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum"; - private List arrayEnum = null; + private List arrayEnum = new ArrayList<>(); public EnumArrays() { } diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index 3c224df785d0..318e5e3acb63 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -39,7 +39,7 @@ public class FileSchemaTestClass { private ModelFile _file; public static final String JSON_PROPERTY_FILES = "files"; - private List files = null; + private List files = new ArrayList<>(); public FileSchemaTestClass() { } diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/MapTest.java index ab80eb910794..1147b6b54a99 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/MapTest.java @@ -37,7 +37,7 @@ @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class MapTest { public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string"; - private Map> mapMapOfString = null; + private Map> mapMapOfString = new HashMap<>(); /** * Gets or Sets inner @@ -75,13 +75,13 @@ public static InnerEnum fromValue(String value) { } public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string"; - private Map mapOfEnumString = null; + private Map mapOfEnumString = new HashMap<>(); public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map"; - private Map directMap = null; + private Map directMap = new HashMap<>(); public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map"; - private Map indirectMap = null; + private Map indirectMap = new HashMap<>(); public MapTest() { } diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index afc126869142..7761b5cc7b40 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -45,7 +45,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { private OffsetDateTime dateTime; public static final String JSON_PROPERTY_MAP = "map"; - private Map map = null; + private Map map = new HashMap<>(); public MixedPropertiesAndAdditionalPropertiesClass() { } diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/NullableClass.java index 8b06f2b3d533..dfd5ef1d18b4 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/NullableClass.java @@ -78,7 +78,7 @@ public class NullableClass extends HashMap { private JsonNullable> arrayAndItemsNullableProp = JsonNullable.>undefined(); public static final String JSON_PROPERTY_ARRAY_ITEMS_NULLABLE = "array_items_nullable"; - private List arrayItemsNullable = null; + private List arrayItemsNullable = new ArrayList<>(); public static final String JSON_PROPERTY_OBJECT_NULLABLE_PROP = "object_nullable_prop"; private JsonNullable> objectNullableProp = JsonNullable.>undefined(); @@ -87,7 +87,7 @@ public class NullableClass extends HashMap { private JsonNullable> objectAndItemsNullableProp = JsonNullable.>undefined(); public static final String JSON_PROPERTY_OBJECT_ITEMS_NULLABLE = "object_items_nullable"; - private Map objectItemsNullable = null; + private Map objectItemsNullable = new HashMap<>(); public NullableClass() { @@ -305,7 +305,7 @@ public NullableClass arrayNullableProp(List arrayNullableProp) { public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) { if (this.arrayNullableProp == null || !this.arrayNullableProp.isPresent()) { - this.arrayNullableProp = JsonNullable.>of(new ArrayList<>()); + this.arrayNullableProp = JsonNullable.>of(null); } try { this.arrayNullableProp.get().add(arrayNullablePropItem); @@ -351,7 +351,7 @@ public NullableClass arrayAndItemsNullableProp(List arrayAndItemsNullabl public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullablePropItem) { if (this.arrayAndItemsNullableProp == null || !this.arrayAndItemsNullableProp.isPresent()) { - this.arrayAndItemsNullableProp = JsonNullable.>of(new ArrayList<>()); + this.arrayAndItemsNullableProp = JsonNullable.>of(null); } try { this.arrayAndItemsNullableProp.get().add(arrayAndItemsNullablePropItem); @@ -431,7 +431,7 @@ public NullableClass objectNullableProp(Map objectNullableProp) public NullableClass putObjectNullablePropItem(String key, Object objectNullablePropItem) { if (this.objectNullableProp == null || !this.objectNullableProp.isPresent()) { - this.objectNullableProp = JsonNullable.>of(new HashMap<>()); + this.objectNullableProp = JsonNullable.>of(null); } try { this.objectNullableProp.get().put(key, objectNullablePropItem); @@ -477,7 +477,7 @@ public NullableClass objectAndItemsNullableProp(Map objectAndIte public NullableClass putObjectAndItemsNullablePropItem(String key, Object objectAndItemsNullablePropItem) { if (this.objectAndItemsNullableProp == null || !this.objectAndItemsNullableProp.isPresent()) { - this.objectAndItemsNullableProp = JsonNullable.>of(new HashMap<>()); + this.objectAndItemsNullableProp = JsonNullable.>of(null); } try { this.objectAndItemsNullableProp.get().put(key, objectAndItemsNullablePropItem); diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index d15e791df548..4939749b0b70 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -48,7 +48,7 @@ public class ObjectWithDeprecatedFields { private DeprecatedObject deprecatedRef; public static final String JSON_PROPERTY_BARS = "bars"; - private List bars = null; + private List bars = new ArrayList<>(); public ObjectWithDeprecatedFields() { } diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Pet.java index a1c5bce636ef..764c15ca6303 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Pet.java @@ -56,7 +56,7 @@ public class Pet { private Set photoUrls = new LinkedHashSet<>(); public static final String JSON_PROPERTY_TAGS = "tags"; - private List tags = null; + private List tags = new ArrayList<>(); /** * pet status in the store diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java index 2bfa18f61d93..f9d1908df762 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java @@ -51,7 +51,7 @@ public AdditionalPropertiesClass mapProperty(Map mapProperty) { public AdditionalPropertiesClass putMapPropertyItem(String key, String mapPropertyItem) { if (this.mapProperty == null) { - this.mapProperty = new HashMap<>(); + this.mapProperty = null; } this.mapProperty.put(key, mapPropertyItem); return this; @@ -85,7 +85,7 @@ public AdditionalPropertiesClass mapOfMapProperty(Map mapOfMapPropertyItem) { if (this.mapOfMapProperty == null) { - this.mapOfMapProperty = new HashMap<>(); + this.mapOfMapProperty = null; } this.mapOfMapProperty.put(key, mapOfMapPropertyItem); return this; diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java index 815ebdc15317..7729eedac4b7 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java @@ -48,7 +48,7 @@ public ArrayOfArrayOfNumberOnly arrayArrayNumber(List> arrayArr public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List arrayArrayNumberItem) { if (this.arrayArrayNumber == null) { - this.arrayArrayNumber = new ArrayList<>(); + this.arrayArrayNumber = null; } this.arrayArrayNumber.add(arrayArrayNumberItem); return this; diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java index 50dc83cf671e..20fa6c02c339 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java @@ -48,7 +48,7 @@ public ArrayOfNumberOnly arrayNumber(List arrayNumber) { public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) { if (this.arrayNumber == null) { - this.arrayNumber = new ArrayList<>(); + this.arrayNumber = null; } this.arrayNumber.add(arrayNumberItem); return this; diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayTest.java index 85da0bb3ea9f..fb1542f33ba2 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayTest.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayTest.java @@ -56,7 +56,7 @@ public ArrayTest arrayOfString(List arrayOfString) { public ArrayTest addArrayOfStringItem(String arrayOfStringItem) { if (this.arrayOfString == null) { - this.arrayOfString = new ArrayList<>(); + this.arrayOfString = null; } this.arrayOfString.add(arrayOfStringItem); return this; @@ -90,7 +90,7 @@ public ArrayTest arrayArrayOfInteger(List> arrayArrayOfInteger) { public ArrayTest addArrayArrayOfIntegerItem(List arrayArrayOfIntegerItem) { if (this.arrayArrayOfInteger == null) { - this.arrayArrayOfInteger = new ArrayList<>(); + this.arrayArrayOfInteger = null; } this.arrayArrayOfInteger.add(arrayArrayOfIntegerItem); return this; @@ -124,7 +124,7 @@ public ArrayTest arrayArrayOfModel(List> arrayArrayOfModel) public ArrayTest addArrayArrayOfModelItem(List arrayArrayOfModelItem) { if (this.arrayArrayOfModel == null) { - this.arrayArrayOfModel = new ArrayList<>(); + this.arrayArrayOfModel = null; } this.arrayArrayOfModel.add(arrayArrayOfModelItem); return this; diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumArrays.java index fd795d68cc8e..46e76d1f7430 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumArrays.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumArrays.java @@ -147,7 +147,7 @@ public EnumArrays arrayEnum(List arrayEnum) { public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) { if (this.arrayEnum == null) { - this.arrayEnum = new ArrayList<>(); + this.arrayEnum = null; } this.arrayEnum.add(arrayEnumItem); return this; diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java index c576d944c873..0db455cb6326 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java @@ -78,7 +78,7 @@ public FileSchemaTestClass files(List files) { public FileSchemaTestClass addFilesItem(ModelFile filesItem) { if (this.files == null) { - this.files = new ArrayList<>(); + this.files = null; } this.files.add(filesItem); return this; diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MapTest.java index f890eccbbc60..3d6c7ba4f45a 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MapTest.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MapTest.java @@ -94,7 +94,7 @@ public MapTest mapMapOfString(Map> mapMapOfString) { public MapTest putMapMapOfStringItem(String key, Map mapMapOfStringItem) { if (this.mapMapOfString == null) { - this.mapMapOfString = new HashMap<>(); + this.mapMapOfString = null; } this.mapMapOfString.put(key, mapMapOfStringItem); return this; @@ -128,7 +128,7 @@ public MapTest mapOfEnumString(Map mapOfEnumString) { public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) { if (this.mapOfEnumString == null) { - this.mapOfEnumString = new HashMap<>(); + this.mapOfEnumString = null; } this.mapOfEnumString.put(key, mapOfEnumStringItem); return this; @@ -162,7 +162,7 @@ public MapTest directMap(Map directMap) { public MapTest putDirectMapItem(String key, Boolean directMapItem) { if (this.directMap == null) { - this.directMap = new HashMap<>(); + this.directMap = null; } this.directMap.put(key, directMapItem); return this; @@ -196,7 +196,7 @@ public MapTest indirectMap(Map indirectMap) { public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) { if (this.indirectMap == null) { - this.indirectMap = new HashMap<>(); + this.indirectMap = null; } this.indirectMap.put(key, indirectMapItem); return this; diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java index f40b19fde4bb..340223cd1365 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -110,7 +110,7 @@ public MixedPropertiesAndAdditionalPropertiesClass map(Map map) public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) { if (this.map == null) { - this.map = new HashMap<>(); + this.map = null; } this.map.put(key, mapItem); return this; diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NullableClass.java index 34722a920930..39f24d625a2c 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NullableClass.java @@ -305,7 +305,7 @@ public NullableClass arrayNullableProp(List arrayNullableProp) { public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) { if (this.arrayNullableProp == null || !this.arrayNullableProp.isPresent()) { - this.arrayNullableProp = JsonNullable.>of(new ArrayList<>()); + this.arrayNullableProp = JsonNullable.>of(null); } try { this.arrayNullableProp.get().add(arrayNullablePropItem); @@ -351,7 +351,7 @@ public NullableClass arrayAndItemsNullableProp(List arrayAndItemsNullabl public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullablePropItem) { if (this.arrayAndItemsNullableProp == null || !this.arrayAndItemsNullableProp.isPresent()) { - this.arrayAndItemsNullableProp = JsonNullable.>of(new ArrayList<>()); + this.arrayAndItemsNullableProp = JsonNullable.>of(null); } try { this.arrayAndItemsNullableProp.get().add(arrayAndItemsNullablePropItem); @@ -397,7 +397,7 @@ public NullableClass arrayItemsNullable(List arrayItemsNullable) { public NullableClass addArrayItemsNullableItem(Object arrayItemsNullableItem) { if (this.arrayItemsNullable == null) { - this.arrayItemsNullable = new ArrayList<>(); + this.arrayItemsNullable = null; } this.arrayItemsNullable.add(arrayItemsNullableItem); return this; @@ -431,7 +431,7 @@ public NullableClass objectNullableProp(Map objectNullableProp) public NullableClass putObjectNullablePropItem(String key, Object objectNullablePropItem) { if (this.objectNullableProp == null || !this.objectNullableProp.isPresent()) { - this.objectNullableProp = JsonNullable.>of(new HashMap<>()); + this.objectNullableProp = JsonNullable.>of(null); } try { this.objectNullableProp.get().put(key, objectNullablePropItem); @@ -477,7 +477,7 @@ public NullableClass objectAndItemsNullableProp(Map objectAndIte public NullableClass putObjectAndItemsNullablePropItem(String key, Object objectAndItemsNullablePropItem) { if (this.objectAndItemsNullableProp == null || !this.objectAndItemsNullableProp.isPresent()) { - this.objectAndItemsNullableProp = JsonNullable.>of(new HashMap<>()); + this.objectAndItemsNullableProp = JsonNullable.>of(null); } try { this.objectAndItemsNullableProp.get().put(key, objectAndItemsNullablePropItem); @@ -523,7 +523,7 @@ public NullableClass objectItemsNullable(Map objectItemsNullable public NullableClass putObjectItemsNullableItem(String key, Object objectItemsNullableItem) { if (this.objectItemsNullable == null) { - this.objectItemsNullable = new HashMap<>(); + this.objectItemsNullable = null; } this.objectItemsNullable.put(key, objectItemsNullableItem); return this; diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java index 7f3f584ade0f..1d9eb6b07cf5 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java @@ -143,7 +143,7 @@ public ObjectWithDeprecatedFields bars(List bars) { public ObjectWithDeprecatedFields addBarsItem(String barsItem) { if (this.bars == null) { - this.bars = new ArrayList<>(); + this.bars = null; } this.bars.add(barsItem); return this; diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Pet.java index 1cb9c104fde7..6c5498646bc8 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Pet.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Pet.java @@ -53,7 +53,7 @@ public class Pet { private String name; public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls"; - private Set photoUrls = new LinkedHashSet<>(); + private Set photoUrls = null; public static final String JSON_PROPERTY_TAGS = "tags"; private List tags = null; @@ -219,7 +219,7 @@ public Pet tags(List tags) { public Pet addTagsItem(Tag tagsItem) { if (this.tags == null) { - this.tags = new ArrayList<>(); + this.tags = null; } this.tags.add(tagsItem); return this; diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableClass.java index 8a6973cd2bb9..e2c21ac252cc 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableClass.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NullableClass.java @@ -304,7 +304,7 @@ public NullableClass arrayNullableProp(List arrayNullableProp) { public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) { if (this.arrayNullableProp == null || !this.arrayNullableProp.isPresent()) { - this.arrayNullableProp = JsonNullable.>of(new ArrayList<>()); + this.arrayNullableProp = JsonNullable.>of(null); } try { this.arrayNullableProp.get().add(arrayNullablePropItem); @@ -349,7 +349,7 @@ public NullableClass arrayAndItemsNullableProp(List arrayAndItemsNullabl public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullablePropItem) { if (this.arrayAndItemsNullableProp == null || !this.arrayAndItemsNullableProp.isPresent()) { - this.arrayAndItemsNullableProp = JsonNullable.>of(new ArrayList<>()); + this.arrayAndItemsNullableProp = JsonNullable.>of(null); } try { this.arrayAndItemsNullableProp.get().add(arrayAndItemsNullablePropItem); @@ -427,7 +427,7 @@ public NullableClass objectNullableProp(Map objectNullableProp) public NullableClass putObjectNullablePropItem(String key, Object objectNullablePropItem) { if (this.objectNullableProp == null || !this.objectNullableProp.isPresent()) { - this.objectNullableProp = JsonNullable.>of(new HashMap<>()); + this.objectNullableProp = JsonNullable.>of(null); } try { this.objectNullableProp.get().put(key, objectNullablePropItem); @@ -472,7 +472,7 @@ public NullableClass objectAndItemsNullableProp(Map objectAndIte public NullableClass putObjectAndItemsNullablePropItem(String key, Object objectAndItemsNullablePropItem) { if (this.objectAndItemsNullableProp == null || !this.objectAndItemsNullableProp.isPresent()) { - this.objectAndItemsNullableProp = JsonNullable.>of(new HashMap<>()); + this.objectAndItemsNullableProp = JsonNullable.>of(null); } try { this.objectAndItemsNullableProp.get().put(key, objectAndItemsNullablePropItem); diff --git a/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/NullableClass.java b/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/NullableClass.java index 2e2c2659cd44..54650f48eef7 100644 --- a/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/NullableClass.java +++ b/samples/server/petstore/java-helidon-server/se/src/main/java/org/openapitools/server/model/NullableClass.java @@ -19,11 +19,11 @@ public class NullableClass extends HashMap { private String stringProp; private LocalDate dateProp; private OffsetDateTime datetimeProp; - private List arrayNullableProp = new ArrayList<>(); - private List arrayAndItemsNullableProp = new ArrayList<>(); + private List arrayNullableProp = null; + private List arrayAndItemsNullableProp = null; private List arrayItemsNullable = new ArrayList<>(); - private Map objectNullableProp = new HashMap<>(); - private Map objectAndItemsNullableProp = new HashMap<>(); + private Map objectNullableProp = null; + private Map objectAndItemsNullableProp = null; private Map objectItemsNullable = new HashMap<>(); /** diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/NullableClass.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/NullableClass.java index 216118481757..d6cbf2beba76 100644 --- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/NullableClass.java +++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/NullableClass.java @@ -222,7 +222,7 @@ public NullableClass arrayNullableProp(List arrayNullableProp) { public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) { if (this.arrayNullableProp == null) { - this.arrayNullableProp = new ArrayList<>(); + this.arrayNullableProp = null; } this.arrayNullableProp.add(arrayNullablePropItem); return this; @@ -250,7 +250,7 @@ public NullableClass arrayAndItemsNullableProp(List arrayAndItemsNullabl public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullablePropItem) { if (this.arrayAndItemsNullableProp == null) { - this.arrayAndItemsNullableProp = new ArrayList<>(); + this.arrayAndItemsNullableProp = null; } this.arrayAndItemsNullableProp.add(arrayAndItemsNullablePropItem); return this; @@ -306,7 +306,7 @@ public NullableClass objectNullableProp(Map objectNullableProp) public NullableClass putObjectNullablePropItem(String key, Object objectNullablePropItem) { if (this.objectNullableProp == null) { - this.objectNullableProp = new HashMap<>(); + this.objectNullableProp = null; } this.objectNullableProp.put(key, objectNullablePropItem); return this; @@ -334,7 +334,7 @@ public NullableClass objectAndItemsNullableProp(Map objectAndIte public NullableClass putObjectAndItemsNullablePropItem(String key, Object objectAndItemsNullablePropItem) { if (this.objectAndItemsNullableProp == null) { - this.objectAndItemsNullableProp = new HashMap<>(); + this.objectAndItemsNullableProp = null; } this.objectAndItemsNullableProp.put(key, objectAndItemsNullablePropItem); return this; diff --git a/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java b/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java index 06109fa9beae..3c83acd48f61 100644 --- a/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java +++ b/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java @@ -62,7 +62,7 @@ public ObjectWithUniqueItems nullSet(Set nullSet) { public ObjectWithUniqueItems addNullSetItem(String nullSetItem) { if (this.nullSet == null || !this.nullSet.isPresent()) { - this.nullSet = JsonNullable.of(new LinkedHashSet<>()); + this.nullSet = JsonNullable.of(null); } this.nullSet.get().add(nullSetItem); return this; @@ -117,7 +117,7 @@ public ObjectWithUniqueItems nullList(List nullList) { public ObjectWithUniqueItems addNullListItem(String nullListItem) { if (this.nullList == null || !this.nullList.isPresent()) { - this.nullList = JsonNullable.of(new ArrayList<>()); + this.nullList = JsonNullable.of(null); } this.nullList.get().add(nullListItem); return this;