Upgrade Jackson dependencies to v2.10.0

Netflix · Oct 15, 2019 · 8237ded · 8237ded
1 parent 56ebccb
commit 8237ded
Show file tree

Hide file tree

Showing 21 changed files with 9,415 additions and 59,242 deletions.
diff --git a/cassandra-persistence/dependencies.lock b/cassandra-persistence/dependencies.lock
diff --git a/client/dependencies.lock b/client/dependencies.lock
diff --git a/common/dependencies.lock b/common/dependencies.lock
diff --git a/common/src/main/java/com/netflix/conductor/common/utils/JsonMapperProvider.java b/common/src/main/java/com/netflix/conductor/common/utils/JsonMapperProvider.java
@@ -14,6 +14,7 @@
 import java.io.IOException;
 
 public class JsonMapperProvider implements Provider<ObjectMapper> {
+
     public JsonMapperProvider() {}
 
     /**
@@ -111,11 +112,11 @@ public Any deserialize(JsonParser p, DeserializationContext ctxt)
                 JsonNode value = root.get(JSON_VALUE);
 
                 if (type == null || !type.isTextual()) {
-                    throw ctxt.reportMappingException("invalid '@type' field when deserializing ProtoBuf Any object");
+                    ctxt.reportMappingException("invalid '@type' field when deserializing ProtoBuf Any object");
                 }
 
                 if (value == null || !value.isTextual()) {
-                    throw ctxt.reportMappingException("invalid '@value' field when deserializing ProtoBuf Any object");
+                    ctxt.reportMappingException("invalid '@value' field when deserializing ProtoBuf Any object");
                 }
 
                 return Any.newBuilder()
@@ -138,8 +139,7 @@ public ObjectMapper get() {
         objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         objectMapper.configure(DeserializationFeature.FAIL_ON_IGNORED_PROPERTIES, false);
         objectMapper.configure(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES, false);
-        objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
-        objectMapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
+        objectMapper.setDefaultPropertyInclusion(JsonInclude.Value.construct(JsonInclude.Include.NON_NULL, JsonInclude.Include.ALWAYS));
         objectMapper.registerModule(new JsonProtoModule());
         return objectMapper;
     }