Throw exceptions when atempting to handling unsupport CloudEvent formats. (#362)

JemDay · web-flow · commit e2b13109e4a0 · 2021-03-26T09:55:23.000+01:00
- Modfy logic that selects between structured and binary modes during reception.
- Introduced new test scenarios to veify behavior.

Signed-off-by: Day, Jeremy(jday) &lt;jday@paypal.com&gt;
diff --git a/core/src/main/java/io/cloudevents/core/message/impl/MessageUtils.java b/core/src/main/java/io/cloudevents/core/message/impl/MessageUtils.java
@@ -59,6 +59,15 @@ public static MessageReader parseStructuredOrBinaryMessage(
             EventFormat format = EventFormatProvider.getInstance().resolveFormat(ct);
             if (format != null) {
                 return structuredMessageFactory.apply(format);
+            } else {
+                /**
+                 * The format wasn't one we support, but if it's part of the
+                 * CloudEvent family it indicates it's a structured
+                 * representation that we can't interpret.
+                 */
+                if (ct.startsWith("application/cloudevents")) {
+                    throw newUnknownEncodingException();
+                }
             }
         }
 
diff --git a/core/src/test/java/io/cloudevents/core/message/impl/MessageUtilsTest.java b/core/src/test/java/io/cloudevents/core/message/impl/MessageUtilsTest.java
@@ -27,6 +27,25 @@ void parseStructuredOrBinaryMessage_Exception() {
             .isEqualTo(CloudEventRWException.CloudEventRWExceptionKind.UNKNOWN_ENCODING);
     }
 
+
+    /**
+     * Verify an exception is thrown if an unsupported
+     * application/cloudevents content-type family is
+     * received.
+     */
+    @ParameterizedTest
+    @MethodSource
+    void testBadContentTypes(String contentType) {
+
+        CloudEventRWException exception = assertThrows(CloudEventRWException.class, () ->
+        {
+            parseStructuredOrBinaryMessage(() -> contentType, eventFormat -> null, () -> "1.0", specVersion -> null);
+        });
+
+        assertThat(exception.getKind()).isEqualTo(CloudEventRWException.CloudEventRWExceptionKind.UNKNOWN_ENCODING);
+
+    }
+
     @Test
     void testParseStructuredOrBinaryMessage_StructuredMode() {
         MessageUtils.parseStructuredOrBinaryMessage(() -> "application/cloudevents+csv;",
@@ -54,4 +73,11 @@ private static Stream<Arguments> testParseStructuredOrBinaryMessage_BinaryMode()
         );
     }
 
+    private static Stream<Arguments> testBadContentTypes() {
+        return Stream.of(
+            Arguments.of("application/cloudevents"),
+            Arguments.of("application/cloudevents+morse")
+        );
+    }
+
 }
