Move internal methods to the internal package

softwaremill · Mar 24, 2019 · b569b34 · b569b34
1 parent 559b87b
commit b569b34
Show file tree

Hide file tree

Showing 10 changed files with 73 additions and 59 deletions.
diff --git a/client/sttp-client/src/main/scala/tapir/client/sttp/EndpointToSttpClient.scala b/client/sttp-client/src/main/scala/tapir/client/sttp/EndpointToSttpClient.scala
@@ -5,7 +5,7 @@ import java.nio.ByteBuffer
 
 import com.softwaremill.sttp.{Method => SttpMethod, _}
 import tapir.Codec.PlainCodec
-import tapir.internal.SeqToParams
+import tapir.internal._
 import tapir.typelevel.ParamsAsArgs
 import tapir._
 import tapir.model.{MultiQueryParams, Part, Method}

diff --git a/core/src/main/scala/tapir/EndpointIO.scala b/core/src/main/scala/tapir/EndpointIO.scala
@@ -20,36 +20,6 @@ sealed trait EndpointInput[I] {
                                                             paramsAsArgs: ParamsAsArgs[I]): EndpointInput[CASE_CLASS] = {
     map[CASE_CLASS](fc.tupled(c).apply)(ProductToParams(_, fc.arity).asInstanceOf[I])(paramsAsArgs)
   }
-
-  private[tapir] def asVectorOfSingleInputs: Vector[EndpointInput.Single[_]] = this match {
-    case s: EndpointInput.Single[_]   => Vector(s)
-    case m: EndpointInput.Multiple[_] => m.inputs
-    case m: EndpointIO.Multiple[_]    => m.ios
-  }
-
-  private[tapir] def traverseInputs[T](handle: PartialFunction[EndpointInput[_], Vector[T]]): Vector[T] = this match {
-    case i: EndpointInput[_] if handle.isDefinedAt(i) => handle(i)
-    case EndpointInput.Multiple(inputs)               => inputs.flatMap(_.traverseInputs(handle))
-    case EndpointIO.Multiple(inputs)                  => inputs.flatMap(_.traverseInputs(handle))
-    case EndpointInput.Mapped(wrapped, _, _, _)       => wrapped.traverseInputs(handle)
-    case EndpointIO.Mapped(wrapped, _, _, _)          => wrapped.traverseInputs(handle)
-    case a: EndpointInput.Auth[_]                     => a.input.traverseInputs(handle)
-    case _                                            => Vector.empty
-  }
-
-  private[tapir] def asVectorOfBasicInputs(includeAuth: Boolean = true): Vector[EndpointInput.Basic[_]] = traverseInputs {
-    case b: EndpointInput.Basic[_] => Vector(b)
-    case a: EndpointInput.Auth[_]  => if (includeAuth) a.input.asVectorOfBasicInputs(includeAuth) else Vector.empty
-  }
-
-  private[tapir] def auths: Vector[EndpointInput.Auth[_]] = traverseInputs {
-    case a: EndpointInput.Auth[_] => Vector(a)
-  }
-
-  private[tapir] def method: Option[Method] =
-    traverseInputs {
-      case i: EndpointInput.RequestMethod => Vector(i.m)
-    }.headOption
 }
 
 object EndpointInput {
@@ -153,31 +123,6 @@ sealed trait EndpointOutput[I] {
                                                             paramsAsArgs: ParamsAsArgs[I]): EndpointOutput[CASE_CLASS] = {
     map[CASE_CLASS](fc.tupled(c).apply)(ProductToParams(_, fc.arity).asInstanceOf[I])(paramsAsArgs)
   }
-
-  private[tapir] def asVectorOfSingleOutputs: Vector[EndpointOutput.Single[_]] = this match {
-    case s: EndpointOutput.Single[_]   => Vector(s)
-    case m: EndpointOutput.Multiple[_] => m.outputs
-    case m: EndpointIO.Multiple[_]     => m.ios
-  }
-
-  private[tapir] def traverseOutputs[T](handle: PartialFunction[EndpointOutput[_], Vector[T]]): Vector[T] = this match {
-    case o: EndpointOutput[_] if handle.isDefinedAt(o) => handle(o)
-    case EndpointOutput.Multiple(outputs)              => outputs.flatMap(_.traverseOutputs(handle))
-    case EndpointIO.Multiple(outputs)                  => outputs.flatMap(_.traverseOutputs(handle))
-    case EndpointOutput.Mapped(wrapped, _, _, _)       => wrapped.traverseOutputs(handle)
-    case EndpointIO.Mapped(wrapped, _, _, _)           => wrapped.traverseOutputs(handle)
-    case s: EndpointOutput.StatusFrom[_]               => s.output.traverseOutputs(handle)
-    case _                                             => Vector.empty
-  }
-
-  private[tapir] def asVectorOfBasicOutputs: Vector[EndpointOutput.Basic[_]] = traverseOutputs {
-    case b: EndpointOutput.Basic[_] => Vector(b)
-  }
-
-  private[tapir] def bodyType: Option[RawValueType[_]] =
-    traverseOutputs[RawValueType[_]] {
-      case b: EndpointIO.Body[_, _, _] => Vector(b.codec.meta.rawValueType)
-    }.headOption
 }
 
 object EndpointOutput {

diff --git a/core/src/main/scala/tapir/internal/package.scala b/core/src/main/scala/tapir/internal/package.scala
@@ -0,0 +1,63 @@
+package tapir
+import tapir.model.Method
+
+package object internal {
+  implicit class RichEndpointInput[I](input: EndpointInput[I]) {
+    def asVectorOfSingleInputs: Vector[EndpointInput.Single[_]] = input match {
+      case s: EndpointInput.Single[_]   => Vector(s)
+      case m: EndpointInput.Multiple[_] => m.inputs
+      case m: EndpointIO.Multiple[_]    => m.ios
+    }
+
+    def traverseInputs[T](handle: PartialFunction[EndpointInput[_], Vector[T]]): Vector[T] = input match {
+      case i: EndpointInput[_] if handle.isDefinedAt(i) => handle(i)
+      case EndpointInput.Multiple(inputs)               => inputs.flatMap(_.traverseInputs(handle))
+      case EndpointIO.Multiple(inputs)                  => inputs.flatMap(_.traverseInputs(handle))
+      case EndpointInput.Mapped(wrapped, _, _, _)       => wrapped.traverseInputs(handle)
+      case EndpointIO.Mapped(wrapped, _, _, _)          => wrapped.traverseInputs(handle)
+      case a: EndpointInput.Auth[_]                     => a.input.traverseInputs(handle)
+      case _                                            => Vector.empty
+    }
+
+    def asVectorOfBasicInputs(includeAuth: Boolean = true): Vector[EndpointInput.Basic[_]] = traverseInputs {
+      case b: EndpointInput.Basic[_] => Vector(b)
+      case a: EndpointInput.Auth[_]  => if (includeAuth) a.input.asVectorOfBasicInputs(includeAuth) else Vector.empty
+    }
+
+    def auths: Vector[EndpointInput.Auth[_]] = traverseInputs {
+      case a: EndpointInput.Auth[_] => Vector(a)
+    }
+
+    def method: Option[Method] =
+      traverseInputs {
+        case i: EndpointInput.RequestMethod => Vector(i.m)
+      }.headOption
+  }
+
+  implicit class RichEndpointOutput[I](output: EndpointOutput[I]) {
+    def asVectorOfSingleOutputs: Vector[EndpointOutput.Single[_]] = output match {
+      case s: EndpointOutput.Single[_]   => Vector(s)
+      case m: EndpointOutput.Multiple[_] => m.outputs
+      case m: EndpointIO.Multiple[_]     => m.ios
+    }
+
+    def traverseOutputs[T](handle: PartialFunction[EndpointOutput[_], Vector[T]]): Vector[T] = output match {
+      case o: EndpointOutput[_] if handle.isDefinedAt(o) => handle(o)
+      case EndpointOutput.Multiple(outputs)              => outputs.flatMap(_.traverseOutputs(handle))
+      case EndpointIO.Multiple(outputs)                  => outputs.flatMap(_.traverseOutputs(handle))
+      case EndpointOutput.Mapped(wrapped, _, _, _)       => wrapped.traverseOutputs(handle)
+      case EndpointIO.Mapped(wrapped, _, _, _)           => wrapped.traverseOutputs(handle)
+      case s: EndpointOutput.StatusFrom[_]               => s.output.traverseOutputs(handle)
+      case _                                             => Vector.empty
+    }
+
+    def asVectorOfBasicOutputs: Vector[EndpointOutput.Basic[_]] = traverseOutputs {
+      case b: EndpointOutput.Basic[_] => Vector(b)
+    }
+
+    def bodyType: Option[RawValueType[_]] =
+      traverseOutputs[RawValueType[_]] {
+        case b: EndpointIO.Body[_, _, _] => Vector(b.codec.meta.rawValueType)
+      }.headOption
+  }
+}
diff --git a/core/src/main/scala/tapir/internal/server/DecodeInputs.scala b/core/src/main/scala/tapir/internal/server/DecodeInputs.scala
@@ -2,6 +2,7 @@ package tapir.internal.server
 
 import tapir.model.{Cookie, Method, MultiQueryParams, ServerRequest}
 import tapir.{DecodeFailure, DecodeResult, EndpointIO, EndpointInput}
+import tapir.internal._
 
 import scala.annotation.tailrec
 

diff --git a/core/src/main/scala/tapir/internal/server/InputValues.scala b/core/src/main/scala/tapir/internal/server/InputValues.scala
@@ -1,5 +1,6 @@
 package tapir.internal.server
-import tapir.internal.SeqToParams
+
+import tapir.internal._
 import tapir.{EndpointIO, EndpointInput}
 
 object InputValues {

diff --git a/docs/openapi-docs/src/main/scala/tapir/docs/openapi/EndpointToOpenApiPaths.scala b/docs/openapi-docs/src/main/scala/tapir/docs/openapi/EndpointToOpenApiPaths.scala
@@ -4,6 +4,7 @@ import tapir.docs.openapi.schema.ObjectSchemas
 import tapir.model.Method
 import tapir.openapi.OpenAPI.ReferenceOr
 import tapir.openapi._
+import tapir.internal._
 import tapir._
 
 private[openapi] class EndpointToOpenApiPaths(objectSchemas: ObjectSchemas, securitySchemes: SecuritySchemes, options: OpenAPIDocsOptions) {

diff --git a/docs/openapi-docs/src/main/scala/tapir/docs/openapi/EndpointToOperationResponse.scala b/docs/openapi-docs/src/main/scala/tapir/docs/openapi/EndpointToOperationResponse.scala
@@ -1,5 +1,6 @@
 package tapir.docs.openapi
 
+import tapir.internal._
 import tapir.docs.openapi.schema.ObjectSchemas
 import tapir.openapi.OpenAPI.ReferenceOr
 import tapir.openapi._

diff --git a/docs/openapi-docs/src/main/scala/tapir/docs/openapi/SecuritySchemesForEndpoints.scala b/docs/openapi-docs/src/main/scala/tapir/docs/openapi/SecuritySchemesForEndpoints.scala
@@ -1,4 +1,6 @@
 package tapir.docs.openapi
+
+import tapir.internal._
 import tapir.openapi.SecurityScheme
 import tapir.{Endpoint, EndpointIO, EndpointInput}
 

diff --git a/server/akka-http-server/src/main/scala/tapir/server/akkahttp/OutputToAkkaResponse.scala b/server/akka-http-server/src/main/scala/tapir/server/akkahttp/OutputToAkkaResponse.scala
@@ -6,7 +6,7 @@ import akka.http.scaladsl.model.HttpHeader.ParsingResult
 import akka.http.scaladsl.model._
 import akka.stream.scaladsl.StreamConverters
 import akka.util.ByteString
-import tapir.internal.ParamsToSeq
+import tapir.internal._
 import tapir.model.Part
 import tapir.{
   ByteArrayValueType,

diff --git a/server/http4s-server/src/main/scala/tapir/server/http4s/OutputToHttp4sResponse.scala b/server/http4s-server/src/main/scala/tapir/server/http4s/OutputToHttp4sResponse.scala
@@ -8,7 +8,7 @@ import org.http4s
 import org.http4s.headers.{`Content-Disposition`, `Content-Type`}
 import org.http4s.util.CaseInsensitiveString
 import org.http4s.{Charset, EntityBody, EntityEncoder, Header, Headers, multipart}
-import tapir.internal.ParamsToSeq
+import tapir.internal._
 import tapir.model.Part
 import tapir.{
   ByteArrayValueType,