Removae WrappedLocalDateTime and WrappedSubType to use a deserializer

instead.
Bram-- · Feb 22, 2024 · bd33ab4 · bd33ab4
1 parent bc12719
commit bd33ab4
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 84 deletions.
diff --git a/src/main/kotlin/org/audux/bgg/response/Plays.kt b/src/main/kotlin/org/audux/bgg/response/Plays.kt
@@ -107,7 +107,9 @@ data class PlayItem(
 )
 
 /** A SubType of a thing e.g. board game. */
-data class SubType(val subtype: WrappedSubType)
+data class SubType(
+ @JsonDeserialize(using = WrappedSubTypeDeserializer::class)
+ val subtype: org.audux.bgg.common.SubType)
 
 /**
  * Represents a person in the play i.e. their username, id, what color they played, how they did

diff --git a/src/main/kotlin/org/audux/bgg/response/Things.kt b/src/main/kotlin/org/audux/bgg/response/Things.kt
@@ -318,7 +318,8 @@ data class Comment(
 /** A single listing for the thing i.e. a 'for sale'-listing. */
 data class MarketplaceListing(
  /** When the listing was created. */
- val listDate: WrappedLocalDateTime,
+ @JsonDeserialize(using = WrappedLocalDateTimeDeserializer::class)
+ val listDate: LocalDateTime,
 
  /** The requested price for the listing. */
  val price: Price,

diff --git a/src/main/kotlin/org/audux/bgg/response/TypeDeserializers.kt b/src/main/kotlin/org/audux/bgg/response/TypeDeserializers.kt
@@ -18,7 +18,9 @@ import com.fasterxml.jackson.core.JsonToken
 import com.fasterxml.jackson.databind.DeserializationContext
 import com.fasterxml.jackson.databind.JsonDeserializer
 import java.time.LocalDate
+import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
+import java.util.Locale
 import org.audux.bgg.common.FamilyType
 import org.audux.bgg.common.ForumListType
 import org.audux.bgg.common.PlayThingType
@@ -102,14 +104,29 @@ internal class WrappedLocalDateDeserializer : JsonDeserializer<LocalDate?>() {
  * Deserializes `<elementName value="2012-10-12" />` objects into a `LocalDate.of(2012, 10, 12)
  * property.
  */
-internal class WrappedLocalDateTimeDeserializer : JsonDeserializer<LocalDate?>() {
+internal class WrappedLocalDateTimeDeserializer : JsonDeserializer<LocalDateTime?>() {
  override fun deserialize(parser: JsonParser?, context: DeserializationContext?) =
  readWrappedValue(parser) {
- val formatter = DateTimeFormatter.ofPattern("E, dd MMM yyyy HH:mm:ss Z")
- LocalDate.parse(it.valueAsString, formatter)
+ it.valueAsString
+ ?.takeIf { str -> str.isNotBlank() }
+ ?.let { str ->
+ val formatter =
+ DateTimeFormatter.ofPattern("E, dd MMM yyyy HH:mm:ss Z")
+ .localizedBy(Locale.US)
+ LocalDateTime.parse(str, formatter)
+ }
  }
 }
 
+/**
+ * Deserializes `<elementName value="2012-10-12" />` objects into a `LocalDate.of(2012, 10, 12)
+ * property.
+ */
+internal class WrappedSubTypeDeserializer : JsonDeserializer<SubType?>() {
+ override fun deserialize(parser: JsonParser?, context: DeserializationContext?) =
+ readWrappedValue(parser) { SubType.fromParam(parser?.valueAsString) }
+}
+
 /** Deserializes and trims strings. */
 private fun <T> readWrappedValue(parser: JsonParser?, read: (JsonParser) -> T): T? =
  parser?.let {

diff --git a/src/main/kotlin/org/audux/bgg/response/Wrappedvalues.kt b/src/main/kotlin/org/audux/bgg/response/Wrappedvalues.kt
diff --git a/src/test/kotlin/org/audux/bgg/response/PlaysResponseTest.kt b/src/test/kotlin/org/audux/bgg/response/PlaysResponseTest.kt
@@ -58,7 +58,7 @@ class PlaysResponseTest {
  objectType = PlayThingType.THING,
  objectId = 77130,
  subTypes =
- listOf(SubType(WrappedSubType(org.audux.bgg.common.SubType.BOARD_GAME)))
+ listOf(SubType(org.audux.bgg.common.SubType.BOARD_GAME))
  )
  )
  assertThat(civGame.players)

diff --git a/src/test/kotlin/org/audux/bgg/response/ThingsResponseTest.kt b/src/test/kotlin/org/audux/bgg/response/ThingsResponseTest.kt
@@ -15,12 +15,13 @@ package org.audux.bgg.response
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.google.common.truth.Truth.assertThat
-import java.net.URI
-import java.time.LocalDate
 import org.audux.bgg.common.ThingType
 import org.audux.bgg.util.TestUtils
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
+import java.net.URI
+import java.time.LocalDate
+import java.time.LocalDateTime
 
 /** Test class for [Things] data classes. */
 class ThingsResponseTest {
@@ -336,8 +337,7 @@ class ThingsResponseTest {
  assertThat(things.things).hasSize(1)
  val listings = things.things[0].listings
  assertThat(listings).hasSize(11)
- // WrappedLocalDateTimeSubject.assertThat(listings[0].listDate)
- // .isEqualTo(LocalDateTime.of(2023, 10, 6, 19, 41, 25))
+ assertThat(listings[0].listDate).isEqualTo(LocalDateTime.of(2023, 10, 6, 19, 41, 25))
  assertThat(listings[0].price.value).isEqualTo(80.00)
  assertThat(listings[0].price.currency).isEqualTo("USD")
  assertThat(listings[0].condition).isEqualTo("new")

diff --git a/src/test/kotlin/org/audux/bgg/response/WrappedValueSubject.kt b/src/test/kotlin/org/audux/bgg/response/WrappedValueSubject.kt