diff --git a/jackson/pom.xml b/jackson/pom.xml
index 6aa28a0..a63966c 100644
--- a/jackson/pom.xml
+++ b/jackson/pom.xml
@@ -23,11 +23,11 @@
hamcrest
- com.fasterxml.jackson.core
+ tools.jackson.core
jackson-core
- com.fasterxml.jackson.core
+ tools.jackson.core
jackson-databind
diff --git a/jackson/src/main/java/com/spotify/hamcrest/jackson/AbstractJsonNodeMatcher.java b/jackson/src/main/java/com/spotify/hamcrest/jackson/AbstractJsonNodeMatcher.java
index 40342b8..d5ac6b3 100644
--- a/jackson/src/main/java/com/spotify/hamcrest/jackson/AbstractJsonNodeMatcher.java
+++ b/jackson/src/main/java/com/spotify/hamcrest/jackson/AbstractJsonNodeMatcher.java
@@ -20,12 +20,12 @@
package com.spotify.hamcrest.jackson;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.JsonNodeType;
import com.spotify.hamcrest.util.LanguageUtils;
import java.util.Objects;
import org.hamcrest.Description;
import org.hamcrest.TypeSafeDiagnosingMatcher;
+import tools.jackson.databind.JsonNode;
+import tools.jackson.databind.node.JsonNodeType;
public abstract class AbstractJsonNodeMatcher
extends TypeSafeDiagnosingMatcher {
diff --git a/jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonArray.java b/jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonArray.java
index fd4d120..17d851e 100644
--- a/jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonArray.java
+++ b/jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonArray.java
@@ -23,14 +23,14 @@
import static org.hamcrest.Matchers.is;
import static org.hamcrest.core.IsAnything.anything;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.JsonNodeType;
import com.google.common.collect.ImmutableList;
import java.util.Collection;
import java.util.Objects;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
+import tools.jackson.databind.JsonNode;
+import tools.jackson.databind.node.ArrayNode;
+import tools.jackson.databind.node.JsonNodeType;
public class IsJsonArray extends AbstractJsonNodeMatcher {
diff --git a/jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonBoolean.java b/jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonBoolean.java
index 0d9ddd1..cd49152 100644
--- a/jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonBoolean.java
+++ b/jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonBoolean.java
@@ -23,12 +23,12 @@
import static org.hamcrest.core.Is.is;
import static org.hamcrest.core.IsAnything.anything;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.BooleanNode;
-import com.fasterxml.jackson.databind.node.JsonNodeType;
import java.util.Objects;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
+import tools.jackson.databind.JsonNode;
+import tools.jackson.databind.node.BooleanNode;
+import tools.jackson.databind.node.JsonNodeType;
public class IsJsonBoolean extends AbstractJsonNodeMatcher {
diff --git a/jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonMissing.java b/jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonMissing.java
index db5890b..5c79312 100644
--- a/jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonMissing.java
+++ b/jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonMissing.java
@@ -20,11 +20,11 @@
package com.spotify.hamcrest.jackson;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.JsonNodeType;
-import com.fasterxml.jackson.databind.node.MissingNode;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
+import tools.jackson.databind.JsonNode;
+import tools.jackson.databind.node.JsonNodeType;
+import tools.jackson.databind.node.MissingNode;
public class IsJsonMissing extends AbstractJsonNodeMatcher {
private static final IsJsonMissing INSTANCE = new IsJsonMissing();
diff --git a/jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonNull.java b/jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonNull.java
index 965a6f5..6d8ef8b 100644
--- a/jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonNull.java
+++ b/jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonNull.java
@@ -20,11 +20,11 @@
package com.spotify.hamcrest.jackson;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.JsonNodeType;
-import com.fasterxml.jackson.databind.node.NullNode;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
+import tools.jackson.databind.JsonNode;
+import tools.jackson.databind.node.JsonNodeType;
+import tools.jackson.databind.node.NullNode;
public class IsJsonNull extends AbstractJsonNodeMatcher {
private static final IsJsonNull INSTANCE = new IsJsonNull();
diff --git a/jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonNumber.java b/jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonNumber.java
index 8fd961a..7dbbb62 100644
--- a/jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonNumber.java
+++ b/jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonNumber.java
@@ -23,16 +23,16 @@
import static org.hamcrest.core.Is.is;
import static org.hamcrest.core.IsAnything.anything;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.JsonNodeType;
-import com.fasterxml.jackson.databind.node.NumericNode;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Objects;
import java.util.function.Function;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
+import tools.jackson.core.JsonParser;
+import tools.jackson.databind.JsonNode;
+import tools.jackson.databind.node.JsonNodeType;
+import tools.jackson.databind.node.NumericNode;
/**
* Matches JSON Number.
diff --git a/jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonObject.java b/jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonObject.java
index c438fa9..224bd9c 100644
--- a/jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonObject.java
+++ b/jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonObject.java
@@ -20,16 +20,6 @@
package com.spotify.hamcrest.jackson;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.BooleanNode;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.JsonNodeType;
-import com.fasterxml.jackson.databind.node.MissingNode;
-import com.fasterxml.jackson.databind.node.NullNode;
-import com.fasterxml.jackson.databind.node.NumericNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.databind.node.TextNode;
import com.spotify.hamcrest.util.DescriptionUtils;
import java.util.Iterator;
import java.util.LinkedHashMap;
@@ -39,6 +29,16 @@
import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.hamcrest.StringDescription;
+import tools.jackson.databind.JsonNode;
+import tools.jackson.databind.node.ArrayNode;
+import tools.jackson.databind.node.BooleanNode;
+import tools.jackson.databind.node.JsonNodeFactory;
+import tools.jackson.databind.node.JsonNodeType;
+import tools.jackson.databind.node.MissingNode;
+import tools.jackson.databind.node.NullNode;
+import tools.jackson.databind.node.NumericNode;
+import tools.jackson.databind.node.ObjectNode;
+import tools.jackson.databind.node.StringNode;
/**
* Matches JSON Object.
@@ -71,7 +71,7 @@ public static IsJsonObject jsonObject() {
* @return instance of {@link IsJsonObject}.
*/
public static IsJsonObject jsonObject(final ObjectNode objectNode) {
- final Iterator> fields = objectNode.fields();
+ final Iterator> fields = objectNode.properties().iterator();
final LinkedHashMap> entryMatchers = new LinkedHashMap<>();
while (fields.hasNext()) {
@@ -104,7 +104,7 @@ private static Matcher createNodeMatcher(final JsonNode value) {
throw new UnsupportedOperationException(
"Expected value contains a POJO node, which is not implemented.");
case STRING:
- return IsJsonText.jsonText((TextNode) value);
+ return IsJsonText.jsonText((StringNode) value);
default:
throw new UnsupportedOperationException("Unsupported node type " + nodeType);
}
diff --git a/jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonStringMatching.java b/jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonStringMatching.java
index 3af974a..3a2d996 100644
--- a/jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonStringMatching.java
+++ b/jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonStringMatching.java
@@ -24,13 +24,13 @@
import static org.hamcrest.Condition.matched;
import static org.hamcrest.Condition.notMatched;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import java.io.IOException;
import org.hamcrest.Condition;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeDiagnosingMatcher;
+import tools.jackson.core.JacksonException;
+import tools.jackson.databind.JsonNode;
+import tools.jackson.databind.ObjectMapper;
/**
* Matcher for matching Json strings
@@ -74,7 +74,7 @@ private Condition parseJsonNode(
try {
final JsonNode jsonNode = MAPPER.readTree(string);
return matched(jsonNode, mismatchDescription);
- } catch (IOException e) {
+ } catch (JacksonException e) {
mismatchDescription
.appendText(" but the string was not valid JSON ")
.appendValue(e.getMessage());
diff --git a/jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonText.java b/jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonText.java
index f601a49..f2407b0 100644
--- a/jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonText.java
+++ b/jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonText.java
@@ -23,14 +23,14 @@
import static org.hamcrest.core.Is.is;
import static org.hamcrest.core.IsAnything.anything;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.JsonNodeType;
-import com.fasterxml.jackson.databind.node.TextNode;
import java.util.Objects;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
+import tools.jackson.databind.JsonNode;
+import tools.jackson.databind.node.JsonNodeType;
+import tools.jackson.databind.node.StringNode;
-public class IsJsonText extends AbstractJsonNodeMatcher {
+public class IsJsonText extends AbstractJsonNodeMatcher {
private final Matcher super String> textMatcher;
@@ -51,12 +51,12 @@ public static Matcher jsonText(Matcher super String> textMatcher) {
return new IsJsonText(textMatcher);
}
- public static Matcher jsonText(final TextNode value) {
+ public static Matcher jsonText(final StringNode value) {
return jsonText(value.asText());
}
@Override
- protected boolean matchesNode(TextNode node, Description mismatchDescription) {
+ protected boolean matchesNode(StringNode node, Description mismatchDescription) {
final String value = node.asText();
if (textMatcher.matches(value)) {
return true;
diff --git a/jackson/src/main/java/com/spotify/hamcrest/jackson/JsonMatchers.java b/jackson/src/main/java/com/spotify/hamcrest/jackson/JsonMatchers.java
index 5b5c6ea..6ab0dd8 100644
--- a/jackson/src/main/java/com/spotify/hamcrest/jackson/JsonMatchers.java
+++ b/jackson/src/main/java/com/spotify/hamcrest/jackson/JsonMatchers.java
@@ -20,18 +20,18 @@
package com.spotify.hamcrest.jackson;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.BooleanNode;
-import com.fasterxml.jackson.databind.node.MissingNode;
-import com.fasterxml.jackson.databind.node.NullNode;
-import com.fasterxml.jackson.databind.node.NumericNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.databind.node.TextNode;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Collection;
import org.hamcrest.Matcher;
+import tools.jackson.databind.JsonNode;
+import tools.jackson.databind.node.ArrayNode;
+import tools.jackson.databind.node.BooleanNode;
+import tools.jackson.databind.node.MissingNode;
+import tools.jackson.databind.node.NullNode;
+import tools.jackson.databind.node.NumericNode;
+import tools.jackson.databind.node.ObjectNode;
+import tools.jackson.databind.node.StringNode;
/**
* Methods to instantiate different JSON Matchers.
@@ -167,7 +167,7 @@ public static Matcher jsonText(Matcher super String> textMatcher) {
return IsJsonText.jsonText(textMatcher);
}
- public static Matcher jsonText(TextNode value) {
+ public static Matcher jsonText(StringNode value) {
return IsJsonText.jsonText(value);
}
}
diff --git a/jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonArrayTest.java b/jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonArrayTest.java
index 4ee5d93..92ff82c 100644
--- a/jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonArrayTest.java
+++ b/jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonArrayTest.java
@@ -31,11 +31,11 @@
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertThat;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import org.hamcrest.Matcher;
import org.hamcrest.StringDescription;
import org.junit.Test;
+import tools.jackson.databind.JsonNode;
+import tools.jackson.databind.node.JsonNodeFactory;
public class IsJsonArrayTest {
diff --git a/jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonBooleanTest.java b/jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonBooleanTest.java
index 83ce53d..df36363 100644
--- a/jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonBooleanTest.java
+++ b/jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonBooleanTest.java
@@ -24,11 +24,11 @@
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertThat;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import org.hamcrest.Matcher;
import org.hamcrest.StringDescription;
import org.junit.Test;
+import tools.jackson.databind.JsonNode;
+import tools.jackson.databind.node.JsonNodeFactory;
public class IsJsonBooleanTest {
diff --git a/jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonMissingTest.java b/jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonMissingTest.java
index 2d5b08d..f01198a 100644
--- a/jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonMissingTest.java
+++ b/jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonMissingTest.java
@@ -24,12 +24,12 @@
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertThat;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.MissingNode;
import org.hamcrest.Matcher;
import org.hamcrest.StringDescription;
import org.junit.Test;
+import tools.jackson.databind.JsonNode;
+import tools.jackson.databind.node.JsonNodeFactory;
+import tools.jackson.databind.node.MissingNode;
public class IsJsonMissingTest {
diff --git a/jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonNullTest.java b/jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonNullTest.java
index d6ed8fd..4fef818 100644
--- a/jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonNullTest.java
+++ b/jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonNullTest.java
@@ -24,12 +24,12 @@
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertThat;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.NullNode;
import org.hamcrest.Matcher;
import org.hamcrest.StringDescription;
import org.junit.Test;
+import tools.jackson.databind.JsonNode;
+import tools.jackson.databind.node.JsonNodeFactory;
+import tools.jackson.databind.node.NullNode;
public class IsJsonNullTest {
diff --git a/jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonNumberTest.java b/jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonNumberTest.java
index 57c4f42..ccac695 100644
--- a/jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonNumberTest.java
+++ b/jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonNumberTest.java
@@ -30,15 +30,15 @@
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertThat;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.BigIntegerNode;
-import com.fasterxml.jackson.databind.node.DecimalNode;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import java.math.BigDecimal;
import java.math.BigInteger;
import org.hamcrest.Matcher;
import org.hamcrest.StringDescription;
import org.junit.Test;
+import tools.jackson.databind.JsonNode;
+import tools.jackson.databind.node.BigIntegerNode;
+import tools.jackson.databind.node.DecimalNode;
+import tools.jackson.databind.node.JsonNodeFactory;
public class IsJsonNumberTest {
diff --git a/jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonObjectTest.java b/jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonObjectTest.java
index 76a86c5..fdcb83d 100644
--- a/jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonObjectTest.java
+++ b/jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonObjectTest.java
@@ -27,12 +27,12 @@
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertThat;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.ObjectNode;
import org.hamcrest.Matcher;
import org.hamcrest.StringDescription;
import org.junit.Test;
+import tools.jackson.databind.JsonNode;
+import tools.jackson.databind.node.JsonNodeFactory;
+import tools.jackson.databind.node.ObjectNode;
public class IsJsonObjectTest {
diff --git a/jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonStringMatchingTest.java b/jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonStringMatchingTest.java
index b9b60e7..684e46a 100644
--- a/jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonStringMatchingTest.java
+++ b/jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonStringMatchingTest.java
@@ -29,11 +29,11 @@
import static org.hamcrest.core.Is.is;
import static org.hamcrest.core.IsNot.not;
-import com.fasterxml.jackson.databind.JsonNode;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
import org.hamcrest.StringDescription;
import org.junit.Test;
+import tools.jackson.databind.JsonNode;
public class IsJsonStringMatchingTest {
diff --git a/jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonTextTest.java b/jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonTextTest.java
index 3bcedf1..8266647 100644
--- a/jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonTextTest.java
+++ b/jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonTextTest.java
@@ -27,11 +27,11 @@
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertThat;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import org.hamcrest.Matcher;
import org.hamcrest.StringDescription;
import org.junit.Test;
+import tools.jackson.databind.JsonNode;
+import tools.jackson.databind.node.JsonNodeFactory;
public class IsJsonTextTest {
@@ -46,7 +46,7 @@ public void testType() throws Exception {
@Test
public void testLiteral() throws Exception {
- final Matcher sut = jsonText(NF.textNode("foo"));
+ final Matcher sut = jsonText(NF.stringNode("foo"));
assertThat(NF.textNode("foo"), is(sut));
}
diff --git a/pom.xml b/pom.xml
index a5470c3..41516d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,9 +58,9 @@
- com.fasterxml.jackson
+ tools.jackson
jackson-bom
- 2.15.2
+ 3.0.3
import
pom