refactoring/remove unused

sourceplusplus · Jan 26, 2022 · cb510f8 · cb510f8
1 parent eb84d43
commit cb510f8
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 60 deletions.
diff --git a/.ext/vertx-service-discovery-4.0.3-SNAPSHOT.jar b/.ext/vertx-service-discovery-4.0.3-SNAPSHOT.jar
diff --git a/src/commonMain/kotlin/spp.protocol/artifact/method/MethodType.kt b/src/commonMain/kotlin/spp.protocol/artifact/method/MethodType.kt
diff --git a/src/jvmMain/kotlin/spp/protocol/SourceMarkerServices.kt b/src/jvmMain/kotlin/spp/protocol/SourceMarkerServices.kt
@@ -24,10 +24,6 @@ object SourceMarkerServices {
         var logCountIndicator: LogCountIndicatorService? = null
     }
 
-    object Status {
-        const val MARKER_CONNECTED = "spp.status.marker-connected"
-    }
-
     object Utilize {
         const val LIVE_SERVICE = "spp.service.live-service"
         const val LIVE_INSTRUMENT = "spp.service.live-instrument"

diff --git a/src/jvmMain/kotlin/spp/protocol/platform/PlatformAddress.kt b/src/jvmMain/kotlin/spp/protocol/platform/PlatformAddress.kt
@@ -22,7 +22,7 @@ enum class PlatformAddress(val address: String) {
     LIVE_SPAN_APPLIED("spp.platform.status.live-span-applied"),
     LIVE_SPANS("spp.platform.status.live-spans"),
 
-    //MARKER_CONNECTED("spp.status.marker-connected"),
+    MARKER_CONNECTED("spp.status.marker-connected"),
     MARKER_DISCONNECTED("spp.platform.status.marker-disconnected"),
     GENERATE_PROBE("spp.platform.generate-probe");
 }
diff --git a/src/jvmMain/kotlin/spp/protocol/platform/error/EventBusUtil.kt b/src/jvmMain/kotlin/spp/protocol/platform/error/EventBusUtil.kt
diff --git a/src/jvmMain/kotlin/spp/protocol/probe/command/LiveInstrumentCommand.kt b/src/jvmMain/kotlin/spp/protocol/probe/command/LiveInstrumentCommand.kt
@@ -10,13 +10,6 @@ data class LiveInstrumentCommand @ConstructorProperties("commandType", "context"
     var context: LiveInstrumentContext
 ) : Serializable {
 
-    data class Response(
-        var isSuccess: Boolean,
-        var fault: String? = null,
-        var timestamp: Long,
-        var context: LiveInstrumentContext
-    ) : Serializable
-
     enum class CommandType {
         ADD_LIVE_INSTRUMENT,
         REMOVE_LIVE_INSTRUMENT

diff --git a/src/jvmMain/kotlin/spp/protocol/probe/command/LiveInstrumentContext.kt b/src/jvmMain/kotlin/spp/protocol/probe/command/LiveInstrumentContext.kt
@@ -6,7 +6,6 @@ import io.vertx.core.json.Json
 import spp.protocol.instrument.LiveInstrument
 import spp.protocol.instrument.LiveSourceLocation
 import java.io.Serializable
-import java.util.stream.Collectors
 
 //todo: treat this as a regular data class
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -34,15 +33,7 @@ data class LiveInstrumentContext(
         return this
     }
 
-    fun <T> getLiveInstrumentsCast(clazz: Class<T>): List<T> {
-        return instruments.stream().map { Json.decodeValue(it, clazz) }.collect(Collectors.toList())
-    }
-
     fun addLocation(location: LiveSourceLocation) {
         locations.add(Json.encode(location))
     }
-
-    fun <T> getLocationsCast(clazz: Class<T>): List<T> {
-        return locations.stream().map { Json.decodeValue(it, clazz) }.collect(Collectors.toList())
-    }
 }
diff --git a/src/jvmMain/kotlin/spp/protocol/service/logging/LogCountIndicatorService.kt b/src/jvmMain/kotlin/spp/protocol/service/logging/LogCountIndicatorService.kt
@@ -27,6 +27,4 @@ interface LogCountIndicatorService {
         step: DurationStep,
         handler: Handler<AsyncResult<JsonObject>>
     )
-
-    fun getLogCountSummary(handler: Handler<AsyncResult<LogCountSummary>>)
 }