Go: Return error body with >= 300 errors (#7192)

antihax · wing328 · commit dc69138de52f · 2017-12-18T23:03:47.000+08:00
* Report better errors

* update tests
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GoClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/GoClientCodegen.java
@@ -111,8 +111,7 @@ public GoClientCodegen() {
         importMapping = new HashMap<String, String>();
         importMapping.put("time.Time", "time");
         importMapping.put("*os.File", "os");
-        importMapping.put("os", "io/ioutil");
-
+        
         cliOptions.clear();
         cliOptions.add(new CliOption(CodegenConstants.PACKAGE_NAME, "Go package name (convention: lowercase).")
                 .defaultValue("swagger"));
diff --git a/modules/swagger-codegen/src/main/resources/go/api.mustache b/modules/swagger-codegen/src/main/resources/go/api.mustache
@@ -3,6 +3,7 @@ package {{packageName}}
 
 {{#operations}}
 import (
+	"io/ioutil"
 	"net/url"
 	"net/http"
 	"strings"
@@ -212,7 +213,8 @@ func (a *{{{classname}}}Service) {{{nickname}}}(ctx context.Context{{#hasParams}
 	}
 	defer localVarHttpResponse.Body.Close()
 	if localVarHttpResponse.StatusCode >= 300 {
-		return {{#returnType}}successPayload, {{/returnType}}localVarHttpResponse, reportError(localVarHttpResponse.Status)
+		bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)
+		return {{#returnType}}successPayload, {{/returnType}}localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)
 	}
 {{#returnType}}
 
diff --git a/samples/client/petstore/go/go-petstore/another_fake_api.go b/samples/client/petstore/go/go-petstore/another_fake_api.go
@@ -11,6 +11,7 @@
 package petstore
 
 import (
+	"io/ioutil"
 	"net/url"
 	"net/http"
 	"strings"
@@ -80,7 +81,8 @@ func (a *AnotherFakeApiService) TestSpecialTags(ctx context.Context, body Client
 	}
 	defer localVarHttpResponse.Body.Close()
 	if localVarHttpResponse.StatusCode >= 300 {
-		return successPayload, localVarHttpResponse, reportError(localVarHttpResponse.Status)
+		bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)
+		return successPayload, localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)
 	}
 
 	if err = json.NewDecoder(localVarHttpResponse.Body).Decode(&successPayload); err != nil {
diff --git a/samples/client/petstore/go/go-petstore/docs/Fake_classname_tags123Api.md b/samples/client/petstore/go/go-petstore/docs/Fake_classname_tags123Api.md
diff --git a/samples/client/petstore/go/go-petstore/fake_api.go b/samples/client/petstore/go/go-petstore/fake_api.go
@@ -11,6 +11,7 @@
 package petstore
 
 import (
+	"io/ioutil"
 	"net/url"
 	"net/http"
 	"strings"
@@ -83,7 +84,8 @@ func (a *FakeApiService) FakeOuterBooleanSerialize(ctx context.Context, localVar
 	}
 	defer localVarHttpResponse.Body.Close()
 	if localVarHttpResponse.StatusCode >= 300 {
-		return successPayload, localVarHttpResponse, reportError(localVarHttpResponse.Status)
+		bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)
+		return successPayload, localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)
 	}
 
 	if err = json.NewDecoder(localVarHttpResponse.Body).Decode(&successPayload); err != nil {
@@ -150,7 +152,8 @@ func (a *FakeApiService) FakeOuterCompositeSerialize(ctx context.Context, localV
 	}
 	defer localVarHttpResponse.Body.Close()
 	if localVarHttpResponse.StatusCode >= 300 {
-		return successPayload, localVarHttpResponse, reportError(localVarHttpResponse.Status)
+		bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)
+		return successPayload, localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)
 	}
 
 	if err = json.NewDecoder(localVarHttpResponse.Body).Decode(&successPayload); err != nil {
@@ -217,7 +220,8 @@ func (a *FakeApiService) FakeOuterNumberSerialize(ctx context.Context, localVarO
 	}
 	defer localVarHttpResponse.Body.Close()
 	if localVarHttpResponse.StatusCode >= 300 {
-		return successPayload, localVarHttpResponse, reportError(localVarHttpResponse.Status)
+		bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)
+		return successPayload, localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)
 	}
 
 	if err = json.NewDecoder(localVarHttpResponse.Body).Decode(&successPayload); err != nil {
@@ -284,7 +288,8 @@ func (a *FakeApiService) FakeOuterStringSerialize(ctx context.Context, localVarO
 	}
 	defer localVarHttpResponse.Body.Close()
 	if localVarHttpResponse.StatusCode >= 300 {
-		return successPayload, localVarHttpResponse, reportError(localVarHttpResponse.Status)
+		bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)
+		return successPayload, localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)
 	}
 
 	if err = json.NewDecoder(localVarHttpResponse.Body).Decode(&successPayload); err != nil {
@@ -349,7 +354,8 @@ func (a *FakeApiService) TestClientModel(ctx context.Context, body Client) (Clie
 	}
 	defer localVarHttpResponse.Body.Close()
 	if localVarHttpResponse.StatusCode >= 300 {
-		return successPayload, localVarHttpResponse, reportError(localVarHttpResponse.Status)
+		bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)
+		return successPayload, localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)
 	}
 
 	if err = json.NewDecoder(localVarHttpResponse.Body).Decode(&successPayload); err != nil {
@@ -502,7 +508,8 @@ func (a *FakeApiService) TestEndpointParameters(ctx context.Context, number floa
 	}
 	defer localVarHttpResponse.Body.Close()
 	if localVarHttpResponse.StatusCode >= 300 {
-		return localVarHttpResponse, reportError(localVarHttpResponse.Status)
+		bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)
+		return localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)
 	}
 
 	return localVarHttpResponse, err
@@ -606,7 +613,8 @@ func (a *FakeApiService) TestEnumParameters(ctx context.Context, localVarOptiona
 	}
 	defer localVarHttpResponse.Body.Close()
 	if localVarHttpResponse.StatusCode >= 300 {
-		return localVarHttpResponse, reportError(localVarHttpResponse.Status)
+		bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)
+		return localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)
 	}
 
 	return localVarHttpResponse, err
@@ -664,7 +672,8 @@ func (a *FakeApiService) TestInlineAdditionalProperties(ctx context.Context, par
 	}
 	defer localVarHttpResponse.Body.Close()
 	if localVarHttpResponse.StatusCode >= 300 {
-		return localVarHttpResponse, reportError(localVarHttpResponse.Status)
+		bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)
+		return localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)
 	}
 
 	return localVarHttpResponse, err
@@ -723,7 +732,8 @@ func (a *FakeApiService) TestJsonFormData(ctx context.Context, param string, par
 	}
 	defer localVarHttpResponse.Body.Close()
 	if localVarHttpResponse.StatusCode >= 300 {
-		return localVarHttpResponse, reportError(localVarHttpResponse.Status)
+		bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)
+		return localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)
 	}
 
 	return localVarHttpResponse, err
diff --git a/samples/client/petstore/go/go-petstore/fake_classname_tags123_api.go b/samples/client/petstore/go/go-petstore/fake_classname_tags123_api.go
@@ -11,6 +11,7 @@
 package petstore
 
 import (
+	"io/ioutil"
 	"net/url"
 	"net/http"
 	"strings"
@@ -91,7 +92,8 @@ func (a *FakeClassnameTags123ApiService) TestClassname(ctx context.Context, body
 	}
 	defer localVarHttpResponse.Body.Close()
 	if localVarHttpResponse.StatusCode >= 300 {
-		return successPayload, localVarHttpResponse, reportError(localVarHttpResponse.Status)
+		bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)
+		return successPayload, localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)
 	}
 
 	if err = json.NewDecoder(localVarHttpResponse.Body).Decode(&successPayload); err != nil {
diff --git a/samples/client/petstore/go/go-petstore/pet_api.go b/samples/client/petstore/go/go-petstore/pet_api.go
@@ -11,12 +11,12 @@
 package petstore
 
 import (
+	"io/ioutil"
 	"net/url"
 	"net/http"
 	"strings"
 	"golang.org/x/net/context"
 	"os"
-	"io/ioutil"
 	"encoding/json"
 	"fmt"
 )
@@ -83,7 +83,8 @@ func (a *PetApiService) AddPet(ctx context.Context, body Pet) ( *http.Response,
 	}
 	defer localVarHttpResponse.Body.Close()
 	if localVarHttpResponse.StatusCode >= 300 {
-		return localVarHttpResponse, reportError(localVarHttpResponse.Status)
+		bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)
+		return localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)
 	}
 
 	return localVarHttpResponse, err
@@ -150,7 +151,8 @@ func (a *PetApiService) DeletePet(ctx context.Context, petId int64, localVarOpti
 	}
 	defer localVarHttpResponse.Body.Close()
 	if localVarHttpResponse.StatusCode >= 300 {
-		return localVarHttpResponse, reportError(localVarHttpResponse.Status)
+		bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)
+		return localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)
 	}
 
 	return localVarHttpResponse, err
@@ -210,7 +212,8 @@ func (a *PetApiService) FindPetsByStatus(ctx context.Context, status []string) (
 	}
 	defer localVarHttpResponse.Body.Close()
 	if localVarHttpResponse.StatusCode >= 300 {
-		return successPayload, localVarHttpResponse, reportError(localVarHttpResponse.Status)
+		bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)
+		return successPayload, localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)
 	}
 
 	if err = json.NewDecoder(localVarHttpResponse.Body).Decode(&successPayload); err != nil {
@@ -275,7 +278,8 @@ func (a *PetApiService) FindPetsByTags(ctx context.Context, tags []string) ([]Pe
 	}
 	defer localVarHttpResponse.Body.Close()
 	if localVarHttpResponse.StatusCode >= 300 {
-		return successPayload, localVarHttpResponse, reportError(localVarHttpResponse.Status)
+		bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)
+		return successPayload, localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)
 	}
 
 	if err = json.NewDecoder(localVarHttpResponse.Body).Decode(&successPayload); err != nil {
@@ -352,7 +356,8 @@ func (a *PetApiService) GetPetById(ctx context.Context, petId int64) (Pet,  *htt
 	}
 	defer localVarHttpResponse.Body.Close()
 	if localVarHttpResponse.StatusCode >= 300 {
-		return successPayload, localVarHttpResponse, reportError(localVarHttpResponse.Status)
+		bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)
+		return successPayload, localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)
 	}
 
 	if err = json.NewDecoder(localVarHttpResponse.Body).Decode(&successPayload); err != nil {
@@ -417,7 +422,8 @@ func (a *PetApiService) UpdatePet(ctx context.Context, body Pet) ( *http.Respons
 	}
 	defer localVarHttpResponse.Body.Close()
 	if localVarHttpResponse.StatusCode >= 300 {
-		return localVarHttpResponse, reportError(localVarHttpResponse.Status)
+		bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)
+		return localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)
 	}
 
 	return localVarHttpResponse, err
@@ -491,7 +497,8 @@ func (a *PetApiService) UpdatePetWithForm(ctx context.Context, petId int64, loca
 	}
 	defer localVarHttpResponse.Body.Close()
 	if localVarHttpResponse.StatusCode >= 300 {
-		return localVarHttpResponse, reportError(localVarHttpResponse.Status)
+		bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)
+		return localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)
 	}
 
 	return localVarHttpResponse, err
@@ -569,7 +576,8 @@ func (a *PetApiService) UploadFile(ctx context.Context, petId int64, localVarOpt
 	}
 	defer localVarHttpResponse.Body.Close()
 	if localVarHttpResponse.StatusCode >= 300 {
-		return successPayload, localVarHttpResponse, reportError(localVarHttpResponse.Status)
+		bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)
+		return successPayload, localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)
 	}
 
 	if err = json.NewDecoder(localVarHttpResponse.Body).Decode(&successPayload); err != nil {
diff --git a/samples/client/petstore/go/go-petstore/store_api.go b/samples/client/petstore/go/go-petstore/store_api.go
@@ -11,6 +11,7 @@
 package petstore
 
 import (
+	"io/ioutil"
 	"net/url"
 	"net/http"
 	"strings"
@@ -80,7 +81,8 @@ func (a *StoreApiService) DeleteOrder(ctx context.Context, orderId string) ( *ht
 	}
 	defer localVarHttpResponse.Body.Close()
 	if localVarHttpResponse.StatusCode >= 300 {
-		return localVarHttpResponse, reportError(localVarHttpResponse.Status)
+		bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)
+		return localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)
 	}
 
 	return localVarHttpResponse, err
@@ -149,7 +151,8 @@ func (a *StoreApiService) GetInventory(ctx context.Context) (map[string]int32,
 	}
 	defer localVarHttpResponse.Body.Close()
 	if localVarHttpResponse.StatusCode >= 300 {
-		return successPayload, localVarHttpResponse, reportError(localVarHttpResponse.Status)
+		bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)
+		return successPayload, localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)
 	}
 
 	if err = json.NewDecoder(localVarHttpResponse.Body).Decode(&successPayload); err != nil {
@@ -220,7 +223,8 @@ func (a *StoreApiService) GetOrderById(ctx context.Context, orderId int64) (Orde
 	}
 	defer localVarHttpResponse.Body.Close()
 	if localVarHttpResponse.StatusCode >= 300 {
-		return successPayload, localVarHttpResponse, reportError(localVarHttpResponse.Status)
+		bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)
+		return successPayload, localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)
 	}
 
 	if err = json.NewDecoder(localVarHttpResponse.Body).Decode(&successPayload); err != nil {
@@ -286,7 +290,8 @@ func (a *StoreApiService) PlaceOrder(ctx context.Context, body Order) (Order,  *
 	}
 	defer localVarHttpResponse.Body.Close()
 	if localVarHttpResponse.StatusCode >= 300 {
-		return successPayload, localVarHttpResponse, reportError(localVarHttpResponse.Status)
+		bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)
+		return successPayload, localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)
 	}
 
 	if err = json.NewDecoder(localVarHttpResponse.Body).Decode(&successPayload); err != nil {
diff --git a/samples/client/petstore/go/go-petstore/user_api.go b/samples/client/petstore/go/go-petstore/user_api.go

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`package petstore`
`12`	`12`
`13`	`13`	`import (`
	`14`	`+ "io/ioutil"`
`14`	`15`	`"net/url"`
`15`	`16`	`"net/http"`
`16`	`17`	`"strings"`
`@@ -83,7 +84,8 @@ func (a *FakeApiService) FakeOuterBooleanSerialize(ctx context.Context, localVar`
`83`	`84`	`}`
`84`	`85`	`defer localVarHttpResponse.Body.Close()`
`85`	`86`	`if localVarHttpResponse.StatusCode >= 300 {`
`86`		`- return successPayload, localVarHttpResponse, reportError(localVarHttpResponse.Status)`
	`87`	`+ bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)`
	`88`	`+ return successPayload, localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)`
`87`	`89`	`}`
`88`	`90`
`89`	`91`	`if err = json.NewDecoder(localVarHttpResponse.Body).Decode(&successPayload); err != nil {`
`@@ -150,7 +152,8 @@ func (a *FakeApiService) FakeOuterCompositeSerialize(ctx context.Context, localV`
`150`	`152`	`}`
`151`	`153`	`defer localVarHttpResponse.Body.Close()`
`152`	`154`	`if localVarHttpResponse.StatusCode >= 300 {`
`153`		`- return successPayload, localVarHttpResponse, reportError(localVarHttpResponse.Status)`
	`155`	`+ bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)`
	`156`	`+ return successPayload, localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)`
`154`	`157`	`}`
`155`	`158`
`156`	`159`	`if err = json.NewDecoder(localVarHttpResponse.Body).Decode(&successPayload); err != nil {`
`@@ -217,7 +220,8 @@ func (a *FakeApiService) FakeOuterNumberSerialize(ctx context.Context, localVarO`
`217`	`220`	`}`
`218`	`221`	`defer localVarHttpResponse.Body.Close()`
`219`	`222`	`if localVarHttpResponse.StatusCode >= 300 {`
`220`		`- return successPayload, localVarHttpResponse, reportError(localVarHttpResponse.Status)`
	`223`	`+ bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)`
	`224`	`+ return successPayload, localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)`
`221`	`225`	`}`
`222`	`226`
`223`	`227`	`if err = json.NewDecoder(localVarHttpResponse.Body).Decode(&successPayload); err != nil {`
`@@ -284,7 +288,8 @@ func (a *FakeApiService) FakeOuterStringSerialize(ctx context.Context, localVarO`
`284`	`288`	`}`
`285`	`289`	`defer localVarHttpResponse.Body.Close()`
`286`	`290`	`if localVarHttpResponse.StatusCode >= 300 {`
`287`		`- return successPayload, localVarHttpResponse, reportError(localVarHttpResponse.Status)`
	`291`	`+ bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)`
	`292`	`+ return successPayload, localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)`
`288`	`293`	`}`
`289`	`294`
`290`	`295`	`if err = json.NewDecoder(localVarHttpResponse.Body).Decode(&successPayload); err != nil {`
`@@ -349,7 +354,8 @@ func (a *FakeApiService) TestClientModel(ctx context.Context, body Client) (Clie`
`349`	`354`	`}`
`350`	`355`	`defer localVarHttpResponse.Body.Close()`
`351`	`356`	`if localVarHttpResponse.StatusCode >= 300 {`
`352`		`- return successPayload, localVarHttpResponse, reportError(localVarHttpResponse.Status)`
	`357`	`+ bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)`
	`358`	`+ return successPayload, localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)`
`353`	`359`	`}`
`354`	`360`
`355`	`361`	`if err = json.NewDecoder(localVarHttpResponse.Body).Decode(&successPayload); err != nil {`
`@@ -502,7 +508,8 @@ func (a *FakeApiService) TestEndpointParameters(ctx context.Context, number floa`
`502`	`508`	`}`
`503`	`509`	`defer localVarHttpResponse.Body.Close()`
`504`	`510`	`if localVarHttpResponse.StatusCode >= 300 {`
`505`		`- return localVarHttpResponse, reportError(localVarHttpResponse.Status)`
	`511`	`+ bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)`
	`512`	`+ return localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)`
`506`	`513`	`}`
`507`	`514`
`508`	`515`	`return localVarHttpResponse, err`
`@@ -606,7 +613,8 @@ func (a *FakeApiService) TestEnumParameters(ctx context.Context, localVarOptiona`
`606`	`613`	`}`
`607`	`614`	`defer localVarHttpResponse.Body.Close()`
`608`	`615`	`if localVarHttpResponse.StatusCode >= 300 {`
`609`		`- return localVarHttpResponse, reportError(localVarHttpResponse.Status)`
	`616`	`+ bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)`
	`617`	`+ return localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)`
`610`	`618`	`}`
`611`	`619`
`612`	`620`	`return localVarHttpResponse, err`
`@@ -664,7 +672,8 @@ func (a *FakeApiService) TestInlineAdditionalProperties(ctx context.Context, par`
`664`	`672`	`}`
`665`	`673`	`defer localVarHttpResponse.Body.Close()`
`666`	`674`	`if localVarHttpResponse.StatusCode >= 300 {`
`667`		`- return localVarHttpResponse, reportError(localVarHttpResponse.Status)`
	`675`	`+ bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)`
	`676`	`+ return localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)`
`668`	`677`	`}`
`669`	`678`
`670`	`679`	`return localVarHttpResponse, err`
`@@ -723,7 +732,8 @@ func (a *FakeApiService) TestJsonFormData(ctx context.Context, param string, par`
`723`	`732`	`}`
`724`	`733`	`defer localVarHttpResponse.Body.Close()`
`725`	`734`	`if localVarHttpResponse.StatusCode >= 300 {`
`726`		`- return localVarHttpResponse, reportError(localVarHttpResponse.Status)`
	`735`	`+ bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)`
	`736`	`+ return localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)`
`727`	`737`	`}`
`728`	`738`
`729`	`739`	`return localVarHttpResponse, err`
Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,12 @@`
`11`	`11`	`package petstore`
`12`	`12`
`13`	`13`	`import (`
	`14`	`+ "io/ioutil"`
`14`	`15`	`"net/url"`
`15`	`16`	`"net/http"`
`16`	`17`	`"strings"`
`17`	`18`	`"golang.org/x/net/context"`
`18`	`19`	`"os"`
`19`		`- "io/ioutil"`
`20`	`20`	`"encoding/json"`
`21`	`21`	`"fmt"`
`22`	`22`	`)`
`@@ -83,7 +83,8 @@ func (a PetApiService) AddPet(ctx context.Context, body Pet) ( http.Response,`
`83`	`83`	`}`
`84`	`84`	`defer localVarHttpResponse.Body.Close()`
`85`	`85`	`if localVarHttpResponse.StatusCode >= 300 {`
`86`		`- return localVarHttpResponse, reportError(localVarHttpResponse.Status)`
	`86`	`+ bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)`
	`87`	`+ return localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)`
`87`	`88`	`}`
`88`	`89`
`89`	`90`	`return localVarHttpResponse, err`
`@@ -150,7 +151,8 @@ func (a *PetApiService) DeletePet(ctx context.Context, petId int64, localVarOpti`
`150`	`151`	`}`
`151`	`152`	`defer localVarHttpResponse.Body.Close()`
`152`	`153`	`if localVarHttpResponse.StatusCode >= 300 {`
`153`		`- return localVarHttpResponse, reportError(localVarHttpResponse.Status)`
	`154`	`+ bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)`
	`155`	`+ return localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)`
`154`	`156`	`}`
`155`	`157`
`156`	`158`	`return localVarHttpResponse, err`
`@@ -210,7 +212,8 @@ func (a *PetApiService) FindPetsByStatus(ctx context.Context, status []string) (`
`210`	`212`	`}`
`211`	`213`	`defer localVarHttpResponse.Body.Close()`
`212`	`214`	`if localVarHttpResponse.StatusCode >= 300 {`
`213`		`- return successPayload, localVarHttpResponse, reportError(localVarHttpResponse.Status)`
	`215`	`+ bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)`
	`216`	`+ return successPayload, localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)`
`214`	`217`	`}`
`215`	`218`
`216`	`219`	`if err = json.NewDecoder(localVarHttpResponse.Body).Decode(&successPayload); err != nil {`
`@@ -275,7 +278,8 @@ func (a *PetApiService) FindPetsByTags(ctx context.Context, tags []string) ([]Pe`
`275`	`278`	`}`
`276`	`279`	`defer localVarHttpResponse.Body.Close()`
`277`	`280`	`if localVarHttpResponse.StatusCode >= 300 {`
`278`		`- return successPayload, localVarHttpResponse, reportError(localVarHttpResponse.Status)`
	`281`	`+ bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)`
	`282`	`+ return successPayload, localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)`
`279`	`283`	`}`
`280`	`284`
`281`	`285`	`if err = json.NewDecoder(localVarHttpResponse.Body).Decode(&successPayload); err != nil {`
`@@ -352,7 +356,8 @@ func (a PetApiService) GetPetById(ctx context.Context, petId int64) (Pet, htt`
`352`	`356`	`}`
`353`	`357`	`defer localVarHttpResponse.Body.Close()`
`354`	`358`	`if localVarHttpResponse.StatusCode >= 300 {`
`355`		`- return successPayload, localVarHttpResponse, reportError(localVarHttpResponse.Status)`
	`359`	`+ bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)`
	`360`	`+ return successPayload, localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)`
`356`	`361`	`}`
`357`	`362`
`358`	`363`	`if err = json.NewDecoder(localVarHttpResponse.Body).Decode(&successPayload); err != nil {`
`@@ -417,7 +422,8 @@ func (a PetApiService) UpdatePet(ctx context.Context, body Pet) ( http.Respons`
`417`	`422`	`}`
`418`	`423`	`defer localVarHttpResponse.Body.Close()`
`419`	`424`	`if localVarHttpResponse.StatusCode >= 300 {`
`420`		`- return localVarHttpResponse, reportError(localVarHttpResponse.Status)`
	`425`	`+ bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)`
	`426`	`+ return localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)`
`421`	`427`	`}`
`422`	`428`
`423`	`429`	`return localVarHttpResponse, err`
`@@ -491,7 +497,8 @@ func (a *PetApiService) UpdatePetWithForm(ctx context.Context, petId int64, loca`
`491`	`497`	`}`
`492`	`498`	`defer localVarHttpResponse.Body.Close()`
`493`	`499`	`if localVarHttpResponse.StatusCode >= 300 {`
`494`		`- return localVarHttpResponse, reportError(localVarHttpResponse.Status)`
	`500`	`+ bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)`
	`501`	`+ return localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)`
`495`	`502`	`}`
`496`	`503`
`497`	`504`	`return localVarHttpResponse, err`
`@@ -569,7 +576,8 @@ func (a *PetApiService) UploadFile(ctx context.Context, petId int64, localVarOpt`
`569`	`576`	`}`
`570`	`577`	`defer localVarHttpResponse.Body.Close()`
`571`	`578`	`if localVarHttpResponse.StatusCode >= 300 {`
`572`		`- return successPayload, localVarHttpResponse, reportError(localVarHttpResponse.Status)`
	`579`	`+ bodyBytes, _ := ioutil.ReadAll(localVarHttpResponse.Body)`
	`580`	`+ return successPayload, localVarHttpResponse, reportError("Status: %v, Body: %s", localVarHttpResponse.Status, bodyBytes)`
`573`	`581`	`}`
`574`	`582`
`575`	`583`	`if err = json.NewDecoder(localVarHttpResponse.Body).Decode(&successPayload); err != nil {`