Skip to content

Commit 2b2d2a0

Browse files
authored
Remove suspend keyword from getBaseUrl function #ANDROID-15254 (#23)
* remove suspend keyword from getBaseUrl function #ANDROID-15254 * fix provideMockApiClient #ANDROID-15254
1 parent 3c26f86 commit 2b2d2a0

File tree

4 files changed

+4
-13
lines changed

4 files changed

+4
-13
lines changed

app/src/main/java/com/telefonica/mocks/domain/backend/InitBackendUrl.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,14 @@ import com.telefonica.mock.MockHelper
44
import com.telefonica.mocks.BuildConfig
55
import com.telefonica.mocks.common.Environment
66
import com.telefonica.mocks.data.backend.BackendRepository
7-
import com.telefonica.mocks.di.IoDispatcher
8-
import kotlinx.coroutines.CoroutineDispatcher
9-
import kotlinx.coroutines.withContext
107
import javax.inject.Inject
118

129
open class InitBackendUrl @Inject constructor(
1310
private val mockHelper: MockHelper,
1411
private val backendRepository: BackendRepository,
15-
@IoDispatcher private val dispatcher: CoroutineDispatcher,
1612
) {
1713

18-
open suspend operator fun invoke() = withContext(dispatcher) {
14+
open operator fun invoke() {
1915
backendRepository.backendUrl = when (BuildConfig.DEFAULT_ENVIRONMENT == Environment.DEMO) {
2016
true -> mockHelper.getBaseUrl()
2117
false -> BuildConfig.DEFAULT_ENVIRONMENT.baseUrl

mock/src/main/java/com/telefonica/mock/MockHelper.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class MockHelper(context: Context) {
2727
mockApiClient.stopServer()
2828
}
2929

30-
suspend fun getBaseUrl(): String = mockApiClient.getBaseUrl()
30+
fun getBaseUrl(): String = mockApiClient.getBaseUrl()
3131

3232
fun setUp(
3333
port: Int = 0,

mock/src/main/java/com/telefonica/mock/MockedServer.kt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.telefonica.mock
22

3-
import kotlinx.coroutines.CoroutineDispatcher
4-
import kotlinx.coroutines.withContext
53
import okhttp3.mockwebserver.Dispatcher
64
import okhttp3.mockwebserver.MockResponse
75
import okhttp3.mockwebserver.MockWebServer
@@ -11,7 +9,6 @@ import okhttp3.tls.HeldCertificate
119
import javax.inject.Inject
1210

1311
open class MockedServer @Inject constructor(
14-
private val coroutineDispatcher: CoroutineDispatcher,
1512
private val mockWebServer: MockWebServer,
1613
private val responseDispatcher: ResponseDispatcher,
1714
) {
@@ -31,9 +28,7 @@ open class MockedServer @Inject constructor(
3128
mockWebServer.shutdown()
3229
}
3330

34-
suspend fun getBaseUrl(): String = withContext(coroutineDispatcher) {
35-
mockWebServer.url("/").toString()
36-
}
31+
fun getBaseUrl(): String = mockWebServer.url("/").toString()
3732

3833
internal fun enqueue(requestInfo: RequestInfo, mockedResponse: MockedResponse) {
3934
responseDispatcher.enqueue(requestInfo, mockedResponse)

mock/src/main/java/com/telefonica/mock/di/MockApiModule.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ class MockApiModule(private val context: Context) {
2727
fun provideMockApiClient(
2828
mockWebServer: MockWebServer,
2929
responseDispatcher: ResponseDispatcher,
30-
): MockedServer = MockedServer(Dispatchers.IO, mockWebServer, responseDispatcher)
30+
): MockedServer = MockedServer(mockWebServer, responseDispatcher)
3131
}

0 commit comments

Comments
 (0)