gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-17 03:24:40 -07:00
Code Issues Packages Projects Releases Wiki Activity

initialize api response structs properly

Browse Source 
when go json marshal a unset []string it puts
null in the body and not [] which then makes
it an invalid list of strings.

Signed-off-by: R.I.Pienaar <rip@devco.net>
This commit is contained in:
R.I.Pienaar
2020-05-06 14:35:02 +02:00
committed by Derek Collison
parent ce26c65174
commit 85da492096
1 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
server/jetstream_api.go
View File

@@ -480,7 +480,13 @@ func (s *Server) jsTemplateCreateRequest(sub *subscription, c *client, subject,
return
}
var resp = JSApiStreamTemplateCreateResponse{ApiResponse: ApiResponse{Type: JSApiStreamTemplateCreateResponseType}}
var resp = JSApiStreamTemplateCreateResponse{
ApiResponse: ApiResponse{Type: JSApiStreamTemplateCreateResponseType},
StreamTemplateInfo: &StreamTemplateInfo{
Streams: []string{},
},
}
if !c.acc.JetStreamEnabled() {
resp.Error = jsNotEnabledErr
s.sendAPIResponse(c, subject, reply, string(msg), s.jsonResponse(&resp))
@@ -518,7 +524,11 @@ func (s *Server) jsTemplateNamesRequest(sub *subscription, c *client, subject, r
return
}
var resp = JSApiStreamTemplateNamesResponse{ApiResponse: ApiResponse{Type: JSApiStreamTemplateNamesResponseType}}
var resp = JSApiStreamTemplateNamesResponse{
ApiResponse: ApiResponse{Type: JSApiStreamTemplateNamesResponseType},
Templates: []string{},
}
if !c.acc.JetStreamEnabled() {
resp.Error = jsNotEnabledErr
s.sendAPIResponse(c, subject, reply, string(msg), s.jsonResponse(&resp))
@@ -561,7 +571,13 @@ func (s *Server) jsTemplateInfoRequest(sub *subscription, c *client, subject, re
return
}
var resp = JSApiStreamTemplateInfoResponse{ApiResponse: ApiResponse{Type: JSApiStreamTemplateInfoResponseType}}
var resp = JSApiStreamTemplateInfoResponse{
ApiResponse: ApiResponse{Type: JSApiStreamTemplateInfoResponseType},
StreamTemplateInfo: &StreamTemplateInfo{
Streams: []string{},
},
}
if !c.acc.JetStreamEnabled() {
resp.Error = jsNotEnabledErr
s.sendAPIResponse(c, subject, reply, string(msg), s.jsonResponse(&resp))
@@ -764,7 +780,11 @@ func (s *Server) jsStreamListRequest(sub *subscription, c *client, subject, repl
return
}
var resp = JSApiStreamListResponse{ApiResponse: ApiResponse{Type: JSApiStreamListResponseType}}
var resp = JSApiStreamListResponse{
ApiResponse: ApiResponse{Type: JSApiStreamListResponseType},
Streams: []*StreamInfo{},
}
if !c.acc.JetStreamEnabled() {
resp.Error = jsNotEnabledErr
s.sendAPIResponse(c, subject, reply, string(msg), s.jsonResponse(&resp))
@@ -1096,7 +1116,11 @@ func (s *Server) jsConsumerNamesRequest(sub *subscription, c *client, subject, r
return
}
var resp = JSApiConsumerNamesResponse{ApiResponse: ApiResponse{Type: JSApiConsumerNamesResponseType}}
var resp = JSApiConsumerNamesResponse{
ApiResponse: ApiResponse{Type: JSApiConsumerNamesResponseType},
Consumers: []string{},
}
if !c.acc.JetStreamEnabled() {
resp.Error = jsNotEnabledErr
s.sendAPIResponse(c, subject, reply, string(msg), s.jsonResponse(&resp))
@@ -1144,7 +1168,11 @@ func (s *Server) jsConsumerListRequest(sub *subscription, c *client, subject, re
return
}
var resp = JSApiConsumerListResponse{ApiResponse: ApiResponse{Type: JSApiConsumerListResponseType}}
var resp = JSApiConsumerListResponse{
ApiResponse: ApiResponse{Type: JSApiConsumerListResponseType},
Consumers: []*ConsumerInfo{},
}
if !c.acc.JetStreamEnabled() {
resp.Error = jsNotEnabledErr
s.sendAPIResponse(c, subject, reply, string(msg), s.jsonResponse(&resp))