airframe-http: #1355 Add Http.clientFor(serverAddress) (#1436)

xerial · web-flow · commit 79d761bceace · 2021-01-15T14:37:45.000-08:00
diff --git a/airframe-http/.jvm/src/test/scala/wvlet/airframe/http/client/URLConnectionClientTest.scala b/airframe-http/.jvm/src/test/scala/wvlet/airframe/http/client/URLConnectionClientTest.scala
@@ -12,6 +12,7 @@
  * limitations under the License.
  */
 package wvlet.airframe.http.client
+
 import wvlet.airframe.Design
 import wvlet.airframe.codec.MessageCodec
 import wvlet.airframe.control.Retry.MaxRetryException
@@ -23,15 +24,22 @@ import wvlet.airspec.AirSpec
 /**
   */
 object URLConnectionClientTest extends AirSpec {
-  override protected def design: Design =
+
+  // Use a public REST test server
+  private val PUBLIC_REST_SERVICE = "https://httpbin.org/"
+
+  override protected def design: Design = {
     Design.newDesign
-      .bind[SyncClient].toInstance(
+      .bind[SyncClient]
+      .toInstance(
         Http.client
           .withRetryContext(_.withMaxRetry(1))
-          .newSyncClient("https://httpbin.org/") // Using a public REST test server
+          .newSyncClient(PUBLIC_REST_SERVICE)
       )
+  }
 
   case class Person(id: Int, name: String)
+
   val p     = Person(1, "leo")
   val pJson = MessageCodec.of[Person].toJson(p)
 
@@ -45,6 +53,13 @@ object URLConnectionClientTest extends AirSpec {
     m("json") shouldBe Map("id" -> 1, "name" -> "leo")
   }
 
+  test("create a new sync client") {
+    val m = Http
+      .clientFor(PUBLIC_REST_SERVICE)
+      .getOps[Person, Map[String, Any]]("/get", p)
+    m("args") shouldBe Map("id" -> "1", "name" -> "leo")
+  }
+
   test("sync client") { client: SyncClient =>
     test("Read content with 200") {
       val resp = client.sendSafe(Http.GET("/get"))
@@ -54,7 +69,8 @@ object URLConnectionClientTest extends AirSpec {
     }
 
     test("user-agent") {
-      val resp = client.get[Map[String, String]]("/user-agent", _.withUserAgent("airframe-http"))
+      val resp =
+        client.get[Map[String, String]]("/user-agent", _.withUserAgent("airframe-http"))
       resp.get("user-agent") shouldBe Some("airframe-http")
     }
 
diff --git a/airframe-http/src/main/scala/wvlet/airframe/http/Http.scala b/airframe-http/src/main/scala/wvlet/airframe/http/Http.scala
@@ -29,10 +29,17 @@ object Http {
     */
   def client: HttpClientConfig = HttpClientConfig()
 
+  /**
+    * Create the default HTTP sync client for the target server address
+    */
+  def clientFor(serverAddress: String): SyncClient =
+    client.newSyncClient(serverAddress)
+
   /**
     * Create a new request
     */
-  def request(method: String, uri: String) = HttpMessage.Request.empty.withMethod(method).withUri(uri)
+  def request(method: String, uri: String) =
+    HttpMessage.Request.empty.withMethod(method).withUri(uri)
 
   /**
     * Create a new request
@@ -101,7 +108,9 @@ object Http {
     macro HttpMacros.newServerExceptionWithCodecFactory[A]
 
   private[http] def parseAcceptHeader(value: Option[String]): Seq[String] = {
-    value.map(_.split(",").map(_.trim).filter(_.nonEmpty).toSeq).getOrElse(Seq.empty)
+    value
+      .map(_.split(",").map(_.trim).filter(_.nonEmpty).toSeq)
+      .getOrElse(Seq.empty)
   }
 }
 
@@ -121,8 +130,10 @@ trait HttpRequest[Req] {
   def contentType: Option[String]  = adapter.contentTypeOf(toRaw)
   def contentBytes: Array[Byte]    = adapter.contentBytesOf(toRaw)
   def contentString: String        = adapter.contentStringOf(toRaw)
-  def accept: Seq[String]          = Http.parseAcceptHeader(header.get(HttpHeader.Accept))
-  def acceptsMsgPack: Boolean      = accept.contains(HttpHeader.MediaType.ApplicationMsgPack)
+  def accept: Seq[String] =
+    Http.parseAcceptHeader(header.get(HttpHeader.Accept))
+  def acceptsMsgPack: Boolean =
+    accept.contains(HttpHeader.MediaType.ApplicationMsgPack)
 }
 
 /**
@@ -166,8 +177,9 @@ trait HttpRequestAdapter[Req] {
   def queryOf(request: Req): HttpMultiMap
   def headerOf(request: Req): HttpMultiMap
   def messageOf(request: Req): HttpMessage.Message
-  def contentStringOf(request: Req): String     = messageOf(request).toContentString
-  def contentBytesOf(request: Req): Array[Byte] = messageOf(request).toContentBytes
+  def contentStringOf(request: Req): String = messageOf(request).toContentString
+  def contentBytesOf(request: Req): Array[Byte] =
+    messageOf(request).toContentBytes
   def contentTypeOf(request: Req): Option[String]
   def pathComponentsOf(request: Req): IndexedSeq[String] = {
     pathOf(request).replaceFirst("/", "").split("/").toIndexedSeq
