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

!htc,doc,htp #19508 fix casing of WebSocket (as per spec)

Browse source
This commit is contained in:
Konrad Malawski 2016-01-19 20:43:59 +01:00
parent 0dd889aa17
commit 1b47fbeac7
72 changed files with 698 additions and 501 deletions
Download patch file Download diff file Expand all files Collapse all files

14
akka-docs/rst/scala/code/docs/http/scaladsl/server/WebsocketExampleSpec.scala → akka-docs/rst/scala/code/docs/http/scaladsl/server/WebSocketExampleSpec.scala
View file

@ -8,7 +8,7 @@ import akka.http.scaladsl.model.ws.BinaryMessage
import akka.stream.scaladsl.Sink
import org.scalatest.{ Matchers, WordSpec }
class WebsocketExampleSpec extends WordSpec with Matchers {
class WebSocketExampleSpec extends WordSpec with Matchers {
"core-example" in {
pending // compile-time only test
//#websocket-example-using-core
@ -16,7 +16,7 @@ class WebsocketExampleSpec extends WordSpec with Matchers {
import akka.stream.ActorMaterializer
import akka.stream.scaladsl.{ Source, Flow }
import akka.http.scaladsl.Http
import akka.http.scaladsl.model.ws.UpgradeToWebsocket
import akka.http.scaladsl.model.ws.UpgradeToWebSocket
import akka.http.scaladsl.model.ws.{ TextMessage, Message }
import akka.http.scaladsl.model.{ HttpResponse, Uri, HttpRequest }
import akka.http.scaladsl.model.HttpMethods._
@ -27,7 +27,7 @@ class WebsocketExampleSpec extends WordSpec with Matchers {
//#websocket-handler
// The Greeter WebSocket Service expects a "name" per message and
// returns a greeting message for that name
val greeterWebsocketService =
val greeterWebSocketService =
Flow[Message]
.mapConcat {
// we match but don't actually consume the text message here,
@ -45,8 +45,8 @@ class WebsocketExampleSpec extends WordSpec with Matchers {
//#websocket-request-handling
val requestHandler: HttpRequest ⇒ HttpResponse = {
case req @ HttpRequest(GET, Uri.Path("/greeter"), _, _, _) ⇒
req.header[UpgradeToWebsocket] match {
case Some(upgrade) ⇒ upgrade.handleMessages(greeterWebsocketService)
req.header[UpgradeToWebSocket] match {
case Some(upgrade) ⇒ upgrade.handleMessages(greeterWebSocketService)
case None ⇒ HttpResponse(400, entity = "Not a valid websocket request!")
}
case _: HttpRequest ⇒ HttpResponse(404, entity = "Unknown resource!")
@ -80,7 +80,7 @@ class WebsocketExampleSpec extends WordSpec with Matchers {
// The Greeter WebSocket Service expects a "name" per message and
// returns a greeting message for that name
val greeterWebsocketService =
val greeterWebSocketService =
Flow[Message]
.collect {
case tm: TextMessage ⇒ TextMessage(Source.single("Hello ") ++ tm.textStream)
@ -91,7 +91,7 @@ class WebsocketExampleSpec extends WordSpec with Matchers {
val route =
path("greeter") {
get {
handleWebsocketMessages(greeterWebsocketService)
handleWebSocketMessages(greeterWebSocketService)
}
}
//#websocket-routing

16
akka-docs/rst/scala/code/docs/http/scaladsl/server/directives/WebsocketDirectivesExamplesSpec.scala → akka-docs/rst/scala/code/docs/http/scaladsl/server/directives/WebSocketDirectivesExamplesSpec.scala
View file

@ -15,7 +15,7 @@ import docs.http.scaladsl.server.RoutingSpec
import akka.http.scaladsl.model.ws.{ TextMessage, Message, BinaryMessage }
import akka.http.scaladsl.testkit.WSProbe
class WebsocketDirectivesExamplesSpec extends RoutingSpec {
class WebSocketDirectivesExamplesSpec extends RoutingSpec {
"greeter-service" in {
def greeter: Flow[Message, Message, Any] =
Flow[Message].mapConcat {
@ -28,18 +28,18 @@ class WebsocketDirectivesExamplesSpec extends RoutingSpec {
}
val websocketRoute =
path("greeter") {
handleWebsocketMessages(greeter)
handleWebSocketMessages(greeter)
}
// tests:
// create a testing probe representing the client-side
val wsClient = WSProbe()
// WS creates a Websocket request for testing
// WS creates a WebSocket request for testing
WS("/greeter", wsClient.flow) ~> websocketRoute ~>
check {
// check response for WS Upgrade headers
isWebsocketUpgrade shouldEqual true
isWebSocketUpgrade shouldEqual true
// manually run a WS conversation
wsClient.sendMessage("Peter")
@ -74,18 +74,18 @@ class WebsocketDirectivesExamplesSpec extends RoutingSpec {
def websocketMultipleProtocolRoute =
path("services") {
handleWebsocketMessagesForProtocol(greeterService, "greeter") ~
handleWebsocketMessagesForProtocol(echoService, "echo")
handleWebSocketMessagesForProtocol(greeterService, "greeter") ~
handleWebSocketMessagesForProtocol(echoService, "echo")
}
// tests:
val wsClient = WSProbe()
// WS creates a Websocket request for testing
// WS creates a WebSocket request for testing
WS("/services", wsClient.flow, List("other", "echo")) ~>
websocketMultipleProtocolRoute ~>
check {
expectWebsocketUpgradeWithProtocol { protocol ⇒
expectWebSocketUpgradeWithProtocol { protocol ⇒
protocol shouldEqual "echo"
wsClient.sendMessage("Peter")