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

use unescaped baseName (#16957)

Browse Source
This commit is contained in:
William Cheng 2023-11-02 00:01:06 +08:00 committed by GitHub
parent a4267ee630
commit 4302d37f52
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/openapi-generator/src/main/resources/go/api.mustache vendored
View File

@ -124,7 +124,7 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class
} }
localVarPath := localBasePath + "{{{path}}}"{{#pathParams}} localVarPath := localBasePath + "{{{path}}}"{{#pathParams}}
localVarPath = strings.Replace(localVarPath, "{"+"{{baseName}}"+"}", url.PathEscape(parameterValueToString(r.{{paramName}}, "{{paramName}}")), -1){{/pathParams}} localVarPath = strings.Replace(localVarPath, "{"+"{{{baseName}}}"+"}", url.PathEscape(parameterValueToString(r.{{paramName}}, "{{paramName}}")), -1){{/pathParams}}
localVarHeaderParams := make(map[string]string) localVarHeaderParams := make(map[string]string)
localVarQueryParams := url.Values{} localVarQueryParams := url.Values{}
@ -189,15 +189,15 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class
if reflect.TypeOf(t).Kind() == reflect.Slice { if reflect.TypeOf(t).Kind() == reflect.Slice {
s := reflect.ValueOf(t) s := reflect.ValueOf(t)
for i := 0; i < s.Len(); i++ { for i := 0; i < s.Len(); i++ {
parameterAddToHeaderOrQuery(localVarQueryParams, "{{baseName}}", s.Index(i).Interface(), "{{collectionFormat}}") parameterAddToHeaderOrQuery(localVarQueryParams, "{{{baseName}}}", s.Index(i).Interface(), "{{collectionFormat}}")
} }
} else { } else {
parameterAddToHeaderOrQuery(localVarQueryParams, "{{baseName}}", t, "{{collectionFormat}}") parameterAddToHeaderOrQuery(localVarQueryParams, "{{{baseName}}}", t, "{{collectionFormat}}")
} }
} }
{{/isCollectionFormatMulti}} {{/isCollectionFormatMulti}}
{{^isCollectionFormatMulti}} {{^isCollectionFormatMulti}}
parameterAddToHeaderOrQuery(localVarQueryParams, "{{baseName}}", r.{{paramName}}, "{{collectionFormat}}") parameterAddToHeaderOrQuery(localVarQueryParams, "{{{baseName}}}", r.{{paramName}}, "{{collectionFormat}}")
{{/isCollectionFormatMulti}} {{/isCollectionFormatMulti}}
{{/required}} {{/required}}
{{^required}} {{^required}}
@ -207,14 +207,14 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class
if reflect.TypeOf(t).Kind() == reflect.Slice { if reflect.TypeOf(t).Kind() == reflect.Slice {
s := reflect.ValueOf(t) s := reflect.ValueOf(t)
for i := 0; i < s.Len(); i++ { for i := 0; i < s.Len(); i++ {
parameterAddToHeaderOrQuery(localVarQueryParams, "{{baseName}}", s.Index(i).Interface(), "{{collectionFormat}}") parameterAddToHeaderOrQuery(localVarQueryParams, "{{{baseName}}}", s.Index(i).Interface(), "{{collectionFormat}}")
} }
} else { } else {
parameterAddToHeaderOrQuery(localVarQueryParams, "{{baseName}}", t, "{{collectionFormat}}") parameterAddToHeaderOrQuery(localVarQueryParams, "{{{baseName}}}", t, "{{collectionFormat}}")
} }
{{/isCollectionFormatMulti}} {{/isCollectionFormatMulti}}
{{^isCollectionFormatMulti}} {{^isCollectionFormatMulti}}
parameterAddToHeaderOrQuery(localVarQueryParams, "{{baseName}}", r.{{paramName}}, "{{collectionFormat}}") parameterAddToHeaderOrQuery(localVarQueryParams, "{{{baseName}}}", r.{{paramName}}, "{{collectionFormat}}")
{{/isCollectionFormatMulti}} {{/isCollectionFormatMulti}}
{{#defaultValue}}} else { {{#defaultValue}}} else {
var defaultValue {{{dataType}}} = {{{.}}} var defaultValue {{{dataType}}} = {{{.}}}
@ -245,11 +245,11 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class
} }
{{#headerParams}} {{#headerParams}}
{{#required}} {{#required}}
parameterAddToHeaderOrQuery(localVarHeaderParams, "{{baseName}}", r.{{paramName}}, "{{collectionFormat}}") parameterAddToHeaderOrQuery(localVarHeaderParams, "{{{baseName}}}", r.{{paramName}}, "{{collectionFormat}}")
{{/required}} {{/required}}
{{^required}} {{^required}}
if r.{{paramName}} != nil { if r.{{paramName}} != nil {
parameterAddToHeaderOrQuery(localVarHeaderParams, "{{baseName}}", r.{{paramName}}, "{{collectionFormat}}") parameterAddToHeaderOrQuery(localVarHeaderParams, "{{{baseName}}}", r.{{paramName}}, "{{collectionFormat}}")
} }
{{/required}} {{/required}}
{{/headerParams}} {{/headerParams}}
@ -295,7 +295,7 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class
{{/isFile}} {{/isFile}}
{{^isFile}} {{^isFile}}
{{#required}} {{#required}}
parameterAddToHeaderOrQuery(localVarFormParams, "{{baseName}}", r.{{paramName}}, "{{collectionFormat}}") parameterAddToHeaderOrQuery(localVarFormParams, "{{{baseName}}}", r.{{paramName}}, "{{collectionFormat}}")
{{/required}} {{/required}}
{{^required}} {{^required}}
{{#isModel}} {{#isModel}}
@ -304,12 +304,12 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class
if err != nil { if err != nil {
return {{#returnType}}localVarReturnValue, {{/returnType}}nil, err return {{#returnType}}localVarReturnValue, {{/returnType}}nil, err
} }
localVarFormParams.Add("{{baseName}}", paramJson) localVarFormParams.Add("{{{baseName}}}", paramJson)
} }
{{/isModel}} {{/isModel}}
{{^isModel}} {{^isModel}}
if r.{{paramName}} != nil { if r.{{paramName}} != nil {
parameterAddToHeaderOrQuery(localVarFormParams, "{{baseName}}", r.{{paramName}}, "{{collectionFormat}}") parameterAddToHeaderOrQuery(localVarFormParams, "{{{baseName}}}", r.{{paramName}}, "{{collectionFormat}}")
} }
{{/isModel}} {{/isModel}}
{{/required}} {{/required}}

14
modules/openapi-generator/src/main/resources/go/model_simple.mustache vendored
View File

@ -22,7 +22,7 @@ type {{classname}} struct {
{{#deprecated}} {{#deprecated}}
// Deprecated // Deprecated
{{/deprecated}} {{/deprecated}}
{{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}}` {{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}}`
{{/vars}} {{/vars}}
{{#isAdditionalPropertiesTrue}} {{#isAdditionalPropertiesTrue}}
AdditionalProperties map[string]interface{} AdditionalProperties map[string]interface{}
@ -295,16 +295,16 @@ func (o {{classname}}) ToMap() (map[string]interface{}, error) {
{{#vendorExtensions.x-golang-is-container}} {{#vendorExtensions.x-golang-is-container}}
{{! support for container fields is not ideal at this point because of lack of Nullable* types}} {{! support for container fields is not ideal at this point because of lack of Nullable* types}}
if o.{{name}} != nil { if o.{{name}} != nil {
toSerialize["{{baseName}}"] = o.{{name}} toSerialize["{{{baseName}}}"] = o.{{name}}
} }
{{/vendorExtensions.x-golang-is-container}} {{/vendorExtensions.x-golang-is-container}}
{{^vendorExtensions.x-golang-is-container}} {{^vendorExtensions.x-golang-is-container}}
{{#required}} {{#required}}
toSerialize["{{baseName}}"] = o.{{name}}.Get() toSerialize["{{{baseName}}}"] = o.{{name}}.Get()
{{/required}} {{/required}}
{{^required}} {{^required}}
if o.{{name}}.IsSet() { if o.{{name}}.IsSet() {
toSerialize["{{baseName}}"] = o.{{name}}.Get() toSerialize["{{{baseName}}}"] = o.{{name}}.Get()
} }
{{/required}} {{/required}}
{{/vendorExtensions.x-golang-is-container}} {{/vendorExtensions.x-golang-is-container}}
@ -312,11 +312,11 @@ func (o {{classname}}) ToMap() (map[string]interface{}, error) {
{{! if argument is not nullable, don't set it if it is nil}} {{! if argument is not nullable, don't set it if it is nil}}
{{^isNullable}} {{^isNullable}}
{{#required}} {{#required}}
toSerialize["{{baseName}}"] = o.{{name}} toSerialize["{{{baseName}}}"] = o.{{name}}
{{/required}} {{/required}}
{{^required}} {{^required}}
if !IsNil(o.{{name}}) { if !IsNil(o.{{name}}) {
toSerialize["{{baseName}}"] = o.{{name}} toSerialize["{{{baseName}}}"] = o.{{name}}
} }
{{/required}} {{/required}}
{{/isNullable}} {{/isNullable}}
@ -345,7 +345,7 @@ func (o *{{{classname}}}) UnmarshalJSON(bytes []byte) (err error) {
{{#deprecated}} {{#deprecated}}
// Deprecated // Deprecated
{{/deprecated}} {{/deprecated}}
{{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}}` {{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}}`
{{/vars}} {{/vars}}
} }