Skip to content

Commit fcfc4ea

Browse files
committed
issue-1960: Add nullability annotations to Java generated clients
Modifications: * Run export_docs_generator.sh script to update samples
1 parent fb12b12 commit fcfc4ea

File tree

1,571 files changed

+14827
-9886
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,571 files changed

+14827
-9886
lines changed

samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Bird.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,17 @@
3636
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.10.0-SNAPSHOT")
3737
public class Bird {
3838
public static final String JSON_PROPERTY_SIZE = "size";
39+
@javax.annotation.Nullable
3940
private String size;
4041

4142
public static final String JSON_PROPERTY_COLOR = "color";
43+
@javax.annotation.Nullable
4244
private String color;
4345

4446
public Bird() {
4547
}
4648

47-
public Bird size(String size) {
49+
public Bird size(@javax.annotation.Nullable String size) {
4850

4951
this.size = size;
5052
return this;
@@ -65,11 +67,11 @@ public String getSize() {
6567

6668
@JsonProperty(JSON_PROPERTY_SIZE)
6769
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
68-
public void setSize(String size) {
70+
public void setSize(@javax.annotation.Nullable String size) {
6971
this.size = size;
7072
}
7173

72-
public Bird color(String color) {
74+
public Bird color(@javax.annotation.Nullable String color) {
7375

7476
this.color = color;
7577
return this;
@@ -90,7 +92,7 @@ public String getColor() {
9092

9193
@JsonProperty(JSON_PROPERTY_COLOR)
9294
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
93-
public void setColor(String color) {
95+
public void setColor(@javax.annotation.Nullable String color) {
9496
this.color = color;
9597
}
9698

samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Category.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,17 @@
3636
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.10.0-SNAPSHOT")
3737
public class Category {
3838
public static final String JSON_PROPERTY_ID = "id";
39+
@javax.annotation.Nullable
3940
private Long id;
4041

4142
public static final String JSON_PROPERTY_NAME = "name";
43+
@javax.annotation.Nullable
4244
private String name;
4345

4446
public Category() {
4547
}
4648

47-
public Category id(Long id) {
49+
public Category id(@javax.annotation.Nullable Long id) {
4850

4951
this.id = id;
5052
return this;
@@ -65,11 +67,11 @@ public Long getId() {
6567

6668
@JsonProperty(JSON_PROPERTY_ID)
6769
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
68-
public void setId(Long id) {
70+
public void setId(@javax.annotation.Nullable Long id) {
6971
this.id = id;
7072
}
7173

72-
public Category name(String name) {
74+
public Category name(@javax.annotation.Nullable String name) {
7375

7476
this.name = name;
7577
return this;
@@ -90,7 +92,7 @@ public String getName() {
9092

9193
@JsonProperty(JSON_PROPERTY_NAME)
9294
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
93-
public void setName(String name) {
95+
public void setName(@javax.annotation.Nullable String name) {
9496
this.name = name;
9597
}
9698

samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DataQuery.java

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,22 @@
4242
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.10.0-SNAPSHOT")
4343
public class DataQuery extends Query {
4444
public static final String JSON_PROPERTY_SUFFIX = "suffix";
45+
@javax.annotation.Nullable
4546
private String suffix;
4647

4748
public static final String JSON_PROPERTY_TEXT = "text";
49+
@javax.annotation.Nullable
4850
private String text;
4951

5052
public static final String JSON_PROPERTY_DATE = "date";
53+
@javax.annotation.Nullable
5154
private OffsetDateTime date;
5255

5356
public DataQuery() {
5457

5558
}
5659

57-
public DataQuery suffix(String suffix) {
60+
public DataQuery suffix(@javax.annotation.Nullable String suffix) {
5861

5962
this.suffix = suffix;
6063
return this;
@@ -75,11 +78,11 @@ public String getSuffix() {
7578

7679
@JsonProperty(JSON_PROPERTY_SUFFIX)
7780
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
78-
public void setSuffix(String suffix) {
81+
public void setSuffix(@javax.annotation.Nullable String suffix) {
7982
this.suffix = suffix;
8083
}
8184

82-
public DataQuery text(String text) {
85+
public DataQuery text(@javax.annotation.Nullable String text) {
8386

8487
this.text = text;
8588
return this;
@@ -100,11 +103,11 @@ public String getText() {
100103

101104
@JsonProperty(JSON_PROPERTY_TEXT)
102105
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
103-
public void setText(String text) {
106+
public void setText(@javax.annotation.Nullable String text) {
104107
this.text = text;
105108
}
106109

107-
public DataQuery date(OffsetDateTime date) {
110+
public DataQuery date(@javax.annotation.Nullable OffsetDateTime date) {
108111

109112
this.date = date;
110113
return this;
@@ -125,18 +128,18 @@ public OffsetDateTime getDate() {
125128

126129
@JsonProperty(JSON_PROPERTY_DATE)
127130
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
128-
public void setDate(OffsetDateTime date) {
131+
public void setDate(@javax.annotation.Nullable OffsetDateTime date) {
129132
this.date = date;
130133
}
131134

132135
@Override
133-
public DataQuery id(Long id) {
136+
public DataQuery id(@javax.annotation.Nullable Long id) {
134137
this.setId(id);
135138
return this;
136139
}
137140

138141
@Override
139-
public DataQuery outcomes(List<OutcomesEnum> outcomes) {
142+
public DataQuery outcomes(@javax.annotation.Nullable List<OutcomesEnum> outcomes) {
140143
this.setOutcomes(outcomes);
141144
return this;
142145
}

samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DefaultValue.java

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.10.0-SNAPSHOT")
5151
public class DefaultValue {
5252
public static final String JSON_PROPERTY_ARRAY_STRING_ENUM_REF_DEFAULT = "array_string_enum_ref_default";
53+
@javax.annotation.Nullable
5354
private List<StringEnumRef> arrayStringEnumRefDefault = new ArrayList<>(Arrays.asList(StringEnumRef.SUCCESS, StringEnumRef.FAILURE));
5455

5556
/**
@@ -90,30 +91,37 @@ public static ArrayStringEnumDefaultEnum fromValue(String value) {
9091
}
9192

9293
public static final String JSON_PROPERTY_ARRAY_STRING_ENUM_DEFAULT = "array_string_enum_default";
94+
@javax.annotation.Nullable
9395
private List<ArrayStringEnumDefaultEnum> arrayStringEnumDefault = new ArrayList<>(Arrays.asList(ArrayStringEnumDefaultEnum.SUCCESS, ArrayStringEnumDefaultEnum.FAILURE));
9496

9597
public static final String JSON_PROPERTY_ARRAY_STRING_DEFAULT = "array_string_default";
98+
@javax.annotation.Nullable
9699
private List<String> arrayStringDefault = new ArrayList<>(Arrays.asList("failure", "skipped"));
97100

98101
public static final String JSON_PROPERTY_ARRAY_INTEGER_DEFAULT = "array_integer_default";
102+
@javax.annotation.Nullable
99103
private List<Integer> arrayIntegerDefault = new ArrayList<>(Arrays.asList(1, 3));
100104

101105
public static final String JSON_PROPERTY_ARRAY_STRING = "array_string";
106+
@javax.annotation.Nullable
102107
private List<String> arrayString = new ArrayList<>();
103108

104109
public static final String JSON_PROPERTY_ARRAY_STRING_NULLABLE = "array_string_nullable";
110+
@javax.annotation.Nullable
105111
private JsonNullable<List<String>> arrayStringNullable = JsonNullable.<List<String>>undefined();
106112

107113
public static final String JSON_PROPERTY_ARRAY_STRING_EXTENSION_NULLABLE = "array_string_extension_nullable";
114+
@javax.annotation.Nullable
108115
private JsonNullable<List<String>> arrayStringExtensionNullable = JsonNullable.<List<String>>undefined();
109116

110117
public static final String JSON_PROPERTY_STRING_NULLABLE = "string_nullable";
118+
@javax.annotation.Nullable
111119
private JsonNullable<String> stringNullable = JsonNullable.<String>undefined();
112120

113121
public DefaultValue() {
114122
}
115123

116-
public DefaultValue arrayStringEnumRefDefault(List<StringEnumRef> arrayStringEnumRefDefault) {
124+
public DefaultValue arrayStringEnumRefDefault(@javax.annotation.Nullable List<StringEnumRef> arrayStringEnumRefDefault) {
117125

118126
this.arrayStringEnumRefDefault = arrayStringEnumRefDefault;
119127
return this;
@@ -142,11 +150,11 @@ public List<StringEnumRef> getArrayStringEnumRefDefault() {
142150

143151
@JsonProperty(JSON_PROPERTY_ARRAY_STRING_ENUM_REF_DEFAULT)
144152
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
145-
public void setArrayStringEnumRefDefault(List<StringEnumRef> arrayStringEnumRefDefault) {
153+
public void setArrayStringEnumRefDefault(@javax.annotation.Nullable List<StringEnumRef> arrayStringEnumRefDefault) {
146154
this.arrayStringEnumRefDefault = arrayStringEnumRefDefault;
147155
}
148156

149-
public DefaultValue arrayStringEnumDefault(List<ArrayStringEnumDefaultEnum> arrayStringEnumDefault) {
157+
public DefaultValue arrayStringEnumDefault(@javax.annotation.Nullable List<ArrayStringEnumDefaultEnum> arrayStringEnumDefault) {
150158

151159
this.arrayStringEnumDefault = arrayStringEnumDefault;
152160
return this;
@@ -175,11 +183,11 @@ public List<ArrayStringEnumDefaultEnum> getArrayStringEnumDefault() {
175183

176184
@JsonProperty(JSON_PROPERTY_ARRAY_STRING_ENUM_DEFAULT)
177185
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
178-
public void setArrayStringEnumDefault(List<ArrayStringEnumDefaultEnum> arrayStringEnumDefault) {
186+
public void setArrayStringEnumDefault(@javax.annotation.Nullable List<ArrayStringEnumDefaultEnum> arrayStringEnumDefault) {
179187
this.arrayStringEnumDefault = arrayStringEnumDefault;
180188
}
181189

182-
public DefaultValue arrayStringDefault(List<String> arrayStringDefault) {
190+
public DefaultValue arrayStringDefault(@javax.annotation.Nullable List<String> arrayStringDefault) {
183191

184192
this.arrayStringDefault = arrayStringDefault;
185193
return this;
@@ -208,11 +216,11 @@ public List<String> getArrayStringDefault() {
208216

209217
@JsonProperty(JSON_PROPERTY_ARRAY_STRING_DEFAULT)
210218
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
211-
public void setArrayStringDefault(List<String> arrayStringDefault) {
219+
public void setArrayStringDefault(@javax.annotation.Nullable List<String> arrayStringDefault) {
212220
this.arrayStringDefault = arrayStringDefault;
213221
}
214222

215-
public DefaultValue arrayIntegerDefault(List<Integer> arrayIntegerDefault) {
223+
public DefaultValue arrayIntegerDefault(@javax.annotation.Nullable List<Integer> arrayIntegerDefault) {
216224

217225
this.arrayIntegerDefault = arrayIntegerDefault;
218226
return this;
@@ -241,11 +249,11 @@ public List<Integer> getArrayIntegerDefault() {
241249

242250
@JsonProperty(JSON_PROPERTY_ARRAY_INTEGER_DEFAULT)
243251
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
244-
public void setArrayIntegerDefault(List<Integer> arrayIntegerDefault) {
252+
public void setArrayIntegerDefault(@javax.annotation.Nullable List<Integer> arrayIntegerDefault) {
245253
this.arrayIntegerDefault = arrayIntegerDefault;
246254
}
247255

248-
public DefaultValue arrayString(List<String> arrayString) {
256+
public DefaultValue arrayString(@javax.annotation.Nullable List<String> arrayString) {
249257

250258
this.arrayString = arrayString;
251259
return this;
@@ -274,11 +282,11 @@ public List<String> getArrayString() {
274282

275283
@JsonProperty(JSON_PROPERTY_ARRAY_STRING)
276284
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
277-
public void setArrayString(List<String> arrayString) {
285+
public void setArrayString(@javax.annotation.Nullable List<String> arrayString) {
278286
this.arrayString = arrayString;
279287
}
280288

281-
public DefaultValue arrayStringNullable(List<String> arrayStringNullable) {
289+
public DefaultValue arrayStringNullable(@javax.annotation.Nullable List<String> arrayStringNullable) {
282290
this.arrayStringNullable = JsonNullable.<List<String>>of(arrayStringNullable);
283291

284292
return this;
@@ -319,11 +327,11 @@ public void setArrayStringNullable_JsonNullable(JsonNullable<List<String>> array
319327
this.arrayStringNullable = arrayStringNullable;
320328
}
321329

322-
public void setArrayStringNullable(List<String> arrayStringNullable) {
330+
public void setArrayStringNullable(@javax.annotation.Nullable List<String> arrayStringNullable) {
323331
this.arrayStringNullable = JsonNullable.<List<String>>of(arrayStringNullable);
324332
}
325333

326-
public DefaultValue arrayStringExtensionNullable(List<String> arrayStringExtensionNullable) {
334+
public DefaultValue arrayStringExtensionNullable(@javax.annotation.Nullable List<String> arrayStringExtensionNullable) {
327335
this.arrayStringExtensionNullable = JsonNullable.<List<String>>of(arrayStringExtensionNullable);
328336

329337
return this;
@@ -364,11 +372,11 @@ public void setArrayStringExtensionNullable_JsonNullable(JsonNullable<List<Strin
364372
this.arrayStringExtensionNullable = arrayStringExtensionNullable;
365373
}
366374

367-
public void setArrayStringExtensionNullable(List<String> arrayStringExtensionNullable) {
375+
public void setArrayStringExtensionNullable(@javax.annotation.Nullable List<String> arrayStringExtensionNullable) {
368376
this.arrayStringExtensionNullable = JsonNullable.<List<String>>of(arrayStringExtensionNullable);
369377
}
370378

371-
public DefaultValue stringNullable(String stringNullable) {
379+
public DefaultValue stringNullable(@javax.annotation.Nullable String stringNullable) {
372380
this.stringNullable = JsonNullable.<String>of(stringNullable);
373381

374382
return this;
@@ -397,7 +405,7 @@ public void setStringNullable_JsonNullable(JsonNullable<String> stringNullable)
397405
this.stringNullable = stringNullable;
398406
}
399407

400-
public void setStringNullable(String stringNullable) {
408+
public void setStringNullable(@javax.annotation.Nullable String stringNullable) {
401409
this.stringNullable = JsonNullable.<String>of(stringNullable);
402410
}
403411

samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,21 @@
3838
@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.10.0-SNAPSHOT")
3939
public class NumberPropertiesOnly {
4040
public static final String JSON_PROPERTY_NUMBER = "number";
41+
@javax.annotation.Nullable
4142
private BigDecimal number;
4243

4344
public static final String JSON_PROPERTY_FLOAT = "float";
45+
@javax.annotation.Nullable
4446
private Float _float;
4547

4648
public static final String JSON_PROPERTY_DOUBLE = "double";
49+
@javax.annotation.Nullable
4750
private Double _double;
4851

4952
public NumberPropertiesOnly() {
5053
}
5154

52-
public NumberPropertiesOnly number(BigDecimal number) {
55+
public NumberPropertiesOnly number(@javax.annotation.Nullable BigDecimal number) {
5356

5457
this.number = number;
5558
return this;
@@ -70,11 +73,11 @@ public BigDecimal getNumber() {
7073

7174
@JsonProperty(JSON_PROPERTY_NUMBER)
7275
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
73-
public void setNumber(BigDecimal number) {
76+
public void setNumber(@javax.annotation.Nullable BigDecimal number) {
7477
this.number = number;
7578
}
7679

77-
public NumberPropertiesOnly _float(Float _float) {
80+
public NumberPropertiesOnly _float(@javax.annotation.Nullable Float _float) {
7881

7982
this._float = _float;
8083
return this;
@@ -95,11 +98,11 @@ public Float getFloat() {
9598

9699
@JsonProperty(JSON_PROPERTY_FLOAT)
97100
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
98-
public void setFloat(Float _float) {
101+
public void setFloat(@javax.annotation.Nullable Float _float) {
99102
this._float = _float;
100103
}
101104

102-
public NumberPropertiesOnly _double(Double _double) {
105+
public NumberPropertiesOnly _double(@javax.annotation.Nullable Double _double) {
103106

104107
this._double = _double;
105108
return this;
@@ -122,7 +125,7 @@ public Double getDouble() {
122125

123126
@JsonProperty(JSON_PROPERTY_DOUBLE)
124127
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
125-
public void setDouble(Double _double) {
128+
public void setDouble(@javax.annotation.Nullable Double _double) {
126129
this._double = _double;
127130
}
128131

0 commit comments

Comments
 (0)