delete request implemented

Author: Johann Egger

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

@@ -75,36 +75,20 @@ class BitbucketClient(key: String, secretKey: String, token: String, secretToken
     }
   }
   /* copy paste from post ... */
-  def delete[T](request: Request[T])(implicit reader: Reads[T]): RequestResponse[T] = {
+  def delete[T](url: String): RequestResponse[Boolean] = {
     val client: WSClient = new NingWSClient(new AsyncHttpClient().getConfig)
 
-    val jpromise = client.url(request.url).sign(OAuthCalculator(KEY, TOKEN)).withFollowRedirects(follow = true).delete()
+    val jpromise = client.url(url).sign(OAuthCalculator(KEY, TOKEN)).withFollowRedirects(follow = true).delete()
     val result = Await.result(jpromise, Duration(10, SECONDS))
 
-    if (Seq(HTTPStatusCodes.OK, HTTPStatusCodes.CREATED).contains(result.status)) {
-      val body = result.body
-
-      /* TODO: remove this when not needed (only keep for debug purposes) */
-      //    println("\n\n")
-      //    println(s"STATUS: ${result.status}")
-      //    println("\n\n")
-      //    println(body)
-      //    println("\n\n")
-
-      val jsValue = parseJson(body)
-      jsValue match {
-        case Right(responseObj) =>
-          RequestResponse(responseObj.asOpt[T])
-        case Left(message) =>
-          RequestResponse(None, message = message.detail, hasError = true)
-      }
-    } else {
+    if (Seq(HTTPStatusCodes.OK, HTTPStatusCodes.CREATED, HTTPStatusCodes.NO_CONTENT).contains(result.status)) {
+      RequestResponse(Option(true))
+    }
+    else {
       RequestResponse(None, result.statusText, hasError = true)
     }
   }
 
-
-
   private def get(url: String): Either[ResponseError, JsValue] = {
     val client: WSClient = new NingWSClient(new AsyncHttpClient().getConfig)
 

src/main/scala/com/codacy/client/bitbucket/service/HookServices.scala

@@ -8,16 +8,10 @@ class ServiceServices(client: BitbucketClient) {
   def list(author: String, repo: String): RequestResponse[Seq[Service]] =
     AuthorRepoOps(author,repo).list()
 
-  /*def byId(author: String, repo: String, id:Long) = {
-    val resp = AuthorRepoOps(author,repo).list()
-    val value = resp.value.map(_.find(_.id == id))
-    resp.copy(value = value)
-  }*/
-
   def created(author: String, repo: String, payload: Map[String,Seq[String]]) =
     AuthorRepoOps(author,repo).created(payload)
 
-  def removed(author: String, repo: String, id:Long) =
+  def removed(author: String, repo: String, id:Long): RequestResponse[Boolean] =
     AuthorRepoOps(author,repo).removed(id)
 
   private[this] lazy val BASE_URL: String = "https://bitbucket.org/!api/1.0/repositories"
@@ -29,8 +23,9 @@ class ServiceServices(client: BitbucketClient) {
     def created(payload: Map[String,Seq[String]]): RequestResponse[Service] =
       client.post(Request(BASE_URL,classOf[Service]),payload)
 
-    def removed(id:Long): RequestResponse[Boolean] =
-      client.delete(Request(s"%BASE_URL/$id",classOf[Boolean]))
+    def removed(id:Long): RequestResponse[Boolean] = {
+      client.delete(s"$BASE_URL/$id")
+    }
 
     def list(): RequestResponse[Seq[Service]] =
       client.execute(Request(BASE_URL,classOf[Seq[Service]]))