diff --git a/src/main/scala/com/codacy/client/bitbucket/v2/service/RepositoryServices.scala b/src/main/scala/com/codacy/client/bitbucket/v2/service/RepositoryServices.scala index 7db0730..5e22b9f 100644 --- a/src/main/scala/com/codacy/client/bitbucket/v2/service/RepositoryServices.scala +++ b/src/main/scala/com/codacy/client/bitbucket/v2/service/RepositoryServices.scala @@ -126,17 +126,13 @@ class RepositoryServices(client: BitbucketClient) { pageLength: Option[Int] ): RequestResponse[Seq[Repository]] = { - val length = s"pagelen=${pageLength.getOrElse(DEFAULT_PAGE_LENGTH)}" - val encodedProjectKey = URLEncoder.encode(s""""$projectKey"""", "UTF-8") val filterProjectKey = s"""q=project.key=$encodedProjectKey""" - val url = joinQueryParameters(s"""${client.repositoriesBaseUrl}/$workspaceId""", filterProjectKey, length) + val url = joinQueryParameters(s"""${client.repositoriesBaseUrl}/$workspaceId""", filterProjectKey) + + client.executeWithCursor[Repository](url, pageRequest.getOrElse(PageRequest()), pageLength) - pageRequest match { - case Some(request) => client.executeWithCursor[Repository](url, request, pageLength) - case None => client.executePaginated[Repository](url) - } } } diff --git a/src/main/scala/com/codacy/client/bitbucket/v2/service/WorkspaceServices.scala b/src/main/scala/com/codacy/client/bitbucket/v2/service/WorkspaceServices.scala index b1a7c6c..93719c4 100644 --- a/src/main/scala/com/codacy/client/bitbucket/v2/service/WorkspaceServices.scala +++ b/src/main/scala/com/codacy/client/bitbucket/v2/service/WorkspaceServices.scala @@ -110,14 +110,7 @@ class WorkspaceServices(client: BitbucketClient) { ): RequestResponse[Seq[Project]] = { val url = s"${client.workspacesBaseUrl}/$workspaceId/projects" - pageRequest match { - case Some(request) => - client.executeWithCursor[Project](url, request, pageLength) - case None => - val length = pageLength.fold("")(pagelen => s"pagelen=$pagelen") - val urlWithPageLength = joinQueryParameters(url, length) - client.executePaginated[Project](urlWithPageLength) - } + client.executeWithCursor[Project](url, pageRequest.getOrElse(PageRequest()), pageLength) } }