update to play 2.4

Author: rtfpessoa

build.sbt

@@ -2,7 +2,7 @@ import Dependencies._
 
 name := """bitbucket-scala-client"""
 
-version := "1.1"
+version := "1.2"
 
 scalaVersion := "2.10.5"
 

project/Dependencies.scala

@@ -6,6 +6,6 @@ object Dependencies {
   lazy val jodaTime = "joda-time" % "joda-time" % "2.7"
 
   // Play framework
-  lazy val playWS = "com.typesafe.play" %% "play-ws" % "2.3.8"
+  lazy val playWS = "com.typesafe.play" %% "play-ws" % "2.4.0"
 
 }

project/build.properties

@@ -1,4 +1,4 @@
 #Activator-generated Properties
 #Sat Jul 12 15:51:18 WEST 2014
 template.uuid=a855816c-0367-44ba-9adb-6a903f6ad599
-sbt.version=0.13.5
+sbt.version=0.13.8

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

@@ -10,6 +10,13 @@ object Commit {
   val dateFormat = "yyyy-MM-dd'T'HH:mm:ssZZ"
   implicit val jodaDateTimeReads = Reads.jodaDateReads(dateFormat)
 
+  implicit def optionSeqStringReader: Reads[Option[Seq[String]]] = Reads { (json: JsValue) =>
+    json match {
+      case JsArray(value) => JsSuccess(Some(value.flatMap(_.asOpt[String])))
+      case _ => JsSuccess(None)
+    }
+  }
+
   implicit val reader: Reads[Commit] = (
     (__ \ "hash").read[String] and
       (__ \ "author" \ "user" \ "username").read[String] and

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

@@ -36,6 +36,13 @@ object PullRequest {
   val dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSSSSZZ"
   implicit val jodaDateTimeReads = Reads.jodaDateReads(dateFormat)
 
+  implicit def optionStringReader: Reads[Option[String]] = Reads { (json: JsValue) =>
+    json match {
+      case JsString(value) => JsSuccess(Some(value))
+      case _ => JsSuccess(None)
+    }
+  }
+
   implicit val reader: Reads[PullRequest] = (
     (__ \ "id").read[Long] and
       (__ \ "title").read[String] and

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

@@ -53,19 +53,21 @@ class BitbucketClient(key: String, secretKey: String, token: String, secretToken
     val jpromise = client.url(request.url).sign(OAuthCalculator(KEY, TOKEN)).withFollowRedirects(follow = true).post(values)
     val result = Await.result(jpromise, Duration(10, SECONDS))
 
-    if (Seq(HTTPStatusCodes.OK, HTTPStatusCodes.CREATED).contains(result.status)) {
+    val value = if (Seq(HTTPStatusCodes.OK, HTTPStatusCodes.CREATED).contains(result.status)) {
       val body = result.body
 
       val jsValue = parseJson(body)
       jsValue match {
         case Right(responseObj) =>
           RequestResponse(responseObj.asOpt[T])
         case Left(message) =>
-          RequestResponse(None, message = message.detail, hasError = true)
+          RequestResponse[T](None, message = message.detail, hasError = true)
       }
     } else {
-      RequestResponse(None, result.statusText, hasError = true)
+      RequestResponse[T](None, result.statusText, hasError = true)
     }
+    client.close()
+    value
   }
 
   /* copy paste from post ... */
@@ -75,11 +77,13 @@ class BitbucketClient(key: String, secretKey: String, token: String, secretToken
     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, HTTPStatusCodes.NO_CONTENT).contains(result.status)) {
+    val value = if (Seq(HTTPStatusCodes.OK, HTTPStatusCodes.CREATED, HTTPStatusCodes.NO_CONTENT).contains(result.status)) {
       RequestResponse(Option(true))
     } else {
-      RequestResponse(None, result.statusText, hasError = true)
+      RequestResponse[Boolean](None, result.statusText, hasError = true)
     }
+    client.close()
+    value
   }
 
   private def get(url: String): Either[ResponseError, JsValue] = {
@@ -88,12 +92,14 @@ class BitbucketClient(key: String, secretKey: String, token: String, secretToken
     val jpromise = client.url(url).sign(OAuthCalculator(KEY, TOKEN)).withFollowRedirects(follow = true).get()
     val result = Await.result(jpromise, Duration(10, SECONDS))
 
-    if (Seq(HTTPStatusCodes.OK, HTTPStatusCodes.CREATED).contains(result.status)) {
+    val value = if (Seq(HTTPStatusCodes.OK, HTTPStatusCodes.CREATED).contains(result.status)) {
       val body = result.body
       parseJson(body)
     } else {
       Left(ResponseError(java.util.UUID.randomUUID().toString, result.statusText, result.statusText))
     }
+    client.close()
+    value
   }
 
   private def parseJson(input: String): Either[ResponseError, JsValue] = {