fix: ignore null values in Character#killedVBloods

DarkAtra · May 29, 2024 · 1df6a6e · 1df6a6e
1 parent 4f8c0d9
commit 1df6a6e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/src/main/kotlin/de/darkatra/vrising/discord/clients/botcompanion/BotCompanionClient.kt b/src/main/kotlin/de/darkatra/vrising/discord/clients/botcompanion/BotCompanionClient.kt
@@ -69,3 +69,7 @@ class BotCompanionClient {
             .build()
     }
 }
+
+fun main() {
+    BotCompanionClient().getCharacters("141.98.19.254", 25570, emptyList())
+}
diff --git a/src/main/kotlin/de/darkatra/vrising/discord/clients/botcompanion/model/Character.kt b/src/main/kotlin/de/darkatra/vrising/discord/clients/botcompanion/model/Character.kt
@@ -1,8 +1,12 @@
 package de.darkatra.vrising.discord.clients.botcompanion.model
 
+import com.fasterxml.jackson.annotation.JsonSetter
+import com.fasterxml.jackson.annotation.Nulls
+
 data class Character(
     val name: String,
     val gearLevel: Int,
     val clan: String?,
+    @field:JsonSetter(contentNulls = Nulls.SKIP)
     val killedVBloods: List<VBlood>
 )
diff --git a/src/test/kotlin/de/darkatra/vrising/discord/clients/botcompanion/BotCompanionClientTest.kt b/src/test/kotlin/de/darkatra/vrising/discord/clients/botcompanion/BotCompanionClientTest.kt
@@ -38,7 +38,8 @@ class BotCompanionClientTest {
                                 "clan": "Test",
                                 "killedVBloods": [
                                   "FOREST_WOLF",
-                                  "BANDIT_STONEBREAKER"
+                                  "BANDIT_STONEBREAKER",
+                                  null
                                 ]
                               }
                             ]""".trimIndent()