From 4c3231ad61f0174a57cca4f3e3594f68bc1338f3 Mon Sep 17 00:00:00 2001
From: Robin Beer <RBeer@ibigroup.com>
Date: Mon, 17 Jan 2022 16:21:48 +0000
Subject: [PATCH 1/2] refactor(Update to work with the latest version of
 jackson databind): Updated dependency and object

---
 snapshot-matcher/pom.xml                              |  4 ++--
 snapshot-matcher/snapshot-matcher.iml                 | 11 +++--------
 .../snapshotmatcher/DeterministicObjectMapper.java    | 10 ++++++----
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/snapshot-matcher/pom.xml b/snapshot-matcher/pom.xml
index b3e7491..d7ca30a 100644
--- a/snapshot-matcher/pom.xml
+++ b/snapshot-matcher/pom.xml
@@ -6,12 +6,12 @@
 
     <groupId>com.zenika</groupId>
     <artifactId>snapshot-matcher</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <properties>
         <jdk.version>1.8</jdk.version>
-        <jackson.version>2.10.0</jackson.version>
+        <jackson.version>2.13.1</jackson.version>
         <diffutils.version>1.3.0</diffutils.version>
         <hamcrest.version>1.3</hamcrest.version>
         <maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
diff --git a/snapshot-matcher/snapshot-matcher.iml b/snapshot-matcher/snapshot-matcher.iml
index 7b69d98..a2b20a4 100644
--- a/snapshot-matcher/snapshot-matcher.iml
+++ b/snapshot-matcher/snapshot-matcher.iml
@@ -13,13 +13,8 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: com.googlecode.java-diff-utils:diffutils:1.3.0" level="project" />
     <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-all:1.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.4.6" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.4.6" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.4.0" level="project" />
-    <orderEntry type="library" name="Maven: com.googlecode.java-diff-utils:diffutils:1.3.0" level="project" />
-    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-all:1.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.4.6" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.4.6" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.4.0" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.13.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.13.1" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/snapshot-matcher/src/main/java/com/zenika/snapshotmatcher/DeterministicObjectMapper.java b/snapshot-matcher/src/main/java/com/zenika/snapshotmatcher/DeterministicObjectMapper.java
index 6d790b8..3c00788 100644
--- a/snapshot-matcher/src/main/java/com/zenika/snapshotmatcher/DeterministicObjectMapper.java
+++ b/snapshot-matcher/src/main/java/com/zenika/snapshotmatcher/DeterministicObjectMapper.java
@@ -7,6 +7,7 @@
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.json.JsonMapper;
 
 import java.io.IOException;
 import java.io.Writer;
@@ -29,10 +30,11 @@ class DeterministicObjectMapper {
     private final ObjectMapper objectMapper;
 
     DeterministicObjectMapper() {
-        objectMapper = new ObjectMapper()
-                .configure(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS, true)
-                .configure(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY, true)
-                .setSerializationInclusion(JsonInclude.Include.NON_NULL);
+        objectMapper = JsonMapper
+            .builder()
+            .configure(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS, true)
+            .configure(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY, true)
+            .build();
     }
 
     public void writeValue(Writer writer, Object o) throws IOException {

From 8408a16905e94ca2bb964f287dd341a1cfd4b3d6 Mon Sep 17 00:00:00 2001
From: Robin Beer <RBeer@ibigroup.com>
Date: Tue, 18 Jan 2022 07:54:14 +0000
Subject: [PATCH 2/2] refactor(DeterministicObjectMapper.java): Removed unused
 import

---
 .../com/zenika/snapshotmatcher/DeterministicObjectMapper.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/snapshot-matcher/src/main/java/com/zenika/snapshotmatcher/DeterministicObjectMapper.java b/snapshot-matcher/src/main/java/com/zenika/snapshotmatcher/DeterministicObjectMapper.java
index 3c00788..99b5b3d 100644
--- a/snapshot-matcher/src/main/java/com/zenika/snapshotmatcher/DeterministicObjectMapper.java
+++ b/snapshot-matcher/src/main/java/com/zenika/snapshotmatcher/DeterministicObjectMapper.java
@@ -1,6 +1,5 @@
 package com.zenika.snapshotmatcher;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.TreeNode;
 import com.fasterxml.jackson.databind.JsonNode;