Skip to content

Update to Jackson 3 #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Bombe wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to Jackson 3 #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions jackson/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
<artifactId>hamcrest</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<groupId>tools.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<groupId>tools.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions jackson/src/main/java/com/spotify/hamcrest/jackson/AbstractJsonNodeMatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<A extends JsonNode>
extends TypeSafeDiagnosingMatcher<JsonNode> {
Expand Down
6 changes: 3 additions & 3 deletions jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonArray.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<ArrayNode> {

Expand Down
6 changes: 3 additions & 3 deletions jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonBoolean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<BooleanNode> {

Expand Down
6 changes: 3 additions & 3 deletions jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonMissing.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<MissingNode> {
private static final IsJsonMissing INSTANCE = new IsJsonMissing();
Expand Down
6 changes: 3 additions & 3 deletions jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonNull.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<NullNode> {
private static final IsJsonNull INSTANCE = new IsJsonNull();
Expand Down
8 changes: 4 additions & 4 deletions jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonNumber.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
24 changes: 12 additions & 12 deletions jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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.
Expand Down Expand Up @@ -71,7 +71,7 @@ public static IsJsonObject jsonObject() {
* @return instance of {@link IsJsonObject}.
*/
public static IsJsonObject jsonObject(final ObjectNode objectNode) {
final Iterator<Map.Entry<String, JsonNode>> fields = objectNode.fields();
final Iterator<Map.Entry<String, JsonNode>> fields = objectNode.properties().iterator();
final LinkedHashMap<String, Matcher<? super JsonNode>> entryMatchers = new LinkedHashMap<>();

while (fields.hasNext()) {
Expand Down Expand Up @@ -104,7 +104,7 @@ private static Matcher<JsonNode> 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);
}
Expand Down
8 changes: 4 additions & 4 deletions jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonStringMatching.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -74,7 +74,7 @@ private Condition<JsonNode> 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());
Expand Down
12 changes: 6 additions & 6 deletions jackson/src/main/java/com/spotify/hamcrest/jackson/IsJsonText.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<TextNode> {
public class IsJsonText extends AbstractJsonNodeMatcher<StringNode> {

private final Matcher<? super String> textMatcher;

Expand All @@ -51,12 +51,12 @@ public static Matcher<JsonNode> jsonText(Matcher<? super String> textMatcher) {
return new IsJsonText(textMatcher);
}

public static Matcher<JsonNode> jsonText(final TextNode value) {
public static Matcher<JsonNode> 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;
Expand Down
18 changes: 9 additions & 9 deletions jackson/src/main/java/com/spotify/hamcrest/jackson/JsonMatchers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -167,7 +167,7 @@ public static Matcher<JsonNode> jsonText(Matcher<? super String> textMatcher) {
return IsJsonText.jsonText(textMatcher);
}

public static Matcher<JsonNode> jsonText(TextNode value) {
public static Matcher<JsonNode> jsonText(StringNode value) {
return IsJsonText.jsonText(value);
}
}
4 changes: 2 additions & 2 deletions jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonArrayTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonBooleanTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
6 changes: 3 additions & 3 deletions jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonMissingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
6 changes: 3 additions & 3 deletions jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonNullTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
8 changes: 4 additions & 4 deletions jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonNumberTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
6 changes: 3 additions & 3 deletions jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonObjectTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonStringMatchingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
6 changes: 3 additions & 3 deletions jackson/src/test/java/com/spotify/hamcrest/jackson/IsJsonTextTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand All @@ -46,7 +46,7 @@ public void testType() throws Exception {

@Test
public void testLiteral() throws Exception {
final Matcher<JsonNode> sut = jsonText(NF.textNode("foo"));
final Matcher<JsonNode> sut = jsonText(NF.stringNode("foo"));

assertThat(NF.textNode("foo"), is(sut));
}
Expand Down
Loading