Skip to content

Let's stick to the old CloudEvents v1 spec and package for now #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 23, 2023
Merged

Let's stick to the old CloudEvents v1 spec and package for now #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions core/src/main/java/com/adobe/aio/util/JacksonUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
import com.fasterxml.jackson.databind.module.SimpleModule;
import com.fasterxml.jackson.databind.node.TextNode;
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import io.cloudevents.json.ZonedDateTimeDeserializer;
import io.cloudevents.json.ZonedDateTimeSerializer;
import io.openapitools.jackson.dataformat.hal.JacksonHALModule;
import java.time.ZonedDateTime;
import org.apache.commons.lang3.StringUtils;
Expand All @@ -31,13 +32,16 @@ private JacksonUtil() {
}

public static final ObjectMapper DEFAULT_OBJECT_MAPPER =
JsonMapper.builder()
.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
.serializationInclusion(Include.NON_NULL)
.addModule(new JacksonHALModule())
.addModule(new Jdk8Module())
.addModule(new JavaTimeModule())
.build();
JsonMapper.builder()
.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
.serializationInclusion(Include.NON_NULL)
.addModule(new SimpleModule()
.addSerializer(ZonedDateTime.class, new ZonedDateTimeSerializer())
.addDeserializer(ZonedDateTime.class, new ZonedDateTimeDeserializer()))
// let's stick to CloudEvents v1 ISO_OFFSET_DATE_TIME date format
.addModule(new JacksonHALModule())
.addModule(new Jdk8Module())
.build();

public static JsonNode getJsonNode(String jsonPayload) throws JsonProcessingException {
if (StringUtils.isEmpty(jsonPayload)) {
Expand Down
4 changes: 3 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,9 @@
<slf4j.version>2.0.7</slf4j.version>
<jackson.version>2.15.2</jackson.version>
<jjwt.version>0.11.5</jjwt.version>
<cloudevents.version>2.5.0</cloudevents.version>

<cloudevents.version>1.2.0</cloudevents.version>
<!-- we'll stick to this CloudEvents v1 version for now -->

<!-- https://github.com/openapi-tools/jackson-dataformat-hal/blob/v1.0.9/pom.xml -->
<jackson-dataformat-hal.version>1.0.9</jackson-dataformat-hal.version>
Expand Down