Patched Query & Query worker to return raw JSON for custom unmarshaling.

marvin-hansen · May 16, 2022 · e0fbfd4 · e0fbfd4
1 parent 75efed2
commit e0fbfd4
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 7 deletions.
diff --git a/client_manager_query.go b/client_manager_query.go
@@ -54,7 +54,7 @@ func (c QueryManager) Query(fabric, query string, bindVars map[string]interface{
 
 	// Create a cursor for the query from the server
 	res = query_req.NewResponseForCreateCursor()
-	if err = c.client.Request(req, res); err != nil {
+	if err = c.client.requestJsonResponse(req, res); err != nil {
 		return nil, err
 	}
 
@@ -64,7 +64,7 @@ func (c QueryManager) Query(fabric, query string, bindVars map[string]interface{
 			// request update for the cursor
 			reqNext := query_req.NewRequestForReadNextCursor(fabric, res.Id)
 			responseNext := query_req.NewResponseForReadNextCursor()
-			if err = c.client.Request(reqNext, responseNext); err != nil {
+			if err = c.client.requestJsonResponse(reqNext, responseNext); err != nil {
 				return nil, err
 			}
 

diff --git a/client_manager_query_worker.go b/client_manager_query_worker.go
@@ -43,7 +43,7 @@ func (c QueryWorkerManager) RunQueryWorker(fabric, workerName, bindVars string)
 
 	req := qw_req.NewRequestForRunQueryWorker(fabric, workerName, bindVars)
 	res = qw_req.NewResponseForRunQueryWorker()
-	if err = c.client.Request(req, res); err != nil {
+	if err = c.client.requestJsonResponse(req, res); err != nil {
 		return nil, err
 	}
 
@@ -53,7 +53,7 @@ func (c QueryWorkerManager) RunQueryWorker(fabric, workerName, bindVars string)
 			// request update for the cursor
 			reqNext := qw_req.NewRequestForReadNextCursor(fabric, res.Id)
 			responseNext := qw_req.NewResponseForReadNextCursor()
-			if err = c.client.Request(reqNext, responseNext); err != nil {
+			if err = c.client.requestJsonResponse(reqNext, responseNext); err != nil {
 				return nil, err
 			}
 

diff --git a/client_util_print.go b/client_util_print.go
@@ -19,6 +19,6 @@ func PrintRes(res types.Responder, verbose bool) {
 
 func PrintJsonRes(res types.JsonResponder, verbose bool) {
 	if verbose {
-		println(res.String())
+		println(string(res.GetJsonMessage()))
 	}
 }
diff --git a/http_request.go b/http_request.go
@@ -21,6 +21,11 @@ func (c *Client) requestJsonResponse(req types.Requester, results types.JsonResp
 	}
 	// println(string(res.Body()))
 	results.SetJsonMessage(res.Body())
+	decErr := decode(res.Body(), results)
+	if decErr != nil {
+		// println("Decode error")
+		return decErr
+	}
 	return nil
 }
 

diff --git a/requests/query_req/shared.go b/requests/query_req/shared.go
@@ -14,9 +14,18 @@ type Cursor struct {
 	Id      string `json:"id"`
 	Cached  bool   `json:"cached"`
 	Result  Result `json:"result"`
+	json    []byte `json:"raw"`
 }
 
-func (r *Cursor) IsResponse() {}
+func (c *Cursor) IsJsonResponse() {}
+
+func (c *Cursor) SetJsonMessage(rawJson []byte) {
+	c.json = rawJson
+}
+
+func (c *Cursor) GetJsonMessage() []byte {
+	return c.json
+}
 
 func (c Cursor) Update(r *Cursor) {
 	c.Code = r.Code

diff --git a/tests/query/query_test.go b/tests/query/query_test.go
@@ -50,6 +50,7 @@ func TestQuery(t *testing.T) {
 	assert.NoError(t, err)
 	assert.NotNil(t, res)
 	goC8.PrintQuery(res, verbose)
+	goC8.PrintJsonRes(res, verbose)
 }
 
 func TestTeardown(t *testing.T) {

diff --git a/tests/query_worker/query_worker_test.go b/tests/query_worker/query_worker_test.go
@@ -46,7 +46,7 @@ func TestRunQueryWorker(t *testing.T) {
 
 	assert.NoError(t, err)
 	assert.NotNil(t, res)
-	goC8.PrintRes(res, verbose)
+	goC8.PrintJsonRes(res, verbose)
 }
 
 func TestReadAllQueryWorkers(t *testing.T) {