From 34fd432a627f71fc1b98a5b3186f120dd63cf3f8 Mon Sep 17 00:00:00 2001 From: Jakob Odersky Date: Fri, 21 Jul 2017 13:20:39 -0700 Subject: Abstract materializer --- .../scala/xyz/driver/pdsuidomain/services/rest/RestArmService.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/scala/xyz/driver/pdsuidomain/services/rest/RestArmService.scala') diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestArmService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestArmService.scala index 0a29c08..fe4fa4d 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestArmService.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestArmService.scala @@ -4,7 +4,7 @@ import scala.concurrent.{ExecutionContext, Future} import akka.http.scaladsl.marshalling.Marshal import akka.http.scaladsl.model._ -import akka.stream.ActorMaterializer +import akka.stream.Materializer import xyz.driver.core.rest.{Pagination => _, _} import xyz.driver.pdsuicommon.auth._ import xyz.driver.pdsuicommon.db._ @@ -14,7 +14,7 @@ import xyz.driver.pdsuidomain.formats.json.ListResponse import xyz.driver.pdsuidomain.formats.json.arm.ApiArm import xyz.driver.pdsuidomain.services.ArmService -class RestArmService(transport: ServiceTransport, baseUri: Uri)(implicit protected val materializer: ActorMaterializer, +class RestArmService(transport: ServiceTransport, baseUri: Uri)(implicit protected val materializer: Materializer, protected val exec: ExecutionContext) extends ArmService with RestHelper { -- cgit v1.2.3