optimize SetError and SetResult

Author: imroc

client.go

@@ -1084,6 +1084,8 @@ func (c *Client) do(r *Request) (resp *Response, err error) {
 		r.trace = nil
 		r.ctx = nil
 		resp.body = nil
+		resp.result = nil
+		resp.error = nil
 	}
 
 	for _, f := range r.client.afterResponse {

middleware.go

@@ -274,25 +274,16 @@ func parseResponseBody(c *Client, r *Response) (err error) {
 	if r.StatusCode == http.StatusNoContent {
 		return
 	}
-	// Handles only JSON or XML content type
-	if r.Request.Result != nil {
-		if r.IsSuccess() {
-			err = unmarshalBody(c, r, r.Request.Result)
-			if err != nil {
-				r.Request.Result = nil
-			}
-		} else {
-			r.Request.Result = nil
+	if r.Request.Result != nil && r.IsSuccess() {
+		err = unmarshalBody(c, r, r.Request.Result)
+		if err == nil {
+			r.result = r.Request.Result
 		}
 	}
-	if r.Request.Error != nil {
-		if r.IsError() {
-			err = unmarshalBody(c, r, r.Request.Error)
-			if err != nil {
-				r.Request.Error = nil
-			}
-		} else {
-			r.Request.Error = nil
+	if r.Request.Error != nil && r.IsError() {
+		err = unmarshalBody(c, r, r.Request.Error)
+		if err == nil {
+			r.error = r.Request.Error
 		}
 	}
 	return

request.go

@@ -32,9 +32,11 @@ type Request struct {
 	RawRequest   *http.Request
 	StartTime    time.Time
 	RetryAttempt int
+	RawURL       string // read only
+	Method       string
 
-	RawURL                   string // read only
-	Method                   string
+	isMultiPart              bool
+	isSaveResponse           bool
 	URL                      *urlpkg.URL
 	getBody                  GetContentFunc
 	uploadCallback           UploadCallback
@@ -48,11 +50,9 @@ type Request struct {
 	dumpOptions              *DumpOptions
 	marshalBody              interface{}
 	ctx                      context.Context
-	isMultiPart              bool
 	uploadFiles              []*FileUpload
 	uploadReader             []io.ReadCloser
 	outputFile               string
-	isSaveResponse           bool
 	output                   io.Writer
 	trace                    *clientTrace
 	dumpBuffer               *bytes.Buffer
@@ -313,14 +313,14 @@ func (r *Request) SetDownloadCallbackWithInterval(callback DownloadCallback, min
 	return r
 }
 
-// SetResult set the result that response body will be unmarshaled to if
+// SetResult set the result that response body will be unmarshalled to if
 // request is success (status `code >= 200 and <= 299`).
 func (r *Request) SetResult(result interface{}) *Request {
 	r.Result = util.GetPointer(result)
 	return r
 }
 
-// SetError set the result that response body will be unmarshaled to if
+// SetError set the result that response body will be unmarshalled to if
 // request is error ( status `code >= 400`).
 func (r *Request) SetError(error interface{}) *Request {
 	r.Error = util.GetPointer(error)

response.go

@@ -13,6 +13,8 @@ type Response struct {
 	Request    *Request
 	body       []byte
 	receivedAt time.Time
+	error      interface{}
+	result     interface{}
 }
 
 // IsSuccess method returns true if HTTP status `code >= 200 and <= 299` otherwise false.
@@ -41,12 +43,12 @@ func (r *Response) GetContentType() string {
 
 // Result returns the response value as an object if it has one
 func (r *Response) Result() interface{} {
-	return r.Request.Result
+	return r.result
 }
 
 // Error returns the error object if it has one.
 func (r *Response) Error() interface{} {
-	return r.Request.Error
+	return r.error
 }
 
 // TraceInfo returns the TraceInfo from Request.