Renamed responses to factories.

Author: EranBoudjnah

app/src/androidTest/java/com/mitteloupe/whoami/server/AppResponseStore.kt

@@ -4,7 +4,7 @@ import com.mitteloupe.whoami.constant.IP_ADDRESS
 import com.mitteloupe.whoami.test.server.MockRequest
 import com.mitteloupe.whoami.test.server.MockRequestResponse
 import com.mitteloupe.whoami.test.server.ResponseStore
-import com.mitteloupe.whoami.test.server.response.SimpleResponse
+import com.mitteloupe.whoami.test.server.response.SimpleResponseFactory
 
 const val IPIFY_ENDPOINT = "/ipify/"
 const val IPINFO_ENDPOINT = "/ipinfo/"
@@ -16,11 +16,11 @@ class AppResponseStore : ResponseStore() {
     override val internalResponses = listOf(
         REQUEST_RESPONSE_GET_IP to MockRequestResponse(
             request = MockRequest(IPIFY_ENDPOINT),
-            response = SimpleResponse(200, "api/get_ip.json")
+            response = SimpleResponseFactory(200, "api/get_ip.json")
         ),
         REQUEST_RESPONSE_GET_IP_DETAILS to MockRequestResponse(
             request = MockRequest("${IPINFO_ENDPOINT}$IP_ADDRESS/geo"),
-            response = SimpleResponse(200, "api/get_ip_details.json")
+            response = SimpleResponseFactory(200, "api/get_ip_details.json")
         )
     )
 }

architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/MockDispatcher.kt

@@ -1,6 +1,6 @@
 package com.mitteloupe.whoami.test.server
 
-import com.mitteloupe.whoami.test.server.response.MockResponseContents
+import com.mitteloupe.whoami.test.server.response.MockResponseFactory
 import okhttp3.Headers
 import okhttp3.Response
 import okhttp3.WebSocket
@@ -15,13 +15,13 @@ class MockDispatcher :
     override val usedEndpoints: Set<String>
         field = mutableSetOf<String>()
 
-    private val responses = mutableMapOf<String, MockResponseContents>()
+    private val responses = mutableMapOf<String, MockResponseFactory>()
 
     var webSocket: WebSocket? = null
 
     override var onWebSocketMessage: (String) -> Unit = {}
 
-    override fun bindResponse(request: MockRequest, response: MockResponseContents) {
+    override fun bindResponse(request: MockRequest, response: MockResponseFactory) {
         responses[request.url] = response
     }
 

architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/MockRequestResponse.kt

@@ -1,5 +1,5 @@
 package com.mitteloupe.whoami.test.server
 
-import com.mitteloupe.whoami.test.server.response.MockResponseContents
+import com.mitteloupe.whoami.test.server.response.MockResponseFactory
 
-data class MockRequestResponse(val request: MockRequest, val response: MockResponseContents)
+data class MockRequestResponse(val request: MockRequest, val response: MockResponseFactory)

architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/ResponseBinder.kt

@@ -1,13 +1,13 @@
 package com.mitteloupe.whoami.test.server
 
-import com.mitteloupe.whoami.test.server.response.MockResponseContents
+import com.mitteloupe.whoami.test.server.response.MockResponseFactory
 
 interface ResponseBinder {
     var onWebSocketMessage: (String) -> Unit
 
     val usedEndpoints: Set<String>
 
-    fun bindResponse(request: MockRequest, response: MockResponseContents)
+    fun bindResponse(request: MockRequest, response: MockResponseFactory)
 
     fun reset()
 }

…mi/test/server/response/ErrorResponse.kt …/server/response/ErrorResponseFactory.ktarchitecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/response/ErrorResponse.kt renamed to architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/response/ErrorResponseFactory.kt architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/response/ErrorResponse.kt renamed to architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/response/ErrorResponseFactory.kt

@@ -2,8 +2,8 @@ package com.mitteloupe.whoami.test.server.response
 
 import com.mitteloupe.whoami.test.server.MockResponse
 
-sealed class ErrorResponse {
-    object NotFound : MockResponseContents {
+sealed class ErrorResponseFactory {
+    object NotFound : MockResponseFactory {
         override fun mockResponse() = MockResponse(code = 404)
     }
 }

…/server/response/MockResponseContents.kt …t/server/response/MockResponseFactory.ktarchitecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/response/MockResponseContents.kt renamed to architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/response/MockResponseFactory.kt architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/response/MockResponseContents.kt renamed to architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/response/MockResponseFactory.kt

@@ -2,6 +2,6 @@ package com.mitteloupe.whoami.test.server.response
 
 import com.mitteloupe.whoami.test.server.MockResponse
 
-interface MockResponseContents {
+interface MockResponseFactory {
     fun mockResponse(): MockResponse
 }

…test/server/response/SequenceResponse.kt …rver/response/SequenceResponseFactory.ktarchitecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/response/SequenceResponse.kt renamed to architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/response/SequenceResponseFactory.kt architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/response/SequenceResponse.kt renamed to architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/response/SequenceResponseFactory.kt

@@ -2,7 +2,8 @@ package com.mitteloupe.whoami.test.server.response
 
 import com.mitteloupe.whoami.test.server.MockResponse
 
-class SequenceResponse(private vararg val responses: MockResponseContents) : MockResponseContents {
+class SequenceResponseFactory(private vararg val responses: MockResponseFactory) :
+    MockResponseFactory {
     private var responseIndex = 0
     override fun mockResponse(): MockResponse {
         val mockResponse = responses[responseIndex]

…i/test/server/response/SimpleResponse.kt …server/response/SimpleResponseFactory.ktarchitecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/response/SimpleResponse.kt renamed to architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/response/SimpleResponseFactory.kt architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/response/SimpleResponse.kt renamed to architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/response/SimpleResponseFactory.kt

@@ -3,11 +3,11 @@ package com.mitteloupe.whoami.test.server.response
 import com.mitteloupe.whoami.test.asset.assetReader
 import com.mitteloupe.whoami.test.server.MockResponse
 
-data class SimpleResponse(
+data class SimpleResponseFactory(
     private val code: Int = 200,
     private val bodyFileName: String = "",
     private val headers: List<Pair<String, String>> = emptyList()
-) : MockResponseContents {
+) : MockResponseFactory {
     private val body by lazy {
         if (bodyFileName.isEmpty()) {
             ""