Skip to content

Commit 54ef454

Browse files
committed
don't trigger unrelated problem
1 parent 22e48e0 commit 54ef454

5 files changed

Lines changed: 12 additions & 42 deletions

File tree

modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -689,15 +689,6 @@ paths:
689689
- -1
690690
- 0
691691
default: 1
692-
enum_form_double:
693-
description: Form parameter enum test (double)
694-
type: number
695-
enum:
696-
- 1.1
697-
- -1.1
698-
- 0.1
699-
- 0.0
700-
default: 1.1
701692
post:
702693
tags:
703694
- fake

samples/client/petstore/java/okhttp-gson/api/openapi.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2934,15 +2934,6 @@ components:
29342934
- -1
29352935
- 0
29362936
type: integer
2937-
enum_form_double:
2938-
default: 1.1
2939-
description: Form parameter enum test (double)
2940-
enum:
2941-
- 1.1
2942-
- -1.1
2943-
- 0.1
2944-
- 0.0
2945-
type: number
29462937
type: object
29472938
testEndpointParameters_request:
29482939
properties:

samples/client/petstore/java/okhttp-gson/docs/FakeApi.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -982,7 +982,7 @@ null (empty response body)
982982

983983
<a id="testEnumParameters"></a>
984984
# **testEnumParameters**
985-
> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble)
985+
> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger)
986986
987987
To test enum parameters
988988

@@ -1012,9 +1012,8 @@ public class Example {
10121012
List<String> enumFormStringArray = Arrays.asList("$"); // List<String> | Form parameter enum test (string array)
10131013
String enumFormString = "_abc"; // String | Form parameter enum test (string)
10141014
Integer enumFormInteger = 1; // Integer | Form parameter enum test (integer)
1015-
BigDecimal enumFormDouble = new BigDecimal("1.1"); // BigDecimal | Form parameter enum test (double)
10161015
try {
1017-
apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
1016+
apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger);
10181017
} catch (ApiException e) {
10191018
System.err.println("Exception when calling FakeApi#testEnumParameters");
10201019
System.err.println("Status code: " + e.getCode());
@@ -1039,7 +1038,6 @@ public class Example {
10391038
| **enumFormStringArray** | [**List&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] |
10401039
| **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] |
10411040
| **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] |
1042-
| **enumFormDouble** | **BigDecimal**| Form parameter enum test (double) | [optional] [default to 1.1] [enum: 1.1, -1.1, 0.1, 0.0] |
10431041

10441042
### Return type
10451043

samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2109,7 +2109,6 @@ public okhttp3.Call testEndpointParametersAsync(BigDecimal number, Double _doubl
21092109
* @param enumFormStringArray Form parameter enum test (string array) (optional)
21102110
* @param enumFormString Form parameter enum test (string) (optional, default to -efg)
21112111
* @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
2112-
* @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
21132112
* @param _callback Callback for upload/download progress
21142113
* @return Call to execute
21152114
* @throws ApiException If fail to serialize the request body object
@@ -2121,7 +2120,7 @@ public okhttp3.Call testEndpointParametersAsync(BigDecimal number, Double _doubl
21212120
<tr><td> 404 </td><td> Not found </td><td> - </td></tr>
21222121
</table>
21232122
*/
2124-
public okhttp3.Call testEnumParametersCall(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble, final ApiCallback _callback) throws ApiException {
2123+
public okhttp3.Call testEnumParametersCall(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger, final ApiCallback _callback) throws ApiException {
21252124
String basePath = null;
21262125
// Operation Servers
21272126
String[] localBasePaths = new String[] { };
@@ -2158,10 +2157,6 @@ public okhttp3.Call testEnumParametersCall(List<String> enumHeaderStringArray, S
21582157
localVarFormParams.put("enum_form_integer", enumFormInteger);
21592158
}
21602159

2161-
if (enumFormDouble != null) {
2162-
localVarFormParams.put("enum_form_double", enumFormDouble);
2163-
}
2164-
21652160
if (enumQueryStringArray != null) {
21662161
localVarCollectionQueryParams.addAll(localVarApiClient.parameterToPairs("multi", "enum_query_string_array", enumQueryStringArray));
21672162
}
@@ -2208,8 +2203,8 @@ public okhttp3.Call testEnumParametersCall(List<String> enumHeaderStringArray, S
22082203
}
22092204

22102205
@SuppressWarnings("rawtypes")
2211-
private okhttp3.Call testEnumParametersValidateBeforeCall(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble, final ApiCallback _callback) throws ApiException {
2212-
return testEnumParametersCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, _callback);
2206+
private okhttp3.Call testEnumParametersValidateBeforeCall(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger, final ApiCallback _callback) throws ApiException {
2207+
return testEnumParametersCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, _callback);
22132208

22142209
}
22152210

@@ -2225,7 +2220,6 @@ private okhttp3.Call testEnumParametersValidateBeforeCall(List<String> enumHeade
22252220
* @param enumFormStringArray Form parameter enum test (string array) (optional)
22262221
* @param enumFormString Form parameter enum test (string) (optional, default to -efg)
22272222
* @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
2228-
* @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
22292223
* @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
22302224
* @http.response.details
22312225
<table border="1">
@@ -2235,8 +2229,8 @@ private okhttp3.Call testEnumParametersValidateBeforeCall(List<String> enumHeade
22352229
<tr><td> 404 </td><td> Not found </td><td> - </td></tr>
22362230
</table>
22372231
*/
2238-
public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble) throws ApiException {
2239-
testEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
2232+
public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger) throws ApiException {
2233+
testEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger);
22402234
}
22412235

22422236
/**
@@ -2251,7 +2245,6 @@ public void testEnumParameters(List<String> enumHeaderStringArray, String enumHe
22512245
* @param enumFormStringArray Form parameter enum test (string array) (optional)
22522246
* @param enumFormString Form parameter enum test (string) (optional, default to -efg)
22532247
* @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
2254-
* @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
22552248
* @return ApiResponse&lt;Void&gt;
22562249
* @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
22572250
* @http.response.details
@@ -2262,8 +2255,8 @@ public void testEnumParameters(List<String> enumHeaderStringArray, String enumHe
22622255
<tr><td> 404 </td><td> Not found </td><td> - </td></tr>
22632256
</table>
22642257
*/
2265-
public ApiResponse<Void> testEnumParametersWithHttpInfo(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble) throws ApiException {
2266-
okhttp3.Call localVarCall = testEnumParametersValidateBeforeCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, null);
2258+
public ApiResponse<Void> testEnumParametersWithHttpInfo(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger) throws ApiException {
2259+
okhttp3.Call localVarCall = testEnumParametersValidateBeforeCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, null);
22672260
return localVarApiClient.execute(localVarCall);
22682261
}
22692262

@@ -2279,7 +2272,6 @@ public ApiResponse<Void> testEnumParametersWithHttpInfo(List<String> enumHeaderS
22792272
* @param enumFormStringArray Form parameter enum test (string array) (optional)
22802273
* @param enumFormString Form parameter enum test (string) (optional, default to -efg)
22812274
* @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
2282-
* @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
22832275
* @param _callback The callback to be executed when the API call finishes
22842276
* @return The request call
22852277
* @throws ApiException If fail to process the API call, e.g. serializing the request body object
@@ -2291,9 +2283,9 @@ public ApiResponse<Void> testEnumParametersWithHttpInfo(List<String> enumHeaderS
22912283
<tr><td> 404 </td><td> Not found </td><td> - </td></tr>
22922284
</table>
22932285
*/
2294-
public okhttp3.Call testEnumParametersAsync(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger, BigDecimal enumFormDouble, final ApiCallback<Void> _callback) throws ApiException {
2286+
public okhttp3.Call testEnumParametersAsync(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString, Integer enumFormInteger, final ApiCallback<Void> _callback) throws ApiException {
22952287

2296-
okhttp3.Call localVarCall = testEnumParametersValidateBeforeCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, _callback);
2288+
okhttp3.Call localVarCall = testEnumParametersValidateBeforeCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, _callback);
22972289
localVarApiClient.executeAsync(localVarCall, _callback);
22982290
return localVarCall;
22992291
}

samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/api/FakeApiTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,7 @@ public void testEnumParametersTest() throws ApiException {
220220
Double enumQueryDouble = null;
221221
List<String> enumFormStringArray = null;
222222
String enumFormString = null;
223-
Integer enumFormInteger = null;
224-
Double enumFormDouble = null;
225-
api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
223+
api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
226224
// TODO: test validations
227225
}
228226

0 commit comments

Comments
 (0)