Skip to content

Commit 4302d37

Browse files
wing328wing328
authored
use unescaped baseName (OpenAPITools#16957)
1 parent a4267ee commit 4302d37

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class
124124
}
125125

126126
localVarPath := localBasePath + "{{{path}}}"{{#pathParams}}
127-
localVarPath = strings.Replace(localVarPath, "{"+"{{baseName}}"+"}", url.PathEscape(parameterValueToString(r.{{paramName}}, "{{paramName}}")), -1){{/pathParams}}
127+
localVarPath = strings.Replace(localVarPath, "{"+"{{{baseName}}}"+"}", url.PathEscape(parameterValueToString(r.{{paramName}}, "{{paramName}}")), -1){{/pathParams}}
128128

129129
localVarHeaderParams := make(map[string]string)
130130
localVarQueryParams := url.Values{}
@@ -189,15 +189,15 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class
189189
if reflect.TypeOf(t).Kind() == reflect.Slice {
190190
s := reflect.ValueOf(t)
191191
for i := 0; i < s.Len(); i++ {
192-
parameterAddToHeaderOrQuery(localVarQueryParams, "{{baseName}}", s.Index(i).Interface(), "{{collectionFormat}}")
192+
parameterAddToHeaderOrQuery(localVarQueryParams, "{{{baseName}}}", s.Index(i).Interface(), "{{collectionFormat}}")
193193
}
194194
} else {
195-
parameterAddToHeaderOrQuery(localVarQueryParams, "{{baseName}}", t, "{{collectionFormat}}")
195+
parameterAddToHeaderOrQuery(localVarQueryParams, "{{{baseName}}}", t, "{{collectionFormat}}")
196196
}
197197
}
198198
{{/isCollectionFormatMulti}}
199199
{{^isCollectionFormatMulti}}
200-
parameterAddToHeaderOrQuery(localVarQueryParams, "{{baseName}}", r.{{paramName}}, "{{collectionFormat}}")
200+
parameterAddToHeaderOrQuery(localVarQueryParams, "{{{baseName}}}", r.{{paramName}}, "{{collectionFormat}}")
201201
{{/isCollectionFormatMulti}}
202202
{{/required}}
203203
{{^required}}
@@ -207,14 +207,14 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class
207207
if reflect.TypeOf(t).Kind() == reflect.Slice {
208208
s := reflect.ValueOf(t)
209209
for i := 0; i < s.Len(); i++ {
210-
parameterAddToHeaderOrQuery(localVarQueryParams, "{{baseName}}", s.Index(i).Interface(), "{{collectionFormat}}")
210+
parameterAddToHeaderOrQuery(localVarQueryParams, "{{{baseName}}}", s.Index(i).Interface(), "{{collectionFormat}}")
211211
}
212212
} else {
213-
parameterAddToHeaderOrQuery(localVarQueryParams, "{{baseName}}", t, "{{collectionFormat}}")
213+
parameterAddToHeaderOrQuery(localVarQueryParams, "{{{baseName}}}", t, "{{collectionFormat}}")
214214
}
215215
{{/isCollectionFormatMulti}}
216216
{{^isCollectionFormatMulti}}
217-
parameterAddToHeaderOrQuery(localVarQueryParams, "{{baseName}}", r.{{paramName}}, "{{collectionFormat}}")
217+
parameterAddToHeaderOrQuery(localVarQueryParams, "{{{baseName}}}", r.{{paramName}}, "{{collectionFormat}}")
218218
{{/isCollectionFormatMulti}}
219219
{{#defaultValue}}} else {
220220
var defaultValue {{{dataType}}} = {{{.}}}
@@ -245,11 +245,11 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class
245245
}
246246
{{#headerParams}}
247247
{{#required}}
248-
parameterAddToHeaderOrQuery(localVarHeaderParams, "{{baseName}}", r.{{paramName}}, "{{collectionFormat}}")
248+
parameterAddToHeaderOrQuery(localVarHeaderParams, "{{{baseName}}}", r.{{paramName}}, "{{collectionFormat}}")
249249
{{/required}}
250250
{{^required}}
251251
if r.{{paramName}} != nil {
252-
parameterAddToHeaderOrQuery(localVarHeaderParams, "{{baseName}}", r.{{paramName}}, "{{collectionFormat}}")
252+
parameterAddToHeaderOrQuery(localVarHeaderParams, "{{{baseName}}}", r.{{paramName}}, "{{collectionFormat}}")
253253
}
254254
{{/required}}
255255
{{/headerParams}}
@@ -295,7 +295,7 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class
295295
{{/isFile}}
296296
{{^isFile}}
297297
{{#required}}
298-
parameterAddToHeaderOrQuery(localVarFormParams, "{{baseName}}", r.{{paramName}}, "{{collectionFormat}}")
298+
parameterAddToHeaderOrQuery(localVarFormParams, "{{{baseName}}}", r.{{paramName}}, "{{collectionFormat}}")
299299
{{/required}}
300300
{{^required}}
301301
{{#isModel}}
@@ -304,12 +304,12 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class
304304
if err != nil {
305305
return {{#returnType}}localVarReturnValue, {{/returnType}}nil, err
306306
}
307-
localVarFormParams.Add("{{baseName}}", paramJson)
307+
localVarFormParams.Add("{{{baseName}}}", paramJson)
308308
}
309309
{{/isModel}}
310310
{{^isModel}}
311311
if r.{{paramName}} != nil {
312-
parameterAddToHeaderOrQuery(localVarFormParams, "{{baseName}}", r.{{paramName}}, "{{collectionFormat}}")
312+
parameterAddToHeaderOrQuery(localVarFormParams, "{{{baseName}}}", r.{{paramName}}, "{{collectionFormat}}")
313313
}
314314
{{/isModel}}
315315
{{/required}}

‎modules/openapi-generator/src/main/resources/go/model_simple.mustache

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ type {{classname}} struct {
2222
{{#deprecated}}
2323
// Deprecated
2424
{{/deprecated}}
25-
{{name}} {{^required}}{{^isNullable}}{{^isArray}}{{^isFreeFormObject}}*{{/isFreeFormObject}}{{/isArray}}{{/isNullable}}{{/required}}{{{dataType}}} `json:"{{baseName}}{{^required}},omitempty{{/required}}"{{#withXml}} xml:"{{baseName}}{{#isXmlAttribute}},attr{{/isXmlAttribute}}"{{/withXml}}{{#vendorExtensions.x-go-custom-tag}} {{{.}}}{{/vendorExtensions.x-go-custom-tag}}`
25+
{{name}} {{^required}}{{^isNullable}}{{^isArray}}{{^isFreeFormObject}}*{{/isFreeFormObject}}{{/isArray}}{{/isNullable}}{{/required}}{{{dataType}}} `json:"{{{baseName}}}{{^required}},omitempty{{/required}}"{{#withXml}} xml:"{{{baseName}}}{{#isXmlAttribute}},attr{{/isXmlAttribute}}"{{/withXml}}{{#vendorExtensions.x-go-custom-tag}} {{{.}}}{{/vendorExtensions.x-go-custom-tag}}`
2626
{{/vars}}
2727
{{#isAdditionalPropertiesTrue}}
2828
AdditionalProperties map[string]interface{}
@@ -295,28 +295,28 @@ func (o {{classname}}) ToMap() (map[string]interface{}, error) {
295295
{{#vendorExtensions.x-golang-is-container}}
296296
{{! support for container fields is not ideal at this point because of lack of Nullable* types}}
297297
if o.{{name}} != nil {
298-
toSerialize["{{baseName}}"] = o.{{name}}
298+
toSerialize["{{{baseName}}}"] = o.{{name}}
299299
}
300300
{{/vendorExtensions.x-golang-is-container}}
301301
{{^vendorExtensions.x-golang-is-container}}
302302
{{#required}}
303-
toSerialize["{{baseName}}"] = o.{{name}}.Get()
303+
toSerialize["{{{baseName}}}"] = o.{{name}}.Get()
304304
{{/required}}
305305
{{^required}}
306306
if o.{{name}}.IsSet() {
307-
toSerialize["{{baseName}}"] = o.{{name}}.Get()
307+
toSerialize["{{{baseName}}}"] = o.{{name}}.Get()
308308
}
309309
{{/required}}
310310
{{/vendorExtensions.x-golang-is-container}}
311311
{{/isNullable}}
312312
{{! if argument is not nullable, don't set it if it is nil}}
313313
{{^isNullable}}
314314
{{#required}}
315-
toSerialize["{{baseName}}"] = o.{{name}}
315+
toSerialize["{{{baseName}}}"] = o.{{name}}
316316
{{/required}}
317317
{{^required}}
318318
if !IsNil(o.{{name}}) {
319-
toSerialize["{{baseName}}"] = o.{{name}}
319+
toSerialize["{{{baseName}}}"] = o.{{name}}
320320
}
321321
{{/required}}
322322
{{/isNullable}}
@@ -345,7 +345,7 @@ func (o *{{{classname}}}) UnmarshalJSON(bytes []byte) (err error) {
345345
{{#deprecated}}
346346
// Deprecated
347347
{{/deprecated}}
348-
{{name}} {{^required}}{{^isNullable}}{{^isArray}}{{^isFreeFormObject}}*{{/isFreeFormObject}}{{/isArray}}{{/isNullable}}{{/required}}{{{dataType}}} `json:"{{baseName}}{{^required}},omitempty{{/required}}"{{#withXml}} xml:"{{baseName}}{{#isXmlAttribute}},attr{{/isXmlAttribute}}"{{/withXml}}{{#vendorExtensions.x-go-custom-tag}} {{{.}}}{{/vendorExtensions.x-go-custom-tag}}`
348+
{{name}} {{^required}}{{^isNullable}}{{^isArray}}{{^isFreeFormObject}}*{{/isFreeFormObject}}{{/isArray}}{{/isNullable}}{{/required}}{{{dataType}}} `json:"{{{baseName}}}{{^required}},omitempty{{/required}}"{{#withXml}} xml:"{{{baseName}}}{{#isXmlAttribute}},attr{{/isXmlAttribute}}"{{/withXml}}{{#vendorExtensions.x-go-custom-tag}} {{{.}}}{{/vendorExtensions.x-go-custom-tag}}`
349349
{{/vars}}
350350
}
351351

0 commit comments

Comments
 (0)