Skip to content

Commit

Permalink
support dynamic data content type
Browse files Browse the repository at this point in the history
Signed-off-by: Isaac Aymerich <[email protected]>
  • Loading branch information
iaymerich committed Aug 24, 2022
1 parent 9125136 commit d34b27f
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import io.cloudevents.rw.CloudEventRWException;

import java.io.IOException;
import java.util.regex.Pattern;

/**
* Implementation of {@link EventFormat} for <a href="https://github.com/cloudevents/spec/blob/v1.0/json-format.md">JSON event format</a>
Expand All @@ -43,7 +44,10 @@ public final class JsonFormat implements EventFormat {
* Content type associated with the JSON event format
*/
public static final String CONTENT_TYPE = "application/cloudevents+json";

/**
* Suppoted Content type
*/
private static final Pattern PATTERN_CONTENT_TYPE = Pattern.compile("^(application|text)\\/([a-zA-Z]+\\+)?json$");
private final ObjectMapper mapper;
private final JsonFormatOptions options;

Expand Down Expand Up @@ -214,6 +218,6 @@ public static SimpleModule getCloudEventJacksonModule(JsonFormatOptions options)

static boolean dataIsJsonContentType(String contentType) {
// If content type, spec states that we should assume is json
return contentType == null || contentType.startsWith("application/json") || contentType.startsWith("text/json");
return contentType == null || PATTERN_CONTENT_TYPE.matcher(contentType).matches();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,27 @@
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import io.cloudevents.CloudEvent;
import io.cloudevents.core.builder.CloudEventBuilder;
import io.cloudevents.core.impl.StringUtils;
import io.cloudevents.core.mock.MyCloudEventData;
import io.cloudevents.core.provider.EventFormatProvider;
import io.cloudevents.core.test.Data;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;

import java.util.stream.Stream;

import static org.assertj.core.api.Assertions.assertThat;

public class JsonCloudEventDataTest {

@Test
public void testMapper() {
@ParameterizedTest
@MethodSource("textContentArguments")
public void testMapper(String contentType) {
CloudEvent event = CloudEventBuilder.v1(Data.V1_MIN)
.withData("application/json", new JsonCloudEventData(JsonNodeFactory.instance.numberNode(10)))
.withData(contentType, new JsonCloudEventData(JsonNodeFactory.instance.numberNode(10)))
.build();

byte[] serialized = EventFormatProvider.getInstance().resolveFormat(JsonFormat.CONTENT_TYPE)
Expand All @@ -53,4 +61,11 @@ public void testMapper() {
.isEqualTo(10);
}

public static Stream<Arguments> textContentArguments() {
return Stream.of(
Arguments.of("application/json"),
Arguments.of("text/json"),
Arguments.of("application/fubar+json")
);
}
}

0 comments on commit d34b27f

Please sign in to comment.