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

!htt #19514 Update RouterSettings to be non case class

Browse source
This commit is contained in:
Johan Andrén 2016-01-25 14:03:04 +01:00
parent 379a3a85b4
commit 61b375cec8
26 changed files with 188 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

9
akka-http/src/main/scala/akka/http/scaladsl/server/Route.scala
View file

@ -5,8 +5,7 @@
package akka.http.scaladsl.server
import akka.NotUsed
import akka.actor.ActorSystem
import akka.http.scaladsl.settings.ParserSettings
import akka.http.scaladsl.settings.{ RoutingSettings, ParserSettings }
import akka.stream.{ ActorMaterializer, Materializer }
import scala.concurrent.{ ExecutionContextExecutor, Future }
@ -24,7 +23,7 @@ object Route {
/**
* "Seals" a route by wrapping it with exception handling and rejection conversion.
*/
def seal(route: Route)(implicit routingSettings: RoutingSettingsImpl,
def seal(route: Route)(implicit routingSettings: RoutingSettings,
parserSettings: ParserSettings = null,
rejectionHandler: RejectionHandler = RejectionHandler.default,
exceptionHandler: ExceptionHandler = null): Route = {
@ -41,7 +40,7 @@ object Route {
*
* This conversion is also implicitly available through [[RouteResult.route2HandlerFlow]].
*/
def handlerFlow(route: Route)(implicit routingSettings: RoutingSettingsImpl,
def handlerFlow(route: Route)(implicit routingSettings: RoutingSettings,
parserSettings: ParserSettings,
materializer: Materializer,
routingLog: RoutingLog,
@ -53,7 +52,7 @@ object Route {
/**
* Turns a `Route` into an async handler function.
*/
def asyncHandler(route: Route)(implicit routingSettings: RoutingSettingsImpl,
def asyncHandler(route: Route)(implicit routingSettings: RoutingSettings,
parserSettings: ParserSettings,
materializer: Materializer,
routingLog: RoutingLog,