Skip to content

Commit b8fe363

Browse files
committed
Upgrade to Jackson 3
1 parent 3db2e82 commit b8fe363

File tree

208 files changed

+1063
-1059
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

208 files changed

+1063
-1059
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
strategy:
1515
matrix:
16-
java: [ 8, 11, 17, 21 ]
16+
java: [ 17, 21, 25 ]
1717
name: Java ${{ matrix.java }}
1818
steps:
1919
- uses: actions/checkout@v4

pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@
6868
</distributionManagement>
6969

7070
<properties>
71-
<java.testversion>1.8</java.testversion>
72-
<java.version>1.8</java.version>
71+
<java.testversion>17</java.testversion>
72+
<java.version>17</java.version>
7373
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
7474

7575
<version.itu>1.14.0</version.itu>
76-
<version.jackson>2.18.3</version.jackson>
76+
<version.jackson>3.0.0-rc10</version.jackson>
7777
<version.joni>2.2.6</version.joni>
7878
<version.logback>1.3.14</version.logback> <!-- 1.4.x and above is not Java 8 compatible -->
7979
<version.slf4j>2.0.17</version.slf4j>
@@ -112,13 +112,13 @@
112112
</dependency>
113113

114114
<dependency>
115-
<groupId>com.fasterxml.jackson.core</groupId>
115+
<groupId>tools.jackson.core</groupId>
116116
<artifactId>jackson-databind</artifactId>
117117
<version>${version.jackson}</version>
118118
</dependency>
119119

120120
<dependency>
121-
<groupId>com.fasterxml.jackson.dataformat</groupId>
121+
<groupId>tools.jackson.dataformat</groupId>
122122
<artifactId>jackson-dataformat-yaml</artifactId>
123123
<version>${version.jackson}</version>
124124
</dependency>
@@ -459,7 +459,7 @@
459459
</exports>
460460
<requires>
461461
static com.ethlo.time;
462-
static com.fasterxml.jackson.dataformat.yaml;
462+
static tools.jackson.dataformat.yaml;
463463
static org.jruby.jcodings;
464464
static org.jruby.joni;
465465
static org.graalvm.sdk;

src/main/java/com/networknt/schema/Error.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
import com.fasterxml.jackson.annotation.JsonInclude;
2121
import com.fasterxml.jackson.annotation.JsonInclude.Include;
2222
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
23-
import com.fasterxml.jackson.databind.JsonNode;
24-
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
25-
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
23+
import tools.jackson.databind.JsonNode;
24+
import tools.jackson.databind.annotation.JsonSerialize;
25+
import tools.jackson.databind.ser.std.ToStringSerializer;
2626
import com.networknt.schema.i18n.MessageFormatter;
2727
import com.networknt.schema.path.NodePath;
2828
import com.networknt.schema.utils.CachingSupplier;

src/main/java/com/networknt/schema/ErrorMessages.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import java.util.LinkedHashMap;
55
import java.util.Map;
66

7-
import com.fasterxml.jackson.databind.JsonNode;
7+
import tools.jackson.databind.JsonNode;
88

99
/**
1010
* ErrorMessages.
@@ -24,12 +24,12 @@ public static Map<String, String> getErrorMessage(Schema parentSchema, String er
2424
if (message != null) {
2525
JsonNode messageNode = message.get(keyword);
2626
if (messageNode != null) {
27-
if (messageNode.isTextual()) {
28-
return Collections.singletonMap("", messageNode.asText());
27+
if (messageNode.isString()) {
28+
return Collections.singletonMap("", messageNode.asString());
2929
} else if (messageNode.isObject()) {
3030
Map<String, String> result = new LinkedHashMap<>();
31-
messageNode.fields()
32-
.forEachRemaining(entry -> result.put(entry.getKey(), entry.getValue().textValue()));
31+
messageNode.properties().iterator()
32+
.forEachRemaining(entry -> result.put(entry.getKey(), entry.getValue().asString()));
3333
if (!result.isEmpty()) {
3434
return result;
3535
}

src/main/java/com/networknt/schema/Schema.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import java.util.Objects;
3333
import java.util.function.Consumer;
3434

35-
import com.fasterxml.jackson.databind.JsonNode;
35+
import tools.jackson.databind.JsonNode;
3636
import com.networknt.schema.keyword.KeywordValidator;
3737
import com.networknt.schema.keyword.TypeValidator;
3838
import com.networknt.schema.path.NodePath;
@@ -108,11 +108,11 @@ private static Schema obtainSubSchemaNode(final JsonNode schemaNode, final Schem
108108
return null;
109109
}
110110

111-
final String text = node.textValue();
111+
final String text = node.asString();
112112
if (text == null) {
113113
return null;
114114
}
115-
final SchemaLocation schemaLocation = SchemaLocation.of(node.textValue());
115+
final SchemaLocation schemaLocation = SchemaLocation.of(node.asString());
116116
return schemaContext.getSchemaRegistry().getSchema(schemaLocation);
117117
}
118118
public static class JsonNodePathLegacy {
@@ -522,7 +522,7 @@ private List<KeywordValidator> read(JsonNode schemaNode) {
522522
} else {
523523
KeywordValidator refValidator = null;
524524

525-
Iterator<Entry<String, JsonNode>> iterator = schemaNode.fields();
525+
Iterator<Entry<String, JsonNode>> iterator = schemaNode.properties().iterator();
526526
validators = new ArrayList<>(schemaNode.size());
527527
while (iterator.hasNext()) {
528528
Entry<String, JsonNode> entry = iterator.next();

src/main/java/com/networknt/schema/SchemaContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import java.util.concurrent.ConcurrentHashMap;
2020
import java.util.concurrent.ConcurrentMap;
2121

22-
import com.fasterxml.jackson.databind.JsonNode;
22+
import tools.jackson.databind.JsonNode;
2323
import com.networknt.schema.dialect.Dialect;
2424
import com.networknt.schema.keyword.KeywordValidator;
2525

src/main/java/com/networknt/schema/SchemaRegistry.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package com.networknt.schema;
1818

19-
import com.fasterxml.jackson.databind.JsonNode;
19+
import tools.jackson.databind.JsonNode;
2020
import com.networknt.schema.dialect.BasicDialectRegistry;
2121
import com.networknt.schema.dialect.DefaultDialectRegistry;
2222
import com.networknt.schema.dialect.Dialect;
@@ -538,18 +538,18 @@ protected SchemaContext createSchemaContext(final JsonNode schemaNode) {
538538

539539
private Dialect getDialect(final JsonNode schemaNode, SchemaRegistryConfig config) {
540540
final JsonNode iriNode = schemaNode.get("$schema");
541-
if (iriNode != null && iriNode.isTextual()) {
542-
return getDialect(iriNode.textValue());
541+
if (iriNode != null && iriNode.isString()) {
542+
return getDialect(iriNode.asString());
543543
}
544544
return null;
545545
}
546546

547547
private Dialect getDialectOrDefault(final JsonNode schemaNode) {
548548
final JsonNode iriNode = schemaNode.get("$schema");
549-
if (iriNode != null && !iriNode.isNull() && !iriNode.isTextual()) {
549+
if (iriNode != null && !iriNode.isNull() && !iriNode.isString()) {
550550
throw new SchemaException("Unknown dialect: " + iriNode);
551551
}
552-
final String iri = iriNode == null || iriNode.isNull() ? defaultDialectId : iriNode.textValue();
552+
final String iri = iriNode == null || iriNode.isNull() ? defaultDialectId : iriNode.asString();
553553
return getDialect(iri);
554554
}
555555

src/main/java/com/networknt/schema/Validator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package com.networknt.schema;
1818

19-
import com.fasterxml.jackson.databind.JsonNode;
19+
import tools.jackson.databind.JsonNode;
2020
import com.networknt.schema.path.NodePath;
2121
import com.networknt.schema.walk.Walker;
2222

src/main/java/com/networknt/schema/annotation/Annotations.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import java.util.List;
2121
import java.util.Map;
2222

23-
import com.fasterxml.jackson.core.JsonProcessingException;
23+
import tools.jackson.core.JacksonException;
2424
import com.networknt.schema.path.NodePath;
2525
import com.networknt.schema.serialization.JsonMapperFactory;
2626

@@ -92,7 +92,7 @@ public static String format(Map<NodePath, List<Annotation>> annotations) {
9292

9393
try {
9494
return JsonMapperFactory.getInstance().writerWithDefaultPrettyPrinter().writeValueAsString(results);
95-
} catch (JsonProcessingException e) {
95+
} catch (JacksonException e) {
9696
return "";
9797
}
9898
}

src/main/java/com/networknt/schema/dialect/AbstractDialectRegistry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import java.util.Map;
1919
import java.util.Map.Entry;
2020

21-
import com.fasterxml.jackson.databind.JsonNode;
21+
import tools.jackson.databind.JsonNode;
2222
import com.networknt.schema.Error;
2323
import com.networknt.schema.InvalidSchemaException;
2424
import com.networknt.schema.Schema;

0 commit comments

Comments
 (0)