raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

=htc cleanup imports

Browse source
This commit is contained in:
Johannes Rudolph 2016-01-04 10:40:12 +01:00
parent 1ac9b4eafb
commit e017792e4e
7 changed files with 7 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-http-core/src/main/scala/akka/http/impl/engine/ws/FrameEventRenderer.scala
View file

@ -5,7 +5,7 @@
package akka.http.impl.engine.ws
import akka.util.ByteString
import akka.stream.stage.{ TerminationDirective, StatefulStage, SyncDirective, Context }
import akka.stream.stage.{ StatefulStage, SyncDirective, Context }
import scala.annotation.tailrec

2
akka-http-core/src/main/scala/akka/http/impl/engine/ws/FrameHandler.scala
View file

@ -5,7 +5,7 @@
package akka.http.impl.engine.ws
import akka.stream.scaladsl.Flow
import akka.stream.stage.{ TerminationDirective, SyncDirective, Context, StatefulStage }
import akka.stream.stage.{ SyncDirective, Context, StatefulStage }
import akka.util.ByteString
import Protocol.Opcode

3
akka-http-core/src/main/scala/akka/http/impl/engine/ws/UpgradeToWebsocketLowLevel.scala
View file

@ -5,8 +5,7 @@
package akka.http.impl.engine.ws
import akka.http.scaladsl.model.HttpResponse
import akka.http.scaladsl.model.ws.{ Message, UpgradeToWebsocket }
import akka.stream.Materializer
import akka.http.scaladsl.model.ws.UpgradeToWebsocket
import akka.stream.scaladsl.Flow
/**

1
akka-http-core/src/main/scala/akka/http/impl/engine/ws/UpgradeToWebsocketsResponseHeader.scala
View file

@ -6,7 +6,6 @@ package akka.http.impl.engine.ws
import akka.http.scaladsl.model.headers.CustomHeader
import akka.http.scaladsl.model.ws.Message
import akka.stream.Materializer
import akka.stream.scaladsl.Flow
private[http] final case class UpgradeToWebsocketResponseHeader(handler: Either[Flow[FrameEvent, FrameEvent, Any], Flow[Message, Message, Any]])

1
akka-http-core/src/main/scala/akka/http/impl/engine/ws/Utf8Decoder.scala
View file

@ -6,7 +6,6 @@ package akka.http.impl.engine.ws
import akka.util.ByteString
import scala.annotation.tailrec
import scala.util.Try
/**

2
akka-http-core/src/main/scala/akka/http/impl/engine/ws/Utf8Encoder.scala
View file

@ -7,8 +7,6 @@ package akka.http.impl.engine.ws
import akka.stream.stage._
import akka.util.{ ByteStringBuilder, ByteString }
import scala.annotation.tailrec
/**
* A utf16 (= Java char) to utf8 encoder.
*

11
akka-http-core/src/main/scala/akka/http/impl/engine/ws/Websocket.scala
View file

@ -6,13 +6,11 @@ package akka.http.impl.engine.ws
import java.util.Random
import akka.event.LoggingAdapter
import akka.stream.impl.fusing.GraphInterpreter
import akka.util.ByteString
import scala.concurrent.duration._
import akka.stream._
import akka.stream.scaladsl._
import akka.stream.stage._
import akka.http.impl.util._
import akka.http.scaladsl.model.ws._
import akka.stream.impl.fusing.SubSource
@ -37,9 +35,9 @@ private[http] object Websocket {
/** The lowest layer that implements the binary protocol */
def framing: BidiFlow[ByteString, FrameEvent, FrameEvent, ByteString, Unit] =
BidiFlow.fromFlowsMat(
BidiFlow.fromFlows(
Flow[ByteString].via(FrameEventParser),
Flow[FrameEvent].transform(() ⇒ new FrameEventRenderer))(Keep.none)
Flow[FrameEvent].transform(() ⇒ new FrameEventRenderer))
.named("ws-framing")
/** The layer that handles masking using the rules defined in the specification */
@ -54,9 +52,9 @@ private[http] object Websocket {
def frameHandling(serverSide: Boolean = true,
closeTimeout: FiniteDuration,
log: LoggingAdapter): BidiFlow[FrameEventOrError, FrameHandler.Output, FrameOutHandler.Input, FrameStart, Unit] =
BidiFlow.fromFlowsMat(
BidiFlow.fromFlows(
FrameHandler.create(server = serverSide),
FrameOutHandler.create(serverSide, closeTimeout, log))(Keep.none)
FrameOutHandler.create(serverSide, closeTimeout, log))
.named("ws-frame-handling")
/**
@ -132,7 +130,6 @@ private[http] object Websocket {
val merge = b.add(BypassMerge)
val messagePreparation = b.add(prepareMessages)
val messageRendering = b.add(renderMessages.via(LiftCompletions))
// val messageRendering = b.add(renderMessages.transform(() ⇒ new LiftCompletions))
// user handler
split.out1 ~> messagePreparation