unify errors

Author: shalom938

src/main/kotlin/org/digma/intellij/plugin/ui/jcef/pluginapi/Command.kt

@@ -34,7 +34,7 @@ abstract class Command {
             val query = apiUrl.query ?: return null // get query string or return null if none
 
             val commandName = query.split("&")
-                .mapNotNull { it.split("=", limit = 2).takeIf { it.size == 2 } }
+                .mapNotNull { it -> it.split("=", limit = 2).takeIf { it.size == 2 } }
                 .firstOrNull { it[0] == CommandQueryName }
                 ?.let { URLDecoder.decode(it[1], StandardCharsets.UTF_8) }
 

src/main/kotlin/org/digma/intellij/plugin/ui/jcef/pluginapi/PluginApiHttpResponse.kt

@@ -1,5 +1,6 @@
 package org.digma.intellij.plugin.ui.jcef.pluginapi
 
+import org.digma.intellij.plugin.common.objectToJson
 import java.io.InputStream
 
 class PluginApiHttpResponse(
@@ -13,4 +14,20 @@ class PluginApiHttpResponse(
         //don't convert contentStream to string, this input stream should be read by the http layer. and it may be a large stream.
         return "PluginApiHttpResponse(status=$status, headers=$headers, contentLength=$contentLength, contentType=$contentType, contentStream=$contentStream)"
     }
+
+    companion object {
+        fun createErrorResponse(statusCode: Int, error: ErrorData): PluginApiHttpResponse {
+            val errorJson = objectToJson(error).toByteArray()
+            return PluginApiHttpResponse(
+                statusCode,
+                headers = mutableMapOf(
+                    "Content-Type" to "application/json",
+                    "Content-Length" to errorJson.size.toString()
+                ),
+                contentLength = errorJson.size.toLong(),
+                contentType = "application/json",
+                contentStream = errorJson.inputStream()
+            )
+        }
+    }
 }

src/main/kotlin/org/digma/intellij/plugin/ui/jcef/pluginapi/PluginApiResourceHandler.kt

@@ -41,13 +41,8 @@ class PluginApiResourceHandler(val project: Project) : CefResourceHandler {
                 request.identifier
             )
 
-            apiResponse = PluginApiHttpResponse(
-                500,
-                mutableMapOf(),
-                null,
-                "text/plain",
-                "encountered multi part post data. it is not supported by Digma plugin api handler.".byteInputStream()
-            )
+            val error = ErrorData("encountered multi part post data. it is not supported by Digma plugin api handler.")
+            apiResponse = PluginApiHttpResponse.createErrorResponse(500, error)
             callback.Continue()
             return true
         }
@@ -63,13 +58,8 @@ class PluginApiResourceHandler(val project: Project) : CefResourceHandler {
                 request.identifier
             )
 
-            apiResponse = PluginApiHttpResponse(
-                500,
-                mutableMapOf(),
-                null,
-                "text/plain",
-                "encountered file element in post data. it is not supported by Digma plugin api handler.".byteInputStream()
-            )
+            val error = ErrorData("encountered file element in post data. it is not supported by Digma plugin api handler.")
+            apiResponse = PluginApiHttpResponse.createErrorResponse(500, error)
             callback.Continue()
             return true
         }
@@ -115,13 +105,8 @@ class PluginApiResourceHandler(val project: Project) : CefResourceHandler {
             Log.warnWithException(logger, e, "processRequest {} failed, [request id:{}]", requestUrl, requestId)
             ErrorReporter.Companion.getInstance().reportError("ApiProxyResourceHandler.processRequest", e)
 
-            apiResponse = PluginApiHttpResponse(
-                500,
-                mutableMapOf(),
-                null,
-                "text/plain",
-                "encountered exception in proxy [$e]. please check the logs".byteInputStream()
-            )
+            val error = ErrorData("encountered exception in plugin api handler [$e]. please check the logs.")
+            apiResponse = PluginApiHttpResponse.createErrorResponse(500, error)
         } finally {
             callback.Continue()
         }

src/main/kotlin/org/digma/intellij/plugin/ui/jcef/pluginapi/RecentActivityBadgeCommand.kt

@@ -3,7 +3,6 @@ package org.digma.intellij.plugin.ui.jcef.pluginapi
 import com.fasterxml.jackson.annotation.JsonCreator
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.intellij.openapi.project.Project
-import org.digma.intellij.plugin.common.objectToJson
 import org.digma.intellij.plugin.ui.jcef.jsonToObject
 import org.digma.intellij.plugin.ui.recentactivity.RecentActivityToolWindowIconChanger
 import java.beans.ConstructorProperties
@@ -24,17 +23,7 @@ class RecentActivityBadgeCommand : Command() {
             if (badgeRequest == null) {
                 // Return 400 Bad Request, with a small error body
                 val error = ErrorData("Invalid or missing badge request")
-                val errorJson = objectToJson(error).toByteArray()
-                return PluginApiHttpResponse(
-                    status = 400,
-                    headers = mutableMapOf(
-                        "Content-Type" to "application/json",
-                        "Content-Length" to errorJson.size.toString()
-                    ),
-                    contentLength = errorJson.size.toLong(),
-                    contentType = "application/json",
-                    contentStream = errorJson.inputStream()
-                )
+                return PluginApiHttpResponse.createErrorResponse(400, error)
             }
 
             val recentActivityToolWindowIconChanger = RecentActivityToolWindowIconChanger.getInstance(project)
@@ -52,21 +41,9 @@ class RecentActivityBadgeCommand : Command() {
                 contentStream = null
             )
         } catch (e: Throwable) {
-            val errorMessage = e.message ?: e.toString()
-            val error = ErrorData(errorMessage)
-            val errorJson = objectToJson(error).toByteArray()
-            return PluginApiHttpResponse(
-                status = 500,
-                headers = mutableMapOf(
-                    "Content-Type" to "application/json",
-                    "Content-Length" to errorJson.size.toString()
-                ),
-                contentLength = errorJson.size.toLong(),
-                contentType = "application/json",
-                contentStream = errorJson.inputStream()
-            )
+            val error = ErrorData(e.message ?: e.toString())
+            return PluginApiHttpResponse.createErrorResponse(500, error)
         }
-
     }
 }