loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-12-11 17:32:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds @Nullable annotation to Spring Boot generator (#20345)

Browse Source 
* Adds @Nullable annotation to Spring Boot generator

* issue-14427: [REQ][spring] Null-Safety annotations
* issue-17382: [REQ] spring generator add Nullable annotations

Motivations:
* Have Spring Boot generator client properly annotated for nullability to be able to check code using them with tools like NullAway
* As it is related to Spring then the `org.springframework.lang.Nullable` annotation was chosen to avoid discussion which `@Nullable` one is true one
* `@NonNull` wasn't used as I didn't see much benefit of it. Anyhow, an empty constructor and/or setters allow to put a `null` value there

Modifications:
* Adds nullableAnnotation template to handle nullability annotation on vars
* Adjust pojo templates to use the nullability template
* Adapts tests

Modifications:
* Runs export_docs_generator.sh script to update samples

* samples update

* excludes Spring @Nullable from java-camel

* ones with defaults shouldn't be annotated as @Nullable

* updates samples

* adds AllArgConstructor generation tests

* adds container tests
This commit is contained in:
Andriy Slobodyanyk
2025-01-06 16:08:01 +04:00
committed by GitHub
parent 4b5dfc430e
commit cba756ffa6
1181 changed files with 4056 additions and 2671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java
View File

@@ -5,6 +5,7 @@ import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -25,7 +26,7 @@ import com.fasterxml.jackson.annotation.JsonAnySetter;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class AdditionalPropertiesAnyTypeDto {
private String name;
private @Nullable String name;
public AdditionalPropertiesAnyTypeDto name(String name) {
this.name = name;

3
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java
View File

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName;
import java.util.List;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -26,7 +27,7 @@ import com.fasterxml.jackson.annotation.JsonAnySetter;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class AdditionalPropertiesArrayDto {
private String name;
private @Nullable String name;
public AdditionalPropertiesArrayDto name(String name) {
this.name = name;

3
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java
View File

@@ -5,6 +5,7 @@ import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -25,7 +26,7 @@ import com.fasterxml.jackson.annotation.JsonAnySetter;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class AdditionalPropertiesBooleanDto {
private String name;
private @Nullable String name;
public AdditionalPropertiesBooleanDto name(String name) {
this.name = name;

5
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java
View File

@@ -11,6 +11,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.openapitools.jackson.nullable.JsonNullable;
import org.springframework.lang.Nullable;
import java.util.NoSuchElementException;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
@@ -52,11 +53,11 @@ public class AdditionalPropertiesClassDto {
private Map<String, Map<String, Object>> mapMapAnytype = new HashMap<>();
private Object anytype1;
private @Nullable Object anytype1;
private JsonNullable<Object> anytype2 = JsonNullable.<Object>undefined();
private Object anytype3;
private @Nullable Object anytype3;
public AdditionalPropertiesClassDto mapString(Map<String, String> mapString) {
this.mapString = mapString;

3
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java
View File

@@ -5,6 +5,7 @@ import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -25,7 +26,7 @@ import com.fasterxml.jackson.annotation.JsonAnySetter;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class AdditionalPropertiesIntegerDto {
private String name;
private @Nullable String name;
public AdditionalPropertiesIntegerDto name(String name) {
this.name = name;

3
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java
View File

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName;
import java.math.BigDecimal;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -26,7 +27,7 @@ import com.fasterxml.jackson.annotation.JsonAnySetter;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class AdditionalPropertiesNumberDto {
private String name;
private @Nullable String name;
public AdditionalPropertiesNumberDto name(String name) {
this.name = name;

3
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java
View File

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName;
import java.util.Map;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -26,7 +27,7 @@ import com.fasterxml.jackson.annotation.JsonAnySetter;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class AdditionalPropertiesObjectDto {
private String name;
private @Nullable String name;
public AdditionalPropertiesObjectDto name(String name) {
this.name = name;

3
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java
View File

@@ -5,6 +5,7 @@ import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -25,7 +26,7 @@ import com.fasterxml.jackson.annotation.JsonAnySetter;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class AdditionalPropertiesStringDto {
private String name;
private @Nullable String name;
public AdditionalPropertiesStringDto name(String name) {
this.name = name;

1
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AnimalDto.java
View File

@@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.fasterxml.jackson.annotation.JsonTypeName;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;

7
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ApiResponseDto.java
View File

@@ -5,6 +5,7 @@ import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -21,11 +22,11 @@ import jakarta.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class ApiResponseDto {
private Integer code;
private @Nullable Integer code;
private String type;
private @Nullable String type;
private String message;
private @Nullable String message;
public ApiResponseDto code(Integer code) {
this.code = code;

1
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java
View File

@@ -9,6 +9,7 @@ import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;

1
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java
View File

@@ -9,6 +9,7 @@ import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;

1
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayTestDto.java
View File

@@ -9,6 +9,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.openapitools.model.ReadOnlyFirstDto;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;

3
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatDto.java
View File

@@ -10,6 +10,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.annotation.JsonValue;
import org.openapitools.model.CatDto;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -66,7 +67,7 @@ public class BigCatDto extends CatDto {
}
}
private KindEnum kind;
private @Nullable KindEnum kind;
public BigCatDto() {
super();

13
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CapitalizationDto.java
View File

@@ -5,6 +5,7 @@ import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -21,17 +22,17 @@ import jakarta.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class CapitalizationDto {
private String smallCamel;
private @Nullable String smallCamel;
private String capitalCamel;
private @Nullable String capitalCamel;
private String smallSnake;
private @Nullable String smallSnake;
private String capitalSnake;
private @Nullable String capitalSnake;
private String scAETHFlowPoints;
private @Nullable String scAETHFlowPoints;
private String ATT_NAME;
private @Nullable String ATT_NAME;
public CapitalizationDto smallCamel(String smallCamel) {
this.smallCamel = smallCamel;

3
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatDto.java
View File

@@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.fasterxml.jackson.annotation.JsonTypeName;
import org.openapitools.model.AnimalDto;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -33,7 +34,7 @@ import jakarta.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class CatDto extends AnimalDto {
private Boolean declawed;
private @Nullable Boolean declawed;
public CatDto() {
super();

3
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CategoryDto.java
View File

@@ -5,6 +5,7 @@ import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -21,7 +22,7 @@ import jakarta.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class CategoryDto {
private Long id;
private @Nullable Long id;
private String name = "default-name";

3
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ChildWithNullableDto.java
View File

@@ -12,6 +12,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
import java.util.Arrays;
import org.openapitools.jackson.nullable.JsonNullable;
import org.openapitools.model.ParentWithNullableDto;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -29,7 +30,7 @@ import jakarta.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class ChildWithNullableDto extends ParentWithNullableDto {
private String otherProperty;
private @Nullable String otherProperty;
public ChildWithNullableDto otherProperty(String otherProperty) {
this.otherProperty = otherProperty;

3
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClassModelDto.java
View File

@@ -5,6 +5,7 @@ import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -21,7 +22,7 @@ import jakarta.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class ClassModelDto {
private String propertyClass;
private @Nullable String propertyClass;
public ClassModelDto propertyClass(String propertyClass) {
this.propertyClass = propertyClass;

3
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClientDto.java
View File

@@ -5,6 +5,7 @@ import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -21,7 +22,7 @@ import jakarta.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class ClientDto {
private String client;
private @Nullable String client;
public ClientDto client(String client) {
this.client = client;

1
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java
View File

@@ -9,6 +9,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.openapitools.jackson.nullable.JsonNullable;
import org.springframework.lang.Nullable;
import java.util.NoSuchElementException;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;

3
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogDto.java
View File

@@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.fasterxml.jackson.annotation.JsonTypeName;
import org.openapitools.model.AnimalDto;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -26,7 +27,7 @@ import jakarta.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class DogDto extends AnimalDto {
private String breed;
private @Nullable String breed;
public DogDto() {
super();

3
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumArraysDto.java
View File

@@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonValue;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -60,7 +61,7 @@ public class EnumArraysDto {
}
}
private JustSymbolEnum justSymbol;
private @Nullable JustSymbolEnum justSymbol;
/**
* Gets or Sets arrayEnum

9
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumTestDto.java
View File

@@ -7,6 +7,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.annotation.JsonValue;
import org.openapitools.model.OuterEnumDto;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -60,7 +61,7 @@ public class EnumTestDto {
}
}
private EnumStringEnum enumString;
private @Nullable EnumStringEnum enumString;
/**
* Gets or Sets enumStringRequired
@@ -136,7 +137,7 @@ public class EnumTestDto {
}
}
private EnumIntegerEnum enumInteger;
private @Nullable EnumIntegerEnum enumInteger;
/**
* Gets or Sets enumNumber
@@ -173,9 +174,9 @@ public class EnumTestDto {
}
}
private EnumNumberEnum enumNumber;
private @Nullable EnumNumberEnum enumNumber;
private OuterEnumDto outerEnum;
private @Nullable OuterEnumDto outerEnum;
public EnumTestDto() {
super();

3
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileDto.java
View File

@@ -5,6 +5,7 @@ import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -21,7 +22,7 @@ import jakarta.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class FileDto {
private String sourceURI;
private @Nullable String sourceURI;
public FileDto sourceURI(String sourceURI) {
this.sourceURI = sourceURI;

3
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java
View File

@@ -9,6 +9,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.openapitools.model.FileDto;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -25,7 +26,7 @@ import jakarta.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class FileSchemaTestClassDto {
private FileDto file;
private @Nullable FileDto file;
private List<FileDto> files = new ArrayList<>();

21
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FormatTestDto.java
View File

@@ -11,6 +11,7 @@ import java.time.OffsetDateTime;
import java.util.Arrays;
import java.util.UUID;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -27,35 +28,35 @@ import jakarta.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class FormatTestDto {
private Integer integer;
private @Nullable Integer integer;
private Integer int32;
private @Nullable Integer int32;
private Long int64;
private @Nullable Long int64;
private BigDecimal number;
private Float _float;
private @Nullable Float _float;
private Double _double;
private @Nullable Double _double;
private String string;
private @Nullable String string;
private byte[] _byte;
private org.springframework.core.io.Resource binary;
private @Nullable org.springframework.core.io.Resource binary;
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
private LocalDate date;
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
private OffsetDateTime dateTime;
private @Nullable OffsetDateTime dateTime;
private UUID uuid;
private @Nullable UUID uuid;
private String password;
private BigDecimal bigDecimal;
private @Nullable BigDecimal bigDecimal;
public FormatTestDto() {
super();

5
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java
View File

@@ -5,6 +5,7 @@ import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -21,9 +22,9 @@ import jakarta.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class HasOnlyReadOnlyDto {
private String bar;
private @Nullable String bar;
private String foo;
private @Nullable String foo;
public HasOnlyReadOnlyDto bar(String bar) {
this.bar = bar;

3
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ListDto.java
View File

@@ -5,6 +5,7 @@ import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -21,7 +22,7 @@ import jakarta.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class ListDto {
private String _123list;
private @Nullable String _123list;
public ListDto _123list(String _123list) {
this._123list = _123list;

1
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MapTestDto.java
View File

@@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.annotation.JsonValue;
import java.util.HashMap;
import java.util.Map;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;

5
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java
View File

@@ -11,6 +11,7 @@ import java.util.Map;
import java.util.UUID;
import org.openapitools.model.AnimalDto;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -27,10 +28,10 @@ import jakarta.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class MixedPropertiesAndAdditionalPropertiesClassDto {
private UUID uuid;
private @Nullable UUID uuid;
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
private OffsetDateTime dateTime;
private @Nullable OffsetDateTime dateTime;
private Map<String, AnimalDto> map = new HashMap<>();

5
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/Model200ResponseDto.java
View File

@@ -5,6 +5,7 @@ import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -21,9 +22,9 @@ import jakarta.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class Model200ResponseDto {
private Integer name;
private @Nullable Integer name;
private String propertyClass;
private @Nullable String propertyClass;
public Model200ResponseDto name(Integer name) {
this.name = name;

7
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NameDto.java
View File

@@ -5,6 +5,7 @@ import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -23,11 +24,11 @@ public class NameDto {
private Integer name;
private Integer snakeCase;
private @Nullable Integer snakeCase;
private String property;
private @Nullable String property;
private Integer _123number;
private @Nullable Integer _123number;
public NameDto() {
super();

1
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NullableMapPropertyDto.java
View File

@@ -9,6 +9,7 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import org.openapitools.jackson.nullable.JsonNullable;
import org.springframework.lang.Nullable;
import java.util.NoSuchElementException;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;

3
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NumberOnlyDto.java
View File

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName;
import java.math.BigDecimal;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -22,7 +23,7 @@ import jakarta.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class NumberOnlyDto {
private BigDecimal justNumber;
private @Nullable BigDecimal justNumber;
public NumberOnlyDto justNumber(BigDecimal justNumber) {
this.justNumber = justNumber;

11
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/OrderDto.java
View File

@@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.annotation.JsonValue;
import java.time.OffsetDateTime;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -24,14 +25,14 @@ import jakarta.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class OrderDto {
private Long id;
private @Nullable Long id;
private Long petId;
private @Nullable Long petId;
private Integer quantity;
private @Nullable Integer quantity;
@DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
private OffsetDateTime shipDate;
private @Nullable OffsetDateTime shipDate;
/**
* Order Status
@@ -70,7 +71,7 @@ public class OrderDto {
}
}
private StatusEnum status;
private @Nullable StatusEnum status;
private Boolean complete = false;

7
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/OuterCompositeDto.java
View File

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName;
import java.math.BigDecimal;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -22,11 +23,11 @@ import jakarta.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class OuterCompositeDto {
private BigDecimal myNumber;
private @Nullable BigDecimal myNumber;
private String myString;
private @Nullable String myString;
private Boolean myBoolean;
private @Nullable Boolean myBoolean;
public OuterCompositeDto myNumber(BigDecimal myNumber) {
this.myNumber = myNumber;

3
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ParentWithNullableDto.java
View File

@@ -11,6 +11,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName;
import com.fasterxml.jackson.annotation.JsonValue;
import java.util.Arrays;
import org.openapitools.jackson.nullable.JsonNullable;
import org.springframework.lang.Nullable;
import java.util.NoSuchElementException;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
@@ -69,7 +70,7 @@ public class ParentWithNullableDto {
}
}
private TypeEnum type;
private @Nullable TypeEnum type;
private JsonNullable<String> nullableProperty = JsonNullable.<String>undefined();

7
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java
View File

@@ -14,6 +14,7 @@ import java.util.List;
import java.util.Set;
import org.openapitools.model.CategoryDto;
import org.openapitools.model.TagDto;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -30,9 +31,9 @@ import jakarta.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class PetDto {
private Long id;
private @Nullable Long id;
private CategoryDto category;
private @Nullable CategoryDto category;
private String name;
@@ -80,7 +81,7 @@ public class PetDto {
}
@Deprecated
private StatusEnum status;
private @Nullable StatusEnum status;
public PetDto() {
super();

5
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java
View File

@@ -5,6 +5,7 @@ import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -21,9 +22,9 @@ import jakarta.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class ReadOnlyFirstDto {
private String bar;
private @Nullable String bar;
private String baz;
private @Nullable String baz;
public ReadOnlyFirstDto bar(String bar) {
this.bar = bar;

9
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java
View File

@@ -5,6 +5,7 @@ import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -21,13 +22,13 @@ import jakarta.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class ResponseObjectWithDifferentFieldNamesDto {
private String normalPropertyName;
private @Nullable String normalPropertyName;
private String UPPER_CASE_PROPERTY_SNAKE;
private @Nullable String UPPER_CASE_PROPERTY_SNAKE;
private String lowerCasePropertyDashes;
private @Nullable String lowerCasePropertyDashes;
private String propertyNameWithSpaces;
private @Nullable String propertyNameWithSpaces;
public ResponseObjectWithDifferentFieldNamesDto normalPropertyName(String normalPropertyName) {
this.normalPropertyName = normalPropertyName;

3
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ReturnDto.java
View File

@@ -5,6 +5,7 @@ import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -21,7 +22,7 @@ import jakarta.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class ReturnDto {
private Integer _return;
private @Nullable Integer _return;
public ReturnDto _return(Integer _return) {
this._return = _return;

3
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/SpecialModelNameDto.java
View File

@@ -5,6 +5,7 @@ import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -21,7 +22,7 @@ import jakarta.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class SpecialModelNameDto {
private Long $specialPropertyName;
private @Nullable Long $specialPropertyName;
public SpecialModelNameDto $specialPropertyName(Long $specialPropertyName) {
this.$specialPropertyName = $specialPropertyName;

5
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TagDto.java
View File

@@ -5,6 +5,7 @@ import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -21,9 +22,9 @@ import jakarta.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class TagDto {
private Long id;
private @Nullable Long id;
private String name;
private @Nullable String name;
public TagDto id(Long id) {
this.id = id;

1
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java
View File

@@ -9,6 +9,7 @@ import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;

1
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java
View File

@@ -9,6 +9,7 @@ import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;

17
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/UserDto.java
View File

@@ -5,6 +5,7 @@ import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonTypeName;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -21,21 +22,21 @@ import jakarta.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class UserDto {
private Long id;
private @Nullable Long id;
private String username;
private @Nullable String username;
private String firstName;
private @Nullable String firstName;
private String lastName;
private @Nullable String lastName;
private String email;
private @Nullable String email;
private String password;
private @Nullable String password;
private String phone;
private @Nullable String phone;
private Integer userStatus;
private @Nullable Integer userStatus;
public UserDto id(Long id) {
this.id = id;

41
samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/XmlItemDto.java
View File

@@ -9,6 +9,7 @@ import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.springframework.lang.Nullable;
import org.openapitools.jackson.nullable.JsonNullable;
import java.time.OffsetDateTime;
import jakarta.validation.constraints.NotNull;
@@ -25,24 +26,24 @@ import jakarta.annotation.Generated;
@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.11.0-SNAPSHOT")
public class XmlItemDto {
private String attributeString;
private @Nullable String attributeString;
private BigDecimal attributeNumber;
private @Nullable BigDecimal attributeNumber;
private Integer attributeInteger;
private @Nullable Integer attributeInteger;
private Boolean attributeBoolean;
private @Nullable Boolean attributeBoolean;
private List<Integer> wrappedArray = new ArrayList<>();
private String nameString;
private @Nullable String nameString;
private BigDecimal nameNumber;
private @Nullable BigDecimal nameNumber;
private Integer nameInteger;
private @Nullable Integer nameInteger;
private Boolean nameBoolean;
private @Nullable Boolean nameBoolean;
private List<Integer> nameArray = new ArrayList<>();
@@ -50,13 +51,13 @@ public class XmlItemDto {
private List<Integer> nameWrappedArray = new ArrayList<>();
private String prefixString;
private @Nullable String prefixString;
private BigDecimal prefixNumber;
private @Nullable BigDecimal prefixNumber;
private Integer prefixInteger;
private @Nullable Integer prefixInteger;
private Boolean prefixBoolean;
private @Nullable Boolean prefixBoolean;
private List<Integer> prefixArray = new ArrayList<>();
@@ -64,13 +65,13 @@ public class XmlItemDto {
private List<Integer> prefixWrappedArray = new ArrayList<>();
private String namespaceString;
private @Nullable String namespaceString;
private BigDecimal namespaceNumber;
private @Nullable BigDecimal namespaceNumber;
private Integer namespaceInteger;
private @Nullable Integer namespaceInteger;
private Boolean namespaceBoolean;
private @Nullable Boolean namespaceBoolean;
private List<Integer> namespaceArray = new ArrayList<>();
@@ -78,13 +79,13 @@ public class XmlItemDto {
private List<Integer> namespaceWrappedArray = new ArrayList<>();
private String prefixNsString;
private @Nullable String prefixNsString;
private BigDecimal prefixNsNumber;
private @Nullable BigDecimal prefixNsNumber;
private Integer prefixNsInteger;
private @Nullable Integer prefixNsInteger;
private Boolean prefixNsBoolean;
private @Nullable Boolean prefixNsBoolean;
private List<Integer> prefixNsArray = new ArrayList<>();