Merge remote-tracking branch 'origin/develop' into release/2.0.2

Author: hhund

dsf-bpe/dsf-bpe-process-api-v2-impl/src/main/java/dev/dsf/bpe/v2/variables/ObjectMapperFactory.java

@@ -19,10 +19,13 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 
 import ca.uhn.fhir.context.FhirContext;
 
@@ -37,9 +40,12 @@ public static ObjectMapper createObjectMapper(FhirContext fhirContext)
 		return JsonMapper.builder()
 				.defaultPropertyInclusion(JsonInclude.Value.construct(Include.NON_NULL, Include.NON_NULL))
 				.defaultPropertyInclusion(JsonInclude.Value.construct(Include.NON_EMPTY, Include.NON_EMPTY))
-				.addModule(fhirModule(fhirContext)).disable(MapperFeature.AUTO_DETECT_CREATORS)
-				.disable(MapperFeature.AUTO_DETECT_FIELDS).disable(MapperFeature.AUTO_DETECT_GETTERS)
-				.disable(MapperFeature.AUTO_DETECT_IS_GETTERS).disable(MapperFeature.AUTO_DETECT_SETTERS).build();
+				.addModule(fhirModule(fhirContext)).addModule(new JavaTimeModule())
+				.disable(MapperFeature.AUTO_DETECT_CREATORS).disable(MapperFeature.AUTO_DETECT_FIELDS)
+				.disable(MapperFeature.AUTO_DETECT_GETTERS).disable(MapperFeature.AUTO_DETECT_IS_GETTERS)
+				.disable(MapperFeature.AUTO_DETECT_SETTERS).disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
+				.enable(SerializationFeature.WRITE_DATES_WITH_ZONE_ID)
+				.disable(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE).build();
 	}
 
 	public static SimpleModule fhirModule(FhirContext fhirContext)

dsf-bpe/dsf-bpe-test-plugin-v2/src/main/java/dev/dsf/bpe/test/json/JsonPojo.java

@@ -15,15 +15,20 @@
  */
 package dev.dsf.bpe.test.json;
 
+import java.time.ZonedDateTime;
+
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-public record JsonPojo(@JsonProperty("value-1") String value1, @JsonProperty("value-2") String value2)
+public record JsonPojo(@JsonProperty("value-1") String value1, @JsonProperty("value-2") String value2,
+		@JsonProperty("zoned-date-time") ZonedDateTime zonedDateTime)
 {
 	@JsonCreator
-	public JsonPojo(@JsonProperty("value-1") String value1, @JsonProperty("value-2") String value2)
+	public JsonPojo(@JsonProperty("value-1") String value1, @JsonProperty("value-2") String value2,
+			@JsonProperty("zoned-date-time") ZonedDateTime zonedDateTime)
 	{
 		this.value1 = value1;
 		this.value2 = value2;
+		this.zonedDateTime = zonedDateTime;
 	}
 }

dsf-bpe/dsf-bpe-test-plugin-v2/src/main/java/dev/dsf/bpe/test/service/JsonVariableTestGet.java

@@ -42,6 +42,7 @@ public void getJsonVariable(Variables variables) throws Exception
 		expectNotNull(variable);
 		expectSame(JsonVariableTestSet.TEST_VALUE_1, variable.value1());
 		expectSame(JsonVariableTestSet.TEST_VALUE_2, variable.value2());
+		expectSame(JsonVariableTestSet.TEST_ZONED_DATE_TIME_VALUE, variable.zonedDateTime());
 	}
 
 	@PluginTest

dsf-bpe/dsf-bpe-test-plugin-v2/src/main/java/dev/dsf/bpe/test/service/JsonVariableTestSet.java

@@ -15,6 +15,8 @@
  */
 package dev.dsf.bpe.test.service;
 
+import java.time.ZonedDateTime;
+
 import dev.dsf.bpe.test.json.JsonPojo;
 import dev.dsf.bpe.v2.ProcessPluginApi;
 import dev.dsf.bpe.v2.activity.ServiceTask;
@@ -29,13 +31,14 @@ public class JsonVariableTestSet implements ServiceTask
 
 	public static final String TEST_VALUE_1 = "test-value-1";
 	public static final String TEST_VALUE_2 = "test-value-2";
+	public static final ZonedDateTime TEST_ZONED_DATE_TIME_VALUE = ZonedDateTime.now();
 	public static final String TEST_STRING = "test-string";
 	public static final Integer TEST_INTEGER = 42;
 
 	@Override
 	public void execute(ProcessPluginApi api, Variables variables) throws ErrorBoundaryEvent, Exception
 	{
-		variables.setJsonVariable(JSON_VARIABLE, new JsonPojo(TEST_VALUE_1, TEST_VALUE_2));
+		variables.setJsonVariable(JSON_VARIABLE, new JsonPojo(TEST_VALUE_1, TEST_VALUE_2, TEST_ZONED_DATE_TIME_VALUE));
 		variables.setString(STRING_VARIABLE, TEST_STRING);
 		variables.setInteger(INTEGER_VARIABLE, TEST_INTEGER);
 	}