Skip to content

Commit 83e7009

Browse files
timon-sbrtimon-sbr
committed
issue-20188: regenerate samples after rebase
1 parent eae6725 commit 83e7009

15 files changed

Lines changed: 298 additions & 66 deletions

File tree

‎samples/client/petstore/java/feign-hc5/api/openapi.yaml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2217,6 +2217,23 @@ components:
22172217
- -efg
22182218
- (xyz)
22192219
type: string
2220+
enum_form_integer:
2221+
default: 1
2222+
description: Form parameter enum test (integer)
2223+
enum:
2224+
- 1
2225+
- -1
2226+
- 0
2227+
type: integer
2228+
enum_form_double:
2229+
default: 1.1
2230+
description: Form parameter enum test (double)
2231+
enum:
2232+
- 1.1
2233+
- -1.1
2234+
- 0.1
2235+
- 0.0
2236+
type: number
22202237
type: object
22212238
testEndpointParameters_request:
22222239
properties:

‎samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/api/FakeApi.java‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -570,6 +570,8 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final
570570
* @param enumQueryModelArray (optional)
571571
* @param enumFormStringArray Form parameter enum test (string array) (optional)
572572
* @param enumFormString Form parameter enum test (string) (optional, default to -efg)
573+
* @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
574+
* @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
573575
*/
574576
@RequestLine("GET /fake?enum_query_string_array={enumQueryStringArray}&enum_query_string={enumQueryString}&enum_query_integer={enumQueryInteger}&enum_query_double={enumQueryDouble}&enum_query_model_array={enumQueryModelArray}")
575577
@Headers({
@@ -579,7 +581,7 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final
579581

580582
"enum_header_string: {enumHeaderString}"
581583
})
582-
void testEnumParameters(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enumQueryStringArray") @javax.annotation.Nullable List<String> enumQueryStringArray, @Param("enumQueryString") @javax.annotation.Nullable String enumQueryString, @Param("enumQueryInteger") @javax.annotation.Nullable Integer enumQueryInteger, @Param("enumQueryDouble") @javax.annotation.Nullable Double enumQueryDouble, @Param("enumQueryModelArray") @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString);
584+
void testEnumParameters(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enumQueryStringArray") @javax.annotation.Nullable List<String> enumQueryStringArray, @Param("enumQueryString") @javax.annotation.Nullable String enumQueryString, @Param("enumQueryInteger") @javax.annotation.Nullable Integer enumQueryInteger, @Param("enumQueryDouble") @javax.annotation.Nullable Double enumQueryDouble, @Param("enumQueryModelArray") @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @Param("enum_form_integer") @javax.annotation.Nullable Integer enumFormInteger, @Param("enum_form_double") @javax.annotation.Nullable BigDecimal enumFormDouble);
583585

584586
/**
585587
* To test enum parameters
@@ -594,6 +596,8 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final
594596
* @param enumQueryModelArray (optional)
595597
* @param enumFormStringArray Form parameter enum test (string array) (optional)
596598
* @param enumFormString Form parameter enum test (string) (optional, default to -efg)
599+
* @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
600+
* @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
597601
*/
598602
@RequestLine("GET /fake?enum_query_string_array={enumQueryStringArray}&enum_query_string={enumQueryString}&enum_query_integer={enumQueryInteger}&enum_query_double={enumQueryDouble}&enum_query_model_array={enumQueryModelArray}")
599603
@Headers({
@@ -603,7 +607,7 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final
603607

604608
"enum_header_string: {enumHeaderString}"
605609
})
606-
ApiResponse<Void> testEnumParametersWithHttpInfo(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enumQueryStringArray") @javax.annotation.Nullable List<String> enumQueryStringArray, @Param("enumQueryString") @javax.annotation.Nullable String enumQueryString, @Param("enumQueryInteger") @javax.annotation.Nullable Integer enumQueryInteger, @Param("enumQueryDouble") @javax.annotation.Nullable Double enumQueryDouble, @Param("enumQueryModelArray") @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString);
610+
ApiResponse<Void> testEnumParametersWithHttpInfo(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enumQueryStringArray") @javax.annotation.Nullable List<String> enumQueryStringArray, @Param("enumQueryString") @javax.annotation.Nullable String enumQueryString, @Param("enumQueryInteger") @javax.annotation.Nullable Integer enumQueryInteger, @Param("enumQueryDouble") @javax.annotation.Nullable Double enumQueryDouble, @Param("enumQueryModelArray") @javax.annotation.Nullable List<EnumClass> enumQueryModelArray, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @Param("enum_form_integer") @javax.annotation.Nullable Integer enumFormInteger, @Param("enum_form_double") @javax.annotation.Nullable BigDecimal enumFormDouble);
607611

608612

609613
/**
@@ -618,6 +622,8 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final
618622
* @param enumHeaderString Header parameter enum test (string) (optional, default to -efg)
619623
* @param enumFormStringArray Form parameter enum test (string array) (optional)
620624
* @param enumFormString Form parameter enum test (string) (optional, default to -efg)
625+
* @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
626+
* @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
621627
* @param queryParams Map of query parameters as name-value pairs
622628
* <p>The following elements may be specified in the query map:</p>
623629
* <ul>
@@ -636,7 +642,7 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final
636642

637643
"enum_header_string: {enumHeaderString}"
638644
})
639-
void testEnumParameters(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @QueryMap(encoded=true) TestEnumParametersQueryParams queryParams);
645+
void testEnumParameters(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @Param("enum_form_integer") @javax.annotation.Nullable Integer enumFormInteger, @Param("enum_form_double") @javax.annotation.Nullable BigDecimal enumFormDouble, @QueryMap(encoded=true) TestEnumParametersQueryParams queryParams);
640646

641647
/**
642648
* To test enum parameters
@@ -647,6 +653,8 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final
647653
* @param enumHeaderString Header parameter enum test (string) (optional, default to -efg)
648654
* @param enumFormStringArray Form parameter enum test (string array) (optional)
649655
* @param enumFormString Form parameter enum test (string) (optional, default to -efg)
656+
* @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
657+
* @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
650658
* @param queryParams Map of query parameters as name-value pairs
651659
* <p>The following elements may be specified in the query map:</p>
652660
* <ul>
@@ -665,7 +673,7 @@ public TestBodyWithQueryParamsQueryParams query(@javax.annotation.Nonnull final
665673

666674
"enum_header_string: {enumHeaderString}"
667675
})
668-
ApiResponse<Void> testEnumParametersWithHttpInfo(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @QueryMap(encoded=true) TestEnumParametersQueryParams queryParams);
676+
ApiResponse<Void> testEnumParametersWithHttpInfo(@Param("enumHeaderStringArray") @javax.annotation.Nullable List<String> enumHeaderStringArray, @Param("enumHeaderString") @javax.annotation.Nullable String enumHeaderString, @Param("enum_form_string_array") @javax.annotation.Nullable List<String> enumFormStringArray, @Param("enum_form_string") @javax.annotation.Nullable String enumFormString, @Param("enum_form_integer") @javax.annotation.Nullable Integer enumFormInteger, @Param("enum_form_double") @javax.annotation.Nullable BigDecimal enumFormDouble, @QueryMap(encoded=true) TestEnumParametersQueryParams queryParams);
669677

670678

671679
/**

‎samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/model/EnumTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +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(1),
137137

138-
NUMBER_MINUS_1(Integer.valueOf(-1));
138+
NUMBER_MINUS_1(-1);
139139

140140
private Integer value;
141141

@@ -172,9 +172,9 @@ public static EnumIntegerEnum fromValue(Integer value) {
172172
* Gets or Sets enumNumber
173173
*/
174174
public enum EnumNumberEnum {
175-
NUMBER_1_DOT_1(Double.valueOf(1.1)),
175+
NUMBER_1_DOT_1(1.1),
176176

177-
NUMBER_MINUS_1_DOT_2(Double.valueOf(-1.2));
177+
NUMBER_MINUS_1_DOT_2(-1.2);
178178

179179
private Double value;
180180

‎samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java‎

Lines changed: 86 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.google.gson.stream.JsonReader;
2121
import com.google.gson.stream.JsonWriter;
2222
import java.io.IOException;
23+
import java.math.BigDecimal;
2324
import java.time.OffsetDateTime;
2425
import java.util.Arrays;
2526

@@ -135,6 +136,63 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
135136
@javax.annotation.Nullable
136137
private Boolean complete = false;
137138

139+
/**
140+
* Various payment methods
141+
*/
142+
@JsonAdapter(PaymentMethodEnum.Adapter.class)
143+
public enum PaymentMethodEnum {
144+
NUMBER_1(new BigDecimal("1")),
145+
146+
NUMBER_2(new BigDecimal("2"));
147+
148+
private BigDecimal value;
149+
150+
PaymentMethodEnum(BigDecimal value) {
151+
this.value = value;
152+
}
153+
154+
public BigDecimal getValue() {
155+
return value;
156+
}
157+
158+
@Override
159+
public String toString() {
160+
return String.valueOf(value);
161+
}
162+
163+
public static PaymentMethodEnum fromValue(BigDecimal value) {
164+
for (PaymentMethodEnum b : PaymentMethodEnum.values()) {
165+
if (b.value.equals(value)) {
166+
return b;
167+
}
168+
}
169+
throw new IllegalArgumentException("Unexpected value '" + value + "'");
170+
}
171+
172+
public static class Adapter extends TypeAdapter<PaymentMethodEnum> {
173+
@Override
174+
public void write(final JsonWriter jsonWriter, final PaymentMethodEnum enumeration) throws IOException {
175+
jsonWriter.value(enumeration.getValue());
176+
}
177+
178+
@Override
179+
public PaymentMethodEnum read(final JsonReader jsonReader) throws IOException {
180+
String value = jsonReader.nextString();
181+
return PaymentMethodEnum.fromValue(new BigDecimal(value));
182+
}
183+
}
184+
185+
public static void validateJsonElement(JsonElement jsonElement) throws IOException {
186+
String value = jsonElement.getAsString();
187+
PaymentMethodEnum.fromValue(new BigDecimal(value));
188+
}
189+
}
190+
191+
public static final String SERIALIZED_NAME_PAYMENT_METHOD = "paymentMethod";
192+
@SerializedName(SERIALIZED_NAME_PAYMENT_METHOD)
193+
@javax.annotation.Nullable
194+
private PaymentMethodEnum paymentMethod = PaymentMethodEnum.NUMBER_1;
195+
138196
public Order() {
139197
}
140198

@@ -251,6 +309,25 @@ public void setComplete(@javax.annotation.Nullable Boolean complete) {
251309
this.complete = complete;
252310
}
253311

312+
313+
public Order paymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
314+
this.paymentMethod = paymentMethod;
315+
return this;
316+
}
317+
318+
/**
319+
* Various payment methods
320+
* @return paymentMethod
321+
*/
322+
@javax.annotation.Nullable
323+
public PaymentMethodEnum getPaymentMethod() {
324+
return paymentMethod;
325+
}
326+
327+
public void setPaymentMethod(@javax.annotation.Nullable PaymentMethodEnum paymentMethod) {
328+
this.paymentMethod = paymentMethod;
329+
}
330+
254331
/**
255332
* A container for additional, undeclared properties.
256333
* This is a holder for any undeclared properties as specified with
@@ -311,13 +388,14 @@ public boolean equals(Object o) {
311388
Objects.equals(this.quantity, order.quantity) &&
312389
Objects.equals(this.shipDate, order.shipDate) &&
313390
Objects.equals(this.status, order.status) &&
314-
Objects.equals(this.complete, order.complete)&&
391+
Objects.equals(this.complete, order.complete) &&
392+
Objects.equals(this.paymentMethod, order.paymentMethod)&&
315393
Objects.equals(this.additionalProperties, order.additionalProperties);
316394
}
317395

318396
@Override
319397
public int hashCode() {
320-
return Objects.hash(id, petId, quantity, shipDate, status, complete, additionalProperties);
398+
return Objects.hash(id, petId, quantity, shipDate, status, complete, paymentMethod, additionalProperties);
321399
}
322400

323401
@Override
@@ -330,6 +408,7 @@ public String toString() {
330408
sb.append(" shipDate: ").append(toIndentedString(shipDate)).append("\n");
331409
sb.append(" status: ").append(toIndentedString(status)).append("\n");
332410
sb.append(" complete: ").append(toIndentedString(complete)).append("\n");
411+
sb.append(" paymentMethod: ").append(toIndentedString(paymentMethod)).append("\n");
333412
sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n");
334413
sb.append("}");
335414
return sb.toString();
@@ -352,7 +431,7 @@ private String toIndentedString(Object o) {
352431

353432
static {
354433
// a set of all properties/fields (JSON key names)
355-
openapiFields = new HashSet<String>(Arrays.asList("id", "petId", "quantity", "shipDate", "status", "complete"));
434+
openapiFields = new HashSet<String>(Arrays.asList("id", "petId", "quantity", "shipDate", "status", "complete", "paymentMethod"));
356435

357436
// a set of required properties/fields (JSON key names)
358437
openapiRequiredFields = new HashSet<String>(0);
@@ -378,6 +457,10 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
378457
if (jsonObj.get("status") != null && !jsonObj.get("status").isJsonNull()) {
379458
StatusEnum.validateJsonElement(jsonObj.get("status"));
380459
}
460+
// validate the optional field `paymentMethod`
461+
if (jsonObj.get("paymentMethod") != null && !jsonObj.get("paymentMethod").isJsonNull()) {
462+
PaymentMethodEnum.validateJsonElement(jsonObj.get("paymentMethod"));
463+
}
381464
}
382465

383466
public static class CustomTypeAdapterFactory implements TypeAdapterFactory {

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2217,6 +2217,23 @@ components:
22172217
- -efg
22182218
- (xyz)
22192219
type: string
2220+
enum_form_integer:
2221+
default: 1
2222+
description: Form parameter enum test (integer)
2223+
enum:
2224+
- 1
2225+
- -1
2226+
- 0
2227+
type: integer
2228+
enum_form_double:
2229+
default: 1.1
2230+
description: Form parameter enum test (double)
2231+
enum:
2232+
- 1.1
2233+
- -1.1
2234+
- 0.1
2235+
- 0.0
2236+
type: number
22202237
type: object
22212238
testEndpointParameters_request:
22222239
properties:

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -976,7 +976,7 @@ null (empty response body)
976976

977977
## testEnumParameters
978978

979-
> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString)
979+
> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble)
980980
981981
To test enum parameters
982982

@@ -1007,8 +1007,10 @@ public class Example {
10071007
List<EnumClass> enumQueryModelArray = Arrays.asList(-efg); // List<EnumClass> |
10081008
List<String> enumFormStringArray = Arrays.asList("$"); // List<String> | Form parameter enum test (string array)
10091009
String enumFormString = "_abc"; // String | Form parameter enum test (string)
1010+
Integer enumFormInteger = 1; // Integer | Form parameter enum test (integer)
1011+
BigDecimal enumFormDouble = new BigDecimal("1.1"); // BigDecimal | Form parameter enum test (double)
10101012
try {
1011-
apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString);
1013+
apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumQueryModelArray, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
10121014
} catch (ApiException e) {
10131015
System.err.println("Exception when calling FakeApi#testEnumParameters");
10141016
System.err.println("Status code: " + e.getCode());
@@ -1034,6 +1036,8 @@ public class Example {
10341036
| **enumQueryModelArray** | [**List&lt;EnumClass&gt;**](EnumClass.md)| | [optional] |
10351037
| **enumFormStringArray** | [**List&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] |
10361038
| **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] |
1039+
| **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] |
1040+
| **enumFormDouble** | **BigDecimal**| Form parameter enum test (double) | [optional] [default to 1.1] [enum: 1.1, -1.1, 0.1, 0.0] |
10371041

10381042
### Return type
10391043

0 commit comments

Comments
 (0)