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

replace spaces with tabs in go client (#14189)

Browse Source
This commit is contained in:
William Cheng 2022-12-06 13:04:58 +08:00 committed by GitHub
parent 63629ad51c
commit 811e0de1be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 287 additions and 287 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -214,7 +214,7 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class
} }
{{/isCollectionFormatMulti}} {{/isCollectionFormatMulti}}
{{^isCollectionFormatMulti}} {{^isCollectionFormatMulti}}
parameterAddToQuery(localVarQueryParams, "{{baseName}}", r.{{paramName}}, "{{collectionFormat}}") parameterAddToQuery(localVarQueryParams, "{{baseName}}", r.{{paramName}}, "{{collectionFormat}}")
{{/isCollectionFormatMulti}} {{/isCollectionFormatMulti}}
} }
{{/required}} {{/required}}
@ -269,15 +269,15 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class
if {{paramName}}LocalVarFile != nil { if {{paramName}}LocalVarFile != nil {
fbs, _ := ioutil.ReadAll({{paramName}}LocalVarFile) fbs, _ := ioutil.ReadAll({{paramName}}LocalVarFile)
{{/required}} {{/required}}
{{#required}} {{#required}}
fbs, _ := ioutil.ReadAll({{paramName}}LocalVarFile) fbs, _ := ioutil.ReadAll({{paramName}}LocalVarFile)
{{/required}} {{/required}}
{{paramName}}LocalVarFileBytes = fbs {{paramName}}LocalVarFileBytes = fbs
{{paramName}}LocalVarFileName = {{paramName}}LocalVarFile.Name() {{paramName}}LocalVarFileName = {{paramName}}LocalVarFile.Name()
{{paramName}}LocalVarFile.Close() {{paramName}}LocalVarFile.Close()
{{^required}} {{^required}}
} }
{{/required}} {{/required}}
formFiles = append(formFiles, formFile{fileBytes: {{paramName}}LocalVarFileBytes, fileName: {{paramName}}LocalVarFileName, formFileName: {{paramName}}LocalVarFormFileName}) formFiles = append(formFiles, formFile{fileBytes: {{paramName}}LocalVarFileBytes, fileName: {{paramName}}LocalVarFileName, formFileName: {{paramName}}LocalVarFormFileName})
{{/isFile}} {{/isFile}}
{{^isFile}} {{^isFile}}
@ -390,8 +390,8 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class
newErr.error = err.Error() newErr.error = err.Error()
return {{#returnType}}localVarReturnValue, {{/returnType}}localVarHTTPResponse, newErr return {{#returnType}}localVarReturnValue, {{/returnType}}localVarHTTPResponse, newErr
} }
newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
newErr.model = v newErr.model = v
{{^-last}} {{^-last}}
return {{#returnType}}localVarReturnValue, {{/returnType}}localVarHTTPResponse, newErr return {{#returnType}}localVarReturnValue, {{/returnType}}localVarHTTPResponse, newErr
{{/-last}} {{/-last}}

126
modules/openapi-generator/src/main/resources/go/client.mustache vendored
View File

@ -36,8 +36,8 @@ import (
var ( var (
jsonCheck = regexp.MustCompile(`(?i:(?:application|text)/(?:vnd\.[^;]+\+)?json)`) jsonCheck = regexp.MustCompile(`(?i:(?:application|text)/(?:vnd\.[^;]+\+)?json)`)
xmlCheck = regexp.MustCompile(`(?i:(?:application|text)/xml)`) xmlCheck = regexp.MustCompile(`(?i:(?:application|text)/xml)`)
queryParamSplit = regexp.MustCompile(`(^|&)([^&]+)`) queryParamSplit = regexp.MustCompile(`(^|&)([^&]+)`)
queryDescape = strings.NewReplacer( "%5B", "[", "%5D", "]" ) queryDescape = strings.NewReplacer( "%5B", "[", "%5D", "]" )
) )
// APIClient manages communication with the {{appName}} API v{{version}} // APIClient manages communication with the {{appName}} API v{{version}}
@ -137,28 +137,28 @@ func typeCheckParameter(obj interface{}, expected string, name string) error {
} }
func parameterValueToString( obj interface{}, key string ) string { func parameterValueToString( obj interface{}, key string ) string {
if reflect.TypeOf(obj).Kind() != reflect.Ptr { if reflect.TypeOf(obj).Kind() != reflect.Ptr {
return fmt.Sprintf("%v", obj) return fmt.Sprintf("%v", obj)
} }
var param,ok = obj.(MappedNullable) var param,ok = obj.(MappedNullable)
if !ok { if !ok {
return "" return ""
} }
dataMap,err := param.ToMap() dataMap,err := param.ToMap()
if err != nil { if err != nil {
return "" return ""
} }
return fmt.Sprintf("%v", dataMap[key]) return fmt.Sprintf("%v", dataMap[key])
} }
// parameterAddToQuery adds the provided object to the url query supporting deep object syntax // parameterAddToQuery adds the provided object to the url query supporting deep object syntax
func parameterAddToQuery(queryParams interface{}, keyPrefix string, obj interface{}, collectionType string) { func parameterAddToQuery(queryParams interface{}, keyPrefix string, obj interface{}, collectionType string) {
var v = reflect.ValueOf(obj) var v = reflect.ValueOf(obj)
var value = "" var value = ""
if v == reflect.ValueOf(nil) { if v == reflect.ValueOf(nil) {
value = "null" value = "null"
} else { } else {
switch v.Kind() { switch v.Kind() {
case reflect.Invalid: case reflect.Invalid:
value = "invalid" value = "invalid"
@ -202,35 +202,35 @@ func parameterAddToQuery(queryParams interface{}, keyPrefix string, obj interfac
case reflect.Interface: case reflect.Interface:
fallthrough fallthrough
case reflect.Ptr: case reflect.Ptr:
parameterAddToQuery(queryParams, keyPrefix, v.Elem().Interface(), collectionType) parameterAddToQuery(queryParams, keyPrefix, v.Elem().Interface(), collectionType)
return return
case reflect.Int, reflect.Int8, reflect.Int16, case reflect.Int, reflect.Int8, reflect.Int16,
reflect.Int32, reflect.Int64: reflect.Int32, reflect.Int64:
value = strconv.FormatInt(v.Int(), 10) value = strconv.FormatInt(v.Int(), 10)
case reflect.Uint, reflect.Uint8, reflect.Uint16, case reflect.Uint, reflect.Uint8, reflect.Uint16,
reflect.Uint32, reflect.Uint64, reflect.Uintptr: reflect.Uint32, reflect.Uint64, reflect.Uintptr:
value = strconv.FormatUint(v.Uint(), 10) value = strconv.FormatUint(v.Uint(), 10)
case reflect.Float32, reflect.Float64: case reflect.Float32, reflect.Float64:
value = strconv.FormatFloat(v.Float(), 'g', -1, 32) value = strconv.FormatFloat(v.Float(), 'g', -1, 32)
case reflect.Bool: case reflect.Bool:
value = strconv.FormatBool(v.Bool()) value = strconv.FormatBool(v.Bool())
case reflect.String: case reflect.String:
value = v.String() value = v.String()
default: default:
value = v.Type().String() + " value" value = v.Type().String() + " value"
} }
} }
switch valuesMap := queryParams.(type) { switch valuesMap := queryParams.(type) {
case url.Values: case url.Values:
valuesMap.Add( keyPrefix, value ) valuesMap.Add( keyPrefix, value )
break break
case map[string]string: case map[string]string:
valuesMap[keyPrefix] = value valuesMap[keyPrefix] = value
break break
} }
} }
// helper for converting interface{} parameters to json strings // helper for converting interface{} parameters to json strings
@ -382,11 +382,11 @@ func (c *APIClient) prepareRequest(
} }
// Encode the parameters. // Encode the parameters.
url.RawQuery = queryParamSplit.ReplaceAllStringFunc(query.Encode(), func(s string) string { url.RawQuery = queryParamSplit.ReplaceAllStringFunc(query.Encode(), func(s string) string {
pieces := strings.Split(s, "=") pieces := strings.Split(s, "=")
pieces[0] = queryDescape.Replace(pieces[0]) pieces[0] = queryDescape.Replace(pieces[0])
return strings.Join(pieces, "=") return strings.Join(pieces, "=")
}) })
// Generate a new request // Generate a new request
if body != nil { if body != nil {
@ -508,19 +508,19 @@ func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err err
return nil return nil
} }
if f, ok := v.(*os.File); ok { if f, ok := v.(*os.File); ok {
f, err = ioutil.TempFile("", "HttpClientFile") f, err = ioutil.TempFile("", "HttpClientFile")
if err != nil { if err != nil {
return return
} }
_, err = f.Write(b) _, err = f.Write(b)
if err != nil { if err != nil {
return return
} }
_, err = f.Seek(0, io.SeekStart) _, err = f.Seek(0, io.SeekStart)
return return
} }
if f, ok := v.(**os.File); ok { if f, ok := v.(**os.File); ok {
*f, err = ioutil.TempFile("", "HttpClientFile") *f, err = ioutil.TempFile("", "HttpClientFile")
if err != nil { if err != nil {
return return
} }

14
samples/client/petstore/go/go-petstore/api_fake.go
View File

@ -1280,7 +1280,7 @@ func (a *FakeApiService) TestEndpointParametersExecute(r ApiTestEndpointParamete
binaryLocalVarFileBytes = fbs binaryLocalVarFileBytes = fbs
binaryLocalVarFileName = binaryLocalVarFile.Name() binaryLocalVarFileName = binaryLocalVarFile.Name()
binaryLocalVarFile.Close() binaryLocalVarFile.Close()
} }
formFiles = append(formFiles, formFile{fileBytes: binaryLocalVarFileBytes, fileName: binaryLocalVarFileName, formFileName: binaryLocalVarFormFileName}) formFiles = append(formFiles, formFile{fileBytes: binaryLocalVarFileBytes, fileName: binaryLocalVarFileName, formFileName: binaryLocalVarFormFileName})
if r.date != nil { if r.date != nil {
parameterAddToQuery(localVarFormParams, "date", r.date, "") parameterAddToQuery(localVarFormParams, "date", r.date, "")
@ -1422,16 +1422,16 @@ func (a *FakeApiService) TestEnumParametersExecute(r ApiTestEnumParametersReques
localVarFormParams := url.Values{} localVarFormParams := url.Values{}
if r.enumQueryStringArray != nil { if r.enumQueryStringArray != nil {
parameterAddToQuery(localVarQueryParams, "enum_query_string_array", r.enumQueryStringArray, "csv") parameterAddToQuery(localVarQueryParams, "enum_query_string_array", r.enumQueryStringArray, "csv")
} }
if r.enumQueryString != nil { if r.enumQueryString != nil {
parameterAddToQuery(localVarQueryParams, "enum_query_string", r.enumQueryString, "") parameterAddToQuery(localVarQueryParams, "enum_query_string", r.enumQueryString, "")
} }
if r.enumQueryInteger != nil { if r.enumQueryInteger != nil {
parameterAddToQuery(localVarQueryParams, "enum_query_integer", r.enumQueryInteger, "") parameterAddToQuery(localVarQueryParams, "enum_query_integer", r.enumQueryInteger, "")
} }
if r.enumQueryDouble != nil { if r.enumQueryDouble != nil {
parameterAddToQuery(localVarQueryParams, "enum_query_double", r.enumQueryDouble, "") parameterAddToQuery(localVarQueryParams, "enum_query_double", r.enumQueryDouble, "")
} }
// to determine the Content-Type header // to determine the Content-Type header
localVarHTTPContentTypes := []string{"application/x-www-form-urlencoded"} localVarHTTPContentTypes := []string{"application/x-www-form-urlencoded"}
@ -1587,10 +1587,10 @@ func (a *FakeApiService) TestGroupParametersExecute(r ApiTestGroupParametersRequ
parameterAddToQuery(localVarQueryParams, "required_string_group", r.requiredStringGroup, "") parameterAddToQuery(localVarQueryParams, "required_string_group", r.requiredStringGroup, "")
parameterAddToQuery(localVarQueryParams, "required_int64_group", r.requiredInt64Group, "") parameterAddToQuery(localVarQueryParams, "required_int64_group", r.requiredInt64Group, "")
if r.stringGroup != nil { if r.stringGroup != nil {
parameterAddToQuery(localVarQueryParams, "string_group", r.stringGroup, "") parameterAddToQuery(localVarQueryParams, "string_group", r.stringGroup, "")
} }
if r.int64Group != nil { if r.int64Group != nil {
parameterAddToQuery(localVarQueryParams, "int64_group", r.int64Group, "") parameterAddToQuery(localVarQueryParams, "int64_group", r.int64Group, "")
} }
// to determine the Content-Type header // to determine the Content-Type header
localVarHTTPContentTypes := []string{} localVarHTTPContentTypes := []string{}

4
samples/client/petstore/go/go-petstore/api_pet.go
View File

@ -986,7 +986,7 @@ func (a *PetApiService) UploadFileExecute(r ApiUploadFileRequest) (*ApiResponse,
fileLocalVarFileBytes = fbs fileLocalVarFileBytes = fbs
fileLocalVarFileName = fileLocalVarFile.Name() fileLocalVarFileName = fileLocalVarFile.Name()
fileLocalVarFile.Close() fileLocalVarFile.Close()
} }
formFiles = append(formFiles, formFile{fileBytes: fileLocalVarFileBytes, fileName: fileLocalVarFileName, formFileName: fileLocalVarFormFileName}) formFiles = append(formFiles, formFile{fileBytes: fileLocalVarFileBytes, fileName: fileLocalVarFileName, formFileName: fileLocalVarFormFileName})
req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles) req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
if err != nil { if err != nil {
@ -1116,7 +1116,7 @@ func (a *PetApiService) UploadFileWithRequiredFileExecute(r ApiUploadFileWithReq
requiredFileLocalVarFormFileName = "requiredFile" requiredFileLocalVarFormFileName = "requiredFile"
requiredFileLocalVarFile := r.requiredFile requiredFileLocalVarFile := r.requiredFile
fbs, _ := ioutil.ReadAll(requiredFileLocalVarFile) fbs, _ := ioutil.ReadAll(requiredFileLocalVarFile)
requiredFileLocalVarFileBytes = fbs requiredFileLocalVarFileBytes = fbs
requiredFileLocalVarFileName = requiredFileLocalVarFile.Name() requiredFileLocalVarFileName = requiredFileLocalVarFile.Name()
requiredFileLocalVarFile.Close() requiredFileLocalVarFile.Close()

126
samples/client/petstore/go/go-petstore/client.go
View File

@ -39,8 +39,8 @@ import (
var ( var (
jsonCheck = regexp.MustCompile(`(?i:(?:application|text)/(?:vnd\.[^;]+\+)?json)`) jsonCheck = regexp.MustCompile(`(?i:(?:application|text)/(?:vnd\.[^;]+\+)?json)`)
xmlCheck = regexp.MustCompile(`(?i:(?:application|text)/xml)`) xmlCheck = regexp.MustCompile(`(?i:(?:application|text)/xml)`)
queryParamSplit = regexp.MustCompile(`(^|&)([^&]+)`) queryParamSplit = regexp.MustCompile(`(^|&)([^&]+)`)
queryDescape = strings.NewReplacer( "%5B", "[", "%5D", "]" ) queryDescape = strings.NewReplacer( "%5B", "[", "%5D", "]" )
) )
// APIClient manages communication with the OpenAPI Petstore API v1.0.0 // APIClient manages communication with the OpenAPI Petstore API v1.0.0
@ -143,28 +143,28 @@ func typeCheckParameter(obj interface{}, expected string, name string) error {
} }
func parameterValueToString( obj interface{}, key string ) string { func parameterValueToString( obj interface{}, key string ) string {
if reflect.TypeOf(obj).Kind() != reflect.Ptr { if reflect.TypeOf(obj).Kind() != reflect.Ptr {
return fmt.Sprintf("%v", obj) return fmt.Sprintf("%v", obj)
} }
var param,ok = obj.(MappedNullable) var param,ok = obj.(MappedNullable)
if !ok { if !ok {
return "" return ""
} }
dataMap,err := param.ToMap() dataMap,err := param.ToMap()
if err != nil { if err != nil {
return "" return ""
} }
return fmt.Sprintf("%v", dataMap[key]) return fmt.Sprintf("%v", dataMap[key])
} }
// parameterAddToQuery adds the provided object to the url query supporting deep object syntax // parameterAddToQuery adds the provided object to the url query supporting deep object syntax
func parameterAddToQuery(queryParams interface{}, keyPrefix string, obj interface{}, collectionType string) { func parameterAddToQuery(queryParams interface{}, keyPrefix string, obj interface{}, collectionType string) {
var v = reflect.ValueOf(obj) var v = reflect.ValueOf(obj)
var value = "" var value = ""
if v == reflect.ValueOf(nil) { if v == reflect.ValueOf(nil) {
value = "null" value = "null"
} else { } else {
switch v.Kind() { switch v.Kind() {
case reflect.Invalid: case reflect.Invalid:
value = "invalid" value = "invalid"
@ -208,35 +208,35 @@ func parameterAddToQuery(queryParams interface{}, keyPrefix string, obj interfac
case reflect.Interface: case reflect.Interface:
fallthrough fallthrough
case reflect.Ptr: case reflect.Ptr:
parameterAddToQuery(queryParams, keyPrefix, v.Elem().Interface(), collectionType) parameterAddToQuery(queryParams, keyPrefix, v.Elem().Interface(), collectionType)
return return
case reflect.Int, reflect.Int8, reflect.Int16, case reflect.Int, reflect.Int8, reflect.Int16,
reflect.Int32, reflect.Int64: reflect.Int32, reflect.Int64:
value = strconv.FormatInt(v.Int(), 10) value = strconv.FormatInt(v.Int(), 10)
case reflect.Uint, reflect.Uint8, reflect.Uint16, case reflect.Uint, reflect.Uint8, reflect.Uint16,
reflect.Uint32, reflect.Uint64, reflect.Uintptr: reflect.Uint32, reflect.Uint64, reflect.Uintptr:
value = strconv.FormatUint(v.Uint(), 10) value = strconv.FormatUint(v.Uint(), 10)
case reflect.Float32, reflect.Float64: case reflect.Float32, reflect.Float64:
value = strconv.FormatFloat(v.Float(), 'g', -1, 32) value = strconv.FormatFloat(v.Float(), 'g', -1, 32)
case reflect.Bool: case reflect.Bool:
value = strconv.FormatBool(v.Bool()) value = strconv.FormatBool(v.Bool())
case reflect.String: case reflect.String:
value = v.String() value = v.String()
default: default:
value = v.Type().String() + " value" value = v.Type().String() + " value"
} }
} }
switch valuesMap := queryParams.(type) { switch valuesMap := queryParams.(type) {
case url.Values: case url.Values:
valuesMap.Add( keyPrefix, value ) valuesMap.Add( keyPrefix, value )
break break
case map[string]string: case map[string]string:
valuesMap[keyPrefix] = value valuesMap[keyPrefix] = value
break break
} }
} }
// helper for converting interface{} parameters to json strings // helper for converting interface{} parameters to json strings
@ -388,11 +388,11 @@ func (c *APIClient) prepareRequest(
} }
// Encode the parameters. // Encode the parameters.
url.RawQuery = queryParamSplit.ReplaceAllStringFunc(query.Encode(), func(s string) string { url.RawQuery = queryParamSplit.ReplaceAllStringFunc(query.Encode(), func(s string) string {
pieces := strings.Split(s, "=") pieces := strings.Split(s, "=")
pieces[0] = queryDescape.Replace(pieces[0]) pieces[0] = queryDescape.Replace(pieces[0])
return strings.Join(pieces, "=") return strings.Join(pieces, "=")
}) })
// Generate a new request // Generate a new request
if body != nil { if body != nil {
@ -455,19 +455,19 @@ func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err err
return nil return nil
} }
if f, ok := v.(*os.File); ok { if f, ok := v.(*os.File); ok {
f, err = ioutil.TempFile("", "HttpClientFile") f, err = ioutil.TempFile("", "HttpClientFile")
if err != nil { if err != nil {
return return
} }
_, err = f.Write(b) _, err = f.Write(b)
if err != nil { if err != nil {
return return
} }
_, err = f.Seek(0, io.SeekStart) _, err = f.Seek(0, io.SeekStart)
return return
} }
if f, ok := v.(**os.File); ok { if f, ok := v.(**os.File); ok {
*f, err = ioutil.TempFile("", "HttpClientFile") *f, err = ioutil.TempFile("", "HttpClientFile")
if err != nil { if err != nil {
return return
} }

126
samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/client.go
View File

@ -38,8 +38,8 @@ import (
var ( var (
jsonCheck = regexp.MustCompile(`(?i:(?:application|text)/(?:vnd\.[^;]+\+)?json)`) jsonCheck = regexp.MustCompile(`(?i:(?:application|text)/(?:vnd\.[^;]+\+)?json)`)
xmlCheck = regexp.MustCompile(`(?i:(?:application|text)/xml)`) xmlCheck = regexp.MustCompile(`(?i:(?:application|text)/xml)`)
queryParamSplit = regexp.MustCompile(`(^|&)([^&]+)`) queryParamSplit = regexp.MustCompile(`(^|&)([^&]+)`)
queryDescape = strings.NewReplacer( "%5B", "[", "%5D", "]" ) queryDescape = strings.NewReplacer( "%5B", "[", "%5D", "]" )
) )
// APIClient manages communication with the OpenAPI Extension x-auth-id-alias API v1.0.0 // APIClient manages communication with the OpenAPI Extension x-auth-id-alias API v1.0.0
@ -127,28 +127,28 @@ func typeCheckParameter(obj interface{}, expected string, name string) error {
} }
func parameterValueToString( obj interface{}, key string ) string { func parameterValueToString( obj interface{}, key string ) string {
if reflect.TypeOf(obj).Kind() != reflect.Ptr { if reflect.TypeOf(obj).Kind() != reflect.Ptr {
return fmt.Sprintf("%v", obj) return fmt.Sprintf("%v", obj)
} }
var param,ok = obj.(MappedNullable) var param,ok = obj.(MappedNullable)
if !ok { if !ok {
return "" return ""
} }
dataMap,err := param.ToMap() dataMap,err := param.ToMap()
if err != nil { if err != nil {
return "" return ""
} }
return fmt.Sprintf("%v", dataMap[key]) return fmt.Sprintf("%v", dataMap[key])
} }
// parameterAddToQuery adds the provided object to the url query supporting deep object syntax // parameterAddToQuery adds the provided object to the url query supporting deep object syntax
func parameterAddToQuery(queryParams interface{}, keyPrefix string, obj interface{}, collectionType string) { func parameterAddToQuery(queryParams interface{}, keyPrefix string, obj interface{}, collectionType string) {
var v = reflect.ValueOf(obj) var v = reflect.ValueOf(obj)
var value = "" var value = ""
if v == reflect.ValueOf(nil) { if v == reflect.ValueOf(nil) {
value = "null" value = "null"
} else { } else {
switch v.Kind() { switch v.Kind() {
case reflect.Invalid: case reflect.Invalid:
value = "invalid" value = "invalid"
@ -192,35 +192,35 @@ func parameterAddToQuery(queryParams interface{}, keyPrefix string, obj interfac
case reflect.Interface: case reflect.Interface:
fallthrough fallthrough
case reflect.Ptr: case reflect.Ptr:
parameterAddToQuery(queryParams, keyPrefix, v.Elem().Interface(), collectionType) parameterAddToQuery(queryParams, keyPrefix, v.Elem().Interface(), collectionType)
return return
case reflect.Int, reflect.Int8, reflect.Int16, case reflect.Int, reflect.Int8, reflect.Int16,
reflect.Int32, reflect.Int64: reflect.Int32, reflect.Int64:
value = strconv.FormatInt(v.Int(), 10) value = strconv.FormatInt(v.Int(), 10)
case reflect.Uint, reflect.Uint8, reflect.Uint16, case reflect.Uint, reflect.Uint8, reflect.Uint16,
reflect.Uint32, reflect.Uint64, reflect.Uintptr: reflect.Uint32, reflect.Uint64, reflect.Uintptr:
value = strconv.FormatUint(v.Uint(), 10) value = strconv.FormatUint(v.Uint(), 10)
case reflect.Float32, reflect.Float64: case reflect.Float32, reflect.Float64:
value = strconv.FormatFloat(v.Float(), 'g', -1, 32) value = strconv.FormatFloat(v.Float(), 'g', -1, 32)
case reflect.Bool: case reflect.Bool:
value = strconv.FormatBool(v.Bool()) value = strconv.FormatBool(v.Bool())
case reflect.String: case reflect.String:
value = v.String() value = v.String()
default: default:
value = v.Type().String() + " value" value = v.Type().String() + " value"
} }
} }
switch valuesMap := queryParams.(type) { switch valuesMap := queryParams.(type) {
case url.Values: case url.Values:
valuesMap.Add( keyPrefix, value ) valuesMap.Add( keyPrefix, value )
break break
case map[string]string: case map[string]string:
valuesMap[keyPrefix] = value valuesMap[keyPrefix] = value
break break
} }
} }
// helper for converting interface{} parameters to json strings // helper for converting interface{} parameters to json strings
@ -372,11 +372,11 @@ func (c *APIClient) prepareRequest(
} }
// Encode the parameters. // Encode the parameters.
url.RawQuery = queryParamSplit.ReplaceAllStringFunc(query.Encode(), func(s string) string { url.RawQuery = queryParamSplit.ReplaceAllStringFunc(query.Encode(), func(s string) string {
pieces := strings.Split(s, "=") pieces := strings.Split(s, "=")
pieces[0] = queryDescape.Replace(pieces[0]) pieces[0] = queryDescape.Replace(pieces[0])
return strings.Join(pieces, "=") return strings.Join(pieces, "=")
}) })
// Generate a new request // Generate a new request
if body != nil { if body != nil {
@ -423,19 +423,19 @@ func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err err
return nil return nil
} }
if f, ok := v.(*os.File); ok { if f, ok := v.(*os.File); ok {
f, err = ioutil.TempFile("", "HttpClientFile") f, err = ioutil.TempFile("", "HttpClientFile")
if err != nil { if err != nil {
return return
} }
_, err = f.Write(b) _, err = f.Write(b)
if err != nil { if err != nil {
return return
} }
_, err = f.Seek(0, io.SeekStart) _, err = f.Seek(0, io.SeekStart)
return return
} }
if f, ok := v.(**os.File); ok { if f, ok := v.(**os.File); ok {
*f, err = ioutil.TempFile("", "HttpClientFile") *f, err = ioutil.TempFile("", "HttpClientFile")
if err != nil { if err != nil {
return return
} }

12
samples/openapi3/client/petstore/go/go-petstore/api_default.go
View File

@ -126,8 +126,8 @@ func (a *DefaultApiService) FooGetExecute(r ApiFooGetRequest) (*FooGetDefaultRes
newErr.error = err.Error() newErr.error = err.Error()
return localVarReturnValue, localVarHTTPResponse, newErr return localVarReturnValue, localVarHTTPResponse, newErr
} }
newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
newErr.model = v newErr.model = v
return localVarReturnValue, localVarHTTPResponse, newErr return localVarReturnValue, localVarHTTPResponse, newErr
} }
if localVarHTTPResponse.StatusCode >= 400 && localVarHTTPResponse.StatusCode < 500 { if localVarHTTPResponse.StatusCode >= 400 && localVarHTTPResponse.StatusCode < 500 {
@ -137,8 +137,8 @@ func (a *DefaultApiService) FooGetExecute(r ApiFooGetRequest) (*FooGetDefaultRes
newErr.error = err.Error() newErr.error = err.Error()
return localVarReturnValue, localVarHTTPResponse, newErr return localVarReturnValue, localVarHTTPResponse, newErr
} }
newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
newErr.model = v newErr.model = v
return localVarReturnValue, localVarHTTPResponse, newErr return localVarReturnValue, localVarHTTPResponse, newErr
} }
var v FooGetDefaultResponse var v FooGetDefaultResponse
@ -147,8 +147,8 @@ func (a *DefaultApiService) FooGetExecute(r ApiFooGetRequest) (*FooGetDefaultRes
newErr.error = err.Error() newErr.error = err.Error()
return localVarReturnValue, localVarHTTPResponse, newErr return localVarReturnValue, localVarHTTPResponse, newErr
} }
newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
newErr.model = v newErr.model = v
return localVarReturnValue, localVarHTTPResponse, newErr return localVarReturnValue, localVarHTTPResponse, newErr
} }

20
samples/openapi3/client/petstore/go/go-petstore/api_fake.go
View File

@ -1307,7 +1307,7 @@ func (a *FakeApiService) TestEndpointParametersExecute(r ApiTestEndpointParamete
binaryLocalVarFileBytes = fbs binaryLocalVarFileBytes = fbs
binaryLocalVarFileName = binaryLocalVarFile.Name() binaryLocalVarFileName = binaryLocalVarFile.Name()
binaryLocalVarFile.Close() binaryLocalVarFile.Close()
} }
formFiles = append(formFiles, formFile{fileBytes: binaryLocalVarFileBytes, fileName: binaryLocalVarFileName, formFileName: binaryLocalVarFormFileName}) formFiles = append(formFiles, formFile{fileBytes: binaryLocalVarFileBytes, fileName: binaryLocalVarFileName, formFileName: binaryLocalVarFormFileName})
if r.date != nil { if r.date != nil {
parameterAddToQuery(localVarFormParams, "date", r.date, "") parameterAddToQuery(localVarFormParams, "date", r.date, "")
@ -1460,13 +1460,13 @@ func (a *FakeApiService) TestEnumParametersExecute(r ApiTestEnumParametersReques
} }
} }
if r.enumQueryString != nil { if r.enumQueryString != nil {
parameterAddToQuery(localVarQueryParams, "enum_query_string", r.enumQueryString, "") parameterAddToQuery(localVarQueryParams, "enum_query_string", r.enumQueryString, "")
} }
if r.enumQueryInteger != nil { if r.enumQueryInteger != nil {
parameterAddToQuery(localVarQueryParams, "enum_query_integer", r.enumQueryInteger, "") parameterAddToQuery(localVarQueryParams, "enum_query_integer", r.enumQueryInteger, "")
} }
if r.enumQueryDouble != nil { if r.enumQueryDouble != nil {
parameterAddToQuery(localVarQueryParams, "enum_query_double", r.enumQueryDouble, "") parameterAddToQuery(localVarQueryParams, "enum_query_double", r.enumQueryDouble, "")
} }
// to determine the Content-Type header // to determine the Content-Type header
localVarHTTPContentTypes := []string{"application/x-www-form-urlencoded"} localVarHTTPContentTypes := []string{"application/x-www-form-urlencoded"}
@ -1622,10 +1622,10 @@ func (a *FakeApiService) TestGroupParametersExecute(r ApiTestGroupParametersRequ
parameterAddToQuery(localVarQueryParams, "required_string_group", r.requiredStringGroup, "") parameterAddToQuery(localVarQueryParams, "required_string_group", r.requiredStringGroup, "")
parameterAddToQuery(localVarQueryParams, "required_int64_group", r.requiredInt64Group, "") parameterAddToQuery(localVarQueryParams, "required_int64_group", r.requiredInt64Group, "")
if r.stringGroup != nil { if r.stringGroup != nil {
parameterAddToQuery(localVarQueryParams, "string_group", r.stringGroup, "") parameterAddToQuery(localVarQueryParams, "string_group", r.stringGroup, "")
} }
if r.int64Group != nil { if r.int64Group != nil {
parameterAddToQuery(localVarQueryParams, "int64_group", r.int64Group, "") parameterAddToQuery(localVarQueryParams, "int64_group", r.int64Group, "")
} }
// to determine the Content-Type header // to determine the Content-Type header
localVarHTTPContentTypes := []string{} localVarHTTPContentTypes := []string{}
@ -1677,8 +1677,8 @@ func (a *FakeApiService) TestGroupParametersExecute(r ApiTestGroupParametersRequ
newErr.error = err.Error() newErr.error = err.Error()
return localVarHTTPResponse, newErr return localVarHTTPResponse, newErr
} }
newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v) newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
newErr.model = v newErr.model = v
} }
return localVarHTTPResponse, newErr return localVarHTTPResponse, newErr
} }
@ -1950,10 +1950,10 @@ func (a *FakeApiService) TestQueryDeepObjectExecute(r ApiTestQueryDeepObjectRequ
localVarFormParams := url.Values{} localVarFormParams := url.Values{}
if r.testPet != nil { if r.testPet != nil {
parameterAddToQuery(localVarQueryParams, "test_pet", r.testPet, "") parameterAddToQuery(localVarQueryParams, "test_pet", r.testPet, "")
} }
if r.inputOptions != nil { if r.inputOptions != nil {
parameterAddToQuery(localVarQueryParams, "inputOptions", r.inputOptions, "") parameterAddToQuery(localVarQueryParams, "inputOptions", r.inputOptions, "")
} }
// to determine the Content-Type header // to determine the Content-Type header
localVarHTTPContentTypes := []string{} localVarHTTPContentTypes := []string{}

4
samples/openapi3/client/petstore/go/go-petstore/api_pet.go
View File

@ -1009,7 +1009,7 @@ func (a *PetApiService) UploadFileExecute(r ApiUploadFileRequest) (*ApiResponse,
fileLocalVarFileBytes = fbs fileLocalVarFileBytes = fbs
fileLocalVarFileName = fileLocalVarFile.Name() fileLocalVarFileName = fileLocalVarFile.Name()
fileLocalVarFile.Close() fileLocalVarFile.Close()
} }
formFiles = append(formFiles, formFile{fileBytes: fileLocalVarFileBytes, fileName: fileLocalVarFileName, formFileName: fileLocalVarFormFileName}) formFiles = append(formFiles, formFile{fileBytes: fileLocalVarFileBytes, fileName: fileLocalVarFileName, formFileName: fileLocalVarFormFileName})
req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles) req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
if err != nil { if err != nil {
@ -1141,7 +1141,7 @@ func (a *PetApiService) UploadFileWithRequiredFileExecute(r ApiUploadFileWithReq
requiredFileLocalVarFormFileName = "requiredFile" requiredFileLocalVarFormFileName = "requiredFile"
requiredFileLocalVarFile := r.requiredFile requiredFileLocalVarFile := r.requiredFile
fbs, _ := ioutil.ReadAll(requiredFileLocalVarFile) fbs, _ := ioutil.ReadAll(requiredFileLocalVarFile)
requiredFileLocalVarFileBytes = fbs requiredFileLocalVarFileBytes = fbs
requiredFileLocalVarFileName = requiredFileLocalVarFile.Name() requiredFileLocalVarFileName = requiredFileLocalVarFile.Name()
requiredFileLocalVarFile.Close() requiredFileLocalVarFile.Close()

126
samples/openapi3/client/petstore/go/go-petstore/client.go
View File

@ -39,8 +39,8 @@ import (
var ( var (
jsonCheck = regexp.MustCompile(`(?i:(?:application|text)/(?:vnd\.[^;]+\+)?json)`) jsonCheck = regexp.MustCompile(`(?i:(?:application|text)/(?:vnd\.[^;]+\+)?json)`)
xmlCheck = regexp.MustCompile(`(?i:(?:application|text)/xml)`) xmlCheck = regexp.MustCompile(`(?i:(?:application|text)/xml)`)
queryParamSplit = regexp.MustCompile(`(^|&)([^&]+)`) queryParamSplit = regexp.MustCompile(`(^|&)([^&]+)`)
queryDescape = strings.NewReplacer( "%5B", "[", "%5D", "]" ) queryDescape = strings.NewReplacer( "%5B", "[", "%5D", "]" )
) )
// APIClient manages communication with the OpenAPI Petstore API v1.0.0 // APIClient manages communication with the OpenAPI Petstore API v1.0.0
@ -146,28 +146,28 @@ func typeCheckParameter(obj interface{}, expected string, name string) error {
} }
func parameterValueToString( obj interface{}, key string ) string { func parameterValueToString( obj interface{}, key string ) string {
if reflect.TypeOf(obj).Kind() != reflect.Ptr { if reflect.TypeOf(obj).Kind() != reflect.Ptr {
return fmt.Sprintf("%v", obj) return fmt.Sprintf("%v", obj)
} }
var param,ok = obj.(MappedNullable) var param,ok = obj.(MappedNullable)
if !ok { if !ok {
return "" return ""
} }
dataMap,err := param.ToMap() dataMap,err := param.ToMap()
if err != nil { if err != nil {
return "" return ""
} }
return fmt.Sprintf("%v", dataMap[key]) return fmt.Sprintf("%v", dataMap[key])
} }
// parameterAddToQuery adds the provided object to the url query supporting deep object syntax // parameterAddToQuery adds the provided object to the url query supporting deep object syntax
func parameterAddToQuery(queryParams interface{}, keyPrefix string, obj interface{}, collectionType string) { func parameterAddToQuery(queryParams interface{}, keyPrefix string, obj interface{}, collectionType string) {
var v = reflect.ValueOf(obj) var v = reflect.ValueOf(obj)
var value = "" var value = ""
if v == reflect.ValueOf(nil) { if v == reflect.ValueOf(nil) {
value = "null" value = "null"
} else { } else {
switch v.Kind() { switch v.Kind() {
case reflect.Invalid: case reflect.Invalid:
value = "invalid" value = "invalid"
@ -211,35 +211,35 @@ func parameterAddToQuery(queryParams interface{}, keyPrefix string, obj interfac
case reflect.Interface: case reflect.Interface:
fallthrough fallthrough
case reflect.Ptr: case reflect.Ptr:
parameterAddToQuery(queryParams, keyPrefix, v.Elem().Interface(), collectionType) parameterAddToQuery(queryParams, keyPrefix, v.Elem().Interface(), collectionType)
return return
case reflect.Int, reflect.Int8, reflect.Int16, case reflect.Int, reflect.Int8, reflect.Int16,
reflect.Int32, reflect.Int64: reflect.Int32, reflect.Int64:
value = strconv.FormatInt(v.Int(), 10) value = strconv.FormatInt(v.Int(), 10)
case reflect.Uint, reflect.Uint8, reflect.Uint16, case reflect.Uint, reflect.Uint8, reflect.Uint16,
reflect.Uint32, reflect.Uint64, reflect.Uintptr: reflect.Uint32, reflect.Uint64, reflect.Uintptr:
value = strconv.FormatUint(v.Uint(), 10) value = strconv.FormatUint(v.Uint(), 10)
case reflect.Float32, reflect.Float64: case reflect.Float32, reflect.Float64:
value = strconv.FormatFloat(v.Float(), 'g', -1, 32) value = strconv.FormatFloat(v.Float(), 'g', -1, 32)
case reflect.Bool: case reflect.Bool:
value = strconv.FormatBool(v.Bool()) value = strconv.FormatBool(v.Bool())
case reflect.String: case reflect.String:
value = v.String() value = v.String()
default: default:
value = v.Type().String() + " value" value = v.Type().String() + " value"
} }
} }
switch valuesMap := queryParams.(type) { switch valuesMap := queryParams.(type) {
case url.Values: case url.Values:
valuesMap.Add( keyPrefix, value ) valuesMap.Add( keyPrefix, value )
break break
case map[string]string: case map[string]string:
valuesMap[keyPrefix] = value valuesMap[keyPrefix] = value
break break
} }
} }
// helper for converting interface{} parameters to json strings // helper for converting interface{} parameters to json strings
@ -391,11 +391,11 @@ func (c *APIClient) prepareRequest(
} }
// Encode the parameters. // Encode the parameters.
url.RawQuery = queryParamSplit.ReplaceAllStringFunc(query.Encode(), func(s string) string { url.RawQuery = queryParamSplit.ReplaceAllStringFunc(query.Encode(), func(s string) string {
pieces := strings.Split(s, "=") pieces := strings.Split(s, "=")
pieces[0] = queryDescape.Replace(pieces[0]) pieces[0] = queryDescape.Replace(pieces[0])
return strings.Join(pieces, "=") return strings.Join(pieces, "=")
}) })
// Generate a new request // Generate a new request
if body != nil { if body != nil {
@ -473,19 +473,19 @@ func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err err
return nil return nil
} }
if f, ok := v.(*os.File); ok { if f, ok := v.(*os.File); ok {
f, err = ioutil.TempFile("", "HttpClientFile") f, err = ioutil.TempFile("", "HttpClientFile")
if err != nil { if err != nil {
return return
} }
_, err = f.Write(b) _, err = f.Write(b)
if err != nil { if err != nil {
return return
} }
_, err = f.Seek(0, io.SeekStart) _, err = f.Seek(0, io.SeekStart)
return return
} }
if f, ok := v.(**os.File); ok { if f, ok := v.(**os.File); ok {
*f, err = ioutil.TempFile("", "HttpClientFile") *f, err = ioutil.TempFile("", "HttpClientFile")
if err != nil { if err != nil {
return return
} }