diff --git a/modules/swagger-codegen/src/main/resources/go/api.mustache b/modules/swagger-codegen/src/main/resources/go/api.mustache index 1e18bde85caa..9e0679538fab 100644 --- a/modules/swagger-codegen/src/main/resources/go/api.mustache +++ b/modules/swagger-codegen/src/main/resources/go/api.mustache @@ -2,6 +2,7 @@ package {{invokerPackage}} {{#operations}} import ( +// "encoding/json" "strings" "fmt" // "log" @@ -35,13 +36,8 @@ func New{{classname}}WithBasePath(basePath string) *{{classname}}{ {{#allParams}} * @param {{paramName}} {{description}} {{/allParams}} * @return {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}} */ +//func (a {{classname}}) {{nickname}} ({{#allParams}}{{paramName}} {{{dataType}}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) ({{#returnType}}{{{returnType}}}, {{/returnType}}error) { func (a {{classname}}) {{nickname}} ({{#allParams}}{{paramName}} {{{dataType}}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) ({{#returnType}}{{{returnType}}}, {{/returnType}}error) { - {{#allParams}}{{#required}} - // verify the required parameter '{{paramName}}' is set - //if {{paramName}} == nil { - // return 0, fmt.Error("Missing the required parameter '{{paramName}}' when calling {{nickname}}") - //} - {{/required}}{{/allParams}} _sling := a.sling.{{httpMethod}}(a.basePath) @@ -54,8 +50,7 @@ func (a {{classname}}) {{nickname}} ({{#allParams}}{{paramName}} {{{dataType}}}{ _sling = _sling.Path(path) - {{#hasQueryParams}} - type QueryParams struct { + {{#hasQueryParams}}type QueryParams struct { {{#queryParams}}{{paramName}} {{dataType}} `url:"{{baseName}},omitempty"` {{/queryParams}} } @@ -69,8 +64,7 @@ func (a {{classname}}) {{nickname}} ({{#allParams}}{{paramName}} {{{dataType}}}{ //contentTypes := []string { {{#consumes}}"{{mediaType}}"{{#hasMore}},{{/hasMore}}{{/consumes}} } - {{#hasFormParams}} - type FormParams struct { + {{#hasFormParams}}type FormParams struct { {{#formParams}}{{paramName}} {{dataType}} `url:"{{baseName}},omitempty"` {{/formParams}} } @@ -83,16 +77,30 @@ func (a {{classname}}) {{nickname}} ({{#allParams}}{{paramName}} {{{dataType}}}{ //bodyParams["{{baseName}}"] = string(b) {{/bodyParams}} - req, err := _sling.Request() + {{#returnType}} + var response {{returnType}} + resp, err := _sling.ReceiveSuccess(response) + fmt.Println("{{operationId}} response: ", response, resp, err) + return response, err + {{/returnType}}{{^returnType}} + resp, err := _sling.Request() + fmt.Println("{{operationId}} response: void, ", resp, err) + return err + {{/returnType}} - /*response, err := a.apiClient.CallApi(a.basePath, path, "{{httpMethod}}", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) + + + //response, err := a.apiClient.CallApi(a.basePath, path, "{{httpMethod}}", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) //if err != nil { // log.Fatal(err) - //} */ + //} //{{#returnType}}ApiClient.Deserialize(response, "{{returnContainer}}", "{{returnBaseType}}"){{/returnType}} - {{#returnType}}return req, err{{/returnType}} - {{^returnType}}return err{{/returnType}} + + //{{#returnType}}var response {{returnType}} + //err = json.Unmarshal([]byte(req), &response) + //return response, err{{/returnType}} + //{{^returnType}}return err{{/returnType}} } {{/operation}} {{/operations}} diff --git a/samples/client/petstore/go/swagger/PetApi.go b/samples/client/petstore/go/swagger/PetApi.go index 5170797cc806..cf6f793805fb 100644 --- a/samples/client/petstore/go/swagger/PetApi.go +++ b/samples/client/petstore/go/swagger/PetApi.go @@ -1,6 +1,7 @@ package swagger import ( +// "encoding/json" "strings" "fmt" // "log" @@ -32,8 +33,8 @@ func NewPetApiWithBasePath(basePath string) *PetApi{ * @param body Pet object that needs to be added to the store * @return void */ +//func (a PetApi) updatePet (body Pet) (error) { func (a PetApi) updatePet (body Pet) (error) { - _sling := a.sling.Put(a.basePath) @@ -57,16 +58,23 @@ func (a PetApi) updatePet (body Pet) (error) { //bodyParams["body"] = string(b) - req, err := _sling.Request() + + resp, err := _sling.Request() + fmt.Println("updatePet response: void, ", resp, err) + return err + - /*response, err := a.apiClient.CallApi(a.basePath, path, "Put", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) + + + //response, err := a.apiClient.CallApi(a.basePath, path, "Put", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) //if err != nil { // log.Fatal(err) - //} */ + //} // - - return err + + // + //return err } /** * Add a new pet to the store @@ -74,8 +82,8 @@ func (a PetApi) updatePet (body Pet) (error) { * @param body Pet object that needs to be added to the store * @return void */ +//func (a PetApi) addPet (body Pet) (error) { func (a PetApi) addPet (body Pet) (error) { - _sling := a.sling.Post(a.basePath) @@ -99,16 +107,23 @@ func (a PetApi) addPet (body Pet) (error) { //bodyParams["body"] = string(b) - req, err := _sling.Request() + + resp, err := _sling.Request() + fmt.Println("addPet response: void, ", resp, err) + return err + - /*response, err := a.apiClient.CallApi(a.basePath, path, "Post", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) + + + //response, err := a.apiClient.CallApi(a.basePath, path, "Post", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) //if err != nil { // log.Fatal(err) - //} */ + //} // - - return err + + // + //return err } /** * Finds Pets by status @@ -116,8 +131,8 @@ func (a PetApi) addPet (body Pet) (error) { * @param status Status values that need to be considered for filter * @return []Pet */ +//func (a PetApi) findPetsByStatus (status []string) ([]Pet, error) { func (a PetApi) findPetsByStatus (status []string) ([]Pet, error) { - _sling := a.sling.Get(a.basePath) @@ -127,7 +142,6 @@ func (a PetApi) findPetsByStatus (status []string) ([]Pet, error) { _sling = _sling.Path(path) - type QueryParams struct { status []string `url:"status,omitempty"` @@ -144,16 +158,26 @@ func (a PetApi) findPetsByStatus (status []string) ([]Pet, error) { - req, err := _sling.Request() + + var response []Pet + resp, err := _sling.ReceiveSuccess(response) + fmt.Println("findPetsByStatus response: ", response, resp, err) + return response, err + - /*response, err := a.apiClient.CallApi(a.basePath, path, "Get", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) + + + //response, err := a.apiClient.CallApi(a.basePath, path, "Get", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) //if err != nil { // log.Fatal(err) - //} */ + //} //ApiClient.Deserialize(response, "array", "Pet") - return req, err - + + //var response []Pet + //err = json.Unmarshal([]byte(req), &response) + //return response, err + // } /** * Finds Pets by tags @@ -161,8 +185,8 @@ func (a PetApi) findPetsByStatus (status []string) ([]Pet, error) { * @param tags Tags to filter by * @return []Pet */ +//func (a PetApi) findPetsByTags (tags []string) ([]Pet, error) { func (a PetApi) findPetsByTags (tags []string) ([]Pet, error) { - _sling := a.sling.Get(a.basePath) @@ -172,7 +196,6 @@ func (a PetApi) findPetsByTags (tags []string) ([]Pet, error) { _sling = _sling.Path(path) - type QueryParams struct { tags []string `url:"tags,omitempty"` @@ -189,16 +212,26 @@ func (a PetApi) findPetsByTags (tags []string) ([]Pet, error) { - req, err := _sling.Request() + + var response []Pet + resp, err := _sling.ReceiveSuccess(response) + fmt.Println("findPetsByTags response: ", response, resp, err) + return response, err + - /*response, err := a.apiClient.CallApi(a.basePath, path, "Get", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) + + + //response, err := a.apiClient.CallApi(a.basePath, path, "Get", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) //if err != nil { // log.Fatal(err) - //} */ + //} //ApiClient.Deserialize(response, "array", "Pet") - return req, err - + + //var response []Pet + //err = json.Unmarshal([]byte(req), &response) + //return response, err + // } /** * Find pet by ID @@ -206,13 +239,8 @@ func (a PetApi) findPetsByTags (tags []string) ([]Pet, error) { * @param petId ID of pet that needs to be fetched * @return Pet */ +//func (a PetApi) getPetById (petId int64) (Pet, error) { func (a PetApi) getPetById (petId int64) (Pet, error) { - - // verify the required parameter 'petId' is set - //if petId == nil { - // return 0, fmt.Error("Missing the required parameter 'petId' when calling getPetById") - //} - _sling := a.sling.Get(a.basePath) @@ -235,16 +263,26 @@ func (a PetApi) getPetById (petId int64) (Pet, error) { - req, err := _sling.Request() + + var response Pet + resp, err := _sling.ReceiveSuccess(response) + fmt.Println("getPetById response: ", response, resp, err) + return response, err + - /*response, err := a.apiClient.CallApi(a.basePath, path, "Get", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) + + + //response, err := a.apiClient.CallApi(a.basePath, path, "Get", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) //if err != nil { // log.Fatal(err) - //} */ + //} //ApiClient.Deserialize(response, "", "Pet") - return req, err - + + //var response Pet + //err = json.Unmarshal([]byte(req), &response) + //return response, err + // } /** * Updates a pet in the store with form data @@ -254,13 +292,8 @@ func (a PetApi) getPetById (petId int64) (Pet, error) { * @param status Updated status of the pet * @return void */ +//func (a PetApi) updatePetWithForm (petId string, name string, status string) (error) { func (a PetApi) updatePetWithForm (petId string, name string, status string) (error) { - - // verify the required parameter 'petId' is set - //if petId == nil { - // return 0, fmt.Error("Missing the required parameter 'petId' when calling updatePetWithForm") - //} - _sling := a.sling.Post(a.basePath) @@ -279,7 +312,6 @@ func (a PetApi) updatePetWithForm (petId string, name string, status string) (er //contentTypes := []string { "application/x-www-form-urlencoded" } - type FormParams struct { name string `url:"name,omitempty"` status string `url:"status,omitempty"` @@ -290,16 +322,23 @@ func (a PetApi) updatePetWithForm (petId string, name string, status string) (er - req, err := _sling.Request() + + resp, err := _sling.Request() + fmt.Println("updatePetWithForm response: void, ", resp, err) + return err + - /*response, err := a.apiClient.CallApi(a.basePath, path, "Post", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) + + + //response, err := a.apiClient.CallApi(a.basePath, path, "Post", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) //if err != nil { // log.Fatal(err) - //} */ + //} // - - return err + + // + //return err } /** * Deletes a pet @@ -308,13 +347,8 @@ func (a PetApi) updatePetWithForm (petId string, name string, status string) (er * @param apiKey * @return void */ +//func (a PetApi) deletePet (petId int64, apiKey string) (error) { func (a PetApi) deletePet (petId int64, apiKey string) (error) { - - // verify the required parameter 'petId' is set - //if petId == nil { - // return 0, fmt.Error("Missing the required parameter 'petId' when calling deletePet") - //} - _sling := a.sling.Delete(a.basePath) @@ -339,16 +373,23 @@ func (a PetApi) deletePet (petId int64, apiKey string) (error) { - req, err := _sling.Request() + + resp, err := _sling.Request() + fmt.Println("deletePet response: void, ", resp, err) + return err + - /*response, err := a.apiClient.CallApi(a.basePath, path, "Delete", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) + + + //response, err := a.apiClient.CallApi(a.basePath, path, "Delete", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) //if err != nil { // log.Fatal(err) - //} */ + //} // - - return err + + // + //return err } /** * uploads an image @@ -358,13 +399,8 @@ func (a PetApi) deletePet (petId int64, apiKey string) (error) { * @param file file to upload * @return void */ +//func (a PetApi) uploadFile (petId int64, additionalMetadata string, file *os.File) (error) { func (a PetApi) uploadFile (petId int64, additionalMetadata string, file *os.File) (error) { - - // verify the required parameter 'petId' is set - //if petId == nil { - // return 0, fmt.Error("Missing the required parameter 'petId' when calling uploadFile") - //} - _sling := a.sling.Post(a.basePath) @@ -383,7 +419,6 @@ func (a PetApi) uploadFile (petId int64, additionalMetadata string, file *os.Fil //contentTypes := []string { "multipart/form-data" } - type FormParams struct { additionalMetadata string `url:"additionalMetadata,omitempty"` file *os.File `url:"file,omitempty"` @@ -394,14 +429,21 @@ func (a PetApi) uploadFile (petId int64, additionalMetadata string, file *os.Fil - req, err := _sling.Request() + + resp, err := _sling.Request() + fmt.Println("uploadFile response: void, ", resp, err) + return err + - /*response, err := a.apiClient.CallApi(a.basePath, path, "Post", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) + + + //response, err := a.apiClient.CallApi(a.basePath, path, "Post", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) //if err != nil { // log.Fatal(err) - //} */ + //} // - - return err + + // + //return err } diff --git a/samples/client/petstore/go/swagger/StoreApi.go b/samples/client/petstore/go/swagger/StoreApi.go index 987c39a72163..17adb00933b4 100644 --- a/samples/client/petstore/go/swagger/StoreApi.go +++ b/samples/client/petstore/go/swagger/StoreApi.go @@ -1,6 +1,7 @@ package swagger import ( +// "encoding/json" "strings" "fmt" // "log" @@ -30,8 +31,8 @@ func NewStoreApiWithBasePath(basePath string) *StoreApi{ * Returns a map of status codes to quantities * @return map[string]int32 */ +//func (a StoreApi) getInventory () (map[string]int32, error) { func (a StoreApi) getInventory () (map[string]int32, error) { - _sling := a.sling.Get(a.basePath) @@ -51,16 +52,26 @@ func (a StoreApi) getInventory () (map[string]int32, error) { - req, err := _sling.Request() + + var response map[string]int32 + resp, err := _sling.ReceiveSuccess(response) + fmt.Println("getInventory response: ", response, resp, err) + return response, err + - /*response, err := a.apiClient.CallApi(a.basePath, path, "Get", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) + + + //response, err := a.apiClient.CallApi(a.basePath, path, "Get", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) //if err != nil { // log.Fatal(err) - //} */ + //} //ApiClient.Deserialize(response, "map", "map") - return req, err - + + //var response map[string]int32 + //err = json.Unmarshal([]byte(req), &response) + //return response, err + // } /** * Place an order for a pet @@ -68,8 +79,8 @@ func (a StoreApi) getInventory () (map[string]int32, error) { * @param body order placed for purchasing the pet * @return Order */ +//func (a StoreApi) placeOrder (body Order) (Order, error) { func (a StoreApi) placeOrder (body Order) (Order, error) { - _sling := a.sling.Post(a.basePath) @@ -93,16 +104,26 @@ func (a StoreApi) placeOrder (body Order) (Order, error) { //bodyParams["body"] = string(b) - req, err := _sling.Request() + + var response Order + resp, err := _sling.ReceiveSuccess(response) + fmt.Println("placeOrder response: ", response, resp, err) + return response, err + - /*response, err := a.apiClient.CallApi(a.basePath, path, "Post", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) + + + //response, err := a.apiClient.CallApi(a.basePath, path, "Post", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) //if err != nil { // log.Fatal(err) - //} */ + //} //ApiClient.Deserialize(response, "", "Order") - return req, err - + + //var response Order + //err = json.Unmarshal([]byte(req), &response) + //return response, err + // } /** * Find purchase order by ID @@ -110,13 +131,8 @@ func (a StoreApi) placeOrder (body Order) (Order, error) { * @param orderId ID of pet that needs to be fetched * @return Order */ +//func (a StoreApi) getOrderById (orderId string) (Order, error) { func (a StoreApi) getOrderById (orderId string) (Order, error) { - - // verify the required parameter 'orderId' is set - //if orderId == nil { - // return 0, fmt.Error("Missing the required parameter 'orderId' when calling getOrderById") - //} - _sling := a.sling.Get(a.basePath) @@ -139,16 +155,26 @@ func (a StoreApi) getOrderById (orderId string) (Order, error) { - req, err := _sling.Request() + + var response Order + resp, err := _sling.ReceiveSuccess(response) + fmt.Println("getOrderById response: ", response, resp, err) + return response, err + - /*response, err := a.apiClient.CallApi(a.basePath, path, "Get", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) + + + //response, err := a.apiClient.CallApi(a.basePath, path, "Get", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) //if err != nil { // log.Fatal(err) - //} */ + //} //ApiClient.Deserialize(response, "", "Order") - return req, err - + + //var response Order + //err = json.Unmarshal([]byte(req), &response) + //return response, err + // } /** * Delete purchase order by ID @@ -156,13 +182,8 @@ func (a StoreApi) getOrderById (orderId string) (Order, error) { * @param orderId ID of the order that needs to be deleted * @return void */ +//func (a StoreApi) deleteOrder (orderId string) (error) { func (a StoreApi) deleteOrder (orderId string) (error) { - - // verify the required parameter 'orderId' is set - //if orderId == nil { - // return 0, fmt.Error("Missing the required parameter 'orderId' when calling deleteOrder") - //} - _sling := a.sling.Delete(a.basePath) @@ -185,14 +206,21 @@ func (a StoreApi) deleteOrder (orderId string) (error) { - req, err := _sling.Request() + + resp, err := _sling.Request() + fmt.Println("deleteOrder response: void, ", resp, err) + return err + - /*response, err := a.apiClient.CallApi(a.basePath, path, "Delete", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) + + + //response, err := a.apiClient.CallApi(a.basePath, path, "Delete", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) //if err != nil { // log.Fatal(err) - //} */ + //} // - - return err + + // + //return err } diff --git a/samples/client/petstore/go/swagger/UserApi.go b/samples/client/petstore/go/swagger/UserApi.go index 4c2c73cb9dc6..0a1abeb7827b 100644 --- a/samples/client/petstore/go/swagger/UserApi.go +++ b/samples/client/petstore/go/swagger/UserApi.go @@ -1,6 +1,7 @@ package swagger import ( +// "encoding/json" "strings" "fmt" // "log" @@ -31,8 +32,8 @@ func NewUserApiWithBasePath(basePath string) *UserApi{ * @param body Created user object * @return void */ +//func (a UserApi) createUser (body User) (error) { func (a UserApi) createUser (body User) (error) { - _sling := a.sling.Post(a.basePath) @@ -56,16 +57,23 @@ func (a UserApi) createUser (body User) (error) { //bodyParams["body"] = string(b) - req, err := _sling.Request() + + resp, err := _sling.Request() + fmt.Println("createUser response: void, ", resp, err) + return err + - /*response, err := a.apiClient.CallApi(a.basePath, path, "Post", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) + + + //response, err := a.apiClient.CallApi(a.basePath, path, "Post", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) //if err != nil { // log.Fatal(err) - //} */ + //} // - - return err + + // + //return err } /** * Creates list of users with given input array @@ -73,8 +81,8 @@ func (a UserApi) createUser (body User) (error) { * @param body List of user object * @return void */ +//func (a UserApi) createUsersWithArrayInput (body []User) (error) { func (a UserApi) createUsersWithArrayInput (body []User) (error) { - _sling := a.sling.Post(a.basePath) @@ -98,16 +106,23 @@ func (a UserApi) createUsersWithArrayInput (body []User) (error) { //bodyParams["body"] = string(b) - req, err := _sling.Request() + + resp, err := _sling.Request() + fmt.Println("createUsersWithArrayInput response: void, ", resp, err) + return err + - /*response, err := a.apiClient.CallApi(a.basePath, path, "Post", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) + + + //response, err := a.apiClient.CallApi(a.basePath, path, "Post", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) //if err != nil { // log.Fatal(err) - //} */ + //} // - - return err + + // + //return err } /** * Creates list of users with given input array @@ -115,8 +130,8 @@ func (a UserApi) createUsersWithArrayInput (body []User) (error) { * @param body List of user object * @return void */ +//func (a UserApi) createUsersWithListInput (body []User) (error) { func (a UserApi) createUsersWithListInput (body []User) (error) { - _sling := a.sling.Post(a.basePath) @@ -140,16 +155,23 @@ func (a UserApi) createUsersWithListInput (body []User) (error) { //bodyParams["body"] = string(b) - req, err := _sling.Request() + + resp, err := _sling.Request() + fmt.Println("createUsersWithListInput response: void, ", resp, err) + return err + - /*response, err := a.apiClient.CallApi(a.basePath, path, "Post", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) + + + //response, err := a.apiClient.CallApi(a.basePath, path, "Post", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) //if err != nil { // log.Fatal(err) - //} */ + //} // - - return err + + // + //return err } /** * Logs user into the system @@ -158,8 +180,8 @@ func (a UserApi) createUsersWithListInput (body []User) (error) { * @param password The password for login in clear text * @return string */ +//func (a UserApi) loginUser (username string, password string) (string, error) { func (a UserApi) loginUser (username string, password string) (string, error) { - _sling := a.sling.Get(a.basePath) @@ -169,7 +191,6 @@ func (a UserApi) loginUser (username string, password string) (string, error) { _sling = _sling.Path(path) - type QueryParams struct { username string `url:"username,omitempty"` password string `url:"password,omitempty"` @@ -187,24 +208,34 @@ func (a UserApi) loginUser (username string, password string) (string, error) { - req, err := _sling.Request() + + var response string + resp, err := _sling.ReceiveSuccess(response) + fmt.Println("loginUser response: ", response, resp, err) + return response, err + - /*response, err := a.apiClient.CallApi(a.basePath, path, "Get", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) + + + //response, err := a.apiClient.CallApi(a.basePath, path, "Get", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) //if err != nil { // log.Fatal(err) - //} */ + //} //ApiClient.Deserialize(response, "", "string") - return req, err - + + //var response string + //err = json.Unmarshal([]byte(req), &response) + //return response, err + // } /** * Logs out current logged in user session * * @return void */ +//func (a UserApi) logoutUser () (error) { func (a UserApi) logoutUser () (error) { - _sling := a.sling.Get(a.basePath) @@ -224,16 +255,23 @@ func (a UserApi) logoutUser () (error) { - req, err := _sling.Request() + + resp, err := _sling.Request() + fmt.Println("logoutUser response: void, ", resp, err) + return err + - /*response, err := a.apiClient.CallApi(a.basePath, path, "Get", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) + + + //response, err := a.apiClient.CallApi(a.basePath, path, "Get", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) //if err != nil { // log.Fatal(err) - //} */ + //} // - - return err + + // + //return err } /** * Get user by user name @@ -241,13 +279,8 @@ func (a UserApi) logoutUser () (error) { * @param username The name that needs to be fetched. Use user1 for testing. * @return User */ +//func (a UserApi) getUserByName (username string) (User, error) { func (a UserApi) getUserByName (username string) (User, error) { - - // verify the required parameter 'username' is set - //if username == nil { - // return 0, fmt.Error("Missing the required parameter 'username' when calling getUserByName") - //} - _sling := a.sling.Get(a.basePath) @@ -270,16 +303,26 @@ func (a UserApi) getUserByName (username string) (User, error) { - req, err := _sling.Request() + + var response User + resp, err := _sling.ReceiveSuccess(response) + fmt.Println("getUserByName response: ", response, resp, err) + return response, err + - /*response, err := a.apiClient.CallApi(a.basePath, path, "Get", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) + + + //response, err := a.apiClient.CallApi(a.basePath, path, "Get", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) //if err != nil { // log.Fatal(err) - //} */ + //} //ApiClient.Deserialize(response, "", "User") - return req, err - + + //var response User + //err = json.Unmarshal([]byte(req), &response) + //return response, err + // } /** * Updated user @@ -288,13 +331,8 @@ func (a UserApi) getUserByName (username string) (User, error) { * @param body Updated user object * @return void */ +//func (a UserApi) updateUser (username string, body User) (error) { func (a UserApi) updateUser (username string, body User) (error) { - - // verify the required parameter 'username' is set - //if username == nil { - // return 0, fmt.Error("Missing the required parameter 'username' when calling updateUser") - //} - _sling := a.sling.Put(a.basePath) @@ -321,16 +359,23 @@ func (a UserApi) updateUser (username string, body User) (error) { //bodyParams["body"] = string(b) - req, err := _sling.Request() + + resp, err := _sling.Request() + fmt.Println("updateUser response: void, ", resp, err) + return err + - /*response, err := a.apiClient.CallApi(a.basePath, path, "Put", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) + + + //response, err := a.apiClient.CallApi(a.basePath, path, "Put", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) //if err != nil { // log.Fatal(err) - //} */ + //} // - - return err + + // + //return err } /** * Delete user @@ -338,13 +383,8 @@ func (a UserApi) updateUser (username string, body User) (error) { * @param username The name that needs to be deleted * @return void */ +//func (a UserApi) deleteUser (username string) (error) { func (a UserApi) deleteUser (username string) (error) { - - // verify the required parameter 'username' is set - //if username == nil { - // return 0, fmt.Error("Missing the required parameter 'username' when calling deleteUser") - //} - _sling := a.sling.Delete(a.basePath) @@ -367,14 +407,21 @@ func (a UserApi) deleteUser (username string) (error) { - req, err := _sling.Request() + + resp, err := _sling.Request() + fmt.Println("deleteUser response: void, ", resp, err) + return err + - /*response, err := a.apiClient.CallApi(a.basePath, path, "Delete", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) + + + //response, err := a.apiClient.CallApi(a.basePath, path, "Delete", queryParams, headerParams, formParams, fileParams, bodyParams, contentTypes) //if err != nil { // log.Fatal(err) - //} */ + //} // - - return err + + // + //return err } diff --git a/samples/client/petstore/go/test.go b/samples/client/petstore/go/test.go index b20f0347354b..d1dbf4272a26 100644 --- a/samples/client/petstore/go/test.go +++ b/samples/client/petstore/go/test.go @@ -1,14 +1,15 @@ package main - import ( - "fmt" - "log" - "./swagger" + "fmt" + // "log" + swagger "./swagger" ) func main() { + fmt.Println("hello world") + s := swagger.NewPetApi() + &s.updatePetWithForm("2", "golang", "available") - fmt.Println("hello world") }