From 2182081831bb8959e88cdd8e69743b3fba56ab03 Mon Sep 17 00:00:00 2001
From: holooooo <844082183@qq.com>
Date: Tue, 25 May 2021 10:10:06 +0800
Subject: [PATCH] fix lint

---
 client/httplib/client_option_test.go | 17 +++++++++--------
 client/httplib/httpclient.go         |  4 ++--
 client/httplib/httpclient_test.go    | 11 +++++------
 client/httplib/httplib.go            |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/client/httplib/client_option_test.go b/client/httplib/client_option_test.go
index fd7ba7df..28cbc6fe 100644
--- a/client/httplib/client_option_test.go
+++ b/client/httplib/client_option_test.go
@@ -32,6 +32,7 @@ type respCarrier struct {
 func (r *respCarrier) SetBytes(bytes []byte) {
 	r.bytes = bytes
 }
+
 func (r *respCarrier) String() string {
 	return string(r.bytes)
 }
@@ -44,7 +45,7 @@ func TestOption_WithEnableCookie(t *testing.T) {
 	}
 
 	v := "smallfish"
-	var resp = &respCarrier{}
+	resp := &respCarrier{}
 	err = client.Get(resp, "/cookies/set?k1="+v)
 	if err != nil {
 		t.Fatal(err)
@@ -71,7 +72,7 @@ func TestOption_WithUserAgent(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	var resp = &respCarrier{}
+	resp := &respCarrier{}
 	err = client.Get(resp, "/headers")
 	if err != nil {
 		t.Fatal(err)
@@ -119,7 +120,7 @@ func TestOption_WithHTTPSetting(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	var resp = &respCarrier{}
+	resp := &respCarrier{}
 	err = client.Get(resp, "/get")
 	if err != nil {
 		t.Fatal(err)
@@ -139,7 +140,7 @@ func TestOption_WithHeader(t *testing.T) {
 	}
 	client.CommonOpts = append(client.CommonOpts, WithHeader("User-Agent", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.57 Safari/537.36"))
 
-	var resp = &respCarrier{}
+	resp := &respCarrier{}
 	err = client.Get(resp, "/headers")
 	if err != nil {
 		t.Fatal(err)
@@ -162,7 +163,7 @@ func TestOption_WithTokenFactory(t *testing.T) {
 			return "testauth"
 		}))
 
-	var resp = &respCarrier{}
+	resp := &respCarrier{}
 	err = client.Get(resp, "/headers")
 	if err != nil {
 		t.Fatal(err)
@@ -181,7 +182,7 @@ func TestOption_WithBasicAuth(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	var resp = &respCarrier{}
+	resp := &respCarrier{}
 	err = client.Get(resp, "/basic-auth/user/passwd",
 		WithBasicAuth(func() (string, string) {
 			return "user", "passwd"
@@ -203,7 +204,7 @@ func TestOption_WithContentType(t *testing.T) {
 	}
 
 	v := "application/json"
-	var resp = &respCarrier{}
+	resp := &respCarrier{}
 	err = client.Get(resp, "/headers", WithContentType(v))
 	if err != nil {
 		t.Fatal(err)
@@ -223,7 +224,7 @@ func TestOption_WithParam(t *testing.T) {
 	}
 
 	v := "smallfish"
-	var resp = &respCarrier{}
+	resp := &respCarrier{}
 	err = client.Get(resp, "/get", WithParam("username", v))
 	if err != nil {
 		t.Fatal(err)
diff --git a/client/httplib/httpclient.go b/client/httplib/httpclient.go
index 32ab4d6c..ef2e27eb 100644
--- a/client/httplib/httpclient.go
+++ b/client/httplib/httpclient.go
@@ -91,14 +91,14 @@ func (c *Client) handleResponse(value interface{}, req *BeegoHTTPRequest) error
 // handleCarrier set http data to value
 func (c *Client) handleCarrier(value interface{}, req *BeegoHTTPRequest) error {
 	resp, err := req.Response()
-	defer resp.Body.Close()
 	if err != nil {
 		return err
 	}
+	defer resp.Body.Close()
+
 	if value == nil {
 		return err
 	}
-
 	if carrier, ok := value.(HTTPResponseCarrier); ok {
 		b, err := req.Bytes()
 		if err != nil {
diff --git a/client/httplib/httpclient_test.go b/client/httplib/httpclient_test.go
index 6437e534..6bb00258 100644
--- a/client/httplib/httpclient_test.go
+++ b/client/httplib/httpclient_test.go
@@ -88,7 +88,7 @@ func TestClient_handleCarrier(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	var s = &slideShowResponse{}
+	s := &slideShowResponse{}
 	err = client.Get(s, "/json")
 	if err != nil {
 		t.Fatal(err)
@@ -143,7 +143,6 @@ func TestClient_Get(t *testing.T) {
 	assert.Equal(t, "Sample Slide Show", s.Slideshow.Title)
 	assert.Equal(t, 2, len(s.Slideshow.Slides))
 	assert.Equal(t, "Overview", s.Slideshow.Slides[1].Title)
-
 }
 
 func TestClient_Post(t *testing.T) {
@@ -152,7 +151,7 @@ func TestClient_Post(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	var resp = &slideShowResponse{}
+	resp := &slideShowResponse{}
 	err = client.Get(resp, "/json")
 	if err != nil {
 		t.Fatal(err)
@@ -173,7 +172,7 @@ func TestClient_Put(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	var resp = &slideShowResponse{}
+	resp := &slideShowResponse{}
 	err = client.Get(resp, "/json")
 	if err != nil {
 		t.Fatal(err)
@@ -194,7 +193,7 @@ func TestClient_Delete(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	var resp = &slideShowResponse{}
+	resp := &slideShowResponse{}
 	err = client.Delete(resp, "/delete")
 	if err != nil {
 		t.Fatal(err)
@@ -210,7 +209,7 @@ func TestClient_Head(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	var resp = &slideShowResponse{}
+	resp := &slideShowResponse{}
 	err = client.Head(resp, "")
 	if err != nil {
 		t.Fatal(err)
diff --git a/client/httplib/httplib.go b/client/httplib/httplib.go
index 6a78e13b..76583712 100644
--- a/client/httplib/httplib.go
+++ b/client/httplib/httplib.go
@@ -663,10 +663,10 @@ func (b *BeegoHTTPRequest) ToValue(value interface{}) error {
 	}
 
 	resp, err := b.Response()
-	defer resp.Body.Close()
 	if err != nil {
 		return err
 	}
+	defer resp.Body.Close()
 
 	contentType := strings.Split(resp.Header.Get(contentTypeKey), ";")[0]
 	// try to parse it as content type