fix NoWhenBranchMatchedException #ANDROID-15269 (#24)

Telefonica · Oct 7, 2024 · e79d0ac · e79d0ac
1 parent 2b2d2a0
commit e79d0ac
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/mock/src/main/java/com/telefonica/mock/ResponseDispatcher.kt b/mock/src/main/java/com/telefonica/mock/ResponseDispatcher.kt
@@ -24,7 +24,7 @@ class ResponseDispatcher @Inject constructor() {
         return when {
             responseList.isNullOrEmpty() -> MockResponse().setResponseCode(MockedServer.RESPONSE_NOT_FOUND_CODE)
             else -> {
-                val response = responseList.poll()
+                val response = responseList.poll() ?: return MockResponse().setResponseCode(MockedServer.RESPONSE_NOT_FOUND_CODE)
                 responseList.add(response)
                 when (response) {
                     is MockedApiResponse -> MockResponse()
@@ -45,4 +45,4 @@ class ResponseDispatcher @Inject constructor() {
         val mockListUpdated = (responses[requestInfo] ?: LinkedList()).apply { add(mockedResponse) }
         responses[requestInfo] = mockListUpdated
     }
-}
+}
diff --git a/mock/src/main/java/com/telefonica/mock/models.kt b/mock/src/main/java/com/telefonica/mock/models.kt
@@ -12,19 +12,19 @@ sealed class Method(val value: String) {
 }
 
 sealed class MockedResponse(
-    val httpResponseCode: Int = DEFAULT_MOCK_HTTP_RESPONSE_CODE,
-    val delayInMillis: Long = DEFAULT_MOCK_DELAY_IN_MILLIS,
+    open val httpResponseCode: Int = DEFAULT_MOCK_HTTP_RESPONSE_CODE,
+    open val delayInMillis: Long = DEFAULT_MOCK_DELAY_IN_MILLIS,
 ) {
     companion object {
         const val DEFAULT_MOCK_DELAY_IN_MILLIS = 0L
         const val DEFAULT_MOCK_HTTP_RESPONSE_CODE = 200
     }
 }
 
-class MockedApiResponse(
+data class MockedApiResponse(
     val body: String = DEFAULT_BODY,
-    httpResponseCode: Int = DEFAULT_MOCK_HTTP_RESPONSE_CODE,
-    delayInMillis: Long = DEFAULT_MOCK_DELAY_IN_MILLIS,
+    override val httpResponseCode: Int = DEFAULT_MOCK_HTTP_RESPONSE_CODE,
+    override val delayInMillis: Long = DEFAULT_MOCK_DELAY_IN_MILLIS,
 ) : MockedResponse(
     httpResponseCode,
     delayInMillis,
@@ -34,10 +34,10 @@ class MockedApiResponse(
     }
 }
 
-class MockedBufferedResponse(
+data class MockedBufferedResponse(
     val buffer: Buffer,
-    httpResponseCode: Int = DEFAULT_MOCK_HTTP_RESPONSE_CODE,
-    delayInMillis: Long = DEFAULT_MOCK_DELAY_IN_MILLIS,
+    override val httpResponseCode: Int = DEFAULT_MOCK_HTTP_RESPONSE_CODE,
+    override val delayInMillis: Long = DEFAULT_MOCK_DELAY_IN_MILLIS,
 ) : MockedResponse(
     httpResponseCode,
     delayInMillis,
@@ -48,4 +48,4 @@ internal class RequestAndResponse(val requestInfo: RequestInfo, val mockedRespon
 data class RequestInfo(val path: Path, val method: Method)
 typealias Path=String
 
-internal class RequestInfoWithPattern(val pathPattern: PatternMatcher, val method: Method)
+internal class RequestInfoWithPattern(val pathPattern: PatternMatcher, val method: Method)