From 0a854947a90b54f853b22b9965d4d170809eab0b Mon Sep 17 00:00:00 2001
From: Kirill Kamakin <k.kamakin@protonmail.ch>
Date: Fri, 8 Apr 2022 20:10:13 +0500
Subject: [PATCH] Move base url implementation to impl package

---
 .../java/gq/kirmanak/mealient/data/baseurl/VersionInfo.kt   | 2 +-
 .../mealient/data/baseurl/{ => impl}/BaseURLStorageImpl.kt  | 3 ++-
 .../data/baseurl/{ => impl}/VersionDataSourceImpl.kt        | 4 +++-
 .../mealient/data/baseurl/{ => impl}/VersionResponse.kt     | 4 ++--
 .../mealient/data/baseurl/{ => impl}/VersionService.kt      | 2 +-
 app/src/main/java/gq/kirmanak/mealient/di/BaseURLModule.kt  | 6 +++++-
 .../kirmanak/mealient/extensions/RemoteToLocalMappings.kt   | 2 +-
 .../mealient/data/baseurl/BaseURLStorageImplTest.kt         | 1 +
 .../mealient/data/baseurl/VersionDataSourceImplTest.kt      | 3 +++
 .../mealient/data/network/RetrofitServiceFactoryTest.kt     | 2 +-
 10 files changed, 20 insertions(+), 9 deletions(-)
 rename app/src/main/java/gq/kirmanak/mealient/data/baseurl/{ => impl}/BaseURLStorageImpl.kt (88%)
 rename app/src/main/java/gq/kirmanak/mealient/data/baseurl/{ => impl}/VersionDataSourceImpl.kt (85%)
 rename app/src/main/java/gq/kirmanak/mealient/data/baseurl/{ => impl}/VersionResponse.kt (86%)
 rename app/src/main/java/gq/kirmanak/mealient/data/baseurl/{ => impl}/VersionService.kt (73%)

diff --git a/app/src/main/java/gq/kirmanak/mealient/data/baseurl/VersionInfo.kt b/app/src/main/java/gq/kirmanak/mealient/data/baseurl/VersionInfo.kt
index d706d60..0e24c3b 100644
--- a/app/src/main/java/gq/kirmanak/mealient/data/baseurl/VersionInfo.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/data/baseurl/VersionInfo.kt
@@ -4,4 +4,4 @@ data class VersionInfo(
     val production: Boolean,
     val version: String,
     val demoStatus: Boolean,
-)
+)
\ No newline at end of file
diff --git a/app/src/main/java/gq/kirmanak/mealient/data/baseurl/BaseURLStorageImpl.kt b/app/src/main/java/gq/kirmanak/mealient/data/baseurl/impl/BaseURLStorageImpl.kt
similarity index 88%
rename from app/src/main/java/gq/kirmanak/mealient/data/baseurl/BaseURLStorageImpl.kt
rename to app/src/main/java/gq/kirmanak/mealient/data/baseurl/impl/BaseURLStorageImpl.kt
index 2081bac..64280cf 100644
--- a/app/src/main/java/gq/kirmanak/mealient/data/baseurl/BaseURLStorageImpl.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/data/baseurl/impl/BaseURLStorageImpl.kt
@@ -1,6 +1,7 @@
-package gq.kirmanak.mealient.data.baseurl
+package gq.kirmanak.mealient.data.baseurl.impl
 
 import androidx.datastore.preferences.core.Preferences
+import gq.kirmanak.mealient.data.baseurl.BaseURLStorage
 import gq.kirmanak.mealient.data.storage.PreferencesStorage
 import javax.inject.Inject
 import javax.inject.Singleton
diff --git a/app/src/main/java/gq/kirmanak/mealient/data/baseurl/VersionDataSourceImpl.kt b/app/src/main/java/gq/kirmanak/mealient/data/baseurl/impl/VersionDataSourceImpl.kt
similarity index 85%
rename from app/src/main/java/gq/kirmanak/mealient/data/baseurl/VersionDataSourceImpl.kt
rename to app/src/main/java/gq/kirmanak/mealient/data/baseurl/impl/VersionDataSourceImpl.kt
index d779a03..4a472f9 100644
--- a/app/src/main/java/gq/kirmanak/mealient/data/baseurl/VersionDataSourceImpl.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/data/baseurl/impl/VersionDataSourceImpl.kt
@@ -1,5 +1,7 @@
-package gq.kirmanak.mealient.data.baseurl
+package gq.kirmanak.mealient.data.baseurl.impl
 
+import gq.kirmanak.mealient.data.baseurl.VersionDataSource
+import gq.kirmanak.mealient.data.baseurl.VersionInfo
 import gq.kirmanak.mealient.data.network.ServiceFactory
 import gq.kirmanak.mealient.extensions.mapToNetworkError
 import gq.kirmanak.mealient.extensions.runCatchingExceptCancel
diff --git a/app/src/main/java/gq/kirmanak/mealient/data/baseurl/VersionResponse.kt b/app/src/main/java/gq/kirmanak/mealient/data/baseurl/impl/VersionResponse.kt
similarity index 86%
rename from app/src/main/java/gq/kirmanak/mealient/data/baseurl/VersionResponse.kt
rename to app/src/main/java/gq/kirmanak/mealient/data/baseurl/impl/VersionResponse.kt
index 9529415..3c7efe7 100644
--- a/app/src/main/java/gq/kirmanak/mealient/data/baseurl/VersionResponse.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/data/baseurl/impl/VersionResponse.kt
@@ -1,4 +1,4 @@
-package gq.kirmanak.mealient.data.baseurl
+package gq.kirmanak.mealient.data.baseurl.impl
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -11,4 +11,4 @@ data class VersionResponse(
     val version: String,
     @SerialName("demoStatus")
     val demoStatus: Boolean,
-)
+)
\ No newline at end of file
diff --git a/app/src/main/java/gq/kirmanak/mealient/data/baseurl/VersionService.kt b/app/src/main/java/gq/kirmanak/mealient/data/baseurl/impl/VersionService.kt
similarity index 73%
rename from app/src/main/java/gq/kirmanak/mealient/data/baseurl/VersionService.kt
rename to app/src/main/java/gq/kirmanak/mealient/data/baseurl/impl/VersionService.kt
index 0271550..4f34f2f 100644
--- a/app/src/main/java/gq/kirmanak/mealient/data/baseurl/VersionService.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/data/baseurl/impl/VersionService.kt
@@ -1,4 +1,4 @@
-package gq.kirmanak.mealient.data.baseurl
+package gq.kirmanak.mealient.data.baseurl.impl
 
 import retrofit2.http.GET
 
diff --git a/app/src/main/java/gq/kirmanak/mealient/di/BaseURLModule.kt b/app/src/main/java/gq/kirmanak/mealient/di/BaseURLModule.kt
index 805535b..f205096 100644
--- a/app/src/main/java/gq/kirmanak/mealient/di/BaseURLModule.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/di/BaseURLModule.kt
@@ -5,7 +5,11 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import gq.kirmanak.mealient.data.baseurl.*
+import gq.kirmanak.mealient.data.baseurl.BaseURLStorage
+import gq.kirmanak.mealient.data.baseurl.VersionDataSource
+import gq.kirmanak.mealient.data.baseurl.impl.BaseURLStorageImpl
+import gq.kirmanak.mealient.data.baseurl.impl.VersionDataSourceImpl
+import gq.kirmanak.mealient.data.baseurl.impl.VersionService
 import gq.kirmanak.mealient.data.network.RetrofitBuilder
 import gq.kirmanak.mealient.data.network.ServiceFactory
 import gq.kirmanak.mealient.data.network.createServiceFactory
diff --git a/app/src/main/java/gq/kirmanak/mealient/extensions/RemoteToLocalMappings.kt b/app/src/main/java/gq/kirmanak/mealient/extensions/RemoteToLocalMappings.kt
index 394ff01..7686ddc 100644
--- a/app/src/main/java/gq/kirmanak/mealient/extensions/RemoteToLocalMappings.kt
+++ b/app/src/main/java/gq/kirmanak/mealient/extensions/RemoteToLocalMappings.kt
@@ -1,7 +1,7 @@
 package gq.kirmanak.mealient.extensions
 
 import gq.kirmanak.mealient.data.baseurl.VersionInfo
-import gq.kirmanak.mealient.data.baseurl.VersionResponse
+import gq.kirmanak.mealient.data.baseurl.impl.VersionResponse
 import gq.kirmanak.mealient.data.recipes.db.entity.RecipeEntity
 import gq.kirmanak.mealient.data.recipes.db.entity.RecipeIngredientEntity
 import gq.kirmanak.mealient.data.recipes.db.entity.RecipeInstructionEntity
diff --git a/app/src/test/java/gq/kirmanak/mealient/data/baseurl/BaseURLStorageImplTest.kt b/app/src/test/java/gq/kirmanak/mealient/data/baseurl/BaseURLStorageImplTest.kt
index 8d5aa5f..256139a 100644
--- a/app/src/test/java/gq/kirmanak/mealient/data/baseurl/BaseURLStorageImplTest.kt
+++ b/app/src/test/java/gq/kirmanak/mealient/data/baseurl/BaseURLStorageImplTest.kt
@@ -2,6 +2,7 @@ package gq.kirmanak.mealient.data.baseurl
 
 import androidx.datastore.preferences.core.stringPreferencesKey
 import com.google.common.truth.Truth.assertThat
+import gq.kirmanak.mealient.data.baseurl.impl.BaseURLStorageImpl
 import gq.kirmanak.mealient.data.storage.PreferencesStorage
 import io.mockk.MockKAnnotations
 import io.mockk.coEvery
diff --git a/app/src/test/java/gq/kirmanak/mealient/data/baseurl/VersionDataSourceImplTest.kt b/app/src/test/java/gq/kirmanak/mealient/data/baseurl/VersionDataSourceImplTest.kt
index eed1861..7320340 100644
--- a/app/src/test/java/gq/kirmanak/mealient/data/baseurl/VersionDataSourceImplTest.kt
+++ b/app/src/test/java/gq/kirmanak/mealient/data/baseurl/VersionDataSourceImplTest.kt
@@ -1,6 +1,9 @@
 package gq.kirmanak.mealient.data.baseurl
 
 import com.google.common.truth.Truth.assertThat
+import gq.kirmanak.mealient.data.baseurl.impl.VersionDataSourceImpl
+import gq.kirmanak.mealient.data.baseurl.impl.VersionResponse
+import gq.kirmanak.mealient.data.baseurl.impl.VersionService
 import gq.kirmanak.mealient.data.network.NetworkError
 import gq.kirmanak.mealient.data.network.ServiceFactory
 import gq.kirmanak.mealient.test.AuthImplTestData.TEST_BASE_URL
diff --git a/app/src/test/java/gq/kirmanak/mealient/data/network/RetrofitServiceFactoryTest.kt b/app/src/test/java/gq/kirmanak/mealient/data/network/RetrofitServiceFactoryTest.kt
index 2fc42c0..05a7c93 100644
--- a/app/src/test/java/gq/kirmanak/mealient/data/network/RetrofitServiceFactoryTest.kt
+++ b/app/src/test/java/gq/kirmanak/mealient/data/network/RetrofitServiceFactoryTest.kt
@@ -2,7 +2,7 @@ package gq.kirmanak.mealient.data.network
 
 import com.google.common.truth.Truth.assertThat
 import gq.kirmanak.mealient.data.baseurl.BaseURLStorage
-import gq.kirmanak.mealient.data.baseurl.VersionService
+import gq.kirmanak.mealient.data.baseurl.impl.VersionService
 import gq.kirmanak.mealient.test.AuthImplTestData.TEST_BASE_URL
 import io.mockk.*
 import io.mockk.impl.annotations.MockK