Skip to content

Commit 7d1ad03

Browse files
authored
Merge pull request #261 from ProjectMapK/pre-ktlint
Preliminary fixes for Kotlinter/Ktlint updates
2 parents f103995 + ab65d2d commit 7d1ad03

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import io.github.projectmapk.jackson.module.kogera.deser.valueInstantiator.Kotli
1818
import io.github.projectmapk.jackson.module.kogera.ser.serializers.KotlinKeySerializers
1919
import io.github.projectmapk.jackson.module.kogera.ser.serializers.KotlinSerializers
2020
import java.io.Serializable
21-
import java.util.*
21+
import java.util.BitSet
2222

2323
/**
2424
* @param cacheSize

src/main/kotlin/io/github/projectmapk/jackson/module/kogera/deser/deserializers/KotlinDeserializers.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@ import java.lang.reflect.Modifier
2626
internal object SequenceDeserializer : StdDeserializer<Sequence<*>>(Sequence::class.java) {
2727
private fun readResolve(): Any = SequenceDeserializer
2828

29-
override fun deserialize(p: JsonParser, ctxt: DeserializationContext): Sequence<*> {
30-
return ctxt.readValue(p, List::class.java).asSequence()
31-
}
29+
override fun deserialize(p: JsonParser, ctxt: DeserializationContext): Sequence<*> =
30+
ctxt.readValue(p, List::class.java).asSequence()
3231
}
3332

3433
internal object RegexDeserializer : StdDeserializer<Regex>(Regex::class.java) {

src/test/kotlin/io/github/projectmapk/jackson/module/kogera/zPorted/test/ParameterNameTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import org.junit.jupiter.api.Assertions.assertTrue
1414
import org.junit.jupiter.api.Assertions.fail
1515
import org.junit.jupiter.api.Test
1616
import java.io.StringWriter
17-
import java.util.*
17+
import java.util.Date
1818
import kotlin.properties.Delegates
1919

2020
class TestJacksonWithKotlin {

0 commit comments

Comments
 (0)