From e8e0f6d373e85cbeb313bb38cbefc772869a834f Mon Sep 17 00:00:00 2001 From: soberich <43persona@gmail.com> Date: Fri, 30 Nov 2018 02:00:04 +0300 Subject: [PATCH] Removed Guava (left in tests) --- project.gradle | 4 +- .../github/fge/jsonpatch/AddOperation.java | 7 ++- .../com/github/fge/jsonpatch/Iterables.java | 30 ++++++++++++ .../com/github/fge/jsonpatch/JsonPatch.java | 5 +- .../github/fge/jsonpatch/RemoveOperation.java | 1 - .../fge/jsonpatch/ReplaceOperation.java | 1 - .../github/fge/jsonpatch/TestOperation.java | 3 +- .../fge/jsonpatch/diff/DiffProcessor.java | 22 +++------ .../github/fge/jsonpatch/diff/JsonDiff.java | 48 +++++++++++++------ .../JsonMergePatchDeserializer.java | 9 ++-- .../mergepatch/NonObjectMergePatch.java | 6 ++- .../mergepatch/ObjectMergePatch.java | 14 +++--- .../fge/jsonpatch/JsonPatchOperationTest.java | 3 +- .../fge/jsonpatch/diff/JsonDiffTest.java | 12 ++--- .../mergepatch/NonObjectMergePatchTest.java | 4 +- .../mergepatch/ObjectMergePatchTest.java | 4 +- .../mergepatch/SerializationTest.java | 4 +- .../JsonPatchOperationSerializationTest.java | 4 +- 18 files changed, 105 insertions(+), 76 deletions(-) create mode 100644 src/main/java/com/github/fge/jsonpatch/Iterables.java diff --git a/project.gradle b/project.gradle index d344f7a5..ec7dbe6a 100644 --- a/project.gradle +++ b/project.gradle @@ -31,11 +31,10 @@ project.ext.description = "JSON Patch (RFC 6902) and JSON Merge Patch (RFC 7386) */ dependencies { provided(group: "com.google.code.findbugs", name: "jsr305", version: "3.0.2"); - compile(group: "com.google.guava", name: "guava", version: "28.1-android"); compile(group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.9.9"); compile(group: "com.github.java-json-tools", name: "msg-simple", version: "1.2"); - compile(group: "com.github.java-json-tools", name: "jackson-coreutils", version: "1.11"); + compile(group: "com.github.java-json-tools", name: "jackson-coreutils", version: "2.0-SNAPSHOT"); testCompile(group: "org.testng", name: "testng", version: "6.8.7") { exclude(group: "junit", module: "junit"); exclude(group: "org.beanshell", module: "bsh"); @@ -44,6 +43,7 @@ dependencies { testCompile(group: "org.mockito", name: "mockito-core", version: "2.28.2"); // FIXME: update to 3.x once we're off of Java 7 testCompile(group: "org.assertj", name: "assertj-core", version: "2.9.1"); + testCompile(group: "com.google.guava", name: "guava", version: "28.1-android"); } javadoc.options { diff --git a/src/main/java/com/github/fge/jsonpatch/AddOperation.java b/src/main/java/com/github/fge/jsonpatch/AddOperation.java index 7d995f36..5e5fb57a 100644 --- a/src/main/java/com/github/fge/jsonpatch/AddOperation.java +++ b/src/main/java/com/github/fge/jsonpatch/AddOperation.java @@ -27,7 +27,8 @@ import com.github.fge.jackson.jsonpointer.JsonPointer; import com.github.fge.jackson.jsonpointer.ReferenceToken; import com.github.fge.jackson.jsonpointer.TokenResolver; -import com.google.common.collect.Iterables; + +import java.util.NoSuchElementException; /** @@ -105,6 +106,7 @@ private JsonNode addToArray(final JsonPointer path, final JsonNode node) { final JsonNode ret = node.deepCopy(); final ArrayNode target = (ArrayNode) path.parent().get(ret); + final TokenResolver token = Iterables.getLast(path); if (token.getToken().equals(LAST_ARRAY_ELEMENT)) { @@ -131,9 +133,10 @@ private JsonNode addToArray(final JsonPointer path, final JsonNode node) private JsonNode addToObject(final JsonPointer path, final JsonNode node) { + final TokenResolver token = Iterables.getLast(path); final JsonNode ret = node.deepCopy(); final ObjectNode target = (ObjectNode) path.parent().get(ret); - target.set(Iterables.getLast(path).getToken().getRaw(), value); + target.set(token.getToken().getRaw(), value); return ret; } } diff --git a/src/main/java/com/github/fge/jsonpatch/Iterables.java b/src/main/java/com/github/fge/jsonpatch/Iterables.java new file mode 100644 index 00000000..3c2abcf7 --- /dev/null +++ b/src/main/java/com/github/fge/jsonpatch/Iterables.java @@ -0,0 +1,30 @@ +package com.github.fge.jsonpatch; + +import java.util.Iterator; +import java.util.NoSuchElementException; + +/** + * @author {@literal @}soberich on 30-Nov-18 + */ +public final class Iterables { + + private Iterables() {} + + /** + * Returns the last element of {@code iterable}. + * + * @param underlying type being iterated + * @param iterable type of iterable + * @return the last element of {@code iterable} + * @throws NoSuchElementException if the iterable is empty + */ + public static T getLast(Iterable iterable) { + Iterator iterator = iterable.iterator(); + while (true) { + T current = iterator.next(); + if (!iterator.hasNext()) { + return current; + } + } + } +} diff --git a/src/main/java/com/github/fge/jsonpatch/JsonPatch.java b/src/main/java/com/github/fge/jsonpatch/JsonPatch.java index edbfd5fd..e3f5a6fc 100644 --- a/src/main/java/com/github/fge/jsonpatch/JsonPatch.java +++ b/src/main/java/com/github/fge/jsonpatch/JsonPatch.java @@ -28,9 +28,10 @@ import com.github.fge.jackson.JacksonUtils; import com.github.fge.msgsimple.bundle.MessageBundle; import com.github.fge.msgsimple.load.MessageBundles; -import com.google.common.collect.ImmutableList; import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; import java.util.List; /** @@ -111,7 +112,7 @@ public final class JsonPatch @JsonCreator public JsonPatch(final List operations) { - this.operations = ImmutableList.copyOf(operations); + this.operations = Collections.unmodifiableList(new ArrayList(operations)); } /** diff --git a/src/main/java/com/github/fge/jsonpatch/RemoveOperation.java b/src/main/java/com/github/fge/jsonpatch/RemoveOperation.java index 16b0011d..4c528baa 100644 --- a/src/main/java/com/github/fge/jsonpatch/RemoveOperation.java +++ b/src/main/java/com/github/fge/jsonpatch/RemoveOperation.java @@ -30,7 +30,6 @@ import com.fasterxml.jackson.databind.node.MissingNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.github.fge.jackson.jsonpointer.JsonPointer; -import com.google.common.collect.Iterables; import java.io.IOException; diff --git a/src/main/java/com/github/fge/jsonpatch/ReplaceOperation.java b/src/main/java/com/github/fge/jsonpatch/ReplaceOperation.java index f668c5ba..d4454bdb 100644 --- a/src/main/java/com/github/fge/jsonpatch/ReplaceOperation.java +++ b/src/main/java/com/github/fge/jsonpatch/ReplaceOperation.java @@ -25,7 +25,6 @@ import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.github.fge.jackson.jsonpointer.JsonPointer; -import com.google.common.collect.Iterables; /** * JSON Patch {@code replace} operation diff --git a/src/main/java/com/github/fge/jsonpatch/TestOperation.java b/src/main/java/com/github/fge/jsonpatch/TestOperation.java index c6b3fa54..90f03401 100644 --- a/src/main/java/com/github/fge/jsonpatch/TestOperation.java +++ b/src/main/java/com/github/fge/jsonpatch/TestOperation.java @@ -24,7 +24,6 @@ import com.fasterxml.jackson.databind.JsonNode; import com.github.fge.jackson.JsonNumEquals; import com.github.fge.jackson.jsonpointer.JsonPointer; -import com.google.common.base.Equivalence; /** * JSON Patch {@code test} operation @@ -42,7 +41,7 @@ public final class TestOperation extends PathValueOperation { - private static final Equivalence EQUIVALENCE + private static final JsonNumEquals EQUIVALENCE = JsonNumEquals.getInstance(); @JsonCreator diff --git a/src/main/java/com/github/fge/jsonpatch/diff/DiffProcessor.java b/src/main/java/com/github/fge/jsonpatch/diff/DiffProcessor.java index 05ee8874..299d29a1 100644 --- a/src/main/java/com/github/fge/jsonpatch/diff/DiffProcessor.java +++ b/src/main/java/com/github/fge/jsonpatch/diff/DiffProcessor.java @@ -24,28 +24,23 @@ import com.github.fge.jackson.jsonpointer.JsonPointer; import com.github.fge.jsonpatch.JsonPatch; import com.github.fge.jsonpatch.JsonPatchOperation; -import com.google.common.base.Equivalence; -import com.google.common.base.Predicate; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; import javax.annotation.Nullable; -import java.util.List; -import java.util.Map; +import java.util.*; // TODO: cleanup final class DiffProcessor { - private static final Equivalence EQUIVALENCE + private static final JsonNumEquals EQUIVALENCE = JsonNumEquals.getInstance(); private final Map unchanged; - private final List diffs = Lists.newArrayList(); + private final List diffs = new ArrayList(); DiffProcessor(final Map unchanged) { - this.unchanged = ImmutableMap.copyOf(unchanged); + this.unchanged = Collections.unmodifiableMap(new HashMap(unchanged)); } void valueReplaced(final JsonPointer pointer, final JsonNode oldValue, @@ -79,7 +74,7 @@ void valueAdded(final JsonPointer pointer, final JsonNode value) JsonPatch getPatch() { - final List list = Lists.newArrayList(); + final List list = new ArrayList(); for (final DiffOperation op: diffs) list.add(op.asJsonPatchOperation()); @@ -90,23 +85,20 @@ JsonPatch getPatch() @Nullable private JsonPointer findUnchangedValue(final JsonNode value) { - final Predicate predicate = EQUIVALENCE.equivalentTo(value); for (final Map.Entry entry: unchanged.entrySet()) - if (predicate.apply(entry.getValue())) + if (EQUIVALENCE.equivalent(value, entry.getValue())) return entry.getKey(); return null; } private int findPreviouslyRemoved(final JsonNode value) { - final Predicate predicate = EQUIVALENCE.equivalentTo(value); - DiffOperation op; for (int i = 0; i < diffs.size(); i++) { op = diffs.get(i); if (op.getType() == DiffOperation.Type.REMOVE - && predicate.apply(op.getOldValue())) + && EQUIVALENCE.equivalent(value, op.getOldValue())) return i; } return -1; diff --git a/src/main/java/com/github/fge/jsonpatch/diff/JsonDiff.java b/src/main/java/com/github/fge/jsonpatch/diff/JsonDiff.java index 82b8a894..302a79c2 100644 --- a/src/main/java/com/github/fge/jsonpatch/diff/JsonDiff.java +++ b/src/main/java/com/github/fge/jsonpatch/diff/JsonDiff.java @@ -31,16 +31,10 @@ import com.github.fge.jsonpatch.JsonPatchMessages; import com.github.fge.msgsimple.bundle.MessageBundle; import com.github.fge.msgsimple.load.MessageBundles; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Equivalence; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import javax.annotation.ParametersAreNonnullByDefault; import java.io.IOException; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; +import java.util.*; /** * JSON "diff" implementation @@ -70,7 +64,7 @@ public final class JsonDiff = MessageBundles.getBundle(JsonPatchMessages.class); private static final ObjectMapper MAPPER = JacksonUtils.newMapper(); - private static final Equivalence EQUIVALENCE + private static final JsonNumEquals EQUIVALENCE = JsonNumEquals.getInstance(); private JsonDiff() @@ -164,21 +158,46 @@ private static void generateObjectDiffs(final DiffProcessor processor, final ObjectNode target) { final Set firstFields - = Sets.newTreeSet(Sets.newHashSet(source.fieldNames())); + = collect(source.fieldNames(), new TreeSet()); final Set secondFields - = Sets.newTreeSet(Sets.newHashSet(target.fieldNames())); + = collect(target.fieldNames(), new TreeSet()); - for (final String field: Sets.difference(firstFields, secondFields)) + final Set copy1 = new HashSet(firstFields); + copy1.removeAll(secondFields); + + for (final String field: Collections.unmodifiableSet(copy1)) processor.valueRemoved(pointer.append(field), source.get(field)); - for (final String field: Sets.difference(secondFields, firstFields)) + final Set copy2 = new HashSet(secondFields); + copy2.removeAll(firstFields); + + + for (final String field: Collections.unmodifiableSet(copy2)) processor.valueAdded(pointer.append(field), target.get(field)); - for (final String field: Sets.intersection(firstFields, secondFields)) + final Set intersection = new HashSet(firstFields); + intersection.retainAll(secondFields); + + for (final String field: intersection) generateDiffs(processor, pointer.append(field), source.get(field), target.get(field)); } + private static Set collect(Iterator from, Set to) { + if (from == null) { + throw new NullPointerException(); + } + if (to == null) { + throw new NullPointerException(); + } + while (from.hasNext()) { + to.add(from.next()); + } + return Collections.unmodifiableSet(to); + } + + + private static void generateArrayDiffs(final DiffProcessor processor, final JsonPointer pointer, final ArrayNode source, final ArrayNode target) @@ -204,11 +223,10 @@ private static void generateArrayDiffs(final DiffProcessor processor, } - @VisibleForTesting static Map getUnchangedValues(final JsonNode source, final JsonNode target) { - final Map ret = Maps.newHashMap(); + final Map ret = new HashMap(); computeUnchanged(ret, JsonPointer.empty(), source, target); return ret; } diff --git a/src/main/java/com/github/fge/jsonpatch/mergepatch/JsonMergePatchDeserializer.java b/src/main/java/com/github/fge/jsonpatch/mergepatch/JsonMergePatchDeserializer.java index e6bf5ed1..27b15d08 100644 --- a/src/main/java/com/github/fge/jsonpatch/mergepatch/JsonMergePatchDeserializer.java +++ b/src/main/java/com/github/fge/jsonpatch/mergepatch/JsonMergePatchDeserializer.java @@ -27,10 +27,11 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.NullNode; import com.github.fge.jackson.JacksonUtils; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import java.io.IOException; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; import java.util.Map; import java.util.Set; @@ -71,8 +72,8 @@ public JsonMergePatch deserialize(final JsonParser jp, * members. */ - final Set removedMembers = Sets.newHashSet(); - final Map modifiedMembers = Maps.newHashMap(); + final Set removedMembers = new HashSet(); + final Map modifiedMembers = new HashMap(); final Iterator> iterator = node.fields(); Map.Entry entry; diff --git a/src/main/java/com/github/fge/jsonpatch/mergepatch/NonObjectMergePatch.java b/src/main/java/com/github/fge/jsonpatch/mergepatch/NonObjectMergePatch.java index 1735f775..9a1ae8c0 100644 --- a/src/main/java/com/github/fge/jsonpatch/mergepatch/NonObjectMergePatch.java +++ b/src/main/java/com/github/fge/jsonpatch/mergepatch/NonObjectMergePatch.java @@ -25,7 +25,6 @@ import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.jsontype.TypeSerializer; import com.github.fge.jsonpatch.JsonPatchException; -import com.google.common.base.Preconditions; import javax.annotation.ParametersAreNonnullByDefault; import java.io.IOException; @@ -38,7 +37,10 @@ final class NonObjectMergePatch NonObjectMergePatch(final JsonNode node) { - this.node = Preconditions.checkNotNull(node); + if (node == null) { + throw new NullPointerException(); + } + this.node = node; } @Override diff --git a/src/main/java/com/github/fge/jsonpatch/mergepatch/ObjectMergePatch.java b/src/main/java/com/github/fge/jsonpatch/mergepatch/ObjectMergePatch.java index 5b7d54a7..009c3347 100644 --- a/src/main/java/com/github/fge/jsonpatch/mergepatch/ObjectMergePatch.java +++ b/src/main/java/com/github/fge/jsonpatch/mergepatch/ObjectMergePatch.java @@ -28,12 +28,12 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import com.github.fge.jackson.JacksonUtils; import com.github.fge.jsonpatch.JsonPatchException; -import com.google.common.base.Optional; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; import javax.annotation.ParametersAreNonnullByDefault; import java.io.IOException; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; import java.util.Map; import java.util.Set; @@ -47,8 +47,8 @@ final class ObjectMergePatch ObjectMergePatch(final Set removedMembers, final Map modifiedMembers) { - this.removedMembers = ImmutableSet.copyOf(removedMembers); - this.modifiedMembers = ImmutableMap.copyOf(modifiedMembers); + this.removedMembers = Collections.unmodifiableSet(new HashSet(removedMembers)); + this.modifiedMembers = Collections.unmodifiableMap(new HashMap(modifiedMembers)); } @Override @@ -82,8 +82,8 @@ public JsonNode apply(final JsonNode input) * * if it is an ObjectMergePatch, we get back here; the value will * be replaced with a JSON Object anyway before being processed. */ - value = Optional.fromNullable(ret.get(key)) - .or(NullNode.getInstance()); + final JsonNode jsonNode = ret.get(key); + value = jsonNode != null ? jsonNode : NullNode.getInstance(); ret.replace(key, entry.getValue().apply(value)); } diff --git a/src/test/java/com/github/fge/jsonpatch/JsonPatchOperationTest.java b/src/test/java/com/github/fge/jsonpatch/JsonPatchOperationTest.java index a3031b75..5f04d811 100644 --- a/src/test/java/com/github/fge/jsonpatch/JsonPatchOperationTest.java +++ b/src/test/java/com/github/fge/jsonpatch/JsonPatchOperationTest.java @@ -26,7 +26,6 @@ import com.github.fge.jackson.JsonNumEquals; import com.github.fge.msgsimple.bundle.MessageBundle; import com.github.fge.msgsimple.load.MessageBundles; -import com.google.common.base.Equivalence; import com.google.common.collect.Lists; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -43,7 +42,7 @@ public abstract class JsonPatchOperationTest private static final MessageBundle BUNDLE = MessageBundles.getBundle(JsonPatchMessages.class); - private static final Equivalence EQUIVALENCE + private static final JsonNumEquals EQUIVALENCE = JsonNumEquals.getInstance(); private final JsonNode errors; diff --git a/src/test/java/com/github/fge/jsonpatch/diff/JsonDiffTest.java b/src/test/java/com/github/fge/jsonpatch/diff/JsonDiffTest.java index 2801c592..1a8d0ac5 100644 --- a/src/test/java/com/github/fge/jsonpatch/diff/JsonDiffTest.java +++ b/src/test/java/com/github/fge/jsonpatch/diff/JsonDiffTest.java @@ -24,8 +24,6 @@ import com.github.fge.jackson.JsonNumEquals; import com.github.fge.jsonpatch.JsonPatch; import com.github.fge.jsonpatch.JsonPatchException; -import com.google.common.base.Equivalence; -import com.google.common.base.Predicate; import com.google.common.collect.Lists; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -38,8 +36,7 @@ public final class JsonDiffTest { - private static final Equivalence EQUIVALENCE - = JsonNumEquals.getInstance(); + private static final JsonNumEquals EQUIVALENCE = JsonNumEquals.getInstance(); private final JsonNode testData; @@ -67,10 +64,9 @@ public void generatedPatchAppliesCleanly(final JsonNode first, throws JsonPatchException { final JsonPatch patch = JsonDiff.asJsonPatch(first, second); - final Predicate predicate = EQUIVALENCE.equivalentTo(second); final JsonNode actual = patch.apply(first); - assertThat(predicate.apply(actual)).overridingErrorMessage( + assertThat(EQUIVALENCE.equivalent(second, actual)).overridingErrorMessage( "Generated patch failed to apply\nexpected: %s\nactual: %s", second, actual ).isTrue(); @@ -101,10 +97,8 @@ public void generatedPatchesAreWhatIsExpected(final String message, final JsonNode first, final JsonNode second, final JsonNode expected) { final JsonNode actual = JsonDiff.asJson(first, second); - final Predicate predicate - = EQUIVALENCE.equivalentTo(expected); - assertThat(predicate.apply(actual)).overridingErrorMessage( + assertThat(EQUIVALENCE.equivalent(expected, actual)).overridingErrorMessage( "patch is not what was expected\nscenario: %s\n" + "expected: %s\nactual: %s\n", message, expected, actual ).isTrue(); diff --git a/src/test/java/com/github/fge/jsonpatch/mergepatch/NonObjectMergePatchTest.java b/src/test/java/com/github/fge/jsonpatch/mergepatch/NonObjectMergePatchTest.java index d80fde1e..67d2c52f 100644 --- a/src/test/java/com/github/fge/jsonpatch/mergepatch/NonObjectMergePatchTest.java +++ b/src/test/java/com/github/fge/jsonpatch/mergepatch/NonObjectMergePatchTest.java @@ -27,7 +27,6 @@ import com.github.fge.jsonpatch.JsonPatchMessages; import com.github.fge.msgsimple.bundle.MessageBundle; import com.github.fge.msgsimple.load.MessageBundles; -import com.google.common.base.Equivalence; import com.google.common.collect.Lists; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -42,8 +41,7 @@ public final class NonObjectMergePatchTest { - private static final Equivalence EQUIVALENCE - = JsonNumEquals.getInstance(); + private static final JsonNumEquals EQUIVALENCE = JsonNumEquals.getInstance(); private static final MessageBundle BUNDLE = MessageBundles.getBundle(JsonPatchMessages.class); diff --git a/src/test/java/com/github/fge/jsonpatch/mergepatch/ObjectMergePatchTest.java b/src/test/java/com/github/fge/jsonpatch/mergepatch/ObjectMergePatchTest.java index 1bb6dc24..68d4fefc 100644 --- a/src/test/java/com/github/fge/jsonpatch/mergepatch/ObjectMergePatchTest.java +++ b/src/test/java/com/github/fge/jsonpatch/mergepatch/ObjectMergePatchTest.java @@ -27,7 +27,6 @@ import com.github.fge.jsonpatch.JsonPatchMessages; import com.github.fge.msgsimple.bundle.MessageBundle; import com.github.fge.msgsimple.load.MessageBundles; -import com.google.common.base.Equivalence; import com.google.common.collect.Lists; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -42,8 +41,7 @@ public final class ObjectMergePatchTest { - private static final Equivalence EQUIVALENCE - = JsonNumEquals.getInstance(); + private static final JsonNumEquals EQUIVALENCE = JsonNumEquals.getInstance(); private static final MessageBundle BUNDLE = MessageBundles.getBundle(JsonPatchMessages.class); diff --git a/src/test/java/com/github/fge/jsonpatch/mergepatch/SerializationTest.java b/src/test/java/com/github/fge/jsonpatch/mergepatch/SerializationTest.java index e6529d42..4eb22280 100644 --- a/src/test/java/com/github/fge/jsonpatch/mergepatch/SerializationTest.java +++ b/src/test/java/com/github/fge/jsonpatch/mergepatch/SerializationTest.java @@ -24,7 +24,6 @@ import com.github.fge.jackson.JacksonUtils; import com.github.fge.jackson.JsonLoader; import com.github.fge.jackson.JsonNumEquals; -import com.google.common.base.Equivalence; import com.google.common.collect.Lists; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -39,8 +38,7 @@ public final class SerializationTest { - private static final Equivalence EQUIVALENCE - = JsonNumEquals.getInstance(); + private static final JsonNumEquals EQUIVALENCE = JsonNumEquals.getInstance(); private final ObjectMapper mapper = JacksonUtils.newMapper(); private final JsonNode nonObjectTestData; diff --git a/src/test/java/com/github/fge/jsonpatch/serialization/JsonPatchOperationSerializationTest.java b/src/test/java/com/github/fge/jsonpatch/serialization/JsonPatchOperationSerializationTest.java index f18af096..1bb91bae 100644 --- a/src/test/java/com/github/fge/jsonpatch/serialization/JsonPatchOperationSerializationTest.java +++ b/src/test/java/com/github/fge/jsonpatch/serialization/JsonPatchOperationSerializationTest.java @@ -25,7 +25,6 @@ import com.github.fge.jackson.JsonLoader; import com.github.fge.jackson.JsonNumEquals; import com.github.fge.jsonpatch.JsonPatchOperation; -import com.google.common.base.Equivalence; import com.google.common.collect.Lists; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -39,8 +38,7 @@ @Test public abstract class JsonPatchOperationSerializationTest { - private static final Equivalence EQUIVALENCE - = JsonNumEquals.getInstance(); + private static final JsonNumEquals EQUIVALENCE = JsonNumEquals.getInstance(); private final Class c; private final JsonNode node;