3 files changed, 24 insertions, 26 deletions
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