diff options
| author | Jakob Odersky <jakob@driver.xyz> | 2017-07-05 19:06:56 -0700 |
|---|---|---|
| committer | Jakob Odersky <jakob@driver.xyz> | 2017-07-05 19:07:45 -0700 |
| commit | 6fa693851222057d459d23330474ea83a3fb73f1 (patch) | |
| tree | a5c6fc9991f198dd557a90f505696663492bfa44 | |
| parent | e41050b75308aab2736eea11b67bf9387a90dfe5 (diff) | |
| download | driver-core-6fa693851222057d459d23330474ea83a3fb73f1.tar.gz driver-core-6fa693851222057d459d23330474ea83a3fb73f1.tar.bz2 driver-core-6fa693851222057d459d23330474ea83a3fb73f1.zip | |
Use an abstract materializer in RestService
This avoids exposing implementation details to services.
(Suggesting this now as the ongoing PDSUI refactor will create a lot
of new RestService children.)
| -rw-r--r-- | src/main/scala/xyz/driver/core/rest.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/scala/xyz/driver/core/rest.scala b/src/main/scala/xyz/driver/core/rest.scala index f076748..7a734ae 100644 --- a/src/main/scala/xyz/driver/core/rest.scala +++ b/src/main/scala/xyz/driver/core/rest.scala @@ -11,7 +11,7 @@ import akka.http.scaladsl.model.headers.{HttpChallenges, RawHeader, `User-Agent` import akka.http.scaladsl.server.AuthenticationFailedRejection.CredentialsRejected import akka.http.scaladsl.settings.{ClientConnectionSettings, ConnectionPoolSettings} import akka.http.scaladsl.unmarshalling.{Unmarshal, Unmarshaller} -import akka.stream.ActorMaterializer +import akka.stream.{ActorMaterializer, Materializer} import akka.stream.scaladsl.Flow import akka.util.ByteString import com.github.swagger.akka.model._ @@ -321,7 +321,7 @@ package rest { import spray.json._ protected implicit val exec: ExecutionContext - protected implicit val materializer: ActorMaterializer + protected implicit val materializer: Materializer implicit class ResponseEntityFoldable(entity: Unmarshal[ResponseEntity]) { def fold[T](default: => T)(implicit um: Unmarshaller[ResponseEntity, T]): Future[T] = |