diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/pojo.mustache index 3a75c9fba9bf..afc7c8c39ff2 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/restclient/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/restclient/pojo.mustache @@ -67,7 +67,12 @@ public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#v {{#gson}} @SerializedName(SERIALIZED_NAME_{{nameInSnakeCase}}) {{/gson}} + {{^isDiscriminator}} {{>nullable_var_annotations}}{{! prevent indent}} + {{/isDiscriminator}} + {{#isDiscriminator}} + // The discriminator does not have Nullability-annotation since it is added during serialization by the @JsonTypeName annotation + {{/isDiscriminator}} {{#vendorExtensions.x-field-extra-annotation}} {{{vendorExtensions.x-field-extra-annotation}}} {{/vendorExtensions.x-field-extra-annotation}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache index a913065409bd..229586076fff 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache @@ -67,7 +67,12 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens {{#gson}} @SerializedName(SERIALIZED_NAME_{{nameInSnakeCase}}) {{/gson}} + {{^isDiscriminator}} {{>nullable_var_annotations}}{{! prevent indent}} + {{/isDiscriminator}} + {{#isDiscriminator}} + // The discriminator does not have Nullability-annotation since it is added during serialization by the @JsonTypeName annotation + {{/isDiscriminator}} {{#vendorExtensions.x-field-extra-annotation}} {{{vendorExtensions.x-field-extra-annotation}}} {{/vendorExtensions.x-field-extra-annotation}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pojo.mustache index 258e060a946b..1db407b3972d 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pojo.mustache @@ -67,7 +67,12 @@ public {{>sealed}}class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#v {{#gson}} @SerializedName(SERIALIZED_NAME_{{nameInSnakeCase}}) {{/gson}} + {{^isDiscriminator}} {{>nullable_var_annotations}}{{! prevent indent}} + {{/isDiscriminator}} + {{#isDiscriminator}} + // The discriminator does not have Nullability-annotation since it is added during serialization by the @JsonTypeName annotation + {{/isDiscriminator}} {{#vendorExtensions.x-field-extra-annotation}} {{{vendorExtensions.x-field-extra-annotation}}} {{/vendorExtensions.x-field-extra-annotation}} diff --git a/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Apple.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Apple.java index 43da5bb89f7d..6b39ead5e9bf 100644 --- a/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Apple.java +++ b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Apple.java @@ -41,7 +41,7 @@ public final class Apple implements Fruit { private Integer seeds; public static final String JSON_PROPERTY_FRUIT_TYPE = "fruitType"; - @javax.annotation.Nonnull + // The discriminator does not have Nullability-annotation since it is added during serialization by the @JsonTypeName annotation private FruitType fruitType; public Apple() { diff --git a/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Banana.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Banana.java index ef87516eed71..75414acb4b64 100644 --- a/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Banana.java +++ b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Banana.java @@ -41,7 +41,7 @@ public final class Banana implements Fruit { private Integer length; public static final String JSON_PROPERTY_FRUIT_TYPE = "fruitType"; - @javax.annotation.Nonnull + // The discriminator does not have Nullability-annotation since it is added during serialization by the @JsonTypeName annotation private FruitType fruitType; public Banana() { diff --git a/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Entity.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Entity.java index a60e9b783b86..48ab7abee50d 100644 --- a/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Entity.java +++ b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Entity.java @@ -70,7 +70,7 @@ public class Entity { protected String atBaseType; public static final String JSON_PROPERTY_AT_TYPE = "@type"; - @javax.annotation.Nonnull + // The discriminator does not have Nullability-annotation since it is added during serialization by the @JsonTypeName annotation protected String atType; public Entity() { diff --git a/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/EntityRef.java b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/EntityRef.java index 0ba18979052d..4cc979c6ff88 100644 --- a/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/EntityRef.java +++ b/samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/EntityRef.java @@ -76,7 +76,7 @@ public class EntityRef { protected String atBaseType; public static final String JSON_PROPERTY_AT_TYPE = "@type"; - @javax.annotation.Nonnull + // The discriminator does not have Nullability-annotation since it is added during serialization by the @JsonTypeName annotation protected String atType; public EntityRef() { diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Animal.java index 35fde59be1a8..c7fd1c2c246f 100644 --- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Animal.java @@ -48,7 +48,7 @@ public class Animal { public static final String JSON_PROPERTY_CLASS_NAME = "className"; - @jakarta.annotation.Nonnull + // The discriminator does not have Nullability-annotation since it is added during serialization by the @JsonTypeName annotation protected String className; public static final String JSON_PROPERTY_COLOR = "color"; diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ParentWithNullable.java index 7bfadd2a4a1f..ab5de6c16c26 100644 --- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ParentWithNullable.java +++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ParentWithNullable.java @@ -84,7 +84,7 @@ public static TypeEnum fromValue(String value) { } public static final String JSON_PROPERTY_TYPE = "type"; - @jakarta.annotation.Nullable + // The discriminator does not have Nullability-annotation since it is added during serialization by the @JsonTypeName annotation protected TypeEnum type; public static final String JSON_PROPERTY_NULLABLE_PROPERTY = "nullableProperty"; diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/Animal.java index a6079a052a2f..84a9add8d585 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/Animal.java @@ -47,7 +47,7 @@ public class Animal { public static final String JSON_PROPERTY_CLASS_NAME = "className"; - @jakarta.annotation.Nonnull + // The discriminator does not have Nullability-annotation since it is added during serialization by the @JsonTypeName annotation protected String className; public static final String JSON_PROPERTY_COLOR = "color"; diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/ParentWithNullable.java index c7397c9497b4..b3f4cd54e736 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/ParentWithNullable.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/ParentWithNullable.java @@ -83,7 +83,7 @@ public static TypeEnum fromValue(String value) { } public static final String JSON_PROPERTY_TYPE = "type"; - @jakarta.annotation.Nullable + // The discriminator does not have Nullability-annotation since it is added during serialization by the @JsonTypeName annotation protected TypeEnum type; public static final String JSON_PROPERTY_NULLABLE_PROPERTY = "nullableProperty"; diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Animal.java index a6079a052a2f..84a9add8d585 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Animal.java @@ -47,7 +47,7 @@ public class Animal { public static final String JSON_PROPERTY_CLASS_NAME = "className"; - @jakarta.annotation.Nonnull + // The discriminator does not have Nullability-annotation since it is added during serialization by the @JsonTypeName annotation protected String className; public static final String JSON_PROPERTY_COLOR = "color"; diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/ParentWithNullable.java index c7397c9497b4..b3f4cd54e736 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/ParentWithNullable.java +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/ParentWithNullable.java @@ -83,7 +83,7 @@ public static TypeEnum fromValue(String value) { } public static final String JSON_PROPERTY_TYPE = "type"; - @jakarta.annotation.Nullable + // The discriminator does not have Nullability-annotation since it is added during serialization by the @JsonTypeName annotation protected TypeEnum type; public static final String JSON_PROPERTY_NULLABLE_PROPERTY = "nullableProperty"; diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Animal.java index a6079a052a2f..84a9add8d585 100644 --- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Animal.java @@ -47,7 +47,7 @@ public class Animal { public static final String JSON_PROPERTY_CLASS_NAME = "className"; - @jakarta.annotation.Nonnull + // The discriminator does not have Nullability-annotation since it is added during serialization by the @JsonTypeName annotation protected String className; public static final String JSON_PROPERTY_COLOR = "color"; diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ParentWithNullable.java index c7397c9497b4..b3f4cd54e736 100644 --- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ParentWithNullable.java +++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ParentWithNullable.java @@ -83,7 +83,7 @@ public static TypeEnum fromValue(String value) { } public static final String JSON_PROPERTY_TYPE = "type"; - @jakarta.annotation.Nullable + // The discriminator does not have Nullability-annotation since it is added during serialization by the @JsonTypeName annotation protected TypeEnum type; public static final String JSON_PROPERTY_NULLABLE_PROPERTY = "nullableProperty"; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java index b7f541cdbd5b..a8f993f5fc4c 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java @@ -55,7 +55,7 @@ public class Animal { public static final String JSON_PROPERTY_CLASS_NAME = "className"; @XmlElement(name = "className") - @javax.annotation.Nonnull + // The discriminator does not have Nullability-annotation since it is added during serialization by the @JsonTypeName annotation protected String className; public static final String JSON_PROPERTY_COLOR = "color"; diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ParentWithNullable.java index 4864de7df6c1..ec4398a1a3d9 100644 --- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ParentWithNullable.java +++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ParentWithNullable.java @@ -94,7 +94,7 @@ public static TypeEnum fromValue(String value) { public static final String JSON_PROPERTY_TYPE = "type"; @XmlElement(name = "type") - @javax.annotation.Nullable + // The discriminator does not have Nullability-annotation since it is added during serialization by the @JsonTypeName annotation protected TypeEnum type; public static final String JSON_PROPERTY_NULLABLE_PROPERTY = "nullableProperty"; diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Animal.java index 6ad5d759dd20..78dcd2afffad 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Animal.java @@ -47,7 +47,7 @@ public class Animal { public static final String JSON_PROPERTY_CLASS_NAME = "className"; - @javax.annotation.Nonnull + // The discriminator does not have Nullability-annotation since it is added during serialization by the @JsonTypeName annotation protected String className; public static final String JSON_PROPERTY_COLOR = "color"; diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ParentWithNullable.java index 8eac0383a47a..ddcef5db681c 100644 --- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ParentWithNullable.java +++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ParentWithNullable.java @@ -83,7 +83,7 @@ public static TypeEnum fromValue(String value) { } public static final String JSON_PROPERTY_TYPE = "type"; - @javax.annotation.Nullable + // The discriminator does not have Nullability-annotation since it is added during serialization by the @JsonTypeName annotation protected TypeEnum type; public static final String JSON_PROPERTY_NULLABLE_PROPERTY = "nullableProperty"; diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Animal.java index a6079a052a2f..84a9add8d585 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Animal.java @@ -47,7 +47,7 @@ public class Animal { public static final String JSON_PROPERTY_CLASS_NAME = "className"; - @jakarta.annotation.Nonnull + // The discriminator does not have Nullability-annotation since it is added during serialization by the @JsonTypeName annotation protected String className; public static final String JSON_PROPERTY_COLOR = "color"; diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ParentWithNullable.java index c7397c9497b4..b3f4cd54e736 100644 --- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ParentWithNullable.java +++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ParentWithNullable.java @@ -83,7 +83,7 @@ public static TypeEnum fromValue(String value) { } public static final String JSON_PROPERTY_TYPE = "type"; - @jakarta.annotation.Nullable + // The discriminator does not have Nullability-annotation since it is added during serialization by the @JsonTypeName annotation protected TypeEnum type; public static final String JSON_PROPERTY_NULLABLE_PROPERTY = "nullableProperty"; diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Animal.java index 294c669464e9..084e99d058d2 100644 --- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Animal.java @@ -48,7 +48,7 @@ public class Animal { public static final String JSON_PROPERTY_CLASS_NAME = "className"; - @javax.annotation.Nonnull + // The discriminator does not have Nullability-annotation since it is added during serialization by the @JsonTypeName annotation protected String className; public static final String JSON_PROPERTY_COLOR = "color"; diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ParentWithNullable.java index 946b66eaa64f..dbcdee52405c 100644 --- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ParentWithNullable.java +++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ParentWithNullable.java @@ -84,7 +84,7 @@ public static TypeEnum fromValue(String value) { } public static final String JSON_PROPERTY_TYPE = "type"; - @javax.annotation.Nullable + // The discriminator does not have Nullability-annotation since it is added during serialization by the @JsonTypeName annotation protected TypeEnum type; public static final String JSON_PROPERTY_NULLABLE_PROPERTY = "nullableProperty"; diff --git a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Animal.java index c57ba7240196..d3a99ac1e7af 100644 --- a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Animal.java @@ -47,7 +47,7 @@ public class Animal { public static final String JSON_PROPERTY_CLASS_NAME = "className"; - @javax.annotation.Nonnull + // The discriminator does not have Nullability-annotation since it is added during serialization by the @JsonTypeName annotation protected String className; public static final String JSON_PROPERTY_COLOR = "color"; diff --git a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/ParentWithNullable.java index 81102ce36e93..0364e0ff966c 100644 --- a/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/ParentWithNullable.java +++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/ParentWithNullable.java @@ -83,7 +83,7 @@ public static TypeEnum fromValue(String value) { } public static final String JSON_PROPERTY_TYPE = "type"; - @javax.annotation.Nullable + // The discriminator does not have Nullability-annotation since it is added during serialization by the @JsonTypeName annotation protected TypeEnum type; public static final String JSON_PROPERTY_NULLABLE_PROPERTY = "nullableProperty"; diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Animal.java index c57ba7240196..d3a99ac1e7af 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Animal.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Animal.java @@ -47,7 +47,7 @@ public class Animal { public static final String JSON_PROPERTY_CLASS_NAME = "className"; - @javax.annotation.Nonnull + // The discriminator does not have Nullability-annotation since it is added during serialization by the @JsonTypeName annotation protected String className; public static final String JSON_PROPERTY_COLOR = "color"; diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ParentWithNullable.java index 81102ce36e93..0364e0ff966c 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ParentWithNullable.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ParentWithNullable.java @@ -83,7 +83,7 @@ public static TypeEnum fromValue(String value) { } public static final String JSON_PROPERTY_TYPE = "type"; - @javax.annotation.Nullable + // The discriminator does not have Nullability-annotation since it is added during serialization by the @JsonTypeName annotation protected TypeEnum type; public static final String JSON_PROPERTY_NULLABLE_PROPERTY = "nullableProperty";