Skip to content

Commit ea453ba

Browse files
Update samples based on changes highlighted in pipeline
1 parent 8fce2ba commit ea453ba

File tree

4 files changed

+32
-37
lines changed

4 files changed

+32
-37
lines changed

samples/client/petstore/java/restclient-useSingleRequestParameter-static/api/openapi.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -817,7 +817,7 @@ paths:
817817
schema:
818818
enum:
819819
- 1
820-
- null
820+
- -2
821821
format: int32
822822
type: integer
823823
style: form
@@ -1769,7 +1769,7 @@ components:
17691769
enum_integer:
17701770
enum:
17711771
- 1
1772-
- null
1772+
- -1
17731773
format: int32
17741774
type: integer
17751775
enum_number:

samples/client/petstore/java/restclient-useSingleRequestParameter-static/docs/EnumTest.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
| Name | Value |
4444
|---- | -----|
4545
| NUMBER_1 | 1 |
46+
| NUMBER_MINUS_1 | -1 |
4647

4748

4849

samples/client/petstore/java/restclient-useSingleRequestParameter-static/docs/FakeApi.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1029,7 +1029,7 @@ public class Example {
10291029
| **enumHeaderString** | **String**| Header parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] |
10301030
| **enumQueryStringArray** | [**List<String>**](String.md)| Query parameter enum test (string array) | [optional] [enum: >, $] |
10311031
| **enumQueryString** | **String**| Query parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] |
1032-
| **enumQueryInteger** | **Integer**| Query parameter enum test (double) | [optional] [enum: 1, ] |
1032+
| **enumQueryInteger** | **Integer**| Query parameter enum test (double) | [optional] [enum: 1, -2] |
10331033
| **enumQueryDouble** | **Double**| Query parameter enum test (double) | [optional] [enum: 1.1, -1.2] |
10341034
| **enumQueryModelArray** | [**List<EnumClass>**](EnumClass.md)| | [optional] |
10351035
| **enumFormStringArray** | [**List<String>**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] |

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

Lines changed: 28 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
44
*
55
* The version of the OpenAPI document: 1.0.0
6-
*
6+
*
77
*
88
* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
99
* https://openapi-generator.tech
@@ -52,9 +52,9 @@ public class EnumTest {
5252
*/
5353
public enum EnumStringEnum {
5454
UPPER(String.valueOf("UPPER")),
55-
55+
5656
LOWER(String.valueOf("lower")),
57-
57+
5858
EMPTY(String.valueOf(""));
5959

6060
private String value;
@@ -93,9 +93,9 @@ public static EnumStringEnum fromValue(String value) {
9393
*/
9494
public enum EnumStringRequiredEnum {
9595
UPPER(String.valueOf("UPPER")),
96-
96+
9797
LOWER(String.valueOf("lower")),
98-
98+
9999
EMPTY(String.valueOf(""));
100100

101101
private String value;
@@ -133,7 +133,9 @@ public static EnumStringRequiredEnum fromValue(String value) {
133133
* Gets or Sets enumInteger
134134
*/
135135
public enum EnumIntegerEnum {
136-
NUMBER_1(Integer.valueOf(1));
136+
NUMBER_1(Integer.valueOf(1)),
137+
138+
NUMBER_MINUS_1(Integer.valueOf(-1));
137139

138140
private Integer value;
139141

@@ -158,20 +160,20 @@ public static EnumIntegerEnum fromValue(Integer value) {
158160
return b;
159161
}
160162
}
161-
return null;
163+
throw new IllegalArgumentException("Unexpected value '" + value + "'");
162164
}
163165
}
164166

165167
public static final String JSON_PROPERTY_ENUM_INTEGER = "enum_integer";
166168
@jakarta.annotation.Nullable
167-
private JsonNullable<EnumIntegerEnum> enumInteger = JsonNullable.<EnumIntegerEnum>undefined();
169+
private EnumIntegerEnum enumInteger;
168170

169171
/**
170172
* Gets or Sets enumNumber
171173
*/
172174
public enum EnumNumberEnum {
173175
NUMBER_1_DOT_1(Double.valueOf(1.1)),
174-
176+
175177
NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
176178

177179
private Double value;
@@ -225,7 +227,7 @@ public EnumTest() {
225227
}
226228

227229
public EnumTest enumString(@jakarta.annotation.Nullable EnumStringEnum enumString) {
228-
230+
229231
this.enumString = enumString;
230232
return this;
231233
}
@@ -250,7 +252,7 @@ public void setEnumString(@jakarta.annotation.Nullable EnumStringEnum enumString
250252
}
251253

252254
public EnumTest enumStringRequired(@jakarta.annotation.Nonnull EnumStringRequiredEnum enumStringRequired) {
253-
255+
254256
this.enumStringRequired = enumStringRequired;
255257
return this;
256258
}
@@ -275,8 +277,8 @@ public void setEnumStringRequired(@jakarta.annotation.Nonnull EnumStringRequired
275277
}
276278

277279
public EnumTest enumInteger(@jakarta.annotation.Nullable EnumIntegerEnum enumInteger) {
278-
this.enumInteger = JsonNullable.<EnumIntegerEnum>of(enumInteger);
279-
280+
281+
this.enumInteger = enumInteger;
280282
return this;
281283
}
282284

@@ -285,30 +287,22 @@ public EnumTest enumInteger(@jakarta.annotation.Nullable EnumIntegerEnum enumInt
285287
* @return enumInteger
286288
*/
287289
@jakarta.annotation.Nullable
288-
@JsonIgnore
289-
290-
public EnumIntegerEnum getEnumInteger() {
291-
return enumInteger.orElse(null);
292-
}
293-
294290
@JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
295291
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
296292

297-
public JsonNullable<EnumIntegerEnum> getEnumInteger_JsonNullable() {
293+
public EnumIntegerEnum getEnumInteger() {
298294
return enumInteger;
299295
}
300-
301-
@JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
302-
public void setEnumInteger_JsonNullable(JsonNullable<EnumIntegerEnum> enumInteger) {
303-
this.enumInteger = enumInteger;
304-
}
305296

297+
298+
@JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
299+
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
306300
public void setEnumInteger(@jakarta.annotation.Nullable EnumIntegerEnum enumInteger) {
307-
this.enumInteger = JsonNullable.<EnumIntegerEnum>of(enumInteger);
301+
this.enumInteger = enumInteger;
308302
}
309303

310304
public EnumTest enumNumber(@jakarta.annotation.Nullable EnumNumberEnum enumNumber) {
311-
305+
312306
this.enumNumber = enumNumber;
313307
return this;
314308
}
@@ -334,7 +328,7 @@ public void setEnumNumber(@jakarta.annotation.Nullable EnumNumberEnum enumNumber
334328

335329
public EnumTest outerEnum(@jakarta.annotation.Nullable OuterEnum outerEnum) {
336330
this.outerEnum = JsonNullable.<OuterEnum>of(outerEnum);
337-
331+
338332
return this;
339333
}
340334

@@ -355,7 +349,7 @@ public OuterEnum getOuterEnum() {
355349
public JsonNullable<OuterEnum> getOuterEnum_JsonNullable() {
356350
return outerEnum;
357351
}
358-
352+
359353
@JsonProperty(JSON_PROPERTY_OUTER_ENUM)
360354
public void setOuterEnum_JsonNullable(JsonNullable<OuterEnum> outerEnum) {
361355
this.outerEnum = outerEnum;
@@ -366,7 +360,7 @@ public void setOuterEnum(@jakarta.annotation.Nullable OuterEnum outerEnum) {
366360
}
367361

368362
public EnumTest outerEnumInteger(@jakarta.annotation.Nullable OuterEnumInteger outerEnumInteger) {
369-
363+
370364
this.outerEnumInteger = outerEnumInteger;
371365
return this;
372366
}
@@ -391,7 +385,7 @@ public void setOuterEnumInteger(@jakarta.annotation.Nullable OuterEnumInteger ou
391385
}
392386

393387
public EnumTest outerEnumDefaultValue(@jakarta.annotation.Nullable OuterEnumDefaultValue outerEnumDefaultValue) {
394-
388+
395389
this.outerEnumDefaultValue = outerEnumDefaultValue;
396390
return this;
397391
}
@@ -416,7 +410,7 @@ public void setOuterEnumDefaultValue(@jakarta.annotation.Nullable OuterEnumDefau
416410
}
417411

418412
public EnumTest outerEnumIntegerDefaultValue(@jakarta.annotation.Nullable OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue) {
419-
413+
420414
this.outerEnumIntegerDefaultValue = outerEnumIntegerDefaultValue;
421415
return this;
422416
}
@@ -451,7 +445,7 @@ public boolean equals(Object o) {
451445
EnumTest enumTest = (EnumTest) o;
452446
return Objects.equals(this.enumString, enumTest.enumString) &&
453447
Objects.equals(this.enumStringRequired, enumTest.enumStringRequired) &&
454-
equalsNullable(this.enumInteger, enumTest.enumInteger) &&
448+
Objects.equals(this.enumInteger, enumTest.enumInteger) &&
455449
Objects.equals(this.enumNumber, enumTest.enumNumber) &&
456450
equalsNullable(this.outerEnum, enumTest.outerEnum) &&
457451
Objects.equals(this.outerEnumInteger, enumTest.outerEnumInteger) &&
@@ -465,7 +459,7 @@ private static <T> boolean equalsNullable(JsonNullable<T> a, JsonNullable<T> b)
465459

466460
@Override
467461
public int hashCode() {
468-
return Objects.hash(enumString, enumStringRequired, hashCodeNullable(enumInteger), enumNumber, hashCodeNullable(outerEnum), outerEnumInteger, outerEnumDefaultValue, outerEnumIntegerDefaultValue);
462+
return Objects.hash(enumString, enumStringRequired, enumInteger, enumNumber, hashCodeNullable(outerEnum), outerEnumInteger, outerEnumDefaultValue, outerEnumIntegerDefaultValue);
469463
}
470464

471465
private static <T> int hashCodeNullable(JsonNullable<T> a) {

0 commit comments

Comments
 (0)