Fix context import order

Author: bvwells

modules/swagger-codegen/src/main/resources/go/api.mustache

@@ -3,11 +3,11 @@ package {{packageName}}
 
 {{#operations}}
 import (
+	"context"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strings"
-	"context"
 {{#imports}}	"{{import}}"
 {{/imports}}
 )

modules/swagger-codegen/src/main/resources/go/client.mustache

@@ -3,6 +3,7 @@ package {{packageName}}
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"encoding/xml"
 	"errors"
@@ -20,7 +21,6 @@ import (
 	"time"
 	"unicode/utf8"
 
-	"context"
 	"golang.org/x/oauth2"
 )
 

samples/client/petstore/go/go-petstore-withXml/README.md

@@ -22,11 +22,11 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 Class | Method | HTTP request | Description
 ------------ | ------------- | ------------- | -------------
 *AnotherFakeApi* | [**TestSpecialTags**](docs/AnotherFakeApi.md#testspecialtags) | **Patch** /another-fake/dummy | To test special tags
-*DefaultApi* | [**TestBodyWithQueryParams**](docs/DefaultApi.md#testbodywithqueryparams) | **Put** /fake/body-with-query-params | 
 *FakeApi* | [**FakeOuterBooleanSerialize**](docs/FakeApi.md#fakeouterbooleanserialize) | **Post** /fake/outer/boolean | 
 *FakeApi* | [**FakeOuterCompositeSerialize**](docs/FakeApi.md#fakeoutercompositeserialize) | **Post** /fake/outer/composite | 
 *FakeApi* | [**FakeOuterNumberSerialize**](docs/FakeApi.md#fakeouternumberserialize) | **Post** /fake/outer/number | 
 *FakeApi* | [**FakeOuterStringSerialize**](docs/FakeApi.md#fakeouterstringserialize) | **Post** /fake/outer/string | 
+*FakeApi* | [**TestBodyWithQueryParams**](docs/FakeApi.md#testbodywithqueryparams) | **Put** /fake/body-with-query-params | 
 *FakeApi* | [**TestClientModel**](docs/FakeApi.md#testclientmodel) | **Patch** /fake | To test \"client\" model
 *FakeApi* | [**TestEndpointParameters**](docs/FakeApi.md#testendpointparameters) | **Post** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 *FakeApi* | [**TestEnumParameters**](docs/FakeApi.md#testenumparameters) | **Get** /fake | To test enum parameters

samples/client/petstore/go/go-petstore-withXml/api/swagger.yaml

@@ -107,11 +107,11 @@ paths:
         type: "array"
         items:
           type: "string"
+          default: "available"
           enum:
           - "available"
           - "pending"
           - "sold"
-          default: "available"
         collectionFormat: "csv"
         x-exportParamName: "Status"
       responses:
@@ -216,12 +216,14 @@ paths:
         required: false
         type: "string"
         x-exportParamName: "Name"
+        x-optionalDataType: "String"
       - name: "status"
         in: "formData"
         description: "Updated status of the pet"
         required: false
         type: "string"
         x-exportParamName: "Status"
+        x-optionalDataType: "String"
       responses:
         405:
           description: "Invalid input"
@@ -244,6 +246,7 @@ paths:
         required: false
         type: "string"
         x-exportParamName: "ApiKey"
+        x-optionalDataType: "String"
       - name: "petId"
         in: "path"
         description: "Pet id to delete"
@@ -283,6 +286,7 @@ paths:
         required: false
         type: "string"
         x-exportParamName: "AdditionalMetadata"
+        x-optionalDataType: "String"
       - name: "file"
         in: "formData"
         description: "file to upload"
@@ -635,10 +639,10 @@ paths:
         type: "array"
         items:
           type: "string"
+          default: "$"
           enum:
           - ">"
           - "$"
-          default: "$"
         x-exportParamName: "EnumFormStringArray"
       - name: "enum_form_string"
         in: "formData"
@@ -651,17 +655,18 @@ paths:
         - "-efg"
         - "(xyz)"
         x-exportParamName: "EnumFormString"
+        x-optionalDataType: "String"
       - name: "enum_header_string_array"
         in: "header"
         description: "Header parameter enum test (string array)"
         required: false
         type: "array"
         items:
           type: "string"
+          default: "$"
           enum:
           - ">"
           - "$"
-          default: "$"
         x-exportParamName: "EnumHeaderStringArray"
       - name: "enum_header_string"
         in: "header"
@@ -674,17 +679,18 @@ paths:
         - "-efg"
         - "(xyz)"
         x-exportParamName: "EnumHeaderString"
+        x-optionalDataType: "String"
       - name: "enum_query_string_array"
         in: "query"
         description: "Query parameter enum test (string array)"
         required: false
         type: "array"
         items:
           type: "string"
+          default: "$"
           enum:
           - ">"
           - "$"
-          default: "$"
         x-exportParamName: "EnumQueryStringArray"
       - name: "enum_query_string"
         in: "query"
@@ -697,6 +703,7 @@ paths:
         - "-efg"
         - "(xyz)"
         x-exportParamName: "EnumQueryString"
+        x-optionalDataType: "String"
       - name: "enum_query_integer"
         in: "query"
         description: "Query parameter enum test (double)"
@@ -707,6 +714,7 @@ paths:
         - 1
         - -2
         x-exportParamName: "EnumQueryInteger"
+        x-optionalDataType: "Int32"
       - name: "enum_query_double"
         in: "formData"
         description: "Query parameter enum test (double)"
@@ -717,6 +725,7 @@ paths:
         - 1.1
         - -1.2
         x-exportParamName: "EnumQueryDouble"
+        x-optionalDataType: "Float64"
       responses:
         400:
           description: "Invalid request"
@@ -745,6 +754,7 @@ paths:
         maximum: 100
         minimum: 10
         x-exportParamName: "Integer"
+        x-optionalDataType: "Int32"
       - name: "int32"
         in: "formData"
         description: "None"
@@ -754,13 +764,15 @@ paths:
         minimum: 20
         format: "int32"
         x-exportParamName: "Int32_"
+        x-optionalDataType: "Int32"
       - name: "int64"
         in: "formData"
         description: "None"
         required: false
         type: "integer"
         format: "int64"
         x-exportParamName: "Int64_"
+        x-optionalDataType: "Int64"
       - name: "number"
         in: "formData"
         description: "None"
@@ -777,6 +789,7 @@ paths:
         maximum: 987.6
         format: "float"
         x-exportParamName: "Float"
+        x-optionalDataType: "Float32"
       - name: "double"
         in: "formData"
         description: "None"
@@ -793,6 +806,7 @@ paths:
         type: "string"
         pattern: "/[a-z]/i"
         x-exportParamName: "String_"
+        x-optionalDataType: "String"
       - name: "pattern_without_delimiter"
         in: "formData"
         description: "None"
@@ -814,20 +828,23 @@ paths:
         type: "string"
         format: "binary"
         x-exportParamName: "Binary"
+        x-optionalDataType: "String"
       - name: "date"
         in: "formData"
         description: "None"
         required: false
         type: "string"
         format: "date"
         x-exportParamName: "Date"
+        x-optionalDataType: "String"
       - name: "dateTime"
         in: "formData"
         description: "None"
         required: false
         type: "string"
         format: "date-time"
         x-exportParamName: "DateTime"
+        x-optionalDataType: "Time"
       - name: "password"
         in: "formData"
         description: "None"
@@ -837,12 +854,14 @@ paths:
         minLength: 10
         format: "password"
         x-exportParamName: "Password"
+        x-optionalDataType: "String"
       - name: "callback"
         in: "formData"
         description: "None"
         required: false
         type: "string"
         x-exportParamName: "Callback"
+        x-optionalDataType: "String"
       responses:
         400:
           description: "Invalid username supplied"
@@ -998,6 +1017,8 @@ paths:
           description: "successful operation"
   /fake/body-with-query-params:
     put:
+      tags:
+      - "fake"
       operationId: "testBodyWithQueryParams"
       consumes:
       - "application/json"

samples/client/petstore/go/go-petstore-withXml/api_another_fake.go

@@ -11,11 +11,11 @@
 package petstore
 
 import (
+	"context"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strings"
-	"golang.org/x/net/context"
 )
 
 // Linger please
@@ -25,11 +25,14 @@ var (
 
 type AnotherFakeApiService service
 
-/* AnotherFakeApiService To test special tags
+/* 
+AnotherFakeApiService To test special tags
 To test special tags
- * @param ctx context.Context for authentication, logging, tracing, etc.
-@param body client model
-@return Client*/
+ * @param ctx context.Context - for authentication, logging, cancellation, deadlines, tracing, etc. Passed from http.Request or context.Background().
+ * @param body client model
+
+@return Client
+*/
 func (a *AnotherFakeApiService) TestSpecialTags(ctx context.Context, body Client) (Client, *http.Response, error) {
 	var (
 		localVarHttpMethod = strings.ToUpper("Patch")
@@ -76,6 +79,7 @@ func (a *AnotherFakeApiService) TestSpecialTags(ctx context.Context, body Client
 	}
 
 	localVarBody, err := ioutil.ReadAll(localVarHttpResponse.Body)
+	localVarHttpResponse.Body.Close()
 	if err != nil {
 		return localVarReturnValue, localVarHttpResponse, err
 	}