From 8e9b14cecc37be3163953c53f362a4518ab0ba8a Mon Sep 17 00:00:00 2001 From: Gergely Hegedus Date: Sun, 19 Sep 2021 02:19:01 +0300 Subject: [PATCH] Fix code analysis errors --- .../testutils/configuration/HiltTestRunner.kt | 2 +- .../configuration/HttpsConfigurationModule.kt | 2 +- .../test/showcase/TestShowcaseApplication.kt | 8 +------ .../org/fnives/test/showcase/di/AppModule.kt | 5 ++-- .../test/showcase/ui/IntentCoordinator.kt | 2 +- .../test/showcase/ui/ViewModelDelegate.kt | 2 +- .../test/showcase/ui/auth/HiltAuthActivity.kt | 2 +- .../test/showcase/ui/home/HiltMainActivity.kt | 2 +- .../showcase/ui/splash/HiltSplashActivity.kt | 2 +- .../test/showcase/ui/IntentCoordinator.kt | 2 +- .../test/showcase/ui/ViewModelDelegate.kt | 2 +- .../storage/SharedPreferencesManagerImpl.kt | 18 ++++++++++---- .../FavouriteContentLocalStorageImpl.kt | 5 +++- .../test/showcase/ui/home/MainActivity.kt | 1 - .../FavouriteContentLocalStorageImplTest.kt | 2 +- .../statesetup/SetupLoggedInState.kt | 24 +++++++++---------- .../statesetup/SetupLoggedInState.kt | 4 ++-- .../test/showcase/ui/ActivityClassHolder.kt | 2 +- .../test/showcase/ui/ActivityClassHolder.kt | 2 +- .../core/content/ContentRepository.kt | 4 +++- .../test/showcase/core/di/hilt/CoreModule.kt | 5 ++-- .../core/di/hilt/LoggedInModuleInject.kt | 2 +- .../test/showcase/core/login/LogoutUseCase.kt | 2 +- .../core/login/hilt/LogoutUseCaseTest.kt | 6 ----- .../core/login/hilt/TestCoreComponent.kt | 3 +-- .../showcase/hilt/SessionLessQualifier.kt | 2 +- .../test/showcase/hilt/SessionQualifier.kt | 2 +- .../content/ContentRemoteSourceImpl.kt | 4 +++- .../network/di/hilt/BindsBaseOkHttpClient.kt | 4 ++-- .../network/di/hilt/HiltNetworkModule.kt | 3 +-- .../session/AuthenticationHeaderUtils.kt | 7 ++++-- .../showcase/network/TestNetworkComponent.kt | 3 +-- .../hilt/ContentRemoteSourceImplTest.kt | 11 ++------- .../content/hilt/SessionExpirationTest.kt | 3 --- 34 files changed, 71 insertions(+), 79 deletions(-) diff --git a/app/src/androidTestHilt/java/org/fnives/test/showcase/testutils/configuration/HiltTestRunner.kt b/app/src/androidTestHilt/java/org/fnives/test/showcase/testutils/configuration/HiltTestRunner.kt index 3ee4ec1..d2b4ee5 100644 --- a/app/src/androidTestHilt/java/org/fnives/test/showcase/testutils/configuration/HiltTestRunner.kt +++ b/app/src/androidTestHilt/java/org/fnives/test/showcase/testutils/configuration/HiltTestRunner.kt @@ -9,4 +9,4 @@ class HiltTestRunner : AndroidJUnitRunner() { override fun newApplication(cl: ClassLoader?, name: String?, context: Context?): Application = super.newApplication(cl, HiltTestApplication::class.java.name, context) -} \ No newline at end of file +} diff --git a/app/src/androidTestHilt/java/org/fnives/test/showcase/testutils/configuration/HttpsConfigurationModule.kt b/app/src/androidTestHilt/java/org/fnives/test/showcase/testutils/configuration/HttpsConfigurationModule.kt index 7c34155..3bf93c8 100644 --- a/app/src/androidTestHilt/java/org/fnives/test/showcase/testutils/configuration/HttpsConfigurationModule.kt +++ b/app/src/androidTestHilt/java/org/fnives/test/showcase/testutils/configuration/HttpsConfigurationModule.kt @@ -30,4 +30,4 @@ object HttpsConfigurationModule { handshakeCertificates.trustManager ) .build() -} \ No newline at end of file +} diff --git a/app/src/hilt/java/org/fnives/test/showcase/TestShowcaseApplication.kt b/app/src/hilt/java/org/fnives/test/showcase/TestShowcaseApplication.kt index a3b36fe..4881f5c 100644 --- a/app/src/hilt/java/org/fnives/test/showcase/TestShowcaseApplication.kt +++ b/app/src/hilt/java/org/fnives/test/showcase/TestShowcaseApplication.kt @@ -4,10 +4,4 @@ import android.app.Application import dagger.hilt.android.HiltAndroidApp @HiltAndroidApp -class TestShowcaseApplication : Application() { - - override fun onCreate() { - super.onCreate() - - } -} +class TestShowcaseApplication : Application() diff --git a/app/src/hilt/java/org/fnives/test/showcase/di/AppModule.kt b/app/src/hilt/java/org/fnives/test/showcase/di/AppModule.kt index 57fa755..3e574ee 100644 --- a/app/src/hilt/java/org/fnives/test/showcase/di/AppModule.kt +++ b/app/src/hilt/java/org/fnives/test/showcase/di/AppModule.kt @@ -48,6 +48,5 @@ object AppModule { @Provides internal fun bindSessionExpirationListener( sessionExpirationListenerImpl: SessionExpirationListenerImpl - ) : SessionExpirationListener = sessionExpirationListenerImpl - -} \ No newline at end of file + ): SessionExpirationListener = sessionExpirationListenerImpl +} diff --git a/app/src/hilt/java/org/fnives/test/showcase/ui/IntentCoordinator.kt b/app/src/hilt/java/org/fnives/test/showcase/ui/IntentCoordinator.kt index a7d3f6e..2abf987 100644 --- a/app/src/hilt/java/org/fnives/test/showcase/ui/IntentCoordinator.kt +++ b/app/src/hilt/java/org/fnives/test/showcase/ui/IntentCoordinator.kt @@ -11,4 +11,4 @@ object IntentCoordinator { fun authActivitygetStartIntent(context: Context) = HiltAuthActivity.getStartIntent(context) -} \ No newline at end of file +} diff --git a/app/src/hilt/java/org/fnives/test/showcase/ui/ViewModelDelegate.kt b/app/src/hilt/java/org/fnives/test/showcase/ui/ViewModelDelegate.kt index 2138fa6..7ef6742 100644 --- a/app/src/hilt/java/org/fnives/test/showcase/ui/ViewModelDelegate.kt +++ b/app/src/hilt/java/org/fnives/test/showcase/ui/ViewModelDelegate.kt @@ -9,4 +9,4 @@ inline fun ViewModelStoreOwner.viewModels(): Lazy = when (this) { is ComponentActivity -> androidxViewModel() else -> throw IllegalStateException("Only supports activity viewModel for now") - } \ No newline at end of file + } diff --git a/app/src/hilt/java/org/fnives/test/showcase/ui/auth/HiltAuthActivity.kt b/app/src/hilt/java/org/fnives/test/showcase/ui/auth/HiltAuthActivity.kt index e6df5b0..2574965 100644 --- a/app/src/hilt/java/org/fnives/test/showcase/ui/auth/HiltAuthActivity.kt +++ b/app/src/hilt/java/org/fnives/test/showcase/ui/auth/HiltAuthActivity.kt @@ -9,4 +9,4 @@ class HiltAuthActivity : AuthActivity() { companion object { fun getStartIntent(context: Context): Intent = Intent(context, HiltAuthActivity::class.java) } -} \ No newline at end of file +} diff --git a/app/src/hilt/java/org/fnives/test/showcase/ui/home/HiltMainActivity.kt b/app/src/hilt/java/org/fnives/test/showcase/ui/home/HiltMainActivity.kt index f6a7cdc..94b0b5f 100644 --- a/app/src/hilt/java/org/fnives/test/showcase/ui/home/HiltMainActivity.kt +++ b/app/src/hilt/java/org/fnives/test/showcase/ui/home/HiltMainActivity.kt @@ -9,4 +9,4 @@ class HiltMainActivity : MainActivity() { companion object { fun getStartIntent(context: Context): Intent = Intent(context, HiltMainActivity::class.java) } -} \ No newline at end of file +} diff --git a/app/src/hilt/java/org/fnives/test/showcase/ui/splash/HiltSplashActivity.kt b/app/src/hilt/java/org/fnives/test/showcase/ui/splash/HiltSplashActivity.kt index 19ba159..c3af781 100644 --- a/app/src/hilt/java/org/fnives/test/showcase/ui/splash/HiltSplashActivity.kt +++ b/app/src/hilt/java/org/fnives/test/showcase/ui/splash/HiltSplashActivity.kt @@ -3,4 +3,4 @@ package org.fnives.test.showcase.ui.splash import dagger.hilt.android.AndroidEntryPoint @AndroidEntryPoint -class HiltSplashActivity : SplashActivity() \ No newline at end of file +class HiltSplashActivity : SplashActivity() diff --git a/app/src/koin/java/org/fnives/test/showcase/ui/IntentCoordinator.kt b/app/src/koin/java/org/fnives/test/showcase/ui/IntentCoordinator.kt index 4a5170a..86eec94 100644 --- a/app/src/koin/java/org/fnives/test/showcase/ui/IntentCoordinator.kt +++ b/app/src/koin/java/org/fnives/test/showcase/ui/IntentCoordinator.kt @@ -11,4 +11,4 @@ object IntentCoordinator { fun authActivitygetStartIntent(context: Context) = AuthActivity.getStartIntent(context) -} \ No newline at end of file +} diff --git a/app/src/koin/java/org/fnives/test/showcase/ui/ViewModelDelegate.kt b/app/src/koin/java/org/fnives/test/showcase/ui/ViewModelDelegate.kt index 1cca4d6..6ead7ed 100644 --- a/app/src/koin/java/org/fnives/test/showcase/ui/ViewModelDelegate.kt +++ b/app/src/koin/java/org/fnives/test/showcase/ui/ViewModelDelegate.kt @@ -5,4 +5,4 @@ import androidx.lifecycle.ViewModelStoreOwner import org.koin.androidx.viewmodel.ext.android.viewModel inline fun ViewModelStoreOwner.viewModels(): Lazy = - viewModel() \ No newline at end of file + viewModel() diff --git a/app/src/main/java/org/fnives/test/showcase/storage/SharedPreferencesManagerImpl.kt b/app/src/main/java/org/fnives/test/showcase/storage/SharedPreferencesManagerImpl.kt index aa4265b..6835182 100644 --- a/app/src/main/java/org/fnives/test/showcase/storage/SharedPreferencesManagerImpl.kt +++ b/app/src/main/java/org/fnives/test/showcase/storage/SharedPreferencesManagerImpl.kt @@ -7,13 +7,20 @@ import org.fnives.test.showcase.model.session.Session import kotlin.properties.ReadWriteProperty import kotlin.reflect.KProperty -class SharedPreferencesManagerImpl constructor(private val sharedPreferences: SharedPreferences) : UserDataLocalStorage { +class SharedPreferencesManagerImpl( + private val sharedPreferences: SharedPreferences +) : UserDataLocalStorage { override var session: Session? by SessionDelegate(SESSION_KEY) - private class SessionDelegate(private val key: String) : ReadWriteProperty { + private class SessionDelegate(private val key: String) : + ReadWriteProperty { - override fun setValue(thisRef: SharedPreferencesManagerImpl, property: KProperty<*>, value: Session?) { + override fun setValue( + thisRef: SharedPreferencesManagerImpl, + property: KProperty<*>, + value: Session? + ) { if (value == null) { thisRef.sharedPreferences.edit().remove(key).apply() } else { @@ -25,7 +32,10 @@ class SharedPreferencesManagerImpl constructor(private val sharedPreferences: Sh } } - override fun getValue(thisRef: SharedPreferencesManagerImpl, property: KProperty<*>): Session? { + override fun getValue( + thisRef: SharedPreferencesManagerImpl, + property: KProperty<*> + ): Session? { val values = thisRef.sharedPreferences.getStringSet(key, null)?.toList() val accessToken = values?.firstOrNull { it.startsWith(ACCESS_TOKEN_KEY) } ?.drop(ACCESS_TOKEN_KEY.length) ?: return null diff --git a/app/src/main/java/org/fnives/test/showcase/storage/favourite/FavouriteContentLocalStorageImpl.kt b/app/src/main/java/org/fnives/test/showcase/storage/favourite/FavouriteContentLocalStorageImpl.kt index 4797f32..f93416a 100644 --- a/app/src/main/java/org/fnives/test/showcase/storage/favourite/FavouriteContentLocalStorageImpl.kt +++ b/app/src/main/java/org/fnives/test/showcase/storage/favourite/FavouriteContentLocalStorageImpl.kt @@ -6,7 +6,10 @@ import org.fnives.test.showcase.core.storage.content.FavouriteContentLocalStorag import org.fnives.test.showcase.model.content.ContentId import javax.inject.Inject -class FavouriteContentLocalStorageImpl @Inject constructor(private val favouriteDao: FavouriteDao) : FavouriteContentLocalStorage { +class FavouriteContentLocalStorageImpl @Inject constructor( + private val favouriteDao: FavouriteDao +) : FavouriteContentLocalStorage { + override fun observeFavourites(): Flow> = favouriteDao.get().map { it.map(FavouriteEntity::contentId).map(::ContentId) } diff --git a/app/src/main/java/org/fnives/test/showcase/ui/home/MainActivity.kt b/app/src/main/java/org/fnives/test/showcase/ui/home/MainActivity.kt index a9bea69..3ec95c1 100644 --- a/app/src/main/java/org/fnives/test/showcase/ui/home/MainActivity.kt +++ b/app/src/main/java/org/fnives/test/showcase/ui/home/MainActivity.kt @@ -6,7 +6,6 @@ import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import androidx.core.view.isVisible import androidx.recyclerview.widget.LinearLayoutManager -import dagger.hilt.android.AndroidEntryPoint import org.fnives.test.showcase.R import org.fnives.test.showcase.databinding.ActivityMainBinding import org.fnives.test.showcase.model.content.ContentId diff --git a/app/src/robolectricTestHilt/java/org/fnives/test/showcase/favourite/FavouriteContentLocalStorageImplTest.kt b/app/src/robolectricTestHilt/java/org/fnives/test/showcase/favourite/FavouriteContentLocalStorageImplTest.kt index 967962f..7166b68 100644 --- a/app/src/robolectricTestHilt/java/org/fnives/test/showcase/favourite/FavouriteContentLocalStorageImplTest.kt +++ b/app/src/robolectricTestHilt/java/org/fnives/test/showcase/favourite/FavouriteContentLocalStorageImplTest.kt @@ -30,7 +30,7 @@ internal class FavouriteContentLocalStorageImplTest { val hiltRule = HiltAndroidRule(this) @Inject - lateinit var sut : FavouriteContentLocalStorage + lateinit var sut: FavouriteContentLocalStorage private lateinit var testDispatcher: TestCoroutineDispatcher @Before diff --git a/app/src/sharedTest/java/org/fnives/test/showcase/testutils/statesetup/SetupLoggedInState.kt b/app/src/sharedTest/java/org/fnives/test/showcase/testutils/statesetup/SetupLoggedInState.kt index fe7b3f7..ce25260 100644 --- a/app/src/sharedTest/java/org/fnives/test/showcase/testutils/statesetup/SetupLoggedInState.kt +++ b/app/src/sharedTest/java/org/fnives/test/showcase/testutils/statesetup/SetupLoggedInState.kt @@ -1,16 +1,16 @@ -//package org.fnives.test.showcase.testutils.statesetup +// package org.fnives.test.showcase.testutils.statesetup // -//import kotlinx.coroutines.runBlocking -//import org.fnives.test.showcase.core.login.IsUserLoggedInUseCase -//import org.fnives.test.showcase.core.login.LoginUseCase -//import org.fnives.test.showcase.core.login.LogoutUseCase -//import org.fnives.test.showcase.model.auth.LoginCredentials -//import org.fnives.test.showcase.network.mockserver.MockServerScenarioSetup -//import org.fnives.test.showcase.network.mockserver.scenario.auth.AuthScenario -//import org.koin.test.KoinTest -//import org.koin.test.get +// import kotlinx.coroutines.runBlocking +// import org.fnives.test.showcase.core.login.IsUserLoggedInUseCase +// import org.fnives.test.showcase.core.login.LoginUseCase +// import org.fnives.test.showcase.core.login.LogoutUseCase +// import org.fnives.test.showcase.model.auth.LoginCredentials +// import org.fnives.test.showcase.network.mockserver.MockServerScenarioSetup +// import org.fnives.test.showcase.network.mockserver.scenario.auth.AuthScenario +// import org.koin.test.KoinTest +// import org.koin.test.get // -//object SetupLoggedInState : KoinTest { +// object SetupLoggedInState : KoinTest { // // private val logoutUseCase get() = get() // private val loginUseCase get() = get() @@ -28,4 +28,4 @@ // fun setupLogout() { // runBlocking { logoutUseCase.invoke() } // } -//} +// } diff --git a/app/src/sharedTestHilt/java/org/fnives/test/showcase/testutils/statesetup/SetupLoggedInState.kt b/app/src/sharedTestHilt/java/org/fnives/test/showcase/testutils/statesetup/SetupLoggedInState.kt index c4c1f71..04d165d 100644 --- a/app/src/sharedTestHilt/java/org/fnives/test/showcase/testutils/statesetup/SetupLoggedInState.kt +++ b/app/src/sharedTestHilt/java/org/fnives/test/showcase/testutils/statesetup/SetupLoggedInState.kt @@ -10,8 +10,8 @@ import org.fnives.test.showcase.network.mockserver.scenario.auth.AuthScenario import javax.inject.Inject class SetupLoggedInState @Inject constructor( - private val logoutUseCase : LogoutUseCase, - private val loginUseCase : LoginUseCase, + private val logoutUseCase: LogoutUseCase, + private val loginUseCase: LoginUseCase, private val isUserLoggedInUseCase: IsUserLoggedInUseCase ) { diff --git a/app/src/sharedTestHilt/java/org/fnives/test/showcase/ui/ActivityClassHolder.kt b/app/src/sharedTestHilt/java/org/fnives/test/showcase/ui/ActivityClassHolder.kt index e2e48a2..5e1aaca 100644 --- a/app/src/sharedTestHilt/java/org/fnives/test/showcase/ui/ActivityClassHolder.kt +++ b/app/src/sharedTestHilt/java/org/fnives/test/showcase/ui/ActivityClassHolder.kt @@ -11,4 +11,4 @@ object ActivityClassHolder { fun mainActivity() = HiltMainActivity::class fun splashActivity() = HiltSplashActivity::class -} \ No newline at end of file +} diff --git a/app/src/sharedTestKoin/java/org/fnives/test/showcase/ui/ActivityClassHolder.kt b/app/src/sharedTestKoin/java/org/fnives/test/showcase/ui/ActivityClassHolder.kt index 445c3b5..357b766 100644 --- a/app/src/sharedTestKoin/java/org/fnives/test/showcase/ui/ActivityClassHolder.kt +++ b/app/src/sharedTestKoin/java/org/fnives/test/showcase/ui/ActivityClassHolder.kt @@ -11,4 +11,4 @@ object ActivityClassHolder { fun mainActivity() = MainActivity::class fun splashActivity() = SplashActivity::class -} \ No newline at end of file +} diff --git a/core/src/main/java/org/fnives/test/showcase/core/content/ContentRepository.kt b/core/src/main/java/org/fnives/test/showcase/core/content/ContentRepository.kt index 143d2c8..6b45ad3 100644 --- a/core/src/main/java/org/fnives/test/showcase/core/content/ContentRepository.kt +++ b/core/src/main/java/org/fnives/test/showcase/core/content/ContentRepository.kt @@ -15,7 +15,9 @@ import org.fnives.test.showcase.model.content.Content import org.fnives.test.showcase.model.shared.Resource import org.fnives.test.showcase.network.content.ContentRemoteSource -internal class ContentRepository @LoggedInModuleInject constructor(private val contentRemoteSource: ContentRemoteSource) { +internal class ContentRepository @LoggedInModuleInject constructor( + private val contentRemoteSource: ContentRemoteSource +) { private val mutableContentFlow = MutableStateFlow(Optional>(null)) private val requestFlow: Flow>> = flow { diff --git a/core/src/main/java/org/fnives/test/showcase/core/di/hilt/CoreModule.kt b/core/src/main/java/org/fnives/test/showcase/core/di/hilt/CoreModule.kt index 6ca5bdc..67887f9 100644 --- a/core/src/main/java/org/fnives/test/showcase/core/di/hilt/CoreModule.kt +++ b/core/src/main/java/org/fnives/test/showcase/core/di/hilt/CoreModule.kt @@ -10,7 +10,6 @@ import org.fnives.test.showcase.core.storage.NetworkSessionLocalStorageAdapter import org.fnives.test.showcase.core.storage.UserDataLocalStorage import org.fnives.test.showcase.network.session.NetworkSessionExpirationListener import org.fnives.test.showcase.network.session.NetworkSessionLocalStorage -import org.fnives.test.showcase.core.di.hilt.ReloadLoggedInModuleInjectModule @InstallIn(SingletonComponent::class) @Module @@ -30,5 +29,5 @@ object CoreModule { fun provideLogoutUseCase( storage: UserDataLocalStorage, reloadLoggedInModuleInjectModule: ReloadLoggedInModuleInjectModule - ) : LogoutUseCase = LogoutUseCase(storage, reloadLoggedInModuleInjectModule) -} \ No newline at end of file + ): LogoutUseCase = LogoutUseCase(storage, reloadLoggedInModuleInjectModule) +} diff --git a/core/src/main/java/org/fnives/test/showcase/core/di/hilt/LoggedInModuleInject.kt b/core/src/main/java/org/fnives/test/showcase/core/di/hilt/LoggedInModuleInject.kt index 3649804..5032c97 100644 --- a/core/src/main/java/org/fnives/test/showcase/core/di/hilt/LoggedInModuleInject.kt +++ b/core/src/main/java/org/fnives/test/showcase/core/di/hilt/LoggedInModuleInject.kt @@ -5,4 +5,4 @@ import org.fnives.library.reloadable.module.annotation.ReloadableModule @ReloadableModule @Target(AnnotationTarget.CONSTRUCTOR) @Retention(AnnotationRetention.SOURCE) -annotation class LoggedInModuleInject \ No newline at end of file +annotation class LoggedInModuleInject diff --git a/core/src/main/java/org/fnives/test/showcase/core/login/LogoutUseCase.kt b/core/src/main/java/org/fnives/test/showcase/core/login/LogoutUseCase.kt index 7e36a78..15d6033 100644 --- a/core/src/main/java/org/fnives/test/showcase/core/login/LogoutUseCase.kt +++ b/core/src/main/java/org/fnives/test/showcase/core/login/LogoutUseCase.kt @@ -1,10 +1,10 @@ package org.fnives.test.showcase.core.login +import org.fnives.test.showcase.core.di.hilt.ReloadLoggedInModuleInjectModule import org.fnives.test.showcase.core.di.koin.repositoryModule import org.fnives.test.showcase.core.storage.UserDataLocalStorage import org.koin.core.context.loadKoinModules import org.koin.mp.KoinPlatformTools -import org.fnives.test.showcase.core.di.hilt.ReloadLoggedInModuleInjectModule class LogoutUseCase( private val storage: UserDataLocalStorage, diff --git a/core/src/test/java/org/fnives/test/showcase/core/login/hilt/LogoutUseCaseTest.kt b/core/src/test/java/org/fnives/test/showcase/core/login/hilt/LogoutUseCaseTest.kt index 6e92568..20ea451 100644 --- a/core/src/test/java/org/fnives/test/showcase/core/login/hilt/LogoutUseCaseTest.kt +++ b/core/src/test/java/org/fnives/test/showcase/core/login/hilt/LogoutUseCaseTest.kt @@ -2,17 +2,11 @@ package org.fnives.test.showcase.core.login.hilt import kotlinx.coroutines.test.runBlockingTest import org.fnives.test.showcase.core.content.ContentRepository -import org.fnives.test.showcase.core.di.koin.createCoreModule import org.fnives.test.showcase.core.login.LogoutUseCase import org.fnives.test.showcase.core.storage.UserDataLocalStorage -import org.fnives.test.showcase.model.network.BaseUrl -import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test -import org.koin.core.context.startKoin -import org.koin.core.context.stopKoin -import org.koin.test.KoinTest import org.mockito.kotlin.mock import org.mockito.kotlin.times import org.mockito.kotlin.verify diff --git a/core/src/test/java/org/fnives/test/showcase/core/login/hilt/TestCoreComponent.kt b/core/src/test/java/org/fnives/test/showcase/core/login/hilt/TestCoreComponent.kt index 8f658d6..f5d2997 100644 --- a/core/src/test/java/org/fnives/test/showcase/core/login/hilt/TestCoreComponent.kt +++ b/core/src/test/java/org/fnives/test/showcase/core/login/hilt/TestCoreComponent.kt @@ -14,7 +14,6 @@ import javax.inject.Singleton @Component(modules = [CoreModule::class, HiltNetworkModule::class, ReloadLoggedInModuleInjectModuleImpl::class, BindsBaseOkHttpClient::class]) internal interface TestCoreComponent { - @Component.Builder interface Builder { @@ -34,4 +33,4 @@ internal interface TestCoreComponent { } fun inject(logoutUseCaseTest: LogoutUseCaseTest) -} \ No newline at end of file +} diff --git a/model/src/main/java/org/fnives/test/showcase/hilt/SessionLessQualifier.kt b/model/src/main/java/org/fnives/test/showcase/hilt/SessionLessQualifier.kt index 30d3a3b..7760b2f 100644 --- a/model/src/main/java/org/fnives/test/showcase/hilt/SessionLessQualifier.kt +++ b/model/src/main/java/org/fnives/test/showcase/hilt/SessionLessQualifier.kt @@ -3,4 +3,4 @@ package org.fnives.test.showcase.hilt import javax.inject.Qualifier @Qualifier -annotation class SessionLessQualifier \ No newline at end of file +annotation class SessionLessQualifier diff --git a/model/src/main/java/org/fnives/test/showcase/hilt/SessionQualifier.kt b/model/src/main/java/org/fnives/test/showcase/hilt/SessionQualifier.kt index 2a70fba..bba6af8 100644 --- a/model/src/main/java/org/fnives/test/showcase/hilt/SessionQualifier.kt +++ b/model/src/main/java/org/fnives/test/showcase/hilt/SessionQualifier.kt @@ -3,4 +3,4 @@ package org.fnives.test.showcase.hilt import javax.inject.Qualifier @Qualifier -annotation class SessionQualifier \ No newline at end of file +annotation class SessionQualifier diff --git a/network/src/main/java/org/fnives/test/showcase/network/content/ContentRemoteSourceImpl.kt b/network/src/main/java/org/fnives/test/showcase/network/content/ContentRemoteSourceImpl.kt index 4c0da1a..25d830d 100644 --- a/network/src/main/java/org/fnives/test/showcase/network/content/ContentRemoteSourceImpl.kt +++ b/network/src/main/java/org/fnives/test/showcase/network/content/ContentRemoteSourceImpl.kt @@ -6,7 +6,9 @@ import org.fnives.test.showcase.model.content.ImageUrl import org.fnives.test.showcase.network.shared.ExceptionWrapper import javax.inject.Inject -internal class ContentRemoteSourceImpl @Inject constructor(private val contentService: ContentService) : ContentRemoteSource { +internal class ContentRemoteSourceImpl @Inject constructor( + private val contentService: ContentService +) : ContentRemoteSource { override suspend fun get(): List = ExceptionWrapper.wrap { diff --git a/network/src/main/java/org/fnives/test/showcase/network/di/hilt/BindsBaseOkHttpClient.kt b/network/src/main/java/org/fnives/test/showcase/network/di/hilt/BindsBaseOkHttpClient.kt index 34e9ad7..260f5ad 100644 --- a/network/src/main/java/org/fnives/test/showcase/network/di/hilt/BindsBaseOkHttpClient.kt +++ b/network/src/main/java/org/fnives/test/showcase/network/di/hilt/BindsBaseOkHttpClient.kt @@ -13,5 +13,5 @@ abstract class BindsBaseOkHttpClient { @Binds @SessionLessQualifier - abstract fun bindsSessionLess(okHttpClient: OkHttpClient) : OkHttpClient -} \ No newline at end of file + abstract fun bindsSessionLess(okHttpClient: OkHttpClient): OkHttpClient +} diff --git a/network/src/main/java/org/fnives/test/showcase/network/di/hilt/HiltNetworkModule.kt b/network/src/main/java/org/fnives/test/showcase/network/di/hilt/HiltNetworkModule.kt index 5667f2f..fe8d982 100644 --- a/network/src/main/java/org/fnives/test/showcase/network/di/hilt/HiltNetworkModule.kt +++ b/network/src/main/java/org/fnives/test/showcase/network/di/hilt/HiltNetworkModule.kt @@ -93,5 +93,4 @@ object HiltNetworkModule { @Provides internal fun provideContentService(@SessionQualifier retrofit: Retrofit): ContentService = retrofit.create(ContentService::class.java) - -} \ No newline at end of file +} diff --git a/network/src/main/java/org/fnives/test/showcase/network/session/AuthenticationHeaderUtils.kt b/network/src/main/java/org/fnives/test/showcase/network/session/AuthenticationHeaderUtils.kt index ae228d5..56601b1 100644 --- a/network/src/main/java/org/fnives/test/showcase/network/session/AuthenticationHeaderUtils.kt +++ b/network/src/main/java/org/fnives/test/showcase/network/session/AuthenticationHeaderUtils.kt @@ -3,13 +3,16 @@ package org.fnives.test.showcase.network.session import okhttp3.Request import javax.inject.Inject -internal class AuthenticationHeaderUtils @Inject constructor(private val networkSessionLocalStorage: NetworkSessionLocalStorage) { +internal class AuthenticationHeaderUtils @Inject constructor( + private val networkSessionLocalStorage: NetworkSessionLocalStorage +) { fun hasToken(okhttpRequest: Request): Boolean = okhttpRequest.header(KEY) == networkSessionLocalStorage.session?.accessToken fun attachToken(okhttpRequest: Request): Request = - okhttpRequest.newBuilder().header(KEY, networkSessionLocalStorage.session?.accessToken.orEmpty()).build() + okhttpRequest.newBuilder() + .header(KEY, networkSessionLocalStorage.session?.accessToken.orEmpty()).build() companion object { private const val KEY = "Authorization" diff --git a/network/src/test/java/org/fnives/test/showcase/network/TestNetworkComponent.kt b/network/src/test/java/org/fnives/test/showcase/network/TestNetworkComponent.kt index e2c0b3e..9300e01 100644 --- a/network/src/test/java/org/fnives/test/showcase/network/TestNetworkComponent.kt +++ b/network/src/test/java/org/fnives/test/showcase/network/TestNetworkComponent.kt @@ -16,7 +16,6 @@ import javax.inject.Singleton @Component(modules = [HiltNetworkModule::class, BindsBaseOkHttpClient::class]) interface TestNetworkComponent { - @Component.Builder interface Builder { @@ -42,4 +41,4 @@ interface TestNetworkComponent { fun inject(loginRemoteSourceRefreshActionImplTest: LoginRemoteSourceRefreshActionImplTest) fun inject(loginRemoteSourceTest: LoginRemoteSourceTest) -} \ No newline at end of file +} diff --git a/network/src/test/java/org/fnives/test/showcase/network/content/hilt/ContentRemoteSourceImplTest.kt b/network/src/test/java/org/fnives/test/showcase/network/content/hilt/ContentRemoteSourceImplTest.kt index c3fad8c..d1b669d 100644 --- a/network/src/test/java/org/fnives/test/showcase/network/content/hilt/ContentRemoteSourceImplTest.kt +++ b/network/src/test/java/org/fnives/test/showcase/network/content/hilt/ContentRemoteSourceImplTest.kt @@ -1,33 +1,26 @@ package org.fnives.test.showcase.network.content.hilt import kotlinx.coroutines.runBlocking -import org.fnives.test.showcase.model.network.BaseUrl -import org.fnives.test.showcase.network.TestNetworkComponent +import org.fnives.test.showcase.network.DaggerTestNetworkComponent import org.fnives.test.showcase.network.content.ContentRemoteSourceImpl -import org.fnives.test.showcase.network.di.koin.createNetworkModules import org.fnives.test.showcase.network.mockserver.ContentData import org.fnives.test.showcase.network.mockserver.scenario.content.ContentScenario import org.fnives.test.showcase.network.session.NetworkSessionLocalStorage import org.fnives.test.showcase.network.shared.MockServerScenarioSetupExtensions import org.fnives.test.showcase.network.shared.exceptions.NetworkException import org.fnives.test.showcase.network.shared.exceptions.ParsingException -import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.RegisterExtension -import org.koin.core.context.startKoin -import org.koin.core.context.stopKoin -import org.koin.test.KoinTest import org.koin.test.inject import org.mockito.kotlin.doReturn import org.mockito.kotlin.mock import org.mockito.kotlin.whenever -import org.fnives.test.showcase.network.DaggerTestNetworkComponent import javax.inject.Inject @Suppress("TestFunctionName") -class ContentRemoteSourceImplTest { +class ContentRemoteSourceImplTest { @Inject internal lateinit var sut: ContentRemoteSourceImpl diff --git a/network/src/test/java/org/fnives/test/showcase/network/content/hilt/SessionExpirationTest.kt b/network/src/test/java/org/fnives/test/showcase/network/content/hilt/SessionExpirationTest.kt index 7c009fa..9476715 100644 --- a/network/src/test/java/org/fnives/test/showcase/network/content/hilt/SessionExpirationTest.kt +++ b/network/src/test/java/org/fnives/test/showcase/network/content/hilt/SessionExpirationTest.kt @@ -11,14 +11,11 @@ import org.fnives.test.showcase.network.session.NetworkSessionExpirationListener import org.fnives.test.showcase.network.session.NetworkSessionLocalStorage import org.fnives.test.showcase.network.shared.MockServerScenarioSetupExtensions import org.fnives.test.showcase.network.shared.exceptions.NetworkException -import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.Assertions import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.RegisterExtension -import org.koin.core.context.stopKoin -import org.koin.test.KoinTest import org.koin.test.inject import org.mockito.kotlin.anyOrNull import org.mockito.kotlin.doAnswer