From fcaebd73fbe4e6375a2ce989eed7178b763987fe Mon Sep 17 00:00:00 2001
From: kevin <wanjunfeng@gmail.com>
Date: Wed, 12 Aug 2020 14:44:09 +0800
Subject: [PATCH] remove bodyless check

---
 rest/httpx/requests.go      | 12 +-----------
 rest/httpx/requests_test.go | 20 --------------------
 rest/httpx/vars.go          |  4 ----
 3 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/rest/httpx/requests.go b/rest/httpx/requests.go
index 7f8d52cc..bf217da5 100644
--- a/rest/httpx/requests.go
+++ b/rest/httpx/requests.go
@@ -34,11 +34,7 @@ func Parse(r *http.Request, v interface{}) error {
 		return err
 	}
 
-	if r.ContentLength > 0 {
-		return ParseJsonBody(r, v)
-	}
-
-	return nil
+	return ParseJsonBody(r, v)
 }
 
 // Parses the form request.
@@ -87,12 +83,6 @@ func ParseHeader(headerValue string) map[string]string {
 
 // Parses the post request which contains json in body.
 func ParseJsonBody(r *http.Request, v interface{}) error {
-	switch r.Method {
-	case http.MethodDelete, http.MethodPatch, http.MethodPost, http.MethodPut:
-	default:
-		return ErrBodylessRequest
-	}
-
 	var reader io.Reader
 	if withJsonBody(r) {
 		reader = io.LimitReader(r.Body, maxBodyLen)
diff --git a/rest/httpx/requests_test.go b/rest/httpx/requests_test.go
index a6411479..49ecaa7e 100644
--- a/rest/httpx/requests_test.go
+++ b/rest/httpx/requests_test.go
@@ -134,26 +134,6 @@ func BenchmarkParseRaw(b *testing.B) {
 	}
 }
 
-func TestParseJsonBodyless(t *testing.T) {
-	methods := []string{
-		http.MethodConnect,
-		http.MethodGet,
-		http.MethodHead,
-		http.MethodOptions,
-		http.MethodTrace,
-	}
-
-	for _, method := range methods {
-		t.Run(method, func(t *testing.T) {
-			r, err := http.NewRequest(http.MethodGet, "http://hello.com", nil)
-			if err != nil {
-				t.Fatal(err)
-			}
-			assert.Equal(t, ErrBodylessRequest, ParseJsonBody(r, nil))
-		})
-	}
-}
-
 func BenchmarkParseAuto(b *testing.B) {
 	r, err := http.NewRequest(http.MethodGet, "http://hello.com/a?name=hello&age=18&percent=3.4", nil)
 	if err != nil {
diff --git a/rest/httpx/vars.go b/rest/httpx/vars.go
index 001d2d6d..3df99c8d 100644
--- a/rest/httpx/vars.go
+++ b/rest/httpx/vars.go
@@ -1,7 +1,5 @@
 package httpx
 
-import "errors"
-
 const (
 	ApplicationJson = "application/json"
 	ContentEncoding = "Content-Encoding"
@@ -19,5 +17,3 @@ const (
 	CodeSignatureWrongTime
 	CodeSignatureInvalidToken
 )
-
-var ErrBodylessRequest = errors.New("not a POST|PUT|PATCH|DELETE request")