[Go][Exp] better code format (#7088)

* go-exp-format * replace spaces with tabs
OpenAPITools · Aug 1, 2020 · a7ccc4a · a7ccc4a
1 parent f49ab2a
commit a7ccc4a
Show file tree

Hide file tree

Showing 17 changed files with 78 additions and 439 deletions.
diff --git a/modules/openapi-generator/src/main/resources/go-experimental/api.mustache b/modules/openapi-generator/src/main/resources/go-experimental/api.mustache
@@ -26,12 +26,14 @@ type api{{operationId}}Request struct {
 	{{paramName}} {{^isPathParam}}*{{/isPathParam}}{{{dataType}}}{{/allParams}}
 }
 
-{{#allParams}}{{^isPathParam}}
+{{#allParams}}
+{{^isPathParam}}
 func (r api{{operationId}}Request) {{vendorExtensions.x-export-param-name}}({{paramName}} {{{dataType}}}) api{{operationId}}Request {
 	r.{{paramName}} = &{{paramName}}
 	return r
 }
-{{/isPathParam}}{{/allParams}}
+{{/isPathParam}}
+{{/allParams}}
 /*
 {{operationId}}{{#summary}} {{{.}}}{{/summary}}{{^summary}} Method for {{operationId}}{{/summary}}
 {{#notes}}
@@ -51,7 +53,9 @@ func (a *{{{classname}}}Service) {{{nickname}}}(ctx _context.Context{{#pathParam
 
 /*
 Execute executes the request
-{{#returnType}} @return {{{.}}}{{/returnType}}
+{{#returnType}}
+@return {{{.}}}
+{{/returnType}}
 */
 func (r api{{operationId}}Request) Execute() ({{#returnType}}{{{.}}}, {{/returnType}}*_nethttp.Response, error) {
 	var (
@@ -60,7 +64,9 @@ func (r api{{operationId}}Request) Execute() ({{#returnType}}{{{.}}}, {{/returnT
 		localVarFormFileName string
 		localVarFileName     string
 		localVarFileBytes    []byte
-		{{#returnType}}localVarReturnValue  {{{.}}}{{/returnType}}
+		{{#returnType}}
+		localVarReturnValue  {{{.}}}
+		{{/returnType}}
 	)
 
 	localBasePath, err := r.apiService.client.cfg.ServerURLWithContext(r.ctx, "{{{classname}}}Service.{{{nickname}}}")
@@ -75,10 +81,12 @@ func (r api{{operationId}}Request) Execute() ({{#returnType}}{{{.}}}, {{/returnT
 	localVarQueryParams := _neturl.Values{}
 	localVarFormParams := _neturl.Values{}
 	{{#allParams}}
-	{{#required}}{{^isPathParam}}
+	{{#required}}
+	{{^isPathParam}}
 	if r.{{paramName}} == nil {
 		return {{#returnType}}localVarReturnValue, {{/returnType}}nil, reportError("{{paramName}} is required and must be specified")
-	}{{/isPathParam}}
+	}
+	{{/isPathParam}}
 	{{#minItems}}
 	if len({{^isPathParam}}*{{/isPathParam}}r.{{paramName}}) < {{minItems}} {
 		return {{#returnType}}localVarReturnValue, {{/returnType}}nil, reportError("{{paramName}} must have at least {{minItems}} elements")

diff --git a/modules/openapi-generator/src/main/resources/go-experimental/model_anyof.mustache b/modules/openapi-generator/src/main/resources/go-experimental/model_anyof.mustache
@@ -17,15 +17,15 @@ func (dst *{{classname}}) UnmarshalJSON(data []byte) error {
 	{{/isNullable}}
 	{{#discriminator}}
 	{{#mappedModels}}
-    {{#-first}}
+	{{#-first}}
 	// use discriminator value to speed up the lookup
 	var jsonDict map[string]interface{}
 	err := json.Unmarshal(data, &jsonDict)
 	if err != nil {
 		return fmt.Errorf("Failed to unmarshal JSON into map for the discrimintor lookup.")
 	}
 
-    {{/-first}}
+	{{/-first}}
 	// check if the discriminator value is '{{{mappingName}}}'
 	if jsonDict["{{{propertyBaseName}}}"] == "{{{mappingName}}}" {
 		// try to unmarshal JSON data into {{{modelName}}}

diff --git a/modules/openapi-generator/src/main/resources/go-experimental/signing.mustache b/modules/openapi-generator/src/main/resources/go-experimental/signing.mustache
@@ -40,7 +40,7 @@ const (
 	// The 'Host' header, as defined in RFC 2616, section 14.23.
 	HttpHeaderHost string = "Host"
 	// The 'Date' header.
-	HttpHeaderDate string = "Date" 
+	HttpHeaderDate string = "Date"
 	// The digest header, as defined in RFC 3230, section 4.3.2.
 	HttpHeaderDigest string = "Digest"
 	// The HTTP Authorization header, as defined in RFC 7235, section 4.2.
@@ -106,7 +106,7 @@ type HttpSignatureAuth struct {
 	SigningScheme     string            // The signature scheme, when signing HTTP requests. Supported value is 'hs2019'.
 	// The signature algorithm, when signing HTTP requests.
 	// Supported values are RSASSA-PKCS1-v1_5, RSASSA-PSS.
-	SigningAlgorithm  string            
+	SigningAlgorithm  string
 	SignedHeaders     []string          // A list of HTTP headers included when generating the signature for the message.
 	// SignatureMaxValidity specifies the maximum duration of the signature validity.
 	// The value is used to set the '(expires)' signature parameter in the HTTP request.

diff --git a/samples/client/petstore/go-experimental/go-petstore/api_another_fake.go b/samples/client/petstore/go-experimental/go-petstore/api_another_fake.go
@@ -30,12 +30,10 @@ type apiCall123TestSpecialTagsRequest struct {
 	body *Client
 }
 
-
 func (r apiCall123TestSpecialTagsRequest) Body(body Client) apiCall123TestSpecialTagsRequest {
 	r.body = &body
 	return r
 }
-
 /*
 Call123TestSpecialTags To test special tags
 To test special tags and operation ID starting with number
@@ -51,7 +49,7 @@ func (a *AnotherFakeApiService) Call123TestSpecialTags(ctx _context.Context) api
 
 /*
 Execute executes the request
- @return Client
+@return Client
 */
 func (r apiCall123TestSpecialTagsRequest) Execute() (Client, *_nethttp.Response, error) {
 	var (
@@ -73,7 +71,6 @@ func (r apiCall123TestSpecialTagsRequest) Execute() (Client, *_nethttp.Response,
 	localVarHeaderParams := make(map[string]string)
 	localVarQueryParams := _neturl.Values{}
 	localVarFormParams := _neturl.Values{}
-
 	if r.body == nil {
 		return localVarReturnValue, nil, reportError("body is required and must be specified")
 	}