From 7e3856fa05e0cfbe8c9c3164b0536b2f1dfcdd12 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Thu, 5 Jan 2023 21:10:14 +0800
Subject: [PATCH] Refine dao nullability

---
 .../com/hippo/ehviewer/dao/DownloadDirname.kt |  6 ++---
 .../com/hippo/ehviewer/dao/DownloadLabel.kt   |  8 +++---
 .../java/com/hippo/ehviewer/dao/EhDatabase.kt | 16 ++++++------
 .../java/com/hippo/ehviewer/dao/Filter.kt     | 21 ++++------------
 .../com/hippo/ehviewer/dao/QuickSearch.kt     | 25 ++++++++-----------
 5 files changed, 31 insertions(+), 45 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/dao/DownloadDirname.kt b/app/src/main/java/com/hippo/ehviewer/dao/DownloadDirname.kt
index d442f511a..9bade3aca 100644
--- a/app/src/main/java/com/hippo/ehviewer/dao/DownloadDirname.kt
+++ b/app/src/main/java/com/hippo/ehviewer/dao/DownloadDirname.kt
@@ -5,11 +5,11 @@ import androidx.room.Entity
 import androidx.room.PrimaryKey
 
 @Entity(tableName = "DOWNLOAD_DIRNAME")
-class DownloadDirname {
+data class DownloadDirname(
     @PrimaryKey
     @ColumnInfo(name = "GID")
-    var gid: Long = 0
+    var gid: Long = 0,
 
     @ColumnInfo(name = "DIRNAME")
     var dirname: String? = null
-}
\ No newline at end of file
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/hippo/ehviewer/dao/DownloadLabel.kt b/app/src/main/java/com/hippo/ehviewer/dao/DownloadLabel.kt
index 6c73152e0..e3e440c1c 100644
--- a/app/src/main/java/com/hippo/ehviewer/dao/DownloadLabel.kt
+++ b/app/src/main/java/com/hippo/ehviewer/dao/DownloadLabel.kt
@@ -5,14 +5,14 @@ import androidx.room.Entity
 import androidx.room.PrimaryKey
 
 @Entity(tableName = "DOWNLOAD_LABELS")
-class DownloadLabel {
+data class DownloadLabel(
     @PrimaryKey
     @ColumnInfo(name = "_id")
-    var id: Long? = null
+    var id: Long? = null,
 
     @ColumnInfo(name = "LABEL")
-    var label: String? = null
+    var label: String? = null,
 
     @ColumnInfo(name = "TIME")
     var time: Long = 0
-}
\ No newline at end of file
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/hippo/ehviewer/dao/EhDatabase.kt b/app/src/main/java/com/hippo/ehviewer/dao/EhDatabase.kt
index 3c4227c79..6e4744add 100644
--- a/app/src/main/java/com/hippo/ehviewer/dao/EhDatabase.kt
+++ b/app/src/main/java/com/hippo/ehviewer/dao/EhDatabase.kt
@@ -9,12 +9,12 @@ import androidx.room.RoomDatabase
     exportSchema = false
 )
 abstract class EhDatabase : RoomDatabase() {
-    abstract fun bookmarksBao(): BookmarksDao?
-    abstract fun downloadDirnameDao(): DownloadDirnameDao?
-    abstract fun downloadLabelDao(): DownloadLabelDao?
-    abstract fun downloadsDao(): DownloadsDao?
-    abstract fun filterDao(): FilterDao?
-    abstract fun historyDao(): HistoryDao?
-    abstract fun localFavoritesDao(): LocalFavoritesDao?
-    abstract fun quickSearchDao(): QuickSearchDao?
+    abstract fun bookmarksBao(): BookmarksDao
+    abstract fun downloadDirnameDao(): DownloadDirnameDao
+    abstract fun downloadLabelDao(): DownloadLabelDao
+    abstract fun downloadsDao(): DownloadsDao
+    abstract fun filterDao(): FilterDao
+    abstract fun historyDao(): HistoryDao
+    abstract fun localFavoritesDao(): LocalFavoritesDao
+    abstract fun quickSearchDao(): QuickSearchDao
 }
diff --git a/app/src/main/java/com/hippo/ehviewer/dao/Filter.kt b/app/src/main/java/com/hippo/ehviewer/dao/Filter.kt
index 40b60ac6a..252e4131e 100644
--- a/app/src/main/java/com/hippo/ehviewer/dao/Filter.kt
+++ b/app/src/main/java/com/hippo/ehviewer/dao/Filter.kt
@@ -3,33 +3,22 @@ package com.hippo.ehviewer.dao
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import com.hippo.util.HashCodeUtils
 
 @Entity(tableName = "FILTER")
-class Filter {
+data class Filter(
     @JvmField
     @ColumnInfo(name = "MODE")
-    var mode = 0
+    var mode: Int = 0,
 
     @JvmField
     @ColumnInfo(name = "TEXT")
-    var text: String? = null
+    var text: String? = null,
 
     @JvmField
     @ColumnInfo(name = "ENABLE")
-    var enable: Boolean? = null
+    var enable: Boolean? = null,
 
     @PrimaryKey
     @ColumnInfo(name = "_id")
     var id: Long? = null
-    override fun hashCode(): Int {
-        return HashCodeUtils.hashCode(mode, text)
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (other !is Filter) {
-            return false
-        }
-        return other.mode == mode && other.text == text
-    }
-}
\ No newline at end of file
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/hippo/ehviewer/dao/QuickSearch.kt b/app/src/main/java/com/hippo/ehviewer/dao/QuickSearch.kt
index 655dc011a..a5aab34d7 100644
--- a/app/src/main/java/com/hippo/ehviewer/dao/QuickSearch.kt
+++ b/app/src/main/java/com/hippo/ehviewer/dao/QuickSearch.kt
@@ -5,38 +5,35 @@ import androidx.room.Entity
 import androidx.room.PrimaryKey
 
 @Entity(tableName = "QUICK_SEARCH")
-class QuickSearch {
+data class QuickSearch(
     @PrimaryKey
     @ColumnInfo(name = "_id")
-    var id: Long? = null
+    var id: Long? = null,
 
     @ColumnInfo(name = "NAME")
-    var name: String? = null
+    var name: String? = null,
 
     @ColumnInfo(name = "MODE")
-    var mode = 0
+    var mode: Int = 0,
 
     @ColumnInfo(name = "CATEGORY")
-    var category = 0
+    var category: Int = 0,
 
     @ColumnInfo(name = "KEYWORD")
-    var keyword: String? = null
+    var keyword: String? = null,
 
     @ColumnInfo(name = "ADVANCE_SEARCH")
-    var advanceSearch = 0
+    var advanceSearch: Int = 0,
 
     @ColumnInfo(name = "MIN_RATING")
-    var minRating = 0
+    var minRating: Int = 0,
 
     @ColumnInfo(name = "PAGE_FROM")
-    var pageFrom = 0
+    var pageFrom: Int = 0,
 
     @ColumnInfo(name = "PAGE_TO")
-    var pageTo = 0
+    var pageTo: Int = 0,
 
     @ColumnInfo(name = "TIME")
     var time: Long = 0
-    override fun toString(): String {
-        return name!!
-    }
-}
\ No newline at end of file
+)
\ No newline at end of file