Skip to content

Commit 61d0843

Browse files
committed
upgrade to jackson 3
1 parent 101df3a commit 61d0843

File tree

4 files changed

+26
-25
lines changed

4 files changed

+26
-25
lines changed

CHANGELOG.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
This list is not intended to be all-encompassing - it will document major and breaking API changes with their rationale
44
when appropriate:
55

6-
### v2.22.5.0 (uncut)
7-
- **all** : Upgrade versions
6+
### v2.23.0.0
7+
- **all** : Upgrade versions, including Jackson to v3
8+
- **data4k** : [Breaking] Migrated to Jackson v3 - this is a major change and may require changes to your code if you were using Jackson-specific annotations or features.
89

910
### v2.22.4.0
1011
- **all** : Release to new Maven Central target

data4k/src/main/kotlin/dev/forkhandles/data/JsonNodeDataContainer.kt

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
package dev.forkhandles.data
22

3-
import com.fasterxml.jackson.databind.JsonNode
4-
import com.fasterxml.jackson.databind.node.ArrayNode
5-
import com.fasterxml.jackson.databind.node.BigIntegerNode
6-
import com.fasterxml.jackson.databind.node.BinaryNode
7-
import com.fasterxml.jackson.databind.node.BooleanNode
8-
import com.fasterxml.jackson.databind.node.BooleanNode.FALSE
9-
import com.fasterxml.jackson.databind.node.BooleanNode.TRUE
10-
import com.fasterxml.jackson.databind.node.DecimalNode
11-
import com.fasterxml.jackson.databind.node.DoubleNode
12-
import com.fasterxml.jackson.databind.node.FloatNode
13-
import com.fasterxml.jackson.databind.node.IntNode
14-
import com.fasterxml.jackson.databind.node.JsonNodeFactory.instance
15-
import com.fasterxml.jackson.databind.node.LongNode
16-
import com.fasterxml.jackson.databind.node.NullNode
17-
import com.fasterxml.jackson.databind.node.ObjectNode
18-
import com.fasterxml.jackson.databind.node.ShortNode
19-
import com.fasterxml.jackson.databind.node.TextNode
3+
import tools.jackson.databind.JsonNode
4+
import tools.jackson.databind.node.ArrayNode
5+
import tools.jackson.databind.node.BigIntegerNode
6+
import tools.jackson.databind.node.BinaryNode
7+
import tools.jackson.databind.node.BooleanNode
8+
import tools.jackson.databind.node.BooleanNode.FALSE
9+
import tools.jackson.databind.node.BooleanNode.TRUE
10+
import tools.jackson.databind.node.DecimalNode
11+
import tools.jackson.databind.node.DoubleNode
12+
import tools.jackson.databind.node.FloatNode
13+
import tools.jackson.databind.node.IntNode
14+
import tools.jackson.databind.node.JsonNodeFactory.instance
15+
import tools.jackson.databind.node.LongNode
16+
import tools.jackson.databind.node.NullNode
17+
import tools.jackson.databind.node.ObjectNode
18+
import tools.jackson.databind.node.ShortNode
19+
import tools.jackson.databind.node.StringNode
2020
import java.math.BigDecimal
2121
import java.math.BigInteger
2222

@@ -47,7 +47,7 @@ open class JsonNodeDataContainer(input: JsonNode) :
4747
is BigDecimal -> DecimalNode(this)
4848
is BigInteger -> BigIntegerNode(this)
4949
is Double -> DoubleNode(this)
50-
is String -> TextNode(this)
50+
is String -> StringNode(this)
5151
is Iterable<*> -> ArrayNode(instance)
5252
.also { map { if (it is JsonNode) it else it.toNode() }.forEach(it::add) }
5353

@@ -56,7 +56,7 @@ open class JsonNodeDataContainer(input: JsonNode) :
5656

5757
private fun nodeToValue(input: JsonNode): Any? = when (input) {
5858
is NullNode -> null
59-
is TextNode -> input.textValue()
59+
is StringNode -> input.textValue()
6060
is ArrayNode -> input.map(::nodeToValue)
6161
is ObjectNode -> input
6262
is BooleanNode -> input.booleanValue()

data4k/src/test/kotlin/dev/forkhandles/lens/JsonNodeDataContainerTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package dev.forkhandles.lens
22

3-
import com.fasterxml.jackson.databind.JsonNode
4-
import com.fasterxml.jackson.databind.ObjectMapper
3+
import tools.jackson.databind.JsonNode
4+
import tools.jackson.databind.ObjectMapper
55
import com.oneeyedmen.okeydoke.Approver
66
import dev.forkhandles.data.JsonNodeDataContainer
77
import dev.forkhandles.lens.ContainerMeta.bar

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kotlin = "2.2.20"
33
kotlinx-coroutines = "1.10.2"
44
kotlinx-serialization = "1.9.0"
55
kotlinx-benchmark = "0.4.14"
6-
jackson = "2.19.2"
6+
jackson = "3.0.0"
77
hamkrest = "1.8.0.1"
88
kotest = "5.6.2"
99
strikt = "0.34.1"
@@ -29,7 +29,7 @@ kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-c
2929
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
3030
kotlinx-benchmark-runtime = { module = "org.jetbrains.kotlinx:kotlinx-benchmark-runtime", version.ref = "kotlinx-benchmark" }
3131

32-
jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
32+
jackson-databind = { module = "tools.jackson.core:jackson-databind", version.ref = "jackson" }
3333

3434
hamkrest = { module = "com.natpryce:hamkrest", version.ref = "hamkrest" }
3535
kotest-runner-junit5 = { module = "io.kotest:kotest-runner-junit5", version.ref = "kotest" }

0 commit comments

Comments
 (0)