[FAB-4317] Fix go 1.7 uint32 parsing in protolator

Under go 1.7, the defaults for JSON unmarshaling are different than for
go 1.8.  In particular, go 1.7 unmarshals numbers to the float64 type by
default, while go 1.8 unmarshals numbers to the json.Numeric type (which
stores both an int64 and float64 representation).

The float64 numbers cannot be converted to uint32 fields in the proto
structures, causing an error in decoding.

This CR switches from using the default json.Unmarshal method to a
custom json.Decoder to achieve the go 1.8 behavior in go 1.7.

Change-Id: I1d3a980f116dddb1749dc9110ffb4a94f2cc105c
Signed-off-by: Jason Yellick <[email protected]>

Author: Jason Yellick

common/tools/protolator/json.go

@@ -240,7 +240,9 @@ func mapToProto(tree map[string]interface{}, msg proto.Message) error {
 // and returns it, or error
 func jsonToMap(marshaled []byte) (map[string]interface{}, error) {
 	tree := make(map[string]interface{})
-	err := json.Unmarshal(marshaled, &tree)
+	d := json.NewDecoder(bytes.NewReader(marshaled))
+	d.UseNumber()
+	err := d.Decode(&tree)
 	if err != nil {
 		return nil, fmt.Errorf("error unmarshaling intermediate JSON: %s", err)
 	}

common/tools/protolator/json_test.go

@@ -18,7 +18,9 @@ package protolator
 
 import (
 	"bytes"
+	"encoding/json"
 	"fmt"
+	"math"
 	"reflect"
 	"testing"
 
@@ -235,3 +237,11 @@ func TestFailFactory(t *testing.T) {
 	var buffer bytes.Buffer
 	assert.Error(t, DeepMarshalJSON(&buffer, &testprotos.SimpleMsg{}))
 }
+
+func TestJSONUnmarshalMaxUint32(t *testing.T) {
+	fieldName := "numField"
+	jsonString := fmt.Sprintf("{\"%s\":%d}", fieldName, math.MaxUint32)
+	m, err := jsonToMap([]byte(jsonString))
+	assert.NoError(t, err)
+	assert.IsType(t, json.Number(""), m[fieldName])
+}