Fix endless loop when fetching branch by filterText from Bitbucket Se…

…rver API (#737) * fix endless loop when fetching branch by filterText from Bitbucket Server API * fix endless loop when fetching tag by filterText from Bitbucket Server API --------- Co-authored-by: Günter Grodotzki <[email protected]>
jenkinsci · Jul 11, 2023 · 30be8c1 · 30be8c1
1 parent 6710d1c
commit 30be8c1
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 5 deletions.
diff --git a/.../java/com/cloudbees/jenkins/plugins/bitbucket/server/client/BitbucketServerAPIClient.java b/.../java/com/cloudbees/jenkins/plugins/bitbucket/server/client/BitbucketServerAPIClient.java
@@ -139,9 +139,9 @@ public class BitbucketServerAPIClient implements BitbucketApi {
     private static final String API_REPOSITORY_PATH = API_BASE_PATH + "/projects/{owner}/repos/{repo}";
     private static final String API_DEFAULT_BRANCH_PATH = API_REPOSITORY_PATH + "/branches/default";
     private static final String API_BRANCHES_PATH = API_REPOSITORY_PATH + "/branches{?start,limit}";
-    private static final String API_BRANCHES_FILTERED_PATH = API_REPOSITORY_PATH + "/branches{?filterText}";
+    private static final String API_BRANCHES_FILTERED_PATH = API_REPOSITORY_PATH + "/branches{?filterText,start,limit}";
     private static final String API_TAGS_PATH = API_REPOSITORY_PATH + "/tags{?start,limit}";
-    private static final String API_TAGS_FILTERED_PATH = API_REPOSITORY_PATH + "/tags{?filterText}";
+    private static final String API_TAGS_FILTERED_PATH = API_REPOSITORY_PATH + "/tags{?filterText,start,limit}";
     private static final String API_PULL_REQUESTS_PATH = API_REPOSITORY_PATH + "/pull-requests{?start,limit,at,direction,state}";
     private static final String API_PULL_REQUEST_PATH = API_REPOSITORY_PATH + "/pull-requests/{id}";
     private static final String API_PULL_REQUEST_MERGE_PATH = API_REPOSITORY_PATH + "/pull-requests/{id}/merge";

diff --git a/...s-branches_filterText_feature_2FBB-1.json → ...ext_feature_2FBB-1_start_0_limit_200.json b/...s-branches_filterText_feature_2FBB-1.json → ...ext_feature_2FBB-1_start_0_limit_200.json
diff --git a/...s-branches_filterText_feature_2FBB-2.json → ...ext_feature_2FBB-2_start_0_limit_200.json b/...s-branches_filterText_feature_2FBB-2.json → ...ext_feature_2FBB-2_start_0_limit_200.json
diff --git a/...-test-repos-branches_filterText_main.json → ...es_filterText_main_start_0_limit_200.json b/...-test-repos-branches_filterText_main.json → ...es_filterText_main_start_0_limit_200.json
diff --git a/...nches_filterText_release_2Frelease-1.json → ...elease_2Frelease-1_start_0_limit_200.json b/...nches_filterText_release_2Frelease-1.json → ...elease_2Frelease-1_start_0_limit_200.json
diff --git a/..._3E_3C_26_23__3D_40_21_7C._2C_2Ftest.json → ...0_21_7C._2C_2Ftest_start_0_limit_200.json b/..._3E_3C_26_23__3D_40_21_7C._2C_2Ftest.json → ...0_21_7C._2C_2Ftest_start_0_limit_200.json
@@ -1,6 +1,6 @@
 {
   "size": 1,
-  "limit": 25,
+  "limit": 200,
   "isLastPage": true,
   "values": [
     {
@@ -11,5 +11,6 @@
       "latestChangeset": "046d9a3c1532acf4cf08fe93235c00e4d673c1d2",
       "hash": "c7208aca6fa205f115585be56a817f0cf2a43e62"
     }
-  ]
+  ],
+  "start": 0
 }
diff --git a/...os-test-repos-tags_filterText_v0.0.0.json → ..._filterText_v0.0.0_start_0_limit_200.json b/...os-test-repos-tags_filterText_v0.0.0.json → ..._filterText_v0.0.0_start_0_limit_200.json
@@ -1,6 +1,6 @@
 {
   "size": 1,
-  "limit": 25,
+  "limit": 200,
   "isLastPage": true,
   "values": [
     {