Update jackson-coreutils deps.

The de-Guava-ing of jackson-coreutils means pulling in the Guava-specific Equivalence class from the new jackson-coreutils-equivalence.
java-json-tools · May 27, 2020 · 8086d86 · 8086d86
1 parent 83f5670
commit 8086d86
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 16 deletions.
diff --git a/project.gradle b/project.gradle
@@ -35,7 +35,8 @@ project.ext {
 dependencies {
     compile(group: "com.fasterxml.jackson.core", name: "jackson-databind", version: "2.11.0");
     compile(group: "com.google.guava", name: "guava", version: "28.2-android");
-    compile(group: "com.github.java-json-tools", name: "jackson-coreutils", version: "1.12");
+    compile(group: "com.github.java-json-tools", name: "jackson-coreutils", version: "2.0-SNAPSHOT");
+    compile(group: "com.github.java-json-tools", name: "jackson-coreutils-equivalence", version: "1.0-SNAPSHOT");
     compile(group: "com.github.java-json-tools", name: "uri-template", version: "0.10");
     // FIXME: no javadoc
     // FIXME: update beyond 1.7.7.x once we're Java 8 or better.

diff --git a/...java/com/github/fge/jsonschema/core/keyword/syntax/checkers/common/EnumSyntaxChecker.java b/...java/com/github/fge/jsonschema/core/keyword/syntax/checkers/common/EnumSyntaxChecker.java
@@ -20,7 +20,7 @@
 package com.github.fge.jsonschema.core.keyword.syntax.checkers.common;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.github.fge.jackson.JsonNumEquals;
+import com.github.fge.jackson.JsonNumEquivalence;
 import com.github.fge.jackson.NodeType;
 import com.github.fge.jackson.jsonpointer.JsonPointer;
 import com.github.fge.jsonschema.core.exceptions.ProcessingException;
@@ -38,13 +38,12 @@
 /**
  * Syntax checker for the {@code enum} keyword
  *
- * @see JsonNumEquals
+ * @see JsonNumEquivalence
  */
 public final class EnumSyntaxChecker
     extends AbstractSyntaxChecker
 {
-    private static final Equivalence<JsonNode> EQUIVALENCE
-        = JsonNumEquals.getInstance();
+    private static final Equivalence<JsonNode> EQUIVALENCE = JsonNumEquivalence.getInstance();
 
     private static final SyntaxChecker INSTANCE = new EnumSyntaxChecker();
 

diff --git a/.../fge/jsonschema/core/keyword/syntax/checkers/draftv3/DraftV3TypeKeywordSyntaxChecker.java b/.../fge/jsonschema/core/keyword/syntax/checkers/draftv3/DraftV3TypeKeywordSyntaxChecker.java
@@ -20,7 +20,7 @@
 package com.github.fge.jsonschema.core.keyword.syntax.checkers.draftv3;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.github.fge.jackson.JsonNumEquals;
+import com.github.fge.jackson.JsonNumEquivalence;
 import com.github.fge.jackson.NodeType;
 import com.github.fge.jackson.jsonpointer.JsonPointer;
 import com.github.fge.jsonschema.core.exceptions.ProcessingException;
@@ -46,7 +46,7 @@ public final class DraftV3TypeKeywordSyntaxChecker
 {
     private static final String ANY = "any";
     private static final Equivalence<JsonNode> EQUIVALENCE
-        = JsonNumEquals.getInstance();
+        = JsonNumEquivalence.getInstance();
 
     public DraftV3TypeKeywordSyntaxChecker(final String keyword)
     {

diff --git a/.../github/fge/jsonschema/core/keyword/syntax/checkers/draftv4/DraftV4TypeSyntaxChecker.java b/.../github/fge/jsonschema/core/keyword/syntax/checkers/draftv4/DraftV4TypeSyntaxChecker.java
@@ -20,7 +20,7 @@
 package com.github.fge.jsonschema.core.keyword.syntax.checkers.draftv4;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.github.fge.jackson.JsonNumEquals;
+import com.github.fge.jackson.JsonNumEquivalence;
 import com.github.fge.jackson.NodeType;
 import com.github.fge.jackson.jsonpointer.JsonPointer;
 import com.github.fge.jsonschema.core.exceptions.ProcessingException;
@@ -45,8 +45,7 @@ public final class DraftV4TypeSyntaxChecker
     private static final EnumSet<NodeType> ALL_TYPES
         = EnumSet.allOf(NodeType.class);
 
-    private static final Equivalence<JsonNode> EQUIVALENCE
-        = JsonNumEquals.getInstance();
+    private static final Equivalence<JsonNode> EQUIVALENCE = JsonNumEquivalence.getInstance();
 
     private static final SyntaxChecker INSTANCE
         = new DraftV4TypeSyntaxChecker();

diff --git a/...com/github/fge/jsonschema/core/keyword/syntax/checkers/draftv4/RequiredSyntaxChecker.java b/...com/github/fge/jsonschema/core/keyword/syntax/checkers/draftv4/RequiredSyntaxChecker.java
@@ -20,7 +20,7 @@
 package com.github.fge.jsonschema.core.keyword.syntax.checkers.draftv4;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.github.fge.jackson.JsonNumEquals;
+import com.github.fge.jackson.JsonNumEquivalence;
 import com.github.fge.jackson.NodeType;
 import com.github.fge.jackson.jsonpointer.JsonPointer;
 import com.github.fge.jsonschema.core.exceptions.ProcessingException;
@@ -42,8 +42,7 @@
 public final class RequiredSyntaxChecker
     extends AbstractSyntaxChecker
 {
-    private static final Equivalence<JsonNode> EQUIVALENCE
-        = JsonNumEquals.getInstance();
+    private static final Equivalence<JsonNode> EQUIVALENCE = new JsonNumEquivalence();
 
     private static final SyntaxChecker INSTANCE = new RequiredSyntaxChecker();
 

diff --git a/...github/fge/jsonschema/core/keyword/syntax/checkers/helpers/DependenciesSyntaxChecker.java b/...github/fge/jsonschema/core/keyword/syntax/checkers/helpers/DependenciesSyntaxChecker.java
@@ -21,7 +21,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.github.fge.jackson.JacksonUtils;
-import com.github.fge.jackson.JsonNumEquals;
+import com.github.fge.jackson.JsonNumEquivalence;
 import com.github.fge.jackson.NodeType;
 import com.github.fge.jackson.jsonpointer.JsonPointer;
 import com.github.fge.jsonschema.core.exceptions.InvalidSchemaException;
@@ -49,8 +49,7 @@ public abstract class DependenciesSyntaxChecker
     /**
      * JSON Schema equivalence
      */
-    protected static final Equivalence<JsonNode> EQUIVALENCE
-        = JsonNumEquals.getInstance();
+    protected static final Equivalence<JsonNode> EQUIVALENCE = JsonNumEquivalence.getInstance();
 
     /**
      * Valid types for one dependency value