Remove suspend keyword from getBaseUrl function #ANDROID-15254 (#23)

* remove suspend keyword from getBaseUrl function #ANDROID-15254 * fix provideMockApiClient #ANDROID-15254
Telefonica · Oct 2, 2024 · 2b2d2a0 · 2b2d2a0
1 parent 3c26f86
commit 2b2d2a0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 13 deletions.
diff --git a/app/src/main/java/com/telefonica/mocks/domain/backend/InitBackendUrl.kt b/app/src/main/java/com/telefonica/mocks/domain/backend/InitBackendUrl.kt
@@ -4,18 +4,14 @@ import com.telefonica.mock.MockHelper
 import com.telefonica.mocks.BuildConfig
 import com.telefonica.mocks.common.Environment
 import com.telefonica.mocks.data.backend.BackendRepository
-import com.telefonica.mocks.di.IoDispatcher
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
 open class InitBackendUrl @Inject constructor(
     private val mockHelper: MockHelper,
     private val backendRepository: BackendRepository,
-    @IoDispatcher private val dispatcher: CoroutineDispatcher,
 ) {
 
-    open suspend operator fun invoke() = withContext(dispatcher) {
+    open operator fun invoke() {
         backendRepository.backendUrl = when (BuildConfig.DEFAULT_ENVIRONMENT == Environment.DEMO) {
             true -> mockHelper.getBaseUrl()
             false -> BuildConfig.DEFAULT_ENVIRONMENT.baseUrl

diff --git a/mock/src/main/java/com/telefonica/mock/MockHelper.kt b/mock/src/main/java/com/telefonica/mock/MockHelper.kt
@@ -27,7 +27,7 @@ class MockHelper(context: Context) {
         mockApiClient.stopServer()
     }
 
-    suspend fun getBaseUrl(): String = mockApiClient.getBaseUrl()
+    fun getBaseUrl(): String = mockApiClient.getBaseUrl()
 
     fun setUp(
         port: Int = 0,

diff --git a/mock/src/main/java/com/telefonica/mock/MockedServer.kt b/mock/src/main/java/com/telefonica/mock/MockedServer.kt
@@ -1,7 +1,5 @@
 package com.telefonica.mock
 
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.withContext
 import okhttp3.mockwebserver.Dispatcher
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
@@ -11,7 +9,6 @@ import okhttp3.tls.HeldCertificate
 import javax.inject.Inject
 
 open class MockedServer @Inject constructor(
-    private val coroutineDispatcher: CoroutineDispatcher,
     private val mockWebServer: MockWebServer,
     private val responseDispatcher: ResponseDispatcher,
 ) {
@@ -31,9 +28,7 @@ open class MockedServer @Inject constructor(
         mockWebServer.shutdown()
     }
 
-    suspend fun getBaseUrl(): String = withContext(coroutineDispatcher) {
-        mockWebServer.url("/").toString()
-    }
+    fun getBaseUrl(): String = mockWebServer.url("/").toString()
 
     internal fun enqueue(requestInfo: RequestInfo, mockedResponse: MockedResponse) {
         responseDispatcher.enqueue(requestInfo, mockedResponse)

diff --git a/mock/src/main/java/com/telefonica/mock/di/MockApiModule.kt b/mock/src/main/java/com/telefonica/mock/di/MockApiModule.kt
@@ -27,5 +27,5 @@ class MockApiModule(private val context: Context) {
     fun provideMockApiClient(
         mockWebServer: MockWebServer,
         responseDispatcher: ResponseDispatcher,
-    ): MockedServer = MockedServer(Dispatchers.IO, mockWebServer, responseDispatcher)
+    ): MockedServer = MockedServer(mockWebServer, responseDispatcher)
 }