Rename modules.

ReactiveCircus · Nov 12, 2023 · f468142 · f468142
1 parent 6154314
commit f468142
Show file tree

Hide file tree

Showing 37 changed files with 112 additions and 114 deletions.
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
@@ -225,12 +225,12 @@ androidComponents {
 }
 
 dependencies {
-    mockImplementation(project(":kmp:data-testing"))
-    devImplementation(project(":kmp:data-runtime-cloud"))
-    demoImplementation(project(":kmp:data-runtime-edge"))
-    prodImplementation(project(":kmp:data-runtime-cloud"))
+    mockImplementation(project(":kmp:datasource:testing"))
+    devImplementation(project(":kmp:datasource:runtime-cloud"))
+    demoImplementation(project(":kmp:datasource:runtime-edge"))
+    prodImplementation(project(":kmp:datasource:runtime-cloud"))
 
-    implementation(project(":ui-common"))
+    implementation(project(":feature:common"))
 
     // Firebase
     releaseImplementation(libs.firebase.perf)

diff --git a/android/app/src/demo/java/io/github/reactivecircus/kstreamlined/android/di/EdgeDataModule.kt b/android/app/src/demo/java/io/github/reactivecircus/kstreamlined/android/di/EdgeDataModule.kt
@@ -4,10 +4,10 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import io.github.reactivecircus.kstreamlined.kmp.data.feed.EdgeFeedRepo
-import io.github.reactivecircus.kstreamlined.kmp.data.feed.FeedRepo
-import io.github.reactivecircus.kstreamlined.kmp.data.util.ApiErrorChecker
-import io.github.reactivecircus.kstreamlined.kmp.data.util.KtorApiErrorChecker
+import io.github.reactivecircus.kstreamlined.kmp.datasource.EdgeFeedDataSource
+import io.github.reactivecircus.kstreamlined.kmp.datasource.FeedDataSource
+import io.github.reactivecircus.kstreamlined.kmp.datasource.util.ApiErrorChecker
+import io.github.reactivecircus.kstreamlined.kmp.datasource.util.KtorApiErrorChecker
 import javax.inject.Singleton
 
 @Module
@@ -16,8 +16,8 @@ object EdgeDataModule {
 
     @Provides
     @Singleton
-    fun feedRepo(): FeedRepo {
-        return EdgeFeedRepo()
+    fun feedDataSource(): FeedDataSource {
+        return EdgeFeedDataSource()
     }
 
     @Provides

diff --git a/...p/src/devAndProd/java/io/github/reactivecircus/kstreamlined/android/di/CloudDataModule.kt b/...p/src/devAndProd/java/io/github/reactivecircus/kstreamlined/android/di/CloudDataModule.kt
@@ -5,10 +5,10 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import io.github.reactivecircus.kstreamlined.kmp.data.feed.CloudFeedRepo
-import io.github.reactivecircus.kstreamlined.kmp.data.feed.FeedRepo
-import io.github.reactivecircus.kstreamlined.kmp.data.util.ApiErrorChecker
-import io.github.reactivecircus.kstreamlined.kmp.data.util.ApolloApiErrorChecker
+import io.github.reactivecircus.kstreamlined.kmp.datasource.CloudFeedDataSource
+import io.github.reactivecircus.kstreamlined.kmp.datasource.FeedDataSource
+import io.github.reactivecircus.kstreamlined.kmp.datasource.util.ApiErrorChecker
+import io.github.reactivecircus.kstreamlined.kmp.datasource.util.ApolloApiErrorChecker
 import javax.inject.Singleton
 
 @Module
@@ -17,8 +17,8 @@ object CloudDataModule {
 
     @Provides
     @Singleton
-    fun feedRepo(apolloClient: ApolloClient): FeedRepo {
-        return CloudFeedRepo(apolloClient)
+    fun feedDataSource(apolloClient: ApolloClient): FeedDataSource {
+        return CloudFeedDataSource(apolloClient)
     }
 
     @Provides

diff --git a/.../src/devAndProd/java/io/github/reactivecircus/kstreamlined/android/di/NetworkingModule.kt b/.../src/devAndProd/java/io/github/reactivecircus/kstreamlined/android/di/NetworkingModule.kt
@@ -9,7 +9,7 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import io.github.reactivecircus.kstreamlined.android.BuildConfig
-import io.github.reactivecircus.kstreamlined.kmp.data.networking.ApolloClientConfigs
+import io.github.reactivecircus.kstreamlined.kmp.datasource.networking.ApolloClientConfigs
 import javax.inject.Singleton
 import kotlin.time.DurationUnit
 import kotlin.time.toDuration

diff --git a/android/app/src/mock/java/io/github/reactivecircus/kstreamlined/android/di/MockDataModule.kt b/android/app/src/mock/java/io/github/reactivecircus/kstreamlined/android/di/MockDataModule.kt
@@ -4,10 +4,10 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import io.github.reactivecircus.kstreamlined.kmp.data.feed.FakeFeedRepo
-import io.github.reactivecircus.kstreamlined.kmp.data.feed.FeedRepo
-import io.github.reactivecircus.kstreamlined.kmp.data.util.ApiErrorChecker
-import io.github.reactivecircus.kstreamlined.kmp.data.util.NoOpApiErrorChecker
+import io.github.reactivecircus.kstreamlined.kmp.datasource.FakeFeedDataSource
+import io.github.reactivecircus.kstreamlined.kmp.datasource.FeedDataSource
+import io.github.reactivecircus.kstreamlined.kmp.datasource.util.ApiErrorChecker
+import io.github.reactivecircus.kstreamlined.kmp.datasource.util.NoOpApiErrorChecker
 import javax.inject.Singleton
 
 @Module
@@ -16,8 +16,8 @@ object MockDataModule {
 
     @Provides
     @Singleton
-    fun feedRepo(): FeedRepo {
-        return FakeFeedRepo()
+    fun feedDataSource(): FeedDataSource {
+        return FakeFeedDataSource()
     }
 
     @Provides

diff --git a/android/ui/ui-common/build.gradle.kts → android/feature/common/build.gradle.kts b/android/ui/ui-common/build.gradle.kts → android/feature/common/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 android {
-    namespace = "io.github.reactivecircus.kstreamlined.android.ui.common"
+    namespace = "io.github.reactivecircus.kstreamlined.android.feature.common"
     buildFeatures {
         androidResources = true
     }
@@ -20,8 +20,6 @@ androidComponents {
 }
 
 dependencies {
-    api(project(":kmp:data-common"))
-
     // AndroidX
     api(libs.androidx.core)
 

diff --git a/...ui/ui-common/src/main/AndroidManifest.xml → ...ature/common/src/main/AndroidManifest.xml b/...ui/ui-common/src/main/AndroidManifest.xml → ...ature/common/src/main/AndroidManifest.xml
diff --git a/...ui-common/src/main/res/values/strings.xml → ...re/common/src/main/res/values/strings.xml b/...ui-common/src/main/res/values/strings.xml → ...re/common/src/main/res/values/strings.xml
diff --git a/...mon/src/commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/data/feed/FeedRepo.kt b/...mon/src/commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/data/feed/FeedRepo.kt
diff --git a/kmp/data-common/build.gradle.kts → kmp/datasource/common/build.gradle.kts b/kmp/data-common/build.gradle.kts → kmp/datasource/common/build.gradle.kts
diff --git a/.../commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/datasource/FeedDataSource.kt b/.../commonMain/kotlin/io/github/reactivecircus/kstreamlined/kmp/datasource/FeedDataSource.kt
@@ -0,0 +1,16 @@
+package io.github.reactivecircus.kstreamlined.kmp.datasource
+
+import io.github.reactivecircus.kstreamlined.kmp.datasource.model.FeedEntry
+import io.github.reactivecircus.kstreamlined.kmp.datasource.model.FeedSource
+
+interface FeedDataSource {
+
+    suspend fun loadFeedSources(
+        refresh: Boolean = false
+    ): List<FeedSource>
+
+    suspend fun loadFeedEntries(
+        filters: List<FeedSource.Key>? = null,
+        refresh: Boolean = false,
+    ): List<FeedEntry>
+}
diff --git a/...eamlined/kmp/data/feed/model/FeedEntry.kt → ...amlined/kmp/datasource/model/FeedEntry.kt b/...eamlined/kmp/data/feed/model/FeedEntry.kt → ...amlined/kmp/datasource/model/FeedEntry.kt
@@ -1,4 +1,4 @@
-package io.github.reactivecircus.kstreamlined.kmp.data.feed.model
+package io.github.reactivecircus.kstreamlined.kmp.datasource.model
 
 sealed interface FeedEntry {
     val id: String

diff --git a/...amlined/kmp/data/feed/model/FeedSource.kt → ...mlined/kmp/datasource/model/FeedSource.kt b/...amlined/kmp/data/feed/model/FeedSource.kt → ...mlined/kmp/datasource/model/FeedSource.kt
@@ -1,4 +1,4 @@
-package io.github.reactivecircus.kstreamlined.kmp.data.feed.model
+package io.github.reactivecircus.kstreamlined.kmp.datasource.model
 
 data class FeedSource(
     val key: Key,

diff --git a/...eamlined/kmp/data/util/ApiErrorChecker.kt → ...ed/kmp/datasource/util/ApiErrorChecker.kt b/...eamlined/kmp/data/util/ApiErrorChecker.kt → ...ed/kmp/datasource/util/ApiErrorChecker.kt
@@ -1,4 +1,4 @@
-package io.github.reactivecircus.kstreamlined.kmp.data.util
+package io.github.reactivecircus.kstreamlined.kmp.datasource.util
 
 interface ApiErrorChecker {
 

diff --git a/kmp/data-runtime-cloud/build.gradle.kts → ...datasource/runtime-cloud/build.gradle.kts b/kmp/data-runtime-cloud/build.gradle.kts → ...datasource/runtime-cloud/build.gradle.kts
@@ -23,7 +23,7 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                api(project(":kmp:data-common"))
+                api(project(":kmp:datasource:common"))
                 api(libs.apollo.runtime)
                 api(libs.apollo.normalizedCache)
                 implementation(libs.kotlinx.coroutines.core)

diff --git a/.../kstreamlined/graphql/FeedEntries.graphql → .../kstreamlined/graphql/FeedEntries.graphql b/.../kstreamlined/graphql/FeedEntries.graphql → .../kstreamlined/graphql/FeedEntries.graphql
diff --git a/.../kstreamlined/graphql/FeedSources.graphql → .../kstreamlined/graphql/FeedSources.graphql b/.../kstreamlined/graphql/FeedSources.graphql → .../kstreamlined/graphql/FeedSources.graphql
diff --git a/...rcus/kstreamlined/graphql/schema.graphqls → ...rcus/kstreamlined/graphql/schema.graphqls b/...rcus/kstreamlined/graphql/schema.graphqls → ...rcus/kstreamlined/graphql/schema.graphqls
diff --git a/...treamlined/kmp/data/feed/CloudFeedRepo.kt → ...ned/kmp/datasource/CloudFeedDataSource.kt b/...treamlined/kmp/data/feed/CloudFeedRepo.kt → ...ned/kmp/datasource/CloudFeedDataSource.kt
@@ -1,17 +1,17 @@
-package io.github.reactivecircus.kstreamlined.kmp.data.feed
+package io.github.reactivecircus.kstreamlined.kmp.datasource
 
 import co.touchlab.kermit.Logger
 import com.apollographql.apollo3.ApolloClient
 import com.apollographql.apollo3.api.Optional
 import io.github.reactivecircus.kstreamlined.graphql.FeedEntriesQuery
 import io.github.reactivecircus.kstreamlined.graphql.FeedSourcesQuery
-import io.github.reactivecircus.kstreamlined.kmp.data.feed.mapper.toApollo
-import io.github.reactivecircus.kstreamlined.kmp.data.feed.mapper.toModel
-import io.github.reactivecircus.kstreamlined.kmp.data.feed.model.FeedEntry
-import io.github.reactivecircus.kstreamlined.kmp.data.feed.model.FeedSource
-import io.github.reactivecircus.kstreamlined.kmp.data.networking.defaultFetchPolicy
+import io.github.reactivecircus.kstreamlined.kmp.datasource.mapper.toApollo
+import io.github.reactivecircus.kstreamlined.kmp.datasource.mapper.toModel
+import io.github.reactivecircus.kstreamlined.kmp.datasource.model.FeedEntry
+import io.github.reactivecircus.kstreamlined.kmp.datasource.model.FeedSource
+import io.github.reactivecircus.kstreamlined.kmp.datasource.networking.defaultFetchPolicy
 
-class CloudFeedRepo(private val apolloClient: ApolloClient) : FeedRepo {
+class CloudFeedDataSource(private val apolloClient: ApolloClient) : FeedDataSource {
 
     override suspend fun loadFeedSources(refresh: Boolean): List<FeedSource> {
         return runCatching {

diff --git a/.../kmp/data/feed/mapper/FeedEntryMappers.kt → ...kmp/datasource/mapper/FeedEntryMappers.kt b/.../kmp/data/feed/mapper/FeedEntryMappers.kt → ...kmp/datasource/mapper/FeedEntryMappers.kt
@@ -1,7 +1,7 @@
-package io.github.reactivecircus.kstreamlined.kmp.data.feed.mapper
+package io.github.reactivecircus.kstreamlined.kmp.datasource.mapper
 
 import io.github.reactivecircus.kstreamlined.graphql.FeedEntriesQuery
-import io.github.reactivecircus.kstreamlined.kmp.data.feed.model.FeedEntry
+import io.github.reactivecircus.kstreamlined.kmp.datasource.model.FeedEntry
 
 internal fun FeedEntriesQuery.FeedEntry.toModel(): FeedEntry {
     return when (this) {

diff --git a/...kmp/data/feed/mapper/FeedSourceMappers.kt → ...mp/datasource/mapper/FeedSourceMappers.kt b/...kmp/data/feed/mapper/FeedSourceMappers.kt → ...mp/datasource/mapper/FeedSourceMappers.kt
@@ -1,8 +1,8 @@
-package io.github.reactivecircus.kstreamlined.kmp.data.feed.mapper
+package io.github.reactivecircus.kstreamlined.kmp.datasource.mapper
 
 import io.github.reactivecircus.kstreamlined.graphql.FeedSourcesQuery
 import io.github.reactivecircus.kstreamlined.graphql.type.FeedSourceKey
-import io.github.reactivecircus.kstreamlined.kmp.data.feed.model.FeedSource
+import io.github.reactivecircus.kstreamlined.kmp.datasource.model.FeedSource
 
 internal fun FeedSource.Key.toApollo(): FeedSourceKey {
     return when (this) {

diff --git a/...mp/data/networking/ApolloClientConfigs.kt → ...asource/networking/ApolloClientConfigs.kt b/...mp/data/networking/ApolloClientConfigs.kt → ...asource/networking/ApolloClientConfigs.kt
@@ -1,4 +1,4 @@
-package io.github.reactivecircus.kstreamlined.kmp.data.networking
+package io.github.reactivecircus.kstreamlined.kmp.datasource.networking
 
 import com.apollographql.apollo3.cache.normalized.ApolloStore
 import com.apollographql.apollo3.cache.normalized.api.MemoryCacheFactory

diff --git a/...kmp/data/networking/DefaultFetchPolicy.kt → ...tasource/networking/DefaultFetchPolicy.kt b/...kmp/data/networking/DefaultFetchPolicy.kt → ...tasource/networking/DefaultFetchPolicy.kt
@@ -1,4 +1,4 @@
-package io.github.reactivecircus.kstreamlined.kmp.data.networking
+package io.github.reactivecircus.kstreamlined.kmp.datasource.networking
 
 import com.apollographql.apollo3.ApolloCall
 import com.apollographql.apollo3.api.Operation

diff --git a/...ed/kmp/data/util/ApolloApiErrorChecker.kt → .../datasource/util/ApolloApiErrorChecker.kt b/...ed/kmp/data/util/ApolloApiErrorChecker.kt → .../datasource/util/ApolloApiErrorChecker.kt
@@ -1,4 +1,4 @@
-package io.github.reactivecircus.kstreamlined.kmp.data.util
+package io.github.reactivecircus.kstreamlined.kmp.datasource.util
 
 import com.apollographql.apollo3.exception.ApolloNetworkException
 import com.apollographql.apollo3.exception.NoDataException

diff --git a/...mlined/kmp/data/feed/CloudFeedRepoTest.kt → ...kmp/datasource/CloudFeedDataSourceTest.kt b/...mlined/kmp/data/feed/CloudFeedRepoTest.kt → ...kmp/datasource/CloudFeedDataSourceTest.kt
@@ -1,4 +1,4 @@
-package io.github.reactivecircus.kstreamlined.kmp.data.feed
+package io.github.reactivecircus.kstreamlined.kmp.datasource
 
 import com.apollographql.apollo3.ApolloClient
 import com.apollographql.apollo3.annotations.ApolloExperimental
@@ -15,19 +15,19 @@ import io.github.reactivecircus.kstreamlined.graphql.FeedSourcesQuery
 import io.github.reactivecircus.kstreamlined.graphql.type.buildFeedSource
 import io.github.reactivecircus.kstreamlined.graphql.type.buildKotlinBlog
 import io.github.reactivecircus.kstreamlined.graphql.type.buildKotlinYouTube
-import io.github.reactivecircus.kstreamlined.kmp.data.feed.mapper.toModel
+import io.github.reactivecircus.kstreamlined.kmp.datasource.mapper.toModel
 import io.github.reactivecircus.kstreamlined.kmp.test.utils.runTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 import kotlin.test.assertTrue
 
 @ApolloExperimental
-class CloudFeedRepoTest {
+class CloudFeedDataSourceTest {
 
     private lateinit var mockServer: MockServer
 
-    private lateinit var cloudFeedRepo: CloudFeedRepo
+    private lateinit var cloudFeedDataSource: CloudFeedDataSource
 
     private val dummyFeedSources = FeedSourcesQuery.Data {
         feedSources = listOf(
@@ -53,7 +53,7 @@ class CloudFeedRepoTest {
 
     private suspend fun setUp() {
         mockServer = MockServer()
-        cloudFeedRepo = CloudFeedRepo(
+        cloudFeedDataSource = CloudFeedDataSource(
             apolloClient = ApolloClient.Builder()
                 .serverUrl(mockServer.url())
                 .normalizedCache(MemoryCacheFactory())
@@ -71,7 +71,7 @@ class CloudFeedRepoTest {
             mockServer.enqueueData(
                 FeedSourcesQuery.Data(feedSources = dummyFeedSources)
             )
-            val actual = cloudFeedRepo.loadFeedSources(refresh = true)
+            val actual = cloudFeedDataSource.loadFeedSources(refresh = true)
             assertEquals(dummyFeedSources.map { it.toModel() }, actual)
         }
 
@@ -80,7 +80,7 @@ class CloudFeedRepoTest {
         runTest(before = { setUp() }, after = { tearDown() }) {
             mockServer.enqueueString(statusCode = 404)
             val exception = assertFailsWith<NoDataException> {
-                cloudFeedRepo.loadFeedSources(refresh = true)
+                cloudFeedDataSource.loadFeedSources(refresh = true)
             }
             assertEquals(404, (exception.cause as ApolloHttpException).statusCode)
         }
@@ -91,7 +91,7 @@ class CloudFeedRepoTest {
             mockServer.enqueueData(
                 FeedSourcesQuery.Data(feedSources = dummyFeedSources)
             )
-            val actual = cloudFeedRepo.loadFeedSources(refresh = false)
+            val actual = cloudFeedDataSource.loadFeedSources(refresh = false)
             assertEquals(dummyFeedSources.map { it.toModel() }, actual)
         }
 
@@ -102,11 +102,11 @@ class CloudFeedRepoTest {
             mockServer.enqueueData(
                 FeedSourcesQuery.Data(feedSources = dummyFeedSources)
             )
-            cloudFeedRepo.loadFeedSources(refresh = false)
+            cloudFeedDataSource.loadFeedSources(refresh = false)
 
             // 2nd request to consume cache
             mockServer.enqueueString(statusCode = 404)
-            val actual = cloudFeedRepo.loadFeedSources(refresh = false)
+            val actual = cloudFeedDataSource.loadFeedSources(refresh = false)
             assertEquals(dummyFeedSources.map { it.toModel() }, actual)
         }
 
@@ -115,7 +115,7 @@ class CloudFeedRepoTest {
         runTest(before = { setUp() }, after = { tearDown() }) {
             mockServer.enqueueString(statusCode = 404)
             val exception = assertFailsWith<NoDataException> {
-                cloudFeedRepo.loadFeedSources(refresh = false)
+                cloudFeedDataSource.loadFeedSources(refresh = false)
             }
             assertTrue(exception.cause is CacheMissException)
         }
@@ -126,7 +126,7 @@ class CloudFeedRepoTest {
             mockServer.enqueueData(
                 FeedEntriesQuery.Data(feedEntries = dummyFeedEntries)
             )
-            val actual = cloudFeedRepo.loadFeedEntries(
+            val actual = cloudFeedDataSource.loadFeedEntries(
                 filters = null,
                 refresh = true,
             )
@@ -138,7 +138,7 @@ class CloudFeedRepoTest {
         runTest(before = { setUp() }, after = { tearDown() }) {
             mockServer.enqueueString(statusCode = 404)
             val exception = assertFailsWith<NoDataException> {
-                cloudFeedRepo.loadFeedEntries(
+                cloudFeedDataSource.loadFeedEntries(
                     filters = null,
                     refresh = true,
                 )
@@ -152,7 +152,7 @@ class CloudFeedRepoTest {
             mockServer.enqueueData(
                 FeedEntriesQuery.Data(feedEntries = dummyFeedEntries)
             )
-            val actual = cloudFeedRepo.loadFeedEntries(
+            val actual = cloudFeedDataSource.loadFeedEntries(
                 filters = null,
                 refresh = false,
             )
@@ -166,14 +166,14 @@ class CloudFeedRepoTest {
             mockServer.enqueueData(
                 FeedEntriesQuery.Data(feedEntries = dummyFeedEntries)
             )
-            cloudFeedRepo.loadFeedEntries(
+            cloudFeedDataSource.loadFeedEntries(
                 filters = null,
                 refresh = false,
             )
 
             // 2nd request to consume cache
             mockServer.enqueueString(statusCode = 404)
-            val actual = cloudFeedRepo.loadFeedEntries(
+            val actual = cloudFeedDataSource.loadFeedEntries(
                 filters = null,
                 refresh = false,
             )
@@ -185,7 +185,7 @@ class CloudFeedRepoTest {
         runTest(before = { setUp() }, after = { tearDown() }) {
             mockServer.enqueueString(statusCode = 404)
             val exception = assertFailsWith<NoDataException> {
-                cloudFeedRepo.loadFeedEntries(
+                cloudFeedDataSource.loadFeedEntries(
                     filters = null,
                     refresh = false,
                 )