GH-77: Ensured empty request payload is properly handled.

Added tests with empty request payload.

queryevent.go

@@ -149,15 +149,18 @@ func (qe *queryEvent) handleQueryRequest(m *nats.Msg) {
 	}
 
 	var rqr resQueryRequest
-	err := json.Unmarshal(m.Data, &rqr)
-	if err != nil {
-		s.errorf("Error unmarshaling incoming query request: %s", err)
-		qr.error(ToError(err))
-		return
+	var err error
+	if len(m.Data) > 0 {
+		err = json.Unmarshal(m.Data, &rqr)
+		if err != nil {
+			s.errorf("Error unmarshaling incoming query request: %s", err)
+			qr.error(ToError(err))
+			return
+		}
 	}
 
 	if rqr.Query == "" {
-		s.errorf("Missing query on incoming query request: %s", err)
+		s.errorf("Missing query on incoming query request: %s", m.Data)
 		qr.reply(responseMissingQuery)
 		return
 	}

request.go

@@ -401,12 +401,11 @@ func (r *Request) New(rid Ref) {
 //
 // Only valid for call and auth requests.
 func (r *Request) ParseParams(p interface{}) {
-	if len(r.params) == 0 {
-		return
-	}
-	err := json.Unmarshal(r.params, p)
-	if err != nil {
-		panic(&Error{Code: CodeInvalidParams, Message: err.Error()})
+	if len(r.params) > 0 {
+		err := json.Unmarshal(r.params, p)
+		if err != nil {
+			panic(&Error{Code: CodeInvalidParams, Message: err.Error()})
+		}
 	}
 }
 
@@ -416,12 +415,11 @@ func (r *Request) ParseParams(p interface{}) {
 //
 // Not valid for get requests.
 func (r *Request) ParseToken(t interface{}) {
-	if len(r.token) == 0 {
-		return
-	}
-	err := json.Unmarshal(r.token, t)
-	if err != nil {
-		panic(InternalError(err))
+	if len(r.token) > 0 {
+		err := json.Unmarshal(r.token, t)
+		if err != nil {
+			panic(InternalError(err))
+		}
 	}
 }
 

test/03get_request_test.go

@@ -592,3 +592,16 @@ func TestGet_WithMultipleResponses_CausesPanic(t *testing.T) {
 			AssertModel(mock.Model)
 	})
 }
+
+func TestGetResource_WithEmptyRequestPayload_ReturnsModel(t *testing.T) {
+	runTest(t, func(s *res.Service) {
+		s.Handle("model.foo", res.GetResource(func(r res.GetRequest) {
+			r.Model(mock.Model)
+		}))
+	}, func(s *restest.Session) {
+		inb := s.RequestRaw("get.test.model.foo", nil)
+		s.GetMsg().
+			AssertSubject(inb).
+			AssertModel(mock.Model)
+	})
+}

test/04call_request_test.go

@@ -434,3 +434,16 @@ func TestCallRequest_InvalidJSON_RespondsWithInternalError(t *testing.T) {
 			AssertErrorCode(res.CodeInternalError)
 	})
 }
+
+func TestCallRequest_WithEmptyRequestPayload_ReturnsResult(t *testing.T) {
+	runTest(t, func(s *res.Service) {
+		s.Handle("model.foo",
+			res.Call("method", func(r res.CallRequest) { r.OK(nil) }),
+		)
+	}, func(s *restest.Session) {
+		inb := s.RequestRaw("call.test.model.foo.method", nil)
+		s.GetMsg().
+			AssertSubject(inb).
+			AssertResult(nil)
+	})
+}

test/06auth_request_test.go

@@ -453,3 +453,16 @@ func TestAuthRequest_InvalidJSON_RespondsWithInternalError(t *testing.T) {
 			AssertErrorCode(res.CodeInternalError)
 	})
 }
+
+func TestAuthRequest_WithEmptyRequestPayload_ReturnsResult(t *testing.T) {
+	runTest(t, func(s *res.Service) {
+		s.Handle("model.foo",
+			res.Auth("method", func(r res.AuthRequest) { r.OK(nil) }),
+		)
+	}, func(s *restest.Session) {
+		inb := s.RequestRaw("auth.test.model.foo.method", nil)
+		s.GetMsg().
+			AssertSubject(inb).
+			AssertResult(nil)
+	})
+}