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

updated api_client.go to use the new SetMultiValueQueryParams method

Browse Source
This commit is contained in:
Guo Huang 2016-05-06 23:48:46 -07:00
parent 5bb1853018
commit 0bc34dcae8
6 changed files with 42 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@ import (
"strings"
"fmt"
"errors"
"net/url"
{{#imports}}"{{import}}"
{{/imports}}
)
@ -50,7 +51,7 @@ func (a {{classname}}) {{nickname}}({{#allParams}}{{paramName}} {{{dataType}}}{{
}{{/required}}{{/allParams}}
headerParams := make(map[string]string)
queryParams := make(map[string]string)
queryParams := url.Values{}
formParams := make(map[string]string)
var postBody interface{}
var fileName string
@ -82,14 +83,14 @@ func (a {{classname}}) {{nickname}}({{#allParams}}{{paramName}} {{{dataType}}}{{
var collectionFormat = "{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}"
if collectionFormat == "multi" {
for _, value := range {{paramName}} {
queryParams["{{paramName}}"] = value
queryParams.Add("{{paramName}}", value)
}
} else {
queryParams["{{paramName}}"] = a.Configuration.APIClient.ParameterToString({{paramName}})
queryParams.Add("{{paramName}}", a.Configuration.APIClient.ParameterToString({{paramName}}))
}
{{/isListContainer}}
{{^isListContainer}}
queryParams["{{paramName}}"] = a.Configuration.APIClient.ParameterToString({{paramName}})
queryParams.Add("{{paramName}}", a.Configuration.APIClient.ParameterToString({{paramName}}))
{{/isListContainer}}
{{/queryParams}}{{/hasQueryParams}}

8
modules/swagger-codegen/src/main/resources/go/api_client.mustache
View File

@ -6,7 +6,7 @@ import (
"path/filepath"
"reflect"
"strings"
"net/url"
"github.com/go-resty/resty"
)
@ -47,7 +47,7 @@ func contains(source []string, containvalue string) bool {
func (c *APIClient) CallAPI(path string, method string,
postBody interface{},
headerParams map[string]string,
queryParams map[string]string,
queryParams url.Values,
formParams map[string]string,
fileName string,
fileBytes []byte) (*resty.Response, error) {
@ -89,7 +89,7 @@ func (c *APIClient) ParameterToString(obj interface{}) string {
func prepareRequest(postBody interface{},
headerParams map[string]string,
queryParams map[string]string,
queryParams url.Values,
formParams map[string]string,
fileName string,
fileBytes []byte) *resty.Request {
@ -104,7 +104,7 @@ func prepareRequest(postBody interface{},
// add query parameter, if any
if len(queryParams) > 0 {
request.SetQueryParams(queryParams)
request.SetMultiValueQueryParams(queryParams)
}
// add form parameter, if any

8
samples/client/petstore/go/go-petstore/api_client.go
View File

@ -6,7 +6,7 @@ import (
"path/filepath"
"reflect"
"strings"
"net/url"
"github.com/go-resty/resty"
)
@ -47,7 +47,7 @@ func contains(source []string, containvalue string) bool {
func (c *APIClient) CallAPI(path string, method string,
postBody interface{},
headerParams map[string]string,
queryParams map[string]string,
queryParams url.Values,
formParams map[string]string,
fileName string,
fileBytes []byte) (*resty.Response, error) {
@ -89,7 +89,7 @@ func (c *APIClient) ParameterToString(obj interface{}) string {
func prepareRequest(postBody interface{},
headerParams map[string]string,
queryParams map[string]string,
queryParams url.Values,
formParams map[string]string,
fileName string,
fileBytes []byte) *resty.Request {
@ -104,7 +104,7 @@ func prepareRequest(postBody interface{},
// add query parameter, if any
if len(queryParams) > 0 {
request.SetQueryParams(queryParams)
request.SetMultiValueQueryParams(queryParams)
}
// add form parameter, if any

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

@ -4,6 +4,7 @@ import (
"strings"
"fmt"
"errors"
"net/url"
"os"
"io/ioutil"
"encoding/json"
@ -48,7 +49,7 @@ func (a PetApi) AddPet(body Pet) (*APIResponse, error) {
}
headerParams := make(map[string]string)
queryParams := make(map[string]string)
queryParams := url.Values{}
formParams := make(map[string]string)
var postBody interface{}
var fileName string
@ -117,7 +118,7 @@ func (a PetApi) DeletePet(petId int64, apiKey string) (*APIResponse, error) {
}
headerParams := make(map[string]string)
queryParams := make(map[string]string)
queryParams := url.Values{}
formParams := make(map[string]string)
var postBody interface{}
var fileName string
@ -185,7 +186,7 @@ func (a PetApi) FindPetsByStatus(status []string) ([]Pet, *APIResponse, error) {
}
headerParams := make(map[string]string)
queryParams := make(map[string]string)
queryParams := url.Values{}
formParams := make(map[string]string)
var postBody interface{}
var fileName string
@ -203,10 +204,10 @@ func (a PetApi) FindPetsByStatus(status []string) ([]Pet, *APIResponse, error) {
var collectionFormat = "csv"
if collectionFormat == "multi" {
for _, value := range status {
queryParams["status"] = value
queryParams.Add("status", value)
}
} else {
queryParams["status"] = a.Configuration.APIClient.ParameterToString(status)
queryParams.Add("status", a.Configuration.APIClient.ParameterToString(status))
}
@ -257,7 +258,7 @@ func (a PetApi) FindPetsByTags(tags []string) ([]Pet, *APIResponse, error) {
}
headerParams := make(map[string]string)
queryParams := make(map[string]string)
queryParams := url.Values{}
formParams := make(map[string]string)
var postBody interface{}
var fileName string
@ -275,10 +276,10 @@ func (a PetApi) FindPetsByTags(tags []string) ([]Pet, *APIResponse, error) {
var collectionFormat = "csv"
if collectionFormat == "multi" {
for _, value := range tags {
queryParams["tags"] = value
queryParams.Add("tags", value)
}
} else {
queryParams["tags"] = a.Configuration.APIClient.ParameterToString(tags)
queryParams.Add("tags", a.Configuration.APIClient.ParameterToString(tags))
}
@ -330,7 +331,7 @@ func (a PetApi) GetPetById(petId int64) (*Pet, *APIResponse, error) {
}
headerParams := make(map[string]string)
queryParams := make(map[string]string)
queryParams := url.Values{}
formParams := make(map[string]string)
var postBody interface{}
var fileName string
@ -393,7 +394,7 @@ func (a PetApi) UpdatePet(body Pet) (*APIResponse, error) {
}
headerParams := make(map[string]string)
queryParams := make(map[string]string)
queryParams := url.Values{}
formParams := make(map[string]string)
var postBody interface{}
var fileName string
@ -463,7 +464,7 @@ func (a PetApi) UpdatePetWithForm(petId int64, name string, status string) (*API
}
headerParams := make(map[string]string)
queryParams := make(map[string]string)
queryParams := url.Values{}
formParams := make(map[string]string)
var postBody interface{}
var fileName string
@ -533,7 +534,7 @@ func (a PetApi) UploadFile(petId int64, additionalMetadata string, file *os.File
}
headerParams := make(map[string]string)
queryParams := make(map[string]string)
queryParams := url.Values{}
formParams := make(map[string]string)
var postBody interface{}
var fileName string

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

@ -4,6 +4,7 @@ import (
"strings"
"fmt"
"errors"
"net/url"
"encoding/json"
)
@ -47,7 +48,7 @@ func (a StoreApi) DeleteOrder(orderId string) (*APIResponse, error) {
}
headerParams := make(map[string]string)
queryParams := make(map[string]string)
queryParams := url.Values{}
formParams := make(map[string]string)
var postBody interface{}
var fileName string
@ -101,7 +102,7 @@ func (a StoreApi) GetInventory() (*map[string]int32, *APIResponse, error) {
headerParams := make(map[string]string)
queryParams := make(map[string]string)
queryParams := url.Values{}
formParams := make(map[string]string)
var postBody interface{}
var fileName string
@ -164,7 +165,7 @@ func (a StoreApi) GetOrderById(orderId int64) (*Order, *APIResponse, error) {
}
headerParams := make(map[string]string)
queryParams := make(map[string]string)
queryParams := url.Values{}
formParams := make(map[string]string)
var postBody interface{}
var fileName string
@ -223,7 +224,7 @@ func (a StoreApi) PlaceOrder(body Order) (*Order, *APIResponse, error) {
}
headerParams := make(map[string]string)
queryParams := make(map[string]string)
queryParams := url.Values{}
formParams := make(map[string]string)
var postBody interface{}
var fileName string

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

@ -4,6 +4,7 @@ import (
"strings"
"fmt"
"errors"
"net/url"
"encoding/json"
)
@ -46,7 +47,7 @@ func (a UserApi) CreateUser(body User) (*APIResponse, error) {
}
headerParams := make(map[string]string)
queryParams := make(map[string]string)
queryParams := url.Values{}
formParams := make(map[string]string)
var postBody interface{}
var fileName string
@ -108,7 +109,7 @@ func (a UserApi) CreateUsersWithArrayInput(body []User) (*APIResponse, error) {
}
headerParams := make(map[string]string)
queryParams := make(map[string]string)
queryParams := url.Values{}
formParams := make(map[string]string)
var postBody interface{}
var fileName string
@ -170,7 +171,7 @@ func (a UserApi) CreateUsersWithListInput(body []User) (*APIResponse, error) {
}
headerParams := make(map[string]string)
queryParams := make(map[string]string)
queryParams := url.Values{}
formParams := make(map[string]string)
var postBody interface{}
var fileName string
@ -233,7 +234,7 @@ func (a UserApi) DeleteUser(username string) (*APIResponse, error) {
}
headerParams := make(map[string]string)
queryParams := make(map[string]string)
queryParams := url.Values{}
formParams := make(map[string]string)
var postBody interface{}
var fileName string
@ -293,7 +294,7 @@ func (a UserApi) GetUserByName(username string) (*User, *APIResponse, error) {
}
headerParams := make(map[string]string)
queryParams := make(map[string]string)
queryParams := url.Values{}
formParams := make(map[string]string)
var postBody interface{}
var fileName string
@ -357,7 +358,7 @@ func (a UserApi) LoginUser(username string, password string) (*string, *APIRespo
}
headerParams := make(map[string]string)
queryParams := make(map[string]string)
queryParams := url.Values{}
formParams := make(map[string]string)
var postBody interface{}
var fileName string
@ -367,8 +368,8 @@ func (a UserApi) LoginUser(username string, password string) (*string, *APIRespo
for key := range a.Configuration.DefaultHeader {
headerParams[key] = a.Configuration.DefaultHeader[key]
}
queryParams["username"] = a.Configuration.APIClient.ParameterToString(username)
queryParams["password"] = a.Configuration.APIClient.ParameterToString(password)
queryParams.Add("username", a.Configuration.APIClient.ParameterToString(username))
queryParams.Add("password", a.Configuration.APIClient.ParameterToString(password))
// to determine the Content-Type header
@ -413,7 +414,7 @@ func (a UserApi) LogoutUser() (*APIResponse, error) {
headerParams := make(map[string]string)
queryParams := make(map[string]string)
queryParams := url.Values{}
formParams := make(map[string]string)
var postBody interface{}
var fileName string
@ -478,7 +479,7 @@ func (a UserApi) UpdateUser(username string, body User) (*APIResponse, error) {
}
headerParams := make(map[string]string)
queryParams := make(map[string]string)
queryParams := url.Values{}
formParams := make(map[string]string)
var postBody interface{}
var fileName string