From 3830a5849361be5733662eca27cf2b3c93b26de7 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 23 Apr 2013 10:30:54 -0700 Subject: [PATCH 1/6] [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 b3cebb8139..8705e7e8cb 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ github-api - 1.41 + 1.42-SNAPSHOT GitHub API for Java http://github-api.kohsuke.org/ GitHub API for Java From 716bfd4611e4016718afd176ecf9c0a0f6f021f5 Mon Sep 17 00:00:00 2001 From: Aaron Crickenberger Date: Tue, 30 Apr 2013 15:41:08 -0700 Subject: [PATCH 2/6] requireCredential should allow for oauthToken with no login --- src/main/java/org/kohsuke/github/GitHub.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/kohsuke/github/GitHub.java b/src/main/java/org/kohsuke/github/GitHub.java index d71fce0b39..8adf7e352f 100644 --- a/src/main/java/org/kohsuke/github/GitHub.java +++ b/src/main/java/org/kohsuke/github/GitHub.java @@ -193,7 +193,7 @@ public static GitHub connectAnonymously() throws IOException { } /*package*/ void requireCredential() { - if (login==null || encodedAuthorization==null) + if (login==null && encodedAuthorization==null) throw new IllegalStateException("This operation requires a credential but none is given to the GitHub constructor"); } From 5410ba3b1da65152edef35708c2127fc3a825e18 Mon Sep 17 00:00:00 2001 From: Aaron Crickenberger Date: Wed, 1 May 2013 13:59:45 -0700 Subject: [PATCH 3/6] Force issues-based API route for PR comments pulls/:number/comments is used for review_comments --- src/main/java/org/kohsuke/github/GHIssue.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/kohsuke/github/GHIssue.java b/src/main/java/org/kohsuke/github/GHIssue.java index 6cf376df19..636ebb7c51 100644 --- a/src/main/java/org/kohsuke/github/GHIssue.java +++ b/src/main/java/org/kohsuke/github/GHIssue.java @@ -138,7 +138,7 @@ public URL getApiURL(){ * Updates the issue by adding a comment. */ public void comment(String message) throws IOException { - new Requester(root).with("body",message).to(getApiRoute() + "/comments"); + new Requester(root).with("body",message).to(getIssuesApiRoute() + "/comments"); } private void edit(String key, Object value) throws IOException { @@ -190,7 +190,7 @@ public List getComments() throws IOException { public PagedIterable listComments() throws IOException { return new PagedIterable() { public PagedIterator iterator() { - return new PagedIterator(root.retrieve().asIterator(getApiRoute() + "/comments", GHIssueComment[].class)) { + return new PagedIterator(root.retrieve().asIterator(getIssuesApiRoute() + "/comments", GHIssueComment[].class)) { protected void wrapUp(GHIssueComment[] page) { for (GHIssueComment c : page) c.wrapUp(GHIssue.this); @@ -201,6 +201,10 @@ protected void wrapUp(GHIssueComment[] page) { } protected String getApiRoute() { + return getIssuesApiRoute(); + } + + private String getIssuesApiRoute() { return "/repos/"+owner.getOwnerName()+"/"+owner.getName()+"/issues/"+number; } @@ -250,4 +254,4 @@ public URL getUrl() { return GitHub.parseURL(html_url); } } -} \ No newline at end of file +} From 0d2ecfbc6749c9e2c0bf8ee48bb8ed8cc00e523f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Br=C3=A1zdil?= Date: Thu, 2 May 2013 18:11:40 +0200 Subject: [PATCH 4/6] add repository to Pull Request payload and wrap the PR with the repository --- src/main/java/org/kohsuke/github/GHEventPayload.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/kohsuke/github/GHEventPayload.java b/src/main/java/org/kohsuke/github/GHEventPayload.java index 5d666f5090..69b961473a 100644 --- a/src/main/java/org/kohsuke/github/GHEventPayload.java +++ b/src/main/java/org/kohsuke/github/GHEventPayload.java @@ -27,6 +27,7 @@ public static class PullRequest extends GHEventPayload { private String action; private int number; private GHPullRequest pull_request; + private GHRepository repository; public String getAction() { return action; @@ -41,10 +42,15 @@ public GHPullRequest getPullRequest() { return pull_request; } + public GHRepository getRepository() { + return repository; + } + @Override void wrapUp(GitHub root) { super.wrapUp(root); - pull_request.wrapUp(root); + repository.wrap(root); + pull_request.wrap(repository); } } From b932ba856d832f4cdf3f310a4c8c07c2ff3f85ad Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 7 May 2013 11:07:12 -0700 Subject: [PATCH 5/6] fixed NPE --- src/main/java/org/kohsuke/github/GHEventPayload.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/kohsuke/github/GHEventPayload.java b/src/main/java/org/kohsuke/github/GHEventPayload.java index 69b961473a..0e0b7054e3 100644 --- a/src/main/java/org/kohsuke/github/GHEventPayload.java +++ b/src/main/java/org/kohsuke/github/GHEventPayload.java @@ -49,8 +49,12 @@ public GHRepository getRepository() { @Override void wrapUp(GitHub root) { super.wrapUp(root); - repository.wrap(root); - pull_request.wrap(repository); + if (repository!=null) { + repository.wrap(root); + pull_request.wrap(repository); + } else { + pull_request.wrapUp(root); + } } } From 435be772499694759f93cc3bb8fb31a64fbe9cd3 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Tue, 7 May 2013 11:09:13 -0700 Subject: [PATCH 6/6] [maven-release-plugin] prepare release github-api-1.42 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8705e7e8cb..d89670607b 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ github-api - 1.42-SNAPSHOT + 1.42 GitHub API for Java http://github-api.kohsuke.org/ GitHub API for Java