Skip to content

Port config of default Jackson timestamp deserialization to kotlin #1388

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 29, 2022
Merged

Port config of default Jackson timestamp deserialization to kotlin #1388

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
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ plugins {
id 'org.cadixdev.licenser' version '0.6.1'
id 'com.palantir.git-version' version "${palantirGitVersionVersion}" apply false
id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
id 'com.diffplug.spotless' version '6.9.1' apply false
id 'com.diffplug.spotless' version '6.10.0' apply false
id 'com.github.nbaztec.coveralls-jacoco' version "1.2.14" apply false

// id 'org.jetbrains.kotlin.jvm' version '1.4.32'
Expand All @@ -29,7 +29,7 @@ allprojects {

ext {
// Platforms
grpcVersion = '1.48.1' // [1.34.0,)
grpcVersion = '1.49.0' // [1.34.0,)
jacksonVersion = '2.13.1' // [2.9.0,)
micrometerVersion = '1.9.3' // [1.0.0,)

Expand Down
2 changes: 1 addition & 1 deletion temporal-kotlin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'org.jlleitschuh.gradle.ktlint' version '10.3.0'
id 'org.jlleitschuh.gradle.ktlint' version '11.0.0'
}

apply plugin: 'org.jetbrains.kotlin.jvm'
Expand Down
12 changes: 2 additions & 10 deletions temporal-kotlin/src/main/kotlin/io/temporal/common/converter/KotlinObjectMapperFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,15 @@

package io.temporal.common.converter

import com.fasterxml.jackson.annotation.JsonAutoDetect
import com.fasterxml.jackson.annotation.PropertyAccessor
import com.fasterxml.jackson.databind.ObjectMapper
import com.fasterxml.jackson.databind.SerializationFeature
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
import com.fasterxml.jackson.module.kotlin.KotlinModule

class KotlinObjectMapperFactory {
companion object {
@JvmStatic
fun new(): ObjectMapper {
val mapper = ObjectMapper()
mapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false)
mapper.registerModule(JavaTimeModule())
mapper.registerModule(Jdk8Module())
mapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY)
val mapper = JacksonJsonPayloadConverter.newDefaultObjectMapper()

// use deprecated constructor instead of builder to maintain compatibility with old jackson versions
@Suppress("deprecation")
val km = KotlinModule()
Expand Down
15 changes: 13 additions & 2 deletions temporal-sdk/src/main/java/io/temporal/common/converter/JacksonJsonPayloadConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,14 @@ public class JacksonJsonPayloadConverter implements PayloadConverter {

private final ObjectMapper mapper;

public JacksonJsonPayloadConverter() {
mapper = new ObjectMapper();
/**
* Can be used as a starting point for custom user configurations of ObjectMapper.
*
* @return a default configuration of {@link ObjectMapper} used by {@link
* JacksonJsonPayloadConverter}.
*/
public static ObjectMapper newDefaultObjectMapper() {
ObjectMapper mapper = new ObjectMapper();
// preserve the original value of timezone coming from the server in Payload
// without adjusting to the host timezone
// may be important if the replay is happening on a host in another timezone
Expand All @@ -49,6 +55,11 @@ public JacksonJsonPayloadConverter() {
mapper.registerModule(new JavaTimeModule());
mapper.registerModule(new Jdk8Module());
mapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY);
return mapper;
}

public JacksonJsonPayloadConverter() {
this(newDefaultObjectMapper());
}

public JacksonJsonPayloadConverter(ObjectMapper mapper) {
Expand Down