Skip to content

Commit cefbf62

Browse files
authored
[go-server] Fix: missing quotes for string default value (OpenAPITools#18546)
* Update controller mustache * Add tests to openapi doc * Regen
1 parent b1fac19 commit cefbf62

File tree

14 files changed

+188
-43
lines changed

14 files changed

+188
-43
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ func (c *{{classname}}Controller) {{nickname}}(w http.ResponseWriter, r *http.Re
520520
{{/required}}
521521
{{^required}}
522522
{{#defaultValue}}
523-
param := {{^isString}}{{dataType}}({{/isString}}{{defaultValue}}{{^isString}}){{/isString}}
523+
param := {{^isString}}{{dataType}}({{/isString}}"{{defaultValue}}"{{^isString}}){{/isString}}
524524
{{paramName}}Param = {{#isNullable}}&{{/isNullable}}param
525525
{{/defaultValue}}
526526
{{/required}}

modules/openapi-generator/src/test/resources/3_0/go-server/petstore.yaml

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,21 @@ paths:
100100
- "OPTION_1"
101101
- "OPTION_2"
102102
- "OPTION_3"
103+
- name: defaultInt
104+
in: query
105+
schema:
106+
default: 1
107+
type: integer
108+
- name: defaultNum
109+
in: query
110+
schema:
111+
default: 1.5
112+
type: number
113+
- name: defaultStr
114+
in: query
115+
schema:
116+
default: default
117+
type: string
103118
- name: status
104119
in: query
105120
description: Status values that need to be considered for filter
@@ -616,9 +631,9 @@ paths:
616631
required: true
617632
schema:
618633
type: string
619-
- name: boolean_test
634+
- name: remember_me
620635
in: query
621-
description: The password for login in clear text
636+
description: Remember Me
622637
schema:
623638
type: boolean
624639
responses:
@@ -731,9 +746,9 @@ paths:
731746
required: true
732747
schema:
733748
type: string
734-
- name: boolean_test # to ensure boolean query parameter won't cause compilation errors
749+
- name: confirmation # to ensure boolean query parameter won't cause compilation errors
735750
in: query
736-
description: boolean query parameter
751+
description: Confirm the deletion
737752
schema:
738753
type: boolean
739754
responses:

samples/server/petstore/go-api-server/api/openapi.yaml

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,30 @@ paths:
105105
- OPTION_3
106106
type: string
107107
style: form
108+
- explode: true
109+
in: query
110+
name: defaultInt
111+
required: false
112+
schema:
113+
default: 1
114+
type: integer
115+
style: form
116+
- explode: true
117+
in: query
118+
name: defaultNum
119+
required: false
120+
schema:
121+
default: 1.5
122+
type: number
123+
style: form
124+
- explode: true
125+
in: query
126+
name: defaultStr
127+
required: false
128+
schema:
129+
default: default
130+
type: string
131+
style: form
108132
- deprecated: true
109133
description: Status values that need to be considered for filter
110134
explode: false
@@ -631,10 +655,10 @@ paths:
631655
schema:
632656
type: string
633657
style: form
634-
- description: The password for login in clear text
658+
- description: Remember Me
635659
explode: true
636660
in: query
637-
name: boolean_test
661+
name: remember_me
638662
required: false
639663
schema:
640664
type: boolean
@@ -702,10 +726,10 @@ paths:
702726
schema:
703727
type: string
704728
style: simple
705-
- description: boolean query parameter
729+
- description: Confirm the deletion
706730
explode: true
707731
in: query
708-
name: boolean_test
732+
name: confirmation
709733
required: false
710734
schema:
711735
type: boolean

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 42 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/server/petstore/go-api-server/go/api_pet_service.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/server/petstore/go-api-server/go/api_user_service.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

samples/server/petstore/go-chi-server/api/openapi.yaml

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,30 @@ paths:
105105
- OPTION_3
106106
type: string
107107
style: form
108+
- explode: true
109+
in: query
110+
name: defaultInt
111+
required: false
112+
schema:
113+
default: 1
114+
type: integer
115+
style: form
116+
- explode: true
117+
in: query
118+
name: defaultNum
119+
required: false
120+
schema:
121+
default: 1.5
122+
type: number
123+
style: form
124+
- explode: true
125+
in: query
126+
name: defaultStr
127+
required: false
128+
schema:
129+
default: default
130+
type: string
131+
style: form
108132
- deprecated: true
109133
description: Status values that need to be considered for filter
110134
explode: false
@@ -631,10 +655,10 @@ paths:
631655
schema:
632656
type: string
633657
style: form
634-
- description: The password for login in clear text
658+
- description: Remember Me
635659
explode: true
636660
in: query
637-
name: boolean_test
661+
name: remember_me
638662
required: false
639663
schema:
640664
type: boolean
@@ -702,10 +726,10 @@ paths:
702726
schema:
703727
type: string
704728
style: simple
705-
- description: boolean query parameter
729+
- description: Confirm the deletion
706730
explode: true
707731
in: query
708-
name: boolean_test
732+
name: confirmation
709733
required: false
710734
schema:
711735
type: boolean

samples/server/petstore/go-chi-server/go/api.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)