Merge pull request #1164 from alank-ps/main

fix: consumeData(and consumeDataAsBytes) should consider structued mode JSON …

Author: embano1

v2/event/content_type.go

@@ -14,6 +14,18 @@ const (
 	ApplicationCloudEventsBatchJSON = "application/cloudevents-batch+json"
 )
 
+// isJSON returns true if the content type is a JSON type.
+func isJSON(contentType string) bool {
+	switch contentType {
+	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/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 isJSON(mediaType) && !isBase64 {
 			stream.WriteObjectField("data")
 			_, err := stream.Write(in.DataEncoded)
 			if err != nil {

v2/event/event_unmarshal.go

@@ -365,8 +365,7 @@ func consumeDataAsBytes(e *Event, isBase64 bool, b []byte) error {
 	}
 
 	mt, _ := e.Context.GetDataMediaType()
-	// Empty content type assumes json
-	if mt != "" && mt != ApplicationJSON && mt != TextJSON {
+	if !isJSON(mt) {
 		// If not json, then data is encoded as string
 		iter := jsoniter.ParseBytes(jsoniter.ConfigFastest, b)
 		src := iter.ReadString() // handles escaping
@@ -402,7 +401,7 @@ func consumeData(e *Event, isBase64 bool, iter *jsoniter.Iterator) error {
 	}
 
 	mt, _ := e.Context.GetDataMediaType()
-	if mt != ApplicationJSON && mt != TextJSON {
+	if !isJSON(mt) {
 		// If not json, then data is encoded as string
 		src := iter.ReadString() // handles escaping
 		e.DataEncoded = []byte(src)

v2/event/event_unmarshal_test.go

@@ -198,6 +198,94 @@ func TestUnmarshal(t *testing.T) {
 				}),
 			},
 		},
+		"structured mode data v1.0": {
+			body: mustJsonMarshal(t, map[string]interface{}{
+				"specversion":     "1.0",
+				"datacontenttype": "application/cloudevents+json",
+				"data": map[string]interface{}{
+					"a": 42,
+					"b": "testing",
+				},
+				"id":         "ABC-123",
+				"time":       now.Format(time.RFC3339Nano),
+				"type":       "com.example.test",
+				"exbool":     true,
+				"exint":      42,
+				"exstring":   "exstring",
+				"exbinary":   "AAECAw==",
+				"exurl":      "http://example.com/source",
+				"extime":     now.Format(time.RFC3339Nano),
+				"dataschema": "http://example.com/schema",
+				"source":     "http://example.com/source",
+			}),
+			want: &event.Event{
+				Context: event.EventContextV1{
+					Type:            "com.example.test",
+					Source:          *sourceV1,
+					DataSchema:      schemaV1,
+					ID:              "ABC-123",
+					Time:            &now,
+					DataContentType: event.StringOfApplicationCloudEventsJSON(),
+					Extensions: map[string]interface{}{
+						"exbool":   true, // Boolean should be preserved
+						"exint":    int32(42),
+						"exstring": "exstring",
+						// Since byte, url and time are encoded as string, the unmarshal should just convert them to string
+						"exbinary": "AAECAw==",
+						"exurl":    "http://example.com/source",
+						"extime":   now.Format(time.RFC3339Nano),
+					},
+				}.AsV1(),
+				DataEncoded: mustJsonMarshal(t, DataExample{
+					AnInt:   42,
+					AString: "testing",
+				}),
+			},
+		},
+		"structured mode batch data v1.0": {
+			body: mustJsonMarshal(t, map[string]interface{}{
+				"specversion":     "1.0",
+				"datacontenttype": "application/cloudevents-batch+json",
+				"data": map[string]interface{}{
+					"a": 42,
+					"b": "testing",
+				},
+				"id":         "ABC-123",
+				"time":       now.Format(time.RFC3339Nano),
+				"type":       "com.example.test",
+				"exbool":     true,
+				"exint":      42,
+				"exstring":   "exstring",
+				"exbinary":   "AAECAw==",
+				"exurl":      "http://example.com/source",
+				"extime":     now.Format(time.RFC3339Nano),
+				"dataschema": "http://example.com/schema",
+				"source":     "http://example.com/source",
+			}),
+			want: &event.Event{
+				Context: event.EventContextV1{
+					Type:            "com.example.test",
+					Source:          *sourceV1,
+					DataSchema:      schemaV1,
+					ID:              "ABC-123",
+					Time:            &now,
+					DataContentType: event.StringOfApplicationCloudEventsBatchJSON(),
+					Extensions: map[string]interface{}{
+						"exbool":   true, // Boolean should be preserved
+						"exint":    int32(42),
+						"exstring": "exstring",
+						// Since byte, url and time are encoded as string, the unmarshal should just convert them to string
+						"exbinary": "AAECAw==",
+						"exurl":    "http://example.com/source",
+						"extime":   now.Format(time.RFC3339Nano),
+					},
+				}.AsV1(),
+				DataEncoded: mustJsonMarshal(t, DataExample{
+					AnInt:   42,
+					AString: "testing",
+				}),
+			},
+		},
 		"string data v1.0": {
 			body: mustJsonMarshal(t, map[string]interface{}{
 				"specversion":     "1.0",