diff --git a/.ext/vertx-service-discovery-4.0.3-SNAPSHOT.jar b/.ext/vertx-service-discovery-4.0.3-SNAPSHOT.jar deleted file mode 100644 index 451d90e8..00000000 Binary files a/.ext/vertx-service-discovery-4.0.3-SNAPSHOT.jar and /dev/null differ diff --git a/src/commonMain/kotlin/spp.protocol/artifact/method/MethodType.kt b/src/commonMain/kotlin/spp.protocol/artifact/method/MethodType.kt deleted file mode 100644 index d5790652..00000000 --- a/src/commonMain/kotlin/spp.protocol/artifact/method/MethodType.kt +++ /dev/null @@ -1,11 +0,0 @@ -package spp.protocol.artifact.method - -/** - * Represents the runtime types methods can express. - * - * @since 0.1.0 - * @author [Brandon Fergerson](mailto:bfergerson@apache.org) - */ -enum class MethodType { - ENDPOINT -} diff --git a/src/jvmMain/kotlin/spp/protocol/SourceMarkerServices.kt b/src/jvmMain/kotlin/spp/protocol/SourceMarkerServices.kt index 808c41d8..8a66ece8 100644 --- 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 index c7722b70..f34d8bc3 100644 --- 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 deleted file mode 100644 index 621af526..00000000 --- a/src/jvmMain/kotlin/spp/protocol/platform/error/EventBusUtil.kt +++ /dev/null @@ -1,26 +0,0 @@ -package spp.protocol.platform.error - -import spp.protocol.service.error.LiveInstrumentException - -object EventBusUtil { - - fun fromEventBusException(exception: String): Exception { - return if (exception.startsWith("EventBusException")) { - var exceptionType = exception.substringAfter("EventBusException:") - exceptionType = exceptionType.substringBefore("[") - var exceptionParams = exception.substringAfter("[") - exceptionParams = exceptionParams.substringBefore("]") - val exceptionMessage = exception.substringAfter("]: ").trim { it <= ' ' } - if (LiveInstrumentException::class.java.simpleName == exceptionType) { - LiveInstrumentException( - LiveInstrumentException.ErrorType.valueOf(exceptionParams), - exceptionMessage - ).toEventBusException() - } else { - throw UnsupportedOperationException(exceptionType) - } - } else { - throw IllegalArgumentException(exception) - } - } -} diff --git a/src/jvmMain/kotlin/spp/protocol/probe/command/LiveInstrumentCommand.kt b/src/jvmMain/kotlin/spp/protocol/probe/command/LiveInstrumentCommand.kt index 49ca8e84..9390876c 100644 --- 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 index 55b1dca4..6c3a4aa3 100644 --- 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 getLiveInstrumentsCast(clazz: Class): List { - return instruments.stream().map { Json.decodeValue(it, clazz) }.collect(Collectors.toList()) - } - fun addLocation(location: LiveSourceLocation) { locations.add(Json.encode(location)) } - - fun getLocationsCast(clazz: Class): List { - 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 index 3f3b0291..1d28e9bd 100644 --- 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> ) - - fun getLogCountSummary(handler: Handler>) }