-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
d48d6dd
commit 8b61f9c
Showing
7 changed files
with
90 additions
and
91 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| sbt.version = 1.9.8 | ||
| scala.version = 2.13.2 | ||
| scala.version = 3.3.1 |
8 changes: 4 additions & 4 deletions
8
smithy4play/src/main/scala/de/innfactory/smithy4play/SmithyPlayRouter.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
smithy4play/src/main/scala/de/innfactory/smithy4play/middleware/MiddlewareBase.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
156 changes: 77 additions & 79 deletions
156
smithy4play/src/main/scala/de/innfactory/smithy4play/package.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,104 +1,102 @@ | ||
| package de.innfactory | ||
| package de.innfactory.smithy4play | ||
|
|
||
| import cats.data.{ EitherT, Kleisli } | ||
| import de.innfactory.smithy4play.client.{ SmithyPlayClientEndpointErrorResponse, SmithyPlayClientEndpointResponse } | ||
| import cats.data.{EitherT, Kleisli} | ||
| import de.innfactory.smithy4play.client.SmithyPlayClientEndpointErrorResponse | ||
| import org.slf4j | ||
| import play.api.Logger | ||
| import play.api.libs.json.{ JsValue, Json } | ||
| import play.api.mvc.{ Headers, RequestHeader } | ||
| import smithy4s.http.{ CaseInsensitive, HttpEndpoint } | ||
| import play.api.libs.json.{JsValue, Json, OFormat} | ||
| import play.api.mvc.{Headers, RequestHeader} | ||
| import smithy4s.http.{CaseInsensitive, HttpEndpoint} | ||
|
|
||
| import scala.annotation.{ compileTimeOnly, StaticAnnotation } | ||
| import scala.annotation.{StaticAnnotation, compileTimeOnly} | ||
| import scala.concurrent.Future | ||
| import scala.language.experimental.macros | ||
|
|
||
| package object smithy4play { | ||
|
|
||
| trait ContextRouteError extends StatusResult[ContextRouteError] { | ||
| def message: String | ||
| def toJson: JsValue | ||
| } | ||
| trait ContextRouteError extends StatusResult[ContextRouteError] { | ||
| def message: String | ||
| def toJson: JsValue | ||
| } | ||
|
|
||
| type ClientResponse[O] = Future[Either[SmithyPlayClientEndpointErrorResponse, SmithyPlayClientEndpointResponse[O]]] | ||
| type RunnableClientRequest[O] = Kleisli[ClientResponse, Option[Map[String, Seq[String]]], O] | ||
| type RouteResult[O] = EitherT[Future, ContextRouteError, O] | ||
| type ContextRoute[O] = Kleisli[RouteResult, RoutingContext, O] | ||
| type ClientResponse[O] = Future[ | ||
| Either[SmithyPlayClientEndpointErrorResponse, SmithyPlayClientEndpointResponse[O]] | ||
| ] | ||
| type RunnableClientRequest[O] = Kleisli[ClientResponse, Option[Map[String, Seq[String]]], O] | ||
| type RouteResult[O] = EitherT[Future, ContextRouteError, O] | ||
| type ContextRoute[O] = Kleisli[RouteResult, RoutingContext, O] | ||
|
|
||
| trait StatusResult[S <: StatusResult[S]] { | ||
| def status: Status | ||
| def addHeaders(headers: Map[String, String]): S | ||
| } | ||
| trait StatusResult[S <: StatusResult[S]] { | ||
| def status: Status | ||
| def addHeaders(headers: Map[String, String]): S | ||
| } | ||
|
|
||
| case class Status(headers: Map[String, String], statusCode: Int) | ||
| object Status { | ||
| implicit val format = Json.format[Status] | ||
| } | ||
| case class Status(headers: Map[String, String], statusCode: Int) | ||
| object Status { | ||
| implicit val format: OFormat[Status] = Json.format[Status] | ||
| } | ||
|
|
||
| case class EndpointResult(body: Option[Array[Byte]], status: Status) extends StatusResult[EndpointResult] { | ||
| override def addHeaders(headers: Map[String, String]): EndpointResult = this.copy( | ||
| status = status.copy( | ||
| headers = status.headers ++ headers | ||
| ) | ||
| case class EndpointResult(body: Option[Array[Byte]], status: Status) extends StatusResult[EndpointResult] { | ||
| override def addHeaders(headers: Map[String, String]): EndpointResult = this.copy( | ||
| status = status.copy( | ||
| headers = status.headers ++ headers | ||
| ) | ||
| } | ||
| ) | ||
| } | ||
|
|
||
| private[smithy4play] case class Smithy4PlayError( | ||
| message: String, | ||
| status: Status, | ||
| additionalInformation: Option[String] = None | ||
| ) extends ContextRouteError { | ||
| override def toJson: JsValue = Json.toJson(this)(Smithy4PlayError.format) | ||
| override def addHeaders(headers: Map[String, String]): Smithy4PlayError = this.copy( | ||
| status = status.copy( | ||
| headers = status.headers ++ headers | ||
| ) | ||
| private[smithy4play] case class Smithy4PlayError( | ||
| message: String, | ||
| status: Status, | ||
| additionalInformation: Option[String] = None | ||
| ) extends ContextRouteError { | ||
| override def toJson: JsValue = Json.toJson(this)(Smithy4PlayError.format) | ||
| override def addHeaders(headers: Map[String, String]): Smithy4PlayError = this.copy( | ||
| status = status.copy( | ||
| headers = status.headers ++ headers | ||
| ) | ||
| } | ||
|
|
||
| object Smithy4PlayError { | ||
| implicit val format = Json.format[Smithy4PlayError] | ||
| } | ||
|
|
||
| private[smithy4play] val logger: slf4j.Logger = Logger("smithy4play").logger | ||
| ) | ||
| } | ||
|
|
||
| private[smithy4play] def getHeaders(headers: Headers): Map[CaseInsensitive, Seq[String]] = | ||
| headers.headers.groupBy(_._1).map { case (k, v) => | ||
| (CaseInsensitive(k), v.map(_._2)) | ||
| } | ||
| object Smithy4PlayError { | ||
| implicit val format: OFormat[Smithy4PlayError] = Json.format[Smithy4PlayError] | ||
| } | ||
|
|
||
| private[smithy4play] def matchRequestPath( | ||
| x: RequestHeader, | ||
| ep: HttpEndpoint[_] | ||
| ): Option[Map[String, String]] = | ||
| ep.matches(x.path.replaceFirst("/", "").split("/").filter(_.nonEmpty)) | ||
| private[smithy4play] val logger: slf4j.Logger = Logger("smithy4play").logger | ||
|
|
||
| @compileTimeOnly( | ||
| "Macro failed to expand. \"Add: scalacOptions += \"-Ymacro-annotations\"\" to project settings" | ||
| ) | ||
| class AutoRouting extends StaticAnnotation { | ||
| def macroTransform(annottees: Any*): Any = macro AutoRoutingMacro.impl | ||
| private[smithy4play] def getHeaders(headers: Headers): Map[CaseInsensitive, Seq[String]] = | ||
| headers.headers.groupBy(_._1).map { case (k, v) => | ||
| (CaseInsensitive(k), v.map(_._2)) | ||
| } | ||
|
|
||
| private[smithy4play] trait Showable { | ||
| this: Product => | ||
| override def toString: String = this.show | ||
| } | ||
| private[smithy4play] def matchRequestPath( | ||
| x: RequestHeader, | ||
| ep: HttpEndpoint[_] | ||
| ): Option[Map[String, String]] = | ||
| ep.matches(x.path.replaceFirst("/", "").split("/").filter(_.nonEmpty)) | ||
|
|
||
| @compileTimeOnly( | ||
| "Macro failed to expand. \"Add: scalacOptions += \"-Ymacro-annotations\"\" to project settings" | ||
| ) | ||
| class AutoRouting extends StaticAnnotation { | ||
| def macroTransform(annottees: Any*): Any = macro AutoRoutingMacro.impl | ||
| } | ||
|
|
||
| private[smithy4play] object Showable { | ||
| implicit class ShowableProduct(product: Product) { | ||
| def show: String = { | ||
| val className = product.productPrefix | ||
| val fieldNames = product.productElementNames.toList | ||
| val fieldValues = product.productIterator.toList | ||
| val fields = fieldNames.zip(fieldValues).map { case (name, value) => | ||
| value match { | ||
| case subProduct: Product => s"$name = ${subProduct.show}" | ||
| case _ => s"$name = $value" | ||
| } | ||
| private[smithy4play] trait Showable { | ||
| this: Product => | ||
| override def toString: String = this.show | ||
| } | ||
|
|
||
| private[smithy4play] object Showable { | ||
| implicit class ShowableProduct(product: Product) { | ||
| def show: String = { | ||
| val className = product.productPrefix | ||
| val fieldNames = product.productElementNames.toList | ||
| val fieldValues = product.productIterator.toList | ||
| val fields = fieldNames.zip(fieldValues).map { case (name, value) => | ||
| value match { | ||
| case subProduct: Product => s"$name = ${subProduct.show}" | ||
| case _ => s"$name = $value" | ||
| } | ||
| fields.mkString(s"$className(", ", ", ")") | ||
| } | ||
| fields.mkString(s"$className(", ", ", ")") | ||
| } | ||
| } | ||
|
|
||
| } |