From 7c0a48689a622bb913c44652f156086568f1b8b7 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Mon, 19 Sep 2016 10:15:57 -0700 Subject: [PATCH] Use the maximum page size to minimize HTTP requests. Also add logging about looking for repositories in dropdowns. --- .../plugins/github_branch_source/GitHubSCMNavigator.java | 6 +++--- .../plugins/github_branch_source/GitHubSCMSource.java | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMNavigator.java b/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMNavigator.java index 944a459a6..c8e77f5c9 100644 --- a/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMNavigator.java +++ b/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMNavigator.java @@ -250,7 +250,7 @@ public String getApiUri() { } if (myself != null && repoOwner.equalsIgnoreCase(myself.getLogin())) { listener.getLogger().format("Looking up repositories of myself %s%n%n", repoOwner); - for (GHRepository repo : myself.listRepositories()) { + for (GHRepository repo : myself.listRepositories(100)) { if (!repo.getOwnerName().equals(repoOwner)) { continue; // ignore repos in other orgs when using GHMyself } @@ -272,7 +272,7 @@ public String getApiUri() { } if (org != null && repoOwner.equalsIgnoreCase(org.getLogin())) { listener.getLogger().format("Looking up repositories of organization %s%n%n", repoOwner); - for (GHRepository repo : org.listRepositories()) { + for (GHRepository repo : org.listRepositories(100)) { add(listener, observer, repo); } return; @@ -288,7 +288,7 @@ public String getApiUri() { } if (user != null && repoOwner.equalsIgnoreCase(user.getLogin())) { listener.getLogger().format("Looking up repositories of user %s%n%n", repoOwner); - for (GHRepository repo : user.listRepositories()) { + for (GHRepository repo : user.listRepositories(100)) { add(listener, observer, repo); } return; diff --git a/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMSource.java b/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMSource.java index 389061b40..9d907da4a 100644 --- a/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMSource.java +++ b/src/main/java/org/jenkinsci/plugins/github_branch_source/GitHubSCMSource.java @@ -885,9 +885,12 @@ public ListBoxModel doFillRepositoryItems(@AncestorInPath SCMSourceOwner context LOGGER.log(Level.WARNING, e.getMessage()); } if (org != null && repoOwner.equalsIgnoreCase(org.getLogin())) { - for (GHRepository repo : org.listRepositories()) { + LOGGER.log(Level.FINE, "as {0} looking for repositories in {1}", new Object[] {scanCredentialsId, repoOwner}); + for (GHRepository repo : org.listRepositories(100)) { + LOGGER.log(Level.FINE, "as {0} found {1}/{2}", new Object[] {scanCredentialsId, repoOwner, repo.getName()}); result.add(repo.getName()); } + LOGGER.log(Level.FINE, "as {0} result of {1} is {2}", new Object[] {scanCredentialsId, repoOwner, result}); return nameAndValueModel(result); } @@ -900,7 +903,7 @@ public ListBoxModel doFillRepositoryItems(@AncestorInPath SCMSourceOwner context LOGGER.log(Level.WARNING, e.getMessage()); } if (user != null && repoOwner.equalsIgnoreCase(user.getLogin())) { - for (GHRepository repo : user.listRepositories()) { + for (GHRepository repo : user.listRepositories(100)) { result.add(repo.getName()); } return nameAndValueModel(result);