diff --git a/krossbow-websocket-spring/api/krossbow-websocket-spring.api b/krossbow-websocket-spring/api/krossbow-websocket-spring.api index 0f01030d8..6114b2f99 100644 --- a/krossbow-websocket-spring/api/krossbow-websocket-spring.api +++ b/krossbow-websocket-spring/api/krossbow-websocket-spring.api @@ -1,21 +1,3 @@ -public final class org/hildan/krossbow/websocket/spring/SpringDefaultWebSocketClient : org/hildan/krossbow/websocket/spring/SpringWebSocketClientAdapter { - public static final field INSTANCE Lorg/hildan/krossbow/websocket/spring/SpringDefaultWebSocketClient; -} - -public final class org/hildan/krossbow/websocket/spring/SpringJettyWebSocketClient : org/hildan/krossbow/websocket/spring/SpringWebSocketClientAdapter { - public static final field INSTANCE Lorg/hildan/krossbow/websocket/spring/SpringJettyWebSocketClient; -} - -public final class org/hildan/krossbow/websocket/spring/SpringSockJSWebSocketClient : org/hildan/krossbow/websocket/spring/SpringWebSocketClientAdapter { - public static final field INSTANCE Lorg/hildan/krossbow/websocket/spring/SpringSockJSWebSocketClient; -} - -public class org/hildan/krossbow/websocket/spring/SpringWebSocketClientAdapter : org/hildan/krossbow/websocket/WebSocketClient { - public fun (Lorg/springframework/web/socket/client/WebSocketClient;)V - public fun connect (Ljava/lang/String;Ljava/util/Map;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; - public synthetic fun connect (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object; -} - public final class org/hildan/krossbow/websocket/spring/SpringWebSocketClientKt { public static final fun asKrossbowWebSocketClient (Lorg/springframework/web/socket/client/WebSocketClient;)Lorg/hildan/krossbow/websocket/WebSocketClient; } diff --git a/krossbow-websocket-spring/src/main/kotlin/org/hildan/krossbow/websocket/spring/SpringWebSocketClient.kt b/krossbow-websocket-spring/src/main/kotlin/org/hildan/krossbow/websocket/spring/SpringWebSocketClient.kt index 224608611..cd3f86649 100644 --- a/krossbow-websocket-spring/src/main/kotlin/org/hildan/krossbow/websocket/spring/SpringWebSocketClient.kt +++ b/krossbow-websocket-spring/src/main/kotlin/org/hildan/krossbow/websocket/spring/SpringWebSocketClient.kt @@ -20,14 +20,9 @@ import org.springframework.web.socket.client.WebSocketClient as SpringWebSocketC * Adapts this Spring [WebSocketClient][SpringWebSocketClient] to the Krossbow * [WebSocketClient][KrossbowWebSocketClient] interface. */ -@Suppress("DEPRECATION") fun SpringWebSocketClient.asKrossbowWebSocketClient(): KrossbowWebSocketClient = SpringWebSocketClientAdapter(this) -@Deprecated( - message = "This class is internal and will become invisible in future versions, " + - "prefer the adapter extension asKrossbowWebSocketClient().", -) -open class SpringWebSocketClientAdapter(private val client: SpringWebSocketClient) : KrossbowWebSocketClient { +private class SpringWebSocketClientAdapter(private val client: SpringWebSocketClient) : KrossbowWebSocketClient { override suspend fun connect(url: String, headers: Map): WebSocketConnectionWithPingPong { try {