From 6a8aae3c20becbee52080c1e0da91d389fc458d2 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Tue, 28 Feb 2023 16:22:48 +0100 Subject: [PATCH] GH-1003 Remove date configuration code when configuring insensitive properties of ObjectMapper Resolves #1003 --- .../function/adapter/aws/FunctionInvoker.java | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/FunctionInvoker.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/FunctionInvoker.java index 183b082f1..e1e706477 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/FunctionInvoker.java +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/src/main/java/org/springframework/cloud/function/adapter/aws/FunctionInvoker.java @@ -20,19 +20,12 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; import java.util.List; import java.util.Set; import com.amazonaws.services.lambda.runtime.Context; import com.amazonaws.services.lambda.runtime.RequestStreamHandler; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.MapperFeature; -import com.fasterxml.jackson.databind.module.SimpleModule; -import com.fasterxml.jackson.datatype.joda.JodaModule; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.reactivestreams.Publisher; @@ -146,18 +139,6 @@ public class FunctionInvoker implements RequestStreamHandler { if (this.jsonMapper instanceof JacksonMapper) { ((JacksonMapper) this.jsonMapper).configureObjectMapper(objectMapper -> { if (!objectMapper.isEnabled(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)) { - SimpleModule module = new SimpleModule(); - module.addDeserializer(Date.class, new JsonDeserializer() { - @Override - public Date deserialize(JsonParser jsonParser, DeserializationContext deserializationContext) - throws IOException { - Calendar calendar = Calendar.getInstance(); - calendar.setTimeInMillis(jsonParser.getValueAsLong()); - return calendar.getTime(); - } - }); - objectMapper.registerModule(module); - objectMapper.registerModule(new JodaModule()); objectMapper.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true); } });