Refactor LiveView implementation and Service object structure

Author: BFergerson

insight/src/main/kotlin/spp/jetbrains/insight/contributor/FunctionDurationContributor.kt

@@ -99,11 +99,9 @@ class FunctionDurationContributor(private val remoteInsightsAvailable: Boolean)
         val vertx = UserData.vertx(guideMark.project)
         viewService.addLiveView(
             LiveView(
-                null,
                 mutableSetOf(guideMark.getUserData(EndpointDetector.DETECTED_ENDPOINTS)!!.firstNotNullOf { it.name }),
-                guideMark.artifactQualifiedName,
-                LiveSourceLocation(guideMark.artifactQualifiedName.identifier, -1, service),
-                LiveViewConfig(FUNCTION_DURATION.name, listenMetrics, 1000)
+                LiveViewConfig(FUNCTION_DURATION.name, listenMetrics, 1000),
+                service = service
             )
         ).onSuccess {
             val subscriptionId = it.subscriptionId!!

plugin/src/main/kotlin/spp/jetbrains/sourcemarker/command/status/LiveStatusBarManagerImpl.kt

@@ -43,8 +43,6 @@ import spp.jetbrains.marker.source.mark.api.component.swing.SwingSourceMarkCompo
 import spp.jetbrains.marker.source.mark.inlay.InlayMark
 import spp.jetbrains.sourcemarker.SourceMarkerPlugin
 import spp.jetbrains.sourcemarker.command.status.ui.*
-import spp.protocol.artifact.ArtifactQualifiedName
-import spp.protocol.artifact.ArtifactType
 import spp.protocol.instrument.*
 import spp.protocol.instrument.location.LiveSourceLocation
 import spp.protocol.instrument.meter.MeterType
@@ -330,14 +328,9 @@ class LiveStatusBarManagerImpl(val project: Project, val vertx: Vertx) : LiveSta
 
                 UserData.liveViewService(project)!!.addLiveView(
                     LiveView(
-                        null,
                         mutableSetOf(liveMeter.id!!),
-                        ArtifactQualifiedName(liveMeter.location.source, type = ArtifactType.EXPRESSION),
-                        liveMeter.location,
-                        LiveViewConfig(
-                            "LIVE_METER",
-                            listOf(liveMeter.id!!)
-                        )
+                        LiveViewConfig("LIVE_METER", listOf(liveMeter.id!!)),
+                        service = liveMeter.location.service
                     )
                 ).onComplete {
                     if (it.succeeded()) {

plugin/src/main/kotlin/spp/jetbrains/sourcemarker/command/status/ui/LogStatusBar.java

@@ -280,7 +280,7 @@ public void accept(@NotNull LiveViewEvent event) {
         JsonObject rawMetrics = new JsonObject(event.getMetricsData());
         Log logData = new Log(rawMetrics.getJsonObject("log"));
         LogResult logResult = new LogResult(
-            event.getArtifactQualifiedName(),
+            null,
             LogOrderType.NEWEST_LOGS,
             logData.getTimestamp(),
             Collections.singletonList(logData),

plugin/src/main/kotlin/spp/jetbrains/sourcemarker/view/window/LiveEndpointsWindow.kt

@@ -36,7 +36,6 @@ import spp.jetbrains.view.window.util.EndpointRowView
 import spp.protocol.artifact.metrics.MetricType.Companion.Endpoint_CPM
 import spp.protocol.artifact.metrics.MetricType.Companion.Endpoint_RespTime_AVG
 import spp.protocol.artifact.metrics.MetricType.Companion.Endpoint_SLA
-import spp.protocol.instrument.location.LiveSourceLocation
 import spp.protocol.platform.general.Service
 import spp.protocol.service.LiveViewService
 import spp.protocol.service.SourceServices.Subscribe.toLiveViewSubscriberAddress
@@ -109,11 +108,9 @@ class LiveEndpointsWindow(
             Endpoint_SLA.metricId
         )
         val liveView = LiveView(
-            null,
             mutableSetOf(endpoint.endpoint.name),
-            null,
-            LiveSourceLocation("", 0, service),
-            LiveViewConfig("LiveEndpointsWindow", listenMetrics, refreshInterval)
+            LiveViewConfig("LiveEndpointsWindow", listenMetrics, refreshInterval),
+            service = service
         )
         addView(EndpointRowView(project, viewService, liveView, endpoint, model) {
             consumerCreator(vertx, it, endpoint)