Remove Android room annotations

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(),
-            )
+            ),
         )
     }
 

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,
 )

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,
 )

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<TopicEntity>,
 )
 

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,
 )

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,
 )
 

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()
 }