Rewrite OAuthAPI with Transort

Author: shunjikonishi

src/main/scala/codecheck/github/api/OAuthAPI.scala

@@ -1,9 +1,5 @@
 package codecheck.github.api
 
-import com.ning.http.client.AsyncHttpClient
-import com.ning.http.client.AsyncCompletionHandler
-import com.ning.http.client.Response
-import com.ning.http.client.RequestBuilder
 import java.net.URLEncoder
 import scala.concurrent.Promise
 import scala.concurrent.Future
@@ -12,8 +8,9 @@ import org.json4s.DefaultFormats
 import java.util.UUID
 import codecheck.github.models.AccessToken
 import codecheck.github.exceptions.OAuthAPIException
+import codecheck.github.transport._
 
-class OAuthAPI(clientId: String, clientSecret: String, redirectUri: String, client: AsyncHttpClient) {
+class OAuthAPI(clientId: String, clientSecret: String, redirectUri: String, client: Transport) {
   private implicit val format = DefaultFormats
 
   private val accessRequestUri = "https://github.com/login/oauth/authorize"
@@ -38,33 +35,31 @@ class OAuthAPI(clientId: String, clientSecret: String, redirectUri: String, clie
       "code" -> code,
       "redirect_uri" -> redirectUri
     )
-    val builder: RequestBuilder = new RequestBuilder("POST")
+    val request = client.preparePost(tokenRequestUri)
       .setHeader("Content-Type", "application/x-www-form-urlencoded")
       .setHeader("Accept", "application/json")
-      .setFollowRedirects(true)
-      .setUrl(tokenRequestUri)
-    params.foreach { case (k, v) => builder.addFormParam(k, v) }
+      .setFollowRedirect(true)
+    params.foreach { case (k, v) => request.addFormParam(k, v) }
 
     val deferred = Promise[AccessToken]()
-    client.prepareRequest(builder.build).execute(new AsyncCompletionHandler[Response]() {
+    request.execute(new CompletionHandler() {
       def onCompleted(res: Response) = {
-        val json = JsonMethods.parse(res.getResponseBody("utf-8"))
+        val body = res.getResponseBody.getOrElse("{\"error\": \"No response\"}")
+        val json = JsonMethods.parse(body)
         (json \ "error").toOption match {
           case Some(_) => deferred.failure(new OAuthAPIException(json))
           case None => deferred.success(AccessToken(json))
         }
-        res
       }
-      override def onThrowable(t: Throwable) {
+      def onThrowable(t: Throwable) {
         deferred.failure(t)
-        super.onThrowable(t)
       }
     })
     deferred.future
   }
 }
 
 object OAuthAPI {
-  def apply(clientId: String, clientSecret: String, redirectUri: String)(implicit client: AsyncHttpClient) = new OAuthAPI(clientId, clientSecret, redirectUri, client)
+  def apply(clientId: String, clientSecret: String, redirectUri: String)(implicit client: Transport) = new OAuthAPI(clientId, clientSecret, redirectUri, client)
 
 }

src/main/scala/codecheck/github/transport/Request.scala

@@ -3,6 +3,8 @@ package codecheck.github.transport
 trait Request {
   def setBody(body: String): Request
   def setHeader(name: String, value: String): Request
+  def setFollowRedirect(b: Boolean): Request
+  def addFormParam(name: String, value: String): Request
 
   def execute(handler: CompletionHandler): Unit
 }

src/main/scala/codecheck/github/transport/asynchttp19/AsyncHttp19Transport.scala

@@ -27,6 +27,16 @@ class AsyncHttp19Request(request: AsyncHttpClient#BoundRequestBuilder) extends R
     this
   }
 
+  def setFollowRedirect(b: Boolean): Request = {
+    request.setFollowRedirects(b)
+    this
+  }
+
+  def addFormParam(name: String, value: String): Request = {
+    request.addFormParam(name, value)
+    this
+  }
+
   def execute(handler: CompletionHandler): Unit = {
     request.execute(new AsyncCompletionHandler[AsyncHttpResponse]() {
       def onCompleted(res: AsyncHttpResponse) = {

src/main/scala/codecheck/github/transport/asynchttp20/AsyncHttp20Transport.scala

@@ -27,6 +27,16 @@ class AsyncHttp20Request(request: BoundRequestBuilder) extends Request {
     this
   }
 
+  def setFollowRedirect(b: Boolean): Request = {
+    request.setFollowRedirect(b)
+    this
+  }
+
+  def addFormParam(name: String, value: String): Request = {
+    request.addFormParam(name, value)
+    this
+  }
+
   def execute(handler: CompletionHandler): Unit = {
     request.execute(new AsyncCompletionHandler[AsyncHttpResponse]() {
       def onCompleted(res: AsyncHttpResponse) = {