From 915fd77daacdaf5c9c119f16811ff86508800619 Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Sat, 10 Dec 2022 07:40:53 +0100 Subject: [PATCH] Create impl package in datasource --- .../gq/kirmanak/mealient/datasource/DataSourceModule.kt | 4 ++++ .../mealient/datasource/{ => impl}/CacheBuilderImpl.kt | 3 ++- .../datasource/{ => impl}/NetworkRequestWrapperImpl.kt | 5 ++++- .../mealient/datasource/{ => impl}/OkHttpBuilderImpl.kt | 4 +++- .../mealient/datasource/{ => impl}/RetrofitBuilder.kt | 2 +- .../mealient/datasource/MealieDataSourceV0ImplTest.kt | 1 + 6 files changed, 15 insertions(+), 4 deletions(-) rename datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/{ => impl}/CacheBuilderImpl.kt (92%) rename datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/{ => impl}/NetworkRequestWrapperImpl.kt (83%) rename datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/{ => impl}/OkHttpBuilderImpl.kt (80%) rename datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/{ => impl}/RetrofitBuilder.kt (93%) diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/DataSourceModule.kt b/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/DataSourceModule.kt index afaf344..1582f0c 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/DataSourceModule.kt +++ b/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/DataSourceModule.kt @@ -6,6 +6,10 @@ import dagger.Module import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent +import gq.kirmanak.mealient.datasource.impl.CacheBuilderImpl +import gq.kirmanak.mealient.datasource.impl.NetworkRequestWrapperImpl +import gq.kirmanak.mealient.datasource.impl.OkHttpBuilderImpl +import gq.kirmanak.mealient.datasource.impl.RetrofitBuilder import gq.kirmanak.mealient.datasource.v0.MealieDataSourceV0 import gq.kirmanak.mealient.datasource.v0.MealieDataSourceV0Impl import gq.kirmanak.mealient.datasource.v0.MealieServiceV0 diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/CacheBuilderImpl.kt b/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/CacheBuilderImpl.kt similarity index 92% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/CacheBuilderImpl.kt rename to datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/CacheBuilderImpl.kt index c2403ed..856723e 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/CacheBuilderImpl.kt +++ b/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/CacheBuilderImpl.kt @@ -1,8 +1,9 @@ -package gq.kirmanak.mealient.datasource +package gq.kirmanak.mealient.datasource.impl import android.content.Context import android.os.StatFs import dagger.hilt.android.qualifiers.ApplicationContext +import gq.kirmanak.mealient.datasource.CacheBuilder import gq.kirmanak.mealient.logging.Logger import okhttp3.Cache import java.io.File diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/NetworkRequestWrapperImpl.kt b/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/NetworkRequestWrapperImpl.kt similarity index 83% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/NetworkRequestWrapperImpl.kt rename to datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/NetworkRequestWrapperImpl.kt index 5bf01dc..6c2b5b2 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/NetworkRequestWrapperImpl.kt +++ b/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/NetworkRequestWrapperImpl.kt @@ -1,5 +1,8 @@ -package gq.kirmanak.mealient.datasource +package gq.kirmanak.mealient.datasource.impl +import gq.kirmanak.mealient.datasource.NetworkError +import gq.kirmanak.mealient.datasource.NetworkRequestWrapper +import gq.kirmanak.mealient.datasource.runCatchingExceptCancel import gq.kirmanak.mealient.logging.Logger import retrofit2.HttpException import javax.inject.Inject diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/OkHttpBuilderImpl.kt b/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/OkHttpBuilderImpl.kt similarity index 80% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/OkHttpBuilderImpl.kt rename to datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/OkHttpBuilderImpl.kt index f3f5cfd..21ca1d1 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/OkHttpBuilderImpl.kt +++ b/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/OkHttpBuilderImpl.kt @@ -1,5 +1,7 @@ -package gq.kirmanak.mealient.datasource +package gq.kirmanak.mealient.datasource.impl +import gq.kirmanak.mealient.datasource.CacheBuilder +import gq.kirmanak.mealient.datasource.OkHttpBuilder import okhttp3.Interceptor import okhttp3.OkHttpClient import javax.inject.Inject diff --git a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/RetrofitBuilder.kt b/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/RetrofitBuilder.kt similarity index 93% rename from datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/RetrofitBuilder.kt rename to datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/RetrofitBuilder.kt index fe6b26e..8a5713f 100644 --- a/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/RetrofitBuilder.kt +++ b/datasource/src/main/kotlin/gq/kirmanak/mealient/datasource/impl/RetrofitBuilder.kt @@ -1,4 +1,4 @@ -package gq.kirmanak.mealient.datasource +package gq.kirmanak.mealient.datasource.impl import gq.kirmanak.mealient.logging.Logger import okhttp3.OkHttpClient diff --git a/datasource/src/test/kotlin/gq/kirmanak/mealient/datasource/MealieDataSourceV0ImplTest.kt b/datasource/src/test/kotlin/gq/kirmanak/mealient/datasource/MealieDataSourceV0ImplTest.kt index 29762ec..43a3527 100644 --- a/datasource/src/test/kotlin/gq/kirmanak/mealient/datasource/MealieDataSourceV0ImplTest.kt +++ b/datasource/src/test/kotlin/gq/kirmanak/mealient/datasource/MealieDataSourceV0ImplTest.kt @@ -1,6 +1,7 @@ package gq.kirmanak.mealient.datasource import com.google.common.truth.Truth.assertThat +import gq.kirmanak.mealient.datasource.impl.NetworkRequestWrapperImpl import gq.kirmanak.mealient.datasource.v0.MealieDataSourceV0Impl import gq.kirmanak.mealient.datasource.v0.MealieServiceV0 import gq.kirmanak.mealient.datasource.v0.models.GetTokenResponseV0