Merge pull request #70 from anypointcloud/30-javautiloptionaljavalangstring-not-supported-by-default

Added JDK8 datatypes for JsonMapper

Author: mtransier

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>cloud.anypoint</groupId>
     <artifactId>json-logger</artifactId>
-    <version>3.0.3-SNAPSHOT</version>
+    <version>3.1.0-SNAPSHOT</version>
     <packaging>mule-extension</packaging>
     <name>JSON Logger</name>
 
@@ -103,6 +103,11 @@
             <artifactId>jackson-databind</artifactId>
             <version>2.20.1</version>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jdk8</artifactId>
+            <version>2.20.1</version>
+        </dependency>
         <dependency>
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>

src/main/java/org/mule/extension/jsonlogger/internal/datamask/JsonMasker.java

@@ -1,11 +1,14 @@
 package org.mule.extension.jsonlogger.internal.datamask;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.core.JsonProcessingException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Pattern;
+
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.MapperFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.TextNode;
@@ -14,9 +17,6 @@
 import com.jayway.jsonpath.Option;
 import com.jayway.jsonpath.spi.json.JacksonJsonNodeJsonProvider;
 
-import java.util.*;
-import java.util.regex.Pattern;
-
 public class JsonMasker {
 
     private static final Pattern digits = Pattern.compile("\\d");
@@ -130,4 +130,4 @@ private static String maskNumber(String value) {
         return value.replaceAll("[0-9]", "*");
     }
 
-}
+}

src/main/java/org/mule/extension/jsonlogger/internal/singleton/ObjectMapperSingleton.java

@@ -1,17 +1,17 @@
 package org.mule.extension.jsonlogger.internal.singleton;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.MapperFeature;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 
 public class ObjectMapperSingleton {
 
     // JSON Object Mapper
-    private final ObjectMapper om = new ObjectMapper()
-            .setSerializationInclusion(JsonInclude.Include.NON_NULL);
-//            .configure(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY, true)
-//            .configure(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS, true);
+    private final ObjectMapper om = JsonMapper.builder()
+            .addModule(new Jdk8Module())
+            .serializationInclusion(Include.NON_NULL)
+            .build();
 
     public ObjectMapper getObjectMapper() {
         return this.om;