Merge pull request #2542 from wing328/restore_petstore_yaml

[Petstore] restore petstore.yaml from http://petstore.swagger.io/v2/swagger.json

Author: wing328

modules/swagger-codegen/src/test/resources/2_0/petstore.yaml

@@ -5,6 +5,5 @@ import (
 
 type Category struct {
     Id  int64  `json:"id,omitempty"`
-    Name  string  `json:"name,omitempty"`
-    
+Name  string  `json:"name,omitempty"`
 }

samples/client/petstore/go/swagger/Category.go

@@ -6,10 +6,9 @@ import (
 
 type Order struct {
     Id  int64  `json:"id,omitempty"`
-    PetId  int64  `json:"petId,omitempty"`
-    Quantity  int32  `json:"quantity,omitempty"`
-    ShipDate  time.Time  `json:"shipDate,omitempty"`
-    Status  string  `json:"status,omitempty"`
-    Complete  bool  `json:"complete,omitempty"`
-    
+PetId  int64  `json:"petId,omitempty"`
+Quantity  int32  `json:"quantity,omitempty"`
+ShipDate  time.Time  `json:"shipDate,omitempty"`
+Status  string  `json:"status,omitempty"`
+Complete  bool  `json:"complete,omitempty"`
 }

samples/client/petstore/go/swagger/Order.go

@@ -5,10 +5,9 @@ import (
 
 type Pet struct {
     Id  int64  `json:"id,omitempty"`
-    Category  Category  `json:"category,omitempty"`
-    Name  string  `json:"name,omitempty"`
-    PhotoUrls  []string  `json:"photoUrls,omitempty"`
-    Tags  []Tag  `json:"tags,omitempty"`
-    Status  string  `json:"status,omitempty"`
-    
+Category  Category  `json:"category,omitempty"`
+Name  string  `json:"name,omitempty"`
+PhotoUrls  []string  `json:"photoUrls,omitempty"`
+Tags  []Tag  `json:"tags,omitempty"`
+Status  string  `json:"status,omitempty"`
 }

samples/client/petstore/go/swagger/Pet.go

@@ -1,13 +1,12 @@
 package swagger
 
-
 import (
     "strings"
     "fmt"
     "encoding/json"
     "errors"
     "github.com/dghubble/sling"
-
+    "os"
 )
 
 type PetApi struct {
@@ -30,7 +29,6 @@ func NewPetApiWithBasePath(basePath string) *PetApi{
     }
 }
 
-
 /**
  * Add a new pet to the store
  * 
@@ -43,20 +41,17 @@ func (a PetApi) AddPet (body Pet) (error) {
     _sling := sling.New().Post(a.Configuration.BasePath)
 
     // create path and map variables
-    path := "/v2/pets"
-
+    path := "/v2/pet"
 
     _sling = _sling.Path(path)
 
-
     // accept header
-    accepts := []string { "application/json", "application/xml" }
+    accepts := []string { "application/xml", "application/json" }
     for key := range accepts {
         _sling = _sling.Set("Accept", accepts[key])
         break // only use the first Accept
     }
 
-
 // body params
     _sling = _sling.BodyJSON(body)
 
@@ -94,29 +89,26 @@ func (a PetApi) AddPet (body Pet) (error) {
 
   return err
 }
-
 /**
  * Deletes a pet
  * 
- * @param apiKey 
  * @param petId Pet id to delete
+ * @param apiKey 
  * @return void
  */
-//func (a PetApi) DeletePet (apiKey string, petId int64) (error) {
-func (a PetApi) DeletePet (apiKey string, petId int64) (error) {
+//func (a PetApi) DeletePet (petId int64, apiKey string) (error) {
+func (a PetApi) DeletePet (petId int64, apiKey string) (error) {
 
     _sling := sling.New().Delete(a.Configuration.BasePath)
 
     // create path and map variables
-    path := "/v2/pets/{petId}"
+    path := "/v2/pet/{petId}"
     path = strings.Replace(path, "{" + "petId" + "}", fmt.Sprintf("%v", petId), -1)
 
-
     _sling = _sling.Path(path)
 
-
     // accept header
-    accepts := []string { "application/json", "application/xml" }
+    accepts := []string { "application/xml", "application/json" }
     for key := range accepts {
         _sling = _sling.Set("Accept", accepts[key])
         break // only use the first Accept
@@ -127,7 +119,6 @@ func (a PetApi) DeletePet (apiKey string, petId int64) (error) {
 
 
 
-
   // We use this map (below) so that any arbitrary error JSON can be handled.
   // FIXME: This is in the absence of this Go generator honoring the non-2xx
   // response (error) models, which needs to be implemented at some point.
@@ -160,10 +151,9 @@ func (a PetApi) DeletePet (apiKey string, petId int64) (error) {
 
   return err
 }
-
 /**
  * Finds Pets by status
- * Multiple status values can be provided with comma seperated strings
+ * Multiple status values can be provided with comma separated strings
  * @param status Status values that need to be considered for filter
  * @return []Pet
  */
@@ -173,26 +163,22 @@ func (a PetApi) FindPetsByStatus (status []string) ([]Pet, error) {
     _sling := sling.New().Get(a.Configuration.BasePath)
 
     // create path and map variables
-    path := "/v2/pets/findByStatus"
-
+    path := "/v2/pet/findByStatus"
 
     _sling = _sling.Path(path)
 
     type QueryParams struct {
         status    []string `url:"status,omitempty"`
-        
 }
     _sling = _sling.QueryStruct(&QueryParams{ status: status })
-
     // accept header
-    accepts := []string { "application/json", "application/xml" }
+    accepts := []string { "application/xml", "application/json" }
     for key := range accepts {
         _sling = _sling.Set("Accept", accepts[key])
         break // only use the first Accept
     }
 
 
-
   var successPayload = new([]Pet)
 
   // We use this map (below) so that any arbitrary error JSON can be handled.
@@ -227,10 +213,9 @@ func (a PetApi) FindPetsByStatus (status []string) ([]Pet, error) {
 
   return *successPayload, err
 }
-
 /**
  * Finds Pets by tags
- * Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.
+ * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
  * @param tags Tags to filter by
  * @return []Pet
  */
@@ -240,26 +225,22 @@ func (a PetApi) FindPetsByTags (tags []string) ([]Pet, error) {
     _sling := sling.New().Get(a.Configuration.BasePath)
 
     // create path and map variables
-    path := "/v2/pets/findByTags"
-
+    path := "/v2/pet/findByTags"
 
     _sling = _sling.Path(path)
 
     type QueryParams struct {
         tags    []string `url:"tags,omitempty"`
-        
 }
     _sling = _sling.QueryStruct(&QueryParams{ tags: tags })
-
     // accept header
-    accepts := []string { "application/json", "application/xml" }
+    accepts := []string { "application/xml", "application/json" }
     for key := range accepts {
         _sling = _sling.Set("Accept", accepts[key])
         break // only use the first Accept
     }
 
 
-
   var successPayload = new([]Pet)
 
   // We use this map (below) so that any arbitrary error JSON can be handled.
@@ -294,11 +275,10 @@ func (a PetApi) FindPetsByTags (tags []string) ([]Pet, error) {
 
   return *successPayload, err
 }
-
 /**
  * Find pet by ID
- * Returns a pet when ID < 10.  ID > 10 or nonintegers will simulate API error conditions
- * @param petId ID of pet that needs to be fetched
+ * Returns a single pet
+ * @param petId ID of pet to return
  * @return Pet
  */
 //func (a PetApi) GetPetById (petId int64) (Pet, error) {
@@ -307,22 +287,19 @@ func (a PetApi) GetPetById (petId int64) (Pet, error) {
     _sling := sling.New().Get(a.Configuration.BasePath)
 
     // create path and map variables
-    path := "/v2/pets/{petId}"
+    path := "/v2/pet/{petId}"
     path = strings.Replace(path, "{" + "petId" + "}", fmt.Sprintf("%v", petId), -1)
 
-
     _sling = _sling.Path(path)
 
-
     // accept header
-    accepts := []string { "application/json", "application/xml" }
+    accepts := []string { "application/xml", "application/json" }
     for key := range accepts {
         _sling = _sling.Set("Accept", accepts[key])
         break // only use the first Accept
     }
 
 
-
   var successPayload = new(Pet)
 
   // We use this map (below) so that any arbitrary error JSON can be handled.
@@ -357,7 +334,6 @@ func (a PetApi) GetPetById (petId int64) (Pet, error) {
 
   return *successPayload, err
 }
-
 /**
  * Update an existing pet
  * 
@@ -370,20 +346,17 @@ func (a PetApi) UpdatePet (body Pet) (error) {
     _sling := sling.New().Put(a.Configuration.BasePath)
 
     // create path and map variables
-    path := "/v2/pets"
-
+    path := "/v2/pet"
 
     _sling = _sling.Path(path)
 
-
     // accept header
-    accepts := []string { "application/json", "application/xml" }
+    accepts := []string { "application/xml", "application/json" }
     for key := range accepts {
         _sling = _sling.Set("Accept", accepts[key])
         break // only use the first Accept
     }
 
-
 // body params
     _sling = _sling.BodyJSON(body)
 
@@ -421,7 +394,6 @@ func (a PetApi) UpdatePet (body Pet) (error) {
 
   return err
 }
-
 /**
  * Updates a pet in the store with form data
  * 
@@ -430,21 +402,19 @@ func (a PetApi) UpdatePet (body 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) {
+//func (a PetApi) UpdatePetWithForm (petId int64, name string, status string) (error) {
+func (a PetApi) UpdatePetWithForm (petId int64, name string, status string) (error) {
 
     _sling := sling.New().Post(a.Configuration.BasePath)
 
     // create path and map variables
-    path := "/v2/pets/{petId}"
+    path := "/v2/pet/{petId}"
     path = strings.Replace(path, "{" + "petId" + "}", fmt.Sprintf("%v", petId), -1)
 
-
     _sling = _sling.Path(path)
 
-
     // accept header
-    accepts := []string { "application/json", "application/xml" }
+    accepts := []string { "application/xml", "application/json" }
     for key := range accepts {
         _sling = _sling.Set("Accept", accepts[key])
         break // only use the first Accept
@@ -453,13 +423,11 @@ func (a PetApi) UpdatePetWithForm (petId string, name string, status string) (er
     type FormParams struct {
         name    string `url:"name,omitempty"`
         status    string `url:"status,omitempty"`
-
     }
     _sling = _sling.BodyForm(&FormParams{ name: name,status: status })
 
 
 
-
   // We use this map (below) so that any arbitrary error JSON can be handled.
   // FIXME: This is in the absence of this Go generator honoring the non-2xx
   // response (error) models, which needs to be implemented at some point.
@@ -492,5 +460,69 @@ func (a PetApi) UpdatePetWithForm (petId string, name string, status string) (er
 
   return err
 }
+/**
+ * uploads an image
+ * 
+ * @param petId ID of pet to update
+ * @param additionalMetadata Additional data to pass to server
+ * @param file file to upload
+ * @return ApiResponse
+ */
+//func (a PetApi) UploadFile (petId int64, additionalMetadata string, file *os.File) (ApiResponse, error) {
+func (a PetApi) UploadFile (petId int64, additionalMetadata string, file *os.File) (ApiResponse, error) {
+
+    _sling := sling.New().Post(a.Configuration.BasePath)
+
+    // create path and map variables
+    path := "/v2/pet/{petId}/uploadImage"
+    path = strings.Replace(path, "{" + "petId" + "}", fmt.Sprintf("%v", petId), -1)
+
+    _sling = _sling.Path(path)
+
+    // accept header
+    accepts := []string { "application/json" }
+    for key := range accepts {
+        _sling = _sling.Set("Accept", accepts[key])
+        break // only use the first Accept
+    }
+
+    type FormParams struct {
+        additionalMetadata    string `url:"additionalMetadata,omitempty"`
+        file    *os.File `url:"file,omitempty"`
+    }
+    _sling = _sling.BodyForm(&FormParams{ additionalMetadata: additionalMetadata,file: file })
+
+  var successPayload = new(ApiResponse)
 
+  // We use this map (below) so that any arbitrary error JSON can be handled.
+  // FIXME: This is in the absence of this Go generator honoring the non-2xx
+  // response (error) models, which needs to be implemented at some point.
+  var failurePayload map[string]interface{}
+
+  httpResponse, err := _sling.Receive(successPayload, &failurePayload)
+
+  if err == nil {
+    // err == nil only means that there wasn't a sub-application-layer error (e.g. no network error)
+    if failurePayload != nil {
+      // If the failurePayload is present, there likely was some kind of non-2xx status
+      // returned (and a JSON payload error present)
+      var str []byte
+      str, err = json.Marshal(failurePayload)
+      if err == nil { // For safety, check for an error marshalling... probably superfluous
+        // This will return the JSON error body as a string
+        err = errors.New(string(str))
+      }
+  } else {
+    // So, there was no network-type error, and nothing in the failure payload,
+    // but we should still check the status code
+    if httpResponse == nil {
+      // This should never happen...
+      err = errors.New("No HTTP Response received.")
+    } else if code := httpResponse.StatusCode; 200 > code || code > 299 {
+        err = errors.New("HTTP Error: " + string(httpResponse.StatusCode))
+      }
+    }
+  }
 
+  return *successPayload, err
+}