diff options
| author | vlad <vlad@driver.xyz> | 2017-07-20 10:37:08 -0700 |
|---|---|---|
| committer | vlad <vlad@driver.xyz> | 2017-07-20 10:37:08 -0700 |
| commit | 5279d01cedb35a759347f194c0e8adb21d19e88e (patch) | |
| tree | e340bb2eaba41d917bbca8c5e42b0b76bd164e37 /src/main/scala/xyz/driver/pdsuidomain/services/QueueUploadService.scala | |
| parent | d9c3283c307105e03253c621b9b25a6308ac3b94 (diff) | |
| parent | 7f7bd651122754a3df47894b64ddb0456561bbe7 (diff) | |
| download | rest-query-5279d01cedb35a759347f194c0e8adb21d19e88e.tar.gz rest-query-5279d01cedb35a759347f194c0e8adb21d19e88e.tar.bz2 rest-query-5279d01cedb35a759347f194c0e8adb21d19e88e.zip | |
Merge remote-tracking branch 'origin/master'
# Conflicts:
# build.sbt
# src/main/scala/xyz/driver/pdsuicommon/auth/AuthenticatedRequestContext.scala
# src/main/scala/xyz/driver/pdsuicommon/domain/User.scala
# src/main/scala/xyz/driver/pdsuidomain/formats/json/user/ApiPartialUser.scala
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuidomain/services/QueueUploadService.scala')
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuidomain/services/QueueUploadService.scala | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/QueueUploadService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/QueueUploadService.scala index f201fd9..340733d 100644 --- a/src/main/scala/xyz/driver/pdsuidomain/services/QueueUploadService.scala +++ b/src/main/scala/xyz/driver/pdsuidomain/services/QueueUploadService.scala @@ -20,28 +20,28 @@ object QueueUploadService { object CreateReply { type Error = CreateReply with DomainError - case class Created(x: BridgeUploadQueue.Item) extends CreateReply + final case class Created(x: BridgeUploadQueue.Item) extends CreateReply case object AuthorizationError extends CreateReply with DomainError.AuthorizationError with DefaultAccessDeniedError - case class CommonError(userMessage: String) extends CreateReply with DomainError + final case class CommonError(userMessage: String) extends CreateReply with DomainError } sealed trait GetByIdReply object GetByIdReply { type Error = GetByIdReply with DomainError - case class Entity(x: BridgeUploadQueue.Item) extends GetByIdReply + final case class Entity(x: BridgeUploadQueue.Item) extends GetByIdReply case object AuthorizationError extends GetByIdReply with DomainError.AuthorizationError with DefaultAccessDeniedError - case object NotFoundError extends GetByIdReply with DomainError.NotFoundError with DefaultNotFoundError - case class CommonError(userMessage: String) extends GetByIdReply with DomainError + case object NotFoundError extends GetByIdReply with DomainError.NotFoundError with DefaultNotFoundError + final case class CommonError(userMessage: String) extends GetByIdReply with DomainError } sealed trait GetListReply object GetListReply { type Error = GetListReply with DomainError - case class EntityList(xs: Seq[BridgeUploadQueue.Item], totalFound: Int) extends GetListReply + final case class EntityList(xs: Seq[BridgeUploadQueue.Item], totalFound: Int) extends GetListReply case object AuthorizationError extends GetListReply with DomainError.AuthorizationError with DefaultAccessDeniedError @@ -51,10 +51,10 @@ object QueueUploadService { object ResetReply { type Error = ResetReply with DomainError - case class Updated(updated: BridgeUploadQueue.Item) extends ResetReply - case object AuthorizationError extends ResetReply with DomainError.AuthorizationError with DefaultAccessDeniedError - case object NotFoundError extends ResetReply with DefaultNotFoundError with DomainError.NotFoundError - case class CommonError(userMessage: String) extends ResetReply with DomainError + final case class Updated(updated: BridgeUploadQueue.Item) extends ResetReply + case object AuthorizationError extends ResetReply with DomainError.AuthorizationError with DefaultAccessDeniedError + case object NotFoundError extends ResetReply with DefaultNotFoundError with DomainError.NotFoundError + final case class CommonError(userMessage: String) extends ResetReply with DomainError } } |