Prepare for Moshi 1.9.0

rubengees · rubengees · commit 5e4ddeaff9f3 · 2019-09-18T22:53:41.000+02:00
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -11,6 +11,7 @@ dependencies {
     runtime "com.squareup.okio:okio:$okioVersion"
 
     kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion"
+    kaptTest "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion"
 
     testImplementation "org.junit.jupiter:junit-jupiter:$junitVersion"
     testImplementation "org.junit.jupiter:junit-jupiter-params:$junitVersion"
diff --git a/library/src/main/kotlin/me/proxer/library/ProxerApi.kt b/library/src/main/kotlin/me/proxer/library/ProxerApi.kt
@@ -17,7 +17,6 @@ import me.proxer.library.api.notifications.NotificationsApi
 import me.proxer.library.api.ucp.UcpApi
 import me.proxer.library.api.user.UserApi
 import me.proxer.library.internal.DefaultLoginTokenManager
-import me.proxer.library.internal.adapter.AdaptionInfoAdapter
 import me.proxer.library.internal.adapter.BooleanAdapterFactory
 import me.proxer.library.internal.adapter.ConferenceAdapter
 import me.proxer.library.internal.adapter.ConferenceInfoAdapter
@@ -258,7 +257,6 @@ class ProxerApi private constructor(retrofit: Retrofit) {
                 .add(HttpUrlAdapter())
                 .add(ConferenceAdapter())
                 .add(EpisodeInfoAdapter())
-                .add(AdaptionInfoAdapter())
                 .add(NotificationAdapter())
                 .add(ConferenceInfoAdapter())
                 .add(BooleanAdapterFactory())
diff --git a/library/src/main/kotlin/me/proxer/library/entity/info/AdaptionInfo.kt b/library/src/main/kotlin/me/proxer/library/entity/info/AdaptionInfo.kt
@@ -1,6 +1,7 @@
 package me.proxer.library.entity.info
 
 import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
 import me.proxer.library.entity.ProxerIdItem
 import me.proxer.library.enums.Medium
 
@@ -10,6 +11,7 @@ import me.proxer.library.enums.Medium
  * @property name The name.
  * @property medium The medium.
  */
+@JsonClass(generateAdapter = true)
 data class AdaptionInfo(
     @Json(name = "id") override val id: String,
     @Json(name = "name") val name: String,
diff --git a/library/src/main/kotlin/me/proxer/library/entity/info/RatingDetails.kt b/library/src/main/kotlin/me/proxer/library/entity/info/RatingDetails.kt
@@ -1,6 +1,7 @@
 package me.proxer.library.entity.info
 
 import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
 
 /**
  * Container for the single ratings. This ranges from 1 to 5 and is 0 if the user has not rated a
@@ -14,6 +15,7 @@ import com.squareup.moshi.Json
  *
  * @author Desnoo
  */
+@JsonClass(generateAdapter = true)
 data class RatingDetails(
     @Json(name = "genre") val genre: Int = 0,
     @Json(name = "story") val story: Int = 0,
diff --git a/library/src/main/kotlin/me/proxer/library/entity/manga/Page.kt b/library/src/main/kotlin/me/proxer/library/entity/manga/Page.kt
@@ -1,6 +1,7 @@
 package me.proxer.library.entity.manga
 
 import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
 
 /**
  * Entity representing a single page from a [Chapter].
@@ -11,6 +12,7 @@ import com.squareup.moshi.Json
  *
  * @author Ruben Gees
  */
+@JsonClass(generateAdapter = true)
 data class Page(
     @Json(name = "name") val name: String,
     @Json(name = "height") val height: Int,
diff --git a/library/src/main/kotlin/me/proxer/library/entity/notifications/Notification.kt b/library/src/main/kotlin/me/proxer/library/entity/notifications/Notification.kt
@@ -26,5 +26,5 @@ data class Notification(
     @Json(name = "link") val contentLink: HttpUrl,
     @Json(name = "linktext") val text: String,
     @Json(name = "time") override val date: Date,
-    @Json(name = "description") val additionalDescription: String?
+    @Json(name = "description") val additionalDescription: String
 ) : ProxerIdItem, ProxerDateItem
diff --git a/library/src/main/kotlin/me/proxer/library/entity/notifications/NotificationInfo.kt b/library/src/main/kotlin/me/proxer/library/entity/notifications/NotificationInfo.kt
@@ -1,7 +1,5 @@
 package me.proxer.library.entity.notifications
 
-import com.squareup.moshi.Json
-
 /**
  * Entity holding counts of notification types.
  *
@@ -13,8 +11,8 @@ import com.squareup.moshi.Json
  * @author Ruben Gees
  */
 data class NotificationInfo(
-    @Json(name = "message_amount") val messageAmount: Int,
-    @Json(name = "friend_request_amount") val friendRequestAmount: Int,
-    @Json(name = "news_amount") val newsAmount: Int,
-    @Json(name = "notification_amount") val notificationAmount: Int
+    val messageAmount: Int,
+    val friendRequestAmount: Int,
+    val newsAmount: Int,
+    val notificationAmount: Int
 )
diff --git a/library/src/main/kotlin/me/proxer/library/internal/adapter/AdaptionInfoAdapter.kt b/library/src/main/kotlin/me/proxer/library/internal/adapter/AdaptionInfoAdapter.kt
diff --git a/library/src/main/kotlin/me/proxer/library/internal/adapter/ConferenceAdapter.kt b/library/src/main/kotlin/me/proxer/library/internal/adapter/ConferenceAdapter.kt
@@ -3,6 +3,7 @@ package me.proxer.library.internal.adapter
 import com.squareup.moshi.FromJson
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+import com.squareup.moshi.ToJson
 import me.proxer.library.entity.messenger.Conference
 import java.util.Date
 
@@ -23,6 +24,22 @@ internal class ConferenceAdapter {
         )
     }
 
+    @ToJson
+    fun toJson(value: Conference): IntermediateConference {
+        return IntermediateConference(
+            id = value.id,
+            topic = value.topic,
+            customTopic = value.customTopic,
+            participantAmount = value.participantAmount,
+            isGroup = value.isGroup,
+            isRead = value.isRead,
+            date = value.date,
+            unreadMessageAmount = value.unreadMessageAmount,
+            lastReadMessageId = value.lastReadMessageId,
+            rawImage = value.imageType + IMAGE_DELIMITER + value.image
+        )
+    }
+
     @JsonClass(generateAdapter = true)
     internal data class IntermediateConference(
         @Json(name = "id") val id: String,
diff --git a/library/src/main/kotlin/me/proxer/library/internal/adapter/ConferenceInfoAdapter.kt b/library/src/main/kotlin/me/proxer/library/internal/adapter/ConferenceInfoAdapter.kt
@@ -3,6 +3,7 @@ package me.proxer.library.internal.adapter
 import com.squareup.moshi.FromJson
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+import com.squareup.moshi.ToJson
 import me.proxer.library.entity.messenger.ConferenceInfo
 import me.proxer.library.entity.messenger.ConferenceParticipant
 
@@ -21,6 +22,20 @@ internal class ConferenceInfoAdapter {
         )
     }
 
+    @ToJson
+    fun toJson(value: ConferenceInfo): IntermediateConferenceInfoContainer {
+        return IntermediateConferenceInfoContainer(
+            IntermediateConferenceInfoContainer.IntermediateConferenceInfo(
+                value.topic,
+                value.participantAmount,
+                value.firstMessageTime,
+                value.lastMessageTime,
+                value.leaderId
+            ),
+            value.participants
+        )
+    }
+
     @JsonClass(generateAdapter = true)
     internal data class IntermediateConferenceInfoContainer(
         @Json(name = "conference") internal val info: IntermediateConferenceInfo,
diff --git a/library/src/main/kotlin/me/proxer/library/internal/adapter/FixRatingDetailsAdapter.kt b/library/src/main/kotlin/me/proxer/library/internal/adapter/FixRatingDetailsAdapter.kt
@@ -3,6 +3,8 @@ package me.proxer.library.internal.adapter
 import com.squareup.moshi.FromJson
 import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.JsonReader
+import com.squareup.moshi.JsonWriter
+import com.squareup.moshi.ToJson
 import me.proxer.library.entity.info.RatingDetails
 
 /**
@@ -23,4 +25,9 @@ internal class FixRatingDetailsAdapter {
             else -> delegate.fromJson(json)
         }
     }
+
+    @ToJson
+    fun toJson(writer: JsonWriter, value: RatingDetails?, delegate: JsonAdapter<RatingDetails>) {
+        delegate.toJson(writer, value)
+    }
 }
diff --git a/library/src/main/kotlin/me/proxer/library/internal/adapter/HttpUrlAdapter.kt b/library/src/main/kotlin/me/proxer/library/internal/adapter/HttpUrlAdapter.kt
@@ -1,6 +1,7 @@
 package me.proxer.library.internal.adapter
 
 import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 
@@ -15,4 +16,7 @@ internal class HttpUrlAdapter {
 
         return fixedUrl.toHttpUrlOrNull()
     }
+
+    @ToJson
+    fun toJson(url: HttpUrl?) = url?.toString()
 }
diff --git a/library/src/main/kotlin/me/proxer/library/internal/adapter/NotificationAdapter.kt b/library/src/main/kotlin/me/proxer/library/internal/adapter/NotificationAdapter.kt
@@ -3,6 +3,7 @@ package me.proxer.library.internal.adapter
 import com.squareup.moshi.FromJson
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
+import com.squareup.moshi.ToJson
 import me.proxer.library.entity.notifications.Notification
 import me.proxer.library.enums.NotificationType
 import me.proxer.library.util.ProxerUrls
@@ -28,6 +29,14 @@ internal class NotificationAdapter {
         )
     }
 
+    @ToJson
+    fun toJson(value: Notification): IntermediateNotification {
+        return IntermediateNotification(
+            value.id, value.type, value.contentId, value.contentLink.toString(),
+            value.text, value.date, value.additionalDescription
+        )
+    }
+
     @JsonClass(generateAdapter = true)
     internal data class IntermediateNotification(
         @Json(name = "id") val id: String,
diff --git a/library/src/main/kotlin/me/proxer/library/internal/adapter/NotificationInfoAdapter.kt b/library/src/main/kotlin/me/proxer/library/internal/adapter/NotificationInfoAdapter.kt
@@ -2,6 +2,7 @@ package me.proxer.library.internal.adapter
 
 import com.squareup.moshi.FromJson
 import com.squareup.moshi.JsonDataException
+import com.squareup.moshi.ToJson
 import me.proxer.library.entity.notifications.NotificationInfo
 
 /**
@@ -29,4 +30,9 @@ internal class NotificationInfoAdapter {
             json[NEWS_FIELD_LOCATION], json[NOTIFICATIONS_FIELD_LOCATION]
         )
     }
+
+    @ToJson
+    fun toJson(value: NotificationInfo): IntArray {
+        return intArrayOf(value.messageAmount, value.friendRequestAmount, value.newsAmount, value.notificationAmount)
+    }
 }
diff --git a/library/src/main/kotlin/me/proxer/library/internal/adapter/PageAdapter.kt b/library/src/main/kotlin/me/proxer/library/internal/adapter/PageAdapter.kt
@@ -2,6 +2,7 @@ package me.proxer.library.internal.adapter
 
 import com.squareup.moshi.FromJson
 import com.squareup.moshi.JsonDataException
+import com.squareup.moshi.ToJson
 import me.proxer.library.entity.manga.Page
 
 /**
@@ -35,4 +36,9 @@ internal class PageAdapter {
             Page(jsonPage[NAME_FIELD_LOCATION], height, width)
         }
     }
+
+    @ToJson
+    fun toJson(value: Page): Array<String> {
+        return arrayOf(value.name, value.width.toString(), value.height.toString())
+    }
 }
diff --git a/library/src/test/kotlin/me/proxer/library/internal/adapter/DelimitedEnumSetAdapterFactoryTest.kt b/library/src/test/kotlin/me/proxer/library/internal/adapter/DelimitedEnumSetAdapterFactoryTest.kt
@@ -1,5 +1,6 @@
 package me.proxer.library.internal.adapter
 
+import com.squareup.moshi.JsonClass
 import com.squareup.moshi.JsonDataException
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.Types
@@ -161,15 +162,18 @@ class DelimitedEnumSetAdapterFactoryTest {
         result shouldEqual """{"genders":"f, m"}"""
     }
 
-    private data class GenderTestClass(
+    @JsonClass(generateAdapter = true)
+    data class GenderTestClass(
         @field:DelimitedEnumSet val genders: Set<Gender>? = null
     )
 
-    private data class GenderWithDelimiterTestClass(
+    @JsonClass(generateAdapter = true)
+    data class GenderWithDelimiterTestClass(
         @field:DelimitedEnumSet(delimiter = ", ") val genders: Set<Gender>? = null
     )
 
-    private data class FskConstrainTestClass(
+    @JsonClass(generateAdapter = true)
+    data class FskConstrainTestClass(
         @field:DelimitedEnumSet val fskConstraints: Set<FskConstraint>? = null
     )
 }
diff --git a/library/src/test/kotlin/me/proxer/library/internal/adapter/DelimitedStringSetAdapterFactoryTest.kt b/library/src/test/kotlin/me/proxer/library/internal/adapter/DelimitedStringSetAdapterFactoryTest.kt
@@ -1,5 +1,6 @@
 package me.proxer.library.internal.adapter
 
+import com.squareup.moshi.JsonClass
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.Types
 import org.amshove.kluent.shouldBeEmpty
@@ -141,15 +142,18 @@ class DelimitedStringSetAdapterFactoryTest {
         result shouldEqual """{"value":"a, b, c"}"""
     }
 
-    private data class StringSetTestClass(
+    @JsonClass(generateAdapter = true)
+    data class StringSetTestClass(
         @field:DelimitedStringSet val value: Set<String>
     )
 
-    private data class StringSetWithDelimiterTestClass(
+    @JsonClass(generateAdapter = true)
+    data class StringSetWithDelimiterTestClass(
         @field:DelimitedStringSet(delimiter = ", ") val value: Set<String>
     )
 
-    private data class StringSetWithValuesToKeepTestClass(
+    @JsonClass(generateAdapter = true)
+    data class StringSetWithValuesToKeepTestClass(
         @field:DelimitedStringSet(valuesToKeep = ["a b"]) val value: Set<String>
     )
 }
