From ce45a6b8239a729a64a65704ad24caa6e3d33f50 Mon Sep 17 00:00:00 2001
From: Sergey Nastich <sergey@driver.xyz>
Date: Fri, 21 Sep 2018 16:29:37 -0400
Subject: Unconsolidate `rest` package to help IntelliJ understand where
 sources belong

---
 .../main/scala/xyz/driver/core/rest/domain.scala   | 57 ++++++++++++++++++++++
 .../main/scala/xyz/driver/core/rest/package.scala  | 56 +--------------------
 2 files changed, 59 insertions(+), 54 deletions(-)
 create mode 100644 core-rest/src/main/scala/xyz/driver/core/rest/domain.scala

diff --git a/core-rest/src/main/scala/xyz/driver/core/rest/domain.scala b/core-rest/src/main/scala/xyz/driver/core/rest/domain.scala
new file mode 100644
index 0000000..7926991
--- /dev/null
+++ b/core-rest/src/main/scala/xyz/driver/core/rest/domain.scala
@@ -0,0 +1,57 @@
+package xyz.driver.core.rest
+
+import akka.http.scaladsl.model.{HttpRequest, HttpResponse, ResponseEntity}
+import akka.http.scaladsl.unmarshalling.Unmarshal
+import akka.stream.Materializer
+
+import scala.concurrent.Future
+
+trait Service
+
+object 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)(
+      implicit mat: Materializer): Future[Unmarshal[ResponseEntity]]
+}
+
+sealed trait SortingOrder
+object SortingOrder {
+  case object Asc  extends SortingOrder
+  case object Desc extends SortingOrder
+}
+
+final case class SortingField(name: String, sortingOrder: SortingOrder)
+final case class Sorting(sortingFields: Seq[SortingField])
+
+final case class Pagination(pageSize: Int, pageNumber: Int) {
+  require(pageSize > 0, "Page size must be greater than zero")
+  require(pageNumber > 0, "Page number must be greater than zero")
+
+  def offset: Int = pageSize * (pageNumber - 1)
+}
+
+final case class ListResponse[+T](items: Seq[T], meta: ListResponse.Meta)
+
+object ListResponse {
+
+  def apply[T](items: Seq[T], size: Int, pagination: Option[Pagination]): ListResponse[T] =
+    ListResponse(
+      items = items,
+      meta = ListResponse.Meta(size, pagination.fold(1)(_.pageNumber), pagination.fold(size)(_.pageSize)))
+
+  final case class Meta(itemsCount: Int, pageNumber: Int, pageSize: Int)
+
+  object Meta {
+    def apply(itemsCount: Int, pagination: Pagination): Meta =
+      Meta(itemsCount, pagination.pageNumber, pagination.pageSize)
+  }
+
+}
diff --git a/core-rest/src/main/scala/xyz/driver/core/rest/package.scala b/core-rest/src/main/scala/xyz/driver/core/rest/package.scala
index 34a4a9d..4620585 100644
--- a/core-rest/src/main/scala/xyz/driver/core/rest/package.scala
+++ b/core-rest/src/main/scala/xyz/driver/core/rest/package.scala
@@ -1,4 +1,4 @@
-package xyz.driver.core.rest
+package xyz.driver.core
 
 import java.net.InetAddress
 
@@ -7,8 +7,6 @@ import akka.http.scaladsl.model._
 import akka.http.scaladsl.model.headers._
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.server._
-import akka.http.scaladsl.unmarshalling.Unmarshal
-import akka.stream.Materializer
 import akka.stream.scaladsl.Flow
 import akka.util.ByteString
 import scalaz.Scalaz.{intInstance, stringInstance}
@@ -22,57 +20,7 @@ import xyz.driver.tracing.TracingDirectives
 import scala.concurrent.{ExecutionContext, Future}
 import scala.util.Try
 
-trait Service
-
-object 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)(
-      implicit mat: Materializer): Future[Unmarshal[ResponseEntity]]
-}
-
-sealed trait SortingOrder
-object SortingOrder {
-  case object Asc  extends SortingOrder
-  case object Desc extends SortingOrder
-}
-
-final case class SortingField(name: String, sortingOrder: SortingOrder)
-final case class Sorting(sortingFields: Seq[SortingField])
-
-final case class Pagination(pageSize: Int, pageNumber: Int) {
-  require(pageSize > 0, "Page size must be greater than zero")
-  require(pageNumber > 0, "Page number must be greater than zero")
-
-  def offset: Int = pageSize * (pageNumber - 1)
-}
-
-final case class ListResponse[+T](items: Seq[T], meta: ListResponse.Meta)
-
-object ListResponse {
-
-  def apply[T](items: Seq[T], size: Int, pagination: Option[Pagination]): ListResponse[T] =
-    ListResponse(
-      items = items,
-      meta = ListResponse.Meta(size, pagination.fold(1)(_.pageNumber), pagination.fold(size)(_.pageSize)))
-
-  final case class Meta(itemsCount: Int, pageNumber: Int, pageSize: Int)
-
-  object Meta {
-    def apply(itemsCount: Int, pagination: Pagination): Meta =
-      Meta(itemsCount, pagination.pageNumber, pagination.pageSize)
-  }
-
-}
-
-object `package` {
+package object rest {
 
   implicit class FutureExtensions[T](future: Future[T]) {
     def passThroughExternalServiceException(implicit executionContext: ExecutionContext): Future[T] =
-- 
cgit v1.2.3