Skip to content

Commit 0bc434e

Browse files
committed
fx: remove double page length param
1 parent e3ed2c8 commit 0bc434e

File tree

2 files changed

+4
-15
lines changed

2 files changed

+4
-15
lines changed

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -126,17 +126,13 @@ class RepositoryServices(client: BitbucketClient) {
126126
pageLength: Option[Int]
127127
): RequestResponse[Seq[Repository]] = {
128128

129-
val length = s"pagelen=${pageLength.getOrElse(DEFAULT_PAGE_LENGTH)}"
130-
131129
val encodedProjectKey = URLEncoder.encode(s""""$projectKey"""", "UTF-8")
132130
val filterProjectKey = s"""q=project.key=$encodedProjectKey"""
133131

134-
val url = joinQueryParameters(s"""${client.repositoriesBaseUrl}/$workspaceId""", filterProjectKey, length)
132+
val url = joinQueryParameters(s"""${client.repositoriesBaseUrl}/$workspaceId""", filterProjectKey)
133+
134+
client.executeWithCursor[Repository](url, pageRequest.getOrElse(PageRequest), pageLength)
135135

136-
pageRequest match {
137-
case Some(request) => client.executeWithCursor[Repository](url, request, pageLength)
138-
case None => client.executePaginated[Repository](url)
139-
}
140136
}
141137

142138
}

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -110,14 +110,7 @@ class WorkspaceServices(client: BitbucketClient) {
110110
): RequestResponse[Seq[Project]] = {
111111
val url = s"${client.workspacesBaseUrl}/$workspaceId/projects"
112112

113-
pageRequest match {
114-
case Some(request) =>
115-
client.executeWithCursor[Project](url, request, pageLength)
116-
case None =>
117-
val length = pageLength.fold("")(pagelen => s"pagelen=$pagelen")
118-
val urlWithPageLength = joinQueryParameters(url, length)
119-
client.executePaginated[Project](urlWithPageLength)
120-
}
113+
client.executeWithCursor[Project](url, pageRequest.getOrElse(PageRequest), pageLength)
121114
}
122115

123116
}

0 commit comments

Comments
 (0)