loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

fix java feign parameter request name (#4883)

Browse Source
This commit is contained in:
William Cheng 2019-12-29 14:55:08 +08:00 committed by GitHub
parent 1a5ba8736d
commit 85f43a3000
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openapi-generator/src/main/resources/Java/libraries/feign/api.mustache vendored
View File

@ -42,7 +42,7 @@ public interface {{classname}} extends ApiClient.Api {
"{{baseName}}: {{=<% %>=}}{<%paramName%>}<%={{ }}=%>"{{#hasMore}}, "{{baseName}}: {{=<% %>=}}{<%paramName%>}<%={{ }}=%>"{{#hasMore}},
{{/hasMore}}{{/headerParams}} {{/hasMore}}{{/headerParams}}
}) })
{{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{nickname}}({{#allParams}}{{^isBodyParam}}{{^legacyDates}}@Param("{{paramName}}") {{/legacyDates}}{{#legacyDates}}@Param(value="{{paramName}}", expander=ParamExpander.class) {{/legacyDates}}{{/isBodyParam}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}); {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{nickname}}({{#allParams}}{{^isBodyParam}}{{^legacyDates}}@Param("{{baseName}}") {{/legacyDates}}{{#legacyDates}}@Param(value="{{baseName}}", expander=ParamExpander.class) {{/legacyDates}}{{/isBodyParam}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
{{#hasQueryParams}} {{#hasQueryParams}}
/** /**
@ -80,7 +80,7 @@ public interface {{classname}} extends ApiClient.Api {
"{{baseName}}: {{=<% %>=}}{<%paramName%>}<%={{ }}=%>"{{#hasMore}}, "{{baseName}}: {{=<% %>=}}{<%paramName%>}<%={{ }}=%>"{{#hasMore}},
{{/hasMore}}{{/headerParams}} {{/hasMore}}{{/headerParams}}
}) })
{{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{nickname}}({{#allParams}}{{^isQueryParam}}{{^isBodyParam}}{{^legacyDates}}@Param("{{paramName}}") {{/legacyDates}}{{#legacyDates}}@Param(value="{{paramName}}", expander=ParamExpander.class) {{/legacyDates}}{{/isBodyParam}}{{{dataType}}} {{paramName}}, {{/isQueryParam}}{{/allParams}}@QueryMap(encoded=true) Map<String, Object> queryParams); {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{nickname}}({{#allParams}}{{^isQueryParam}}{{^isBodyParam}}{{^legacyDates}}@Param("{{baseName}}") {{/legacyDates}}{{#legacyDates}}@Param(value="{{baseName}}", expander=ParamExpander.class) {{/legacyDates}}{{/isBodyParam}}{{{dataType}}} {{paramName}}, {{/isQueryParam}}{{/allParams}}@QueryMap(encoded=true) Map<String, Object> queryParams);
/** /**
* A convenience class for generating query parameters for the * A convenience class for generating query parameters for the

10
samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java
View File

@ -181,7 +181,7 @@ public interface FakeApi extends ApiClient.Api {
"Content-Type: application/x-www-form-urlencoded", "Content-Type: application/x-www-form-urlencoded",
"Accept: application/json", "Accept: application/json",
}) })
void testEndpointParameters(@Param("number") BigDecimal number, @Param("_double") Double _double, @Param("patternWithoutDelimiter") String patternWithoutDelimiter, @Param("_byte") byte[] _byte, @Param("integer") Integer integer, @Param("int32") Integer int32, @Param("int64") Long int64, @Param("_float") Float _float, @Param("string") String string, @Param("binary") File binary, @Param("date") LocalDate date, @Param("dateTime") OffsetDateTime dateTime, @Param("password") String password, @Param("paramCallback") String paramCallback); void testEndpointParameters(@Param("number") BigDecimal number, @Param("double") Double _double, @Param("pattern_without_delimiter") String patternWithoutDelimiter, @Param("byte") byte[] _byte, @Param("integer") Integer integer, @Param("int32") Integer int32, @Param("int64") Long int64, @Param("float") Float _float, @Param("string") String string, @Param("binary") File binary, @Param("date") LocalDate date, @Param("dateTime") OffsetDateTime dateTime, @Param("password") String password, @Param("callback") String paramCallback);
/** /**
* To test enum parameters * To test enum parameters
@ -203,7 +203,7 @@ public interface FakeApi extends ApiClient.Api {
"enum_header_string: {enumHeaderString}" "enum_header_string: {enumHeaderString}"
}) })
void testEnumParameters(@Param("enumHeaderStringArray") List<String> enumHeaderStringArray, @Param("enumHeaderString") String enumHeaderString, @Param("enumQueryStringArray") List<String> enumQueryStringArray, @Param("enumQueryString") String enumQueryString, @Param("enumQueryInteger") Integer enumQueryInteger, @Param("enumQueryDouble") Double enumQueryDouble, @Param("enumFormStringArray") List<String> enumFormStringArray, @Param("enumFormString") String enumFormString); void testEnumParameters(@Param("enum_header_string_array") List<String> enumHeaderStringArray, @Param("enum_header_string") String enumHeaderString, @Param("enum_query_string_array") List<String> enumQueryStringArray, @Param("enum_query_string") String enumQueryString, @Param("enum_query_integer") Integer enumQueryInteger, @Param("enum_query_double") Double enumQueryDouble, @Param("enum_form_string_array") List<String> enumFormStringArray, @Param("enum_form_string") String enumFormString);
/** /**
* To test enum parameters * To test enum parameters
@ -234,7 +234,7 @@ public interface FakeApi extends ApiClient.Api {
"enum_header_string: {enumHeaderString}" "enum_header_string: {enumHeaderString}"
}) })
void testEnumParameters(@Param("enumHeaderStringArray") List<String> enumHeaderStringArray, @Param("enumHeaderString") String enumHeaderString, @Param("enumFormStringArray") List<String> enumFormStringArray, @Param("enumFormString") String enumFormString, @QueryMap(encoded=true) Map<String, Object> queryParams); void testEnumParameters(@Param("enum_header_string_array") List<String> enumHeaderStringArray, @Param("enum_header_string") String enumHeaderString, @Param("enum_form_string_array") List<String> enumFormStringArray, @Param("enum_form_string") String enumFormString, @QueryMap(encoded=true) Map<String, Object> queryParams);
/** /**
* A convenience class for generating query parameters for the * A convenience class for generating query parameters for the
@ -276,7 +276,7 @@ public interface FakeApi extends ApiClient.Api {
"boolean_group: {booleanGroup}" "boolean_group: {booleanGroup}"
}) })
void testGroupParameters(@Param("requiredStringGroup") Integer requiredStringGroup, @Param("requiredBooleanGroup") Boolean requiredBooleanGroup, @Param("requiredInt64Group") Long requiredInt64Group, @Param("stringGroup") Integer stringGroup, @Param("booleanGroup") Boolean booleanGroup, @Param("int64Group") Long int64Group); void testGroupParameters(@Param("required_string_group") Integer requiredStringGroup, @Param("required_boolean_group") Boolean requiredBooleanGroup, @Param("required_int64_group") Long requiredInt64Group, @Param("string_group") Integer stringGroup, @Param("boolean_group") Boolean booleanGroup, @Param("int64_group") Long int64Group);
/** /**
* Fake endpoint to test group parameters (optional) * Fake endpoint to test group parameters (optional)
@ -304,7 +304,7 @@ public interface FakeApi extends ApiClient.Api {
"boolean_group: {booleanGroup}" "boolean_group: {booleanGroup}"
}) })
void testGroupParameters(@Param("requiredBooleanGroup") Boolean requiredBooleanGroup, @Param("booleanGroup") Boolean booleanGroup, @QueryMap(encoded=true) Map<String, Object> queryParams); void testGroupParameters(@Param("required_boolean_group") Boolean requiredBooleanGroup, @Param("boolean_group") Boolean booleanGroup, @QueryMap(encoded=true) Map<String, Object> queryParams);
/** /**
* A convenience class for generating query parameters for the * A convenience class for generating query parameters for the

2
samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/PetApi.java
View File

@ -40,7 +40,7 @@ public interface PetApi extends ApiClient.Api {
"Accept: application/json", "Accept: application/json",
"api_key: {apiKey}" "api_key: {apiKey}"
}) })
void deletePet(@Param("petId") Long petId, @Param("apiKey") String apiKey); void deletePet(@Param("petId") Long petId, @Param("api_key") String apiKey);
/** /**
* Finds Pets by status * Finds Pets by status

4
samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/StoreApi.java
View File

@ -24,7 +24,7 @@ public interface StoreApi extends ApiClient.Api {
@Headers({ @Headers({
"Accept: application/json", "Accept: application/json",
}) })
void deleteOrder(@Param("orderId") String orderId); void deleteOrder(@Param("order_id") String orderId);
/** /**
* Returns pet inventories by status * Returns pet inventories by status
@ -47,7 +47,7 @@ public interface StoreApi extends ApiClient.Api {
@Headers({ @Headers({
"Accept: application/json", "Accept: application/json",
}) })
Order getOrderById(@Param("orderId") Long orderId); Order getOrderById(@Param("order_id") Long orderId);
/** /**
* Place an order for a pet * Place an order for a pet

10
samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/api/FakeApi.java
View File

@ -181,7 +181,7 @@ public interface FakeApi extends ApiClient.Api {
"Content-Type: application/x-www-form-urlencoded", "Content-Type: application/x-www-form-urlencoded",
"Accept: application/json", "Accept: application/json",
}) })
void testEndpointParameters(@Param("number") BigDecimal number, @Param("_double") Double _double, @Param("patternWithoutDelimiter") String patternWithoutDelimiter, @Param("_byte") byte[] _byte, @Param("integer") Integer integer, @Param("int32") Integer int32, @Param("int64") Long int64, @Param("_float") Float _float, @Param("string") String string, @Param("binary") File binary, @Param("date") LocalDate date, @Param("dateTime") OffsetDateTime dateTime, @Param("password") String password, @Param("paramCallback") String paramCallback); void testEndpointParameters(@Param("number") BigDecimal number, @Param("double") Double _double, @Param("pattern_without_delimiter") String patternWithoutDelimiter, @Param("byte") byte[] _byte, @Param("integer") Integer integer, @Param("int32") Integer int32, @Param("int64") Long int64, @Param("float") Float _float, @Param("string") String string, @Param("binary") File binary, @Param("date") LocalDate date, @Param("dateTime") OffsetDateTime dateTime, @Param("password") String password, @Param("callback") String paramCallback);
/** /**
* To test enum parameters * To test enum parameters
@ -203,7 +203,7 @@ public interface FakeApi extends ApiClient.Api {
"enum_header_string: {enumHeaderString}" "enum_header_string: {enumHeaderString}"
}) })
void testEnumParameters(@Param("enumHeaderStringArray") List<String> enumHeaderStringArray, @Param("enumHeaderString") String enumHeaderString, @Param("enumQueryStringArray") List<String> enumQueryStringArray, @Param("enumQueryString") String enumQueryString, @Param("enumQueryInteger") Integer enumQueryInteger, @Param("enumQueryDouble") Double enumQueryDouble, @Param("enumFormStringArray") List<String> enumFormStringArray, @Param("enumFormString") String enumFormString); void testEnumParameters(@Param("enum_header_string_array") List<String> enumHeaderStringArray, @Param("enum_header_string") String enumHeaderString, @Param("enum_query_string_array") List<String> enumQueryStringArray, @Param("enum_query_string") String enumQueryString, @Param("enum_query_integer") Integer enumQueryInteger, @Param("enum_query_double") Double enumQueryDouble, @Param("enum_form_string_array") List<String> enumFormStringArray, @Param("enum_form_string") String enumFormString);
/** /**
* To test enum parameters * To test enum parameters
@ -234,7 +234,7 @@ public interface FakeApi extends ApiClient.Api {
"enum_header_string: {enumHeaderString}" "enum_header_string: {enumHeaderString}"
}) })
void testEnumParameters(@Param("enumHeaderStringArray") List<String> enumHeaderStringArray, @Param("enumHeaderString") String enumHeaderString, @Param("enumFormStringArray") List<String> enumFormStringArray, @Param("enumFormString") String enumFormString, @QueryMap(encoded=true) Map<String, Object> queryParams); void testEnumParameters(@Param("enum_header_string_array") List<String> enumHeaderStringArray, @Param("enum_header_string") String enumHeaderString, @Param("enum_form_string_array") List<String> enumFormStringArray, @Param("enum_form_string") String enumFormString, @QueryMap(encoded=true) Map<String, Object> queryParams);
/** /**
* A convenience class for generating query parameters for the * A convenience class for generating query parameters for the
@ -276,7 +276,7 @@ public interface FakeApi extends ApiClient.Api {
"boolean_group: {booleanGroup}" "boolean_group: {booleanGroup}"
}) })
void testGroupParameters(@Param("requiredStringGroup") Integer requiredStringGroup, @Param("requiredBooleanGroup") Boolean requiredBooleanGroup, @Param("requiredInt64Group") Long requiredInt64Group, @Param("stringGroup") Integer stringGroup, @Param("booleanGroup") Boolean booleanGroup, @Param("int64Group") Long int64Group); void testGroupParameters(@Param("required_string_group") Integer requiredStringGroup, @Param("required_boolean_group") Boolean requiredBooleanGroup, @Param("required_int64_group") Long requiredInt64Group, @Param("string_group") Integer stringGroup, @Param("boolean_group") Boolean booleanGroup, @Param("int64_group") Long int64Group);
/** /**
* Fake endpoint to test group parameters (optional) * Fake endpoint to test group parameters (optional)
@ -304,7 +304,7 @@ public interface FakeApi extends ApiClient.Api {
"boolean_group: {booleanGroup}" "boolean_group: {booleanGroup}"
}) })
void testGroupParameters(@Param("requiredBooleanGroup") Boolean requiredBooleanGroup, @Param("booleanGroup") Boolean booleanGroup, @QueryMap(encoded=true) Map<String, Object> queryParams); void testGroupParameters(@Param("required_boolean_group") Boolean requiredBooleanGroup, @Param("boolean_group") Boolean booleanGroup, @QueryMap(encoded=true) Map<String, Object> queryParams);
/** /**
* A convenience class for generating query parameters for the * A convenience class for generating query parameters for the

2
samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/api/PetApi.java
View File

@ -40,7 +40,7 @@ public interface PetApi extends ApiClient.Api {
"Accept: application/json", "Accept: application/json",
"api_key: {apiKey}" "api_key: {apiKey}"
}) })
void deletePet(@Param("petId") Long petId, @Param("apiKey") String apiKey); void deletePet(@Param("petId") Long petId, @Param("api_key") String apiKey);
/** /**
* Finds Pets by status * Finds Pets by status

4
samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/api/StoreApi.java
View File

@ -24,7 +24,7 @@ public interface StoreApi extends ApiClient.Api {
@Headers({ @Headers({
"Accept: application/json", "Accept: application/json",
}) })
void deleteOrder(@Param("orderId") String orderId); void deleteOrder(@Param("order_id") String orderId);
/** /**
* Returns pet inventories by status * Returns pet inventories by status
@ -47,7 +47,7 @@ public interface StoreApi extends ApiClient.Api {
@Headers({ @Headers({
"Accept: application/json", "Accept: application/json",
}) })
Order getOrderById(@Param("orderId") Long orderId); Order getOrderById(@Param("order_id") Long orderId);
/** /**
* Place an order for a pet * Place an order for a pet