Skip to content

Commit

Permalink
[go-server] Fix: param names clash with variables, added suffix (#10243)
Browse files Browse the repository at this point in the history 
* Postfix "Param" to param names in controller

* Regen samples
  • Loading branch information
@lwj5
lwj5 committed Aug 27, 2021
1 parent 3446bc6 commit 3b8f66c
Show file tree
Hide file tree
Showing 10 changed files with 191 additions and 191 deletions.
40 changes: 20 additions & 20 deletions modules/openapi-generator/src/main/resources/go-server/controller-api.mustache
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,41 +90,41 @@ func (c *{{classname}}Controller) {{nickname}}(w http.ResponseWriter, r *http.Re
{{#allParams}}
{{#isPathParam}}
{{#isLong}}
{{paramName}}, err := parseInt64Parameter({{#routers}}{{#mux}}params["{{baseName}}"]{{/mux}}{{#chi}}chi.URLParam(r, "{{baseName}}"){{/chi}}{{/routers}}, {{required}})
{{paramName}}Param, err := parseInt64Parameter({{#routers}}{{#mux}}params["{{baseName}}"]{{/mux}}{{#chi}}chi.URLParam(r, "{{baseName}}"){{/chi}}{{/routers}}, {{required}})
if err != nil {
c.errorHandler(w, r, &ParsingError{Err: err}, nil)
return
}
{{/isLong}}
{{#isInteger}}
{{paramName}}, err := parseInt32Parameter({{#routers}}{{#mux}}params["{{baseName}}"]{{/mux}}{{#chi}}chi.URLParam(r, "{{baseName}}"){{/chi}}{{/routers}}, {{required}})
{{paramName}}Param, err := parseInt32Parameter({{#routers}}{{#mux}}params["{{baseName}}"]{{/mux}}{{#chi}}chi.URLParam(r, "{{baseName}}"){{/chi}}{{/routers}}, {{required}})
if err != nil {
c.errorHandler(w, r, &ParsingError{Err: err}, nil)
return
}
{{/isInteger}}
{{^isLong}}
{{^isInteger}}
{{paramName}} := {{#routers}}{{#mux}}params["{{baseName}}"]{{/mux}}{{#chi}}chi.URLParam(r, "{{baseName}}"){{/chi}}{{/routers}}
{{paramName}}Param := {{#routers}}{{#mux}}params["{{baseName}}"]{{/mux}}{{#chi}}chi.URLParam(r, "{{baseName}}"){{/chi}}{{/routers}}
{{/isInteger}}{{/isLong}}
{{/isPathParam}}
{{#isQueryParam}}
{{#isLong}}
{{paramName}}, err := parseInt64Parameter(query.Get("{{baseName}}"), {{required}})
{{paramName}}Param, err := parseInt64Parameter(query.Get("{{baseName}}"), {{required}})
if err != nil {
c.errorHandler(w, r, &ParsingError{Err: err}, nil)
return
}
{{/isLong}}
{{#isInteger}}
{{paramName}}, err := parseInt32Parameter(query.Get("{{baseName}}"), {{required}})
{{paramName}}Param, err := parseInt32Parameter(query.Get("{{baseName}}"), {{required}})
if err != nil {
c.errorHandler(w, r, &ParsingError{Err: err}, nil)
return
}
{{/isInteger}}
{{#isBoolean}}
{{paramName}}, err := parseBoolParameter(query.Get("{{baseName}}"))
{{paramName}}Param, err := parseBoolParameter(query.Get("{{baseName}}"))
if err != nil {
w.WriteHeader(500)
return
Expand All @@ -133,59 +133,59 @@ func (c *{{classname}}Controller) {{nickname}}(w http.ResponseWriter, r *http.Re
{{^isLong}}
{{^isInteger}}
{{^isBoolean}}
{{paramName}} := {{#isArray}}strings.Split({{/isArray}}query.Get("{{baseName}}"){{#isArray}}, ","){{/isArray}}
{{paramName}}Param := {{#isArray}}strings.Split({{/isArray}}query.Get("{{baseName}}"){{#isArray}}, ","){{/isArray}}
{{/isBoolean}}
{{/isInteger}}
{{/isLong}}
{{/isQueryParam}}
{{#isFormParam}}
{{#isFile}}{{#isArray}}
{{paramName}}, err := ReadFormFilesToTempFiles(r, "{{baseName}}"){{/isArray}}{{^isArray}}
{{paramName}}, err := ReadFormFileToTempFile(r, "{{baseName}}")
{{paramName}}Param, err := ReadFormFilesToTempFiles(r, "{{baseName}}"){{/isArray}}{{^isArray}}
{{paramName}}Param, err := ReadFormFileToTempFile(r, "{{baseName}}")
{{/isArray}}
if err != nil {
c.errorHandler(w, r, &ParsingError{Err: err}, nil)
return
}
{{/isFile}}
{{#isLong}}{{#isArray}}
{{paramName}}, err := parseInt64ArrayParameter(r.FormValue("{{baseName}}"), ",", {{required}}){{/isArray}}{{^isArray}}
{{paramName}}, err := parseInt64Parameter(r.FormValue("{{baseName}}"), {{required}}){{/isArray}}
{{paramName}}Param, err := parseInt64ArrayParameter(r.FormValue("{{baseName}}"), ",", {{required}}){{/isArray}}{{^isArray}}
{{paramName}}Param, err := parseInt64Parameter(r.FormValue("{{baseName}}"), {{required}}){{/isArray}}
if err != nil {
c.errorHandler(w, r, &ParsingError{Err: err}, nil)
return
}
{{/isLong}}
{{#isInteger}}{{#isArray}}
{{paramName}}, err := parseInt32ArrayParameter(r.FormValue("{{baseName}}"), ",", {{required}}){{/isArray}}{{^isArray}}
{{paramName}}, err := parseInt32Parameter(r.FormValue("{{baseName}}"), {{required}}){{/isArray}}
{{paramName}}Param, err := parseInt32ArrayParameter(r.FormValue("{{baseName}}"), ",", {{required}}){{/isArray}}{{^isArray}}
{{paramName}}Param, err := parseInt32Parameter(r.FormValue("{{baseName}}"), {{required}}){{/isArray}}
if err != nil {
c.errorHandler(w, r, &ParsingError{Err: err}, nil)
return
}
{{/isInteger}}
{{^isFile}}
{{^isLong}}
{{paramName}} := r.FormValue("{{baseName}}")
{{paramName}}Param := r.FormValue("{{baseName}}")
{{/isLong}}
{{/isFile}}
{{/isFormParam}}
{{#isHeaderParam}}
{{paramName}} := r.Header.Get("{{baseName}}")
{{paramName}}Param := r.Header.Get("{{baseName}}")
{{/isHeaderParam}}
{{#isBodyParam}}
{{paramName}} := {{dataType}}{}
{{paramName}}Param := {{dataType}}{}
d := json.NewDecoder(r.Body)
{{^isAdditionalPropertiesTrue}}
d.DisallowUnknownFields()
{{/isAdditionalPropertiesTrue}}
if err := d.Decode(&{{paramName}}); err != nil {
if err := d.Decode(&{{paramName}}Param); err != nil {
c.errorHandler(w, r, &ParsingError{Err: err}, nil)
return
}
{{#isArray}}
{{#items.isModel}}
for _, el := range {{paramName}} {
for _, el := range {{paramName}}Param {
if err := Assert{{baseType}}Required(el); err != nil {
c.errorHandler(w, r, err, nil)
return
Expand All @@ -195,15 +195,15 @@ func (c *{{classname}}Controller) {{nickname}}(w http.ResponseWriter, r *http.Re
{{/isArray}}
{{^isArray}}
{{#isModel}}
if err := Assert{{baseType}}Required({{paramName}}); err != nil {
if err := Assert{{baseType}}Required({{paramName}}Param); err != nil {
c.errorHandler(w, r, err, nil)
return
}
{{/isModel}}
{{/isArray}}
{{/isBodyParam}}
{{/allParams}}
result, err := c.service.{{nickname}}(r.Context(){{#allParams}}, {{paramName}}{{/allParams}})
result, err := c.service.{{nickname}}(r.Context(){{#allParams}}, {{paramName}}Param{{/allParams}})
// If an error occurred, encode the error with the status code
if err != nil {
c.errorHandler(w, r, err, &result)
Expand Down
50 changes: 25 additions & 25 deletions samples/server/petstore/go-api-server/go/api_pet.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,18 +103,18 @@ func (c *PetApiController) Routes() Routes {

// AddPet - Add a new pet to the store
func (c *PetApiController) AddPet(w http.ResponseWriter, r *http.Request) {
pet := Pet{}
petParam := Pet{}
d := json.NewDecoder(r.Body)
d.DisallowUnknownFields()
if err := d.Decode(&pet); err != nil {
if err := d.Decode(&petParam); err != nil {
c.errorHandler(w, r, &ParsingError{Err: err}, nil)
return
}
if err := AssertPetRequired(pet); err != nil {
if err := AssertPetRequired(petParam); err != nil {
c.errorHandler(w, r, err, nil)
return
}
result, err := c.service.AddPet(r.Context(), pet)
result, err := c.service.AddPet(r.Context(), petParam)
// If an error occurred, encode the error with the status code
if err != nil {
c.errorHandler(w, r, err, &result)
Expand All @@ -128,14 +128,14 @@ func (c *PetApiController) AddPet(w http.ResponseWriter, r *http.Request) {
// DeletePet - Deletes a pet
func (c *PetApiController) DeletePet(w http.ResponseWriter, r *http.Request) {
params := mux.Vars(r)
petId, err := parseInt64Parameter(params["petId"], true)
petIdParam, err := parseInt64Parameter(params["petId"], true)
if err != nil {
c.errorHandler(w, r, &ParsingError{Err: err}, nil)
return
}

apiKey := r.Header.Get("api_key")
result, err := c.service.DeletePet(r.Context(), petId, apiKey)
apiKeyParam := r.Header.Get("api_key")
result, err := c.service.DeletePet(r.Context(), petIdParam, apiKeyParam)
// If an error occurred, encode the error with the status code
if err != nil {
c.errorHandler(w, r, err, &result)
Expand All @@ -149,8 +149,8 @@ func (c *PetApiController) DeletePet(w http.ResponseWriter, r *http.Request) {
// FindPetsByStatus - Finds Pets by status
func (c *PetApiController) FindPetsByStatus(w http.ResponseWriter, r *http.Request) {
query := r.URL.Query()
status := strings.Split(query.Get("status"), ",")
result, err := c.service.FindPetsByStatus(r.Context(), status)
statusParam := strings.Split(query.Get("status"), ",")
result, err := c.service.FindPetsByStatus(r.Context(), statusParam)
// If an error occurred, encode the error with the status code
if err != nil {
c.errorHandler(w, r, err, &result)
Expand All @@ -165,8 +165,8 @@ func (c *PetApiController) FindPetsByStatus(w http.ResponseWriter, r *http.Reque
// Deprecated
func (c *PetApiController) FindPetsByTags(w http.ResponseWriter, r *http.Request) {
query := r.URL.Query()
tags := strings.Split(query.Get("tags"), ",")
result, err := c.service.FindPetsByTags(r.Context(), tags)
tagsParam := strings.Split(query.Get("tags"), ",")
result, err := c.service.FindPetsByTags(r.Context(), tagsParam)
// If an error occurred, encode the error with the status code
if err != nil {
c.errorHandler(w, r, err, &result)
Expand All @@ -180,13 +180,13 @@ func (c *PetApiController) FindPetsByTags(w http.ResponseWriter, r *http.Request
// GetPetById - Find pet by ID
func (c *PetApiController) GetPetById(w http.ResponseWriter, r *http.Request) {
params := mux.Vars(r)
petId, err := parseInt64Parameter(params["petId"], true)
petIdParam, err := parseInt64Parameter(params["petId"], true)
if err != nil {
c.errorHandler(w, r, &ParsingError{Err: err}, nil)
return
}

result, err := c.service.GetPetById(r.Context(), petId)
result, err := c.service.GetPetById(r.Context(), petIdParam)
// If an error occurred, encode the error with the status code
if err != nil {
c.errorHandler(w, r, err, &result)
Expand All @@ -199,18 +199,18 @@ func (c *PetApiController) GetPetById(w http.ResponseWriter, r *http.Request) {

// UpdatePet - Update an existing pet
func (c *PetApiController) UpdatePet(w http.ResponseWriter, r *http.Request) {
pet := Pet{}
petParam := Pet{}
d := json.NewDecoder(r.Body)
d.DisallowUnknownFields()
if err := d.Decode(&pet); err != nil {
if err := d.Decode(&petParam); err != nil {
c.errorHandler(w, r, &ParsingError{Err: err}, nil)
return
}
if err := AssertPetRequired(pet); err != nil {
if err := AssertPetRequired(petParam); err != nil {
c.errorHandler(w, r, err, nil)
return
}
result, err := c.service.UpdatePet(r.Context(), pet)
result, err := c.service.UpdatePet(r.Context(), petParam)
// If an error occurred, encode the error with the status code
if err != nil {
c.errorHandler(w, r, err, &result)
Expand All @@ -228,15 +228,15 @@ func (c *PetApiController) UpdatePetWithForm(w http.ResponseWriter, r *http.Requ
return
}
params := mux.Vars(r)
petId, err := parseInt64Parameter(params["petId"], true)
petIdParam, err := parseInt64Parameter(params["petId"], true)
if err != nil {
c.errorHandler(w, r, &ParsingError{Err: err}, nil)
return
}

name := r.FormValue("name")
status := r.FormValue("status")
result, err := c.service.UpdatePetWithForm(r.Context(), petId, name, status)
nameParam := r.FormValue("name")
statusParam := r.FormValue("status")
result, err := c.service.UpdatePetWithForm(r.Context(), petIdParam, nameParam, statusParam)
// If an error occurred, encode the error with the status code
if err != nil {
c.errorHandler(w, r, err, &result)
Expand All @@ -254,20 +254,20 @@ func (c *PetApiController) UploadFile(w http.ResponseWriter, r *http.Request) {
return
}
params := mux.Vars(r)
petId, err := parseInt64Parameter(params["petId"], true)
petIdParam, err := parseInt64Parameter(params["petId"], true)
if err != nil {
c.errorHandler(w, r, &ParsingError{Err: err}, nil)
return
}

additionalMetadata := r.FormValue("additionalMetadata")
additionalMetadataParam := r.FormValue("additionalMetadata")

file, err := ReadFormFileToTempFile(r, "file")
fileParam, err := ReadFormFileToTempFile(r, "file")
if err != nil {
c.errorHandler(w, r, &ParsingError{Err: err}, nil)
return
}
result, err := c.service.UploadFile(r.Context(), petId, additionalMetadata, file)
result, err := c.service.UploadFile(r.Context(), petIdParam, additionalMetadataParam, fileParam)
// If an error occurred, encode the error with the status code
if err != nil {
c.errorHandler(w, r, err, &result)
Expand Down
16 changes: 8 additions & 8 deletions samples/server/petstore/go-api-server/go/api_store.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ func (c *StoreApiController) Routes() Routes {
// DeleteOrder - Delete purchase order by ID
func (c *StoreApiController) DeleteOrder(w http.ResponseWriter, r *http.Request) {
params := mux.Vars(r)
orderId := params["orderId"]
orderIdParam := params["orderId"]

result, err := c.service.DeleteOrder(r.Context(), orderId)
result, err := c.service.DeleteOrder(r.Context(), orderIdParam)
// If an error occurred, encode the error with the status code
if err != nil {
c.errorHandler(w, r, err, &result)
Expand All @@ -109,13 +109,13 @@ func (c *StoreApiController) GetInventory(w http.ResponseWriter, r *http.Request
// GetOrderById - Find purchase order by ID
func (c *StoreApiController) GetOrderById(w http.ResponseWriter, r *http.Request) {
params := mux.Vars(r)
orderId, err := parseInt64Parameter(params["orderId"], true)
orderIdParam, err := parseInt64Parameter(params["orderId"], true)
if err != nil {
c.errorHandler(w, r, &ParsingError{Err: err}, nil)
return
}

result, err := c.service.GetOrderById(r.Context(), orderId)
result, err := c.service.GetOrderById(r.Context(), orderIdParam)
// If an error occurred, encode the error with the status code
if err != nil {
c.errorHandler(w, r, err, &result)
Expand All @@ -128,18 +128,18 @@ func (c *StoreApiController) GetOrderById(w http.ResponseWriter, r *http.Request

// PlaceOrder - Place an order for a pet
func (c *StoreApiController) PlaceOrder(w http.ResponseWriter, r *http.Request) {
order := Order{}
orderParam := Order{}
d := json.NewDecoder(r.Body)
d.DisallowUnknownFields()
if err := d.Decode(&order); err != nil {
if err := d.Decode(&orderParam); err != nil {
c.errorHandler(w, r, &ParsingError{Err: err}, nil)
return
}
if err := AssertOrderRequired(order); err != nil {
if err := AssertOrderRequired(orderParam); err != nil {
c.errorHandler(w, r, err, nil)
return
}
result, err := c.service.PlaceOrder(r.Context(), order)
result, err := c.service.PlaceOrder(r.Context(), orderParam)
// If an error occurred, encode the error with the status code
if err != nil {
c.errorHandler(w, r, err, &result)
Expand Down

0 comments on commit 3b8f66c

Please sign in to comment.