From abef9cba19526117e4dddfc487acc7f60e2eb76b Mon Sep 17 00:00:00 2001 From: Yasmin Zhamborova Date: Wed, 9 Oct 2024 13:56:10 +0200 Subject: [PATCH 1/3] [PT-1049] - fix url format 2.0 --- .../v2/service/RepositoryServices.scala | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 6eed886..bc3ca1f 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 @@ -125,16 +125,16 @@ class RepositoryServices(client: BitbucketClient) { pageRequest: Option[PageRequest], pageLength: Option[Int] ): RequestResponse[Seq[Repository]] = { - val encodedProjectKey = URLEncoder.encode(projectKey, "UTF-8") - val url = s"""${client.repositoriesBaseUrl}/$workspaceId?q=project.key="$encodedProjectKey"""" + 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) pageRequest match { - case Some(request) => - client.executeWithCursor[Repository](url, request, pageLength) - case None => - val length = pageLength.fold("")(pagelen => s"pagelen=$pagelen") - val urlWithPageLength = joinQueryParameters(url, length) - client.executePaginated[Repository](urlWithPageLength) + case Some(request) => client.executeWithCursor[Repository](url, request, pageLength) + case None => client.executePaginated[Repository](url) } } From b1b110139db77118d6f0a2241d71955f2dec3c14 Mon Sep 17 00:00:00 2001 From: Yasmin Zhamborova Date: Wed, 9 Oct 2024 13:57:19 +0200 Subject: [PATCH 2/3] [PT-1049] - fix url format 2.0 --- .../codacy/client/bitbucket/v2/service/RepositoryServices.scala | 1 + 1 file changed, 1 insertion(+) 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 bc3ca1f..b926f5c 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 @@ -132,6 +132,7 @@ class RepositoryServices(client: BitbucketClient) { val url = joinQueryParameters(s"""${client.repositoriesBaseUrl}/$workspaceId""", filterProjectKey, length) + println(url) pageRequest match { case Some(request) => client.executeWithCursor[Repository](url, request, pageLength) case None => client.executePaginated[Repository](url) From 8efca4a20b6d2f616194f99ed032c81f3a820f6b Mon Sep 17 00:00:00 2001 From: Yasmin Zhamborova Date: Wed, 9 Oct 2024 14:22:14 +0200 Subject: [PATCH 3/3] [PT-1049] - fix url format 2.0 --- .../codacy/client/bitbucket/v2/service/RepositoryServices.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b926f5c..6fdf60d 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 @@ -135,7 +135,7 @@ class RepositoryServices(client: BitbucketClient) { println(url) pageRequest match { case Some(request) => client.executeWithCursor[Repository](url, request, pageLength) - case None => client.executePaginated[Repository](url) + case None => client.executePaginated[Repository](url) } }