Merge pull request #1318 from agis/types-json-null-handling

Fix types.JSON.MarshalJSON to handle nil values

Author: stephenafamo

types/json.go

@@ -46,6 +46,9 @@ func (j *JSON) UnmarshalJSON(data []byte) error {
 
 // MarshalJSON returns j as the JSON encoding of j.
 func (j JSON) MarshalJSON() ([]byte, error) {
+	if j == nil {
+		return []byte("null"), nil
+	}
 	return j, nil
 }
 

types/json_test.go

@@ -76,6 +76,20 @@ func TestJSONUnmarshalJSON(t *testing.T) {
 	}
 }
 
+func TestJSONMarshalJSON_Null(t *testing.T) {
+	t.Parallel()
+
+	var j JSON
+	res, err := j.MarshalJSON()
+	if err != nil {
+		t.Error(err)
+	}
+
+	if !bytes.Equal(res, []byte(`null`)) {
+		t.Errorf("Expected %q, got %v", `null`, res)
+	}
+}
+
 func TestJSONMarshalJSON(t *testing.T) {
 	t.Parallel()