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

!str #15851 Rename FlowMaterializer and settings

Browse source 
* FlowMaterializer is now the actor independent interface
* ActorFlowMaterializer is the actor based interface
* MaterializerSettings renamed to ActorFlowMaterializerSettings
* impl.ActorBasedFlowMaterializer renamed to impl.ActorFlowMaterializerImpl
* Optimizations included in ActorFlowMaterializerSettings
* Note that http is using FlowMaterializer in api, but I suspect that it
  will currently only run with a ActorFlowMaterializer
This commit is contained in:
Patrik Nordwall 2015-01-27 18:29:20 +01:00
parent 5b72928439
commit cd9d503b03
146 changed files with 601 additions and 595 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,6 +11,7 @@ import scala.concurrent.duration._
import scala.util.DynamicVariable
import scala.reflect.ClassTag
import akka.actor.ActorSystem
import akka.stream.ActorFlowMaterializer
import akka.stream.FlowMaterializer
import akka.http.client.RequestBuilding
import akka.http.util.FastFuture
@ -41,7 +42,7 @@ trait RouteTest extends RequestBuilding with RouteTestResultComponent with Marsh
}
implicit val system = createActorSystem()
implicit def executor = system.dispatcher
implicit val materializer = FlowMaterializer()
implicit val materializer = ActorFlowMaterializer()
def cleanUp(): Unit = system.shutdown()
@ -141,4 +142,4 @@ trait RouteTest extends RequestBuilding with RouteTestResultComponent with Marsh
}
}
//FIXME: trait Specs2RouteTest extends RouteTest with Specs2Interface
//FIXME: trait Specs2RouteTest extends RouteTest with Specs2Interface