From 6af12c2335335ec4379395cc3214b6956ef0d274 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 28 Aug 2012 09:43:22 -0700 Subject: [PATCH 1/8] [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 965f1b2294..e68dffa235 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ github-api - 1.30 + 1.31-SNAPSHOT GitHub API for Java http://github-api.kohsuke.org/ GitHub API for Java From dbc5b0b7424ac97085b5a6be0ddfc90f1b8f4931 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Br=C3=A1zdil?= Date: Fri, 10 Aug 2012 15:52:17 +0200 Subject: [PATCH 2/8] user is not just username; added url --- .../java/org/kohsuke/github/GHIssueComment.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/kohsuke/github/GHIssueComment.java b/src/main/java/org/kohsuke/github/GHIssueComment.java index 9dd96896a1..e8a700cdfb 100644 --- a/src/main/java/org/kohsuke/github/GHIssueComment.java +++ b/src/main/java/org/kohsuke/github/GHIssueComment.java @@ -24,6 +24,7 @@ package org.kohsuke.github; import java.io.IOException; +import java.net.URL; import java.util.Date; /** @@ -34,8 +35,10 @@ public class GHIssueComment { GHIssue owner; - private String body, gravatar_id, user, created_at, updated_at; + private String body, gravatar_id, created_at, updated_at; + private URL url; private int id; + private GHUser user; /*package*/ GHIssueComment wrapUp(GHIssue owner) { this.owner = owner; @@ -68,17 +71,22 @@ public int getId() { return id; } + public URL getUrl() { + return url; + } + /** * Gets the ID of the user who posted this comment. */ + @Deprecated public String getUserName() { - return user; + return user.getLogin(); } /** * Gets the user who posted this comment. */ public GHUser getUser() throws IOException { - return owner.root.getUser(user); + return owner.root.getUser(user.getLogin()); } } From ae2d01a87858c7eb052cdd9d57ac47cd2fba4513 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Br=C3=A1zdil?= Date: Fri, 10 Aug 2012 16:29:08 +0200 Subject: [PATCH 3/8] fix GHPullRequest.getLabels() NPE --- src/main/java/org/kohsuke/github/GHIssue.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/org/kohsuke/github/GHIssue.java b/src/main/java/org/kohsuke/github/GHIssue.java index 961f27edca..ffaa515cab 100644 --- a/src/main/java/org/kohsuke/github/GHIssue.java +++ b/src/main/java/org/kohsuke/github/GHIssue.java @@ -97,6 +97,9 @@ public GHIssueState getState() { } public Collection getLabels() { + if(labels == null){ + return Collections.EMPTY_LIST; + } return Collections.unmodifiableList(labels); } From 58d10df5e33cb4076f31c1d7670ea53d85e4590e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Br=C3=A1zdil?= Date: Fri, 10 Aug 2012 16:32:10 +0200 Subject: [PATCH 4/8] Fix GHIssue.getState() No enum constant --- src/main/java/org/kohsuke/github/GHIssue.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/kohsuke/github/GHIssue.java b/src/main/java/org/kohsuke/github/GHIssue.java index ffaa515cab..98cc63b586 100644 --- a/src/main/java/org/kohsuke/github/GHIssue.java +++ b/src/main/java/org/kohsuke/github/GHIssue.java @@ -31,6 +31,7 @@ import java.util.Collections; import java.util.Date; import java.util.List; +import java.util.Locale; /** * Represents an issue on GitHub. @@ -93,7 +94,7 @@ public String getTitle() { } public GHIssueState getState() { - return Enum.valueOf(GHIssueState.class, state); + return Enum.valueOf(GHIssueState.class, state.toUpperCase(Locale.ENGLISH)); } public Collection getLabels() { From c268a5dd07b05714a65c830889f4a20ba39bb9f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Br=C3=A1zdil?= Date: Thu, 16 Aug 2012 14:52:37 +0200 Subject: [PATCH 5/8] removed unused throws statement --- src/main/java/org/kohsuke/github/GitHub.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/kohsuke/github/GitHub.java b/src/main/java/org/kohsuke/github/GitHub.java index 9f8d1df240..5893de9c41 100644 --- a/src/main/java/org/kohsuke/github/GitHub.java +++ b/src/main/java/org/kohsuke/github/GitHub.java @@ -129,11 +129,11 @@ public static GitHub connect() throws IOException { return new GitHub(props.getProperty("login"),props.getProperty("token"),props.getProperty("password")); } - public static GitHub connect(String login, String apiToken) throws IOException { + public static GitHub connect(String login, String apiToken){ return new GitHub(login,apiToken,null); } - public static GitHub connect(String login, String apiToken, String password) throws IOException { + public static GitHub connect(String login, String apiToken, String password){ return new GitHub(login,apiToken,password); } From cc3793cbcd6d262bcb97d3aef608fa8f72500351 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Br=C3=A1zdil?= Date: Fri, 24 Aug 2012 13:59:30 +0200 Subject: [PATCH 6/8] Comments are paged --- src/main/java/org/kohsuke/github/GHIssue.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/kohsuke/github/GHIssue.java b/src/main/java/org/kohsuke/github/GHIssue.java index 98cc63b586..444c60d3de 100644 --- a/src/main/java/org/kohsuke/github/GHIssue.java +++ b/src/main/java/org/kohsuke/github/GHIssue.java @@ -157,11 +157,17 @@ public void setLabels(String... labels) throws IOException { /** * Obtains all the comments associated with this issue. */ - public List getComments() throws IOException { - GHIssueComment[] r = root.retrieve(getApiRoute() + "/comments", GHIssueComment[].class); - for (GHIssueComment c : r) - c.wrapUp(this); - return Arrays.asList(r); + public PagedIterable getComments() throws IOException { + return new PagedIterable() { + public PagedIterator iterator() { + return new PagedIterator(root.retrievePaged(getApiRoute() + "/comments",GHIssueComment[].class,false)) { + protected void wrapUp(GHIssueComment[] page) { + for (GHIssueComment c : page) + c.wrapUp(GHIssue.this); + } + }; + } + }; } private String getApiRoute() { From 587278f282dacadd1d373854b5db37acab5039f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Br=C3=A1zdil?= Date: Tue, 28 Aug 2012 19:09:18 +0200 Subject: [PATCH 7/8] we need to maintain the binary compatibility, so I reverted getComments and added listComments that exposes PagedIterable. inspired by 8f95c4f1790f282ede2a07995f3ebe2407f9dae3 --- src/main/java/org/kohsuke/github/GHIssue.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/kohsuke/github/GHIssue.java b/src/main/java/org/kohsuke/github/GHIssue.java index 444c60d3de..3224e76f29 100644 --- a/src/main/java/org/kohsuke/github/GHIssue.java +++ b/src/main/java/org/kohsuke/github/GHIssue.java @@ -156,8 +156,17 @@ public void setLabels(String... labels) throws IOException { /** * Obtains all the comments associated with this issue. + * + * @see #listComments() */ - public PagedIterable getComments() throws IOException { + public List getComments() throws IOException { + return listComments().asList(); + } + + /** + * Obtains all the comments associated with this issue. + */ + public PagedIterable listComments() throws IOException { return new PagedIterable() { public PagedIterator iterator() { return new PagedIterator(root.retrievePaged(getApiRoute() + "/comments",GHIssueComment[].class,false)) { From dcaf926a952e3452956fbd38a0bd4fd1be0d32a3 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 28 Aug 2012 11:02:59 -0700 Subject: [PATCH 8/8] [maven-release-plugin] prepare release github-api-1.31 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e68dffa235..7d5af32649 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ github-api - 1.31-SNAPSHOT + 1.31 GitHub API for Java http://github-api.kohsuke.org/ GitHub API for Java