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

[Go][Server] Use the correct parameter name (#8144)

Browse Source 
* Use the correct parameter name

* Minor changes

Co-authored-by: Bernardo Pastorelli <13519917-randomswdev@users.noreply.github.com>
This commit is contained in:
randomswdev
2020-12-20 08:32:57 +01:00
committed by GitHub
parent bde631c07f
commit d1dcdad3d5
4 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
modules/openapi-generator/src/main/resources/go-server/controller-api.mustache vendored
View File

@@ -35,60 +35,60 @@ func (c *{{classname}}Controller) Routes() Routes {
func (c *{{classname}}Controller) {{nickname}}(w http.ResponseWriter, r *http.Request) { {{#hasFormParams}}
err := r.ParseForm()
if err != nil {
w.WriteHeader(500)
w.WriteHeader(http.StatusBadRequest)
return
}
{{/hasFormParams}}{{#hasPathParams}}
params := mux.Vars(r){{/hasPathParams}}{{#hasQueryParams}}
query := r.URL.Query(){{/hasQueryParams}}{{#allParams}}{{#isPathParam}}{{#isLong}}
{{paramName}}, err := parseInt64Parameter(params["{{paramName}}"])
{{paramName}}, err := parseInt64Parameter(params["{{baseName}}"])
if err != nil {
w.WriteHeader(500)
w.WriteHeader(http.StatusBadRequest)
return
}{{/isLong}}{{#isInteger}}
{{paramName}}, err := parseInt32Parameter(params["{{paramName}}"])
{{paramName}}, err := parseInt32Parameter(params["{{baseName}}"])
if err != nil {
w.WriteHeader(500)
w.WriteHeader(http.StatusBadRequest)
return
}
{{/isInteger}}{{^isLong}}{{^isInteger}}
{{paramName}} := params["{{paramName}}"]{{/isInteger}}{{/isLong}}{{/isPathParam}}{{#isQueryParam}}{{#isLong}}
{{paramName}}, err := parseInt64Parameter(query.Get("{{paramName}}"))
{{paramName}} := params["{{baseName}}"]{{/isInteger}}{{/isLong}}{{/isPathParam}}{{#isQueryParam}}{{#isLong}}
{{paramName}}, err := parseInt64Parameter(query.Get("{{baseName}}"))
if err != nil {
w.WriteHeader(500)
w.WriteHeader(http.StatusBadRequest)
return
}
{{/isLong}}{{#isInteger}}
{{paramName}}, err := parseInt32Parameter(query.Get("{{paramName}}"))
{{paramName}}, err := parseInt32Parameter(query.Get("{{baseName}}"))
if err != nil {
w.WriteHeader(500)
w.WriteHeader(http.StatusBadRequest)
return
}
{{/isInteger}}{{^isLong}}{{^isInteger}}
{{paramName}} := {{#isArray}}strings.Split({{/isArray}}query.Get("{{paramName}}"){{#isArray}}, ","){{/isArray}}{{/isInteger}}{{/isLong}}{{/isQueryParam}}{{#isFormParam}}{{#isFile}}
{{#isArray}}{{paramName}}, err := ReadFormFilesToTempFiles(r, "{{paramName}}"){{/isArray}}{{^isArray}}{{paramName}}, err := ReadFormFileToTempFile(r, "{{paramName}}"){{/isArray}}
{{paramName}} := {{#isArray}}strings.Split({{/isArray}}query.Get("{{baseName}}"){{#isArray}}, ","){{/isArray}}{{/isInteger}}{{/isLong}}{{/isQueryParam}}{{#isFormParam}}{{#isFile}}
{{#isArray}}{{paramName}}, err := ReadFormFilesToTempFiles(r, "{{baseName}}"){{/isArray}}{{^isArray}}{{paramName}}, err := ReadFormFileToTempFile(r, "{{baseName}}"){{/isArray}}
if err != nil {
w.WriteHeader(500)
w.WriteHeader(http.StatusBadRequest)
return
}
{{/isFile}}{{#isLong}}
{{paramName}}, err := parseInt64Parameter( r.FormValue("{{paramName}}"))
{{paramName}}, err := parseInt64Parameter( r.FormValue("{{baseName}}"))
if err != nil {
w.WriteHeader(500)
w.WriteHeader(http.StatusBadRequest)
return
}
{{/isLong}}{{#isInteger}}
{{paramName}}, err := parseInt32Parameter( r.FormValue("{{paramName}}"))
{{paramName}}, err := parseInt32Parameter( r.FormValue("{{baseName}}"))
if err != nil {
w.WriteHeader(500)
w.WriteHeader(http.StatusBadRequest)
return
}
{{/isInteger}}{{^isFile}}{{^isLong}}
{{paramName}} := r.FormValue("{{paramName}}"){{/isLong}}{{/isFile}}{{/isFormParam}}{{#isHeaderParam}}
{{paramName}} := r.Header.Get("{{paramName}}"){{/isHeaderParam}}{{#isBodyParam}}
{{paramName}} := r.FormValue("{{baseName}}"){{/isLong}}{{/isFile}}{{/isFormParam}}{{#isHeaderParam}}
{{paramName}} := r.Header.Get("{{baseName}}"){{/isHeaderParam}}{{#isBodyParam}}
{{paramName}} := &{{dataType}}{}
if err := json.NewDecoder(r.Body).Decode(&{{paramName}}); err != nil {
w.WriteHeader(500)
w.WriteHeader(http.StatusBadRequest)
return
}
{{/isBodyParam}}{{/allParams}}

20
samples/server/petstore/go-api-server/go/api_pet.go
View File

@@ -85,7 +85,7 @@ func (c *PetApiController) Routes() Routes {
func (c *PetApiController) AddPet(w http.ResponseWriter, r *http.Request) {
pet := &Pet{}
if err := json.NewDecoder(r.Body).Decode(&pet); err != nil {
w.WriteHeader(500)
w.WriteHeader(http.StatusBadRequest)
return
}
@@ -105,10 +105,10 @@ func (c *PetApiController) DeletePet(w http.ResponseWriter, r *http.Request) {
params := mux.Vars(r)
petId, err := parseInt64Parameter(params["petId"])
if err != nil {
w.WriteHeader(500)
w.WriteHeader(http.StatusBadRequest)
return
}
apiKey := r.Header.Get("apiKey")
apiKey := r.Header.Get("api_key")
result, err := c.service.DeletePet(r.Context(), petId, apiKey)
//If an error occured, encode the error with the status code
if err != nil {
@@ -155,7 +155,7 @@ func (c *PetApiController) GetPetById(w http.ResponseWriter, r *http.Request) {
params := mux.Vars(r)
petId, err := parseInt64Parameter(params["petId"])
if err != nil {
w.WriteHeader(500)
w.WriteHeader(http.StatusBadRequest)
return
}
result, err := c.service.GetPetById(r.Context(), petId)
@@ -173,7 +173,7 @@ func (c *PetApiController) GetPetById(w http.ResponseWriter, r *http.Request) {
func (c *PetApiController) UpdatePet(w http.ResponseWriter, r *http.Request) {
pet := &Pet{}
if err := json.NewDecoder(r.Body).Decode(&pet); err != nil {
w.WriteHeader(500)
w.WriteHeader(http.StatusBadRequest)
return
}
@@ -192,14 +192,14 @@ func (c *PetApiController) UpdatePet(w http.ResponseWriter, r *http.Request) {
func (c *PetApiController) UpdatePetWithForm(w http.ResponseWriter, r *http.Request) {
err := r.ParseForm()
if err != nil {
w.WriteHeader(500)
w.WriteHeader(http.StatusBadRequest)
return
}
params := mux.Vars(r)
petId, err := parseInt64Parameter(params["petId"])
if err != nil {
w.WriteHeader(500)
w.WriteHeader(http.StatusBadRequest)
return
}
name := r.FormValue("name")
@@ -219,20 +219,20 @@ func (c *PetApiController) UpdatePetWithForm(w http.ResponseWriter, r *http.Requ
func (c *PetApiController) UploadFile(w http.ResponseWriter, r *http.Request) {
err := r.ParseForm()
if err != nil {
w.WriteHeader(500)
w.WriteHeader(http.StatusBadRequest)
return
}
params := mux.Vars(r)
petId, err := parseInt64Parameter(params["petId"])
if err != nil {
w.WriteHeader(500)
w.WriteHeader(http.StatusBadRequest)
return
}
additionalMetadata := r.FormValue("additionalMetadata")
file, err := ReadFormFileToTempFile(r, "file")
if err != nil {
w.WriteHeader(500)
w.WriteHeader(http.StatusBadRequest)
return
}

4
samples/server/petstore/go-api-server/go/api_store.go
View File

@@ -90,7 +90,7 @@ func (c *StoreApiController) GetOrderById(w http.ResponseWriter, r *http.Request
params := mux.Vars(r)
orderId, err := parseInt64Parameter(params["orderId"])
if err != nil {
w.WriteHeader(500)
w.WriteHeader(http.StatusBadRequest)
return
}
result, err := c.service.GetOrderById(r.Context(), orderId)
@@ -108,7 +108,7 @@ func (c *StoreApiController) GetOrderById(w http.ResponseWriter, r *http.Request
func (c *StoreApiController) PlaceOrder(w http.ResponseWriter, r *http.Request) {
order := &Order{}
if err := json.NewDecoder(r.Body).Decode(&order); err != nil {
w.WriteHeader(500)
w.WriteHeader(http.StatusBadRequest)
return
}

8
samples/server/petstore/go-api-server/go/api_user.go
View File

@@ -85,7 +85,7 @@ func (c *UserApiController) Routes() Routes {
func (c *UserApiController) CreateUser(w http.ResponseWriter, r *http.Request) {
user := &User{}
if err := json.NewDecoder(r.Body).Decode(&user); err != nil {
w.WriteHeader(500)
w.WriteHeader(http.StatusBadRequest)
return
}
@@ -104,7 +104,7 @@ func (c *UserApiController) CreateUser(w http.ResponseWriter, r *http.Request) {
func (c *UserApiController) CreateUsersWithArrayInput(w http.ResponseWriter, r *http.Request) {
user := &[]User{}
if err := json.NewDecoder(r.Body).Decode(&user); err != nil {
w.WriteHeader(500)
w.WriteHeader(http.StatusBadRequest)
return
}
@@ -123,7 +123,7 @@ func (c *UserApiController) CreateUsersWithArrayInput(w http.ResponseWriter, r *
func (c *UserApiController) CreateUsersWithListInput(w http.ResponseWriter, r *http.Request) {
user := &[]User{}
if err := json.NewDecoder(r.Body).Decode(&user); err != nil {
w.WriteHeader(500)
w.WriteHeader(http.StatusBadRequest)
return
}
@@ -203,7 +203,7 @@ func (c *UserApiController) UpdateUser(w http.ResponseWriter, r *http.Request) {
username := params["username"]
user := &User{}
if err := json.NewDecoder(r.Body).Decode(&user); err != nil {
w.WriteHeader(500)
w.WriteHeader(http.StatusBadRequest)
return
}