Skip to content

Commit f055252

Browse files
k163377k163377
authored
Merge pull request #262 from ProjectMapK/update-ktlint
Update Kotlinter/Ktlint
2 parents 7d1ad03 + eadb840 commit f055252

File tree

5 files changed

+107
-37
lines changed

5 files changed

+107
-37
lines changed

‎.editorconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
root = true
33

44
[*.{kt,kts}]
5+
ktlint_code_style = intellij_idea
56
ij_kotlin_allow_trailing_comma = false
67
ij_kotlin_allow_trailing_comma_on_call_site = false

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jackson-xml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-xm
2121
jackson-jsr310 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jsr310", version.ref = "jackson" }
2222

2323
[plugins]
24-
kotlinter = { id = "org.jmailen.kotlinter", version = "3.16.0" }
24+
kotlinter = { id = "org.jmailen.kotlinter", version = "4.4.1" }

‎src/main/kotlin/io/github/projectmapk/jackson/module/kogera/Extensions.kt‎

Lines changed: 91 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -75,37 +75,97 @@ public inline fun <reified T, reified U> ObjectMapper.addMixIn(): ObjectMapper =
7575
public inline fun <reified T, reified U> JsonMapper.Builder.addMixIn(): JsonMapper.Builder =
7676
this.addMixIn(T::class.java, U::class.java)
7777

78-
public operator fun ArrayNode.plus(element: Boolean) { add(element) }
79-
public operator fun ArrayNode.plus(element: Short) { add(element) }
80-
public operator fun ArrayNode.plus(element: Int) { add(element) }
81-
public operator fun ArrayNode.plus(element: Long) { add(element) }
82-
public operator fun ArrayNode.plus(element: Float) { add(element) }
83-
public operator fun ArrayNode.plus(element: Double) { add(element) }
84-
public operator fun ArrayNode.plus(element: BigDecimal) { add(element) }
85-
public operator fun ArrayNode.plus(element: BigInteger) { add(element) }
86-
public operator fun ArrayNode.plus(element: String) { add(element) }
87-
public operator fun ArrayNode.plus(element: ByteArray) { add(element) }
88-
public operator fun ArrayNode.plus(element: JsonNode) { add(element) }
89-
public operator fun ArrayNode.plus(elements: ArrayNode) { addAll(elements) }
90-
public operator fun ArrayNode.plusAssign(element: Boolean) { add(element) }
91-
public operator fun ArrayNode.plusAssign(element: Short) { add(element) }
92-
public operator fun ArrayNode.plusAssign(element: Int) { add(element) }
93-
public operator fun ArrayNode.plusAssign(element: Long) { add(element) }
94-
public operator fun ArrayNode.plusAssign(element: Float) { add(element) }
95-
public operator fun ArrayNode.plusAssign(element: Double) { add(element) }
96-
public operator fun ArrayNode.plusAssign(element: BigDecimal) { add(element) }
97-
public operator fun ArrayNode.plusAssign(element: BigInteger) { add(element) }
98-
public operator fun ArrayNode.plusAssign(element: String) { add(element) }
99-
public operator fun ArrayNode.plusAssign(element: ByteArray) { add(element) }
100-
public operator fun ArrayNode.plusAssign(element: JsonNode) { add(element) }
101-
public operator fun ArrayNode.plusAssign(elements: ArrayNode) { addAll(elements) }
102-
public operator fun ArrayNode.minus(index: Int) { remove(index) }
103-
public operator fun ArrayNode.minusAssign(index: Int) { remove(index) }
104-
105-
public operator fun ObjectNode.minus(field: String) { remove(field) }
106-
public operator fun ObjectNode.minus(fields: Collection<String>) { remove(fields) }
107-
public operator fun ObjectNode.minusAssign(field: String) { remove(field) }
108-
public operator fun ObjectNode.minusAssign(fields: Collection<String>) { remove(fields) }
78+
public operator fun ArrayNode.plus(element: Boolean) {
79+
add(element)
80+
}
81+
public operator fun ArrayNode.plus(element: Short) {
82+
add(element)
83+
}
84+
public operator fun ArrayNode.plus(element: Int) {
85+
add(element)
86+
}
87+
public operator fun ArrayNode.plus(element: Long) {
88+
add(element)
89+
}
90+
public operator fun ArrayNode.plus(element: Float) {
91+
add(element)
92+
}
93+
public operator fun ArrayNode.plus(element: Double) {
94+
add(element)
95+
}
96+
public operator fun ArrayNode.plus(element: BigDecimal) {
97+
add(element)
98+
}
99+
public operator fun ArrayNode.plus(element: BigInteger) {
100+
add(element)
101+
}
102+
public operator fun ArrayNode.plus(element: String) {
103+
add(element)
104+
}
105+
public operator fun ArrayNode.plus(element: ByteArray) {
106+
add(element)
107+
}
108+
public operator fun ArrayNode.plus(element: JsonNode) {
109+
add(element)
110+
}
111+
public operator fun ArrayNode.plus(elements: ArrayNode) {
112+
addAll(elements)
113+
}
114+
public operator fun ArrayNode.plusAssign(element: Boolean) {
115+
add(element)
116+
}
117+
public operator fun ArrayNode.plusAssign(element: Short) {
118+
add(element)
119+
}
120+
public operator fun ArrayNode.plusAssign(element: Int) {
121+
add(element)
122+
}
123+
public operator fun ArrayNode.plusAssign(element: Long) {
124+
add(element)
125+
}
126+
public operator fun ArrayNode.plusAssign(element: Float) {
127+
add(element)
128+
}
129+
public operator fun ArrayNode.plusAssign(element: Double) {
130+
add(element)
131+
}
132+
public operator fun ArrayNode.plusAssign(element: BigDecimal) {
133+
add(element)
134+
}
135+
public operator fun ArrayNode.plusAssign(element: BigInteger) {
136+
add(element)
137+
}
138+
public operator fun ArrayNode.plusAssign(element: String) {
139+
add(element)
140+
}
141+
public operator fun ArrayNode.plusAssign(element: ByteArray) {
142+
add(element)
143+
}
144+
public operator fun ArrayNode.plusAssign(element: JsonNode) {
145+
add(element)
146+
}
147+
public operator fun ArrayNode.plusAssign(elements: ArrayNode) {
148+
addAll(elements)
149+
}
150+
public operator fun ArrayNode.minus(index: Int) {
151+
remove(index)
152+
}
153+
public operator fun ArrayNode.minusAssign(index: Int) {
154+
remove(index)
155+
}
156+
157+
public operator fun ObjectNode.minus(field: String) {
158+
remove(field)
159+
}
160+
public operator fun ObjectNode.minus(fields: Collection<String>) {
161+
remove(fields)
162+
}
163+
public operator fun ObjectNode.minusAssign(field: String) {
164+
remove(field)
165+
}
166+
public operator fun ObjectNode.minusAssign(fields: Collection<String>) {
167+
remove(fields)
168+
}
109169

110170
public operator fun JsonNode.contains(field: String): Boolean = has(field)
111171
public operator fun JsonNode.contains(index: Int): Boolean = has(index)

‎src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/singletonSupport/KotlinBeanDeserializerModifier.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ import java.io.Serializable
1111
// [module-kotlin#225]: keep Kotlin singletons as singletons
1212
internal class KotlinBeanDeserializerModifier(
1313
private val cache: ReflectionCache
14-
) : BeanDeserializerModifier(), Serializable {
14+
) : BeanDeserializerModifier(),
15+
Serializable {
1516
companion object {
1617
// Increment is required when properties that use LRUMap are changed.
1718
@Suppress("ConstPropertyName")

‎src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zIntegration/ser/InheritanceTest.kt‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,21 @@ import org.junit.jupiter.api.Assertions.assertTrue
66
import org.junit.jupiter.api.Test
77

88
private class InheritanceTest {
9-
abstract class A { val a: Int get() = 0 }
9+
abstract class A {
10+
val a: Int get() = 0
11+
}
1012

11-
interface I { val i: Int get() = -1 }
13+
interface I {
14+
val i: Int get() = -1
15+
}
1216

13-
interface J : I { val j: Int get() = -2 }
17+
interface J : I {
18+
val j: Int get() = -2
19+
}
1420

15-
private class X : A(), J
21+
private class X :
22+
A(),
23+
J
1624

1725
val cache = ReflectionCache(5, 5)
1826

0 commit comments

Comments
 (0)