Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 2 commits into from
Sep 19, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa963a5
Exclude the discriminator from getting a nullable-annotation
Mattias-Sehlstedt Sep 16, 2025
dc529a0
Update samples
Mattias-Sehlstedt Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions modules/openapi-generator/src/main/resources/Java/libraries/restclient/pojo.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
5 changes: 5 additions & 0 deletions modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
5 changes: 5 additions & 0 deletions modules/openapi-generator/src/main/resources/Java/libraries/webclient/pojo.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
2 changes: 1 addition & 1 deletion ...ers/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Apple.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion ...rs/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Banana.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion ...rs/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Entity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion ...java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/EntityRef.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion ...petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Animal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion ...a/restclient-swagger2/src/main/java/org/openapitools/client/model/ParentWithNullable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion ...-useSingleRequestParameter-static/src/main/java/org/openapitools/client/model/Animal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion ...questParameter-static/src/main/java/org/openapitools/client/model/ParentWithNullable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion ...tclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Animal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion ...ingleRequestParameter/src/main/java/org/openapitools/client/model/ParentWithNullable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion ...s/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Animal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion ...store/java/restclient/src/main/java/org/openapitools/client/model/ParentWithNullable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion ...etstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion .../resttemplate-withXml/src/main/java/org/openapitools/client/model/ParentWithNullable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion ...client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Animal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion ...ore/java/resttemplate/src/main/java/org/openapitools/client/model/ParentWithNullable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion ...t/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Animal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion ...ava/webclient-jakarta/src/main/java/org/openapitools/client/model/ParentWithNullable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion .../petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Animal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion ...va/webclient-swagger2/src/main/java/org/openapitools/client/model/ParentWithNullable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion ...bclient-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Animal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion ...ingleRequestParameter/src/main/java/org/openapitools/client/model/ParentWithNullable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion ...es/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Animal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion ...tstore/java/webclient/src/main/java/org/openapitools/client/model/ParentWithNullable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Loading