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

!htc #19514 add withXYZ methods to all configs

Browse source
This commit is contained in:
Konrad Malawski 2016-01-22 16:56:49 +01:00 • committed by Johan Andrén
parent 244c52c226
commit 379a3a85b4
71 changed files with 1225 additions and 1030 deletions
Download patch file Download diff file Expand all files Collapse all files

4
akka-http-testkit/src/main/scala/akka/http/javadsl/testkit/RouteTest.scala
View file

@ -15,7 +15,7 @@ import akka.http.javadsl.server.{ HttpApp, AllDirectives, Route, Directives }
import akka.http.impl.util.JavaMapping.Implicits._
import akka.http.impl.server.RouteImplementation
import akka.http.scaladsl.model.HttpResponse
import akka.http.scaladsl.server.{ RouteResult, RoutingSettings, Route ⇒ ScalaRoute }
import akka.http.scaladsl.server.{ RouteResult, RoutingSettingsImpl, Route ⇒ ScalaRoute }
import akka.actor.ActorSystem
import akka.event.NoLogging
import akka.http.impl.util._
@ -55,7 +55,7 @@ abstract class RouteTest extends AllDirectives {
securedConnection = defaultHostInfo.isSecuredConnection(),
defaultHostHeader = defaultHostInfo.getHost().asScala)
val result = scalaRoute(new server.RequestContextImpl(effectiveRequest, NoLogging, RoutingSettings(system)))
val result = scalaRoute(new server.RequestContextImpl(effectiveRequest, NoLogging, RoutingSettingsImpl(system)))
result.awaitResult(awaitDuration) match {
case RouteResult.Complete(response) ⇒ createTestResponse(response)

2
akka-http-testkit/src/main/scala/akka/http/scaladsl/testkit/RouteTest.scala
View file

@ -134,7 +134,7 @@ trait RouteTest extends RequestBuilding with WSTestRequestBuilding with RouteTes
}
implicit def injectIntoRoute(implicit timeout: RouteTestTimeout,
defaultHostInfo: DefaultHostInfo,
routingSettings: RoutingSettings,
routingSettings: RoutingSettingsImpl,
executionContext: ExecutionContext,
materializer: Materializer,
routingLog: RoutingLog,