review: fixes & improves

Author: EmogurovAnton

plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/data/model/DebugStage.kt

@@ -17,22 +17,7 @@ public data class DebugStage(
     }
 
     override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as DebugStage
-
-        if (name != other.name) return false
-        if (hosts != other.hosts) return false
-        if (isDefault != other.isDefault) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = name.hashCode()
-        result = 31 * result + hosts.hashCode()
-        result = 31 * result + isDefault.hashCode()
-        return result
+        val otherServer = other as DebugStage
+        return this.hosts.size == otherServer.hosts.size && this.hosts == otherServer.hosts
     }
 }

plugins/plugin-servers/src/main/kotlin/com/redmadrobot/debug/plugin/servers/interceptor/DebugStageInterceptor.kt

@@ -30,25 +30,28 @@ public class DebugStageInterceptor(private val hostName: String) : Interceptor {
     }
 
     override fun intercept(chain: Interceptor.Chain): Response {
-        var request = chain.request()
-        return if (DebugPanel.isInitialized) {
-            val debugStage = stageRepository.getSelectedStage()
-            val modifiedRequest = debugStage?.let { stage ->
-                val host = stage.hosts[hostName]
-                if (host != null) {
-                    val newUrl = request.getNewUrl(host)
-                    request = request.newBuilder()
-                        .url(newUrl)
-                        .build()
-                }
-
-                requestModifier?.invoke(request, stage)
-            } ?: request
-
-            chain.proceed(modifiedRequest)
-        } else {
-            chain.proceed(request)
+        val originalRequest = chain.request()
+
+        if (!DebugPanel.isInitialized) {
+            return chain.proceed(originalRequest)
+        }
+
+        val debugStage = stageRepository.getSelectedStage()
+        val host = debugStage?.hosts?.get(hostName)
+        var currentRequest = originalRequest
+
+        if (host != null) {
+            val newUrl = originalRequest.getNewUrl(host)
+            if (newUrl != originalRequest.url) {
+                currentRequest = originalRequest.newBuilder().url(newUrl).build()
+            }
         }
+
+        val modifiedRequest = debugStage?.let { stage ->
+            requestModifier?.invoke(currentRequest, stage)
+        }
+
+        return chain.proceed(modifiedRequest ?: currentRequest)
     }
 
 

sample/src/debug/kotlin/com/redmadrobot/debug_sample/debug_data/DebugServersProvider.kt

@@ -2,6 +2,7 @@ package com.redmadrobot.debug_sample.debug_data
 
 import com.redmadrobot.debug.plugin.servers.data.model.DebugServer
 import com.redmadrobot.debug.plugin.servers.data.model.DebugServerData
+import com.redmadrobot.debug.plugin.servers.data.model.DebugStage
 
 class DebugServersProvider {
 
@@ -21,6 +22,15 @@ class DebugServersProvider {
             DebugServer(
                 name = "debug 4", url = "https://testserver4.com"
             ),
+            DebugStage(
+                name = "debug stage 1",
+                hosts = mapOf(
+                    "main" to "https://testserver1main.com",
+                    "s3" to "https://testserver1s3.com",
+                    "wss" to "https://testserver1wss.com"
+                ),
+                isDefault = true
+            ),
         )
     }
 }