Skip to content

Commit 08f207e

Browse files
authored
#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
1 parent f2ffc12 commit 08f207e

24 files changed

+42
-315
lines changed

README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ testRuntimeOnly 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.3'
4848
```text
4949
serializer=au.com.origin.snapshots.serializers.ToStringSnapshotSerializer
5050
serializer.base64=au.com.origin.snapshots.serializers.Base64SnapshotSerializer
51-
serializer.json=au.com.origin.snapshots.serializers.JacksonSnapshotSerializer
52-
serializer.orderedJson=au.com.origin.snapshots.serializers.DeterministicJacksonSnapshotSerializer
51+
serializer.json=au.com.origin.snapshots.jackson.serializers.JacksonSnapshotSerializer
52+
serializer.orderedJson=au.com.origin.snapshots.jackson.serializers.DeterministicJacksonSnapshotSerializer
5353
comparator=au.com.origin.snapshots.comparators.PlainTextEqualsComparator
5454
reporters=au.com.origin.snapshots.reporters.PlainTextSnapshotReporter
5555
snapshot-dir=__snapshots__
@@ -461,8 +461,8 @@ For example:
461461
```text
462462
serializer=au.com.origin.snapshots.serializers.ToStringSnapshotSerializer
463463
serializer.base64=au.com.origin.snapshots.serializers.Base64SnapshotSerializer
464-
serializer.json=au.com.origin.snapshots.serializers.JacksonSnapshotSerializer
465-
serializer.orderedJson=au.com.origin.snapshots.serializers.DeterministicJacksonSnapshotSerializer
464+
serializer.json=au.com.origin.snapshots.jackson.serializers.JacksonSnapshotSerializer
465+
serializer.orderedJson=au.com.origin.snapshots.jackson.serializers.DeterministicJacksonSnapshotSerializer
466466
comparator=au.com.origin.snapshots.comparators.PlainTextEqualsComparator
467467
reporters=au.com.origin.snapshots.reporters.PlainTextSnapshotReporter
468468
snapshot-dir=__snapshots__
@@ -586,7 +586,7 @@ For example, the following will exclude the rendering of Lists without changing
586586
```java
587587
package au.com.origin.snapshots.docs;
588588

589-
import au.com.origin.snapshots.serializers.DeterministicJacksonSnapshotSerializer;
589+
import au.com.origin.snapshots.jackson.serializers.DeterministicJacksonSnapshotSerializer;
590590
import com.fasterxml.jackson.databind.ObjectMapper;
591591
import com.fasterxml.jackson.annotation.JsonIgnore;
592592
import com.fasterxml.jackson.annotation.JsonIgnoreType;

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
group=io.github.origin-energy
2-
version=3.3.9-SNAPSHOT
2+
version=3.1.0-SNAPSHOT

java-snapshot-testing-core/src/main/java/au/com/origin/snapshots/SnapshotFile.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public void pushDebugSnapshot(String snapshot) {
103103
updateFile(getDebugFilename(), rawDebugSnapshots);
104104
}
105105

106-
private void updateFile(String fileName, Set<String> rawSnapshots) {
106+
private synchronized void updateFile(String fileName, Set<String> rawSnapshots) {
107107
File file = createFileIfNotExists(fileName);
108108
try (FileOutputStream fileStream = new FileOutputStream(file, false)) {
109109
byte[] myBytes = String.join(SPLIT_STRING, rawSnapshots).getBytes(StandardCharsets.UTF_8);

java-snapshot-testing-junit5/src/test/java/au/com/origin/snapshots/SnapshotParameterTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package au.com.origin.snapshots;
22

33
import au.com.origin.snapshots.junit5.SnapshotExtension;
4-
import au.com.origin.snapshots.serializers.JacksonSnapshotSerializer;
4+
import au.com.origin.snapshots.jackson.serializers.JacksonSnapshotSerializer;
55
import org.junit.jupiter.api.extension.ExtendWith;
66
import org.junit.jupiter.params.ParameterizedTest;
77
import org.junit.jupiter.params.provider.Arguments;

java-snapshot-testing-junit5/src/test/resources/snapshot.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
serializer=au.com.origin.snapshots.serializers.ToStringSnapshotSerializer
2-
serializer.json=au.com.origin.snapshots.serializers.DeterministicJacksonSnapshotSerializer
2+
serializer.json=au.com.origin.snapshots.jackson.serializers.DeterministicJacksonSnapshotSerializer
33
comparator=au.com.origin.snapshots.comparators.PlainTextEqualsComparator
44
reporters=au.com.origin.snapshots.reporters.PlainTextSnapshotReporter
55
snapshot-dir=__snapshots__

java-snapshot-testing-plugin-jackson/src/main/java/au/com/origin/snapshots/serializers/DeterministicCollectionModule.java java-snapshot-testing-plugin-jackson/src/main/java/au/com/origin/snapshots/jackson/serializers/DeterministicCollectionModule.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package au.com.origin.snapshots.serializers;
1+
package au.com.origin.snapshots.jackson.serializers;
22

33
import com.fasterxml.jackson.core.JsonGenerator;
44
import com.fasterxml.jackson.databind.JsonSerializer;
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package au.com.origin.snapshots.serializers;
1+
package au.com.origin.snapshots.jackson.serializers;
22

33
import com.fasterxml.jackson.databind.MapperFeature;
44
import com.fasterxml.jackson.databind.ObjectMapper;

java-snapshot-testing-plugin-jackson/src/main/java/au/com/origin/snapshots/serializers/JacksonSnapshotSerializer.java java-snapshot-testing-plugin-jackson/src/main/java/au/com/origin/snapshots/jackson/serializers/JacksonSnapshotSerializer.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
package au.com.origin.snapshots.serializers;
1+
package au.com.origin.snapshots.jackson.serializers;
22

33
import au.com.origin.snapshots.exceptions.SnapshotExtensionException;
4+
import au.com.origin.snapshots.serializers.SerializerType;
5+
import au.com.origin.snapshots.serializers.SnapshotSerializer;
46
import com.fasterxml.jackson.annotation.JsonAutoDetect;
57
import com.fasterxml.jackson.annotation.JsonInclude;
68
import com.fasterxml.jackson.core.PrettyPrinter;

java-snapshot-testing-plugin-jackson/src/main/java/au/com/origin/snapshots/serializers/__snapshots__/DeterministicJacksonSnapshotSerializerTest.snap

-140
This file was deleted.

java-snapshot-testing-plugin-jackson/src/main/java/au/com/origin/snapshots/serializers/__snapshots__/JacksonSnapshotSerializerTest.snap

-140
This file was deleted.

java-snapshot-testing-plugin-jackson/src/test/java/au/com/origin/snapshots/docs/__snapshots__/CustomSerializerTest.snap

-5
This file was deleted.

java-snapshot-testing-plugin-jackson/src/test/java/au/com/origin/snapshots/NoNameChangeTest.java java-snapshot-testing-plugin-jackson/src/test/java/au/com/origin/snapshots/jackson/NoNameChangeTest.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package au.com.origin.snapshots;
1+
package au.com.origin.snapshots.jackson;
22

3-
import au.com.origin.snapshots.serializers.DeterministicJacksonSnapshotSerializer;
4-
import au.com.origin.snapshots.serializers.JacksonSnapshotSerializer;
3+
import au.com.origin.snapshots.jackson.serializers.DeterministicJacksonSnapshotSerializer;
4+
import au.com.origin.snapshots.jackson.serializers.JacksonSnapshotSerializer;
55
import org.junit.jupiter.api.Test;
66

77
import static org.assertj.core.api.Assertions.assertThat;
@@ -15,7 +15,7 @@ public class NoNameChangeTest {
1515

1616
@Test
1717
public void serializersApiShouldNotChange() {
18-
assertThat(JacksonSnapshotSerializer.class.getName()).isEqualTo("au.com.origin.snapshots.serializers.JacksonSnapshotSerializer");
19-
assertThat(DeterministicJacksonSnapshotSerializer.class.getName()).isEqualTo("au.com.origin.snapshots.serializers.DeterministicJacksonSnapshotSerializer");
18+
assertThat(JacksonSnapshotSerializer.class.getName()).isEqualTo("au.com.origin.snapshots.jackson.serializers.JacksonSnapshotSerializer");
19+
assertThat(DeterministicJacksonSnapshotSerializer.class.getName()).isEqualTo("au.com.origin.snapshots.jackson.serializers.DeterministicJacksonSnapshotSerializer");
2020
}
2121
}

java-snapshot-testing-plugin-jackson/src/test/java/au/com/origin/snapshots/ReflectionUtilities.java java-snapshot-testing-plugin-jackson/src/test/java/au/com/origin/snapshots/jackson/ReflectionUtilities.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package au.com.origin.snapshots;
1+
package au.com.origin.snapshots.jackson;
22

33
import au.com.origin.snapshots.exceptions.SnapshotMatchException;
44

0 commit comments

Comments
 (0)