Generalize RequestResponse and BitbucketClient

Author: jllopes

src/main/scala/com/codacy/client/client/BitbucketClient.scala

@@ -54,7 +54,7 @@ class BitbucketClient(credentials: Credentials)(implicit materializer: Materiali
           (FIRST_PAGE + 1 to lastPage).par.map { page =>
             val nextUrl = new URI(request.url).addQuery(s"page=$page").toString
             get(nextUrl) match {
-              case Right(json) => extractValues(json)
+              case Right(nextJson) => extractValues(nextJson)
               case Left(error) => FailedResponse(error.detail)
             }
           }.to[Seq]
@@ -105,13 +105,14 @@ class BitbucketClient(credentials: Credentials)(implicit materializer: Materiali
           FailedResponse(message.detail)
       }
     } else {
+      println(Json.parse(result.body) \ "message")
       FailedResponse(result.statusText)
     }
 
     value
   }
 
-  def postForm[T](request: Request[T], values: Map[String, Seq[String]])(implicit reader: Reads[T]): RequestResponse[T] = {
+  def postForm[D, T](request: Request[T], values: D)(implicit reader: Reads[T], writer: BodyWritable[D]): RequestResponse[T] = {
     performRequest("POST", request, values)
   }
 
@@ -155,6 +156,7 @@ class BitbucketClient(credentials: Credentials)(implicit materializer: Materiali
       val body = result.body
       parseJson(body)
     } else {
+      println(Json.parse(result.body) \ "error" \ "message")
       Left(ResponseError(java.util.UUID.randomUUID().toString, result.statusText, result.statusText))
     }
 

src/main/scala/com/codacy/client/client/RequestResponse.scala

@@ -1,6 +1,19 @@
 package com.codacy.client.client
 
-sealed trait RequestResponse[+A]
+sealed trait RequestResponse[+A] {
+
+  def map[B](f: A => B): RequestResponse[B] = {
+    flatMap(a => RequestResponse.success(f(a)))
+  }
+
+  def flatMap[B](f: A => RequestResponse[B]): RequestResponse[B] = {
+    this match {
+      case SuccessfulResponse(a) => f(a)
+      case e: FailedResponse => e
+    }
+  }
+
+}
 
 case class SuccessfulResponse[A](value: A) extends RequestResponse[A]