Compare commits

...

9 Commits

Author SHA1 Message Date
Kohsuke Kawaguchi
435be77249 [maven-release-plugin] prepare release github-api-1.42 2013-05-07 11:09:13 -07:00
Kohsuke Kawaguchi
b932ba856d fixed NPE 2013-05-07 11:07:12 -07:00
Kohsuke Kawaguchi
094514f617 Merge pull request #36 from spiffxp/require-credentials-fix
Allow oauthToken to be used without login
2013-05-06 14:34:06 -07:00
Kohsuke Kawaguchi
fab96879d0 Merge pull request #37 from spiffxp/pr-comments-fix
Force issues-based API route for PR comments
2013-05-06 14:33:29 -07:00
Kohsuke Kawaguchi
367a5f0c57 Merge pull request #38 from janinko/fixPullRequestPayload
add repository to Pull Request payload and wrap the PR with the repository
2013-05-06 14:32:11 -07:00
Honza Brázdil
0d2ecfbc67 add repository to Pull Request payload and wrap the PR with the repository 2013-05-02 18:11:40 +02:00
Aaron Crickenberger
5410ba3b1d Force issues-based API route for PR comments
pulls/:number/comments is used for review_comments
2013-05-01 13:59:45 -07:00
Aaron Crickenberger
716bfd4611 requireCredential should allow for oauthToken with no login 2013-04-30 15:41:08 -07:00
Kohsuke Kawaguchi
3830a58493 [maven-release-plugin] prepare for next development iteration 2013-04-23 10:30:54 -07:00
4 changed files with 20 additions and 6 deletions

View File

@@ -7,7 +7,7 @@
</parent> </parent>
<artifactId>github-api</artifactId> <artifactId>github-api</artifactId>
<version>1.41</version> <version>1.42</version>
<name>GitHub API for Java</name> <name>GitHub API for Java</name>
<url>http://github-api.kohsuke.org/</url> <url>http://github-api.kohsuke.org/</url>
<description>GitHub API for Java</description> <description>GitHub API for Java</description>

View File

@@ -27,6 +27,7 @@ public abstract class GHEventPayload {
private String action; private String action;
private int number; private int number;
private GHPullRequest pull_request; private GHPullRequest pull_request;
private GHRepository repository;
public String getAction() { public String getAction() {
return action; return action;
@@ -41,10 +42,19 @@ public abstract class GHEventPayload {
return pull_request; return pull_request;
} }
public GHRepository getRepository() {
return repository;
}
@Override @Override
void wrapUp(GitHub root) { void wrapUp(GitHub root) {
super.wrapUp(root); super.wrapUp(root);
pull_request.wrapUp(root); if (repository!=null) {
repository.wrap(root);
pull_request.wrap(repository);
} else {
pull_request.wrapUp(root);
}
} }
} }

View File

@@ -138,7 +138,7 @@ public class GHIssue {
* Updates the issue by adding a comment. * Updates the issue by adding a comment.
*/ */
public void comment(String message) throws IOException { 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 { private void edit(String key, Object value) throws IOException {
@@ -190,7 +190,7 @@ public class GHIssue {
public PagedIterable<GHIssueComment> listComments() throws IOException { public PagedIterable<GHIssueComment> listComments() throws IOException {
return new PagedIterable<GHIssueComment>() { return new PagedIterable<GHIssueComment>() {
public PagedIterator<GHIssueComment> iterator() { public PagedIterator<GHIssueComment> iterator() {
return new PagedIterator<GHIssueComment>(root.retrieve().asIterator(getApiRoute() + "/comments", GHIssueComment[].class)) { return new PagedIterator<GHIssueComment>(root.retrieve().asIterator(getIssuesApiRoute() + "/comments", GHIssueComment[].class)) {
protected void wrapUp(GHIssueComment[] page) { protected void wrapUp(GHIssueComment[] page) {
for (GHIssueComment c : page) for (GHIssueComment c : page)
c.wrapUp(GHIssue.this); c.wrapUp(GHIssue.this);
@@ -201,6 +201,10 @@ public class GHIssue {
} }
protected String getApiRoute() { protected String getApiRoute() {
return getIssuesApiRoute();
}
private String getIssuesApiRoute() {
return "/repos/"+owner.getOwnerName()+"/"+owner.getName()+"/issues/"+number; return "/repos/"+owner.getOwnerName()+"/"+owner.getName()+"/issues/"+number;
} }

View File

@@ -193,7 +193,7 @@ public class GitHub {
} }
/*package*/ void requireCredential() { /*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"); throw new IllegalStateException("This operation requires a credential but none is given to the GitHub constructor");
} }