diff options
author | Zach Smith <zach@driver.xyz> | 2017-10-17 14:42:39 -0700 |
---|---|---|
committer | Zach Smith <zach@driver.xyz> | 2017-10-17 14:42:39 -0700 |
commit | 1aaaf7a5ecf2cd28350fff872e334f9f6186966a (patch) | |
tree | bb66e54c3f7ff26af279df255452566df057223b /src/main | |
parent | f1f4183bb7e40347e15347de87e06c1e1d854827 (diff) | |
download | driver-core-1aaaf7a5ecf2cd28350fff872e334f9f6186966a.tar.gz driver-core-1aaaf7a5ecf2cd28350fff872e334f9f6186966a.tar.bz2 driver-core-1aaaf7a5ecf2cd28350fff872e334f9f6186966a.zip |
Rename files containing multiple classes to lowercase
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/scala/xyz/driver/core/app/Module.scala | 54 | ||||
-rw-r--r-- | src/main/scala/xyz/driver/core/app/module.scala | 50 | ||||
-rw-r--r-- | src/main/scala/xyz/driver/core/rest/ServiceDiscovery.scala | 26 | ||||
-rw-r--r-- | src/main/scala/xyz/driver/core/rest/serviceDiscovery.scala | 24 | ||||
-rw-r--r-- | src/main/scala/xyz/driver/core/rest/serviceRequestContext.scala (renamed from src/main/scala/xyz/driver/core/rest/ServiceRequestContext.scala) | 0 |
5 files changed, 74 insertions, 80 deletions
diff --git a/src/main/scala/xyz/driver/core/app/Module.scala b/src/main/scala/xyz/driver/core/app/Module.scala deleted file mode 100644 index 3aea876..0000000 --- a/src/main/scala/xyz/driver/core/app/Module.scala +++ /dev/null @@ -1,54 +0,0 @@ -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.ServiceDiscovery -import xyz.driver.core.rest.ServiceDiscovery.{NoServiceDiscovery, SavingUsedServiceDiscovery} - -import scala.reflect.runtime.universe._ - -trait Module { - val name: String - def route: Route - def routeTypes: Seq[Type] - - val serviceDiscovery: ServiceDiscovery with SavingUsedServiceDiscovery = new NoServiceDiscovery() - - def activate(): Unit = {} - def deactivate(): Unit = {} -} - -object Module { - - class EmptyModule extends Module { - override val name: String = "Nothing" - - override def route: Route = complete(StatusCodes.OK) - - override def routeTypes: Seq[Type] = Seq.empty[Type] - } - - class SimpleModule(override val name: String, override val route: Route, routeType: Type) extends Module { - def routeTypes: Seq[Type] = Seq(routeType) - } - - /** - * Module implementation which may be used to composed a few - * - * @param name more general name of the composite module, - * must be provided as there is no good way to automatically - * generalize the name from the composed modules' names - * @param modules modules to compose into a single one - */ - class CompositeModule(override val name: String, modules: Seq[Module]) extends Module with RouteConcatenation { - - override def route: Route = RouteConcatenation.concat(modules.map(_.route): _*) - - override def routeTypes: Seq[Type] = modules.flatMap(_.routeTypes) - - override def activate(): Unit = modules.foreach(_.activate()) - - override def deactivate(): Unit = modules.reverse.foreach(_.deactivate()) - } -} diff --git a/src/main/scala/xyz/driver/core/app/module.scala b/src/main/scala/xyz/driver/core/app/module.scala new file mode 100644 index 0000000..c6f979f --- /dev/null +++ b/src/main/scala/xyz/driver/core/app/module.scala @@ -0,0 +1,50 @@ +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 scala.reflect.runtime.universe._ + +trait Module { + val name: String + def route: Route + def routeTypes: Seq[Type] + + val serviceDiscovery: ServiceDiscovery with SavingUsedServiceDiscovery = new NoServiceDiscovery() + + def activate(): Unit = {} + def deactivate(): Unit = {} +} + +class EmptyModule extends Module { + override val name: String = "Nothing" + + override def route: Route = complete(StatusCodes.OK) + + override def routeTypes: Seq[Type] = Seq.empty[Type] +} + +class SimpleModule(override val name: String, override val route: Route, routeType: Type) extends Module { + def routeTypes: Seq[Type] = Seq(routeType) +} + +/** + * Module implementation which may be used to composed a few + * + * @param name more general name of the composite module, + * must be provided as there is no good way to automatically + * generalize the name from the composed modules' names + * @param modules modules to compose into a single one + */ +class CompositeModule(override val name: String, modules: Seq[Module]) extends Module with RouteConcatenation { + + override def route: Route = RouteConcatenation.concat(modules.map(_.route): _*) + + override def routeTypes: Seq[Type] = modules.flatMap(_.routeTypes) + + override def activate(): Unit = modules.foreach(_.activate()) + + override def deactivate(): Unit = modules.reverse.foreach(_.deactivate()) +} diff --git a/src/main/scala/xyz/driver/core/rest/ServiceDiscovery.scala b/src/main/scala/xyz/driver/core/rest/ServiceDiscovery.scala deleted file mode 100644 index 5f589a9..0000000 --- a/src/main/scala/xyz/driver/core/rest/ServiceDiscovery.scala +++ /dev/null @@ -1,26 +0,0 @@ -package xyz.driver.core.rest - -import xyz.driver.core.Name - -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/serviceDiscovery.scala b/src/main/scala/xyz/driver/core/rest/serviceDiscovery.scala new file mode 100644 index 0000000..55f1a2e --- /dev/null +++ b/src/main/scala/xyz/driver/core/rest/serviceDiscovery.scala @@ -0,0 +1,24 @@ +package xyz.driver.core.rest + +import xyz.driver.core.Name + +trait ServiceDiscovery { + + def discover[T <: Service](serviceName: Name[Service]): T +} + +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/ServiceRequestContext.scala b/src/main/scala/xyz/driver/core/rest/serviceRequestContext.scala index 4020d57..4020d57 100644 --- a/src/main/scala/xyz/driver/core/rest/ServiceRequestContext.scala +++ b/src/main/scala/xyz/driver/core/rest/serviceRequestContext.scala |