Merge remote-tracking branch 'origin/melody-data-server-dev' into melody-data-server-dev

Author: Verthandii

Diff for: encoding/json.go

@@ -13,8 +13,6 @@ func NewJSONDecoder(isCollection bool) func(io.Reader, *map[string]interface{})
 	} else {
 		return JSONDecoder()
 	}
-
-	return nil
 }
 
 func JSONDecoder() Decoder {

Diff for: proxy/http_response.go

@@ -39,6 +39,6 @@ func DefaultHTTPResponseParserFactory(cfg HTTPResponseParserConfig) HTTPResponse
 			IsComplete: true,
 		}
 		response = cfg.EntityFormatter.Format(response)
-		return &response, err
+		return &response, nil
 	}
 }