From aae9adce8443c055aa3186450b7951f795cb3d55 Mon Sep 17 00:00:00 2001 From: Brian Yencho Date: Fri, 27 Oct 2023 13:01:00 -0500 Subject: [PATCH] Rename NetworkConfigRepository to NetworkConfigManager (#172) --- .../java/com/x8bit/bitwarden/BitwardenApplication.kt | 4 ++-- .../data/platform/manager/NetworkConfigManager.kt | 6 ++++++ .../NetworkConfigManagerImpl.kt} | 9 +++++---- .../platform/repository/NetworkConfigRepository.kt | 6 ------ .../platform/repository/di/PlatformRepositoryModule.kt | 10 +++++----- .../NetworkConfigManagerTest.kt} | 9 +++++---- 6 files changed, 23 insertions(+), 21 deletions(-) create mode 100644 app/src/main/java/com/x8bit/bitwarden/data/platform/manager/NetworkConfigManager.kt rename app/src/main/java/com/x8bit/bitwarden/data/platform/{repository/NetworkConfigRepositoryImpl.kt => manager/NetworkConfigManagerImpl.kt} (85%) delete mode 100644 app/src/main/java/com/x8bit/bitwarden/data/platform/repository/NetworkConfigRepository.kt rename app/src/test/java/com/x8bit/bitwarden/data/platform/{repository/NetworkConfigRepositoryTest.kt => manager/NetworkConfigManagerTest.kt} (90%) diff --git a/app/src/main/java/com/x8bit/bitwarden/BitwardenApplication.kt b/app/src/main/java/com/x8bit/bitwarden/BitwardenApplication.kt index 5aeb83da37..5fe9ba3e75 100644 --- a/app/src/main/java/com/x8bit/bitwarden/BitwardenApplication.kt +++ b/app/src/main/java/com/x8bit/bitwarden/BitwardenApplication.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden import android.app.Application -import com.x8bit.bitwarden.data.platform.repository.NetworkConfigRepository +import com.x8bit.bitwarden.data.platform.manager.NetworkConfigManager import dagger.hilt.android.HiltAndroidApp import javax.inject.Inject @@ -13,5 +13,5 @@ class BitwardenApplication : Application() { // Inject classes here that must be triggered on startup but are not otherwise consumed by // other callers. @Inject - lateinit var networkConfigRepository: NetworkConfigRepository + lateinit var networkConfigManager: NetworkConfigManager } diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/NetworkConfigManager.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/NetworkConfigManager.kt new file mode 100644 index 0000000000..a96d6b08f3 --- /dev/null +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/NetworkConfigManager.kt @@ -0,0 +1,6 @@ +package com.x8bit.bitwarden.data.platform.manager + +/** + * Responsible for managing the active configuration of the network layer. + */ +interface NetworkConfigManager diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/NetworkConfigRepositoryImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/NetworkConfigManagerImpl.kt similarity index 85% rename from app/src/main/java/com/x8bit/bitwarden/data/platform/repository/NetworkConfigRepositoryImpl.kt rename to app/src/main/java/com/x8bit/bitwarden/data/platform/manager/NetworkConfigManagerImpl.kt index 4ae1695a15..966dfbcf47 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/NetworkConfigRepositoryImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/NetworkConfigManagerImpl.kt @@ -1,24 +1,25 @@ -package com.x8bit.bitwarden.data.platform.repository +package com.x8bit.bitwarden.data.platform.manager import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.auth.repository.model.AuthState import com.x8bit.bitwarden.data.platform.datasource.network.interceptor.AuthTokenInterceptor import com.x8bit.bitwarden.data.platform.datasource.network.interceptor.BaseUrlInterceptors +import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach /** - * Primary implementation of [NetworkConfigRepository]. + * Primary implementation of [NetworkConfigManager]. */ -class NetworkConfigRepositoryImpl( +class NetworkConfigManagerImpl( private val authRepository: AuthRepository, private val authTokenInterceptor: AuthTokenInterceptor, private val environmentRepository: EnvironmentRepository, private val baseUrlInterceptors: BaseUrlInterceptors, dispatcher: CoroutineDispatcher, -) : NetworkConfigRepository { +) : NetworkConfigManager { private val scope = CoroutineScope(dispatcher) diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/NetworkConfigRepository.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/NetworkConfigRepository.kt deleted file mode 100644 index 8f679a5e09..0000000000 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/NetworkConfigRepository.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.x8bit.bitwarden.data.platform.repository - -/** - * Responsible for managing the active configuration of the network layer. - */ -interface NetworkConfigRepository diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/di/PlatformRepositoryModule.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/di/PlatformRepositoryModule.kt index eef45d725b..d4be18f176 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/di/PlatformRepositoryModule.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/di/PlatformRepositoryModule.kt @@ -4,10 +4,10 @@ import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.platform.datasource.disk.EnvironmentDiskSource import com.x8bit.bitwarden.data.platform.datasource.network.interceptor.AuthTokenInterceptor import com.x8bit.bitwarden.data.platform.datasource.network.interceptor.BaseUrlInterceptors +import com.x8bit.bitwarden.data.platform.manager.NetworkConfigManager +import com.x8bit.bitwarden.data.platform.manager.NetworkConfigManagerImpl import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepositoryImpl -import com.x8bit.bitwarden.data.platform.repository.NetworkConfigRepository -import com.x8bit.bitwarden.data.platform.repository.NetworkConfigRepositoryImpl import dagger.Module import dagger.Provides import dagger.hilt.InstallIn @@ -34,13 +34,13 @@ object PlatformRepositoryModule { @Provides @Singleton - fun provideNetworkConfigRepository( + fun provideNetworkConfigManager( authRepository: AuthRepository, authTokenInterceptor: AuthTokenInterceptor, environmentRepository: EnvironmentRepository, baseUrlInterceptors: BaseUrlInterceptors, - ): NetworkConfigRepository = - NetworkConfigRepositoryImpl( + ): NetworkConfigManager = + NetworkConfigManagerImpl( authRepository = authRepository, authTokenInterceptor = authTokenInterceptor, environmentRepository = environmentRepository, diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/NetworkConfigRepositoryTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/NetworkConfigManagerTest.kt similarity index 90% rename from app/src/test/java/com/x8bit/bitwarden/data/platform/repository/NetworkConfigRepositoryTest.kt rename to app/src/test/java/com/x8bit/bitwarden/data/platform/manager/NetworkConfigManagerTest.kt index 1a93b964b3..d0e20b9ab6 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/repository/NetworkConfigRepositoryTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/NetworkConfigManagerTest.kt @@ -1,9 +1,10 @@ -package com.x8bit.bitwarden.data.platform.repository +package com.x8bit.bitwarden.data.platform.manager import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.auth.repository.model.AuthState import com.x8bit.bitwarden.data.platform.datasource.network.interceptor.AuthTokenInterceptor import com.x8bit.bitwarden.data.platform.datasource.network.interceptor.BaseUrlInterceptors +import com.x8bit.bitwarden.data.platform.repository.EnvironmentRepository import com.x8bit.bitwarden.data.platform.repository.model.Environment import io.mockk.every import io.mockk.mockk @@ -16,7 +17,7 @@ import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test @OptIn(ExperimentalCoroutinesApi::class) -class NetworkConfigRepositoryTest { +class NetworkConfigManagerTest { private val mutableAuthStateFlow = MutableStateFlow(AuthState.Uninitialized) private val mutableEnvironmentStateFlow = MutableStateFlow(Environment.Us) @@ -31,11 +32,11 @@ class NetworkConfigRepositoryTest { private val authTokenInterceptor = AuthTokenInterceptor() private val baseUrlInterceptors = BaseUrlInterceptors() - private lateinit var networkConfigRepository: NetworkConfigRepository + private lateinit var networkConfigManager: NetworkConfigManager @BeforeEach fun setUp() { - networkConfigRepository = NetworkConfigRepositoryImpl( + networkConfigManager = NetworkConfigManagerImpl( authRepository = authRepository, authTokenInterceptor = authTokenInterceptor, environmentRepository = environmentRepository,