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

Update Java/Feign api.mustache to accept its own convinience Map Class (#14008)

Browse Source 
* Update Java/Feign api.mustache to accept convinience Map

Hi, I just saw, that the generated Map Class is never used outside of tests, but it would be the perfect fit for the changed mehods, as its use-case is exactly the same.

Also a useful change to prevent problems with Collection types and their generics parameters (f.e. Map<x, y>). See: https://stackoverflow.com/questions/62823341/openapi-generator-maven-plugin-breaks-old-feign-with-querymap

* PR checklist

Steps as requested per checklist: done.
This commit is contained in:
hahny93
2022-12-21 07:44:03 +01:00
committed by GitHub
parent 45b1f91807
commit 851ddecda3
12 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,7 +106,7 @@ public interface FakeApi extends ApiClient.Api {
"Accept: application/json",
"header_1: {header1}"
})
void fakeHttpSignatureTest(Pet pet, @Param("header1") String header1, @QueryMap(encoded=true) Map<String, Object> queryParams);
void fakeHttpSignatureTest(Pet pet, @Param("header1") String header1, @QueryMap(encoded=true) FakeHttpSignatureTestQueryParams queryParams);
/**
* test http signature authentication
@@ -127,7 +127,7 @@ public interface FakeApi extends ApiClient.Api {
"Accept: application/json",
"header_1: {header1}"
})
ApiResponse<Void> fakeHttpSignatureTestWithHttpInfo(Pet pet, @Param("header1") String header1, @QueryMap(encoded=true) Map<String, Object> queryParams);
ApiResponse<Void> fakeHttpSignatureTestWithHttpInfo(Pet pet, @Param("header1") String header1, @QueryMap(encoded=true) FakeHttpSignatureTestQueryParams queryParams);
/**
@@ -388,7 +388,7 @@ public interface FakeApi extends ApiClient.Api {
"Content-Type: application/json",
"Accept: application/json",
})
void testBodyWithQueryParams(User user, @QueryMap(encoded=true) Map<String, Object> queryParams);
void testBodyWithQueryParams(User user, @QueryMap(encoded=true) TestBodyWithQueryParamsQueryParams queryParams);
/**
*
@@ -407,7 +407,7 @@ public interface FakeApi extends ApiClient.Api {
"Content-Type: application/json",
"Accept: application/json",
})
ApiResponse<Void> testBodyWithQueryParamsWithHttpInfo(User user, @QueryMap(encoded=true) Map<String, Object> queryParams);
ApiResponse<Void> testBodyWithQueryParamsWithHttpInfo(User user, @QueryMap(encoded=true) TestBodyWithQueryParamsQueryParams queryParams);
/**
@@ -581,7 +581,7 @@ public interface FakeApi extends ApiClient.Api {
"enum_header_string: {enumHeaderString}"
})
void testEnumParameters(@Param("enumHeaderStringArray") List<String> enumHeaderStringArray, @Param("enumHeaderString") String enumHeaderString, @Param("enum_form_string_array") List<String> enumFormStringArray, @Param("enum_form_string") String enumFormString, @QueryMap(encoded=true) Map<String, Object> queryParams);
void testEnumParameters(@Param("enumHeaderStringArray") List<String> enumHeaderStringArray, @Param("enumHeaderString") String enumHeaderString, @Param("enum_form_string_array") List<String> enumFormStringArray, @Param("enum_form_string") String enumFormString, @QueryMap(encoded=true) TestEnumParametersQueryParams queryParams);
/**
* To test enum parameters
@@ -610,7 +610,7 @@ public interface FakeApi extends ApiClient.Api {
"enum_header_string: {enumHeaderString}"
})
ApiResponse<Void> testEnumParametersWithHttpInfo(@Param("enumHeaderStringArray") List<String> enumHeaderStringArray, @Param("enumHeaderString") String enumHeaderString, @Param("enum_form_string_array") List<String> enumFormStringArray, @Param("enum_form_string") String enumFormString, @QueryMap(encoded=true) Map<String, Object> queryParams);
ApiResponse<Void> testEnumParametersWithHttpInfo(@Param("enumHeaderStringArray") List<String> enumHeaderStringArray, @Param("enumHeaderString") String enumHeaderString, @Param("enum_form_string_array") List<String> enumFormStringArray, @Param("enum_form_string") String enumFormString, @QueryMap(encoded=true) TestEnumParametersQueryParams queryParams);
/**
@@ -706,7 +706,7 @@ public interface FakeApi extends ApiClient.Api {
"boolean_group: {booleanGroup}"
})
void testGroupParameters(@Param("requiredBooleanGroup") Boolean requiredBooleanGroup, @Param("booleanGroup") Boolean booleanGroup, @QueryMap(encoded=true) Map<String, Object> queryParams);
void testGroupParameters(@Param("requiredBooleanGroup") Boolean requiredBooleanGroup, @Param("booleanGroup") Boolean booleanGroup, @QueryMap(encoded=true) TestGroupParametersQueryParams queryParams);
/**
* Fake endpoint to test group parameters (optional)
@@ -731,7 +731,7 @@ public interface FakeApi extends ApiClient.Api {
"boolean_group: {booleanGroup}"
})
ApiResponse<Void> testGroupParametersWithHttpInfo(@Param("requiredBooleanGroup") Boolean requiredBooleanGroup, @Param("booleanGroup") Boolean booleanGroup, @QueryMap(encoded=true) Map<String, Object> queryParams);
ApiResponse<Void> testGroupParametersWithHttpInfo(@Param("requiredBooleanGroup") Boolean requiredBooleanGroup, @Param("booleanGroup") Boolean booleanGroup, @QueryMap(encoded=true) TestGroupParametersQueryParams queryParams);
/**
@@ -873,7 +873,7 @@ public interface FakeApi extends ApiClient.Api {
@Headers({
"Accept: application/json",
})
void testQueryParameterCollectionFormat(@QueryMap(encoded=true) Map<String, Object> queryParams);
void testQueryParameterCollectionFormat(@QueryMap(encoded=true) TestQueryParameterCollectionFormatQueryParams queryParams);
/**
*
@@ -896,7 +896,7 @@ public interface FakeApi extends ApiClient.Api {
@Headers({
"Accept: application/json",
})
ApiResponse<Void> testQueryParameterCollectionFormatWithHttpInfo(@QueryMap(encoded=true) Map<String, Object> queryParams);
ApiResponse<Void> testQueryParameterCollectionFormatWithHttpInfo(@QueryMap(encoded=true) TestQueryParameterCollectionFormatQueryParams queryParams);
/**

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

@@ -120,7 +120,7 @@ public interface PetApi extends ApiClient.Api {
@Headers({
"Accept: application/json",
})
List<Pet> findPetsByStatus(@QueryMap(encoded=true) Map<String, Object> queryParams);
List<Pet> findPetsByStatus(@QueryMap(encoded=true) FindPetsByStatusQueryParams queryParams);
/**
* Finds Pets by status
@@ -138,7 +138,7 @@ public interface PetApi extends ApiClient.Api {
@Headers({
"Accept: application/json",
})
ApiResponse<List<Pet>> findPetsByStatusWithHttpInfo(@QueryMap(encoded=true) Map<String, Object> queryParams);
ApiResponse<List<Pet>> findPetsByStatusWithHttpInfo(@QueryMap(encoded=true) FindPetsByStatusQueryParams queryParams);
/**
@@ -203,7 +203,7 @@ public interface PetApi extends ApiClient.Api {
@Headers({
"Accept: application/json",
})
Set<Pet> findPetsByTags(@QueryMap(encoded=true) Map<String, Object> queryParams);
Set<Pet> findPetsByTags(@QueryMap(encoded=true) FindPetsByTagsQueryParams queryParams);
/**
* Finds Pets by tags
@@ -223,7 +223,7 @@ public interface PetApi extends ApiClient.Api {
@Headers({
"Accept: application/json",
})
ApiResponse<Set<Pet>> findPetsByTagsWithHttpInfo(@QueryMap(encoded=true) Map<String, Object> queryParams);
ApiResponse<Set<Pet>> findPetsByTagsWithHttpInfo(@QueryMap(encoded=true) FindPetsByTagsQueryParams queryParams);
/**

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

@@ -198,7 +198,7 @@ public interface UserApi extends ApiClient.Api {
@Headers({
"Accept: application/json",
})
String loginUser(@QueryMap(encoded=true) Map<String, Object> queryParams);
String loginUser(@QueryMap(encoded=true) LoginUserQueryParams queryParams);
/**
* Logs user into the system
@@ -217,7 +217,7 @@ public interface UserApi extends ApiClient.Api {
@Headers({
"Accept: application/json",
})
ApiResponse<String> loginUserWithHttpInfo(@QueryMap(encoded=true) Map<String, Object> queryParams);
ApiResponse<String> loginUserWithHttpInfo(@QueryMap(encoded=true) LoginUserQueryParams queryParams);
/**