From 354a21d1a72867b352edbd0aa25b4980938d2749 Mon Sep 17 00:00:00 2001 From: Zach Smith Date: Mon, 16 Oct 2017 11:54:59 -0700 Subject: Consolidate files --- src/main/scala/xyz/driver/core/app/Module.scala | 3 ++- .../scala/xyz/driver/core/rest/HttpClient.scala | 9 --------- .../xyz/driver/core/rest/NoServiceDiscovery.scala | 9 --------- .../scala/xyz/driver/core/rest/Pagination.scala | 3 --- .../core/rest/SavingUsedServiceDiscovery.scala | 14 ------------- src/main/scala/xyz/driver/core/rest/Service.scala | 3 --- .../xyz/driver/core/rest/ServiceDiscovery.scala | 18 +++++++++++++++++ .../xyz/driver/core/rest/ServiceTransport.scala | 13 ------------ src/main/scala/xyz/driver/core/rest/package.scala | 23 +++++++++++++++++++--- 9 files changed, 40 insertions(+), 55 deletions(-) delete mode 100644 src/main/scala/xyz/driver/core/rest/HttpClient.scala delete mode 100644 src/main/scala/xyz/driver/core/rest/NoServiceDiscovery.scala delete mode 100644 src/main/scala/xyz/driver/core/rest/Pagination.scala delete mode 100644 src/main/scala/xyz/driver/core/rest/SavingUsedServiceDiscovery.scala delete mode 100644 src/main/scala/xyz/driver/core/rest/Service.scala delete mode 100644 src/main/scala/xyz/driver/core/rest/ServiceTransport.scala diff --git a/src/main/scala/xyz/driver/core/app/Module.scala b/src/main/scala/xyz/driver/core/app/Module.scala index 933b408..3aea876 100644 --- a/src/main/scala/xyz/driver/core/app/Module.scala +++ b/src/main/scala/xyz/driver/core/app/Module.scala @@ -3,7 +3,8 @@ package xyz.driver.core.app import akka.http.scaladsl.model.StatusCodes import akka.http.scaladsl.server.Directives.complete import akka.http.scaladsl.server.{Route, RouteConcatenation} -import xyz.driver.core.rest.{NoServiceDiscovery, SavingUsedServiceDiscovery, ServiceDiscovery} +import xyz.driver.core.rest.ServiceDiscovery +import xyz.driver.core.rest.ServiceDiscovery.{NoServiceDiscovery, SavingUsedServiceDiscovery} import scala.reflect.runtime.universe._ diff --git a/src/main/scala/xyz/driver/core/rest/HttpClient.scala b/src/main/scala/xyz/driver/core/rest/HttpClient.scala deleted file mode 100644 index 6f6fda0..0000000 --- a/src/main/scala/xyz/driver/core/rest/HttpClient.scala +++ /dev/null @@ -1,9 +0,0 @@ -package xyz.driver.core.rest - -import akka.http.scaladsl.model.{HttpRequest, HttpResponse} - -import scala.concurrent.Future - -trait HttpClient { - def makeRequest(request: HttpRequest): Future[HttpResponse] -} diff --git a/src/main/scala/xyz/driver/core/rest/NoServiceDiscovery.scala b/src/main/scala/xyz/driver/core/rest/NoServiceDiscovery.scala deleted file mode 100644 index 9d2febd..0000000 --- a/src/main/scala/xyz/driver/core/rest/NoServiceDiscovery.scala +++ /dev/null @@ -1,9 +0,0 @@ -package xyz.driver.core.rest - -import xyz.driver.core.Name - -class NoServiceDiscovery extends ServiceDiscovery with SavingUsedServiceDiscovery { - - def discover[T <: Service](serviceName: Name[Service]): T = - throw new IllegalArgumentException(s"Service with name $serviceName is unknown") -} diff --git a/src/main/scala/xyz/driver/core/rest/Pagination.scala b/src/main/scala/xyz/driver/core/rest/Pagination.scala deleted file mode 100644 index f97660f..0000000 --- a/src/main/scala/xyz/driver/core/rest/Pagination.scala +++ /dev/null @@ -1,3 +0,0 @@ -package xyz.driver.core.rest - -final case class Pagination(pageSize: Int, pageNumber: Int) diff --git a/src/main/scala/xyz/driver/core/rest/SavingUsedServiceDiscovery.scala b/src/main/scala/xyz/driver/core/rest/SavingUsedServiceDiscovery.scala deleted file mode 100644 index 8018bdf..0000000 --- a/src/main/scala/xyz/driver/core/rest/SavingUsedServiceDiscovery.scala +++ /dev/null @@ -1,14 +0,0 @@ -package xyz.driver.core.rest - -import xyz.driver.core.Name - -trait SavingUsedServiceDiscovery { - - private val usedServices = new scala.collection.mutable.HashSet[String]() - - def saveServiceUsage(serviceName: Name[Service]): Unit = usedServices.synchronized { - usedServices += serviceName.value - } - - def getUsedServices: Set[String] = usedServices.synchronized { usedServices.toSet } -} diff --git a/src/main/scala/xyz/driver/core/rest/Service.scala b/src/main/scala/xyz/driver/core/rest/Service.scala deleted file mode 100644 index 8216ab7..0000000 --- a/src/main/scala/xyz/driver/core/rest/Service.scala +++ /dev/null @@ -1,3 +0,0 @@ -package xyz.driver.core.rest - -trait Service diff --git a/src/main/scala/xyz/driver/core/rest/ServiceDiscovery.scala b/src/main/scala/xyz/driver/core/rest/ServiceDiscovery.scala index f0f3b5b..5f589a9 100644 --- a/src/main/scala/xyz/driver/core/rest/ServiceDiscovery.scala +++ b/src/main/scala/xyz/driver/core/rest/ServiceDiscovery.scala @@ -6,3 +6,21 @@ trait ServiceDiscovery { def discover[T <: Service](serviceName: Name[Service]): T } + +object ServiceDiscovery { + trait SavingUsedServiceDiscovery { + private val usedServices = new scala.collection.mutable.HashSet[String]() + + def saveServiceUsage(serviceName: Name[Service]): Unit = usedServices.synchronized { + usedServices += serviceName.value + } + + def getUsedServices: Set[String] = usedServices.synchronized { usedServices.toSet } + } + + class NoServiceDiscovery extends ServiceDiscovery with SavingUsedServiceDiscovery { + + def discover[T <: Service](serviceName: Name[Service]): T = + throw new IllegalArgumentException(s"Service with name $serviceName is unknown") + } +} diff --git a/src/main/scala/xyz/driver/core/rest/ServiceTransport.scala b/src/main/scala/xyz/driver/core/rest/ServiceTransport.scala deleted file mode 100644 index 9c0c429..0000000 --- a/src/main/scala/xyz/driver/core/rest/ServiceTransport.scala +++ /dev/null @@ -1,13 +0,0 @@ -package xyz.driver.core.rest - -import akka.http.scaladsl.model.{HttpRequest, HttpResponse, ResponseEntity} -import akka.http.scaladsl.unmarshalling.Unmarshal - -import scala.concurrent.Future - -trait ServiceTransport { - - def sendRequestGetResponse(context: ServiceRequestContext)(requestStub: HttpRequest): Future[HttpResponse] - - def sendRequest(context: ServiceRequestContext)(requestStub: HttpRequest): Future[Unmarshal[ResponseEntity]] -} diff --git a/src/main/scala/xyz/driver/core/rest/package.scala b/src/main/scala/xyz/driver/core/rest/package.scala index e6eb8d6..6019c33 100644 --- a/src/main/scala/xyz/driver/core/rest/package.scala +++ b/src/main/scala/xyz/driver/core/rest/package.scala @@ -1,16 +1,33 @@ -package xyz.driver.core +package xyz.driver.core.rest -import akka.http.scaladsl.model.HttpRequest +import akka.http.scaladsl.model.{HttpRequest, HttpResponse, ResponseEntity} import akka.http.scaladsl.server.Directives._ import akka.http.scaladsl.server._ +import akka.http.scaladsl.unmarshalling.Unmarshal import akka.stream.scaladsl.Flow import akka.util.ByteString import xyz.driver.tracing.TracingDirectives +import scala.concurrent.Future import scalaz.Scalaz.{intInstance, stringInstance} import scalaz.syntax.equal._ -package object rest { +trait Service + +trait HttpClient { + def makeRequest(request: HttpRequest): Future[HttpResponse] +} + +trait ServiceTransport { + + def sendRequestGetResponse(context: ServiceRequestContext)(requestStub: HttpRequest): Future[HttpResponse] + + def sendRequest(context: ServiceRequestContext)(requestStub: HttpRequest): Future[Unmarshal[ResponseEntity]] +} + +final case class Pagination(pageSize: Int, pageNumber: Int) + +object `package` { object ContextHeaders { val AuthenticationTokenHeader: String = "Authorization" val PermissionsTokenHeader: String = "Permissions" -- cgit v1.2.3