diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/client/BitbucketCloudApiClient.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/client/BitbucketCloudApiClient.java index 124ed8fe3..b4783ad97 100644 --- a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/client/BitbucketCloudApiClient.java +++ b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/client/BitbucketCloudApiClient.java @@ -64,6 +64,8 @@ import java.net.Proxy; import java.nio.charset.StandardCharsets; import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.logging.Level; @@ -494,6 +496,12 @@ public List getRepositories(@CheckForNull UserRoleInRe throw new IOException("I/O error when parsing response from URL: " + url, e); } } + Collections.sort(repositories, new Comparator() { + @Override + public int compare(BitbucketCloudRepository o1, BitbucketCloudRepository o2) { + return o1.getRepositoryName().compareTo(o2.getRepositoryName()); + } + }); return repositories; } diff --git a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/server/client/BitbucketServerAPIClient.java b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/server/client/BitbucketServerAPIClient.java index 445bc1272..8f3dfe3e5 100644 --- a/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/server/client/BitbucketServerAPIClient.java +++ b/src/main/java/com/cloudbees/jenkins/plugins/bitbucket/server/client/BitbucketServerAPIClient.java @@ -62,6 +62,8 @@ import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.logging.Level; @@ -472,6 +474,12 @@ public List getRepositories(@CheckForNull UserRoleInR page = JsonParser.toJava(response, BitbucketServerRepositories.class); repositories.addAll(page.getValues()); } + Collections.sort(repositories, new Comparator() { + @Override + public int compare(BitbucketServerRepository o1, BitbucketServerRepository o2) { + return o1.getRepositoryName().compareTo(o2.getRepositoryName()); + } + }); return repositories; } catch (FileNotFoundException e) { return new ArrayList<>();