loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-10-13 16:03:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* Exclude the discriminator from getting a nullable-annotation

* Update samples
This commit is contained in:
Mattias Sehlstedt 2025-09-19 08:50:58 +02:00 committed by GitHub
parent ac3c37095d
commit 73c8728343
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
27 changed files with 39 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/openapi-generator/src/main/resources/Java/libraries/restclient/pojo.mustache vendored
View File

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

5
modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pojo.mustache vendored
View File

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

5
modules/openapi-generator/src/main/resources/Java/libraries/webclient/pojo.mustache vendored
View File

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

2
samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Apple.java
View File

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

2
samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Banana.java
View File

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

2
samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/Entity.java
View File

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

2
samples/client/others/java/webclient-sealedInterface/src/main/java/org/openapitools/client/model/EntityRef.java
View File

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

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

@ -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";

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

@ -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";

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

@ -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";

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

@ -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";

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

@ -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";

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

@ -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";

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

@ -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";

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

@ -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";

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

@ -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";

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

@ -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";

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

@ -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";

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

@ -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";

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

@ -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";

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

@ -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";

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

@ -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";

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

@ -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";

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

@ -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";

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

@ -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";

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

@ -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";

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

@ -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";