diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2019-09-15 13:20:44 +0800 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2019-09-15 13:20:44 +0800 |
| commit | 60a23d3250db88f6147adf4e74f7497f870cd2ec (patch) | |
| tree | 205578814e777c277985f44ee92b7ec9e194b7b9 /cask | |
| parent | f158811a79f702a406e3dd2b961f3b085e6c47c0 (diff) | |
| download | cask-60a23d3250db88f6147adf4e74f7497f870cd2ec.tar.gz cask-60a23d3250db88f6147adf4e74f7497f870cd2ec.tar.bz2 cask-60a23d3250db88f6147adf4e74f7497f870cd2ec.zip | |
Move `internal.BatchActor` to `util.BatchActor`
Diffstat (limited to 'cask')
| -rw-r--r-- | cask/src/cask/endpoints/WebSocketEndpoint.scala | 8 | ||||
| -rw-r--r-- | cask/src/cask/package.scala | 3 | ||||
| -rw-r--r-- | cask/src/cask/util/BatchActor.scala (renamed from cask/src/cask/internal/BatchActor.scala) | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/cask/src/cask/endpoints/WebSocketEndpoint.scala b/cask/src/cask/endpoints/WebSocketEndpoint.scala index a836321..fae7fde 100644 --- a/cask/src/cask/endpoints/WebSocketEndpoint.scala +++ b/cask/src/cask/endpoints/WebSocketEndpoint.scala @@ -2,7 +2,7 @@ package cask.endpoints import java.nio.ByteBuffer -import cask.internal.{BatchActor, Router} +import cask.internal.Router import cask.model.Request import cask.util.Logger import io.undertow.websockets.WebSocketConnectionCallback @@ -32,7 +32,7 @@ class websocket(val path: String, override val subpath: Boolean = false) def wrapPathSegment(s: String): Seq[String] = Seq(s) } -case class WsHandler(f: WsChannelActor => BatchActor[WsActor.Event]) +case class WsHandler(f: WsChannelActor => cask.util.BatchActor[WsActor.Event]) (implicit ec: ExecutionContext, log: Logger) extends WebsocketResult with WebSocketConnectionCallback { def onConnect(exchange: WebSocketHttpExchange, channel: WebSocketChannel): Unit = { @@ -71,7 +71,7 @@ extends WebsocketResult with WebSocketConnectionCallback { class WsChannelActor(channel: WebSocketChannel) (implicit ec: ExecutionContext, log: Logger) -extends BatchActor[WsActor.Event]{ +extends cask.util.BatchActor[WsActor.Event]{ def run(items: Seq[WsActor.Event]): Unit = items.foreach{ case WsActor.Text(value) => WebSockets.sendTextBlocking(value, channel) case WsActor.Binary(value) => WebSockets.sendBinaryBlocking(ByteBuffer.wrap(value), channel) @@ -83,7 +83,7 @@ extends BatchActor[WsActor.Event]{ case class WsActor(handle: PartialFunction[WsActor.Event, Unit]) (implicit ec: ExecutionContext, log: Logger) -extends BatchActor[WsActor.Event]{ +extends cask.util.BatchActor[WsActor.Event]{ def run(items: Seq[WsActor.Event]): Unit = { items.foreach(handle.applyOrElse(_, (x: WsActor.Event) => ())) } diff --git a/cask/src/cask/package.scala b/cask/src/cask/package.scala index 93c1161..d9e29ba 100644 --- a/cask/src/cask/package.scala +++ b/cask/src/cask/package.scala @@ -51,4 +51,7 @@ package object cask { // util type Logger = util.Logger val Logger = util.Logger + + type BatchActor[T] = util.BatchActor[T] + } diff --git a/cask/src/cask/internal/BatchActor.scala b/cask/src/cask/util/BatchActor.scala index 60b5f57..137b852 100644 --- a/cask/src/cask/internal/BatchActor.scala +++ b/cask/src/cask/util/BatchActor.scala @@ -1,4 +1,4 @@ -package cask.internal +package cask.util import cask.util.Logger |