Skip to content

Commit 22e48e0

Browse files
martin-mfgmartin-mfg
committed
apply to more libraries, improve test
1 parent a8d3e7d commit 22e48e0

24 files changed

Lines changed: 207 additions & 59 deletions

File tree

‎modules/openapi-generator/src/main/resources/Java/libraries/microprofile/enumClass.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
{{#enumVars}}@XmlEnumValue({{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}{{{value}}}{{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}) {{name}}({{dataType}}.valueOf({{{value}}})){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
1616
{{/withXml}}
1717
{{^withXml}}
18-
{{#enumVars}}{{name}}({{^isUri}}{{dataType}}.valueOf({{/isUri}}{{{value}}}{{^isUri}}){{/isUri}}){{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
18+
{{#enumVars}}{{name}}({{^isUri}}{{^isNumeric}}{{dataType}}.valueOf({{/isNumeric}}{{/isUri}}{{{value}}}{{^isUri}}){{/isUri}}{{^isNumeric}}){{/isNumeric}}{{^-last}}, {{/-last}}{{#-last}};{{/-last}}{{/enumVars}}
1919
{{/withXml}}
2020
{{/allowableValues}}
2121

‎modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/modelInnerEnum.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
{{#withXml}}
1818
@XmlEnumValue({{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}}{{{value}}}{{#isInteger}}"{{/isInteger}}{{#isDouble}}"{{/isDouble}}{{#isLong}}"{{/isLong}}{{#isFloat}}"{{/isFloat}})
1919
{{/withXml}}
20-
{{{name}}}({{{value}}}){{^-last}},
20+
{{{name}}}({{^isUri}}{{^isNumeric}}{{dataType}}.valueOf({{/isNumeric}}{{/isUri}}{{{value}}}{{^isUri}}{{^isNumeric}}){{/isNumeric}}{{/isUri}}){{^-last}},
2121
{{/-last}}{{#-last}};{{/-last}}
2222
{{/enumVars}}
2323
{{/allowableValues}}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,7 @@ paths:
691691
default: 1
692692
enum_form_double:
693693
description: Form parameter enum test (double)
694-
type: double
694+
type: number
695695
enum:
696696
- 1.1
697697
- -1.1

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

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -710,6 +710,23 @@ paths:
710710
- '-efg'
711711
- (xyz)
712712
default: '-efg'
713+
enum_form_integer:
714+
description: Form parameter enum test (integer)
715+
type: integer
716+
enum:
717+
- 1
718+
- -1
719+
- 0
720+
default: 1
721+
enum_form_double:
722+
description: Form parameter enum test (double)
723+
type: number
724+
enum:
725+
- 1.1
726+
- -1.1
727+
- 0.1
728+
- 0.0
729+
default: 1.1
713730
post:
714731
tags:
715732
- fake
@@ -1417,6 +1434,18 @@ components:
14171434
complete:
14181435
type: boolean
14191436
default: false
1437+
paymentMethod:
1438+
type: number
1439+
format: int32
1440+
description: "Various payment methods"
1441+
default: 1
1442+
example: 1
1443+
x-enum-description:
1444+
- Paypal
1445+
- Creditcard
1446+
enum:
1447+
- 1
1448+
- 2
14201449
xml:
14211450
name: Order
14221451
Category:

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2935,13 +2935,14 @@ components:
29352935
- 0
29362936
type: integer
29372937
enum_form_double:
2938+
default: 1.1
29382939
description: Form parameter enum test (double)
29392940
enum:
29402941
- 1.1
29412942
- -1.1
29422943
- 0.1
29432944
- 0.0
2944-
type: double
2945+
type: number
29452946
type: object
29462947
testEndpointParameters_request:
29472948
properties:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,7 +1012,7 @@ 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-
Double enumFormDouble = 1.1D; // Double | Form parameter enum test (double)
1015+
BigDecimal enumFormDouble = new BigDecimal("1.1"); // BigDecimal | Form parameter enum test (double)
10161016
try {
10171017
apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
10181018
} catch (ApiException e) {
@@ -1039,7 +1039,7 @@ public class Example {
10391039
| **enumFormStringArray** | [**List&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $] |
10401040
| **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)] |
10411041
| **enumFormInteger** | **Integer**| Form parameter enum test (integer) | [optional] [default to 1] [enum: 1, -1, 0] |
1042-
| **enumFormDouble** | [**Double**](Double.md)| Form parameter enum test (double) | [optional] [enum: 1.1, -1.1, 0.1, 0.0] |
1042+
| **enumFormDouble** | **BigDecimal**| Form parameter enum test (double) | [optional] [default to 1.1] [enum: 1.1, -1.1, 0.1, 0.0] |
10431043

10441044
### Return type
10451045

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2109,7 +2109,7 @@ 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)
2112+
* @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
21132113
* @param _callback Callback for upload/download progress
21142114
* @return Call to execute
21152115
* @throws ApiException If fail to serialize the request body object
@@ -2121,7 +2121,7 @@ public okhttp3.Call testEndpointParametersAsync(BigDecimal number, Double _doubl
21212121
<tr><td> 404 </td><td> Not found </td><td> - </td></tr>
21222122
</table>
21232123
*/
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, Double enumFormDouble, final ApiCallback _callback) throws ApiException {
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 {
21252125
String basePath = null;
21262126
// Operation Servers
21272127
String[] localBasePaths = new String[] { };
@@ -2208,7 +2208,7 @@ public okhttp3.Call testEnumParametersCall(List<String> enumHeaderStringArray, S
22082208
}
22092209

22102210
@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, Double enumFormDouble, final ApiCallback _callback) throws ApiException {
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 {
22122212
return testEnumParametersCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, _callback);
22132213

22142214
}
@@ -2225,7 +2225,7 @@ private okhttp3.Call testEnumParametersValidateBeforeCall(List<String> enumHeade
22252225
* @param enumFormStringArray Form parameter enum test (string array) (optional)
22262226
* @param enumFormString Form parameter enum test (string) (optional, default to -efg)
22272227
* @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
2228-
* @param enumFormDouble Form parameter enum test (double) (optional)
2228+
* @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
22292229
* @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
22302230
* @http.response.details
22312231
<table border="1">
@@ -2235,7 +2235,7 @@ private okhttp3.Call testEnumParametersValidateBeforeCall(List<String> enumHeade
22352235
<tr><td> 404 </td><td> Not found </td><td> - </td></tr>
22362236
</table>
22372237
*/
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, Double enumFormDouble) throws ApiException {
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 {
22392239
testEnumParametersWithHttpInfo(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble);
22402240
}
22412241

@@ -2251,7 +2251,7 @@ public void testEnumParameters(List<String> enumHeaderStringArray, String enumHe
22512251
* @param enumFormStringArray Form parameter enum test (string array) (optional)
22522252
* @param enumFormString Form parameter enum test (string) (optional, default to -efg)
22532253
* @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
2254-
* @param enumFormDouble Form parameter enum test (double) (optional)
2254+
* @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
22552255
* @return ApiResponse&lt;Void&gt;
22562256
* @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
22572257
* @http.response.details
@@ -2262,7 +2262,7 @@ public void testEnumParameters(List<String> enumHeaderStringArray, String enumHe
22622262
<tr><td> 404 </td><td> Not found </td><td> - </td></tr>
22632263
</table>
22642264
*/
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, Double enumFormDouble) throws ApiException {
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 {
22662266
okhttp3.Call localVarCall = testEnumParametersValidateBeforeCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, null);
22672267
return localVarApiClient.execute(localVarCall);
22682268
}
@@ -2279,7 +2279,7 @@ public ApiResponse<Void> testEnumParametersWithHttpInfo(List<String> enumHeaderS
22792279
* @param enumFormStringArray Form parameter enum test (string array) (optional)
22802280
* @param enumFormString Form parameter enum test (string) (optional, default to -efg)
22812281
* @param enumFormInteger Form parameter enum test (integer) (optional, default to 1)
2282-
* @param enumFormDouble Form parameter enum test (double) (optional)
2282+
* @param enumFormDouble Form parameter enum test (double) (optional, default to 1.1)
22832283
* @param _callback The callback to be executed when the API call finishes
22842284
* @return The request call
22852285
* @throws ApiException If fail to process the API call, e.g. serializing the request body object
@@ -2291,7 +2291,7 @@ public ApiResponse<Void> testEnumParametersWithHttpInfo(List<String> enumHeaderS
22912291
<tr><td> 404 </td><td> Not found </td><td> - </td></tr>
22922292
</table>
22932293
*/
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, Double enumFormDouble, final ApiCallback<Void> _callback) throws ApiException {
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 {
22952295

22962296
okhttp3.Call localVarCall = testEnumParametersValidateBeforeCall(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString, enumFormInteger, enumFormDouble, _callback);
22972297
localVarApiClient.executeAsync(localVarCall, _callback);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ public class EnumArrays {
5757
*/
5858
@JsonAdapter(JustSymbolEnum.Adapter.class)
5959
public enum JustSymbolEnum {
60-
GREATER_THAN_OR_EQUAL_TO(">="),
60+
GREATER_THAN_OR_EQUAL_TO(String.valueOf(">=")),
6161

62-
DOLLAR("$");
62+
DOLLAR(String.valueOf("$"));
6363

6464
private String value;
6565

@@ -114,9 +114,9 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
114114
*/
115115
@JsonAdapter(ArrayEnumEnum.Adapter.class)
116116
public enum ArrayEnumEnum {
117-
FISH("fish"),
117+
FISH(String.valueOf("fish")),
118118

119-
CRAB("crab");
119+
CRAB(String.valueOf("crab"));
120120

121121
private String value;
122122

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ public class EnumStringDiscriminator {
5555
*/
5656
@JsonAdapter(EnumStrTypeEnum.Adapter.class)
5757
public enum EnumStrTypeEnum {
58-
A("type_a"),
58+
A(String.valueOf("type_a")),
5959

60-
B("type_b");
60+
B(String.valueOf("type_b"));
6161

6262
private String value;
6363

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ public class EnumTest {
6060
*/
6161
@JsonAdapter(EnumStringEnum.Adapter.class)
6262
public enum EnumStringEnum {
63-
UPPER("UPPER"),
63+
UPPER(String.valueOf("UPPER")),
6464

65-
LOWER("lower"),
65+
LOWER(String.valueOf("lower")),
6666

67-
EMPTY("");
67+
EMPTY(String.valueOf(""));
6868

6969
private String value;
7070

@@ -119,11 +119,11 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
119119
*/
120120
@JsonAdapter(EnumStringRequiredEnum.Adapter.class)
121121
public enum EnumStringRequiredEnum {
122-
UPPER("UPPER"),
122+
UPPER(String.valueOf("UPPER")),
123123

124-
LOWER("lower"),
124+
LOWER(String.valueOf("lower")),
125125

126-
EMPTY("");
126+
EMPTY(String.valueOf(""));
127127

128128
private String value;
129129

0 commit comments

Comments
 (0)