Merge pull request #3474 from voidcontext/httproutes-and-httpapp-for-…

…HeaderEcho-middleware Implement httpRoutes and httpApp constructors for HeaderEcho middleware
http4s · Jun 10, 2020 · b417133 · b417133
2 parents 959a327 + 86b70d3
commit b417133
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 10 deletions.
diff --git a/server/src/main/scala/org/http4s/server/middleware/HeaderEcho.scala b/server/src/main/scala/org/http4s/server/middleware/HeaderEcho.scala
@@ -27,4 +27,12 @@ object HeaderEcho {
 
       http(req).map(_.putHeaders(headersToEcho.toList: _*))
     }
+
+  def httpRoutes[F[_]: Functor](echoHeadersWhen: CaseInsensitiveString => Boolean)(
+      httpRoutes: HttpRoutes[F]): HttpRoutes[F] =
+    apply(echoHeadersWhen)(httpRoutes)
+
+  def httpApp[F[_]: Functor](echoHeadersWhen: CaseInsensitiveString => Boolean)(
+      httpApp: HttpApp[F]): HttpApp[F] =
+    apply(echoHeadersWhen)(httpApp)
 }
diff --git a/server/src/test/scala/org/http4s/server/middleware/HeaderEchoSpec.scala b/server/src/test/scala/org/http4s/server/middleware/HeaderEchoSpec.scala
@@ -6,7 +6,9 @@
 
 package org.http4s.server.middleware
 
+import cats.Functor
 import cats.effect.IO
+import cats.syntax.functor._
 import org.http4s._
 import org.http4s.dsl.io._
 import org.http4s.Uri.uri
@@ -20,18 +22,27 @@ class HeaderEchoSpec extends Http4sSpec {
     case GET -> Root / "request" => Ok("request response")
   }
 
+  def testSingleHeader[F[_]: Functor, G[_]](testee: Http[F, G]) = {
+    val requestMatchingSingleHeaderKey =
+      Request[G](
+        uri = uri("/request"),
+        headers = Headers.of(Header("someheaderkey", "someheadervalue"))
+      )
+
+    testee
+      .apply(requestMatchingSingleHeaderKey)
+      .map(_.headers)
+      .map { responseHeaders =>
+        responseHeaders.exists(_.value == "someheadervalue") must_== true
+        (responseHeaders.toList must have).size(3)
+      }
+  }
+
   "HeaderEcho" should {
     "echo a single header in addition to the defaults" in {
-      val requestMatchingSingleHeaderKey =
-        Request[IO](
-          uri = uri("/request"),
-          headers = Headers.of(Header("someheaderkey", "someheadervalue")))
-      val testee = HeaderEcho(_ == CaseInsensitiveString("someheaderkey"))(testService)
-      val responseHeaders =
-        testee.orNotFound(requestMatchingSingleHeaderKey).unsafeRunSync().headers
-
-      responseHeaders.exists(_.value == "someheadervalue") must_== true
-      (responseHeaders.toList must have).size(3)
+      testSingleHeader(
+        HeaderEcho(_ == CaseInsensitiveString("someheaderkey"))(testService).orNotFound)
+        .unsafeRunSync()
     }
 
     "echo multiple headers" in {
@@ -66,5 +77,17 @@ class HeaderEchoSpec extends Http4sSpec {
       responseHeaders.exists(_.value == "someunmatchedvalue") must_== false
       (responseHeaders.toList must have).size(2)
     }
+
+    "be created via the httpRoutes constructor" in {
+      testSingleHeader(
+        HeaderEcho.httpRoutes(_ == CaseInsensitiveString("someheaderkey"))(testService).orNotFound)
+        .unsafeRunSync()
+    }
+
+    "be created via the httpApps constructor" in {
+      testSingleHeader(
+        HeaderEcho.httpApp(_ == CaseInsensitiveString("someheaderkey"))(testService.orNotFound))
+        .unsafeRunSync()
+    }
   }
 }