Merge remote-tracking branch 'origin/FT-194'

* origin/FT-194:
  version bump for depending (FT-99)
  Update HookServices.scala
  hook api changed to bitbucket 2.0 api vBump

Author: Johann Egger

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

@@ -0,0 +1,14 @@
+package com.codacy.client.bitbucket
+
+import play.api.libs.json.{Reads, Json, JsObject}
+
+case class Webhook(uuid:String,description:String,url:String,subject:JsObject,events:Set[String],active:Boolean,created_at:String,links:JsObject)
+object Webhook{
+  implicit val reads: Reads[Webhook] = Json.reads[Webhook].map{ case hook =>
+    hook.uuid match{
+      case uuid if uuid.startsWith("{") && uuid.endsWith("}") =>
+        hook.copy(uuid = uuid.drop(1).dropRight(1))
+      case _ => hook
+    }
+  }
+}

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

@@ -1,32 +1,34 @@
 package com.codacy.client.bitbucket.service
 
-import com.codacy.client.bitbucket.Service
+import com.codacy.client.bitbucket.{Webhook, Service}
 import com.codacy.client.bitbucket.client.{BitbucketClient, Request, RequestResponse}
 import play.api.libs.json.Json
 
 class HookServices(client: BitbucketClient) {
 
-  def list(author: String, repo: String): RequestResponse[Seq[Service]] = {
+  def list(author: String, repo: String): RequestResponse[Seq[Webhook]] = {
     val servicesUrl = getServicesUrl(author, repo)
-    client.execute(Request(servicesUrl, classOf[Seq[Service]]))
+    client.executePaginated(Request(servicesUrl, classOf[Seq[Webhook]]))
   }
 
-  def create(author: String, repo: String, hookType: String, hookUrl: String): RequestResponse[Service] = {
+  def create(author: String, repo: String, description: String, hookUrl: String, events:Set[String]): RequestResponse[Webhook] = {
     val servicesUrl = getServicesUrl(author, repo)
     val payload = Json.obj(
-      "type" -> hookType,
-      "URL" -> hookUrl
+      "active"      -> true,
+      "description" -> description,
+      "url"         -> hookUrl,
+      "events"      -> events
     )
-    client.post(Request(servicesUrl, classOf[Service]), payload)
+    client.post(Request(servicesUrl, classOf[Webhook]), payload)
   }
 
-  def delete(author: String, repo: String, id: Long): RequestResponse[Boolean] = {
+  def delete(author: String, repo: String, uuid: String): RequestResponse[Boolean] = {
     val servicesUrl = getServicesUrl(author, repo)
-    client.delete(s"$servicesUrl/$id")
+    client.delete(s"$servicesUrl/$uuid")
   }
 
-  private lazy val BASE_URL: String = "https://bitbucket.org/!api/1.0/repositories"
+  private[this] lazy val BASE_URL: String = "https://api.bitbucket.org/2.0/repositories"
 
-  private def getServicesUrl(author: String, repo: String) = s"$BASE_URL/$author/$repo/services"
+  private[this] def getServicesUrl(owner: String, repo: String) = s"$BASE_URL/$owner/$repo/hooks"
 
 }