diff options
| author | vlad <vlad@driver.xyz> | 2017-07-21 16:07:12 -0700 |
|---|---|---|
| committer | vlad <vlad@driver.xyz> | 2017-07-21 16:07:12 -0700 |
| commit | 4339c1bb3ca2d51bc7b3e9881d8376d4cf3d4b22 (patch) | |
| tree | c88dab0278acd003d069b8530a99c70fc364868d /src/main/scala/xyz/driver/pdsuidomain/services/rest/RestStudyDesignService.scala | |
| parent | 4c9d4f0679f7b1f4ab179c8d3208cf207c81635a (diff) | |
| parent | 525ef428d950a6c9ddb58247101aeb1cb1f42d80 (diff) | |
| download | rest-query-4339c1bb3ca2d51bc7b3e9881d8376d4cf3d4b22.tar.gz rest-query-4339c1bb3ca2d51bc7b3e9881d8376d4cf3d4b22.tar.bz2 rest-query-4339c1bb3ca2d51bc7b3e9881d8376d4cf3d4b22.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/services/rest/RestStudyDesignService.scala')
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/services/rest/RestStudyDesignService.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestStudyDesignService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestStudyDesignService.scala index 4fba287..98b397d 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestStudyDesignService.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/services/rest/RestStudyDesignService.scala @@ -3,7 +3,7 @@ package xyz.driver.pdsuidomain.services.rest import scala.concurrent.{ExecutionContext, Future} import akka.http.scaladsl.model._ -import akka.stream.ActorMaterializer +import akka.stream.Materializer import xyz.driver.core.rest._ import xyz.driver.pdsuicommon.auth._ import xyz.driver.pdsuicommon.db._ @@ -12,7 +12,7 @@ import xyz.driver.pdsuidomain.formats.json.studydesign.ApiStudyDesign import xyz.driver.pdsuidomain.services.StudyDesignService class RestStudyDesignService(transport: ServiceTransport, baseUri: Uri)( - implicit protected val materializer: ActorMaterializer, + implicit protected val materializer: Materializer, protected val exec: ExecutionContext) extends StudyDesignService with RestHelper { |