From 5e792f08d9184a08c71d32dd08aa6bb034fd5dbe Mon Sep 17 00:00:00 2001 From: lihenggui Date: Thu, 15 Feb 2024 11:02:16 -0800 Subject: [PATCH] Remove Android room annotations --- .../core/database/dao/RecentSearchQueryDao.kt | 2 +- .../database/model/NewsResourceFtsEntity.kt | 12 -------- .../model/NewsResourceTopicCrossRef.kt | 29 ------------------- .../database/model/PopulatedNewsResource.kt | 13 --------- .../database/model/RecentSearchQueryEntity.kt | 8 ----- .../core/database/model/TopicFtsEntity.kt | 14 --------- .../core/database/util/InstantConverter.kt | 4 +-- 7 files changed, 2 insertions(+), 80 deletions(-) diff --git a/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/RecentSearchQueryDao.kt b/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/RecentSearchQueryDao.kt index 6fa361e09..551455f23 100644 --- a/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/RecentSearchQueryDao.kt +++ b/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/dao/RecentSearchQueryDao.kt @@ -48,7 +48,7 @@ class RecentSearchQueryDao(db: NiaDatabase, private val dispatcher: CoroutineDis recent_search_query = Recent_search_query( query = recentSearchQuery.query, queried_date = recentSearchQuery.queriedDate.toEpochMilliseconds(), - ) + ), ) } diff --git a/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/model/NewsResourceFtsEntity.kt b/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/model/NewsResourceFtsEntity.kt index 0ba625024..38992684f 100644 --- a/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/model/NewsResourceFtsEntity.kt +++ b/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/model/NewsResourceFtsEntity.kt @@ -16,23 +16,11 @@ package com.google.samples.apps.nowinandroid.core.database.model -import androidx.room.ColumnInfo -import androidx.room.Entity -import androidx.room.Fts4 - /** * Fts entity for the news resources. See https://developer.android.com/reference/androidx/room/Fts4. */ -@Entity(tableName = "newsResourcesFts") -@Fts4 data class NewsResourceFtsEntity( - - @ColumnInfo(name = "newsResourceId") val newsResourceId: String, - - @ColumnInfo(name = "title") val title: String, - - @ColumnInfo(name = "content") val content: String, ) diff --git a/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/model/NewsResourceTopicCrossRef.kt b/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/model/NewsResourceTopicCrossRef.kt index 59bf1458f..cfd596b6c 100644 --- a/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/model/NewsResourceTopicCrossRef.kt +++ b/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/model/NewsResourceTopicCrossRef.kt @@ -16,39 +16,10 @@ package com.google.samples.apps.nowinandroid.core.database.model -import androidx.room.ColumnInfo -import androidx.room.Entity -import androidx.room.ForeignKey -import androidx.room.Index - /** * Cross reference for many to many relationship between [NewsResourceEntity] and [TopicEntity] */ -@Entity( - tableName = "news_resources_topics", - primaryKeys = ["news_resource_id", "topic_id"], - foreignKeys = [ - ForeignKey( - entity = NewsResourceEntity::class, - parentColumns = ["id"], - childColumns = ["news_resource_id"], - onDelete = ForeignKey.CASCADE, - ), - ForeignKey( - entity = TopicEntity::class, - parentColumns = ["id"], - childColumns = ["topic_id"], - onDelete = ForeignKey.CASCADE, - ), - ], - indices = [ - Index(value = ["news_resource_id"]), - Index(value = ["topic_id"]), - ], -) data class NewsResourceTopicCrossRef( - @ColumnInfo(name = "news_resource_id") val newsResourceId: String, - @ColumnInfo(name = "topic_id") val topicId: String, ) diff --git a/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/model/PopulatedNewsResource.kt b/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/model/PopulatedNewsResource.kt index a70342401..e0a3708f1 100644 --- a/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/model/PopulatedNewsResource.kt +++ b/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/model/PopulatedNewsResource.kt @@ -16,26 +16,13 @@ package com.google.samples.apps.nowinandroid.core.database.model -import androidx.room.Embedded -import androidx.room.Junction -import androidx.room.Relation import com.google.samples.apps.nowinandroid.core.model.data.NewsResource /** * External data layer representation of a fully populated NiA news resource */ data class PopulatedNewsResource( - @Embedded val entity: NewsResourceEntity, - @Relation( - parentColumn = "id", - entityColumn = "id", - associateBy = Junction( - value = NewsResourceTopicCrossRef::class, - parentColumn = "news_resource_id", - entityColumn = "topic_id", - ), - ) val topics: List, ) diff --git a/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/model/RecentSearchQueryEntity.kt b/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/model/RecentSearchQueryEntity.kt index 9c7439233..24318d3de 100644 --- a/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/model/RecentSearchQueryEntity.kt +++ b/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/model/RecentSearchQueryEntity.kt @@ -16,20 +16,12 @@ package com.google.samples.apps.nowinandroid.core.database.model -import androidx.room.ColumnInfo -import androidx.room.Entity -import androidx.room.PrimaryKey import kotlinx.datetime.Instant /** * Defines an database entity that stored recent search queries. */ -@Entity( - tableName = "recentSearchQueries", -) data class RecentSearchQueryEntity( - @PrimaryKey val query: String, - @ColumnInfo val queriedDate: Instant, ) diff --git a/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/model/TopicFtsEntity.kt b/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/model/TopicFtsEntity.kt index 23d56f2df..7c9c39183 100644 --- a/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/model/TopicFtsEntity.kt +++ b/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/model/TopicFtsEntity.kt @@ -16,27 +16,13 @@ package com.google.samples.apps.nowinandroid.core.database.model -import androidx.room.ColumnInfo -import androidx.room.Entity -import androidx.room.Fts4 - /** * Fts entity for the topic. See https://developer.android.com/reference/androidx/room/Fts4. */ -@Entity(tableName = "topicsFts") -@Fts4 data class TopicFtsEntity( - - @ColumnInfo(name = "topicId") val topicId: String, - - @ColumnInfo(name = "name") val name: String, - - @ColumnInfo(name = "shortDescription") val shortDescription: String, - - @ColumnInfo(name = "longDescription") val longDescription: String, ) diff --git a/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/util/InstantConverter.kt b/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/util/InstantConverter.kt index 0b79c2099..e2082f4c3 100644 --- a/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/util/InstantConverter.kt +++ b/core/database/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/database/util/InstantConverter.kt @@ -16,15 +16,13 @@ package com.google.samples.apps.nowinandroid.core.database.util -import androidx.room.TypeConverter import kotlinx.datetime.Instant internal class InstantConverter { - @TypeConverter + fun longToInstant(value: Long?): Instant? = value?.let(Instant::fromEpochMilliseconds) - @TypeConverter fun instantToLong(instant: Instant?): Long? = instant?.toEpochMilliseconds() }