From 7067ce6eec9767528bca799309cc32386cb70abe Mon Sep 17 00:00:00 2001
From: Nicolas Widart <n.widart@gmail.com>
Date: Wed, 15 May 2019 22:56:06 +0200
Subject: [PATCH 01/13] Adding a method to get all closed issues

---
 .../issuebot/github/GitHubOperations.java     |  9 +++++++
 .../issuebot/github/GitHubTemplate.java       |  7 +++++
 .../issuebot/github/GitHubTemplateTests.java  | 27 +++++++++++++++++++
 3 files changed, 43 insertions(+)

diff --git a/src/main/java/io/spring/issuebot/github/GitHubOperations.java b/src/main/java/io/spring/issuebot/github/GitHubOperations.java
index b7e19d7..dc58974 100644
--- a/src/main/java/io/spring/issuebot/github/GitHubOperations.java
+++ b/src/main/java/io/spring/issuebot/github/GitHubOperations.java
@@ -32,6 +32,15 @@ public interface GitHubOperations {
 	 */
 	Page<Issue> getIssues(String organization, String repository);
 
+	/**
+	 * Returns the closed issues in the {@code repository} owned by the given
+	 * {@code organization}.
+	 * @param organization the name of the organization
+	 * @param repository the name of the repository
+	 * @return the issues
+	 */
+	Page<Issue> getClosedIssues(String organization, String repository);
+
 	/**
 	 * Returns the comments that have been made on the given {@code issue}.
 	 * @param issue the issue
diff --git a/src/main/java/io/spring/issuebot/github/GitHubTemplate.java b/src/main/java/io/spring/issuebot/github/GitHubTemplate.java
index acd5e19..d457292 100644
--- a/src/main/java/io/spring/issuebot/github/GitHubTemplate.java
+++ b/src/main/java/io/spring/issuebot/github/GitHubTemplate.java
@@ -113,6 +113,13 @@ public Page<Issue> getIssues(String organization, String repository) {
 		return getPage(url, Issue[].class);
 	}
 
+	@Override
+	public Page<Issue> getClosedIssues(String organization, String repository) {
+		String url = "https://api.github.com/repos/" + organization + "/" + repository
+				+ "/issues?state=closed";
+		return getPage(url, Issue[].class);
+	}
+
 	@Override
 	public Page<Comment> getComments(Issue issue) {
 		return getPage(issue.getCommentsUrl(), Comment[].class);
diff --git a/src/test/java/io/spring/issuebot/github/GitHubTemplateTests.java b/src/test/java/io/spring/issuebot/github/GitHubTemplateTests.java
index 06170b0..a7043af 100644
--- a/src/test/java/io/spring/issuebot/github/GitHubTemplateTests.java
+++ b/src/test/java/io/spring/issuebot/github/GitHubTemplateTests.java
@@ -80,6 +80,16 @@ public void singlePageOfIssues() {
 		assertThat(issues.next()).isNull();
 	}
 
+	@Test
+	public void singlePageOfClosedIssue() {
+		this.server.expect(requestTo("https://api.github.com/repos/org/repo/issues?state=closed"))
+				.andExpect(method(HttpMethod.GET)).andExpect(basicAuth())
+				.andRespond(withResource("issues-page-one.json"));
+		Page<Issue> issues = this.gitHub.getClosedIssues("org", "repo");
+		assertThat(issues.getContent()).hasSize(15);
+		assertThat(issues.next()).isNull();
+	}
+
 	@Test
 	public void multiplePagesOfIssues() {
 		HttpHeaders headers = new HttpHeaders();
@@ -97,6 +107,23 @@ public void multiplePagesOfIssues() {
 		assertThat(pageTwo.getContent()).hasSize(15);
 	}
 
+	@Test
+	public void multiplePagesOfClosedIssues() {
+		HttpHeaders headers = new HttpHeaders();
+		headers.set("Link", "<page-two>; rel=\"next\"");
+		this.server.expect(requestTo("https://api.github.com/repos/org/repo/issues?state=closed"))
+				.andExpect(method(HttpMethod.GET)).andExpect(basicAuth())
+				.andRespond(withResource("issues-page-one.json",
+						"Link:<page-two>; rel=\"next\""));
+		this.server.expect(requestTo("/page-two")).andExpect(method(HttpMethod.GET))
+				.andExpect(basicAuth()).andRespond(withResource("issues-page-two.json"));
+		Page<Issue> pageOne = this.gitHub.getClosedIssues("org", "repo");
+		assertThat(pageOne.getContent()).hasSize(15);
+		Page<Issue> pageTwo = pageOne.next();
+		assertThat(pageTwo).isNotNull();
+		assertThat(pageTwo.getContent()).hasSize(15);
+	}
+
 	@Test
 	public void rateLimited() {
 		long reset = System.currentTimeMillis();

From 92514ed59f12136950572ab35c0684d9bfd87178 Mon Sep 17 00:00:00 2001
From: Nicolas Widart <n.widart@gmail.com>
Date: Thu, 16 May 2019 09:23:03 +0200
Subject: [PATCH 02/13] Adding the issue state field (open/closed)

---
 .../issuebot/github/GitHubTemplate.java       |  4 +--
 .../java/io/spring/issuebot/github/Issue.java | 20 ++++++++++++--
 .../issuebot/RepositoryMonitorTests.java      | 26 +++++++++++++++----
 .../feedback/FeedbackIssueListenerTests.java  | 18 ++++++-------
 .../StandardFeedbackListenerTests.java        |  2 +-
 .../issuebot/github/GitHubTemplateTests.java  | 20 +++++++-------
 .../LabelApplyingTriageListenerTests.java     |  2 +-
 .../triage/LabelledTriageFilterTests.java     |  6 ++---
 .../MilestoneAppliedTriageFilterTests.java    |  4 +--
 ...OpenedByCollaboratorTriageFilterTests.java |  4 +--
 .../triage/TriageIssueListenerTests.java      | 13 ++++++++--
 11 files changed, 80 insertions(+), 39 deletions(-)

diff --git a/src/main/java/io/spring/issuebot/github/GitHubTemplate.java b/src/main/java/io/spring/issuebot/github/GitHubTemplate.java
index d457292..602b9ea 100644
--- a/src/main/java/io/spring/issuebot/github/GitHubTemplate.java
+++ b/src/main/java/io/spring/issuebot/github/GitHubTemplate.java
@@ -156,7 +156,7 @@ public Issue addLabel(Issue issue, String labelName) {
 		}
 		return new Issue(issue.getUrl(), issue.getCommentsUrl(), issue.getEventsUrl(),
 				issue.getLabelsUrl(), issue.getUser(), Arrays.asList(response.getBody()),
-				issue.getMilestone(), issue.getPullRequest());
+				issue.getMilestone(), issue.getPullRequest(), issue.getState());
 	}
 
 	@Override
@@ -178,7 +178,7 @@ public Issue removeLabel(Issue issue, String labelName) {
 		}
 		return new Issue(issue.getUrl(), issue.getCommentsUrl(), issue.getEventsUrl(),
 				issue.getLabelsUrl(), issue.getUser(), Arrays.asList(response.getBody()),
-				issue.getMilestone(), issue.getPullRequest());
+				issue.getMilestone(), issue.getPullRequest(), issue.getState());
 	}
 
 	@Override
diff --git a/src/main/java/io/spring/issuebot/github/Issue.java b/src/main/java/io/spring/issuebot/github/Issue.java
index f81d11a..ea25241 100644
--- a/src/main/java/io/spring/issuebot/github/Issue.java
+++ b/src/main/java/io/spring/issuebot/github/Issue.java
@@ -44,6 +44,8 @@ public class Issue {
 
 	private final PullRequest pullRequest;
 
+	private final String state;
+
 	/**
 	 * Creates a new {@code Issue}.
 	 * @param url the url of the issue in the GitHub API
@@ -54,6 +56,7 @@ public class Issue {
 	 * @param labels the labels applied to the issue
 	 * @param milestone the milestone applied to the issue
 	 * @param pullRequest details of the pull request (if this issue is a pull request)
+	 * @param state the state of the issue, open or closed
 	 */
 	@JsonCreator
 	public Issue(@JsonProperty("url") String url,
@@ -62,7 +65,8 @@ public Issue(@JsonProperty("url") String url,
 			@JsonProperty("labels_url") String labelsUrl, @JsonProperty("user") User user,
 			@JsonProperty("labels") List<Label> labels,
 			@JsonProperty("milestone") Milestone milestone,
-			@JsonProperty("pull_request") PullRequest pullRequest) {
+			@JsonProperty("pull_request") PullRequest pullRequest,
+			@JsonProperty("state") String state) {
 		this.url = url;
 		this.commentsUrl = commentsUrl;
 		this.eventsUrl = eventsUrl;
@@ -71,6 +75,7 @@ public Issue(@JsonProperty("url") String url,
 		this.labels = labels;
 		this.milestone = milestone;
 		this.pullRequest = pullRequest;
+		this.state = state;
 	}
 
 	String getUrl() {
@@ -105,9 +110,20 @@ public PullRequest getPullRequest() {
 		return this.pullRequest;
 	}
 
+	public String getState() {
+		return state;
+	}
+
+	public boolean isOpen() {
+		return this.getState().equals("open");
+	}
+
+	public boolean isClosed() {
+		return this.getState().equals("closed");
+	}
+
 	@Override
 	public String toString() {
 		return this.url;
 	}
-
 }
diff --git a/src/test/java/io/spring/issuebot/RepositoryMonitorTests.java b/src/test/java/io/spring/issuebot/RepositoryMonitorTests.java
index 7a2b499..8bba750 100644
--- a/src/test/java/io/spring/issuebot/RepositoryMonitorTests.java
+++ b/src/test/java/io/spring/issuebot/RepositoryMonitorTests.java
@@ -71,8 +71,8 @@ public void repositoriesWithNoIssues() {
 	public void oneRepositoryWithOpenIssues() {
 		@SuppressWarnings("unchecked")
 		Page<Issue> page = mock(Page.class);
-		Issue issueOne = new Issue(null, null, null, null, null, null, null, null);
-		Issue issueTwo = new Issue(null, null, null, null, null, null, null, null);
+		Issue issueOne = new Issue(null, null, null, null, null, null, null, null, null);
+		Issue issueTwo = new Issue(null, null, null, null, null, null, null, null, null);
 		given(page.getContent()).willReturn(Arrays.asList(issueOne, issueTwo));
 		given(this.gitHub.getIssues("test", "one")).willReturn(page);
 		given(this.gitHub.getIssues("test", "two")).willReturn(null);
@@ -83,12 +83,28 @@ public void oneRepositoryWithOpenIssues() {
 		verify(this.issueListenerTwo).onOpenIssue(this.repositoryOne, issueTwo);
 	}
 
+	@Test
+	public void onRepositoryWithClosedIssues() {
+		@SuppressWarnings("unchecked")
+		Page<Issue> page = mock(Page.class);
+		Issue issueOne = new Issue(null, null, null, null, null, null, null, null, null);
+		Issue issueTwo = new Issue(null, null, null, null, null, null, null, null, null);
+		given(page.getContent()).willReturn(Arrays.asList(issueOne, issueTwo));
+		given(this.gitHub.getClosedIssues("test", "one")).willReturn(page);
+		given(this.gitHub.getClosedIssues("test", "two")).willReturn(null);
+		this.repositoryMonitor.monitor();
+		verify(this.issueListenerOne).onIssueClosure(this.repositoryOne, issueOne);
+		verify(this.issueListenerOne).onIssueClosure(this.repositoryOne, issueTwo);
+		verify(this.issueListenerTwo).onIssueClosure(this.repositoryOne, issueOne);
+		verify(this.issueListenerTwo).onIssueClosure(this.repositoryOne, issueTwo);
+	}
+
 	@Test
 	public void bothRepositoriesWithOpenIssues() {
 		@SuppressWarnings("unchecked")
 		Page<Issue> page = mock(Page.class);
-		Issue issueOne = new Issue(null, null, null, null, null, null, null, null);
-		Issue issueTwo = new Issue(null, null, null, null, null, null, null, null);
+		Issue issueOne = new Issue(null, null, null, null, null, null, null, null, null);
+		Issue issueTwo = new Issue(null, null, null, null, null, null, null, null, null);
 		given(page.getContent()).willReturn(Arrays.asList(issueOne, issueTwo));
 		given(this.gitHub.getIssues("test", "one")).willReturn(page);
 		given(this.gitHub.getIssues("test", "two")).willReturn(page);
@@ -107,7 +123,7 @@ public void bothRepositoriesWithOpenIssues() {
 	public void exceptionFromAnIssueListenerIsHandledGracefully() {
 		@SuppressWarnings("unchecked")
 		Page<Issue> page = mock(Page.class);
-		Issue issue = new Issue(null, null, null, null, null, null, null, null);
+		Issue issue = new Issue(null, null, null, null, null, null, null, null, null);
 		given(page.getContent()).willReturn(Arrays.asList(issue));
 		given(this.gitHub.getIssues("test", "one")).willReturn(page);
 		willThrow(new RuntimeException()).given(this.issueListenerOne)
diff --git a/src/test/java/io/spring/issuebot/feedback/FeedbackIssueListenerTests.java b/src/test/java/io/spring/issuebot/feedback/FeedbackIssueListenerTests.java
index 93669d7..5cfbb81 100644
--- a/src/test/java/io/spring/issuebot/feedback/FeedbackIssueListenerTests.java
+++ b/src/test/java/io/spring/issuebot/feedback/FeedbackIssueListenerTests.java
@@ -67,7 +67,7 @@ public void setUp() {
 	@Test
 	public void pullRequestsAreIgnored() {
 		Issue issue = new Issue(null, null, null, null, null,
-				Arrays.asList(new Label("required")), null, new PullRequest("url"));
+				Arrays.asList(new Label("required")), null, new PullRequest("url"), null);
 		this.listener.onOpenIssue(this.repository, issue);
 		verifyNoMoreInteractions(this.gitHub, this.feedbackListener);
 	}
@@ -75,7 +75,7 @@ public void pullRequestsAreIgnored() {
 	@Test
 	public void issuesWithFeedbackRequiredLabelAreIgnored() {
 		Issue issue = new Issue(null, null, null, null, null,
-				Arrays.asList(new Label("something-else")), null, null);
+				Arrays.asList(new Label("something-else")), null, null, null);
 		this.listener.onOpenIssue(this.repository, issue);
 		verifyNoMoreInteractions(this.gitHub, this.feedbackListener);
 	}
@@ -83,7 +83,7 @@ public void issuesWithFeedbackRequiredLabelAreIgnored() {
 	@Test
 	public void feedbackRequiredForLabeledIssueWithEvent() {
 		Issue issue = new Issue(null, null, null, null, null,
-				Arrays.asList(new Label("required")), null, null);
+				Arrays.asList(new Label("required")), null, null, null);
 		OffsetDateTime requestTime = OffsetDateTime.now();
 		given(this.gitHub.getEvents(issue)).willReturn(new StandardPage<>(
 				Arrays.asList(new Event("labeled", requestTime, new Label("required"))),
@@ -96,7 +96,7 @@ public void feedbackRequiredForLabeledIssueWithEvent() {
 	@Test
 	public void feedbackProvidedAfterCommentFromNonCollaborator() {
 		Issue issue = new Issue("issue_url", null, null, null, null,
-				Arrays.asList(new Label("required")), null, null);
+				Arrays.asList(new Label("required")), null, null, null);
 		OffsetDateTime requestTime = OffsetDateTime.now().minusDays(1);
 		given(this.gitHub.getEvents(issue)).willReturn(new StandardPage<>(
 				Arrays.asList(new Event("labeled", requestTime, new Label("required"))),
@@ -111,7 +111,7 @@ public void feedbackProvidedAfterCommentFromNonCollaborator() {
 	@Test
 	public void feedbackRequiredAfterCommentFromNonCollaboratorBeforeRequest() {
 		Issue issue = new Issue("issue_url", null, null, null, null,
-				Arrays.asList(new Label("required")), null, null);
+				Arrays.asList(new Label("required")), null, null, null);
 		OffsetDateTime requestTime = OffsetDateTime.now().minusDays(1);
 		given(this.gitHub.getEvents(issue)).willReturn(new StandardPage<>(
 				Arrays.asList(new Event("labeled", requestTime, new Label("required"))),
@@ -127,7 +127,7 @@ public void feedbackRequiredAfterCommentFromNonCollaboratorBeforeRequest() {
 	@Test
 	public void feedbackRequiredAfterCommentFromCollaborator() {
 		Issue issue = new Issue(null, null, null, null, null,
-				Arrays.asList(new Label("required")), null, null);
+				Arrays.asList(new Label("required")), null, null, null);
 		OffsetDateTime requestTime = OffsetDateTime.now().minusDays(1);
 		given(this.gitHub.getEvents(issue)).willReturn(new StandardPage<>(
 				Arrays.asList(new Event("labeled", requestTime, new Label("required"))),
@@ -143,7 +143,7 @@ public void feedbackRequiredAfterCommentFromCollaborator() {
 	@Test
 	public void feedbackRequiredAfterCommentFromIssueBot() {
 		Issue issue = new Issue(null, null, null, null, null,
-				Arrays.asList(new Label("required")), null, null);
+				Arrays.asList(new Label("required")), null, null, null);
 		OffsetDateTime requestTime = OffsetDateTime.now().minusDays(1);
 		given(this.gitHub.getEvents(issue)).willReturn(new StandardPage<>(
 				Arrays.asList(new Event("labeled", requestTime, new Label("required"))),
@@ -159,7 +159,7 @@ public void feedbackRequiredAfterCommentFromIssueBot() {
 	@Test
 	public void issueWithNoMatchingLabeledEventIsIgnored() {
 		Issue issue = new Issue(null, null, null, null, null,
-				Arrays.asList(new Label("required")), null, null);
+				Arrays.asList(new Label("required")), null, null, null);
 		OffsetDateTime requestTime = OffsetDateTime.now();
 		given(this.gitHub.getEvents(issue)).willReturn(new StandardPage<>(
 				Arrays.asList(
@@ -172,7 +172,7 @@ public void issueWithNoMatchingLabeledEventIsIgnored() {
 	@Test
 	public void eventsWithWrongTypeAreIgnored() {
 		Issue issue = new Issue(null, null, null, null, null,
-				Arrays.asList(new Label("required")), null, null);
+				Arrays.asList(new Label("required")), null, null, null);
 		OffsetDateTime requestTime = OffsetDateTime.now();
 		given(this.gitHub.getEvents(issue)).willReturn(new StandardPage<>(
 				Arrays.asList(new Event("milestoned", requestTime, null)), () -> null));
diff --git a/src/test/java/io/spring/issuebot/feedback/StandardFeedbackListenerTests.java b/src/test/java/io/spring/issuebot/feedback/StandardFeedbackListenerTests.java
index a93c558..9b3070c 100644
--- a/src/test/java/io/spring/issuebot/feedback/StandardFeedbackListenerTests.java
+++ b/src/test/java/io/spring/issuebot/feedback/StandardFeedbackListenerTests.java
@@ -48,7 +48,7 @@ public class StandardFeedbackListenerTests {
 			Arrays.asList(this.issueListener));
 
 	private final Issue issue = new Issue(null, null, null, null, null, new ArrayList<>(),
-			null, null);
+			null, null, null);
 
 	private final Repository repository = new Repository();
 
diff --git a/src/test/java/io/spring/issuebot/github/GitHubTemplateTests.java b/src/test/java/io/spring/issuebot/github/GitHubTemplateTests.java
index a7043af..30b3c6f 100644
--- a/src/test/java/io/spring/issuebot/github/GitHubTemplateTests.java
+++ b/src/test/java/io/spring/issuebot/github/GitHubTemplateTests.java
@@ -145,7 +145,7 @@ public void noComments() {
 				.andExpect(basicAuth())
 				.andRespond(withSuccess("[]", MediaType.APPLICATION_JSON));
 		Page<Comment> comments = this.gitHub.getComments(
-				new Issue(null, "commentsUrl", null, null, null, null, null, null));
+				new Issue(null, "commentsUrl", null, null, null, null, null, null, null));
 		assertThat(comments.getContent()).isEmpty();
 		assertThat(comments.next()).isNull();
 	}
@@ -156,7 +156,7 @@ public void singlePageOfComments() {
 				.andExpect(basicAuth())
 				.andRespond(withResource("comments-page-one.json"));
 		Page<Comment> comments = this.gitHub.getComments(
-				new Issue(null, "commentsUrl", null, null, null, null, null, null));
+				new Issue(null, "commentsUrl", null, null, null, null, null, null, null));
 		assertThat(comments.getContent()).hasSize(17);
 		assertThat(comments.next()).isNull();
 	}
@@ -172,7 +172,7 @@ public void multiplePagesOfComments() {
 				.andExpect(basicAuth())
 				.andRespond(withResource("comments-page-two.json"));
 		Page<Comment> pageOne = this.gitHub.getComments(
-				new Issue(null, "commentsUrl", null, null, null, null, null, null));
+				new Issue(null, "commentsUrl", null, null, null, null, null, null, null));
 		assertThat(pageOne.getContent()).hasSize(17);
 		Page<Comment> pageTwo = pageOne.next();
 		assertThat(pageTwo).isNotNull();
@@ -186,7 +186,7 @@ public void addLabelToIssue() {
 				.andRespond(
 						withSuccess("[{\"name\":\"test\"}]", MediaType.APPLICATION_JSON));
 		Issue issue = new Issue("issueUrl", null, null, "labelsUrl{/name}", null, null,
-				null, null);
+				null, null, null);
 		Issue modifiedIssue = this.gitHub.addLabel(issue, "test");
 		assertThat(modifiedIssue.getLabels()).hasSize(1);
 	}
@@ -197,7 +197,7 @@ public void removeLabelFromIssue() {
 				.andExpect(basicAuth())
 				.andRespond(withSuccess("[]", MediaType.APPLICATION_JSON));
 		Issue issue = new Issue(null, null, null, "labels{/name}", null, null, null,
-				null);
+				null, null);
 		Issue modifiedIssue = this.gitHub.removeLabel(issue, "test");
 		assertThat(modifiedIssue.getLabels()).isEmpty();
 	}
@@ -208,7 +208,7 @@ public void removeLabelWithNameThatRequiresEncodingFromIssue() {
 				.andExpect(method(HttpMethod.DELETE)).andExpect(basicAuth())
 				.andRespond(withSuccess("[]", MediaType.APPLICATION_JSON));
 		Issue issue = new Issue(null, null, null, "labels{/name}", null, null, null,
-				null);
+				null, null);
 		Issue modifiedIssue = this.gitHub.removeLabel(issue, "status: foo");
 		assertThat(modifiedIssue.getLabels()).isEmpty();
 	}
@@ -219,7 +219,7 @@ public void addCommentToIssue() {
 				.andExpect(basicAuth())
 				.andExpect(content().string("{\"body\":\"A test comment\"}"))
 				.andRespond(withResource("new-comment.json"));
-		Issue issue = new Issue(null, "commentsUrl", null, null, null, null, null, null);
+		Issue issue = new Issue(null, "commentsUrl", null, null, null, null, null, null, null);
 		Comment comment = this.gitHub.addComment(issue, "A test comment");
 		assertThat(comment).isNotNull();
 	}
@@ -229,7 +229,7 @@ public void singlePageOfEvents() {
 		this.server.expect(requestTo("/eventsUrl")).andExpect(method(HttpMethod.GET))
 				.andExpect(basicAuth()).andRespond(withResource("events-page-one.json"));
 		Page<Event> events = this.gitHub.getEvents(
-				new Issue(null, null, "eventsUrl", null, null, null, null, null));
+				new Issue(null, null, "eventsUrl", null, null, null, null, null, null));
 		assertThat(events.getContent()).hasSize(12);
 		assertThat(events.next()).isNull();
 	}
@@ -244,7 +244,7 @@ public void multiplePagesOfEvents() {
 		this.server.expect(requestTo("/page-two")).andExpect(method(HttpMethod.GET))
 				.andExpect(basicAuth()).andRespond(withResource("events-page-two.json"));
 		Page<Event> pageOne = this.gitHub.getEvents(
-				new Issue(null, null, "eventsUrl", null, null, null, null, null));
+				new Issue(null, null, "eventsUrl", null, null, null, null, null, null));
 		assertThat(pageOne.getContent()).hasSize(12);
 		Page<Event> pageTwo = pageOne.next();
 		assertThat(pageTwo).isNotNull();
@@ -259,7 +259,7 @@ public void closeIssue() {
 				.andRespond(withSuccess("{\"url\":\"updatedIssueUrl\"}",
 						MediaType.APPLICATION_JSON));
 		Issue closedIssue = this.gitHub
-				.close(new Issue("issueUrl", null, null, null, null, null, null, null));
+				.close(new Issue("issueUrl", null, null, null, null, null, null, null, null));
 		assertThat(closedIssue.getUrl()).isEqualTo("updatedIssueUrl");
 	}
 
diff --git a/src/test/java/io/spring/issuebot/triage/LabelApplyingTriageListenerTests.java b/src/test/java/io/spring/issuebot/triage/LabelApplyingTriageListenerTests.java
index de95e3c..67bb9f7 100644
--- a/src/test/java/io/spring/issuebot/triage/LabelApplyingTriageListenerTests.java
+++ b/src/test/java/io/spring/issuebot/triage/LabelApplyingTriageListenerTests.java
@@ -37,7 +37,7 @@ public class LabelApplyingTriageListenerTests {
 
 	@Test
 	public void requiresTriage() {
-		Issue issue = new Issue(null, null, null, null, null, null, null, null);
+		Issue issue = new Issue(null, null, null, null, null, null, null, null, null);
 		this.listener.requiresTriage(issue);
 		verify(this.gitHub).addLabel(issue, "test");
 	}
diff --git a/src/test/java/io/spring/issuebot/triage/LabelledTriageFilterTests.java b/src/test/java/io/spring/issuebot/triage/LabelledTriageFilterTests.java
index f5c3fea..23b625e 100644
--- a/src/test/java/io/spring/issuebot/triage/LabelledTriageFilterTests.java
+++ b/src/test/java/io/spring/issuebot/triage/LabelledTriageFilterTests.java
@@ -40,19 +40,19 @@ public class LabelledTriageFilterTests {
 	@Test
 	public void issueWithLabels() {
 		assertThat(this.filter.triaged(this.repository, new Issue(null, null, null, null,
-				null, Arrays.asList(new Label("test")), null, null))).isTrue();
+				null, Arrays.asList(new Label("test")), null, null, null))).isTrue();
 	}
 
 	@Test
 	public void issueWithNullLabels() {
 		assertThat(this.filter.triaged(this.repository,
-				new Issue(null, null, null, null, null, null, null, null))).isFalse();
+				new Issue(null, null, null, null, null, null, null, null, null))).isFalse();
 	}
 
 	@Test
 	public void issueWithNoLabels() {
 		assertThat(this.filter.triaged(this.repository, new Issue(null, null, null, null,
-				null, Collections.emptyList(), null, null))).isFalse();
+				null, Collections.emptyList(), null, null, null))).isFalse();
 	}
 
 }
diff --git a/src/test/java/io/spring/issuebot/triage/MilestoneAppliedTriageFilterTests.java b/src/test/java/io/spring/issuebot/triage/MilestoneAppliedTriageFilterTests.java
index e3bdc17..daac128 100644
--- a/src/test/java/io/spring/issuebot/triage/MilestoneAppliedTriageFilterTests.java
+++ b/src/test/java/io/spring/issuebot/triage/MilestoneAppliedTriageFilterTests.java
@@ -37,13 +37,13 @@ public class MilestoneAppliedTriageFilterTests {
 	@Test
 	public void issueWithMilestoneApplied() {
 		assertThat(this.filter.triaged(this.repository, new Issue(null, null, null, null,
-				null, null, new Milestone("test"), null))).isTrue();
+				null, null, new Milestone("test"), null, null))).isTrue();
 	}
 
 	@Test
 	public void issueWithNoMilestoneApplied() {
 		assertThat(this.filter.triaged(this.repository,
-				new Issue(null, null, null, null, null, null, null, null))).isFalse();
+				new Issue(null, null, null, null, null, null, null, null, null))).isFalse();
 	}
 
 }
diff --git a/src/test/java/io/spring/issuebot/triage/OpenedByCollaboratorTriageFilterTests.java b/src/test/java/io/spring/issuebot/triage/OpenedByCollaboratorTriageFilterTests.java
index 166ff4b..77e909b 100644
--- a/src/test/java/io/spring/issuebot/triage/OpenedByCollaboratorTriageFilterTests.java
+++ b/src/test/java/io/spring/issuebot/triage/OpenedByCollaboratorTriageFilterTests.java
@@ -47,14 +47,14 @@ public void setUp() {
 	@Test
 	public void openedByCollaborator() {
 		assertThat(this.filter.triaged(this.repository,
-				new Issue(null, null, null, null, new User("Alice"), null, null, null)))
+				new Issue(null, null, null, null, new User("Alice"), null, null, null, null)))
 						.isTrue();
 	}
 
 	@Test
 	public void openedByAnotherUser() {
 		assertThat(this.filter.triaged(this.repository,
-				new Issue(null, null, null, null, new User("Debbie"), null, null, null)))
+				new Issue(null, null, null, null, new User("Debbie"), null, null, null, null)))
 						.isFalse();
 	}
 
diff --git a/src/test/java/io/spring/issuebot/triage/TriageIssueListenerTests.java b/src/test/java/io/spring/issuebot/triage/TriageIssueListenerTests.java
index e82b9c2..27da34b 100644
--- a/src/test/java/io/spring/issuebot/triage/TriageIssueListenerTests.java
+++ b/src/test/java/io/spring/issuebot/triage/TriageIssueListenerTests.java
@@ -48,7 +48,7 @@ public class TriageIssueListenerTests {
 
 	@Test
 	public void listenerIsCalledWhenIssueRequiresTriage() {
-		Issue issue = new Issue(null, null, null, null, null, null, null, null);
+		Issue issue = new Issue(null, null, null, null, null, null, null, null, null);
 		given(this.triageFilterOne.triaged(this.repository, issue)).willReturn(false);
 		given(this.triageFilterTwo.triaged(this.repository, issue)).willReturn(false);
 		this.issueListener.onOpenIssue(this.repository, issue);
@@ -57,9 +57,18 @@ public void listenerIsCalledWhenIssueRequiresTriage() {
 		verify(this.listener).requiresTriage(issue);
 	}
 
+	@Test
+	public void listenerIsCalledWhenClosedIssueRequiresTriage() {
+		Issue issue = new Issue(null, null, null, null, null, null, null, null, null);
+		given(this.triageFilterOne.triaged(this.repository, issue)).willReturn(false);
+		given(this.triageFilterTwo.triaged(this.repository, issue)).willReturn(false);
+		this.issueListener.onIssueClosure(this.repository, issue);
+		verify(this.listener).doesNotRequireTriage(issue);
+	}
+
 	@Test
 	public void listenerIsNotCalledWhenIssueHasAlreadyBeenTriaged() {
-		Issue issue = new Issue(null, null, null, null, null, null, null, null);
+		Issue issue = new Issue(null, null, null, null, null, null, null, null, null);
 		given(this.triageFilterOne.triaged(this.repository, issue)).willReturn(true);
 		this.issueListener.onOpenIssue(this.repository, issue);
 		verify(this.triageFilterOne).triaged(this.repository, issue);

From 9f85136811404a33c8649f0b31bf2980009524ca Mon Sep 17 00:00:00 2001
From: Nicolas Widart <n.widart@gmail.com>
Date: Thu, 16 May 2019 09:23:21 +0200
Subject: [PATCH 03/13] Testing that the remove label method is called

---
 .../issuebot/triage/LabelApplyingTriageListenerTests.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/test/java/io/spring/issuebot/triage/LabelApplyingTriageListenerTests.java b/src/test/java/io/spring/issuebot/triage/LabelApplyingTriageListenerTests.java
index 67bb9f7..0fbd05d 100644
--- a/src/test/java/io/spring/issuebot/triage/LabelApplyingTriageListenerTests.java
+++ b/src/test/java/io/spring/issuebot/triage/LabelApplyingTriageListenerTests.java
@@ -42,4 +42,10 @@ public void requiresTriage() {
 		verify(this.gitHub).addLabel(issue, "test");
 	}
 
+	@Test
+	public void doesNotRequireTriage() {
+		Issue issue = new Issue(null, null, null, null, null, null, null, null, null);
+		this.listener.doesNotRequireTriage(issue);
+		verify(this.gitHub).removeLabel(issue, "test");
+	}
 }

From 379604a5d2de5a054c2b3a7d5db811cbc3eee9ff Mon Sep 17 00:00:00 2001
From: Nicolas Widart <n.widart@gmail.com>
Date: Thu, 16 May 2019 09:28:57 +0200
Subject: [PATCH 04/13] Adding condition on issue checking if we need to listen
 open issues or closed issues

---
 .../io/spring/issuebot/RepositoryMonitor.java  |  8 +++++++-
 .../issuebot/RepositoryMonitorTests.java       | 18 +++++++++---------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/main/java/io/spring/issuebot/RepositoryMonitor.java b/src/main/java/io/spring/issuebot/RepositoryMonitor.java
index 290c6e4..6bb841a 100644
--- a/src/main/java/io/spring/issuebot/RepositoryMonitor.java
+++ b/src/main/java/io/spring/issuebot/RepositoryMonitor.java
@@ -64,7 +64,13 @@ private void monitor(Repository repository) {
 				for (Issue issue : page.getContent()) {
 					for (IssueListener issueListener : this.issueListeners) {
 						try {
-							issueListener.onOpenIssue(repository, issue);
+							if (issue.isOpen()) {
+								issueListener.onOpenIssue(repository, issue);
+								continue;
+							}
+							if (issue.isClosed()) {
+								issueListener.onIssueClosure(repository, issue);
+							}
 						}
 						catch (Exception ex) {
 							log.warn("Listener '{}' failed when handling issue '{}'",
diff --git a/src/test/java/io/spring/issuebot/RepositoryMonitorTests.java b/src/test/java/io/spring/issuebot/RepositoryMonitorTests.java
index 8bba750..4e61b2b 100644
--- a/src/test/java/io/spring/issuebot/RepositoryMonitorTests.java
+++ b/src/test/java/io/spring/issuebot/RepositoryMonitorTests.java
@@ -71,8 +71,8 @@ public void repositoriesWithNoIssues() {
 	public void oneRepositoryWithOpenIssues() {
 		@SuppressWarnings("unchecked")
 		Page<Issue> page = mock(Page.class);
-		Issue issueOne = new Issue(null, null, null, null, null, null, null, null, null);
-		Issue issueTwo = new Issue(null, null, null, null, null, null, null, null, null);
+		Issue issueOne = new Issue(null, null, null, null, null, null, null, null, "open");
+		Issue issueTwo = new Issue(null, null, null, null, null, null, null, null, "open");
 		given(page.getContent()).willReturn(Arrays.asList(issueOne, issueTwo));
 		given(this.gitHub.getIssues("test", "one")).willReturn(page);
 		given(this.gitHub.getIssues("test", "two")).willReturn(null);
@@ -87,11 +87,11 @@ public void oneRepositoryWithOpenIssues() {
 	public void onRepositoryWithClosedIssues() {
 		@SuppressWarnings("unchecked")
 		Page<Issue> page = mock(Page.class);
-		Issue issueOne = new Issue(null, null, null, null, null, null, null, null, null);
-		Issue issueTwo = new Issue(null, null, null, null, null, null, null, null, null);
+		Issue issueOne = new Issue(null, null, null, null, null, null, null, null, "closed");
+		Issue issueTwo = new Issue(null, null, null, null, null, null, null, null, "closed");
 		given(page.getContent()).willReturn(Arrays.asList(issueOne, issueTwo));
-		given(this.gitHub.getClosedIssues("test", "one")).willReturn(page);
-		given(this.gitHub.getClosedIssues("test", "two")).willReturn(null);
+		given(this.gitHub.getIssues("test", "one")).willReturn(page);
+		given(this.gitHub.getIssues("test", "two")).willReturn(null);
 		this.repositoryMonitor.monitor();
 		verify(this.issueListenerOne).onIssueClosure(this.repositoryOne, issueOne);
 		verify(this.issueListenerOne).onIssueClosure(this.repositoryOne, issueTwo);
@@ -103,8 +103,8 @@ public void onRepositoryWithClosedIssues() {
 	public void bothRepositoriesWithOpenIssues() {
 		@SuppressWarnings("unchecked")
 		Page<Issue> page = mock(Page.class);
-		Issue issueOne = new Issue(null, null, null, null, null, null, null, null, null);
-		Issue issueTwo = new Issue(null, null, null, null, null, null, null, null, null);
+		Issue issueOne = new Issue(null, null, null, null, null, null, null, null, "open");
+		Issue issueTwo = new Issue(null, null, null, null, null, null, null, null, "open");
 		given(page.getContent()).willReturn(Arrays.asList(issueOne, issueTwo));
 		given(this.gitHub.getIssues("test", "one")).willReturn(page);
 		given(this.gitHub.getIssues("test", "two")).willReturn(page);
@@ -123,7 +123,7 @@ public void bothRepositoriesWithOpenIssues() {
 	public void exceptionFromAnIssueListenerIsHandledGracefully() {
 		@SuppressWarnings("unchecked")
 		Page<Issue> page = mock(Page.class);
-		Issue issue = new Issue(null, null, null, null, null, null, null, null, null);
+		Issue issue = new Issue(null, null, null, null, null, null, null, null, "open");
 		given(page.getContent()).willReturn(Arrays.asList(issue));
 		given(this.gitHub.getIssues("test", "one")).willReturn(page);
 		willThrow(new RuntimeException()).given(this.issueListenerOne)

From 0d8cdec9cb87d242793e0d0ffe1144548cafafb4 Mon Sep 17 00:00:00 2001
From: Nicolas Widart <n.widart@gmail.com>
Date: Thu, 16 May 2019 09:31:30 +0200
Subject: [PATCH 05/13] Return all issues instead of only open issues from
 github template

---
 .../java/io/spring/issuebot/github/GitHubTemplate.java    | 2 +-
 .../io/spring/issuebot/github/GitHubTemplateTests.java    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/spring/issuebot/github/GitHubTemplate.java b/src/main/java/io/spring/issuebot/github/GitHubTemplate.java
index 602b9ea..3740c32 100644
--- a/src/main/java/io/spring/issuebot/github/GitHubTemplate.java
+++ b/src/main/java/io/spring/issuebot/github/GitHubTemplate.java
@@ -109,7 +109,7 @@ public void handleError(ClientHttpResponse response) throws IOException {
 	@Override
 	public Page<Issue> getIssues(String organization, String repository) {
 		String url = "https://api.github.com/repos/" + organization + "/" + repository
-				+ "/issues";
+				+ "/issues?state=all";
 		return getPage(url, Issue[].class);
 	}
 
diff --git a/src/test/java/io/spring/issuebot/github/GitHubTemplateTests.java b/src/test/java/io/spring/issuebot/github/GitHubTemplateTests.java
index 30b3c6f..3ed8f9f 100644
--- a/src/test/java/io/spring/issuebot/github/GitHubTemplateTests.java
+++ b/src/test/java/io/spring/issuebot/github/GitHubTemplateTests.java
@@ -62,7 +62,7 @@ public class GitHubTemplateTests {
 
 	@Test
 	public void noIssues() {
-		this.server.expect(requestTo("https://api.github.com/repos/org/repo/issues"))
+		this.server.expect(requestTo("https://api.github.com/repos/org/repo/issues?state=all"))
 				.andExpect(method(HttpMethod.GET)).andExpect(basicAuth())
 				.andRespond(withSuccess("[]", MediaType.APPLICATION_JSON));
 		Page<Issue> issues = this.gitHub.getIssues("org", "repo");
@@ -72,7 +72,7 @@ public void noIssues() {
 
 	@Test
 	public void singlePageOfIssues() {
-		this.server.expect(requestTo("https://api.github.com/repos/org/repo/issues"))
+		this.server.expect(requestTo("https://api.github.com/repos/org/repo/issues?state=all"))
 				.andExpect(method(HttpMethod.GET)).andExpect(basicAuth())
 				.andRespond(withResource("issues-page-one.json"));
 		Page<Issue> issues = this.gitHub.getIssues("org", "repo");
@@ -94,7 +94,7 @@ public void singlePageOfClosedIssue() {
 	public void multiplePagesOfIssues() {
 		HttpHeaders headers = new HttpHeaders();
 		headers.set("Link", "<page-two>; rel=\"next\"");
-		this.server.expect(requestTo("https://api.github.com/repos/org/repo/issues"))
+		this.server.expect(requestTo("https://api.github.com/repos/org/repo/issues?state=all"))
 				.andExpect(method(HttpMethod.GET)).andExpect(basicAuth())
 				.andRespond(withResource("issues-page-one.json",
 						"Link:<page-two>; rel=\"next\""));
@@ -130,7 +130,7 @@ public void rateLimited() {
 		HttpHeaders headers = new HttpHeaders();
 		headers.set("X-RateLimit-Remaining", "0");
 		headers.set("X-RateLimit-Reset", Long.toString(reset / 1000));
-		this.server.expect(requestTo("https://api.github.com/repos/org/repo/issues"))
+		this.server.expect(requestTo("https://api.github.com/repos/org/repo/issues?state=all"))
 				.andExpect(method(HttpMethod.GET)).andExpect(basicAuth())
 				.andRespond(withStatus(HttpStatus.FORBIDDEN).headers(headers));
 		this.thrown.expect(IllegalStateException.class);

From 2e68edd25f74ea82f092b95872b73f1cb83f6cea Mon Sep 17 00:00:00 2001
From: Nicolas Widart <n.widart@gmail.com>
Date: Thu, 16 May 2019 09:33:11 +0200
Subject: [PATCH 06/13] Remove the need for a get closed issues method

---
 .../issuebot/github/GitHubOperations.java     |  9 -------
 .../issuebot/github/GitHubTemplate.java       |  7 -----
 .../issuebot/github/GitHubTemplateTests.java  | 27 -------------------
 3 files changed, 43 deletions(-)

diff --git a/src/main/java/io/spring/issuebot/github/GitHubOperations.java b/src/main/java/io/spring/issuebot/github/GitHubOperations.java
index dc58974..b7e19d7 100644
--- a/src/main/java/io/spring/issuebot/github/GitHubOperations.java
+++ b/src/main/java/io/spring/issuebot/github/GitHubOperations.java
@@ -32,15 +32,6 @@ public interface GitHubOperations {
 	 */
 	Page<Issue> getIssues(String organization, String repository);
 
-	/**
-	 * Returns the closed issues in the {@code repository} owned by the given
-	 * {@code organization}.
-	 * @param organization the name of the organization
-	 * @param repository the name of the repository
-	 * @return the issues
-	 */
-	Page<Issue> getClosedIssues(String organization, String repository);
-
 	/**
 	 * Returns the comments that have been made on the given {@code issue}.
 	 * @param issue the issue
diff --git a/src/main/java/io/spring/issuebot/github/GitHubTemplate.java b/src/main/java/io/spring/issuebot/github/GitHubTemplate.java
index 3740c32..d90ec1c 100644
--- a/src/main/java/io/spring/issuebot/github/GitHubTemplate.java
+++ b/src/main/java/io/spring/issuebot/github/GitHubTemplate.java
@@ -113,13 +113,6 @@ public Page<Issue> getIssues(String organization, String repository) {
 		return getPage(url, Issue[].class);
 	}
 
-	@Override
-	public Page<Issue> getClosedIssues(String organization, String repository) {
-		String url = "https://api.github.com/repos/" + organization + "/" + repository
-				+ "/issues?state=closed";
-		return getPage(url, Issue[].class);
-	}
-
 	@Override
 	public Page<Comment> getComments(Issue issue) {
 		return getPage(issue.getCommentsUrl(), Comment[].class);
diff --git a/src/test/java/io/spring/issuebot/github/GitHubTemplateTests.java b/src/test/java/io/spring/issuebot/github/GitHubTemplateTests.java
index 3ed8f9f..5a9c84a 100644
--- a/src/test/java/io/spring/issuebot/github/GitHubTemplateTests.java
+++ b/src/test/java/io/spring/issuebot/github/GitHubTemplateTests.java
@@ -80,16 +80,6 @@ public void singlePageOfIssues() {
 		assertThat(issues.next()).isNull();
 	}
 
-	@Test
-	public void singlePageOfClosedIssue() {
-		this.server.expect(requestTo("https://api.github.com/repos/org/repo/issues?state=closed"))
-				.andExpect(method(HttpMethod.GET)).andExpect(basicAuth())
-				.andRespond(withResource("issues-page-one.json"));
-		Page<Issue> issues = this.gitHub.getClosedIssues("org", "repo");
-		assertThat(issues.getContent()).hasSize(15);
-		assertThat(issues.next()).isNull();
-	}
-
 	@Test
 	public void multiplePagesOfIssues() {
 		HttpHeaders headers = new HttpHeaders();
@@ -107,23 +97,6 @@ public void multiplePagesOfIssues() {
 		assertThat(pageTwo.getContent()).hasSize(15);
 	}
 
-	@Test
-	public void multiplePagesOfClosedIssues() {
-		HttpHeaders headers = new HttpHeaders();
-		headers.set("Link", "<page-two>; rel=\"next\"");
-		this.server.expect(requestTo("https://api.github.com/repos/org/repo/issues?state=closed"))
-				.andExpect(method(HttpMethod.GET)).andExpect(basicAuth())
-				.andRespond(withResource("issues-page-one.json",
-						"Link:<page-two>; rel=\"next\""));
-		this.server.expect(requestTo("/page-two")).andExpect(method(HttpMethod.GET))
-				.andExpect(basicAuth()).andRespond(withResource("issues-page-two.json"));
-		Page<Issue> pageOne = this.gitHub.getClosedIssues("org", "repo");
-		assertThat(pageOne.getContent()).hasSize(15);
-		Page<Issue> pageTwo = pageOne.next();
-		assertThat(pageTwo).isNotNull();
-		assertThat(pageTwo.getContent()).hasSize(15);
-	}
-
 	@Test
 	public void rateLimited() {
 		long reset = System.currentTimeMillis();

From e6b988c45791ac0322f81c8e8bce7f9771175ee1 Mon Sep 17 00:00:00 2001
From: Nicolas Widart <n.widart@gmail.com>
Date: Thu, 16 May 2019 18:06:58 +0200
Subject: [PATCH 07/13] Using the query filter to only get closed issues with a
 specific label This is in order to reduce the amount of data retrieved from
 Github and avoid rate limiting

---
 .../io/spring/issuebot/RepositoryMonitor.java | 43 +++++++++++++------
 .../issuebot/github/GitHubOperations.java     | 10 +++++
 .../issuebot/github/GitHubTemplate.java       | 14 ++++--
 .../issuebot/RepositoryMonitorTests.java      | 25 ++++++++++-
 .../issuebot/github/GitHubTemplateTests.java  | 35 +++++++++++++--
 5 files changed, 106 insertions(+), 21 deletions(-)

diff --git a/src/main/java/io/spring/issuebot/RepositoryMonitor.java b/src/main/java/io/spring/issuebot/RepositoryMonitor.java
index 6bb841a..5074e8c 100644
--- a/src/main/java/io/spring/issuebot/RepositoryMonitor.java
+++ b/src/main/java/io/spring/issuebot/RepositoryMonitor.java
@@ -51,12 +51,14 @@ class RepositoryMonitor {
 	@Scheduled(fixedRate = 5 * 60 * 1000)
 	void monitor() {
 		for (Repository repository : this.repositories) {
-			monitor(repository);
+      log.info("Monitoring {}/{}", repository.getOrganization(), repository.getName());
+			monitorOpenIssues(repository);
+			monitorClosedIssues(repository);
+      log.info("Monitoring of {}/{} completed", repository.getOrganization(), repository.getName());
 		}
 	}
 
-	private void monitor(Repository repository) {
-		log.info("Monitoring {}/{}", repository.getOrganization(), repository.getName());
+	private void monitorOpenIssues(Repository repository) {
 		try {
 			Page<Issue> page = this.gitHub.getIssues(repository.getOrganization(),
 					repository.getName());
@@ -64,13 +66,7 @@ private void monitor(Repository repository) {
 				for (Issue issue : page.getContent()) {
 					for (IssueListener issueListener : this.issueListeners) {
 						try {
-							if (issue.isOpen()) {
-								issueListener.onOpenIssue(repository, issue);
-								continue;
-							}
-							if (issue.isClosed()) {
-								issueListener.onIssueClosure(repository, issue);
-							}
+              issueListener.onOpenIssue(repository, issue);
 						}
 						catch (Exception ex) {
 							log.warn("Listener '{}' failed when handling issue '{}'",
@@ -85,8 +81,31 @@ private void monitor(Repository repository) {
 			log.warn("A failure occurred during monitoring of {}/{}",
 					repository.getOrganization(), repository.getName(), ex);
 		}
-		log.info("Monitoring of {}/{} completed", repository.getOrganization(),
-				repository.getName());
 	}
 
+  private void monitorClosedIssues(Repository repository) {
+    try {
+      Page<Issue> page = this.gitHub
+          .getClosedIssuesWithLabel(repository.getOrganization(), repository.getName(), "status: waiting-for-triage");
+      while (page != null) {
+        for (Issue issue : page.getContent()) {
+          for (IssueListener issueListener : this.issueListeners) {
+            try {
+                issueListener.onIssueClosure(repository, issue);
+            }
+            catch (Exception ex) {
+              log.warn("Listener '{}' failed when handling issue '{}'",
+                  issueListener, issue, ex);
+            }
+          }
+        }
+        page = page.next();
+      }
+    }
+    catch (Exception ex) {
+      log.warn("A failure occurred during monitoring of {}/{}",
+          repository.getOrganization(), repository.getName(), ex);
+    }
+  }
+
 }
diff --git a/src/main/java/io/spring/issuebot/github/GitHubOperations.java b/src/main/java/io/spring/issuebot/github/GitHubOperations.java
index b7e19d7..f60e4c2 100644
--- a/src/main/java/io/spring/issuebot/github/GitHubOperations.java
+++ b/src/main/java/io/spring/issuebot/github/GitHubOperations.java
@@ -32,6 +32,16 @@ public interface GitHubOperations {
 	 */
 	Page<Issue> getIssues(String organization, String repository);
 
+	/**
+	 * Returns the open closed issues in the {@code repository} owned by the given
+	 * {@code organization} with the given label.
+	 * @param organization the name of the organization
+	 * @param repository the name of the repository
+	 * @param label the label the issues need to have
+	 * @return the issues
+	 */
+	Page<Issue> getClosedIssuesWithLabel(String organization, String repository, String label);
+
 	/**
 	 * Returns the comments that have been made on the given {@code issue}.
 	 * @param issue the issue
diff --git a/src/main/java/io/spring/issuebot/github/GitHubTemplate.java b/src/main/java/io/spring/issuebot/github/GitHubTemplate.java
index d90ec1c..840c45c 100644
--- a/src/main/java/io/spring/issuebot/github/GitHubTemplate.java
+++ b/src/main/java/io/spring/issuebot/github/GitHubTemplate.java
@@ -109,7 +109,14 @@ public void handleError(ClientHttpResponse response) throws IOException {
 	@Override
 	public Page<Issue> getIssues(String organization, String repository) {
 		String url = "https://api.github.com/repos/" + organization + "/" + repository
-				+ "/issues?state=all";
+				+ "/issues";
+		return getPage(url, Issue[].class);
+	}
+
+	@Override
+	public Page<Issue> getClosedIssuesWithLabel(String organization, String repository, String label) {
+		String url = "https://api.github.com/repos/" + organization + "/" + repository
+		+ "/issues?state=closed&labels=" + label;
 		return getPage(url, Issue[].class);
 	}
 
@@ -161,9 +168,10 @@ public Issue removeLabel(Issue issue, String labelName) {
 		catch (URISyntaxException ex) {
 			throw new RuntimeException(ex);
 		}
+		URI uri = URI.create(issue.getLabelsUrl().replace("{/name}", "/" + encodedName));
+		log.info("Removing label {} on {}", labelName, uri);
 		ResponseEntity<Label[]> response = this.rest.exchange(
-				new RequestEntity<Void>(HttpMethod.DELETE, URI.create(
-						issue.getLabelsUrl().replace("{/name}", "/" + encodedName))),
+				new RequestEntity<Void>(HttpMethod.DELETE, uri),
 				Label[].class);
 		if (response.getStatusCode() != HttpStatus.OK) {
 			log.warn("Failed to remove label from issue. Response status: "
diff --git a/src/test/java/io/spring/issuebot/RepositoryMonitorTests.java b/src/test/java/io/spring/issuebot/RepositoryMonitorTests.java
index 4e61b2b..425729c 100644
--- a/src/test/java/io/spring/issuebot/RepositoryMonitorTests.java
+++ b/src/test/java/io/spring/issuebot/RepositoryMonitorTests.java
@@ -21,6 +21,7 @@
 import io.spring.issuebot.github.GitHubOperations;
 import io.spring.issuebot.github.Issue;
 import io.spring.issuebot.github.Page;
+import java.util.Collections;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -90,8 +91,8 @@ public void onRepositoryWithClosedIssues() {
 		Issue issueOne = new Issue(null, null, null, null, null, null, null, null, "closed");
 		Issue issueTwo = new Issue(null, null, null, null, null, null, null, null, "closed");
 		given(page.getContent()).willReturn(Arrays.asList(issueOne, issueTwo));
-		given(this.gitHub.getIssues("test", "one")).willReturn(page);
-		given(this.gitHub.getIssues("test", "two")).willReturn(null);
+		given(this.gitHub.getClosedIssuesWithLabel("test", "one", "status: waiting-for-triage")).willReturn(page);
+		given(this.gitHub.getClosedIssuesWithLabel("test", "two", "status: waiting-for-triage")).willReturn(null);
 		this.repositoryMonitor.monitor();
 		verify(this.issueListenerOne).onIssueClosure(this.repositoryOne, issueOne);
 		verify(this.issueListenerOne).onIssueClosure(this.repositoryOne, issueTwo);
@@ -133,6 +134,20 @@ public void exceptionFromAnIssueListenerIsHandledGracefully() {
 		verify(this.issueListenerTwo).onOpenIssue(this.repositoryOne, issue);
 	}
 
+	@Test
+	public void exceptionFromAnIssueListenerIsHandledGracefullyForClosedIssues() {
+		@SuppressWarnings("unchecked")
+		Page<Issue> page = mock(Page.class);
+		Issue issue = new Issue(null, null, null, null, null, null, null, null, "closed");
+		given(page.getContent()).willReturn(Collections.singletonList(issue));
+		given(this.gitHub.getClosedIssuesWithLabel("test", "one", "status: waiting-for-triage")).willReturn(page);
+		willThrow(new RuntimeException()).given(this.issueListenerOne)
+				.onOpenIssue(this.repositoryOne, issue);
+		this.repositoryMonitor.monitor();
+		verify(this.issueListenerOne).onIssueClosure(this.repositoryOne, issue);
+		verify(this.issueListenerTwo).onIssueClosure(this.repositoryOne, issue);
+	}
+
 	@Test
 	public void exceptionFromGitHubIsHandledGracefully() {
 		given(this.gitHub.getIssues("test", "one")).willThrow(new RuntimeException());
@@ -140,4 +155,10 @@ public void exceptionFromGitHubIsHandledGracefully() {
 		verify(this.gitHub).getIssues("test", "one");
 	}
 
+	@Test
+	public void exceptionFromGitHubIsHandledGracefullyForClosedIssues() {
+		given(this.gitHub.getIssues("test", "one")).willThrow(new RuntimeException());
+		this.repositoryMonitor.monitor();
+		verify(this.gitHub).getIssues("test", "one");
+	}
 }
diff --git a/src/test/java/io/spring/issuebot/github/GitHubTemplateTests.java b/src/test/java/io/spring/issuebot/github/GitHubTemplateTests.java
index 5a9c84a..91c4706 100644
--- a/src/test/java/io/spring/issuebot/github/GitHubTemplateTests.java
+++ b/src/test/java/io/spring/issuebot/github/GitHubTemplateTests.java
@@ -62,7 +62,7 @@ public class GitHubTemplateTests {
 
 	@Test
 	public void noIssues() {
-		this.server.expect(requestTo("https://api.github.com/repos/org/repo/issues?state=all"))
+		this.server.expect(requestTo("https://api.github.com/repos/org/repo/issues"))
 				.andExpect(method(HttpMethod.GET)).andExpect(basicAuth())
 				.andRespond(withSuccess("[]", MediaType.APPLICATION_JSON));
 		Page<Issue> issues = this.gitHub.getIssues("org", "repo");
@@ -72,7 +72,7 @@ public void noIssues() {
 
 	@Test
 	public void singlePageOfIssues() {
-		this.server.expect(requestTo("https://api.github.com/repos/org/repo/issues?state=all"))
+		this.server.expect(requestTo("https://api.github.com/repos/org/repo/issues"))
 				.andExpect(method(HttpMethod.GET)).andExpect(basicAuth())
 				.andRespond(withResource("issues-page-one.json"));
 		Page<Issue> issues = this.gitHub.getIssues("org", "repo");
@@ -80,11 +80,21 @@ public void singlePageOfIssues() {
 		assertThat(issues.next()).isNull();
 	}
 
+	@Test
+	public void singlePageOfClosedIssues() {
+		this.server.expect(requestTo("https://api.github.com/repos/org/repo/issues?state=closed&labels=status:%20waiting-for-triage"))
+				.andExpect(method(HttpMethod.GET)).andExpect(basicAuth())
+				.andRespond(withResource("issues-page-one.json"));
+		Page<Issue> issues = this.gitHub.getClosedIssuesWithLabel("org", "repo", "status: waiting-for-triage");
+		assertThat(issues.getContent()).hasSize(15);
+		assertThat(issues.next()).isNull();
+	}
+
 	@Test
 	public void multiplePagesOfIssues() {
 		HttpHeaders headers = new HttpHeaders();
 		headers.set("Link", "<page-two>; rel=\"next\"");
-		this.server.expect(requestTo("https://api.github.com/repos/org/repo/issues?state=all"))
+		this.server.expect(requestTo("https://api.github.com/repos/org/repo/issues"))
 				.andExpect(method(HttpMethod.GET)).andExpect(basicAuth())
 				.andRespond(withResource("issues-page-one.json",
 						"Link:<page-two>; rel=\"next\""));
@@ -97,13 +107,30 @@ public void multiplePagesOfIssues() {
 		assertThat(pageTwo.getContent()).hasSize(15);
 	}
 
+	@Test
+	public void multiplePagesOfClosedIssues() {
+		HttpHeaders headers = new HttpHeaders();
+		headers.set("Link", "<page-two>; rel=\"next\"");
+		this.server.expect(requestTo("https://api.github.com/repos/org/repo/issues?state=closed&labels=status:%20waiting-for-triage"))
+				.andExpect(method(HttpMethod.GET)).andExpect(basicAuth())
+				.andRespond(withResource("issues-page-one.json",
+						"Link:<page-two>; rel=\"next\""));
+		this.server.expect(requestTo("/page-two")).andExpect(method(HttpMethod.GET))
+				.andExpect(basicAuth()).andRespond(withResource("issues-page-two.json"));
+		Page<Issue> pageOne = this.gitHub.getClosedIssuesWithLabel("org", "repo", "status: waiting-for-triage");
+		assertThat(pageOne.getContent()).hasSize(15);
+		Page<Issue> pageTwo = pageOne.next();
+		assertThat(pageTwo).isNotNull();
+		assertThat(pageTwo.getContent()).hasSize(15);
+	}
+
 	@Test
 	public void rateLimited() {
 		long reset = System.currentTimeMillis();
 		HttpHeaders headers = new HttpHeaders();
 		headers.set("X-RateLimit-Remaining", "0");
 		headers.set("X-RateLimit-Reset", Long.toString(reset / 1000));
-		this.server.expect(requestTo("https://api.github.com/repos/org/repo/issues?state=all"))
+		this.server.expect(requestTo("https://api.github.com/repos/org/repo/issues"))
 				.andExpect(method(HttpMethod.GET)).andExpect(basicAuth())
 				.andRespond(withStatus(HttpStatus.FORBIDDEN).headers(headers));
 		this.thrown.expect(IllegalStateException.class);

From a4279a1e1e1720055fc987bbf80adfca567b0fa2 Mon Sep 17 00:00:00 2001
From: Nicolas Widart <n.widart@gmail.com>
Date: Thu, 16 May 2019 19:15:44 +0200
Subject: [PATCH 08/13] Extracting the common logic out of monitor open and
 closed issue methods

---
 .../io/spring/issuebot/IssueOperation.java    |  9 +++
 .../io/spring/issuebot/RepositoryMonitor.java | 70 ++++++++-----------
 .../issuebot/RepositoryMonitorTests.java      |  2 +-
 3 files changed, 39 insertions(+), 42 deletions(-)
 create mode 100644 src/main/java/io/spring/issuebot/IssueOperation.java

diff --git a/src/main/java/io/spring/issuebot/IssueOperation.java b/src/main/java/io/spring/issuebot/IssueOperation.java
new file mode 100644
index 0000000..27eee47
--- /dev/null
+++ b/src/main/java/io/spring/issuebot/IssueOperation.java
@@ -0,0 +1,9 @@
+package io.spring.issuebot;
+
+import io.spring.issuebot.github.Issue;
+
+@FunctionalInterface
+public interface IssueOperation {
+
+  void run(Issue issue, IssueListener issueListener);
+}
diff --git a/src/main/java/io/spring/issuebot/RepositoryMonitor.java b/src/main/java/io/spring/issuebot/RepositoryMonitor.java
index 5074e8c..2f8b774 100644
--- a/src/main/java/io/spring/issuebot/RepositoryMonitor.java
+++ b/src/main/java/io/spring/issuebot/RepositoryMonitor.java
@@ -58,54 +58,42 @@ void monitor() {
 		}
 	}
 
+	private void monitorClosedIssues(Repository repository) {
+		try {
+			Page<Issue> page = this.gitHub
+					.getClosedIssuesWithLabel(repository.getOrganization(), repository.getName(), "status: waiting-for-triage");
+			monitorIssue(page, (issue, issueListener) -> issueListener.onIssueClosure(repository, issue));
+		} catch (Exception ex) {
+			log.warn("A failure occurred during monitoring of {}/{}",
+					repository.getOrganization(), repository.getName(), ex);
+		}
+	}
+
 	private void monitorOpenIssues(Repository repository) {
 		try {
 			Page<Issue> page = this.gitHub.getIssues(repository.getOrganization(),
 					repository.getName());
-			while (page != null) {
-				for (Issue issue : page.getContent()) {
-					for (IssueListener issueListener : this.issueListeners) {
-						try {
-              issueListener.onOpenIssue(repository, issue);
-						}
-						catch (Exception ex) {
-							log.warn("Listener '{}' failed when handling issue '{}'",
-									issueListener, issue, ex);
-						}
-					}
-				}
-				page = page.next();
-			}
-		}
-		catch (Exception ex) {
+			monitorIssue(page, (issue, issueListener) -> issueListener.onOpenIssue(repository, issue));
+		} catch (Exception ex) {
 			log.warn("A failure occurred during monitoring of {}/{}",
 					repository.getOrganization(), repository.getName(), ex);
 		}
 	}
 
-  private void monitorClosedIssues(Repository repository) {
-    try {
-      Page<Issue> page = this.gitHub
-          .getClosedIssuesWithLabel(repository.getOrganization(), repository.getName(), "status: waiting-for-triage");
-      while (page != null) {
-        for (Issue issue : page.getContent()) {
-          for (IssueListener issueListener : this.issueListeners) {
-            try {
-                issueListener.onIssueClosure(repository, issue);
-            }
-            catch (Exception ex) {
-              log.warn("Listener '{}' failed when handling issue '{}'",
-                  issueListener, issue, ex);
-            }
-          }
-        }
-        page = page.next();
-      }
-    }
-    catch (Exception ex) {
-      log.warn("A failure occurred during monitoring of {}/{}",
-          repository.getOrganization(), repository.getName(), ex);
-    }
-  }
-
+	private void monitorIssue(Page<Issue> page, IssueOperation issueOperation) {
+		while (page != null) {
+			for (Issue issue : page.getContent()) {
+				for (IssueListener issueListener : this.issueListeners) {
+					try {
+						issueOperation.run(issue, issueListener);
+					}
+					catch (Exception ex) {
+						log.warn("Listener '{}' failed when handling issue '{}'",
+								issueListener, issue, ex);
+					}
+				}
+			}
+			page = page.next();
+		}
+	}
 }
diff --git a/src/test/java/io/spring/issuebot/RepositoryMonitorTests.java b/src/test/java/io/spring/issuebot/RepositoryMonitorTests.java
index 425729c..874ff46 100644
--- a/src/test/java/io/spring/issuebot/RepositoryMonitorTests.java
+++ b/src/test/java/io/spring/issuebot/RepositoryMonitorTests.java
@@ -157,7 +157,7 @@ public void exceptionFromGitHubIsHandledGracefully() {
 
 	@Test
 	public void exceptionFromGitHubIsHandledGracefullyForClosedIssues() {
-		given(this.gitHub.getIssues("test", "one")).willThrow(new RuntimeException());
+		given(this.gitHub.getClosedIssuesWithLabel("test", "one", "status: waiting-for-triage")).willThrow(new RuntimeException());
 		this.repositoryMonitor.monitor();
 		verify(this.gitHub).getIssues("test", "one");
 	}

From 681f24e61b16e13d65a3c7a133a10e8fc5dd881f Mon Sep 17 00:00:00 2001
From: Nicolas Widart <n.widart@gmail.com>
Date: Thu, 16 May 2019 19:22:16 +0200
Subject: [PATCH 09/13] Using tabs instead of spaces

---
 src/main/java/io/spring/issuebot/RepositoryMonitor.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/spring/issuebot/RepositoryMonitor.java b/src/main/java/io/spring/issuebot/RepositoryMonitor.java
index 2f8b774..f5626dc 100644
--- a/src/main/java/io/spring/issuebot/RepositoryMonitor.java
+++ b/src/main/java/io/spring/issuebot/RepositoryMonitor.java
@@ -51,10 +51,10 @@ class RepositoryMonitor {
 	@Scheduled(fixedRate = 5 * 60 * 1000)
 	void monitor() {
 		for (Repository repository : this.repositories) {
-      log.info("Monitoring {}/{}", repository.getOrganization(), repository.getName());
+			log.info("Monitoring {}/{}", repository.getOrganization(), repository.getName());
 			monitorOpenIssues(repository);
 			monitorClosedIssues(repository);
-      log.info("Monitoring of {}/{} completed", repository.getOrganization(), repository.getName());
+			log.info("Monitoring of {}/{} completed", repository.getOrganization(), repository.getName());
 		}
 	}
 

From 051d008c49e8d7af5fd953873adaad7e49e5fb28 Mon Sep 17 00:00:00 2001
From: Nicolas Widart <n.widart@gmail.com>
Date: Thu, 23 May 2019 19:10:35 +0200
Subject: [PATCH 10/13] Run the spring java format command

---
 .../io/spring/issuebot/IssueOperation.java    |  3 +-
 .../io/spring/issuebot/RepositoryMonitor.java | 24 +++++++++-----
 .../issuebot/github/GitHubOperations.java     |  3 +-
 .../issuebot/github/GitHubTemplate.java       | 10 +++---
 .../java/io/spring/issuebot/github/Issue.java |  3 +-
 .../issuebot/RepositoryMonitorTests.java      | 31 +++++++++++++------
 .../issuebot/github/GitHubTemplateTests.java  | 27 +++++++++-------
 .../LabelApplyingTriageListenerTests.java     |  1 +
 .../triage/LabelledTriageFilterTests.java     | 10 ++++--
 .../MilestoneAppliedTriageFilterTests.java    |  3 +-
 ...OpenedByCollaboratorTriageFilterTests.java | 10 +++---
 11 files changed, 78 insertions(+), 47 deletions(-)

diff --git a/src/main/java/io/spring/issuebot/IssueOperation.java b/src/main/java/io/spring/issuebot/IssueOperation.java
index 27eee47..23bd276 100644
--- a/src/main/java/io/spring/issuebot/IssueOperation.java
+++ b/src/main/java/io/spring/issuebot/IssueOperation.java
@@ -5,5 +5,6 @@
 @FunctionalInterface
 public interface IssueOperation {
 
-  void run(Issue issue, IssueListener issueListener);
+	void run(Issue issue, IssueListener issueListener);
+
 }
diff --git a/src/main/java/io/spring/issuebot/RepositoryMonitor.java b/src/main/java/io/spring/issuebot/RepositoryMonitor.java
index f5626dc..1300324 100644
--- a/src/main/java/io/spring/issuebot/RepositoryMonitor.java
+++ b/src/main/java/io/spring/issuebot/RepositoryMonitor.java
@@ -51,19 +51,24 @@ class RepositoryMonitor {
 	@Scheduled(fixedRate = 5 * 60 * 1000)
 	void monitor() {
 		for (Repository repository : this.repositories) {
-			log.info("Monitoring {}/{}", repository.getOrganization(), repository.getName());
+			log.info("Monitoring {}/{}", repository.getOrganization(),
+					repository.getName());
 			monitorOpenIssues(repository);
 			monitorClosedIssues(repository);
-			log.info("Monitoring of {}/{} completed", repository.getOrganization(), repository.getName());
+			log.info("Monitoring of {}/{} completed", repository.getOrganization(),
+					repository.getName());
 		}
 	}
 
 	private void monitorClosedIssues(Repository repository) {
 		try {
-			Page<Issue> page = this.gitHub
-					.getClosedIssuesWithLabel(repository.getOrganization(), repository.getName(), "status: waiting-for-triage");
-			monitorIssue(page, (issue, issueListener) -> issueListener.onIssueClosure(repository, issue));
-		} catch (Exception ex) {
+			Page<Issue> page = this.gitHub.getClosedIssuesWithLabel(
+					repository.getOrganization(), repository.getName(),
+					"status: waiting-for-triage");
+			monitorIssue(page, (issue, issueListener) -> issueListener
+					.onIssueClosure(repository, issue));
+		}
+		catch (Exception ex) {
 			log.warn("A failure occurred during monitoring of {}/{}",
 					repository.getOrganization(), repository.getName(), ex);
 		}
@@ -73,8 +78,10 @@ private void monitorOpenIssues(Repository repository) {
 		try {
 			Page<Issue> page = this.gitHub.getIssues(repository.getOrganization(),
 					repository.getName());
-			monitorIssue(page, (issue, issueListener) -> issueListener.onOpenIssue(repository, issue));
-		} catch (Exception ex) {
+			monitorIssue(page, (issue, issueListener) -> issueListener
+					.onOpenIssue(repository, issue));
+		}
+		catch (Exception ex) {
 			log.warn("A failure occurred during monitoring of {}/{}",
 					repository.getOrganization(), repository.getName(), ex);
 		}
@@ -96,4 +103,5 @@ private void monitorIssue(Page<Issue> page, IssueOperation issueOperation) {
 			page = page.next();
 		}
 	}
+
 }
diff --git a/src/main/java/io/spring/issuebot/github/GitHubOperations.java b/src/main/java/io/spring/issuebot/github/GitHubOperations.java
index f60e4c2..f38ae8d 100644
--- a/src/main/java/io/spring/issuebot/github/GitHubOperations.java
+++ b/src/main/java/io/spring/issuebot/github/GitHubOperations.java
@@ -40,7 +40,8 @@ public interface GitHubOperations {
 	 * @param label the label the issues need to have
 	 * @return the issues
 	 */
-	Page<Issue> getClosedIssuesWithLabel(String organization, String repository, String label);
+	Page<Issue> getClosedIssuesWithLabel(String organization, String repository,
+			String label);
 
 	/**
 	 * Returns the comments that have been made on the given {@code issue}.
diff --git a/src/main/java/io/spring/issuebot/github/GitHubTemplate.java b/src/main/java/io/spring/issuebot/github/GitHubTemplate.java
index 840c45c..0ec8cee 100644
--- a/src/main/java/io/spring/issuebot/github/GitHubTemplate.java
+++ b/src/main/java/io/spring/issuebot/github/GitHubTemplate.java
@@ -114,9 +114,10 @@ public Page<Issue> getIssues(String organization, String repository) {
 	}
 
 	@Override
-	public Page<Issue> getClosedIssuesWithLabel(String organization, String repository, String label) {
+	public Page<Issue> getClosedIssuesWithLabel(String organization, String repository,
+			String label) {
 		String url = "https://api.github.com/repos/" + organization + "/" + repository
-		+ "/issues?state=closed&labels=" + label;
+				+ "/issues?state=closed&labels=" + label;
 		return getPage(url, Issue[].class);
 	}
 
@@ -170,9 +171,8 @@ public Issue removeLabel(Issue issue, String labelName) {
 		}
 		URI uri = URI.create(issue.getLabelsUrl().replace("{/name}", "/" + encodedName));
 		log.info("Removing label {} on {}", labelName, uri);
-		ResponseEntity<Label[]> response = this.rest.exchange(
-				new RequestEntity<Void>(HttpMethod.DELETE, uri),
-				Label[].class);
+		ResponseEntity<Label[]> response = this.rest
+				.exchange(new RequestEntity<Void>(HttpMethod.DELETE, uri), Label[].class);
 		if (response.getStatusCode() != HttpStatus.OK) {
 			log.warn("Failed to remove label from issue. Response status: "
 					+ response.getStatusCode());
diff --git a/src/main/java/io/spring/issuebot/github/Issue.java b/src/main/java/io/spring/issuebot/github/Issue.java
index ea25241..58b4256 100644
--- a/src/main/java/io/spring/issuebot/github/Issue.java
+++ b/src/main/java/io/spring/issuebot/github/Issue.java
@@ -111,7 +111,7 @@ public PullRequest getPullRequest() {
 	}
 
 	public String getState() {
-		return state;
+		return this.state;
 	}
 
 	public boolean isOpen() {
@@ -126,4 +126,5 @@ public boolean isClosed() {
 	public String toString() {
 		return this.url;
 	}
+
 }
diff --git a/src/test/java/io/spring/issuebot/RepositoryMonitorTests.java b/src/test/java/io/spring/issuebot/RepositoryMonitorTests.java
index 874ff46..63906d5 100644
--- a/src/test/java/io/spring/issuebot/RepositoryMonitorTests.java
+++ b/src/test/java/io/spring/issuebot/RepositoryMonitorTests.java
@@ -72,8 +72,10 @@ public void repositoriesWithNoIssues() {
 	public void oneRepositoryWithOpenIssues() {
 		@SuppressWarnings("unchecked")
 		Page<Issue> page = mock(Page.class);
-		Issue issueOne = new Issue(null, null, null, null, null, null, null, null, "open");
-		Issue issueTwo = new Issue(null, null, null, null, null, null, null, null, "open");
+		Issue issueOne = new Issue(null, null, null, null, null, null, null, null,
+				"open");
+		Issue issueTwo = new Issue(null, null, null, null, null, null, null, null,
+				"open");
 		given(page.getContent()).willReturn(Arrays.asList(issueOne, issueTwo));
 		given(this.gitHub.getIssues("test", "one")).willReturn(page);
 		given(this.gitHub.getIssues("test", "two")).willReturn(null);
@@ -88,11 +90,15 @@ public void oneRepositoryWithOpenIssues() {
 	public void onRepositoryWithClosedIssues() {
 		@SuppressWarnings("unchecked")
 		Page<Issue> page = mock(Page.class);
-		Issue issueOne = new Issue(null, null, null, null, null, null, null, null, "closed");
-		Issue issueTwo = new Issue(null, null, null, null, null, null, null, null, "closed");
+		Issue issueOne = new Issue(null, null, null, null, null, null, null, null,
+				"closed");
+		Issue issueTwo = new Issue(null, null, null, null, null, null, null, null,
+				"closed");
 		given(page.getContent()).willReturn(Arrays.asList(issueOne, issueTwo));
-		given(this.gitHub.getClosedIssuesWithLabel("test", "one", "status: waiting-for-triage")).willReturn(page);
-		given(this.gitHub.getClosedIssuesWithLabel("test", "two", "status: waiting-for-triage")).willReturn(null);
+		given(this.gitHub.getClosedIssuesWithLabel("test", "one",
+				"status: waiting-for-triage")).willReturn(page);
+		given(this.gitHub.getClosedIssuesWithLabel("test", "two",
+				"status: waiting-for-triage")).willReturn(null);
 		this.repositoryMonitor.monitor();
 		verify(this.issueListenerOne).onIssueClosure(this.repositoryOne, issueOne);
 		verify(this.issueListenerOne).onIssueClosure(this.repositoryOne, issueTwo);
@@ -104,8 +110,10 @@ public void onRepositoryWithClosedIssues() {
 	public void bothRepositoriesWithOpenIssues() {
 		@SuppressWarnings("unchecked")
 		Page<Issue> page = mock(Page.class);
-		Issue issueOne = new Issue(null, null, null, null, null, null, null, null, "open");
-		Issue issueTwo = new Issue(null, null, null, null, null, null, null, null, "open");
+		Issue issueOne = new Issue(null, null, null, null, null, null, null, null,
+				"open");
+		Issue issueTwo = new Issue(null, null, null, null, null, null, null, null,
+				"open");
 		given(page.getContent()).willReturn(Arrays.asList(issueOne, issueTwo));
 		given(this.gitHub.getIssues("test", "one")).willReturn(page);
 		given(this.gitHub.getIssues("test", "two")).willReturn(page);
@@ -140,7 +148,8 @@ public void exceptionFromAnIssueListenerIsHandledGracefullyForClosedIssues() {
 		Page<Issue> page = mock(Page.class);
 		Issue issue = new Issue(null, null, null, null, null, null, null, null, "closed");
 		given(page.getContent()).willReturn(Collections.singletonList(issue));
-		given(this.gitHub.getClosedIssuesWithLabel("test", "one", "status: waiting-for-triage")).willReturn(page);
+		given(this.gitHub.getClosedIssuesWithLabel("test", "one",
+				"status: waiting-for-triage")).willReturn(page);
 		willThrow(new RuntimeException()).given(this.issueListenerOne)
 				.onOpenIssue(this.repositoryOne, issue);
 		this.repositoryMonitor.monitor();
@@ -157,8 +166,10 @@ public void exceptionFromGitHubIsHandledGracefully() {
 
 	@Test
 	public void exceptionFromGitHubIsHandledGracefullyForClosedIssues() {
-		given(this.gitHub.getClosedIssuesWithLabel("test", "one", "status: waiting-for-triage")).willThrow(new RuntimeException());
+		given(this.gitHub.getClosedIssuesWithLabel("test", "one",
+				"status: waiting-for-triage")).willThrow(new RuntimeException());
 		this.repositoryMonitor.monitor();
 		verify(this.gitHub).getIssues("test", "one");
 	}
+
 }
diff --git a/src/test/java/io/spring/issuebot/github/GitHubTemplateTests.java b/src/test/java/io/spring/issuebot/github/GitHubTemplateTests.java
index 91c4706..3f24e56 100644
--- a/src/test/java/io/spring/issuebot/github/GitHubTemplateTests.java
+++ b/src/test/java/io/spring/issuebot/github/GitHubTemplateTests.java
@@ -82,10 +82,12 @@ public void singlePageOfIssues() {
 
 	@Test
 	public void singlePageOfClosedIssues() {
-		this.server.expect(requestTo("https://api.github.com/repos/org/repo/issues?state=closed&labels=status:%20waiting-for-triage"))
+		this.server.expect(requestTo(
+				"https://api.github.com/repos/org/repo/issues?state=closed&labels=status:%20waiting-for-triage"))
 				.andExpect(method(HttpMethod.GET)).andExpect(basicAuth())
 				.andRespond(withResource("issues-page-one.json"));
-		Page<Issue> issues = this.gitHub.getClosedIssuesWithLabel("org", "repo", "status: waiting-for-triage");
+		Page<Issue> issues = this.gitHub.getClosedIssuesWithLabel("org", "repo",
+				"status: waiting-for-triage");
 		assertThat(issues.getContent()).hasSize(15);
 		assertThat(issues.next()).isNull();
 	}
@@ -111,13 +113,15 @@ public void multiplePagesOfIssues() {
 	public void multiplePagesOfClosedIssues() {
 		HttpHeaders headers = new HttpHeaders();
 		headers.set("Link", "<page-two>; rel=\"next\"");
-		this.server.expect(requestTo("https://api.github.com/repos/org/repo/issues?state=closed&labels=status:%20waiting-for-triage"))
+		this.server.expect(requestTo(
+				"https://api.github.com/repos/org/repo/issues?state=closed&labels=status:%20waiting-for-triage"))
 				.andExpect(method(HttpMethod.GET)).andExpect(basicAuth())
 				.andRespond(withResource("issues-page-one.json",
 						"Link:<page-two>; rel=\"next\""));
 		this.server.expect(requestTo("/page-two")).andExpect(method(HttpMethod.GET))
 				.andExpect(basicAuth()).andRespond(withResource("issues-page-two.json"));
-		Page<Issue> pageOne = this.gitHub.getClosedIssuesWithLabel("org", "repo", "status: waiting-for-triage");
+		Page<Issue> pageOne = this.gitHub.getClosedIssuesWithLabel("org", "repo",
+				"status: waiting-for-triage");
 		assertThat(pageOne.getContent()).hasSize(15);
 		Page<Issue> pageTwo = pageOne.next();
 		assertThat(pageTwo).isNotNull();
@@ -196,8 +200,8 @@ public void removeLabelFromIssue() {
 		this.server.expect(requestTo("labels/test")).andExpect(method(HttpMethod.DELETE))
 				.andExpect(basicAuth())
 				.andRespond(withSuccess("[]", MediaType.APPLICATION_JSON));
-		Issue issue = new Issue(null, null, null, "labels{/name}", null, null, null,
-				null, null);
+		Issue issue = new Issue(null, null, null, "labels{/name}", null, null, null, null,
+				null);
 		Issue modifiedIssue = this.gitHub.removeLabel(issue, "test");
 		assertThat(modifiedIssue.getLabels()).isEmpty();
 	}
@@ -207,8 +211,8 @@ public void removeLabelWithNameThatRequiresEncodingFromIssue() {
 		this.server.expect(requestTo("labels/status:%20foo"))
 				.andExpect(method(HttpMethod.DELETE)).andExpect(basicAuth())
 				.andRespond(withSuccess("[]", MediaType.APPLICATION_JSON));
-		Issue issue = new Issue(null, null, null, "labels{/name}", null, null, null,
-				null, null);
+		Issue issue = new Issue(null, null, null, "labels{/name}", null, null, null, null,
+				null);
 		Issue modifiedIssue = this.gitHub.removeLabel(issue, "status: foo");
 		assertThat(modifiedIssue.getLabels()).isEmpty();
 	}
@@ -219,7 +223,8 @@ public void addCommentToIssue() {
 				.andExpect(basicAuth())
 				.andExpect(content().string("{\"body\":\"A test comment\"}"))
 				.andRespond(withResource("new-comment.json"));
-		Issue issue = new Issue(null, "commentsUrl", null, null, null, null, null, null, null);
+		Issue issue = new Issue(null, "commentsUrl", null, null, null, null, null, null,
+				null);
 		Comment comment = this.gitHub.addComment(issue, "A test comment");
 		assertThat(comment).isNotNull();
 	}
@@ -258,8 +263,8 @@ public void closeIssue() {
 				.andExpect(content().string("{\"state\":\"closed\"}"))
 				.andRespond(withSuccess("{\"url\":\"updatedIssueUrl\"}",
 						MediaType.APPLICATION_JSON));
-		Issue closedIssue = this.gitHub
-				.close(new Issue("issueUrl", null, null, null, null, null, null, null, null));
+		Issue closedIssue = this.gitHub.close(
+				new Issue("issueUrl", null, null, null, null, null, null, null, null));
 		assertThat(closedIssue.getUrl()).isEqualTo("updatedIssueUrl");
 	}
 
diff --git a/src/test/java/io/spring/issuebot/triage/LabelApplyingTriageListenerTests.java b/src/test/java/io/spring/issuebot/triage/LabelApplyingTriageListenerTests.java
index 0fbd05d..37cac8d 100644
--- a/src/test/java/io/spring/issuebot/triage/LabelApplyingTriageListenerTests.java
+++ b/src/test/java/io/spring/issuebot/triage/LabelApplyingTriageListenerTests.java
@@ -48,4 +48,5 @@ public void doesNotRequireTriage() {
 		this.listener.doesNotRequireTriage(issue);
 		verify(this.gitHub).removeLabel(issue, "test");
 	}
+
 }
diff --git a/src/test/java/io/spring/issuebot/triage/LabelledTriageFilterTests.java b/src/test/java/io/spring/issuebot/triage/LabelledTriageFilterTests.java
index 23b625e..292646d 100644
--- a/src/test/java/io/spring/issuebot/triage/LabelledTriageFilterTests.java
+++ b/src/test/java/io/spring/issuebot/triage/LabelledTriageFilterTests.java
@@ -39,14 +39,18 @@ public class LabelledTriageFilterTests {
 
 	@Test
 	public void issueWithLabels() {
-		assertThat(this.filter.triaged(this.repository, new Issue(null, null, null, null,
-				null, Arrays.asList(new Label("test")), null, null, null))).isTrue();
+		assertThat(
+				this.filter.triaged(this.repository,
+						new Issue(null, null, null, null, null,
+								Arrays.asList(new Label("test")), null, null, null)))
+										.isTrue();
 	}
 
 	@Test
 	public void issueWithNullLabels() {
 		assertThat(this.filter.triaged(this.repository,
-				new Issue(null, null, null, null, null, null, null, null, null))).isFalse();
+				new Issue(null, null, null, null, null, null, null, null, null)))
+						.isFalse();
 	}
 
 	@Test
diff --git a/src/test/java/io/spring/issuebot/triage/MilestoneAppliedTriageFilterTests.java b/src/test/java/io/spring/issuebot/triage/MilestoneAppliedTriageFilterTests.java
index daac128..0eea78a 100644
--- a/src/test/java/io/spring/issuebot/triage/MilestoneAppliedTriageFilterTests.java
+++ b/src/test/java/io/spring/issuebot/triage/MilestoneAppliedTriageFilterTests.java
@@ -43,7 +43,8 @@ public void issueWithMilestoneApplied() {
 	@Test
 	public void issueWithNoMilestoneApplied() {
 		assertThat(this.filter.triaged(this.repository,
-				new Issue(null, null, null, null, null, null, null, null, null))).isFalse();
+				new Issue(null, null, null, null, null, null, null, null, null)))
+						.isFalse();
 	}
 
 }
diff --git a/src/test/java/io/spring/issuebot/triage/OpenedByCollaboratorTriageFilterTests.java b/src/test/java/io/spring/issuebot/triage/OpenedByCollaboratorTriageFilterTests.java
index 77e909b..4f3782a 100644
--- a/src/test/java/io/spring/issuebot/triage/OpenedByCollaboratorTriageFilterTests.java
+++ b/src/test/java/io/spring/issuebot/triage/OpenedByCollaboratorTriageFilterTests.java
@@ -46,16 +46,14 @@ public void setUp() {
 
 	@Test
 	public void openedByCollaborator() {
-		assertThat(this.filter.triaged(this.repository,
-				new Issue(null, null, null, null, new User("Alice"), null, null, null, null)))
-						.isTrue();
+		assertThat(this.filter.triaged(this.repository, new Issue(null, null, null, null,
+				new User("Alice"), null, null, null, null))).isTrue();
 	}
 
 	@Test
 	public void openedByAnotherUser() {
-		assertThat(this.filter.triaged(this.repository,
-				new Issue(null, null, null, null, new User("Debbie"), null, null, null, null)))
-						.isFalse();
+		assertThat(this.filter.triaged(this.repository, new Issue(null, null, null, null,
+				new User("Debbie"), null, null, null, null))).isFalse();
 	}
 
 }

From e4581716532fb7f6744c97dfa1219c3fbcb59ddb Mon Sep 17 00:00:00 2001
From: Nicolas Widart <n.widart@gmail.com>
Date: Thu, 23 May 2019 20:17:30 +0200
Subject: [PATCH 11/13] Extracting the responsibility to handle closed or open
 issues to RepositoryListeners

---
 .../spring/issuebot/IssueBotApplication.java  |  10 +-
 .../spring/issuebot/RepositoryListener.java   |  14 ++
 .../io/spring/issuebot/RepositoryMonitor.java |  65 +-------
 .../issuebot/github/ClosedIssuesListener.java |  53 +++++++
 .../issuebot/github/OpenIssuesListener.java   |  52 +++++++
 .../issuebot/RepositoryMonitorTests.java      | 143 +++---------------
 .../github/ClosedIssuesListenerTest.java      |  85 +++++++++++
 .../github/OpenIssuesListenerTest.java        |  78 ++++++++++
 8 files changed, 318 insertions(+), 182 deletions(-)
 create mode 100644 src/main/java/io/spring/issuebot/RepositoryListener.java
 create mode 100644 src/main/java/io/spring/issuebot/github/ClosedIssuesListener.java
 create mode 100644 src/main/java/io/spring/issuebot/github/OpenIssuesListener.java
 create mode 100644 src/test/java/io/spring/issuebot/github/ClosedIssuesListenerTest.java
 create mode 100644 src/test/java/io/spring/issuebot/github/OpenIssuesListenerTest.java

diff --git a/src/main/java/io/spring/issuebot/IssueBotApplication.java b/src/main/java/io/spring/issuebot/IssueBotApplication.java
index 1320697..d28f46a 100644
--- a/src/main/java/io/spring/issuebot/IssueBotApplication.java
+++ b/src/main/java/io/spring/issuebot/IssueBotApplication.java
@@ -18,7 +18,6 @@
 
 import java.util.List;
 
-import io.spring.issuebot.github.GitHubOperations;
 import io.spring.issuebot.github.GitHubTemplate;
 import io.spring.issuebot.github.RegexLinkParser;
 
@@ -49,11 +48,10 @@ GitHubTemplate gitHubTemplate(GitHubProperties gitHubProperties) {
 	}
 
 	@Bean
-	RepositoryMonitor repositoryMonitor(GitHubOperations gitHub,
-			MonitoringProperties monitoringProperties,
-			List<IssueListener> issueListeners) {
-		return new RepositoryMonitor(gitHub, monitoringProperties.getRepositories(),
-				issueListeners);
+	RepositoryMonitor repositoryMonitor(MonitoringProperties monitoringProperties,
+			List<RepositoryListener> repositoryListeners) {
+		return new RepositoryMonitor(monitoringProperties.getRepositories(),
+				repositoryListeners);
 	}
 
 }
diff --git a/src/main/java/io/spring/issuebot/RepositoryListener.java b/src/main/java/io/spring/issuebot/RepositoryListener.java
new file mode 100644
index 0000000..7ab043b
--- /dev/null
+++ b/src/main/java/io/spring/issuebot/RepositoryListener.java
@@ -0,0 +1,14 @@
+package io.spring.issuebot;
+
+/**
+ * A {@code RepositoryListener} is called when monitoring a repository
+ */
+public interface RepositoryListener {
+
+	/**
+	 * Handle the specific repository
+	 * @param repository the repository
+	 */
+	void handle(Repository repository);
+
+}
diff --git a/src/main/java/io/spring/issuebot/RepositoryMonitor.java b/src/main/java/io/spring/issuebot/RepositoryMonitor.java
index 1300324..117675a 100644
--- a/src/main/java/io/spring/issuebot/RepositoryMonitor.java
+++ b/src/main/java/io/spring/issuebot/RepositoryMonitor.java
@@ -17,13 +17,8 @@
 package io.spring.issuebot;
 
 import java.util.List;
-
-import io.spring.issuebot.github.GitHubOperations;
-import io.spring.issuebot.github.Issue;
-import io.spring.issuebot.github.Page;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import org.springframework.scheduling.annotation.Scheduled;
 
 /**
@@ -35,17 +30,14 @@ class RepositoryMonitor {
 
 	private static final Logger log = LoggerFactory.getLogger(RepositoryMonitor.class);
 
-	private final GitHubOperations gitHub;
-
 	private final List<Repository> repositories;
 
-	private final List<IssueListener> issueListeners;
+	private final List<RepositoryListener> repositoryListeners;
 
-	RepositoryMonitor(GitHubOperations gitHub, List<Repository> repositories,
-			List<IssueListener> issueListeners) {
-		this.gitHub = gitHub;
+	RepositoryMonitor(List<Repository> repositories,
+			List<RepositoryListener> repositoryListeners) {
 		this.repositories = repositories;
-		this.issueListeners = issueListeners;
+		this.repositoryListeners = repositoryListeners;
 	}
 
 	@Scheduled(fixedRate = 5 * 60 * 1000)
@@ -53,55 +45,12 @@ void monitor() {
 		for (Repository repository : this.repositories) {
 			log.info("Monitoring {}/{}", repository.getOrganization(),
 					repository.getName());
-			monitorOpenIssues(repository);
-			monitorClosedIssues(repository);
+			for (RepositoryListener repositoryListener : repositoryListeners) {
+				repositoryListener.handle(repository);
+			}
 			log.info("Monitoring of {}/{} completed", repository.getOrganization(),
 					repository.getName());
 		}
 	}
 
-	private void monitorClosedIssues(Repository repository) {
-		try {
-			Page<Issue> page = this.gitHub.getClosedIssuesWithLabel(
-					repository.getOrganization(), repository.getName(),
-					"status: waiting-for-triage");
-			monitorIssue(page, (issue, issueListener) -> issueListener
-					.onIssueClosure(repository, issue));
-		}
-		catch (Exception ex) {
-			log.warn("A failure occurred during monitoring of {}/{}",
-					repository.getOrganization(), repository.getName(), ex);
-		}
-	}
-
-	private void monitorOpenIssues(Repository repository) {
-		try {
-			Page<Issue> page = this.gitHub.getIssues(repository.getOrganization(),
-					repository.getName());
-			monitorIssue(page, (issue, issueListener) -> issueListener
-					.onOpenIssue(repository, issue));
-		}
-		catch (Exception ex) {
-			log.warn("A failure occurred during monitoring of {}/{}",
-					repository.getOrganization(), repository.getName(), ex);
-		}
-	}
-
-	private void monitorIssue(Page<Issue> page, IssueOperation issueOperation) {
-		while (page != null) {
-			for (Issue issue : page.getContent()) {
-				for (IssueListener issueListener : this.issueListeners) {
-					try {
-						issueOperation.run(issue, issueListener);
-					}
-					catch (Exception ex) {
-						log.warn("Listener '{}' failed when handling issue '{}'",
-								issueListener, issue, ex);
-					}
-				}
-			}
-			page = page.next();
-		}
-	}
-
 }
diff --git a/src/main/java/io/spring/issuebot/github/ClosedIssuesListener.java b/src/main/java/io/spring/issuebot/github/ClosedIssuesListener.java
new file mode 100644
index 0000000..1e5f5ea
--- /dev/null
+++ b/src/main/java/io/spring/issuebot/github/ClosedIssuesListener.java
@@ -0,0 +1,53 @@
+package io.spring.issuebot.github;
+
+import io.spring.issuebot.IssueListener;
+import io.spring.issuebot.Repository;
+import io.spring.issuebot.RepositoryListener;
+import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ClosedIssuesListener implements RepositoryListener {
+
+	private static final Logger log = LoggerFactory.getLogger(ClosedIssuesListener.class);
+
+	private final List<IssueListener> issueListeners;
+
+	private final GitHubOperations gitHub;
+
+	public ClosedIssuesListener(GitHubOperations gitHub,
+			List<IssueListener> issueListeners) {
+		this.issueListeners = issueListeners;
+		this.gitHub = gitHub;
+	}
+
+	@Override
+	public void handle(Repository repository) {
+		try {
+			Page<Issue> page = this.gitHub.getClosedIssuesWithLabel(
+					repository.getOrganization(), repository.getName(),
+					"status: waiting-for-triage");
+			while (page != null) {
+				for (Issue issue : page.getContent()) {
+					for (IssueListener issueListener : this.issueListeners) {
+						try {
+							issueListener.onIssueClosure(repository, issue);
+						}
+						catch (Exception ex) {
+							log.warn("Listener '{}' failed when handling issue '{}'",
+									issueListener, issue, ex);
+						}
+					}
+				}
+				page = page.next();
+			}
+		}
+		catch (Exception ex) {
+			log.warn("A failure occurred during monitoring of {}/{}",
+					repository.getOrganization(), repository.getName(), ex);
+		}
+	}
+
+}
diff --git a/src/main/java/io/spring/issuebot/github/OpenIssuesListener.java b/src/main/java/io/spring/issuebot/github/OpenIssuesListener.java
new file mode 100644
index 0000000..fc25962
--- /dev/null
+++ b/src/main/java/io/spring/issuebot/github/OpenIssuesListener.java
@@ -0,0 +1,52 @@
+package io.spring.issuebot.github;
+
+import io.spring.issuebot.IssueListener;
+import io.spring.issuebot.Repository;
+import io.spring.issuebot.RepositoryListener;
+import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+@Service
+public class OpenIssuesListener implements RepositoryListener {
+
+	private static final Logger log = LoggerFactory.getLogger(OpenIssuesListener.class);
+
+	private final List<IssueListener> issueListeners;
+
+	private final GitHubOperations gitHub;
+
+	public OpenIssuesListener(GitHubOperations gitHub,
+			List<IssueListener> issueListeners) {
+		this.issueListeners = issueListeners;
+		this.gitHub = gitHub;
+	}
+
+	@Override
+	public void handle(Repository repository) {
+		try {
+			Page<Issue> page = this.gitHub.getIssues(repository.getOrganization(),
+					repository.getName());
+			while (page != null) {
+				for (Issue issue : page.getContent()) {
+					for (IssueListener issueListener : this.issueListeners) {
+						try {
+							issueListener.onOpenIssue(repository, issue);
+						}
+						catch (Exception ex) {
+							log.warn("Listener '{}' failed when handling issue '{}'",
+									issueListener, issue, ex);
+						}
+					}
+				}
+				page = page.next();
+			}
+		}
+		catch (Exception ex) {
+			log.warn("A failure occurred during monitoring of {}/{}",
+					repository.getOrganization(), repository.getName(), ex);
+		}
+	}
+
+}
diff --git a/src/test/java/io/spring/issuebot/RepositoryMonitorTests.java b/src/test/java/io/spring/issuebot/RepositoryMonitorTests.java
index 63906d5..248f812 100644
--- a/src/test/java/io/spring/issuebot/RepositoryMonitorTests.java
+++ b/src/test/java/io/spring/issuebot/RepositoryMonitorTests.java
@@ -16,21 +16,15 @@
 
 package io.spring.issuebot;
 
-import java.util.Arrays;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
 
-import io.spring.issuebot.github.GitHubOperations;
-import io.spring.issuebot.github.Issue;
-import io.spring.issuebot.github.Page;
+import java.util.Arrays;
 import java.util.Collections;
 import org.junit.Before;
 import org.junit.Test;
 
-import static org.mockito.BDDMockito.given;
-import static org.mockito.BDDMockito.willThrow;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-
 /**
  * Tests for {@link RepositoryMonitor}.
  *
@@ -38,19 +32,19 @@
  */
 public class RepositoryMonitorTests {
 
-	private final GitHubOperations gitHub = mock(GitHubOperations.class);
-
-	private final IssueListener issueListenerOne = mock(IssueListener.class);
+	private final RepositoryListener repositoryListenerOne = mock(
+			RepositoryListener.class);
 
-	private final IssueListener issueListenerTwo = mock(IssueListener.class);
+	private final RepositoryListener repositoryListenerTwo = mock(
+			RepositoryListener.class);
 
 	private final Repository repositoryOne = new Repository();
 
 	private final Repository repositoryTwo = new Repository();
 
-	private final RepositoryMonitor repositoryMonitor = new RepositoryMonitor(this.gitHub,
+	private final RepositoryMonitor repositoryMonitor = new RepositoryMonitor(
 			Arrays.asList(this.repositoryOne, this.repositoryTwo),
-			Arrays.asList(this.issueListenerOne, this.issueListenerTwo));
+			Arrays.asList(this.repositoryListenerOne, this.repositoryListenerTwo));
 
 	@Before
 	public void setUp() {
@@ -61,115 +55,28 @@ public void setUp() {
 	}
 
 	@Test
-	public void repositoriesWithNoIssues() {
-		given(this.gitHub.getIssues("test", "one")).willReturn(null);
-		given(this.gitHub.getIssues("test", "two")).willReturn(null);
-		this.repositoryMonitor.monitor();
-		verifyNoMoreInteractions(this.issueListenerOne, this.issueListenerTwo);
-	}
-
-	@Test
-	public void oneRepositoryWithOpenIssues() {
-		@SuppressWarnings("unchecked")
-		Page<Issue> page = mock(Page.class);
-		Issue issueOne = new Issue(null, null, null, null, null, null, null, null,
-				"open");
-		Issue issueTwo = new Issue(null, null, null, null, null, null, null, null,
-				"open");
-		given(page.getContent()).willReturn(Arrays.asList(issueOne, issueTwo));
-		given(this.gitHub.getIssues("test", "one")).willReturn(page);
-		given(this.gitHub.getIssues("test", "two")).willReturn(null);
-		this.repositoryMonitor.monitor();
-		verify(this.issueListenerOne).onOpenIssue(this.repositoryOne, issueOne);
-		verify(this.issueListenerOne).onOpenIssue(this.repositoryOne, issueTwo);
-		verify(this.issueListenerTwo).onOpenIssue(this.repositoryOne, issueOne);
-		verify(this.issueListenerTwo).onOpenIssue(this.repositoryOne, issueTwo);
-	}
-
-	@Test
-	public void onRepositoryWithClosedIssues() {
-		@SuppressWarnings("unchecked")
-		Page<Issue> page = mock(Page.class);
-		Issue issueOne = new Issue(null, null, null, null, null, null, null, null,
-				"closed");
-		Issue issueTwo = new Issue(null, null, null, null, null, null, null, null,
-				"closed");
-		given(page.getContent()).willReturn(Arrays.asList(issueOne, issueTwo));
-		given(this.gitHub.getClosedIssuesWithLabel("test", "one",
-				"status: waiting-for-triage")).willReturn(page);
-		given(this.gitHub.getClosedIssuesWithLabel("test", "two",
-				"status: waiting-for-triage")).willReturn(null);
-		this.repositoryMonitor.monitor();
-		verify(this.issueListenerOne).onIssueClosure(this.repositoryOne, issueOne);
-		verify(this.issueListenerOne).onIssueClosure(this.repositoryOne, issueTwo);
-		verify(this.issueListenerTwo).onIssueClosure(this.repositoryOne, issueOne);
-		verify(this.issueListenerTwo).onIssueClosure(this.repositoryOne, issueTwo);
-	}
-
-	@Test
-	public void bothRepositoriesWithOpenIssues() {
-		@SuppressWarnings("unchecked")
-		Page<Issue> page = mock(Page.class);
-		Issue issueOne = new Issue(null, null, null, null, null, null, null, null,
-				"open");
-		Issue issueTwo = new Issue(null, null, null, null, null, null, null, null,
-				"open");
-		given(page.getContent()).willReturn(Arrays.asList(issueOne, issueTwo));
-		given(this.gitHub.getIssues("test", "one")).willReturn(page);
-		given(this.gitHub.getIssues("test", "two")).willReturn(page);
-		this.repositoryMonitor.monitor();
-		verify(this.issueListenerOne).onOpenIssue(this.repositoryOne, issueOne);
-		verify(this.issueListenerOne).onOpenIssue(this.repositoryOne, issueTwo);
-		verify(this.issueListenerTwo).onOpenIssue(this.repositoryOne, issueOne);
-		verify(this.issueListenerTwo).onOpenIssue(this.repositoryOne, issueTwo);
-		verify(this.issueListenerOne).onOpenIssue(this.repositoryTwo, issueOne);
-		verify(this.issueListenerOne).onOpenIssue(this.repositoryTwo, issueTwo);
-		verify(this.issueListenerTwo).onOpenIssue(this.repositoryTwo, issueOne);
-		verify(this.issueListenerTwo).onOpenIssue(this.repositoryTwo, issueTwo);
-	}
-
-	@Test
-	public void exceptionFromAnIssueListenerIsHandledGracefully() {
-		@SuppressWarnings("unchecked")
-		Page<Issue> page = mock(Page.class);
-		Issue issue = new Issue(null, null, null, null, null, null, null, null, "open");
-		given(page.getContent()).willReturn(Arrays.asList(issue));
-		given(this.gitHub.getIssues("test", "one")).willReturn(page);
-		willThrow(new RuntimeException()).given(this.issueListenerOne)
-				.onOpenIssue(this.repositoryOne, issue);
-		this.repositoryMonitor.monitor();
-		verify(this.issueListenerOne).onOpenIssue(this.repositoryOne, issue);
-		verify(this.issueListenerTwo).onOpenIssue(this.repositoryOne, issue);
-	}
-
-	@Test
-	public void exceptionFromAnIssueListenerIsHandledGracefullyForClosedIssues() {
-		@SuppressWarnings("unchecked")
-		Page<Issue> page = mock(Page.class);
-		Issue issue = new Issue(null, null, null, null, null, null, null, null, "closed");
-		given(page.getContent()).willReturn(Collections.singletonList(issue));
-		given(this.gitHub.getClosedIssuesWithLabel("test", "one",
-				"status: waiting-for-triage")).willReturn(page);
-		willThrow(new RuntimeException()).given(this.issueListenerOne)
-				.onOpenIssue(this.repositoryOne, issue);
-		this.repositoryMonitor.monitor();
-		verify(this.issueListenerOne).onIssueClosure(this.repositoryOne, issue);
-		verify(this.issueListenerTwo).onIssueClosure(this.repositoryOne, issue);
+	public void noRepositories() {
+		RepositoryMonitor monitor = new RepositoryMonitor(Collections.emptyList(),
+				Arrays.asList(this.repositoryListenerOne, this.repositoryListenerTwo));
+		monitor.monitor();
+		verifyNoMoreInteractions(repositoryListenerOne, repositoryListenerTwo);
 	}
 
 	@Test
-	public void exceptionFromGitHubIsHandledGracefully() {
-		given(this.gitHub.getIssues("test", "one")).willThrow(new RuntimeException());
-		this.repositoryMonitor.monitor();
-		verify(this.gitHub).getIssues("test", "one");
+	public void noIssueListeners() {
+		RepositoryMonitor monitor = new RepositoryMonitor(
+				Arrays.asList(repositoryOne, repositoryTwo), Collections.emptyList());
+		monitor.monitor();
+		verifyNoMoreInteractions(repositoryListenerTwo, repositoryListenerTwo);
 	}
 
 	@Test
-	public void exceptionFromGitHubIsHandledGracefullyForClosedIssues() {
-		given(this.gitHub.getClosedIssuesWithLabel("test", "one",
-				"status: waiting-for-triage")).willThrow(new RuntimeException());
+	public void monitorDelegatesToListeners() {
 		this.repositoryMonitor.monitor();
-		verify(this.gitHub).getIssues("test", "one");
+		verify(repositoryListenerOne).handle(repositoryOne);
+		verify(repositoryListenerOne).handle(repositoryTwo);
+		verify(repositoryListenerTwo).handle(repositoryOne);
+		verify(repositoryListenerTwo).handle(repositoryTwo);
 	}
 
 }
diff --git a/src/test/java/io/spring/issuebot/github/ClosedIssuesListenerTest.java b/src/test/java/io/spring/issuebot/github/ClosedIssuesListenerTest.java
new file mode 100644
index 0000000..eaf4cf9
--- /dev/null
+++ b/src/test/java/io/spring/issuebot/github/ClosedIssuesListenerTest.java
@@ -0,0 +1,85 @@
+package io.spring.issuebot.github;
+
+import static org.mockito.BDDMockito.given;
+import static org.mockito.BDDMockito.willThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
+import io.spring.issuebot.IssueListener;
+import io.spring.issuebot.Repository;
+import java.util.Arrays;
+import java.util.Collections;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ClosedIssuesListenerTest {
+
+	private static String waitingForTriageLabel = "status: waiting-for-triage";
+
+	private final GitHubOperations gitHub = mock(GitHubOperations.class);
+
+	private final IssueListener issueListenerOne = mock(IssueListener.class);
+
+	private final IssueListener issueListenerTwo = mock(IssueListener.class);
+
+	private final Repository repositoryOne = new Repository();
+
+	private ClosedIssuesListener closedIssuesListener = new ClosedIssuesListener(
+			this.gitHub, Arrays.asList(issueListenerOne, issueListenerTwo));
+
+	@Before
+	public void setUp() {
+		this.repositoryOne.setOrganization("test");
+		this.repositoryOne.setName("one");
+	}
+
+	@Test
+	public void repositoriesWithNoIssues() {
+		given(this.gitHub.getClosedIssuesWithLabel("test", "one", waitingForTriageLabel))
+				.willReturn(null);
+		this.closedIssuesListener.handle(repositoryOne);
+		verifyNoMoreInteractions(this.issueListenerOne, this.issueListenerTwo);
+	}
+
+	@Test
+	public void repositoryWithClosedIssues() {
+		@SuppressWarnings("unchecked")
+		Page<Issue> page = mock(Page.class);
+		Issue issueOne = new Issue(null, null, null, null, null, null, null, null,
+				"closed");
+		Issue issueTwo = new Issue(null, null, null, null, null, null, null, null,
+				"closed");
+		given(page.getContent()).willReturn(Arrays.asList(issueOne, issueTwo));
+		given(this.gitHub.getClosedIssuesWithLabel("test", "one", waitingForTriageLabel))
+				.willReturn(page);
+		this.closedIssuesListener.handle(repositoryOne);
+		verify(this.issueListenerOne).onIssueClosure(this.repositoryOne, issueOne);
+		verify(this.issueListenerOne).onIssueClosure(this.repositoryOne, issueOne);
+	}
+
+	@Test
+	public void exceptionFromAnIssueListenerIsHandledGracefully() {
+		@SuppressWarnings("unchecked")
+		Page<Issue> page = mock(Page.class);
+		Issue issue = new Issue(null, null, null, null, null, null, null, null, "closed");
+		given(page.getContent()).willReturn(Collections.singletonList(issue));
+		given(this.gitHub.getClosedIssuesWithLabel("test", "one", waitingForTriageLabel))
+				.willReturn(page);
+		willThrow(new RuntimeException()).given(this.issueListenerOne)
+				.onIssueClosure(this.repositoryOne, issue);
+		this.closedIssuesListener.handle(repositoryOne);
+		verify(this.issueListenerOne).onIssueClosure(this.repositoryOne, issue);
+		verify(this.issueListenerTwo).onIssueClosure(this.repositoryOne, issue);
+	}
+
+	@Test
+	public void exceptionFromGitHubIsHandledGracefully() {
+		given(this.gitHub.getClosedIssuesWithLabel("test", "one", waitingForTriageLabel))
+				.willThrow(new RuntimeException());
+		this.closedIssuesListener.handle(repositoryOne);
+		verify(this.gitHub).getClosedIssuesWithLabel("test", "one",
+				waitingForTriageLabel);
+	}
+
+}
diff --git a/src/test/java/io/spring/issuebot/github/OpenIssuesListenerTest.java b/src/test/java/io/spring/issuebot/github/OpenIssuesListenerTest.java
new file mode 100644
index 0000000..d9ada70
--- /dev/null
+++ b/src/test/java/io/spring/issuebot/github/OpenIssuesListenerTest.java
@@ -0,0 +1,78 @@
+package io.spring.issuebot.github;
+
+import static org.mockito.BDDMockito.given;
+import static org.mockito.BDDMockito.willThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
+import io.spring.issuebot.IssueListener;
+import io.spring.issuebot.Repository;
+import java.util.Arrays;
+import java.util.Collections;
+import org.junit.Before;
+import org.junit.Test;
+
+public class OpenIssuesListenerTest {
+
+	private final GitHubOperations gitHub = mock(GitHubOperations.class);
+
+	private final IssueListener issueListenerOne = mock(IssueListener.class);
+
+	private final IssueListener issueListenerTwo = mock(IssueListener.class);
+
+	private final Repository repositoryOne = new Repository();
+
+	private OpenIssuesListener openIssuesListener = new OpenIssuesListener(this.gitHub,
+			Arrays.asList(issueListenerOne, issueListenerTwo));
+
+	@Before
+	public void setUp() {
+		this.repositoryOne.setOrganization("test");
+		this.repositoryOne.setName("one");
+	}
+
+	@Test
+	public void repositoriesWithNoIssues() {
+		given(this.gitHub.getIssues("test", "one")).willReturn(null);
+		this.openIssuesListener.handle(repositoryOne);
+		verifyNoMoreInteractions(this.issueListenerOne, this.issueListenerTwo);
+	}
+
+	@Test
+	public void repositoryWithIssues() {
+		@SuppressWarnings("unchecked")
+		Page<Issue> page = mock(Page.class);
+		Issue issueOne = new Issue(null, null, null, null, null, null, null, null,
+				"open");
+		Issue issueTwo = new Issue(null, null, null, null, null, null, null, null,
+				"open");
+		given(page.getContent()).willReturn(Arrays.asList(issueOne, issueTwo));
+		given(this.gitHub.getIssues("test", "one")).willReturn(page);
+		this.openIssuesListener.handle(repositoryOne);
+		verify(this.issueListenerOne).onOpenIssue(this.repositoryOne, issueOne);
+		verify(this.issueListenerOne).onOpenIssue(this.repositoryOne, issueOne);
+	}
+
+	@Test
+	public void exceptionFromAnIssueListenerIsHandledGracefully() {
+		@SuppressWarnings("unchecked")
+		Page<Issue> page = mock(Page.class);
+		Issue issue = new Issue(null, null, null, null, null, null, null, null, "open");
+		given(page.getContent()).willReturn(Collections.singletonList(issue));
+		given(this.gitHub.getIssues("test", "one")).willReturn(page);
+		willThrow(new RuntimeException()).given(this.issueListenerOne)
+				.onOpenIssue(this.repositoryOne, issue);
+		this.openIssuesListener.handle(repositoryOne);
+		verify(this.issueListenerOne).onOpenIssue(this.repositoryOne, issue);
+		verify(this.issueListenerTwo).onOpenIssue(this.repositoryOne, issue);
+	}
+
+	@Test
+	public void exceptionFromGitHubIsHandledGracefully() {
+		given(this.gitHub.getIssues("test", "one")).willThrow(new RuntimeException());
+		this.openIssuesListener.handle(repositoryOne);
+		verify(this.gitHub).getIssues("test", "one");
+	}
+
+}

From e84e2d9f667e6a9266d8ec8d85d41759ce85fa7f Mon Sep 17 00:00:00 2001
From: Nicolas Widart <n.widart@gmail.com>
Date: Thu, 23 May 2019 20:32:57 +0200
Subject: [PATCH 12/13] Extracting common issue monitoring logic into its own
 class Inlining the functional interface as it wont be used anywhere else.

---
 .../java/io/spring/issuebot/IssueMonitor.java | 43 +++++++++++++++++++
 .../io/spring/issuebot/IssueOperation.java    | 10 -----
 .../issuebot/github/ClosedIssuesListener.java | 29 +++----------
 .../issuebot/github/OpenIssuesListener.java   | 25 +++--------
 .../github/ClosedIssuesListenerTest.java      |  6 ++-
 .../github/OpenIssuesListenerTest.java        |  6 ++-
 6 files changed, 65 insertions(+), 54 deletions(-)
 create mode 100644 src/main/java/io/spring/issuebot/IssueMonitor.java
 delete mode 100644 src/main/java/io/spring/issuebot/IssueOperation.java

diff --git a/src/main/java/io/spring/issuebot/IssueMonitor.java b/src/main/java/io/spring/issuebot/IssueMonitor.java
new file mode 100644
index 0000000..502c31e
--- /dev/null
+++ b/src/main/java/io/spring/issuebot/IssueMonitor.java
@@ -0,0 +1,43 @@
+package io.spring.issuebot;
+
+import io.spring.issuebot.github.Issue;
+import io.spring.issuebot.github.Page;
+import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+@Service
+public class IssueMonitor {
+
+	private static final Logger log = LoggerFactory.getLogger(IssueMonitor.class);
+
+	private final List<IssueListener> issueListeners;
+
+	public IssueMonitor(List<IssueListener> issueListeners) {
+		this.issueListeners = issueListeners;
+	}
+
+	public void monitorIssue(Page<Issue> page, IssueOperation issueOperation) {
+		while (page != null) {
+			for (Issue issue : page.getContent()) {
+				for (IssueListener issueListener : this.issueListeners) {
+					try {
+						issueOperation.run(issue, issueListener);
+					} catch (Exception ex) {
+						log.warn("Listener '{}' failed when handling issue '{}'",
+								issueListener, issue, ex);
+					}
+				}
+			}
+			page = page.next();
+		}
+	}
+
+	@FunctionalInterface
+	public interface IssueOperation {
+
+		void run(Issue issue, IssueListener issueListener);
+
+	}
+}
diff --git a/src/main/java/io/spring/issuebot/IssueOperation.java b/src/main/java/io/spring/issuebot/IssueOperation.java
deleted file mode 100644
index 23bd276..0000000
--- a/src/main/java/io/spring/issuebot/IssueOperation.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package io.spring.issuebot;
-
-import io.spring.issuebot.github.Issue;
-
-@FunctionalInterface
-public interface IssueOperation {
-
-	void run(Issue issue, IssueListener issueListener);
-
-}
diff --git a/src/main/java/io/spring/issuebot/github/ClosedIssuesListener.java b/src/main/java/io/spring/issuebot/github/ClosedIssuesListener.java
index 1e5f5ea..f39a67a 100644
--- a/src/main/java/io/spring/issuebot/github/ClosedIssuesListener.java
+++ b/src/main/java/io/spring/issuebot/github/ClosedIssuesListener.java
@@ -1,9 +1,8 @@
 package io.spring.issuebot.github;
 
-import io.spring.issuebot.IssueListener;
+import io.spring.issuebot.IssueMonitor;
 import io.spring.issuebot.Repository;
 import io.spring.issuebot.RepositoryListener;
-import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -13,13 +12,13 @@ public class ClosedIssuesListener implements RepositoryListener {
 
 	private static final Logger log = LoggerFactory.getLogger(ClosedIssuesListener.class);
 
-	private final List<IssueListener> issueListeners;
-
 	private final GitHubOperations gitHub;
 
+	private final IssueMonitor issueMonitor;
+
 	public ClosedIssuesListener(GitHubOperations gitHub,
-			List<IssueListener> issueListeners) {
-		this.issueListeners = issueListeners;
+			IssueMonitor issueMonitor) {
+		this.issueMonitor = issueMonitor;
 		this.gitHub = gitHub;
 	}
 
@@ -29,22 +28,8 @@ public void handle(Repository repository) {
 			Page<Issue> page = this.gitHub.getClosedIssuesWithLabel(
 					repository.getOrganization(), repository.getName(),
 					"status: waiting-for-triage");
-			while (page != null) {
-				for (Issue issue : page.getContent()) {
-					for (IssueListener issueListener : this.issueListeners) {
-						try {
-							issueListener.onIssueClosure(repository, issue);
-						}
-						catch (Exception ex) {
-							log.warn("Listener '{}' failed when handling issue '{}'",
-									issueListener, issue, ex);
-						}
-					}
-				}
-				page = page.next();
-			}
-		}
-		catch (Exception ex) {
+			issueMonitor.monitorIssue(page, (issue, issueListener) -> issueListener.onIssueClosure(repository, issue));
+		} catch (Exception ex) {
 			log.warn("A failure occurred during monitoring of {}/{}",
 					repository.getOrganization(), repository.getName(), ex);
 		}
diff --git a/src/main/java/io/spring/issuebot/github/OpenIssuesListener.java b/src/main/java/io/spring/issuebot/github/OpenIssuesListener.java
index fc25962..79e1c0b 100644
--- a/src/main/java/io/spring/issuebot/github/OpenIssuesListener.java
+++ b/src/main/java/io/spring/issuebot/github/OpenIssuesListener.java
@@ -1,9 +1,8 @@
 package io.spring.issuebot.github;
 
-import io.spring.issuebot.IssueListener;
+import io.spring.issuebot.IssueMonitor;
 import io.spring.issuebot.Repository;
 import io.spring.issuebot.RepositoryListener;
-import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -13,13 +12,12 @@ public class OpenIssuesListener implements RepositoryListener {
 
 	private static final Logger log = LoggerFactory.getLogger(OpenIssuesListener.class);
 
-	private final List<IssueListener> issueListeners;
-
 	private final GitHubOperations gitHub;
+	private final IssueMonitor issueMonitor;
 
 	public OpenIssuesListener(GitHubOperations gitHub,
-			List<IssueListener> issueListeners) {
-		this.issueListeners = issueListeners;
+			IssueMonitor issueMonitor) {
+		this.issueMonitor = issueMonitor;
 		this.gitHub = gitHub;
 	}
 
@@ -28,20 +26,7 @@ public void handle(Repository repository) {
 		try {
 			Page<Issue> page = this.gitHub.getIssues(repository.getOrganization(),
 					repository.getName());
-			while (page != null) {
-				for (Issue issue : page.getContent()) {
-					for (IssueListener issueListener : this.issueListeners) {
-						try {
-							issueListener.onOpenIssue(repository, issue);
-						}
-						catch (Exception ex) {
-							log.warn("Listener '{}' failed when handling issue '{}'",
-									issueListener, issue, ex);
-						}
-					}
-				}
-				page = page.next();
-			}
+			 issueMonitor.monitorIssue(page, (issue, issueListener) -> issueListener.onOpenIssue(repository, issue));
 		}
 		catch (Exception ex) {
 			log.warn("A failure occurred during monitoring of {}/{}",
diff --git a/src/test/java/io/spring/issuebot/github/ClosedIssuesListenerTest.java b/src/test/java/io/spring/issuebot/github/ClosedIssuesListenerTest.java
index eaf4cf9..13f70fa 100644
--- a/src/test/java/io/spring/issuebot/github/ClosedIssuesListenerTest.java
+++ b/src/test/java/io/spring/issuebot/github/ClosedIssuesListenerTest.java
@@ -6,6 +6,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
+import io.spring.issuebot.IssueMonitor;
 import io.spring.issuebot.IssueListener;
 import io.spring.issuebot.Repository;
 import java.util.Arrays;
@@ -25,8 +26,11 @@ public class ClosedIssuesListenerTest {
 
 	private final Repository repositoryOne = new Repository();
 
+	private final IssueMonitor issueMonitor = new IssueMonitor(
+			Arrays.asList(issueListenerOne, issueListenerTwo));
+
 	private ClosedIssuesListener closedIssuesListener = new ClosedIssuesListener(
-			this.gitHub, Arrays.asList(issueListenerOne, issueListenerTwo));
+			this.gitHub, issueMonitor);
 
 	@Before
 	public void setUp() {
diff --git a/src/test/java/io/spring/issuebot/github/OpenIssuesListenerTest.java b/src/test/java/io/spring/issuebot/github/OpenIssuesListenerTest.java
index d9ada70..9124350 100644
--- a/src/test/java/io/spring/issuebot/github/OpenIssuesListenerTest.java
+++ b/src/test/java/io/spring/issuebot/github/OpenIssuesListenerTest.java
@@ -6,6 +6,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
+import io.spring.issuebot.IssueMonitor;
 import io.spring.issuebot.IssueListener;
 import io.spring.issuebot.Repository;
 import java.util.Arrays;
@@ -23,9 +24,12 @@ public class OpenIssuesListenerTest {
 
 	private final Repository repositoryOne = new Repository();
 
-	private OpenIssuesListener openIssuesListener = new OpenIssuesListener(this.gitHub,
+	private final IssueMonitor issueMonitor = new IssueMonitor(
 			Arrays.asList(issueListenerOne, issueListenerTwo));
 
+	private OpenIssuesListener openIssuesListener = new OpenIssuesListener(this.gitHub,
+			issueMonitor);
+
 	@Before
 	public void setUp() {
 		this.repositoryOne.setOrganization("test");

From b9d60790366d5a8c8370bd96e5d2384d41d630bd Mon Sep 17 00:00:00 2001
From: Nicolas Widart <n.widart@gmail.com>
Date: Thu, 23 May 2019 20:36:18 +0200
Subject: [PATCH 13/13] Code Style: Run the spring java format command

---
 src/main/java/io/spring/issuebot/IssueMonitor.java       | 4 +++-
 .../io/spring/issuebot/github/ClosedIssuesListener.java  | 9 +++++----
 .../io/spring/issuebot/github/OpenIssuesListener.java    | 7 ++++---
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/main/java/io/spring/issuebot/IssueMonitor.java b/src/main/java/io/spring/issuebot/IssueMonitor.java
index 502c31e..315f1cc 100644
--- a/src/main/java/io/spring/issuebot/IssueMonitor.java
+++ b/src/main/java/io/spring/issuebot/IssueMonitor.java
@@ -24,7 +24,8 @@ public void monitorIssue(Page<Issue> page, IssueOperation issueOperation) {
 				for (IssueListener issueListener : this.issueListeners) {
 					try {
 						issueOperation.run(issue, issueListener);
-					} catch (Exception ex) {
+					}
+					catch (Exception ex) {
 						log.warn("Listener '{}' failed when handling issue '{}'",
 								issueListener, issue, ex);
 					}
@@ -40,4 +41,5 @@ public interface IssueOperation {
 		void run(Issue issue, IssueListener issueListener);
 
 	}
+
 }
diff --git a/src/main/java/io/spring/issuebot/github/ClosedIssuesListener.java b/src/main/java/io/spring/issuebot/github/ClosedIssuesListener.java
index f39a67a..1c739cf 100644
--- a/src/main/java/io/spring/issuebot/github/ClosedIssuesListener.java
+++ b/src/main/java/io/spring/issuebot/github/ClosedIssuesListener.java
@@ -16,8 +16,7 @@ public class ClosedIssuesListener implements RepositoryListener {
 
 	private final IssueMonitor issueMonitor;
 
-	public ClosedIssuesListener(GitHubOperations gitHub,
-			IssueMonitor issueMonitor) {
+	public ClosedIssuesListener(GitHubOperations gitHub, IssueMonitor issueMonitor) {
 		this.issueMonitor = issueMonitor;
 		this.gitHub = gitHub;
 	}
@@ -28,8 +27,10 @@ public void handle(Repository repository) {
 			Page<Issue> page = this.gitHub.getClosedIssuesWithLabel(
 					repository.getOrganization(), repository.getName(),
 					"status: waiting-for-triage");
-			issueMonitor.monitorIssue(page, (issue, issueListener) -> issueListener.onIssueClosure(repository, issue));
-		} catch (Exception ex) {
+			issueMonitor.monitorIssue(page, (issue, issueListener) -> issueListener
+					.onIssueClosure(repository, issue));
+		}
+		catch (Exception ex) {
 			log.warn("A failure occurred during monitoring of {}/{}",
 					repository.getOrganization(), repository.getName(), ex);
 		}
diff --git a/src/main/java/io/spring/issuebot/github/OpenIssuesListener.java b/src/main/java/io/spring/issuebot/github/OpenIssuesListener.java
index 79e1c0b..4d3bae7 100644
--- a/src/main/java/io/spring/issuebot/github/OpenIssuesListener.java
+++ b/src/main/java/io/spring/issuebot/github/OpenIssuesListener.java
@@ -13,10 +13,10 @@ public class OpenIssuesListener implements RepositoryListener {
 	private static final Logger log = LoggerFactory.getLogger(OpenIssuesListener.class);
 
 	private final GitHubOperations gitHub;
+
 	private final IssueMonitor issueMonitor;
 
-	public OpenIssuesListener(GitHubOperations gitHub,
-			IssueMonitor issueMonitor) {
+	public OpenIssuesListener(GitHubOperations gitHub, IssueMonitor issueMonitor) {
 		this.issueMonitor = issueMonitor;
 		this.gitHub = gitHub;
 	}
@@ -26,7 +26,8 @@ public void handle(Repository repository) {
 		try {
 			Page<Issue> page = this.gitHub.getIssues(repository.getOrganization(),
 					repository.getName());
-			 issueMonitor.monitorIssue(page, (issue, issueListener) -> issueListener.onOpenIssue(repository, issue));
+			issueMonitor.monitorIssue(page, (issue, issueListener) -> issueListener
+					.onOpenIssue(repository, issue));
 		}
 		catch (Exception ex) {
 			log.warn("A failure occurred during monitoring of {}/{}",