Skip to content

Commit d1dcdad

Browse files
randomswdevBernardo Pastorelli
randomswdev
and
Bernardo Pastorelli
authored
[Go][Server] Use the correct parameter name (#8144)
* Use the correct parameter name * Minor changes Co-authored-by: Bernardo Pastorelli <13519917-randomswdev@users.noreply.github.com>
1 parent bde631c commit d1dcdad

4 files changed

Lines changed: 36 additions & 36 deletions

File tree

‎modules/openapi-generator/src/main/resources/go-server/controller-api.mustache‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -35,60 +35,60 @@ func (c *{{classname}}Controller) Routes() Routes {
3535
func (c *{{classname}}Controller) {{nickname}}(w http.ResponseWriter, r *http.Request) { {{#hasFormParams}}
3636
err := r.ParseForm()
3737
if err != nil {
38-
w.WriteHeader(500)
38+
w.WriteHeader(http.StatusBadRequest)
3939
return
4040
}
4141
{{/hasFormParams}}{{#hasPathParams}}
4242
params := mux.Vars(r){{/hasPathParams}}{{#hasQueryParams}}
4343
query := r.URL.Query(){{/hasQueryParams}}{{#allParams}}{{#isPathParam}}{{#isLong}}
44-
{{paramName}}, err := parseInt64Parameter(params["{{paramName}}"])
44+
{{paramName}}, err := parseInt64Parameter(params["{{baseName}}"])
4545
if err != nil {
46-
w.WriteHeader(500)
46+
w.WriteHeader(http.StatusBadRequest)
4747
return
4848
}{{/isLong}}{{#isInteger}}
49-
{{paramName}}, err := parseInt32Parameter(params["{{paramName}}"])
49+
{{paramName}}, err := parseInt32Parameter(params["{{baseName}}"])
5050
if err != nil {
51-
w.WriteHeader(500)
51+
w.WriteHeader(http.StatusBadRequest)
5252
return
5353
}
5454
{{/isInteger}}{{^isLong}}{{^isInteger}}
55-
{{paramName}} := params["{{paramName}}"]{{/isInteger}}{{/isLong}}{{/isPathParam}}{{#isQueryParam}}{{#isLong}}
56-
{{paramName}}, err := parseInt64Parameter(query.Get("{{paramName}}"))
55+
{{paramName}} := params["{{baseName}}"]{{/isInteger}}{{/isLong}}{{/isPathParam}}{{#isQueryParam}}{{#isLong}}
56+
{{paramName}}, err := parseInt64Parameter(query.Get("{{baseName}}"))
5757
if err != nil {
58-
w.WriteHeader(500)
58+
w.WriteHeader(http.StatusBadRequest)
5959
return
6060
}
6161
{{/isLong}}{{#isInteger}}
62-
{{paramName}}, err := parseInt32Parameter(query.Get("{{paramName}}"))
62+
{{paramName}}, err := parseInt32Parameter(query.Get("{{baseName}}"))
6363
if err != nil {
64-
w.WriteHeader(500)
64+
w.WriteHeader(http.StatusBadRequest)
6565
return
6666
}
6767
{{/isInteger}}{{^isLong}}{{^isInteger}}
68-
{{paramName}} := {{#isArray}}strings.Split({{/isArray}}query.Get("{{paramName}}"){{#isArray}}, ","){{/isArray}}{{/isInteger}}{{/isLong}}{{/isQueryParam}}{{#isFormParam}}{{#isFile}}
69-
{{#isArray}}{{paramName}}, err := ReadFormFilesToTempFiles(r, "{{paramName}}"){{/isArray}}{{^isArray}}{{paramName}}, err := ReadFormFileToTempFile(r, "{{paramName}}"){{/isArray}}
68+
{{paramName}} := {{#isArray}}strings.Split({{/isArray}}query.Get("{{baseName}}"){{#isArray}}, ","){{/isArray}}{{/isInteger}}{{/isLong}}{{/isQueryParam}}{{#isFormParam}}{{#isFile}}
69+
{{#isArray}}{{paramName}}, err := ReadFormFilesToTempFiles(r, "{{baseName}}"){{/isArray}}{{^isArray}}{{paramName}}, err := ReadFormFileToTempFile(r, "{{baseName}}"){{/isArray}}
7070
if err != nil {
71-
w.WriteHeader(500)
71+
w.WriteHeader(http.StatusBadRequest)
7272
return
7373
}
7474
{{/isFile}}{{#isLong}}
75-
{{paramName}}, err := parseInt64Parameter( r.FormValue("{{paramName}}"))
75+
{{paramName}}, err := parseInt64Parameter( r.FormValue("{{baseName}}"))
7676
if err != nil {
77-
w.WriteHeader(500)
77+
w.WriteHeader(http.StatusBadRequest)
7878
return
7979
}
8080
{{/isLong}}{{#isInteger}}
81-
{{paramName}}, err := parseInt32Parameter( r.FormValue("{{paramName}}"))
81+
{{paramName}}, err := parseInt32Parameter( r.FormValue("{{baseName}}"))
8282
if err != nil {
83-
w.WriteHeader(500)
83+
w.WriteHeader(http.StatusBadRequest)
8484
return
8585
}
8686
{{/isInteger}}{{^isFile}}{{^isLong}}
87-
{{paramName}} := r.FormValue("{{paramName}}"){{/isLong}}{{/isFile}}{{/isFormParam}}{{#isHeaderParam}}
88-
{{paramName}} := r.Header.Get("{{paramName}}"){{/isHeaderParam}}{{#isBodyParam}}
87+
{{paramName}} := r.FormValue("{{baseName}}"){{/isLong}}{{/isFile}}{{/isFormParam}}{{#isHeaderParam}}
88+
{{paramName}} := r.Header.Get("{{baseName}}"){{/isHeaderParam}}{{#isBodyParam}}
8989
{{paramName}} := &{{dataType}}{}
9090
if err := json.NewDecoder(r.Body).Decode(&{{paramName}}); err != nil {
91-
w.WriteHeader(500)
91+
w.WriteHeader(http.StatusBadRequest)
9292
return
9393
}
9494
{{/isBodyParam}}{{/allParams}}

‎samples/server/petstore/go-api-server/go/api_pet.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func (c *PetApiController) Routes() Routes {
8585
func (c *PetApiController) AddPet(w http.ResponseWriter, r *http.Request) {
8686
pet := &Pet{}
8787
if err := json.NewDecoder(r.Body).Decode(&pet); err != nil {
88-
w.WriteHeader(500)
88+
w.WriteHeader(http.StatusBadRequest)
8989
return
9090
}
9191

@@ -105,10 +105,10 @@ func (c *PetApiController) DeletePet(w http.ResponseWriter, r *http.Request) {
105105
params := mux.Vars(r)
106106
petId, err := parseInt64Parameter(params["petId"])
107107
if err != nil {
108-
w.WriteHeader(500)
108+
w.WriteHeader(http.StatusBadRequest)
109109
return
110110
}
111-
apiKey := r.Header.Get("apiKey")
111+
apiKey := r.Header.Get("api_key")
112112
result, err := c.service.DeletePet(r.Context(), petId, apiKey)
113113
//If an error occured, encode the error with the status code
114114
if err != nil {
@@ -155,7 +155,7 @@ func (c *PetApiController) GetPetById(w http.ResponseWriter, r *http.Request) {
155155
params := mux.Vars(r)
156156
petId, err := parseInt64Parameter(params["petId"])
157157
if err != nil {
158-
w.WriteHeader(500)
158+
w.WriteHeader(http.StatusBadRequest)
159159
return
160160
}
161161
result, err := c.service.GetPetById(r.Context(), petId)
@@ -173,7 +173,7 @@ func (c *PetApiController) GetPetById(w http.ResponseWriter, r *http.Request) {
173173
func (c *PetApiController) UpdatePet(w http.ResponseWriter, r *http.Request) {
174174
pet := &Pet{}
175175
if err := json.NewDecoder(r.Body).Decode(&pet); err != nil {
176-
w.WriteHeader(500)
176+
w.WriteHeader(http.StatusBadRequest)
177177
return
178178
}
179179

@@ -192,14 +192,14 @@ func (c *PetApiController) UpdatePet(w http.ResponseWriter, r *http.Request) {
192192
func (c *PetApiController) UpdatePetWithForm(w http.ResponseWriter, r *http.Request) {
193193
err := r.ParseForm()
194194
if err != nil {
195-
w.WriteHeader(500)
195+
w.WriteHeader(http.StatusBadRequest)
196196
return
197197
}
198198

199199
params := mux.Vars(r)
200200
petId, err := parseInt64Parameter(params["petId"])
201201
if err != nil {
202-
w.WriteHeader(500)
202+
w.WriteHeader(http.StatusBadRequest)
203203
return
204204
}
205205
name := r.FormValue("name")
@@ -219,20 +219,20 @@ func (c *PetApiController) UpdatePetWithForm(w http.ResponseWriter, r *http.Requ
219219
func (c *PetApiController) UploadFile(w http.ResponseWriter, r *http.Request) {
220220
err := r.ParseForm()
221221
if err != nil {
222-
w.WriteHeader(500)
222+
w.WriteHeader(http.StatusBadRequest)
223223
return
224224
}
225225

226226
params := mux.Vars(r)
227227
petId, err := parseInt64Parameter(params["petId"])
228228
if err != nil {
229-
w.WriteHeader(500)
229+
w.WriteHeader(http.StatusBadRequest)
230230
return
231231
}
232232
additionalMetadata := r.FormValue("additionalMetadata")
233233
file, err := ReadFormFileToTempFile(r, "file")
234234
if err != nil {
235-
w.WriteHeader(500)
235+
w.WriteHeader(http.StatusBadRequest)
236236
return
237237
}
238238

‎samples/server/petstore/go-api-server/go/api_store.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ func (c *StoreApiController) GetOrderById(w http.ResponseWriter, r *http.Request
9090
params := mux.Vars(r)
9191
orderId, err := parseInt64Parameter(params["orderId"])
9292
if err != nil {
93-
w.WriteHeader(500)
93+
w.WriteHeader(http.StatusBadRequest)
9494
return
9595
}
9696
result, err := c.service.GetOrderById(r.Context(), orderId)
@@ -108,7 +108,7 @@ func (c *StoreApiController) GetOrderById(w http.ResponseWriter, r *http.Request
108108
func (c *StoreApiController) PlaceOrder(w http.ResponseWriter, r *http.Request) {
109109
order := &Order{}
110110
if err := json.NewDecoder(r.Body).Decode(&order); err != nil {
111-
w.WriteHeader(500)
111+
w.WriteHeader(http.StatusBadRequest)
112112
return
113113
}
114114

‎samples/server/petstore/go-api-server/go/api_user.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ func (c *UserApiController) Routes() Routes {
8585
func (c *UserApiController) CreateUser(w http.ResponseWriter, r *http.Request) {
8686
user := &User{}
8787
if err := json.NewDecoder(r.Body).Decode(&user); err != nil {
88-
w.WriteHeader(500)
88+
w.WriteHeader(http.StatusBadRequest)
8989
return
9090
}
9191

@@ -104,7 +104,7 @@ func (c *UserApiController) CreateUser(w http.ResponseWriter, r *http.Request) {
104104
func (c *UserApiController) CreateUsersWithArrayInput(w http.ResponseWriter, r *http.Request) {
105105
user := &[]User{}
106106
if err := json.NewDecoder(r.Body).Decode(&user); err != nil {
107-
w.WriteHeader(500)
107+
w.WriteHeader(http.StatusBadRequest)
108108
return
109109
}
110110

@@ -123,7 +123,7 @@ func (c *UserApiController) CreateUsersWithArrayInput(w http.ResponseWriter, r *
123123
func (c *UserApiController) CreateUsersWithListInput(w http.ResponseWriter, r *http.Request) {
124124
user := &[]User{}
125125
if err := json.NewDecoder(r.Body).Decode(&user); err != nil {
126-
w.WriteHeader(500)
126+
w.WriteHeader(http.StatusBadRequest)
127127
return
128128
}
129129

@@ -203,7 +203,7 @@ func (c *UserApiController) UpdateUser(w http.ResponseWriter, r *http.Request) {
203203
username := params["username"]
204204
user := &User{}
205205
if err := json.NewDecoder(r.Body).Decode(&user); err != nil {
206-
w.WriteHeader(500)
206+
w.WriteHeader(http.StatusBadRequest)
207207
return
208208
}
209209

0 commit comments

Comments
 (0)