Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 2aa4022

Browse filesBrowse files
martinvanzijlmartinvanzijl
committed
Updated per review.
- Created separate class for GHIssueEvent instead of nested classes. - Renamed test class accordingly. Other fixes: - Changed id type to long. - Updated test cases. - Added toString() method.
1 parent b40741b commit 2aa4022
Copy full SHA for 2aa4022

File tree

Expand file treeCollapse file tree

51 files changed

+37130
-188
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

51 files changed

+37130
-188
lines changed

‎src/main/java/org/kohsuke/github/GHIssue.java

Copy file name to clipboardExpand all lines: src/main/java/org/kohsuke/github/GHIssue.java
+7-61Lines changed: 7 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -431,72 +431,18 @@ public URL getUrl() {
431431
}
432432
}
433433

434-
public static class IssueEventInfo {
435-
private GitHub root;
436-
437-
private int id;
438-
private String node_id;
439-
private String url;
440-
private GHUser actor;
441-
private String event;
442-
private String commit_id;
443-
private String commit_url;
444-
private String created_at;
445-
446-
public int getId() {
447-
return id;
448-
}
449-
450-
public String getNodeId() {
451-
return node_id;
452-
}
453-
454-
public String getUrl() {
455-
return url;
456-
}
457-
458-
public GHUser getActor() {
459-
return actor;
460-
}
461-
462-
public String getEvent() {
463-
return event;
464-
}
465-
466-
public String getCommitId() {
467-
return commit_id;
468-
}
469-
470-
public String getCommitUrl() {
471-
return commit_url;
472-
}
473-
474-
public Date getCreatedAt() {
475-
return GitHub.parseDate(created_at);
476-
}
477-
478-
public IssueEventInfo wrapUp(GitHub root) {
479-
this.root = root;
480-
return this;
481-
}
482-
483-
public GitHub getRoot() {
484-
return root;
485-
}
486-
}
487-
488434
/**
489435
* Lists events for this issue.
490436
* See https://developer.github.com/v3/issues/events/
491437
*/
492-
public PagedIterable<IssueEventInfo> listEvents() throws IOException {
493-
return new PagedIterable<IssueEventInfo>() {
494-
public PagedIterator<IssueEventInfo> _iterator(int pageSize) {
495-
return new PagedIterator<IssueEventInfo>(root.retrieve().asIterator(owner.getApiTailUrl(String.format("/issues/%s/events", number)), IssueEventInfo[].class, pageSize)) {
438+
public PagedIterable<GHIssueEvent> listEvents() throws IOException {
439+
return new PagedIterable<GHIssueEvent>() {
440+
public PagedIterator<GHIssueEvent> _iterator(int pageSize) {
441+
return new PagedIterator<GHIssueEvent>(root.retrieve().asIterator(owner.getApiTailUrl(String.format("/issues/%s/events", number)), GHIssueEvent[].class, pageSize)) {
496442
@Override
497-
protected void wrapUp(IssueEventInfo[] page) {
498-
for (IssueEventInfo c : page)
499-
c.wrapUp(root);
443+
protected void wrapUp(GHIssueEvent[] page) {
444+
for (GHIssueEvent c : page)
445+
c.wrapUp(GHIssue.this);
500446
}
501447
};
502448
}

‎src/main/java/org/kohsuke/github/GHIssueEvent.java

Copy file name to clipboard
+81Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
package org.kohsuke.github;
2+
3+
import java.util.Date;
4+
5+
/**
6+
* @author Martin van Zijl
7+
*/
8+
public class GHIssueEvent {
9+
private GitHub root;
10+
11+
private long id;
12+
private String node_id;
13+
private String url;
14+
private GHUser actor;
15+
private String event;
16+
private String commit_id;
17+
private String commit_url;
18+
private String created_at;
19+
20+
private GHIssue issue;
21+
22+
public long getId() {
23+
return id;
24+
}
25+
26+
public String getNodeId() {
27+
return node_id;
28+
}
29+
30+
public String getUrl() {
31+
return url;
32+
}
33+
34+
public GHUser getActor() {
35+
return actor;
36+
}
37+
38+
public String getEvent() {
39+
return event;
40+
}
41+
42+
public String getCommitId() {
43+
return commit_id;
44+
}
45+
46+
public String getCommitUrl() {
47+
return commit_url;
48+
}
49+
50+
public Date getCreatedAt() {
51+
return GitHub.parseDate(created_at);
52+
}
53+
54+
public GitHub getRoot() {
55+
return root;
56+
}
57+
58+
public GHIssue getIssue() {
59+
return issue;
60+
}
61+
62+
public GHIssueEvent wrapUp(GitHub root) {
63+
this.root = root;
64+
return this;
65+
}
66+
67+
public GHIssueEvent wrapUp(GHIssue parent) {
68+
this.issue = parent;
69+
this.root = parent.root;
70+
return this;
71+
}
72+
73+
@Override
74+
public String toString() {
75+
return String.format("Issue %d was %s by %s on %s",
76+
getIssue().getNumber(),
77+
getEvent(),
78+
getActor().getLogin(),
79+
getCreatedAt().toString());
80+
}
81+
}

‎src/main/java/org/kohsuke/github/GHRepository.java

Copy file name to clipboardExpand all lines: src/main/java/org/kohsuke/github/GHRepository.java
+8-67Lines changed: 8 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1776,76 +1776,17 @@ String getApiTailUrl(String tail) {
17761776
return "/repos/" + getOwnerName() + "/" + name +tail;
17771777
}
17781778

1779-
public static class IssueEventInfo {
1780-
private GitHub root;
1781-
1782-
private long id;
1783-
private String node_id;
1784-
private String url;
1785-
private GHUser actor;
1786-
private String event;
1787-
private String commit_id;
1788-
private String commit_url;
1789-
private String created_at;
1790-
private GHIssue issue;
1791-
1792-
public long getId() {
1793-
return id;
1794-
}
1795-
1796-
public String getNodeId() {
1797-
return node_id;
1798-
}
1799-
1800-
public String getUrl() {
1801-
return url;
1802-
}
1803-
1804-
public GHUser getActor() {
1805-
return actor;
1806-
}
1807-
1808-
public String getEvent() {
1809-
return event;
1810-
}
1811-
1812-
public String getCommitId() {
1813-
return commit_id;
1814-
}
1815-
1816-
public String getCommitUrl() {
1817-
return commit_url;
1818-
}
1819-
1820-
public Date getCreatedAt() {
1821-
return GitHub.parseDate(created_at);
1822-
}
1823-
1824-
public IssueEventInfo wrapUp(GitHub root) {
1825-
this.root = root;
1826-
return this;
1827-
}
1828-
1829-
public GitHub getRoot() {
1830-
return root;
1831-
}
1832-
1833-
public GHIssue getIssue() {
1834-
return issue;
1835-
}
1836-
}
1837-
18381779
/**
18391780
* Get all issue events for this repository.
18401781
* See https://developer.github.com/v3/issues/events/#list-events-for-a-repository
18411782
*/
1842-
public PagedIterable<IssueEventInfo> listIssueEvents() throws IOException {
1843-
return new PagedIterable<IssueEventInfo>() {
1844-
public PagedIterator<IssueEventInfo> _iterator(int pageSize) {
1845-
return new PagedIterator<IssueEventInfo>(root.retrieve().asIterator(getApiTailUrl("issues/events"), IssueEventInfo[].class, pageSize)) {
1783+
public PagedIterable<GHIssueEvent> listIssueEvents() throws IOException {
1784+
return new PagedIterable<GHIssueEvent>() {
1785+
public PagedIterator<GHIssueEvent> _iterator(int pageSize) {
1786+
return new PagedIterator<GHIssueEvent>(root.retrieve().asIterator(getApiTailUrl("issues/events"), GHIssueEvent[].class, pageSize)) {
18461787
@Override
1847-
protected void wrapUp(IssueEventInfo[] page) {
1848-
for (IssueEventInfo c : page)
1788+
protected void wrapUp(GHIssueEvent[] page) {
1789+
for (GHIssueEvent c : page)
18491790
c.wrapUp(root);
18501791
}
18511792
};
@@ -1857,7 +1798,7 @@ protected void wrapUp(IssueEventInfo[] page) {
18571798
* Get a single issue event.
18581799
* See https://developer.github.com/v3/issues/events/#get-a-single-event
18591800
*/
1860-
public IssueEventInfo getIssueEvent(int id) throws IOException {
1861-
return root.retrieve().to(getApiTailUrl("issues/events/" + id), IssueEventInfo.class).wrapUp(root);
1801+
public GHIssueEvent getIssueEvent(long id) throws IOException {
1802+
return root.retrieve().to(getApiTailUrl("issues/events/" + id), GHIssueEvent.class).wrapUp(root);
18621803
}
18631804
}

‎src/test/java/org/kohsuke/github/GHIssueEventTest.java

Copy file name to clipboard
+50Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
package org.kohsuke.github;
2+
3+
import java.io.IOException;
4+
import org.junit.Test;
5+
6+
/**
7+
* @author Martin van Zijl
8+
*/
9+
public class GHIssueEventTest extends AbstractGitHubApiTestBase {
10+
11+
@Test
12+
public void testEventsForSingleIssue() throws Exception {
13+
GHRepository repo = getRepository();
14+
GHIssue issue = repo.getIssue(1);
15+
16+
for (GHIssueEvent event : issue.listEvents()) {
17+
System.out.println(event);
18+
}
19+
20+
//TODO: Use the following...
21+
//GHIssueBuilder builder = repo.createIssue("test from the api");
22+
//GHIssue issue = builder.create();
23+
}
24+
25+
@Test
26+
public void testRepositoryEvents() throws Exception {
27+
GHRepository repo = getRepository();
28+
PagedIterable<GHIssueEvent> list = repo.listIssueEvents();
29+
30+
for (GHIssueEvent event : list) {
31+
System.out.println(event);
32+
}
33+
}
34+
35+
@Test
36+
public void testRepositorySingleEvent() throws Exception {
37+
GHRepository repo = getRepository();
38+
GHIssueEvent event = repo.getIssueEvent(2615868520L);
39+
40+
System.out.println(event);
41+
}
42+
43+
protected GHRepository getRepository() throws IOException {
44+
return getRepository(gitHub);
45+
}
46+
47+
private GHRepository getRepository(GitHub gitHub) throws IOException {
48+
return gitHub.getOrganization("github-api-test-org").getRepository("github-api");
49+
}
50+
}

‎src/test/java/org/kohsuke/github/IssueEventsTest.java

Copy file name to clipboardExpand all lines: src/test/java/org/kohsuke/github/IssueEventsTest.java
-60Lines changed: 0 additions & 60 deletions
This file was deleted.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.