Support custom reason phrase for Status (#3009) (#3116)

zio · Sep 9, 2024 · 8731a44 · 8731a44
1 parent 2def6dd
commit 8731a44
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/zio-http/jvm/src/main/scala/zio/http/netty/model/Conversions.scala b/zio-http/jvm/src/main/scala/zio/http/netty/model/Conversions.scala
@@ -109,10 +109,13 @@ private[netty] object Conversions {
   }
 
   def statusToNetty(status: Status): HttpResponseStatus =
-    HttpResponseStatus.valueOf(status.code)
+    HttpResponseStatus.valueOf(status.code, status.reasonPhrase)
 
   def statusFromNetty(status: HttpResponseStatus): Status =
-    Status.fromInt(status.code)
+    Status.fromInt(status.code) match {
+      case Status.Custom(code, _) => Status.Custom(code, status.reasonPhrase)
+      case status                 => status
+    }
 
   def schemeToNetty(scheme: Scheme): Option[HttpScheme] = scheme match {
     case Scheme.HTTP  => Option(HttpScheme.HTTP)

diff --git a/zio-http/shared/src/main/scala/zio/http/Status.scala b/zio-http/shared/src/main/scala/zio/http/Status.scala
@@ -35,6 +35,9 @@ sealed trait Status extends Product with Serializable { self =>
    */
   val code: Int
 
+  val reasonPhrase: String =
+    self.productPrefix.flatMap { c => if (c.isUpper) s" $c" else s"$c" }.drop(1)
+
   lazy val text: String = code.toString
 
   /**
@@ -53,7 +56,7 @@ object Status {
   sealed trait Informational extends Status // 100 – 199
   sealed trait Success       extends Status // 200 – 299
   sealed trait Redirection   extends Status // 300 – 399
-  sealed trait Error         extends Status // 400 – 499
+  sealed trait Error         extends Status // 400 – 599
   sealed trait ClientError   extends Error  // 400 – 499
   sealed trait ServerError   extends Error  // 500 – 599
 
@@ -169,7 +172,7 @@ object Status {
 
   case object NetworkAuthenticationRequired extends ServerError { override val code: Int = 511 }
 
-  final case class Custom(override val code: Int) extends Status
+  final case class Custom(override val code: Int, override val reasonPhrase: String = "") extends Status
 
   def fromString(code: String): Option[Status] =
     Try(code.toInt).toOption.map(fromInt)
@@ -232,7 +235,7 @@ object Status {
       case 507 => Status.InsufficientStorage
       case 510 => Status.NotExtended
       case 511 => Status.NetworkAuthenticationRequired
-      case _   => Status.Custom(code)
+      case _   => Status.Custom(code, "")
     }
   }
 }
diff --git a/zio-http/shared/src/main/scala/zio/http/codec/StatusCodecs.scala b/zio-http/shared/src/main/scala/zio/http/codec/StatusCodecs.scala
@@ -84,5 +84,8 @@ private[codec] trait StatusCodecs {
   val NotExtended: StatusCodec[Unit]                   = status(Status.NotExtended)
   val NetworkAuthenticationRequired: StatusCodec[Unit] =
     status(Status.NetworkAuthenticationRequired)
-  def CustomStatus(code: Int): StatusCodec[Unit]       = status(Status.Custom(code))
+  def CustomStatus(code: Int): StatusCodec[Unit]       = status(Status.Custom(code, ""))
+
+  def CustomStatus(code: Int, reasonPhrase: String): StatusCodec[Unit] =
+    status(Status.Custom(code, reasonPhrase))
 }