Skip to content

Commit d278cfa

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

File tree

4 files changed

+14
-25
lines changed

4 files changed

+14
-25
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 & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@
4343
| Name | Value |
4444
|---- | -----|
4545
| NUMBER_1 | 1 |
46-
47-
46+
| NUMBER_MINUS_1 | -1 |
4847

4948
## Enum: EnumNumberEnum
5049

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: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -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,13 +160,13 @@ 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
@@ -275,8 +277,7 @@ 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+
this.enumInteger = enumInteger;
280281
return this;
281282
}
282283

@@ -285,26 +286,15 @@ public EnumTest enumInteger(@jakarta.annotation.Nullable EnumIntegerEnum enumInt
285286
* @return enumInteger
286287
*/
287288
@jakarta.annotation.Nullable
288-
@JsonIgnore
289289

290290
public EnumIntegerEnum getEnumInteger() {
291-
return enumInteger.orElse(null);
291+
return enumInteger;
292292
}
293293

294294
@JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
295295
@JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
296-
297-
public JsonNullable<EnumIntegerEnum> getEnumInteger_JsonNullable() {
298-
return enumInteger;
299-
}
300-
301-
@JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
302-
public void setEnumInteger_JsonNullable(JsonNullable<EnumIntegerEnum> enumInteger) {
303-
this.enumInteger = enumInteger;
304-
}
305-
306296
public void setEnumInteger(@jakarta.annotation.Nullable EnumIntegerEnum enumInteger) {
307-
this.enumInteger = JsonNullable.<EnumIntegerEnum>of(enumInteger);
297+
this.enumInteger = enumInteger;
308298
}
309299

310300
public EnumTest enumNumber(@jakarta.annotation.Nullable EnumNumberEnum enumNumber) {
@@ -451,7 +441,7 @@ public boolean equals(Object o) {
451441
EnumTest enumTest = (EnumTest) o;
452442
return Objects.equals(this.enumString, enumTest.enumString) &&
453443
Objects.equals(this.enumStringRequired, enumTest.enumStringRequired) &&
454-
equalsNullable(this.enumInteger, enumTest.enumInteger) &&
444+
Objects.equals(this.enumInteger, enumTest.enumInteger) &&
455445
Objects.equals(this.enumNumber, enumTest.enumNumber) &&
456446
equalsNullable(this.outerEnum, enumTest.outerEnum) &&
457447
Objects.equals(this.outerEnumInteger, enumTest.outerEnumInteger) &&
@@ -465,7 +455,7 @@ private static <T> boolean equalsNullable(JsonNullable<T> a, JsonNullable<T> b)
465455

466456
@Override
467457
public int hashCode() {
468-
return Objects.hash(enumString, enumStringRequired, hashCodeNullable(enumInteger), enumNumber, hashCodeNullable(outerEnum), outerEnumInteger, outerEnumDefaultValue, outerEnumIntegerDefaultValue);
458+
return Objects.hash(enumString, enumStringRequired, enumInteger, enumNumber, hashCodeNullable(outerEnum), outerEnumInteger, outerEnumDefaultValue, outerEnumIntegerDefaultValue);
469459
}
470460

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

0 commit comments

Comments
 (0)