Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sorting repository list #85

Merged
merged 3 commits into from Dec 18, 2017
Merged

Sorting repository list #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d802cb0
Sorted repositories list
maocorte Nov 17, 2017
1acd3e8
sorted repositories list
maocorte Nov 17, 2017
94b65e8
Sorting repository list for bitbucket server
maocorte Nov 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/main/java/com/cloudbees/jenkins/plugins/bitbucket/client/BitbucketCloudApiClient.java
View file
Open in desktop
Expand Up @@ -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;
Expand Down Expand Up @@ -494,6 +496,12 @@ public List<BitbucketCloudRepository> getRepositories(@CheckForNull UserRoleInRe
throw new IOException("I/O error when parsing response from URL: " + url, e);
}
}
Collections.sort(repositories, new Comparator<BitbucketCloudRepository>() {
@Override
public int compare(BitbucketCloudRepository o1, BitbucketCloudRepository o2) {
return o1.getRepositoryName().compareTo(o2.getRepositoryName());
}
});
return repositories;
}

Expand Down
8 changes: 8 additions & 0 deletions .../java/com/cloudbees/jenkins/plugins/bitbucket/server/client/BitbucketServerAPIClient.java
View file
Open in desktop
Expand Up @@ -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;
Expand Down Expand Up @@ -472,6 +474,12 @@ public List<BitbucketServerRepository> getRepositories(@CheckForNull UserRoleInR
page = JsonParser.toJava(response, BitbucketServerRepositories.class);
repositories.addAll(page.getValues());
}
Collections.sort(repositories, new Comparator<BitbucketServerRepository>() {
@Override
public int compare(BitbucketServerRepository o1, BitbucketServerRepository o2) {
return o1.getRepositoryName().compareTo(o2.getRepositoryName());
}
});
return repositories;
} catch (FileNotFoundException e) {
return new ArrayList<>();
Expand Down