-

kostaskougios · Dec 12, 2023 · 6ea30c0 · 6ea30c0
1 parent 83314f0
commit 6ea30c0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/build.sbt b/build.sbt
@@ -49,6 +49,7 @@ val EmbeddedKafka      = "io.github.embeddedkafka"          %% "embedded-kafka"
 
 val HelidonVersion        = "4.0.1"
 val HelidonCommonBuffers  = "io.helidon.common"    % "helidon-common-buffers"  % HelidonVersion
+val HelidonWebSocket      = "io.helidon.websocket" % "helidon-websocket"       % HelidonVersion
 val HelidonServerHttp2    = "io.helidon.webserver" % "helidon-webserver-http2" % HelidonVersion
 val HelidonWebClientHttp2 = "io.helidon.webclient" % "helidon-webclient-http2" % HelidonVersion
 
@@ -180,7 +181,7 @@ lazy val `helidon-client` = project
 lazy val `helidon-ws-client-server-common` = project
   .settings(
     commonSettings,
-    libraryDependencies ++= Seq(ScalaTest, HelidonCommonBuffers)
+    libraryDependencies ++= Seq(ScalaTest, HelidonWebSocket)
   )
   .dependsOn(`functions-common`, fibers)
 

diff --git a/...lidon-ws-end-to-end/src/test/scala/endtoend/tests/helidon/ws/EndToEndHelidonWsSuite.scala b/...lidon-ws-end-to-end/src/test/scala/endtoend/tests/helidon/ws/EndToEndHelidonWsSuite.scala
@@ -5,8 +5,8 @@ import endtoend.tests.helidon.model.Return1
 import endtoend.tests.helidon.{TestsHelidonFunctions, TestsHelidonFunctionsCallerFactory, TestsHelidonFunctionsReceiverFactory}
 import functions.fibers.FiberExecutor
 import functions.helidon.transport.HelidonWsTransport
-import functions.helidon.transport.exceptions.RemoteFunctionFailedException
 import functions.helidon.ws.ServerWsListener
+import functions.helidon.ws.transport.exceptions.RemoteFunctionFailedException
 import functions.model.Serializer
 import functions.model.Serializer.{Avro, Json}
 import io.helidon.webclient.websocket.WsClient

diff --git a/.../helidon/transport/ClientWsListener.scala → ...lidon/ws/transport/ClientWsListener.scala b/.../helidon/transport/ClientWsListener.scala → ...lidon/ws/transport/ClientWsListener.scala
@@ -1,10 +1,10 @@
-package functions.helidon.transport
+package functions.helidon.ws.transport
 
 import functions.fibers.FiberExecutor
-import functions.helidon.transport.ClientWsListener.PoisonPill
-import functions.helidon.transport.exceptions.RemoteFunctionFailedException
+import ClientWsListener.PoisonPill
 import functions.helidon.ws.InOutMessageProtocol
 import functions.helidon.ws.model.RfWsResponse
+import functions.helidon.ws.transport.exceptions.RemoteFunctionFailedException
 import functions.model.Coordinates4
 import io.helidon.common.buffers.BufferData
 import io.helidon.websocket.{WsListener, WsSession}

diff --git a/...tions/RemoteFunctionFailedException.scala → ...tions/RemoteFunctionFailedException.scala b/...tions/RemoteFunctionFailedException.scala → ...tions/RemoteFunctionFailedException.scala
@@ -1,3 +1,3 @@
-package functions.helidon.transport.exceptions
+package functions.helidon.ws.transport.exceptions
 
 class RemoteFunctionFailedException(remoteStacktrace: String) extends RuntimeException(s"Remote function failed with this exception: $remoteStacktrace")
diff --git a/helidon-ws-client/src/main/scala/functions/helidon/transport/HelidonWsTransport.scala b/helidon-ws-client/src/main/scala/functions/helidon/transport/HelidonWsTransport.scala
@@ -2,11 +2,11 @@ package functions.helidon.transport
 
 import functions.fibers.FiberExecutor
 import functions.helidon.ws.InOutMessageProtocol
+import functions.helidon.ws.transport.ClientWsListener
 import functions.model.TransportInput
 import io.helidon.websocket.WsListener
 
 import java.util.concurrent.atomic.AtomicLong
-import scala.util.Random
 import scala.util.Using.Releasable
 
 class HelidonWsTransport(fiberExecutor: FiberExecutor, sendResponseTimeoutInMillis: Long):