Skip to content

Commit fd2fea1

Browse files
committed
Merge pull request #2 from codacy/fix-empty-values
Default value for empty values on paginated request
2 parents 8a8c1c6 + 119f919 commit fd2fea1

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class BitbucketClient(key: String, secretKey: String, token: String, secretToken
2626
}
2727

2828
/*
29-
* Does an paginated API request and parses the json output into a sequence of classes
29+
* Does a paginated API request and parses the json output into a sequence of classes
3030
*/
3131
def executePaginated[T](request: Request[Seq[T]])(implicit reader: Reads[T]): RequestResponse[Seq[T]] = {
3232
get(request.url) match {
@@ -37,7 +37,8 @@ class BitbucketClient(key: String, secretKey: String, token: String, secretToken
3737
executePaginated(Request(nextUrl, request.classType)).value.getOrElse(Seq())
3838
}.getOrElse(Seq())
3939

40-
RequestResponse(Some((json \ "values").as[Seq[T]] ++ nextRepos))
40+
val values = (json \ "values").asOpt[Seq[T]].getOrElse(Seq())
41+
RequestResponse(Some(values ++ nextRepos))
4142

4243
case Left(error) =>
4344
RequestResponse[Seq[T]](None, error.detail, hasError = true)

0 commit comments

Comments
 (0)