use PropertyNamingStrategy's static field instead of new its subclass

bypass the potential deadlock when PropertyNamingStrategy class initialization see: FasterXML/jackson-databind#2715
fangwentong · May 9, 2020 · 92eb162 · 92eb162
1 parent 927fece
commit 92eb162
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...sdk-core/src/main/java/com/amazonaws/monitoring/internal/AsynchronousAgentDispatcher.java b/...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
@@ -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<JsonNode> {
 
     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;