Merge pull request #14 from codacy/handle-json-failures

Handle JSON parsing failures

Author: machadoit

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

@@ -58,8 +58,9 @@ object PullRequest {
       (__ \ "destination" \ "repository" \ "full_name").read[String] and
       (__ \ "destination" \ "branch" \ "name").read[String] and
       (__ \ "destination" \ "commit" \ "hash").read[String] and
+      // TODO: (__ \ "destination" \ "commit" \ "hash").read[Option[String]] and
       (__ \ "links").read[Map[String, Map[String, String]]].map(parseLinks)
-    )(PullRequest.apply _)
+    ) (PullRequest.apply _)
 
   private def parseLinks(links: Map[String, Map[String, String]]): Seq[ApiUrl] = {
     (for {

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

@@ -26,8 +26,8 @@ class BitbucketClient(key: String, secretKey: String, token: String, secretToken
    */
   def execute[T](request: Request[T])(implicit reader: Reads[T]): RequestResponse[T] = {
     get(request.url) match {
-      case Right(json) => RequestResponse(json.asOpt[T])
-      case Left(error) => RequestResponse(None, error.detail, hasError = true)
+      case Right(json) => json.validate[T].fold(_ => FailedResponse(s"Failed to parse json: $json"), a => SuccessfulResponse(a))
+      case Left(error) => FailedResponse(error.detail)
     }
   }
 
@@ -40,14 +40,14 @@ class BitbucketClient(key: String, secretKey: String, token: String, secretToken
         val nextPage = (json \ "next").asOpt[String]
         val nextRepos = nextPage.map {
           nextUrl =>
-            executePaginated(Request(nextUrl, request.classType)).value.getOrElse(Seq())
-        }.getOrElse(Seq())
+            executePaginated(Request(nextUrl, request.classType))
+        }.getOrElse(SuccessfulResponse(Seq.empty))
 
-        val values = (json \ "values").asOpt[Seq[T]].getOrElse(Seq())
-        RequestResponse(Some(values ++ nextRepos))
+        val values = (json \ "values").validate[Seq[T]].fold(_ => FailedResponse(s"Failed to parse json: $json"), a => SuccessfulResponse(a))
+        RequestResponse.apply(values, nextRepos)
 
       case Left(error) =>
-        RequestResponse[Seq[T]](None, error.detail, hasError = true)
+        FailedResponse(error.detail)
     }
   }
 
@@ -66,13 +66,13 @@ class BitbucketClient(key: String, secretKey: String, token: String, secretToken
 
       val jsValue = parseJson(body)
       jsValue match {
-        case Right(responseObj) =>
-          RequestResponse(responseObj.asOpt[T])
+        case Right(json) =>
+          json.validate[T].fold(_ => FailedResponse(s"Failed to parse json: $json"), a => SuccessfulResponse(a))
         case Left(message) =>
-          RequestResponse[T](None, message = message.detail, hasError = true)
+          FailedResponse(message.detail)
       }
     } else {
-      RequestResponse[T](None, result.statusText, hasError = true)
+      FailedResponse(result.statusText)
     }
 
     value
@@ -103,9 +103,9 @@ class BitbucketClient(key: String, secretKey: String, token: String, secretToken
     val result = Await.result(jpromise, requestTimeout)
 
     val value = if (Seq(HTTPStatusCodes.OK, HTTPStatusCodes.CREATED, HTTPStatusCodes.NO_CONTENT).contains(result.status)) {
-      RequestResponse(Option(true))
+      SuccessfulResponse(true)
     } else {
-      RequestResponse[Boolean](None, result.statusText, hasError = true)
+      FailedResponse(result.statusText)
     }
 
     value
@@ -157,7 +157,7 @@ class BitbucketClient(key: String, secretKey: String, token: String, secretToken
              |
              |${getFullStackTrace(error)}
           """.stripMargin
-        RequestResponse[T](None, statusMessage, hasError = true)
+        FailedResponse(statusMessage)
     }
   }
 

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

@@ -1,3 +1,27 @@
 package com.codacy.client.bitbucket.client
 
-case class RequestResponse[T](value: Option[T], message: String = "", hasError: Boolean = false)
+sealed trait RequestResponse[+A]
+
+case class SuccessfulResponse[A](value: A) extends RequestResponse[A]
+
+case class FailedResponse(message: String) extends RequestResponse[Nothing]
+
+object RequestResponse {
+
+  def success[A](a: A): RequestResponse[A] = SuccessfulResponse(a)
+
+  def failure[A](message: String): RequestResponse[A] = FailedResponse(message: String)
+
+  def apply[A](r1: RequestResponse[Seq[A]], r2: RequestResponse[Seq[A]]): RequestResponse[Seq[A]] = {
+    r1 match {
+      case SuccessfulResponse(v1) =>
+        r2 match {
+          case SuccessfulResponse(v2) =>
+            SuccessfulResponse(v1 ++ v2)
+          case f@FailedResponse(_) => f
+        }
+      case f@FailedResponse(_) => f
+    }
+  }
+
+}