remove suffix '.local' from local hostname if exists.

support endpoint of type consumer

Author: shaykeren

ide-common/src/main/java/org/digma/intellij/plugin/common/CommonUtils.java

@@ -1,5 +1,6 @@
 package org.digma.intellij.plugin.common;
 
+import org.apache.commons.lang.StringUtils;
 import org.ocpsoft.prettytime.PrettyTime;
 
 import java.net.InetAddress;
@@ -19,6 +20,7 @@ public static String getLocalHostname() {
         } catch (UnknownHostException e) {
             hostname = hostnameByEnvVar();
         }
+        hostname = StringUtils.removeEnd(hostname, ".local");
         return hostname;
     }
 

model/src/main/kotlin/org/digma/intellij/plugin/model/rest/insights/EndpointSchema.kt

@@ -5,18 +5,22 @@ class EndpointSchema {
     companion object {
         const val HTTP_SCHEMA: String = "epHTTP:"
         const val RPC_SCHEMA: String = "epRPC:"
+        const val CONSUMER_SCHEMA: String = "epConsumer:"
 
         // strips the scheme and returns the rest of the of name
         @JvmStatic
-        fun getShortRouteName(fullRouteName: String): String {
+        fun getShortRouteName(fullRouteName: String): Pair<String, String> {
             if (fullRouteName.startsWith(HTTP_SCHEMA)) {
-                return fullRouteName.replace(HTTP_SCHEMA, "");
+                return Pair(fullRouteName.replace(HTTP_SCHEMA, ""), HTTP_SCHEMA);
             }
             if (fullRouteName.startsWith(RPC_SCHEMA)) {
-                return fullRouteName.replace(RPC_SCHEMA, "");
+                return Pair(fullRouteName.replace(RPC_SCHEMA, ""), RPC_SCHEMA);
+            }
+            if (fullRouteName.startsWith(CONSUMER_SCHEMA)) {
+                return Pair(fullRouteName.replace(CONSUMER_SCHEMA, ""), CONSUMER_SCHEMA);
             }
             // did not manage to find relevant Scheme, so returning value as is
-            return fullRouteName;
+            return Pair(fullRouteName, "");
         }
 
         @JvmStatic
@@ -28,6 +32,9 @@ class EndpointSchema {
             if (origValue.startsWith(RPC_SCHEMA)) {
                 return;
             }
+            if (origValue.startsWith(CONSUMER_SCHEMA)) {
+                return;
+            }
             // default behaviour, to be backward compatible, where did not have the scheme part of the route, so adding it as HTTP one
             endpointInsight.route = HTTP_SCHEMA + origValue;
         }

model/src/test/kotlin/org/digma/intellij/plugin/model/rest/insights/EndpointSchemaTest.kt

@@ -9,17 +9,17 @@ internal class EndpointSchemaTest {
 
     @Test
     fun getShortRouteNameShouldWorkForHttpSchema() {
-        assertEquals("get /hello", getShortRouteName("epHTTP:get /hello"))
+        assertEquals("get /hello", getShortRouteName("epHTTP:get /hello").first)
     }
 
     @Test
     fun getShortRouteNameShouldWorkForRpcSchema() {
-        assertEquals("hello.world", getShortRouteName("epRPC:hello.world"))
+        assertEquals("hello.world", getShortRouteName("epRPC:hello.world").first)
     }
 
     @Test
     fun getShortRouteNameShouldWorkEvenWhenNonRecognizedSchema() {
-        assertEquals("whats.up.dude", getShortRouteName("whats.up.dude"))
+        assertEquals("whats.up.dude", getShortRouteName("whats.up.dude").first)
     }
 
     @Test

src/main/kotlin/org/digma/intellij/plugin/ui/list/insights/InsightsListCellRenderer.kt

@@ -5,6 +5,9 @@ import com.intellij.ui.dsl.builder.RightGap
 import com.intellij.ui.dsl.builder.panel
 import com.intellij.ui.dsl.gridLayout.HorizontalAlign
 import org.digma.intellij.plugin.model.rest.insights.*
+import org.digma.intellij.plugin.model.rest.insights.EndpointSchema.Companion.CONSUMER_SCHEMA
+import org.digma.intellij.plugin.model.rest.insights.EndpointSchema.Companion.HTTP_SCHEMA
+import org.digma.intellij.plugin.model.rest.insights.EndpointSchema.Companion.RPC_SCHEMA
 import org.digma.intellij.plugin.ui.common.*
 import org.digma.intellij.plugin.ui.list.AbstractPanelListCellRenderer
 import org.digma.intellij.plugin.ui.list.PanelsLayoutHelper
@@ -78,8 +81,8 @@ class InsightsListCellRenderer : AbstractPanelListCellRenderer() {
     }
 
     private fun httpEndpointGroupTitle(value: InsightsList.GroupTitleModel): JPanel {
-        val labelText = headerAsHtml(value)
-        return groupTitlePanel("REST: ", labelText, Laf.Icons.Insight.INTERFACE)
+        val header = headerAsHtml(value)
+        return groupTitlePanel(header.first, header.second, Laf.Icons.Insight.INTERFACE)
     }
 
 
@@ -98,15 +101,21 @@ class InsightsListCellRenderer : AbstractPanelListCellRenderer() {
     }
 
 
+    private fun headerAsHtml(value: InsightsList.GroupTitleModel): Pair<String,String> {
+        val routeInfo = EndpointSchema.getShortRouteName(value.groupId)
+        val endpoint = routeInfo.first
+        return when (routeInfo.second) {
+            HTTP_SCHEMA -> {
+                val split = endpoint.split(' ')
+                Pair("REST: ",asHtml("${spanBold("HTTP")} ${span("${split[0].uppercase()} ${split[1]}")}"))
+            }
+            RPC_SCHEMA -> Pair("RPC: ",asHtml(span(endpoint)))
+            CONSUMER_SCHEMA ->{
+                val split = endpoint.split(' ')
+                Pair("CONSUMER: ",asHtml(span("${split[0].uppercase()} ${split[1]}")))
+            }
+            else -> Pair("REST: ",asHtml(endpoint))
+        }
 
-
-
-    private fun headerAsHtml(value: InsightsList.GroupTitleModel): String {
-        val shortRouteName = EndpointSchema.getShortRouteName(value.groupId)
-        // groupId contains "[get|post] [uri]"
-        val split = shortRouteName.split(' ')
-        val httpMethod = split[0].uppercase()
-        val httpRoute = split[1]
-        return asHtml("${spanBold("HTTP")} ${span("$httpMethod $httpRoute")}")
     }
 }