diff --git a/src/commonMain/kotlin/spp.protocol/utils/ArtifactNameUtils.kt b/src/commonMain/kotlin/spp.protocol/utils/ArtifactNameUtils.kt index 3636bc1e..6ec49357 100644 --- a/src/commonMain/kotlin/spp.protocol/utils/ArtifactNameUtils.kt +++ b/src/commonMain/kotlin/spp.protocol/utils/ArtifactNameUtils.kt @@ -51,11 +51,13 @@ object ArtifactNameUtils { } fun getShortFunctionSignature(qualifiedName: String): String { - return getFunctionSignature(qualifiedName).replace("\\B\\w+(\\.)".toRegex(), "$1") + return getFunctionSignature(qualifiedName.substringBefore("#")) + .replace("\\B\\w+(\\.)".toRegex(), "$1") } fun getFunctionSignature(qualifiedName: String): String { - val withoutClassName = qualifiedName.replace(getQualifiedClassName(qualifiedName)!!, "") + val withoutClassName = qualifiedName.substringBefore("#") + .replace(getQualifiedClassName(qualifiedName.substringBefore("#"))!!, "") return withoutClassName.substring( withoutClassName.substring(0, withoutClassName.indexOf("(")).lastIndexOf("?") + 2 ) diff --git a/src/jvmMain/kotlin/spp/protocol/service/live/LiveViewService.kt b/src/jvmMain/kotlin/spp/protocol/service/live/LiveViewService.kt index fa588db8..10a46a3f 100644 --- a/src/jvmMain/kotlin/spp/protocol/service/live/LiveViewService.kt +++ b/src/jvmMain/kotlin/spp/protocol/service/live/LiveViewService.kt @@ -1,10 +1,10 @@ package spp.protocol.service.live -import spp.protocol.view.LiveViewSubscription import io.vertx.codegen.annotations.ProxyGen import io.vertx.codegen.annotations.VertxGen import io.vertx.core.AsyncResult import io.vertx.core.Handler +import spp.protocol.view.LiveViewSubscription /** * todo: description. @@ -17,5 +17,6 @@ import io.vertx.core.Handler interface LiveViewService { fun addLiveViewSubscription(subscription: LiveViewSubscription, handler: Handler>) fun removeLiveViewSubscription(subscriptionId: String, handler: Handler>) + fun getLiveViewSubscriptions(handler: Handler>>) fun clearLiveViewSubscriptions(handler: Handler>>) }