From 92eb162a81e9c1b78d07a430c5a290519d7e7335 Mon Sep 17 00:00:00 2001 From: fangwentong Date: Sun, 10 May 2020 02:57:29 +0800 Subject: [PATCH] use PropertyNamingStrategy's static field instead of new its subclass bypass the potential deadlock when PropertyNamingStrategy class initialization see: https://github.com/FasterXML/jackson-databind/issues/2715 --- .../monitoring/internal/AsynchronousAgentDispatcher.java | 2 +- .../java/com/amazonaws/transform/JsonErrorUnmarshaller.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/aws-java-sdk-core/src/main/java/com/amazonaws/monitoring/internal/AsynchronousAgentDispatcher.java b/aws-java-sdk-core/src/main/java/com/amazonaws/monitoring/internal/AsynchronousAgentDispatcher.java index 211e9f05458b..cd556d14490a 100644 --- a/aws-java-sdk-core/src/main/java/com/amazonaws/monitoring/internal/AsynchronousAgentDispatcher.java +++ b/aws-java-sdk-core/src/main/java/com/amazonaws/monitoring/internal/AsynchronousAgentDispatcher.java @@ -57,7 +57,7 @@ public class AsynchronousAgentDispatcher { private AsynchronousAgentDispatcher() { this.writer = new ObjectMapper() .setSerializationInclusion(JsonInclude.Include.NON_NULL) - .setPropertyNamingStrategy(new PropertyNamingStrategy.PascalCaseStrategy()) + .setPropertyNamingStrategy(PropertyNamingStrategy.PASCAL_CASE_TO_CAMEL_CASE) .writer(); } diff --git a/aws-java-sdk-core/src/main/java/com/amazonaws/transform/JsonErrorUnmarshaller.java b/aws-java-sdk-core/src/main/java/com/amazonaws/transform/JsonErrorUnmarshaller.java index a8b4c5712360..85fe06fe87d6 100644 --- a/aws-java-sdk-core/src/main/java/com/amazonaws/transform/JsonErrorUnmarshaller.java +++ b/aws-java-sdk-core/src/main/java/com/amazonaws/transform/JsonErrorUnmarshaller.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.PropertyNamingStrategy.PascalCaseStrategy; +import com.fasterxml.jackson.databind.PropertyNamingStrategy; /** * Unmarshaller for JSON error responses from AWS services. @@ -34,7 +34,7 @@ public class JsonErrorUnmarshaller extends AbstractErrorUnmarshaller { private static final ObjectMapper MAPPER = new ObjectMapper().configure( DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).setPropertyNamingStrategy( - new PascalCaseStrategy()); + PropertyNamingStrategy.PASCAL_CASE_TO_CAMEL_CASE); private final String handledErrorCode;