Fix for "Lib can not be used with Jackson 2.10.0 or later" json-snapshot#27

metas-ts · metas-ts · commit f5daf2642ea8 · 2021-03-03T21:34:21.000+01:00
Slightly change the json formatter.
Means that one might have to search&amp;replace all existing snap files (if "strict" matching is used)
diff --git a/src/main/java/io/github/jsonSnapshot/SnapshotMatcher.java b/src/main/java/io/github/jsonSnapshot/SnapshotMatcher.java
@@ -24,7 +24,6 @@
 import com.fasterxml.jackson.core.util.DefaultIndenter;
 import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
 import com.fasterxml.jackson.core.util.DefaultPrettyPrinter.Indenter;
-import com.fasterxml.jackson.core.util.Separators;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 
@@ -128,17 +127,8 @@ static Function<Object, String> defaultJsonFunction() {
   }
 
   private static PrettyPrinter buildDefaultPrettyPrinter() {
-    DefaultPrettyPrinter pp =
-        new DefaultPrettyPrinter("") {
-          @Override
-          public DefaultPrettyPrinter withSeparators(Separators separators) {
-            this._separators = separators;
-            this._objectFieldValueSeparatorWithSpaces =
-                separators.getObjectFieldValueSeparator() + " ";
-            return this;
-          }
-        };
-    Indenter lfOnlyIndenter = new DefaultIndenter("  ", "\n");
+    final Indenter lfOnlyIndenter = new DefaultIndenter("  ", "\n");
+    final DefaultPrettyPrinter pp = new DefaultPrettyPrinter("");
     pp.indentArraysWith(lfOnlyIndenter);
     pp.indentObjectsWith(lfOnlyIndenter);
     return pp;
diff --git a/src/test/java/io/github/jsonSnapshot/BackwardCompatilbleTest.snap b/src/test/java/io/github/jsonSnapshot/BackwardCompatilbleTest.snap
@@ -1,19 +1,19 @@
 io.github.jsonSnapshot.BackwardCompatilbleTest.shouldExtractArgsFromFakeMethodWithComplexObject=[
   {
-    "FakeObject.fakeMethodWithComplexObject": [
+    "FakeObject.fakeMethodWithComplexObject" : [
       {
-        "arg0": {
-          "id": "idMock"
+        "arg0" : {
+          "id" : "idMock"
         }
       }
     ]
   },
   {
-    "FakeObject.fakeMethodWithComplexObject": [
+    "FakeObject.fakeMethodWithComplexObject" : [
       {
-        "arg0": {
-          "id": "idMock",
-          "name": "nameMock"
+        "arg0" : {
+          "id" : "idMock",
+          "name" : "nameMock"
         }
       }
     ]
@@ -23,18 +23,18 @@ io.github.jsonSnapshot.BackwardCompatilbleTest.shouldExtractArgsFromFakeMethodWi
 
 io.github.jsonSnapshot.BackwardCompatilbleTest.shouldExtractArgsFromMethod=[
   {
-    "FakeObject.fakeMethod": [
+    "FakeObject.fakeMethod" : [
       {
-        "arg0": "test1",
-        "arg1": 1,
-        "arg2": [
+        "arg0" : "test1",
+        "arg1" : 1,
+        "arg2" : [
           "listTest1"
         ]
       },
       {
-        "arg0": "test2",
-        "arg1": 2,
-        "arg2": [
+        "arg0" : "test2",
+        "arg1" : 2,
+        "arg2" : [
           "listTest1",
           "listTest2"
         ]
diff --git a/src/test/java/io/github/jsonSnapshot/SnapshotIntegrationTest.snap b/src/test/java/io/github/jsonSnapshot/SnapshotIntegrationTest.snap
@@ -1,52 +1,52 @@
 io.github.jsonSnapshot.SnapshotIntegrationTest.shouldMatchSnapshotFour=[
   {
-    "id": "anyId4",
-    "value": 4,
-    "name": "any\n\n\nName4"
+    "id" : "anyId4",
+    "value" : 4,
+    "name" : "any\n\n\nName4"
   }
 ]
 
 
 io.github.jsonSnapshot.SnapshotIntegrationTest.shouldMatchSnapshotInsidePrivateMethod=[
   {
-    "id": "anyPrivate",
-    "value": 5,
-    "name": "anyPrivate"
+    "id" : "anyPrivate",
+    "value" : 5,
+    "name" : "anyPrivate"
   }
 ]
 
 
 io.github.jsonSnapshot.SnapshotIntegrationTest.shouldMatchSnapshotOne=[
   {
-    "id": "anyId1",
-    "value": 1,
-    "name": "anyName1"
+    "id" : "anyId1",
+    "value" : 1,
+    "name" : "anyName1"
   }
 ]
 
 
 io.github.jsonSnapshot.SnapshotIntegrationTest.shouldMatchSnapshotThree=[
   {
-    "id": "anyId3",
-    "value": 3,
-    "name": "anyName3"
+    "id" : "anyId3",
+    "value" : 3,
+    "name" : "anyName3"
   }
 ]
 
 
 io.github.jsonSnapshot.SnapshotIntegrationTest.shouldMatchSnapshotTwo=[
   {
-    "id": "anyId2",
-    "value": 2,
-    "name": "anyName2"
+    "id" : "anyId2",
+    "value" : 2,
+    "name" : "anyName2"
   }
 ]
 
 
 io.github.jsonSnapshot.SnapshotIntegrationTest.shouldThrowSnapshotMatchException=[
   {
-    "id": "anyId5",
-    "value": 5,
-    "name": "anyName5"
+    "id" : "anyId5",
+    "value" : 5,
+    "name" : "anyName5"
   }
 ]
diff --git a/src/test/java/io/github/jsonSnapshot/SnapshotUtilsTest.snap b/src/test/java/io/github/jsonSnapshot/SnapshotUtilsTest.snap
@@ -1,17 +1,17 @@
 io.github.jsonSnapshot.SnapshotUtilsTest.shouldExtractArgsFromFakeMethod=[
   {
-    "FakeObject.fakeMethod": [
+    "FakeObject.fakeMethod" : [
       {
-        "arg0": "test1",
-        "arg1": 1,
-        "arg2": [
+        "arg0" : "test1",
+        "arg1" : 1,
+        "arg2" : [
           "listTest1"
         ]
       },
       {
-        "arg0": "test2",
-        "arg1": 2,
-        "arg2": [
+        "arg0" : "test2",
+        "arg1" : 2,
+        "arg2" : [
           "listTest1",
           "listTest2"
         ]
@@ -23,20 +23,20 @@ io.github.jsonSnapshot.SnapshotUtilsTest.shouldExtractArgsFromFakeMethod=[
 
 io.github.jsonSnapshot.SnapshotUtilsTest.shouldExtractArgsFromFakeMethodWithComplexFakeObject=[
   {
-    "FakeObject.fakeMethodWithComplexObject": [
+    "FakeObject.fakeMethodWithComplexObject" : [
       {
-        "arg0": {
-          "id": "idMock"
+        "arg0" : {
+          "id" : "idMock"
         }
       }
     ]
   },
   {
-    "FakeObject.fakeMethodWithComplexObject": [
+    "FakeObject.fakeMethodWithComplexObject" : [
       {
-        "arg0": {
-          "id": "idMock",
-          "name": "nameMock"
+        "arg0" : {
+          "id" : "idMock",
+          "name" : "nameMock"
         }
       }
     ]
@@ -46,20 +46,20 @@ io.github.jsonSnapshot.SnapshotUtilsTest.shouldExtractArgsFromFakeMethodWithComp
 
 io.github.jsonSnapshot.SnapshotUtilsTest.shouldExtractArgsFromFakeMethodWithComplexObject=[
   {
-    "FakeObject.fakeMethodWithComplexFakeObject": [
+    "FakeObject.fakeMethodWithComplexFakeObject" : [
       {
-        "arg0": {
-          "id": "idMock"
+        "arg0" : {
+          "id" : "idMock"
         }
       }
     ]
   },
   {
-    "FakeObject.fakeMethodWithComplexFakeObject": [
+    "FakeObject.fakeMethodWithComplexFakeObject" : [
       {
-        "arg0": {
-          "id": "idMock",
-          "name": "nameMock"
+        "arg0" : {
+          "id" : "idMock",
+          "name" : "nameMock"
         }
       }
     ]

Original file line number	Diff line number	Diff line change
`@@ -1,19 +1,19 @@`
`1`	`1`	`io.github.jsonSnapshot.BackwardCompatilbleTest.shouldExtractArgsFromFakeMethodWithComplexObject=[`
`2`	`2`	`{`
`3`		`- "FakeObject.fakeMethodWithComplexObject": [`
	`3`	`+ "FakeObject.fakeMethodWithComplexObject" : [`
`4`	`4`	`{`
`5`		`- "arg0": {`
`6`		`- "id": "idMock"`
	`5`	`+ "arg0" : {`
	`6`	`+ "id" : "idMock"`
`7`	`7`	`}`
`8`	`8`	`}`
`9`	`9`	`]`
`10`	`10`	`},`
`11`	`11`	`{`
`12`		`- "FakeObject.fakeMethodWithComplexObject": [`
	`12`	`+ "FakeObject.fakeMethodWithComplexObject" : [`
`13`	`13`	`{`
`14`		`- "arg0": {`
`15`		`- "id": "idMock",`
`16`		`- "name": "nameMock"`
	`14`	`+ "arg0" : {`
	`15`	`+ "id" : "idMock",`
	`16`	`+ "name" : "nameMock"`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`	`]`
`@@ -23,18 +23,18 @@ io.github.jsonSnapshot.BackwardCompatilbleTest.shouldExtractArgsFromFakeMethodWi`
`23`	`23`
`24`	`24`	`io.github.jsonSnapshot.BackwardCompatilbleTest.shouldExtractArgsFromMethod=[`
`25`	`25`	`{`
`26`		`- "FakeObject.fakeMethod": [`
	`26`	`+ "FakeObject.fakeMethod" : [`
`27`	`27`	`{`
`28`		`- "arg0": "test1",`
`29`		`- "arg1": 1,`
`30`		`- "arg2": [`
	`28`	`+ "arg0" : "test1",`
	`29`	`+ "arg1" : 1,`
	`30`	`+ "arg2" : [`
`31`	`31`	`"listTest1"`
`32`	`32`	`]`
`33`	`33`	`},`
`34`	`34`	`{`
`35`		`- "arg0": "test2",`
`36`		`- "arg1": 2,`
`37`		`- "arg2": [`
	`35`	`+ "arg0" : "test2",`
	`36`	`+ "arg1" : 2,`
	`37`	`+ "arg2" : [`
`38`	`38`	`"listTest1",`
`39`	`39`	`"listTest2"`
`40`	`40`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,52 +1,52 @@`
`1`	`1`	`io.github.jsonSnapshot.SnapshotIntegrationTest.shouldMatchSnapshotFour=[`
`2`	`2`	`{`
`3`		`- "id": "anyId4",`
`4`		`- "value": 4,`
`5`		`- "name": "any\n\n\nName4"`
	`3`	`+ "id" : "anyId4",`
	`4`	`+ "value" : 4,`
	`5`	`+ "name" : "any\n\n\nName4"`
`6`	`6`	`}`
`7`	`7`	`]`
`8`	`8`
`9`	`9`
`10`	`10`	`io.github.jsonSnapshot.SnapshotIntegrationTest.shouldMatchSnapshotInsidePrivateMethod=[`
`11`	`11`	`{`
`12`		`- "id": "anyPrivate",`
`13`		`- "value": 5,`
`14`		`- "name": "anyPrivate"`
	`12`	`+ "id" : "anyPrivate",`
	`13`	`+ "value" : 5,`
	`14`	`+ "name" : "anyPrivate"`
`15`	`15`	`}`
`16`	`16`	`]`
`17`	`17`
`18`	`18`
`19`	`19`	`io.github.jsonSnapshot.SnapshotIntegrationTest.shouldMatchSnapshotOne=[`
`20`	`20`	`{`
`21`		`- "id": "anyId1",`
`22`		`- "value": 1,`
`23`		`- "name": "anyName1"`
	`21`	`+ "id" : "anyId1",`
	`22`	`+ "value" : 1,`
	`23`	`+ "name" : "anyName1"`
`24`	`24`	`}`
`25`	`25`	`]`
`26`	`26`
`27`	`27`
`28`	`28`	`io.github.jsonSnapshot.SnapshotIntegrationTest.shouldMatchSnapshotThree=[`
`29`	`29`	`{`
`30`		`- "id": "anyId3",`
`31`		`- "value": 3,`
`32`		`- "name": "anyName3"`
	`30`	`+ "id" : "anyId3",`
	`31`	`+ "value" : 3,`
	`32`	`+ "name" : "anyName3"`
`33`	`33`	`}`
`34`	`34`	`]`
`35`	`35`
`36`	`36`
`37`	`37`	`io.github.jsonSnapshot.SnapshotIntegrationTest.shouldMatchSnapshotTwo=[`
`38`	`38`	`{`
`39`		`- "id": "anyId2",`
`40`		`- "value": 2,`
`41`		`- "name": "anyName2"`
	`39`	`+ "id" : "anyId2",`
	`40`	`+ "value" : 2,`
	`41`	`+ "name" : "anyName2"`
`42`	`42`	`}`
`43`	`43`	`]`
`44`	`44`
`45`	`45`
`46`	`46`	`io.github.jsonSnapshot.SnapshotIntegrationTest.shouldThrowSnapshotMatchException=[`
`47`	`47`	`{`
`48`		`- "id": "anyId5",`
`49`		`- "value": 5,`
`50`		`- "name": "anyName5"`
	`48`	`+ "id" : "anyId5",`
	`49`	`+ "value" : 5,`
	`50`	`+ "name" : "anyName5"`
`51`	`51`	`}`
`52`	`52`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,17 @@`
`1`	`1`	`io.github.jsonSnapshot.SnapshotUtilsTest.shouldExtractArgsFromFakeMethod=[`
`2`	`2`	`{`
`3`		`- "FakeObject.fakeMethod": [`
	`3`	`+ "FakeObject.fakeMethod" : [`
`4`	`4`	`{`
`5`		`- "arg0": "test1",`
`6`		`- "arg1": 1,`
`7`		`- "arg2": [`
	`5`	`+ "arg0" : "test1",`
	`6`	`+ "arg1" : 1,`
	`7`	`+ "arg2" : [`
`8`	`8`	`"listTest1"`
`9`	`9`	`]`
`10`	`10`	`},`
`11`	`11`	`{`
`12`		`- "arg0": "test2",`
`13`		`- "arg1": 2,`
`14`		`- "arg2": [`
	`12`	`+ "arg0" : "test2",`
	`13`	`+ "arg1" : 2,`
	`14`	`+ "arg2" : [`
`15`	`15`	`"listTest1",`
`16`	`16`	`"listTest2"`
`17`	`17`	`]`
`@@ -23,20 +23,20 @@ io.github.jsonSnapshot.SnapshotUtilsTest.shouldExtractArgsFromFakeMethod=[`
`23`	`23`
`24`	`24`	`io.github.jsonSnapshot.SnapshotUtilsTest.shouldExtractArgsFromFakeMethodWithComplexFakeObject=[`
`25`	`25`	`{`
`26`		`- "FakeObject.fakeMethodWithComplexObject": [`
	`26`	`+ "FakeObject.fakeMethodWithComplexObject" : [`
`27`	`27`	`{`
`28`		`- "arg0": {`
`29`		`- "id": "idMock"`
	`28`	`+ "arg0" : {`
	`29`	`+ "id" : "idMock"`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`	`]`
`33`	`33`	`},`
`34`	`34`	`{`
`35`		`- "FakeObject.fakeMethodWithComplexObject": [`
	`35`	`+ "FakeObject.fakeMethodWithComplexObject" : [`
`36`	`36`	`{`
`37`		`- "arg0": {`
`38`		`- "id": "idMock",`
`39`		`- "name": "nameMock"`
	`37`	`+ "arg0" : {`
	`38`	`+ "id" : "idMock",`
	`39`	`+ "name" : "nameMock"`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`]`
`@@ -46,20 +46,20 @@ io.github.jsonSnapshot.SnapshotUtilsTest.shouldExtractArgsFromFakeMethodWithComp`
`46`	`46`
`47`	`47`	`io.github.jsonSnapshot.SnapshotUtilsTest.shouldExtractArgsFromFakeMethodWithComplexObject=[`
`48`	`48`	`{`
`49`		`- "FakeObject.fakeMethodWithComplexFakeObject": [`
	`49`	`+ "FakeObject.fakeMethodWithComplexFakeObject" : [`
`50`	`50`	`{`
`51`		`- "arg0": {`
`52`		`- "id": "idMock"`
	`51`	`+ "arg0" : {`
	`52`	`+ "id" : "idMock"`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`	`]`
`56`	`56`	`},`
`57`	`57`	`{`
`58`		`- "FakeObject.fakeMethodWithComplexFakeObject": [`
	`58`	`+ "FakeObject.fakeMethodWithComplexFakeObject" : [`
`59`	`59`	`{`
`60`		`- "arg0": {`
`61`		`- "id": "idMock",`
`62`		`- "name": "nameMock"`
	`60`	`+ "arg0" : {`
	`61`	`+ "id" : "idMock",`
	`62`	`+ "name" : "nameMock"`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`	`]`