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

fixed code gen using {{#isListContainer}}*{{/isListContainer}} field

Browse Source
This commit is contained in:
Guo Huang 2016-05-05 11:41:58 -07:00
parent 41b7649e62
commit ebdf12bcd4
8 changed files with 48 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GoClientCodegen.java
View File

@ -401,13 +401,7 @@ public class GoClientCodegen extends DefaultCodegen implements CodegenConfig {
listIterator.add(newImportMap);
}
}
// add pointer to return type string if it is not array
for (CodegenOperation operation : operations) {
if((operation.returnContainer == null || operation.returnContainer != "array")
&& operation.returnType != null) {
operation.returnType = "*" + operation.returnType;
}
}
return objs;
}

10
modules/swagger-codegen/src/main/resources/go/api.mustache
View File

@ -35,9 +35,9 @@ func New{{classname}}WithBasePath(basePath string) *{{classname}} {
* {{notes}}{{/notes}}
*
{{#allParams}} * @param {{paramName}} {{description}}
{{/allParams}} * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
{{/allParams}} * @return {{#returnType}}{{^isListContainer}}*{{/isListContainer}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}
*/
func (a {{classname}}) {{nickname}}({{#allParams}}{{paramName}} {{{dataType}}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) ({{#returnType}}{{{returnType}}}, {{/returnType}}*APIResponse, error) {
func (a {{classname}}) {{nickname}}({{#allParams}}{{paramName}} {{{dataType}}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) ({{#returnType}}{{^isListContainer}}*{{/isListContainer}}{{{returnType}}}, {{/returnType}}*APIResponse, error) {
var httpMethod = "{{httpMethod}}"
// create path and map variables
@ -46,7 +46,7 @@ func (a {{classname}}) {{nickname}}({{#allParams}}{{paramName}} {{{dataType}}}{{
{{#allParams}}{{#required}}
// verify the required parameter '{{paramName}}' is set
if &{{paramName}} == nil {
return {{#returnType}}*new({{{returnType}}}), {{/returnType}}nil, errors.New("Missing required parameter '{{paramName}}' when calling {{classname}}->{{operationId}}")
return {{#returnType}}{{#isListContainer}}*{{/isListContainer}}new({{{returnType}}}), {{/returnType}}nil, errors.New("Missing required parameter '{{paramName}}' when calling {{classname}}->{{operationId}}")
}{{/required}}{{/allParams}}
headerParams := make(map[string]string)
@ -113,10 +113,10 @@ func (a {{classname}}) {{nickname}}({{#allParams}}{{paramName}} {{{dataType}}}{{
{{#returnType}} var successPayload = new({{returnType}}){{/returnType}}
httpResponse, err := a.Configuration.APIClient.CallAPI(path, httpMethod, postBody, headerParams, queryParams, formParams, fileName, fileBytes)
if err != nil {
return {{#returnType}}*successPayload, {{/returnType}}NewAPIResponse(httpResponse.RawResponse), err
return {{#returnType}}{{#isListContainer}}*{{/isListContainer}}successPayload, {{/returnType}}NewAPIResponse(httpResponse.RawResponse), err
}
{{#returnType}}
err = json.Unmarshal(httpResponse.Body(), &successPayload){{/returnType}}
return {{#returnType}}*successPayload, {{/returnType}}NewAPIResponse(httpResponse.RawResponse), err
return {{#returnType}}{{#isListContainer}}*{{/isListContainer}}successPayload, {{/returnType}}NewAPIResponse(httpResponse.RawResponse), err
}
{{/operation}}{{/operations}}

8
samples/client/petstore/go/go-petstore/docs/PetApi.md
View File

@ -132,7 +132,7 @@ Name | Type | Description | Notes
[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
# **GetPetById**
> *Pet GetPetById($petId)
> Pet GetPetById($petId)
Find pet by ID
@ -147,7 +147,7 @@ Name | Type | Description | Notes
### Return type
[***Pet**](Pet.md)
[**Pet**](Pet.md)
### Authorization
@ -221,7 +221,7 @@ void (empty response body)
[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
# **UploadFile**
> *ModelApiResponse UploadFile($petId, $additionalMetadata, $file)
> ModelApiResponse UploadFile($petId, $additionalMetadata, $file)
uploads an image
@ -238,7 +238,7 @@ Name | Type | Description | Notes
### Return type
[***ModelApiResponse**](ApiResponse.md)
[**ModelApiResponse**](ApiResponse.md)
### Authorization

12
samples/client/petstore/go/go-petstore/docs/StoreApi.md
View File

@ -40,7 +40,7 @@ No authorization required
[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
# **GetInventory**
> *map[string]int32 GetInventory()
> map[string]int32 GetInventory()
Returns pet inventories by status
@ -52,7 +52,7 @@ This endpoint does not need any parameter.
### Return type
[***map[string]int32**](map.md)
[**map[string]int32**](map.md)
### Authorization
@ -66,7 +66,7 @@ This endpoint does not need any parameter.
[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
# **GetOrderById**
> *Order GetOrderById($orderId)
> Order GetOrderById($orderId)
Find purchase order by ID
@ -81,7 +81,7 @@ Name | Type | Description | Notes
### Return type
[***Order**](Order.md)
[**Order**](Order.md)
### Authorization
@ -95,7 +95,7 @@ No authorization required
[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
# **PlaceOrder**
> *Order PlaceOrder($body)
> Order PlaceOrder($body)
Place an order for a pet
@ -110,7 +110,7 @@ Name | Type | Description | Notes
### Return type
[***Order**](Order.md)
[**Order**](Order.md)
### Authorization

8
samples/client/petstore/go/go-petstore/docs/UserApi.md
View File

@ -131,7 +131,7 @@ No authorization required
[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
# **GetUserByName**
> *User GetUserByName($username)
> User GetUserByName($username)
Get user by user name
@ -146,7 +146,7 @@ Name | Type | Description | Notes
### Return type
[***User**](User.md)
[**User**](User.md)
### Authorization
@ -160,7 +160,7 @@ No authorization required
[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
# **LoginUser**
> *string LoginUser($username, $password)
> string LoginUser($username, $password)
Logs user into the system
@ -176,7 +176,7 @@ Name | Type | Description | Notes
### Return type
***string**
**string**
### Authorization

16
samples/client/petstore/go/go-petstore/pet_api.go
View File

@ -312,7 +312,7 @@ func (a PetApi) GetPetById(petId int64) (*Pet, *APIResponse, error) {
// verify the required parameter 'petId' is set
if &petId == nil {
return *new(*Pet), nil, errors.New("Missing required parameter 'petId' when calling PetApi->GetPetById")
return new(Pet), nil, errors.New("Missing required parameter 'petId' when calling PetApi->GetPetById")
}
headerParams := make(map[string]string)
@ -350,13 +350,13 @@ func (a PetApi) GetPetById(petId int64) (*Pet, *APIResponse, error) {
if localVarHttpHeaderAccept != "" {
headerParams["Accept"] = localVarHttpHeaderAccept
}
var successPayload = new(*Pet)
var successPayload = new(Pet)
httpResponse, err := a.Configuration.APIClient.CallAPI(path, httpMethod, postBody, headerParams, queryParams, formParams, fileName, fileBytes)
if err != nil {
return *successPayload, NewAPIResponse(httpResponse.RawResponse), err
return successPayload, NewAPIResponse(httpResponse.RawResponse), err
}
err = json.Unmarshal(httpResponse.Body(), &successPayload)
return *successPayload, NewAPIResponse(httpResponse.RawResponse), err
return successPayload, NewAPIResponse(httpResponse.RawResponse), err
}
/**
@ -512,7 +512,7 @@ func (a PetApi) UploadFile(petId int64, additionalMetadata string, file *os.File
// verify the required parameter 'petId' is set
if &petId == nil {
return *new(*ModelApiResponse), nil, errors.New("Missing required parameter 'petId' when calling PetApi->UploadFile")
return new(ModelApiResponse), nil, errors.New("Missing required parameter 'petId' when calling PetApi->UploadFile")
}
headerParams := make(map[string]string)
@ -556,12 +556,12 @@ func (a PetApi) UploadFile(petId int64, additionalMetadata string, file *os.File
fileBytes = fbs
fileName = file.Name()
var successPayload = new(*ModelApiResponse)
var successPayload = new(ModelApiResponse)
httpResponse, err := a.Configuration.APIClient.CallAPI(path, httpMethod, postBody, headerParams, queryParams, formParams, fileName, fileBytes)
if err != nil {
return *successPayload, NewAPIResponse(httpResponse.RawResponse), err
return successPayload, NewAPIResponse(httpResponse.RawResponse), err
}
err = json.Unmarshal(httpResponse.Body(), &successPayload)
return *successPayload, NewAPIResponse(httpResponse.RawResponse), err
return successPayload, NewAPIResponse(httpResponse.RawResponse), err
}

22
samples/client/petstore/go/go-petstore/store_api.go
View File

@ -133,13 +133,13 @@ func (a StoreApi) GetInventory() (*map[string]int32, *APIResponse, error) {
if localVarHttpHeaderAccept != "" {
headerParams["Accept"] = localVarHttpHeaderAccept
}
var successPayload = new(*map[string]int32)
var successPayload = new(map[string]int32)
httpResponse, err := a.Configuration.APIClient.CallAPI(path, httpMethod, postBody, headerParams, queryParams, formParams, fileName, fileBytes)
if err != nil {
return *successPayload, NewAPIResponse(httpResponse.RawResponse), err
return successPayload, NewAPIResponse(httpResponse.RawResponse), err
}
err = json.Unmarshal(httpResponse.Body(), &successPayload)
return *successPayload, NewAPIResponse(httpResponse.RawResponse), err
return successPayload, NewAPIResponse(httpResponse.RawResponse), err
}
/**
@ -158,7 +158,7 @@ func (a StoreApi) GetOrderById(orderId int64) (*Order, *APIResponse, error) {
// verify the required parameter 'orderId' is set
if &orderId == nil {
return *new(*Order), nil, errors.New("Missing required parameter 'orderId' when calling StoreApi->GetOrderById")
return new(Order), nil, errors.New("Missing required parameter 'orderId' when calling StoreApi->GetOrderById")
}
headerParams := make(map[string]string)
@ -192,13 +192,13 @@ func (a StoreApi) GetOrderById(orderId int64) (*Order, *APIResponse, error) {
if localVarHttpHeaderAccept != "" {
headerParams["Accept"] = localVarHttpHeaderAccept
}
var successPayload = new(*Order)
var successPayload = new(Order)
httpResponse, err := a.Configuration.APIClient.CallAPI(path, httpMethod, postBody, headerParams, queryParams, formParams, fileName, fileBytes)
if err != nil {
return *successPayload, NewAPIResponse(httpResponse.RawResponse), err
return successPayload, NewAPIResponse(httpResponse.RawResponse), err
}
err = json.Unmarshal(httpResponse.Body(), &successPayload)
return *successPayload, NewAPIResponse(httpResponse.RawResponse), err
return successPayload, NewAPIResponse(httpResponse.RawResponse), err
}
/**
@ -216,7 +216,7 @@ func (a StoreApi) PlaceOrder(body Order) (*Order, *APIResponse, error) {
// verify the required parameter 'body' is set
if &body == nil {
return *new(*Order), nil, errors.New("Missing required parameter 'body' when calling StoreApi->PlaceOrder")
return new(Order), nil, errors.New("Missing required parameter 'body' when calling StoreApi->PlaceOrder")
}
headerParams := make(map[string]string)
@ -253,12 +253,12 @@ func (a StoreApi) PlaceOrder(body Order) (*Order, *APIResponse, error) {
// body params
postBody = &body
var successPayload = new(*Order)
var successPayload = new(Order)
httpResponse, err := a.Configuration.APIClient.CallAPI(path, httpMethod, postBody, headerParams, queryParams, formParams, fileName, fileBytes)
if err != nil {
return *successPayload, NewAPIResponse(httpResponse.RawResponse), err
return successPayload, NewAPIResponse(httpResponse.RawResponse), err
}
err = json.Unmarshal(httpResponse.Body(), &successPayload)
return *successPayload, NewAPIResponse(httpResponse.RawResponse), err
return successPayload, NewAPIResponse(httpResponse.RawResponse), err
}

18
samples/client/petstore/go/go-petstore/user_api.go
View File

@ -285,7 +285,7 @@ func (a UserApi) GetUserByName(username string) (*User, *APIResponse, error) {
// verify the required parameter 'username' is set
if &username == nil {
return *new(*User), nil, errors.New("Missing required parameter 'username' when calling UserApi->GetUserByName")
return new(User), nil, errors.New("Missing required parameter 'username' when calling UserApi->GetUserByName")
}
headerParams := make(map[string]string)
@ -319,13 +319,13 @@ func (a UserApi) GetUserByName(username string) (*User, *APIResponse, error) {
if localVarHttpHeaderAccept != "" {
headerParams["Accept"] = localVarHttpHeaderAccept
}
var successPayload = new(*User)
var successPayload = new(User)
httpResponse, err := a.Configuration.APIClient.CallAPI(path, httpMethod, postBody, headerParams, queryParams, formParams, fileName, fileBytes)
if err != nil {
return *successPayload, NewAPIResponse(httpResponse.RawResponse), err
return successPayload, NewAPIResponse(httpResponse.RawResponse), err
}
err = json.Unmarshal(httpResponse.Body(), &successPayload)
return *successPayload, NewAPIResponse(httpResponse.RawResponse), err
return successPayload, NewAPIResponse(httpResponse.RawResponse), err
}
/**
@ -344,11 +344,11 @@ func (a UserApi) LoginUser(username string, password string) (*string, *APIRespo
// verify the required parameter 'username' is set
if &username == nil {
return *new(*string), nil, errors.New("Missing required parameter 'username' when calling UserApi->LoginUser")
return new(string), nil, errors.New("Missing required parameter 'username' when calling UserApi->LoginUser")
}
// verify the required parameter 'password' is set
if &password == nil {
return *new(*string), nil, errors.New("Missing required parameter 'password' when calling UserApi->LoginUser")
return new(string), nil, errors.New("Missing required parameter 'password' when calling UserApi->LoginUser")
}
headerParams := make(map[string]string)
@ -388,13 +388,13 @@ func (a UserApi) LoginUser(username string, password string) (*string, *APIRespo
if localVarHttpHeaderAccept != "" {
headerParams["Accept"] = localVarHttpHeaderAccept
}
var successPayload = new(*string)
var successPayload = new(string)
httpResponse, err := a.Configuration.APIClient.CallAPI(path, httpMethod, postBody, headerParams, queryParams, formParams, fileName, fileBytes)
if err != nil {
return *successPayload, NewAPIResponse(httpResponse.RawResponse), err
return successPayload, NewAPIResponse(httpResponse.RawResponse), err
}
err = json.Unmarshal(httpResponse.Body(), &successPayload)
return *successPayload, NewAPIResponse(httpResponse.RawResponse), err
return successPayload, NewAPIResponse(httpResponse.RawResponse), err
}
/**