diff --git a/modules/openapi-generator/src/main/resources/go/api.mustache b/modules/openapi-generator/src/main/resources/go/api.mustache
index d66cd939d3e..a13c1a56a59 100644
--- a/modules/openapi-generator/src/main/resources/go/api.mustache
+++ b/modules/openapi-generator/src/main/resources/go/api.mustache
@@ -214,7 +214,7 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class
 		}
 	{{/isCollectionFormatMulti}}
 	{{^isCollectionFormatMulti}}
-	    parameterAddToQuery(localVarQueryParams, "{{baseName}}", r.{{paramName}}, "{{collectionFormat}}")
+		parameterAddToQuery(localVarQueryParams, "{{baseName}}", r.{{paramName}}, "{{collectionFormat}}")
 	{{/isCollectionFormatMulti}}
 	}
 	{{/required}}
@@ -269,15 +269,15 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class
 	if {{paramName}}LocalVarFile != nil {
 		fbs, _ := ioutil.ReadAll({{paramName}}LocalVarFile)
 		{{/required}}
-        {{#required}}
-        		fbs, _ := ioutil.ReadAll({{paramName}}LocalVarFile)
-        {{/required}}
+		{{#required}}
+				fbs, _ := ioutil.ReadAll({{paramName}}LocalVarFile)
+		{{/required}}
 		{{paramName}}LocalVarFileBytes = fbs
 		{{paramName}}LocalVarFileName = {{paramName}}LocalVarFile.Name()
 		{{paramName}}LocalVarFile.Close()
 	{{^required}}
-    }
-    {{/required}}
+	}
+	{{/required}}
 	formFiles = append(formFiles, formFile{fileBytes: {{paramName}}LocalVarFileBytes, fileName: {{paramName}}LocalVarFileName, formFileName: {{paramName}}LocalVarFormFileName})
 {{/isFile}}
 {{^isFile}}
@@ -390,8 +390,8 @@ func (a *{{{classname}}}Service) {{nickname}}Execute(r {{#structPrefix}}{{&class
 				newErr.error = err.Error()
 				return {{#returnType}}localVarReturnValue, {{/returnType}}localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+					newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
+					newErr.model = v
 			{{^-last}}
 			return {{#returnType}}localVarReturnValue, {{/returnType}}localVarHTTPResponse, newErr
 			{{/-last}}
diff --git a/modules/openapi-generator/src/main/resources/go/client.mustache b/modules/openapi-generator/src/main/resources/go/client.mustache
index 3d3bfe8e863..49fbd071ff0 100644
--- a/modules/openapi-generator/src/main/resources/go/client.mustache
+++ b/modules/openapi-generator/src/main/resources/go/client.mustache
@@ -36,8 +36,8 @@ import (
 var (
 	jsonCheck = regexp.MustCompile(`(?i:(?:application|text)/(?:vnd\.[^;]+\+)?json)`)
 	xmlCheck  = regexp.MustCompile(`(?i:(?:application|text)/xml)`)
-    queryParamSplit = regexp.MustCompile(`(^|&)([^&]+)`)
-    queryDescape    = strings.NewReplacer( "%5B", "[", "%5D", "]" )
+	queryParamSplit = regexp.MustCompile(`(^|&)([^&]+)`)
+	queryDescape    = strings.NewReplacer( "%5B", "[", "%5D", "]" )
 )
 
 // 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 {
-    if reflect.TypeOf(obj).Kind() != reflect.Ptr {
-        return fmt.Sprintf("%v", obj)
-    }
-    var param,ok = obj.(MappedNullable)
-    if !ok {
-        return ""
-    }
-    dataMap,err := param.ToMap()
-    if err != nil {
-        return ""
-    }
-    return fmt.Sprintf("%v", dataMap[key])
+	if reflect.TypeOf(obj).Kind() != reflect.Ptr {
+		return fmt.Sprintf("%v", obj)
+	}
+	var param,ok = obj.(MappedNullable)
+	if !ok {
+		return ""
+	}
+	dataMap,err := param.ToMap()
+	if err != nil {
+		return ""
+	}
+	return fmt.Sprintf("%v", dataMap[key])
 }
 
 // parameterAddToQuery adds the provided object to the url query supporting deep object syntax
 func parameterAddToQuery(queryParams interface{}, keyPrefix string, obj interface{}, collectionType string) {
-    var v = reflect.ValueOf(obj)
-    var value = ""
-    if v == reflect.ValueOf(nil) {
-        value = "null"
-    } else {
-        switch v.Kind() {
+	var v = reflect.ValueOf(obj)
+	var value = ""
+	if v == reflect.ValueOf(nil) {
+		value = "null"
+	} else {
+		switch v.Kind() {
 			case reflect.Invalid:
 				value = "invalid"
 
@@ -202,35 +202,35 @@ func parameterAddToQuery(queryParams interface{}, keyPrefix string, obj interfac
 
 			case reflect.Interface:
 				fallthrough
-            case reflect.Ptr:
+			case reflect.Ptr:
 				parameterAddToQuery(queryParams, keyPrefix, v.Elem().Interface(), collectionType)
-                return
+				return
 
-            case reflect.Int, reflect.Int8, reflect.Int16,
-                reflect.Int32, reflect.Int64:
-                value = strconv.FormatInt(v.Int(), 10)
-            case reflect.Uint, reflect.Uint8, reflect.Uint16,
-                reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-                value = strconv.FormatUint(v.Uint(), 10)
-            case reflect.Float32, reflect.Float64:
-                value = strconv.FormatFloat(v.Float(), 'g', -1, 32)
-            case reflect.Bool:
-                value = strconv.FormatBool(v.Bool())
-            case reflect.String:
-                value = v.String()
-            default:
-                value = v.Type().String() + " value"
-        }
-    }
+			case reflect.Int, reflect.Int8, reflect.Int16,
+				reflect.Int32, reflect.Int64:
+				value = strconv.FormatInt(v.Int(), 10)
+			case reflect.Uint, reflect.Uint8, reflect.Uint16,
+				reflect.Uint32, reflect.Uint64, reflect.Uintptr:
+				value = strconv.FormatUint(v.Uint(), 10)
+			case reflect.Float32, reflect.Float64:
+				value = strconv.FormatFloat(v.Float(), 'g', -1, 32)
+			case reflect.Bool:
+				value = strconv.FormatBool(v.Bool())
+			case reflect.String:
+				value = v.String()
+			default:
+				value = v.Type().String() + " value"
+		}
+	}
 
-    switch valuesMap := queryParams.(type) {
-        case url.Values:
-            valuesMap.Add( keyPrefix, value )
-            break
-        case map[string]string:
-            valuesMap[keyPrefix] = value
-            break
-    }
+	switch valuesMap := queryParams.(type) {
+		case url.Values:
+			valuesMap.Add( keyPrefix, value )
+			break
+		case map[string]string:
+			valuesMap[keyPrefix] = value
+			break
+	}
 }
 
 // helper for converting interface{} parameters to json strings
@@ -382,11 +382,11 @@ func (c *APIClient) prepareRequest(
 	}
 
 	// Encode the parameters.
-    url.RawQuery = queryParamSplit.ReplaceAllStringFunc(query.Encode(), func(s string) string {
-        pieces := strings.Split(s, "=")
-        pieces[0] = queryDescape.Replace(pieces[0])
-        return strings.Join(pieces, "=")
-    })
+	url.RawQuery = queryParamSplit.ReplaceAllStringFunc(query.Encode(), func(s string) string {
+		pieces := strings.Split(s, "=")
+		pieces[0] = queryDescape.Replace(pieces[0])
+		return strings.Join(pieces, "=")
+	})
 
 	// Generate a new request
 	if body != nil {
@@ -508,19 +508,19 @@ func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err err
 		return nil
 	}
 	if f, ok := v.(*os.File); ok {
-        f, err = ioutil.TempFile("", "HttpClientFile")
-        if err != nil {
-            return
-        }
-        _, err = f.Write(b)
-        if err != nil {
-            return
-        }
-        _, err = f.Seek(0, io.SeekStart)
-        return
-    }
+		f, err = ioutil.TempFile("", "HttpClientFile")
+		if err != nil {
+			return
+		}
+		_, err = f.Write(b)
+		if err != nil {
+			return
+		}
+		_, err = f.Seek(0, io.SeekStart)
+		return
+	}
 	if f, ok := v.(**os.File); ok {
-        *f, err = ioutil.TempFile("", "HttpClientFile")
+		*f, err = ioutil.TempFile("", "HttpClientFile")
 		if err != nil {
 			return
 		}
diff --git a/samples/client/petstore/go/go-petstore/api_fake.go b/samples/client/petstore/go/go-petstore/api_fake.go
index 2132d4dba7c..d3bf38961f6 100644
--- a/samples/client/petstore/go/go-petstore/api_fake.go
+++ b/samples/client/petstore/go/go-petstore/api_fake.go
@@ -1280,7 +1280,7 @@ func (a *FakeApiService) TestEndpointParametersExecute(r ApiTestEndpointParamete
 		binaryLocalVarFileBytes = fbs
 		binaryLocalVarFileName = binaryLocalVarFile.Name()
 		binaryLocalVarFile.Close()
-    }
+	}
 	formFiles = append(formFiles, formFile{fileBytes: binaryLocalVarFileBytes, fileName: binaryLocalVarFileName, formFileName: binaryLocalVarFormFileName})
 	if r.date != nil {
 		parameterAddToQuery(localVarFormParams, "date", r.date, "")
@@ -1422,16 +1422,16 @@ func (a *FakeApiService) TestEnumParametersExecute(r ApiTestEnumParametersReques
 	localVarFormParams := url.Values{}
 
 	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 {
-	    parameterAddToQuery(localVarQueryParams, "enum_query_string", r.enumQueryString, "")
+		parameterAddToQuery(localVarQueryParams, "enum_query_string", r.enumQueryString, "")
 	}
 	if r.enumQueryInteger != nil {
-	    parameterAddToQuery(localVarQueryParams, "enum_query_integer", r.enumQueryInteger, "")
+		parameterAddToQuery(localVarQueryParams, "enum_query_integer", r.enumQueryInteger, "")
 	}
 	if r.enumQueryDouble != nil {
-	    parameterAddToQuery(localVarQueryParams, "enum_query_double", r.enumQueryDouble, "")
+		parameterAddToQuery(localVarQueryParams, "enum_query_double", r.enumQueryDouble, "")
 	}
 	// to determine the Content-Type header
 	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_int64_group", r.requiredInt64Group, "")
 	if r.stringGroup != nil {
-	    parameterAddToQuery(localVarQueryParams, "string_group", r.stringGroup, "")
+		parameterAddToQuery(localVarQueryParams, "string_group", r.stringGroup, "")
 	}
 	if r.int64Group != nil {
-	    parameterAddToQuery(localVarQueryParams, "int64_group", r.int64Group, "")
+		parameterAddToQuery(localVarQueryParams, "int64_group", r.int64Group, "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
diff --git a/samples/client/petstore/go/go-petstore/api_pet.go b/samples/client/petstore/go/go-petstore/api_pet.go
index 5c5f6861c0f..57f4495a1e4 100644
--- a/samples/client/petstore/go/go-petstore/api_pet.go
+++ b/samples/client/petstore/go/go-petstore/api_pet.go
@@ -986,7 +986,7 @@ func (a *PetApiService) UploadFileExecute(r ApiUploadFileRequest) (*ApiResponse,
 		fileLocalVarFileBytes = fbs
 		fileLocalVarFileName = fileLocalVarFile.Name()
 		fileLocalVarFile.Close()
-    }
+	}
 	formFiles = append(formFiles, formFile{fileBytes: fileLocalVarFileBytes, fileName: fileLocalVarFileName, formFileName: fileLocalVarFormFileName})
 	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
 	if err != nil {
@@ -1116,7 +1116,7 @@ func (a *PetApiService) UploadFileWithRequiredFileExecute(r ApiUploadFileWithReq
 	requiredFileLocalVarFormFileName = "requiredFile"
 
 	requiredFileLocalVarFile := r.requiredFile
-        		fbs, _ := ioutil.ReadAll(requiredFileLocalVarFile)
+				fbs, _ := ioutil.ReadAll(requiredFileLocalVarFile)
 		requiredFileLocalVarFileBytes = fbs
 		requiredFileLocalVarFileName = requiredFileLocalVarFile.Name()
 		requiredFileLocalVarFile.Close()
diff --git a/samples/client/petstore/go/go-petstore/client.go b/samples/client/petstore/go/go-petstore/client.go
index e5a53c851fe..02aeed0b0f4 100644
--- a/samples/client/petstore/go/go-petstore/client.go
+++ b/samples/client/petstore/go/go-petstore/client.go
@@ -39,8 +39,8 @@ import (
 var (
 	jsonCheck = regexp.MustCompile(`(?i:(?:application|text)/(?:vnd\.[^;]+\+)?json)`)
 	xmlCheck  = regexp.MustCompile(`(?i:(?:application|text)/xml)`)
-    queryParamSplit = regexp.MustCompile(`(^|&)([^&]+)`)
-    queryDescape    = strings.NewReplacer( "%5B", "[", "%5D", "]" )
+	queryParamSplit = regexp.MustCompile(`(^|&)([^&]+)`)
+	queryDescape    = strings.NewReplacer( "%5B", "[", "%5D", "]" )
 )
 
 // 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 {
-    if reflect.TypeOf(obj).Kind() != reflect.Ptr {
-        return fmt.Sprintf("%v", obj)
-    }
-    var param,ok = obj.(MappedNullable)
-    if !ok {
-        return ""
-    }
-    dataMap,err := param.ToMap()
-    if err != nil {
-        return ""
-    }
-    return fmt.Sprintf("%v", dataMap[key])
+	if reflect.TypeOf(obj).Kind() != reflect.Ptr {
+		return fmt.Sprintf("%v", obj)
+	}
+	var param,ok = obj.(MappedNullable)
+	if !ok {
+		return ""
+	}
+	dataMap,err := param.ToMap()
+	if err != nil {
+		return ""
+	}
+	return fmt.Sprintf("%v", dataMap[key])
 }
 
 // parameterAddToQuery adds the provided object to the url query supporting deep object syntax
 func parameterAddToQuery(queryParams interface{}, keyPrefix string, obj interface{}, collectionType string) {
-    var v = reflect.ValueOf(obj)
-    var value = ""
-    if v == reflect.ValueOf(nil) {
-        value = "null"
-    } else {
-        switch v.Kind() {
+	var v = reflect.ValueOf(obj)
+	var value = ""
+	if v == reflect.ValueOf(nil) {
+		value = "null"
+	} else {
+		switch v.Kind() {
 			case reflect.Invalid:
 				value = "invalid"
 
@@ -208,35 +208,35 @@ func parameterAddToQuery(queryParams interface{}, keyPrefix string, obj interfac
 
 			case reflect.Interface:
 				fallthrough
-            case reflect.Ptr:
+			case reflect.Ptr:
 				parameterAddToQuery(queryParams, keyPrefix, v.Elem().Interface(), collectionType)
-                return
+				return
 
-            case reflect.Int, reflect.Int8, reflect.Int16,
-                reflect.Int32, reflect.Int64:
-                value = strconv.FormatInt(v.Int(), 10)
-            case reflect.Uint, reflect.Uint8, reflect.Uint16,
-                reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-                value = strconv.FormatUint(v.Uint(), 10)
-            case reflect.Float32, reflect.Float64:
-                value = strconv.FormatFloat(v.Float(), 'g', -1, 32)
-            case reflect.Bool:
-                value = strconv.FormatBool(v.Bool())
-            case reflect.String:
-                value = v.String()
-            default:
-                value = v.Type().String() + " value"
-        }
-    }
+			case reflect.Int, reflect.Int8, reflect.Int16,
+				reflect.Int32, reflect.Int64:
+				value = strconv.FormatInt(v.Int(), 10)
+			case reflect.Uint, reflect.Uint8, reflect.Uint16,
+				reflect.Uint32, reflect.Uint64, reflect.Uintptr:
+				value = strconv.FormatUint(v.Uint(), 10)
+			case reflect.Float32, reflect.Float64:
+				value = strconv.FormatFloat(v.Float(), 'g', -1, 32)
+			case reflect.Bool:
+				value = strconv.FormatBool(v.Bool())
+			case reflect.String:
+				value = v.String()
+			default:
+				value = v.Type().String() + " value"
+		}
+	}
 
-    switch valuesMap := queryParams.(type) {
-        case url.Values:
-            valuesMap.Add( keyPrefix, value )
-            break
-        case map[string]string:
-            valuesMap[keyPrefix] = value
-            break
-    }
+	switch valuesMap := queryParams.(type) {
+		case url.Values:
+			valuesMap.Add( keyPrefix, value )
+			break
+		case map[string]string:
+			valuesMap[keyPrefix] = value
+			break
+	}
 }
 
 // helper for converting interface{} parameters to json strings
@@ -388,11 +388,11 @@ func (c *APIClient) prepareRequest(
 	}
 
 	// Encode the parameters.
-    url.RawQuery = queryParamSplit.ReplaceAllStringFunc(query.Encode(), func(s string) string {
-        pieces := strings.Split(s, "=")
-        pieces[0] = queryDescape.Replace(pieces[0])
-        return strings.Join(pieces, "=")
-    })
+	url.RawQuery = queryParamSplit.ReplaceAllStringFunc(query.Encode(), func(s string) string {
+		pieces := strings.Split(s, "=")
+		pieces[0] = queryDescape.Replace(pieces[0])
+		return strings.Join(pieces, "=")
+	})
 
 	// Generate a new request
 	if body != nil {
@@ -455,19 +455,19 @@ func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err err
 		return nil
 	}
 	if f, ok := v.(*os.File); ok {
-        f, err = ioutil.TempFile("", "HttpClientFile")
-        if err != nil {
-            return
-        }
-        _, err = f.Write(b)
-        if err != nil {
-            return
-        }
-        _, err = f.Seek(0, io.SeekStart)
-        return
-    }
+		f, err = ioutil.TempFile("", "HttpClientFile")
+		if err != nil {
+			return
+		}
+		_, err = f.Write(b)
+		if err != nil {
+			return
+		}
+		_, err = f.Seek(0, io.SeekStart)
+		return
+	}
 	if f, ok := v.(**os.File); ok {
-        *f, err = ioutil.TempFile("", "HttpClientFile")
+		*f, err = ioutil.TempFile("", "HttpClientFile")
 		if err != nil {
 			return
 		}
diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/client.go b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/client.go
index ded348c4856..17aa6861b06 100644
--- a/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/client.go
+++ b/samples/openapi3/client/extensions/x-auth-id-alias/go-experimental/client.go
@@ -38,8 +38,8 @@ import (
 var (
 	jsonCheck = regexp.MustCompile(`(?i:(?:application|text)/(?:vnd\.[^;]+\+)?json)`)
 	xmlCheck  = regexp.MustCompile(`(?i:(?:application|text)/xml)`)
-    queryParamSplit = regexp.MustCompile(`(^|&)([^&]+)`)
-    queryDescape    = strings.NewReplacer( "%5B", "[", "%5D", "]" )
+	queryParamSplit = regexp.MustCompile(`(^|&)([^&]+)`)
+	queryDescape    = strings.NewReplacer( "%5B", "[", "%5D", "]" )
 )
 
 // 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 {
-    if reflect.TypeOf(obj).Kind() != reflect.Ptr {
-        return fmt.Sprintf("%v", obj)
-    }
-    var param,ok = obj.(MappedNullable)
-    if !ok {
-        return ""
-    }
-    dataMap,err := param.ToMap()
-    if err != nil {
-        return ""
-    }
-    return fmt.Sprintf("%v", dataMap[key])
+	if reflect.TypeOf(obj).Kind() != reflect.Ptr {
+		return fmt.Sprintf("%v", obj)
+	}
+	var param,ok = obj.(MappedNullable)
+	if !ok {
+		return ""
+	}
+	dataMap,err := param.ToMap()
+	if err != nil {
+		return ""
+	}
+	return fmt.Sprintf("%v", dataMap[key])
 }
 
 // parameterAddToQuery adds the provided object to the url query supporting deep object syntax
 func parameterAddToQuery(queryParams interface{}, keyPrefix string, obj interface{}, collectionType string) {
-    var v = reflect.ValueOf(obj)
-    var value = ""
-    if v == reflect.ValueOf(nil) {
-        value = "null"
-    } else {
-        switch v.Kind() {
+	var v = reflect.ValueOf(obj)
+	var value = ""
+	if v == reflect.ValueOf(nil) {
+		value = "null"
+	} else {
+		switch v.Kind() {
 			case reflect.Invalid:
 				value = "invalid"
 
@@ -192,35 +192,35 @@ func parameterAddToQuery(queryParams interface{}, keyPrefix string, obj interfac
 
 			case reflect.Interface:
 				fallthrough
-            case reflect.Ptr:
+			case reflect.Ptr:
 				parameterAddToQuery(queryParams, keyPrefix, v.Elem().Interface(), collectionType)
-                return
+				return
 
-            case reflect.Int, reflect.Int8, reflect.Int16,
-                reflect.Int32, reflect.Int64:
-                value = strconv.FormatInt(v.Int(), 10)
-            case reflect.Uint, reflect.Uint8, reflect.Uint16,
-                reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-                value = strconv.FormatUint(v.Uint(), 10)
-            case reflect.Float32, reflect.Float64:
-                value = strconv.FormatFloat(v.Float(), 'g', -1, 32)
-            case reflect.Bool:
-                value = strconv.FormatBool(v.Bool())
-            case reflect.String:
-                value = v.String()
-            default:
-                value = v.Type().String() + " value"
-        }
-    }
+			case reflect.Int, reflect.Int8, reflect.Int16,
+				reflect.Int32, reflect.Int64:
+				value = strconv.FormatInt(v.Int(), 10)
+			case reflect.Uint, reflect.Uint8, reflect.Uint16,
+				reflect.Uint32, reflect.Uint64, reflect.Uintptr:
+				value = strconv.FormatUint(v.Uint(), 10)
+			case reflect.Float32, reflect.Float64:
+				value = strconv.FormatFloat(v.Float(), 'g', -1, 32)
+			case reflect.Bool:
+				value = strconv.FormatBool(v.Bool())
+			case reflect.String:
+				value = v.String()
+			default:
+				value = v.Type().String() + " value"
+		}
+	}
 
-    switch valuesMap := queryParams.(type) {
-        case url.Values:
-            valuesMap.Add( keyPrefix, value )
-            break
-        case map[string]string:
-            valuesMap[keyPrefix] = value
-            break
-    }
+	switch valuesMap := queryParams.(type) {
+		case url.Values:
+			valuesMap.Add( keyPrefix, value )
+			break
+		case map[string]string:
+			valuesMap[keyPrefix] = value
+			break
+	}
 }
 
 // helper for converting interface{} parameters to json strings
@@ -372,11 +372,11 @@ func (c *APIClient) prepareRequest(
 	}
 
 	// Encode the parameters.
-    url.RawQuery = queryParamSplit.ReplaceAllStringFunc(query.Encode(), func(s string) string {
-        pieces := strings.Split(s, "=")
-        pieces[0] = queryDescape.Replace(pieces[0])
-        return strings.Join(pieces, "=")
-    })
+	url.RawQuery = queryParamSplit.ReplaceAllStringFunc(query.Encode(), func(s string) string {
+		pieces := strings.Split(s, "=")
+		pieces[0] = queryDescape.Replace(pieces[0])
+		return strings.Join(pieces, "=")
+	})
 
 	// Generate a new request
 	if body != nil {
@@ -423,19 +423,19 @@ func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err err
 		return nil
 	}
 	if f, ok := v.(*os.File); ok {
-        f, err = ioutil.TempFile("", "HttpClientFile")
-        if err != nil {
-            return
-        }
-        _, err = f.Write(b)
-        if err != nil {
-            return
-        }
-        _, err = f.Seek(0, io.SeekStart)
-        return
-    }
+		f, err = ioutil.TempFile("", "HttpClientFile")
+		if err != nil {
+			return
+		}
+		_, err = f.Write(b)
+		if err != nil {
+			return
+		}
+		_, err = f.Seek(0, io.SeekStart)
+		return
+	}
 	if f, ok := v.(**os.File); ok {
-        *f, err = ioutil.TempFile("", "HttpClientFile")
+		*f, err = ioutil.TempFile("", "HttpClientFile")
 		if err != nil {
 			return
 		}
diff --git a/samples/openapi3/client/petstore/go/go-petstore/api_default.go b/samples/openapi3/client/petstore/go/go-petstore/api_default.go
index 0a54d9522fa..92b78cac5a0 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/api_default.go
+++ b/samples/openapi3/client/petstore/go/go-petstore/api_default.go
@@ -126,8 +126,8 @@ func (a *DefaultApiService) FooGetExecute(r ApiFooGetRequest) (*FooGetDefaultRes
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+					newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
+					newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 		if localVarHTTPResponse.StatusCode >= 400 && localVarHTTPResponse.StatusCode < 500 {
@@ -137,8 +137,8 @@ func (a *DefaultApiService) FooGetExecute(r ApiFooGetRequest) (*FooGetDefaultRes
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+					newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
+					newErr.model = v
 			return localVarReturnValue, localVarHTTPResponse, newErr
 		}
 			var v FooGetDefaultResponse
@@ -147,8 +147,8 @@ func (a *DefaultApiService) FooGetExecute(r ApiFooGetRequest) (*FooGetDefaultRes
 				newErr.error = err.Error()
 				return localVarReturnValue, localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+					newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
+					newErr.model = v
 		return localVarReturnValue, localVarHTTPResponse, newErr
 	}
 
diff --git a/samples/openapi3/client/petstore/go/go-petstore/api_fake.go b/samples/openapi3/client/petstore/go/go-petstore/api_fake.go
index 8c1c89ed642..5a183d84881 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/api_fake.go
+++ b/samples/openapi3/client/petstore/go/go-petstore/api_fake.go
@@ -1307,7 +1307,7 @@ func (a *FakeApiService) TestEndpointParametersExecute(r ApiTestEndpointParamete
 		binaryLocalVarFileBytes = fbs
 		binaryLocalVarFileName = binaryLocalVarFile.Name()
 		binaryLocalVarFile.Close()
-    }
+	}
 	formFiles = append(formFiles, formFile{fileBytes: binaryLocalVarFileBytes, fileName: binaryLocalVarFileName, formFileName: binaryLocalVarFormFileName})
 	if r.date != nil {
 		parameterAddToQuery(localVarFormParams, "date", r.date, "")
@@ -1460,13 +1460,13 @@ func (a *FakeApiService) TestEnumParametersExecute(r ApiTestEnumParametersReques
 		}
 	}
 	if r.enumQueryString != nil {
-	    parameterAddToQuery(localVarQueryParams, "enum_query_string", r.enumQueryString, "")
+		parameterAddToQuery(localVarQueryParams, "enum_query_string", r.enumQueryString, "")
 	}
 	if r.enumQueryInteger != nil {
-	    parameterAddToQuery(localVarQueryParams, "enum_query_integer", r.enumQueryInteger, "")
+		parameterAddToQuery(localVarQueryParams, "enum_query_integer", r.enumQueryInteger, "")
 	}
 	if r.enumQueryDouble != nil {
-	    parameterAddToQuery(localVarQueryParams, "enum_query_double", r.enumQueryDouble, "")
+		parameterAddToQuery(localVarQueryParams, "enum_query_double", r.enumQueryDouble, "")
 	}
 	// to determine the Content-Type header
 	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_int64_group", r.requiredInt64Group, "")
 	if r.stringGroup != nil {
-	    parameterAddToQuery(localVarQueryParams, "string_group", r.stringGroup, "")
+		parameterAddToQuery(localVarQueryParams, "string_group", r.stringGroup, "")
 	}
 	if r.int64Group != nil {
-	    parameterAddToQuery(localVarQueryParams, "int64_group", r.int64Group, "")
+		parameterAddToQuery(localVarQueryParams, "int64_group", r.int64Group, "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
@@ -1677,8 +1677,8 @@ func (a *FakeApiService) TestGroupParametersExecute(r ApiTestGroupParametersRequ
 				newErr.error = err.Error()
 				return localVarHTTPResponse, newErr
 			}
-            		newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
-            		newErr.model = v
+					newErr.error = formatErrorMessage(localVarHTTPResponse.Status, &v)
+					newErr.model = v
 		}
 		return localVarHTTPResponse, newErr
 	}
@@ -1950,10 +1950,10 @@ func (a *FakeApiService) TestQueryDeepObjectExecute(r ApiTestQueryDeepObjectRequ
 	localVarFormParams := url.Values{}
 
 	if r.testPet != nil {
-	    parameterAddToQuery(localVarQueryParams, "test_pet", r.testPet, "")
+		parameterAddToQuery(localVarQueryParams, "test_pet", r.testPet, "")
 	}
 	if r.inputOptions != nil {
-	    parameterAddToQuery(localVarQueryParams, "inputOptions", r.inputOptions, "")
+		parameterAddToQuery(localVarQueryParams, "inputOptions", r.inputOptions, "")
 	}
 	// to determine the Content-Type header
 	localVarHTTPContentTypes := []string{}
diff --git a/samples/openapi3/client/petstore/go/go-petstore/api_pet.go b/samples/openapi3/client/petstore/go/go-petstore/api_pet.go
index af2faaf0732..34f0b0be002 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/api_pet.go
+++ b/samples/openapi3/client/petstore/go/go-petstore/api_pet.go
@@ -1009,7 +1009,7 @@ func (a *PetApiService) UploadFileExecute(r ApiUploadFileRequest) (*ApiResponse,
 		fileLocalVarFileBytes = fbs
 		fileLocalVarFileName = fileLocalVarFile.Name()
 		fileLocalVarFile.Close()
-    }
+	}
 	formFiles = append(formFiles, formFile{fileBytes: fileLocalVarFileBytes, fileName: fileLocalVarFileName, formFileName: fileLocalVarFormFileName})
 	req, err := a.client.prepareRequest(r.ctx, localVarPath, localVarHTTPMethod, localVarPostBody, localVarHeaderParams, localVarQueryParams, localVarFormParams, formFiles)
 	if err != nil {
@@ -1141,7 +1141,7 @@ func (a *PetApiService) UploadFileWithRequiredFileExecute(r ApiUploadFileWithReq
 	requiredFileLocalVarFormFileName = "requiredFile"
 
 	requiredFileLocalVarFile := r.requiredFile
-        		fbs, _ := ioutil.ReadAll(requiredFileLocalVarFile)
+				fbs, _ := ioutil.ReadAll(requiredFileLocalVarFile)
 		requiredFileLocalVarFileBytes = fbs
 		requiredFileLocalVarFileName = requiredFileLocalVarFile.Name()
 		requiredFileLocalVarFile.Close()
diff --git a/samples/openapi3/client/petstore/go/go-petstore/client.go b/samples/openapi3/client/petstore/go/go-petstore/client.go
index 3c443e0ecfa..8db7aa62f1c 100644
--- a/samples/openapi3/client/petstore/go/go-petstore/client.go
+++ b/samples/openapi3/client/petstore/go/go-petstore/client.go
@@ -39,8 +39,8 @@ import (
 var (
 	jsonCheck = regexp.MustCompile(`(?i:(?:application|text)/(?:vnd\.[^;]+\+)?json)`)
 	xmlCheck  = regexp.MustCompile(`(?i:(?:application|text)/xml)`)
-    queryParamSplit = regexp.MustCompile(`(^|&)([^&]+)`)
-    queryDescape    = strings.NewReplacer( "%5B", "[", "%5D", "]" )
+	queryParamSplit = regexp.MustCompile(`(^|&)([^&]+)`)
+	queryDescape    = strings.NewReplacer( "%5B", "[", "%5D", "]" )
 )
 
 // 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 {
-    if reflect.TypeOf(obj).Kind() != reflect.Ptr {
-        return fmt.Sprintf("%v", obj)
-    }
-    var param,ok = obj.(MappedNullable)
-    if !ok {
-        return ""
-    }
-    dataMap,err := param.ToMap()
-    if err != nil {
-        return ""
-    }
-    return fmt.Sprintf("%v", dataMap[key])
+	if reflect.TypeOf(obj).Kind() != reflect.Ptr {
+		return fmt.Sprintf("%v", obj)
+	}
+	var param,ok = obj.(MappedNullable)
+	if !ok {
+		return ""
+	}
+	dataMap,err := param.ToMap()
+	if err != nil {
+		return ""
+	}
+	return fmt.Sprintf("%v", dataMap[key])
 }
 
 // parameterAddToQuery adds the provided object to the url query supporting deep object syntax
 func parameterAddToQuery(queryParams interface{}, keyPrefix string, obj interface{}, collectionType string) {
-    var v = reflect.ValueOf(obj)
-    var value = ""
-    if v == reflect.ValueOf(nil) {
-        value = "null"
-    } else {
-        switch v.Kind() {
+	var v = reflect.ValueOf(obj)
+	var value = ""
+	if v == reflect.ValueOf(nil) {
+		value = "null"
+	} else {
+		switch v.Kind() {
 			case reflect.Invalid:
 				value = "invalid"
 
@@ -211,35 +211,35 @@ func parameterAddToQuery(queryParams interface{}, keyPrefix string, obj interfac
 
 			case reflect.Interface:
 				fallthrough
-            case reflect.Ptr:
+			case reflect.Ptr:
 				parameterAddToQuery(queryParams, keyPrefix, v.Elem().Interface(), collectionType)
-                return
+				return
 
-            case reflect.Int, reflect.Int8, reflect.Int16,
-                reflect.Int32, reflect.Int64:
-                value = strconv.FormatInt(v.Int(), 10)
-            case reflect.Uint, reflect.Uint8, reflect.Uint16,
-                reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-                value = strconv.FormatUint(v.Uint(), 10)
-            case reflect.Float32, reflect.Float64:
-                value = strconv.FormatFloat(v.Float(), 'g', -1, 32)
-            case reflect.Bool:
-                value = strconv.FormatBool(v.Bool())
-            case reflect.String:
-                value = v.String()
-            default:
-                value = v.Type().String() + " value"
-        }
-    }
+			case reflect.Int, reflect.Int8, reflect.Int16,
+				reflect.Int32, reflect.Int64:
+				value = strconv.FormatInt(v.Int(), 10)
+			case reflect.Uint, reflect.Uint8, reflect.Uint16,
+				reflect.Uint32, reflect.Uint64, reflect.Uintptr:
+				value = strconv.FormatUint(v.Uint(), 10)
+			case reflect.Float32, reflect.Float64:
+				value = strconv.FormatFloat(v.Float(), 'g', -1, 32)
+			case reflect.Bool:
+				value = strconv.FormatBool(v.Bool())
+			case reflect.String:
+				value = v.String()
+			default:
+				value = v.Type().String() + " value"
+		}
+	}
 
-    switch valuesMap := queryParams.(type) {
-        case url.Values:
-            valuesMap.Add( keyPrefix, value )
-            break
-        case map[string]string:
-            valuesMap[keyPrefix] = value
-            break
-    }
+	switch valuesMap := queryParams.(type) {
+		case url.Values:
+			valuesMap.Add( keyPrefix, value )
+			break
+		case map[string]string:
+			valuesMap[keyPrefix] = value
+			break
+	}
 }
 
 // helper for converting interface{} parameters to json strings
@@ -391,11 +391,11 @@ func (c *APIClient) prepareRequest(
 	}
 
 	// Encode the parameters.
-    url.RawQuery = queryParamSplit.ReplaceAllStringFunc(query.Encode(), func(s string) string {
-        pieces := strings.Split(s, "=")
-        pieces[0] = queryDescape.Replace(pieces[0])
-        return strings.Join(pieces, "=")
-    })
+	url.RawQuery = queryParamSplit.ReplaceAllStringFunc(query.Encode(), func(s string) string {
+		pieces := strings.Split(s, "=")
+		pieces[0] = queryDescape.Replace(pieces[0])
+		return strings.Join(pieces, "=")
+	})
 
 	// Generate a new request
 	if body != nil {
@@ -473,19 +473,19 @@ func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err err
 		return nil
 	}
 	if f, ok := v.(*os.File); ok {
-        f, err = ioutil.TempFile("", "HttpClientFile")
-        if err != nil {
-            return
-        }
-        _, err = f.Write(b)
-        if err != nil {
-            return
-        }
-        _, err = f.Seek(0, io.SeekStart)
-        return
-    }
+		f, err = ioutil.TempFile("", "HttpClientFile")
+		if err != nil {
+			return
+		}
+		_, err = f.Write(b)
+		if err != nil {
+			return
+		}
+		_, err = f.Seek(0, io.SeekStart)
+		return
+	}
 	if f, ok := v.(**os.File); ok {
-        *f, err = ioutil.TempFile("", "HttpClientFile")
+		*f, err = ioutil.TempFile("", "HttpClientFile")
 		if err != nil {
 			return
 		}