#minor: Make Jackson Plugin unique in order to support Java9 modules (#…

…110) BREAKING! Manual update to "snapshot.properites" required Before ``` serializer.json=au.com.origin.snapshots.serializers.JacksonSnapshotSerializer serializer.orderedJson=au.com.origin.snapshots.serializers.DeterministicJacksonSnapshotSerializer ``` After ``` serializer.json=au.com.origin.snapshots.jackson.serializers.JacksonSnapshotSerializer serializer.orderedJson=au.com.origin.snapshots.jackson.serializers.DeterministicJacksonSnapshotSerializer ``` You will also need to manually update any imports in java code if you have used them
origin-energy · Oct 29, 2022 · 08f207e · 08f207e
1 parent f2ffc12
commit 08f207e
Show file tree

Hide file tree

Showing 24 changed files with 42 additions and 315 deletions.
diff --git a/README.md b/README.md
@@ -48,8 +48,8 @@ testRuntimeOnly 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.3'
  ```text
 serializer=au.com.origin.snapshots.serializers.ToStringSnapshotSerializer
 serializer.base64=au.com.origin.snapshots.serializers.Base64SnapshotSerializer
-serializer.json=au.com.origin.snapshots.serializers.JacksonSnapshotSerializer
-serializer.orderedJson=au.com.origin.snapshots.serializers.DeterministicJacksonSnapshotSerializer
+serializer.json=au.com.origin.snapshots.jackson.serializers.JacksonSnapshotSerializer
+serializer.orderedJson=au.com.origin.snapshots.jackson.serializers.DeterministicJacksonSnapshotSerializer
 comparator=au.com.origin.snapshots.comparators.PlainTextEqualsComparator
 reporters=au.com.origin.snapshots.reporters.PlainTextSnapshotReporter
 snapshot-dir=__snapshots__
@@ -461,8 +461,8 @@ For example:
  ```text
 serializer=au.com.origin.snapshots.serializers.ToStringSnapshotSerializer
 serializer.base64=au.com.origin.snapshots.serializers.Base64SnapshotSerializer
-serializer.json=au.com.origin.snapshots.serializers.JacksonSnapshotSerializer
-serializer.orderedJson=au.com.origin.snapshots.serializers.DeterministicJacksonSnapshotSerializer
+serializer.json=au.com.origin.snapshots.jackson.serializers.JacksonSnapshotSerializer
+serializer.orderedJson=au.com.origin.snapshots.jackson.serializers.DeterministicJacksonSnapshotSerializer
 comparator=au.com.origin.snapshots.comparators.PlainTextEqualsComparator
 reporters=au.com.origin.snapshots.reporters.PlainTextSnapshotReporter
 snapshot-dir=__snapshots__
@@ -586,7 +586,7 @@ For example, the following will exclude the rendering of Lists without changing
 ```java
 package au.com.origin.snapshots.docs;
 
-import au.com.origin.snapshots.serializers.DeterministicJacksonSnapshotSerializer;
+import au.com.origin.snapshots.jackson.serializers.DeterministicJacksonSnapshotSerializer;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreType;

diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,2 @@
 group=io.github.origin-energy
-version=3.3.9-SNAPSHOT
+version=3.1.0-SNAPSHOT
diff --git a/java-snapshot-testing-core/src/main/java/au/com/origin/snapshots/SnapshotFile.java b/java-snapshot-testing-core/src/main/java/au/com/origin/snapshots/SnapshotFile.java
@@ -103,7 +103,7 @@ public void pushDebugSnapshot(String snapshot) {
     updateFile(getDebugFilename(), rawDebugSnapshots);
   }
 
-  private void updateFile(String fileName, Set<String> rawSnapshots) {
+  private synchronized void updateFile(String fileName, Set<String> rawSnapshots) {
     File file = createFileIfNotExists(fileName);
     try (FileOutputStream fileStream = new FileOutputStream(file, false)) {
       byte[] myBytes = String.join(SPLIT_STRING, rawSnapshots).getBytes(StandardCharsets.UTF_8);

diff --git a/...-snapshot-testing-junit5/src/test/java/au/com/origin/snapshots/SnapshotParameterTest.java b/...-snapshot-testing-junit5/src/test/java/au/com/origin/snapshots/SnapshotParameterTest.java
@@ -1,7 +1,7 @@
 package au.com.origin.snapshots;
 
 import au.com.origin.snapshots.junit5.SnapshotExtension;
-import au.com.origin.snapshots.serializers.JacksonSnapshotSerializer;
+import au.com.origin.snapshots.jackson.serializers.JacksonSnapshotSerializer;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;

diff --git a/java-snapshot-testing-junit5/src/test/resources/snapshot.properties b/java-snapshot-testing-junit5/src/test/resources/snapshot.properties
@@ -1,5 +1,5 @@
 serializer=au.com.origin.snapshots.serializers.ToStringSnapshotSerializer
-serializer.json=au.com.origin.snapshots.serializers.DeterministicJacksonSnapshotSerializer
+serializer.json=au.com.origin.snapshots.jackson.serializers.DeterministicJacksonSnapshotSerializer
 comparator=au.com.origin.snapshots.comparators.PlainTextEqualsComparator
 reporters=au.com.origin.snapshots.reporters.PlainTextSnapshotReporter
 snapshot-dir=__snapshots__

diff --git a/...lizers/DeterministicCollectionModule.java → ...lizers/DeterministicCollectionModule.java b/...lizers/DeterministicCollectionModule.java → ...lizers/DeterministicCollectionModule.java
@@ -1,4 +1,4 @@
-package au.com.origin.snapshots.serializers;
+package au.com.origin.snapshots.jackson.serializers;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.JsonSerializer;

diff --git a/...terministicJacksonSnapshotSerializer.java → ...terministicJacksonSnapshotSerializer.java b/...terministicJacksonSnapshotSerializer.java → ...terministicJacksonSnapshotSerializer.java
@@ -1,4 +1,4 @@
-package au.com.origin.snapshots.serializers;
+package au.com.origin.snapshots.jackson.serializers;
 
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;

diff --git a/...erializers/JacksonSnapshotSerializer.java → ...erializers/JacksonSnapshotSerializer.java b/...erializers/JacksonSnapshotSerializer.java → ...erializers/JacksonSnapshotSerializer.java
@@ -1,6 +1,8 @@
-package au.com.origin.snapshots.serializers;
+package au.com.origin.snapshots.jackson.serializers;
 
 import au.com.origin.snapshots.exceptions.SnapshotExtensionException;
+import au.com.origin.snapshots.serializers.SerializerType;
+import au.com.origin.snapshots.serializers.SnapshotSerializer;
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.PrettyPrinter;

diff --git a/...rigin/snapshots/serializers/__snapshots__/DeterministicJacksonSnapshotSerializerTest.snap b/...rigin/snapshots/serializers/__snapshots__/DeterministicJacksonSnapshotSerializerTest.snap
diff --git a/...java/au/com/origin/snapshots/serializers/__snapshots__/JacksonSnapshotSerializerTest.snap b/...java/au/com/origin/snapshots/serializers/__snapshots__/JacksonSnapshotSerializerTest.snap
diff --git a/...ackson/src/test/java/au/com/origin/snapshots/docs/__snapshots__/CustomSerializerTest.snap b/...ackson/src/test/java/au/com/origin/snapshots/docs/__snapshots__/CustomSerializerTest.snap
diff --git a/...om/origin/snapshots/NoNameChangeTest.java → ...n/snapshots/jackson/NoNameChangeTest.java b/...om/origin/snapshots/NoNameChangeTest.java → ...n/snapshots/jackson/NoNameChangeTest.java
@@ -1,7 +1,7 @@
-package au.com.origin.snapshots;
+package au.com.origin.snapshots.jackson;
 
-import au.com.origin.snapshots.serializers.DeterministicJacksonSnapshotSerializer;
-import au.com.origin.snapshots.serializers.JacksonSnapshotSerializer;
+import au.com.origin.snapshots.jackson.serializers.DeterministicJacksonSnapshotSerializer;
+import au.com.origin.snapshots.jackson.serializers.JacksonSnapshotSerializer;
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -15,7 +15,7 @@ public class NoNameChangeTest {
 
   @Test
   public void serializersApiShouldNotChange() {
-    assertThat(JacksonSnapshotSerializer.class.getName()).isEqualTo("au.com.origin.snapshots.serializers.JacksonSnapshotSerializer");
-    assertThat(DeterministicJacksonSnapshotSerializer.class.getName()).isEqualTo("au.com.origin.snapshots.serializers.DeterministicJacksonSnapshotSerializer");
+    assertThat(JacksonSnapshotSerializer.class.getName()).isEqualTo("au.com.origin.snapshots.jackson.serializers.JacksonSnapshotSerializer");
+    assertThat(DeterministicJacksonSnapshotSerializer.class.getName()).isEqualTo("au.com.origin.snapshots.jackson.serializers.DeterministicJacksonSnapshotSerializer");
   }
 }
diff --git a/...origin/snapshots/ReflectionUtilities.java → ...napshots/jackson/ReflectionUtilities.java b/...origin/snapshots/ReflectionUtilities.java → ...napshots/jackson/ReflectionUtilities.java
@@ -1,4 +1,4 @@
-package au.com.origin.snapshots;
+package au.com.origin.snapshots.jackson;
 
 import au.com.origin.snapshots.exceptions.SnapshotMatchException;