[Java] [Spring-client] Exclude discriminator from nullable annotation (#21981)

* Exclude the discriminator from getting a nullable-annotation

* Update samples

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}}

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}}

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}}

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() {

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() {

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() {

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() {

samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Animal.java

@@ -48,7 +48,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 
 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";

samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ParentWithNullable.java

@@ -84,7 +84,7 @@ public class ParentWithNullable {
   }
 
   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";

samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/Animal.java

@@ -47,7 +47,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 
 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";

samples/client/petstore/java/restclient-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/ParentWithNullable.java

@@ -83,7 +83,7 @@ public class ParentWithNullable {
   }
 
   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";

samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Animal.java

@@ -47,7 +47,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 
 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";

samples/client/petstore/java/restclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/ParentWithNullable.java

@@ -83,7 +83,7 @@ public class ParentWithNullable {
   }
 
   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";

samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Animal.java

@@ -47,7 +47,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 
 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";

samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ParentWithNullable.java

@@ -83,7 +83,7 @@ public class ParentWithNullable {
   }
 
   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";

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java

@@ -55,7 +55,7 @@ import io.github.threetenjaxb.core.*;
 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";

samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ParentWithNullable.java

@@ -94,7 +94,7 @@ public class ParentWithNullable {
 
   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";

samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Animal.java

@@ -47,7 +47,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 
 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";

samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ParentWithNullable.java

@@ -83,7 +83,7 @@ public class ParentWithNullable {
   }
 
   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";

samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Animal.java

@@ -47,7 +47,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 
 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";

samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ParentWithNullable.java

@@ -83,7 +83,7 @@ public class ParentWithNullable {
   }
 
   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";

samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Animal.java

@@ -48,7 +48,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 
 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";

samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ParentWithNullable.java

@@ -84,7 +84,7 @@ public class ParentWithNullable {
   }
 
   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";

samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Animal.java

@@ -47,7 +47,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 
 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";

samples/client/petstore/java/webclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/ParentWithNullable.java

@@ -83,7 +83,7 @@ public class ParentWithNullable {
   }
 
   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";

samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Animal.java

@@ -47,7 +47,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
 
 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";

samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ParentWithNullable.java

@@ -83,7 +83,7 @@ public class ParentWithNullable {
   }
 
   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";