Skip to content

Commit 746f599

Browse files
committed
readValueAsTree in BlockSerializer to avoid trailing token
1 parent 1ba3e35 commit 746f599

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

src/main/kotlin/com/lambda/config/serializers/BlockSerializer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@ object BlockSerializer : Serializer<Block>(Block::class.java), Stringifiable<Blo
4040

4141
object BlockDeserializer : Deserializer<Block>(Block::class.java) {
4242
override fun deserialize(p: JsonParser, ctxt: DeserializationContext): Block =
43-
Registries.BLOCK.codec.parse(JsonOps.UNCOMPRESSED, mapper.readTree(p)).orThrow
43+
Registries.BLOCK.codec.parse(JsonOps.UNCOMPRESSED, p.readValueAsTree()).orThrow
4444
}

src/main/kotlin/com/lambda/config/serializers/CollectionSettingSerializer.kt renamed to src/main/kotlin/com/lambda/config/serializers/CollectionSettingFallbackSerializer.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import tools.jackson.core.JsonParser
2727
import tools.jackson.databind.DeserializationContext
2828
import tools.jackson.databind.SerializationContext
2929

30-
object CollectionSettingSerializer : FallbackSerializer<CollectionSetting<*>>(CollectionSetting::class.java) {
30+
object CollectionSettingFallbackSerializer : FallbackSerializer<CollectionSetting<*>>(CollectionSetting::class.java) {
3131
override fun serialize(setting: CollectionSetting<*>, gen: JsonGenerator, ctxt: SerializationContext) {
3232
if (setting.serialize) mapper.writeValue(gen, setting.originalCore.value)
3333
else {
@@ -40,7 +40,7 @@ object CollectionSettingSerializer : FallbackSerializer<CollectionSetting<*>>(Co
4040
}
4141
}
4242

43-
object CollectionSettingDeserializer : FallbackDeserializer<CollectionSetting<*>>(CollectionSetting::class.java) {
43+
object CollectionSettingFallbackDeserializer : FallbackDeserializer<CollectionSetting<*>>(CollectionSetting::class.java) {
4444
override fun deserialize(p: JsonParser, ctxt: DeserializationContext): CollectionSetting<*> {
4545
throw initFromJsonException("CollectionSetting")
4646
}

0 commit comments

Comments
 (0)