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

1 files changed, 0 insertions, 28 deletions

diff --git a/src/main/scala/xyz/driver/pdsuidomain/services/KeywordService.scala b/src/main/scala/xyz/driver/pdsuidomain/services/KeywordService.scala
deleted file mode 100644
index 8824c41..0000000
--- a/src/main/scala/xyz/driver/pdsuidomain/services/KeywordService.scala
+++ /dev/null
@@ -1,28 +0,0 @@
-package xyz.driver.pdsuidomain.services
-
-import xyz.driver.pdsuicommon.auth.AuthenticatedRequestContext
-import xyz.driver.pdsuicommon.db.Sorting
-import xyz.driver.pdsuicommon.error.DomainError
-import xyz.driver.pdsuidomain.entities.KeywordWithLabels
-
-import scala.concurrent.Future
-
-object KeywordService {
-
-  sealed trait GetListReply
-  object GetListReply {
-    case class EntityList(xs: Seq[KeywordWithLabels], totalFound: Int) extends GetListReply
-
-    case object AuthorizationError extends GetListReply with DomainError.AuthorizationError {
-      def userMessage: String = "Access denied"
-    }
-  }
-}
-
-trait KeywordService {
-
-  import KeywordService._
-
-  def getAll(sorting: Option[Sorting] = None)(
-          implicit requestContext: AuthenticatedRequestContext): Future[GetListReply]
-}