all: switch to moshi-kotlin and fix tests

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
Harsh Shandilya 2020-12-17 13:27:13 +05:30
parent bca96ae215
commit 740d9e432a
No known key found for this signature in database
GPG key ID: 366D7BBAD1031E80
8 changed files with 12 additions and 12 deletions

View file

@ -1,9 +1,7 @@
package dev.msfjarvis.lobsters.model
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass
@JsonClass(generateAdapter = true)
class KeybaseSignature(
@Json(name = "kb_username")
val kbUsername: String,

View file

@ -1,9 +1,7 @@
package dev.msfjarvis.lobsters.model
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass
@JsonClass(generateAdapter = true)
class Submitter(
val username: String,
@Json(name = "created_at")

View file

@ -1,11 +1,12 @@
package dev.msfjarvis.lobsters.model
import com.squareup.moshi.Moshi
import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
import com.squareup.sqldelight.ColumnAdapter
class SubmitterAdapter : ColumnAdapter<Submitter, String> {
private val moshi = Moshi.Builder().build()
private val submitterJsonAdapter = SubmitterJsonAdapter(moshi)
private val moshi = Moshi.Builder().add(KotlinJsonAdapterFactory()).build()
private val submitterJsonAdapter = moshi.adapter(Submitter::class.java)
override fun decode(databaseValue: String): Submitter {
return submitterJsonAdapter.fromJson(databaseValue)!!

View file

@ -1,4 +1,5 @@
import dev.msfjarvis.lobsters.model.Submitter;
import java.lang.Integer;
import kotlin.collections.List;
CREATE TABLE IF NOT EXISTS LobstersPost(
@ -14,7 +15,7 @@ CREATE TABLE IF NOT EXISTS LobstersPost(
comments_url TEXT NOT NULL,
submitter_user TEXT as Submitter NOT NULL,
tags TEXT as List<String> NOT NULL,
is_saved INTEGER DEFAULT 0 NOT NULL
is_saved INTEGER as Integer DEFAULT 0
);
selectAllPosts: