From 61cf71fd6710f0adcd2c16a78c4dcca2d2329a40 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 12 Jun 2012 14:26:30 -0700 Subject: [PATCH 1/4] [maven-release-plugin] prepare for next development iteration --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7046e9360b..eb331c34d0 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ github-api - 1.27 + 1.28-SNAPSHOT GitHub API for Java http://github-api.kohsuke.org/ GitHub API for Java From d034ca4d1fec3c0d070efe8fec02df5b13bcda6e Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 13 Jun 2012 08:10:01 -0700 Subject: [PATCH 2/4] removed unused V3 API --- src/main/java/org/kohsuke/github/GHPerson.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/kohsuke/github/GHPerson.java b/src/main/java/org/kohsuke/github/GHPerson.java index 1a368d941e..4811839c0a 100644 --- a/src/main/java/org/kohsuke/github/GHPerson.java +++ b/src/main/java/org/kohsuke/github/GHPerson.java @@ -22,9 +22,6 @@ public abstract class GHPerson { protected int id; protected String gravatar_id; // appears in V3 as well but presumably subsumed by avatar_url? - // V2 - protected int public_gist_count,public_repo_count,followers_count,following_count; - // V3 protected String avatar_url,html_url; protected int followers,following,public_repos,public_gists; @@ -163,15 +160,15 @@ public String getEmail() { } public int getPublicGistCount() { - return Math.max(public_gist_count,public_gists); + return public_gists; } public int getPublicRepoCount() { - return Math.max(public_repo_count,public_repos); + return public_repos; } public int getFollowingCount() { - return Math.max(following_count,following); + return following; } /** @@ -182,7 +179,7 @@ public int getId() { } public int getFollowersCount() { - return Math.max(followers_count,followers); + return followers; } } From 8ec2686e72dc7238d399e5de3e3a502e39639f88 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 13 Jun 2012 08:12:18 -0700 Subject: [PATCH 3/4] getName() is null with shallow retrieval --- src/main/java/org/kohsuke/github/GitHub.java | 9 ++++++++- src/test/java/org/kohsuke/AppTest.java | 6 ++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/kohsuke/github/GitHub.java b/src/main/java/org/kohsuke/github/GitHub.java index 18f9f596aa..687e414c5a 100644 --- a/src/main/java/org/kohsuke/github/GitHub.java +++ b/src/main/java/org/kohsuke/github/GitHub.java @@ -415,11 +415,18 @@ public GHRepository getRepository(String name) throws IOException { return getUser(tokens[0]).getRepository(tokens[1]); } + /** + * This method returns a shallowly populated organizations. + * + * To retrieve full organization details, you need to call {@link #getOrganization(String)} + * TODO: make this automatic. + */ public Map getMyOrganizations() throws IOException { GHOrganization[] orgs = retrieveWithAuth("/user/orgs", GHOrganization[].class); Map r = new HashMap(); for (GHOrganization o : orgs) { - r.put(o.name,o.wrapUp(this)); + // don't put 'o' into orgs because they are shallow + r.put(o.getLogin(),o.wrapUp(this)); } return r; } diff --git a/src/test/java/org/kohsuke/AppTest.java b/src/test/java/org/kohsuke/AppTest.java index 4ab386a2bd..ae64a3600e 100644 --- a/src/test/java/org/kohsuke/AppTest.java +++ b/src/test/java/org/kohsuke/AppTest.java @@ -40,6 +40,12 @@ public void testRateLimit() throws IOException { System.out.println(GitHub.connect().getRateLimit()); } + public void testMyOrganizations() throws IOException { + Map org = GitHub.connect().getMyOrganizations(); + assertFalse(org.keySet().contains(null)); + System.out.println(org); + } + public void testFetchPullRequest() throws Exception { GitHub gh = GitHub.connect(); GHRepository r = gh.getOrganization("jenkinsci").getRepository("jenkins"); From 69a87e2ab72b4a82de84706b214e8a2f9c5654e3 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 13 Jun 2012 08:27:53 -0700 Subject: [PATCH 4/4] [maven-release-plugin] prepare release github-api-1.28 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eb331c34d0..015506a02a 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ github-api - 1.28-SNAPSHOT + 1.28 GitHub API for Java http://github-api.kohsuke.org/ GitHub API for Java