Skip to content

Commit abef9cb

Browse files
committed
[PT-1049] - fix url format 2.0
1 parent b6d83da commit abef9cb

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/main/scala/com/codacy/client/bitbucket/v2/service/RepositoryServices.scala

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -125,16 +125,16 @@ class RepositoryServices(client: BitbucketClient) {
125125
pageRequest: Option[PageRequest],
126126
pageLength: Option[Int]
127127
): RequestResponse[Seq[Repository]] = {
128-
val encodedProjectKey = URLEncoder.encode(projectKey, "UTF-8")
129-
val url = s"""${client.repositoriesBaseUrl}/$workspaceId?q=project.key="$encodedProjectKey""""
128+
val length = s"pagelen=${pageLength.getOrElse(DEFAULT_PAGE_LENGTH)}"
129+
130+
val encodedProjectKey = URLEncoder.encode(s""""$projectKey"""", "UTF-8")
131+
val filterProjectKey = s"""q=project.key=$encodedProjectKey"""
132+
133+
val url = joinQueryParameters(s"""${client.repositoriesBaseUrl}/$workspaceId""", filterProjectKey, length)
130134

131135
pageRequest match {
132-
case Some(request) =>
133-
client.executeWithCursor[Repository](url, request, pageLength)
134-
case None =>
135-
val length = pageLength.fold("")(pagelen => s"pagelen=$pagelen")
136-
val urlWithPageLength = joinQueryParameters(url, length)
137-
client.executePaginated[Repository](urlWithPageLength)
136+
case Some(request) => client.executeWithCursor[Repository](url, request, pageLength)
137+
case None => client.executePaginated[Repository](url)
138138
}
139139
}
140140

0 commit comments

Comments
 (0)