fix: extract IsJson() check to content_type

Signed-off-by: Alan Kan <[email protected]>

Author: alank-ps

v2/event/content_type.go

@@ -14,6 +14,20 @@ const (
 	ApplicationCloudEventsBatchJSON = "application/cloudevents-batch+json"
 )
 
+type ContentType string
+
+// IsJSON returns true if the content type is a JSON type.
+func (c ContentType) IsJSON() bool {
+	switch c {
+	case ApplicationJSON, TextJSON, ApplicationCloudEventsJSON, ApplicationCloudEventsBatchJSON:
+		return true
+	case "":
+		return true // Empty content type assumes json
+	default:
+		return false
+	}
+}
+
 // StringOfApplicationJSON returns a string pointer to "application/json"
 func StringOfApplicationJSON() *string {
 	a := ApplicationJSON

v2/event/content_type_test.go

@@ -57,3 +57,27 @@ func TestStringOfApplicationCloudEventsBatchJSON(t *testing.T) {
 		t.Errorf("unexpected string (-want, +got) = %v", diff)
 	}
 }
+
+func TestContentTypeIsJSON(t *testing.T) {
+	tests := []struct {
+		name     string
+		ct       event.ContentType
+		expected bool
+	}{
+		{name: "Empty", ct: "", expected: true},
+		{name: "ApplicationJSON", ct: event.ApplicationJSON, expected: true},
+		{name: "TextJSON", ct: event.TextJSON, expected: true},
+		{name: "ApplicationCloudEventsJSON", ct: event.ApplicationCloudEventsJSON, expected: true},
+		{name: "ApplicationCloudEventsBatchJSON", ct: event.ApplicationCloudEventsBatchJSON, expected: true},
+		{name: "ApplicationXML", ct: event.ApplicationXML, expected: false},
+		{name: "TextPlain", ct: event.TextPlain, expected: false},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(t *testing.T) {
+			if got := tc.ct.IsJSON(); got != tc.expected {
+				t.Errorf("ContentType.IsJSON() = %v, want %v", got, tc.expected)
+			}
+		})
+	}
+}

v2/event/event_marshal.go

@@ -150,15 +150,8 @@ func WriteJson(in *Event, writer io.Writer) error {
 			mediaType = strings.TrimSpace(strings.ToLower(contentType[0:i]))
 		}
 
-		jsonMediaTypes := map[string]bool{
-			"":                              true,
-			ApplicationJSON:                 true,
-			TextJSON:                        true,
-			ApplicationCloudEventsJSON:      true,
-			ApplicationCloudEventsBatchJSON: true,
-		}
-		// If isJson and no encoding to base64, we don't need to perform additional steps
-		if jsonMediaTypes[mediaType] && !isBase64 {
+		// If IsJSON and no encoding to base64, we don't need to perform additional steps
+		if ContentType(mediaType).IsJSON() && !isBase64 {
 			stream.WriteObjectField("data")
 			_, err := stream.Write(in.DataEncoded)
 			if err != nil {

v2/event/event_unmarshal.go

@@ -365,7 +365,7 @@ func consumeDataAsBytes(e *Event, isBase64 bool, b []byte) error {
 	}
 
 	mt, _ := e.Context.GetDataMediaType()
-	if !isJson(mt) {
+	if !ContentType(mt).IsJSON() {
 		// If not json, then data is encoded as string
 		iter := jsoniter.ParseBytes(jsoniter.ConfigFastest, b)
 		src := iter.ReadString() // handles escaping
@@ -401,7 +401,7 @@ func consumeData(e *Event, isBase64 bool, iter *jsoniter.Iterator) error {
 	}
 
 	mt, _ := e.Context.GetDataMediaType()
-	if !isJson(mt) {
+	if !ContentType(mt).IsJSON() {
 		// If not json, then data is encoded as string
 		src := iter.ReadString() // handles escaping
 		e.DataEncoded = []byte(src)
@@ -415,16 +415,6 @@ func consumeData(e *Event, isBase64 bool, iter *jsoniter.Iterator) error {
 	return nil
 }
 
-func isJson(contentType string) bool {
-	return map[string]bool{
-		"":                              true, // Empty content type assumes json
-		ApplicationJSON:                 true,
-		TextJSON:                        true,
-		ApplicationCloudEventsJSON:      true,
-		ApplicationCloudEventsBatchJSON: true,
-	}[contentType]
-}
-
 func readUriRef(iter *jsoniter.Iterator) types.URIRef {
 	str := iter.ReadString()
 	uriRef := types.ParseURIRef(str)