Use URLs as-is to prevent double percent-encoding

Closes gh-46

Author: wilkinsona

Diff for: src/main/java/io/spring/issuebot/github/GitHubTemplate.java

@@ -139,7 +139,7 @@ private <T> Page<T> getPage(String url, Class<T[]> type) {
 		if (!StringUtils.hasText(url)) {
 			return null;
 		}
-		ResponseEntity<T[]> contents = this.rest.getForEntity(url, type);
+		ResponseEntity<T[]> contents = this.rest.getForEntity(URI.create(url), type);
 		return new StandardPage<>(Arrays.asList(contents.getBody()), () -> getPage(getNextUrl(contents), type));
 	}
 
@@ -169,7 +169,7 @@ public Issue removeLabel(Issue issue, String labelName) {
 		catch (URISyntaxException ex) {
 			throw new RuntimeException(ex);
 		}
-		ResponseEntity<Label[]> response = this.rest.exchange(new RequestEntity<Void>(HttpMethod.DELETE,
+		ResponseEntity<Label[]> response = this.rest.exchange(new RequestEntity<>(HttpMethod.DELETE,
 				URI.create(issue.getLabelsUrl().replace("{/name}", "/" + encodedName))), Label[].class);
 		if (response.getStatusCode() != HttpStatus.OK) {
 			log.warn("Failed to remove label from issue. Response status: " + response.getStatusCode());

Diff for: src/test/java/io/spring/issuebot/github/GitHubTemplateTests.java

@@ -78,12 +78,10 @@ void singlePageOfIssues() {
 
 	@Test
 	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"))
 			.andExpect(method(HttpMethod.GET))
 			.andExpect(basicAuth())
-			.andRespond(withResource("issues-page-one.json", "Link:<page-two>; rel=\"next\""));
+			.andRespond(withResource("issues-page-one.json", "Link:</page-two>; rel=\"next\""));
 		this.server.expect(requestTo("/page-two"))
 			.andExpect(method(HttpMethod.GET))
 			.andExpect(basicAuth())
@@ -95,6 +93,23 @@ void multiplePagesOfIssues() {
 		assertThat(pageTwo.getContent()).hasSize(15);
 	}
 
+	@Test
+	void multiplePagesOfIssuesWithPercentEncodedLink() {
+		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%3D%3D>; rel=\"next\""));
+		this.server.expect(requestTo("/page-two%3D%3D"))
+			.andExpect(method(HttpMethod.GET))
+			.andExpect(basicAuth())
+			.andRespond(withResource("issues-page-two.json"));
+		Page<Issue> pageOne = this.gitHub.getIssues("org", "repo");
+		assertThat(pageOne.getContent()).hasSize(15);
+		Page<Issue> pageTwo = pageOne.next();
+		assertThat(pageTwo).isNotNull();
+		assertThat(pageTwo.getContent()).hasSize(15);
+	}
+
 	@Test
 	void rateLimited() {
 		long reset = System.currentTimeMillis();
@@ -117,7 +132,7 @@ 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));
+			.getComments(new Issue(null, "/commentsUrl", null, null, null, null, null, null));
 		assertThat(comments.getContent()).isEmpty();
 		assertThat(comments.next()).isNull();
 	}
@@ -129,7 +144,7 @@ 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));
+			.getComments(new Issue(null, "/commentsUrl", null, null, null, null, null, null));
 		assertThat(comments.getContent()).hasSize(17);
 		assertThat(comments.next()).isNull();
 	}
@@ -141,13 +156,13 @@ void multiplePagesOfComments() {
 		this.server.expect(requestTo("/commentsUrl"))
 			.andExpect(method(HttpMethod.GET))
 			.andExpect(basicAuth())
-			.andRespond(withResource("comments-page-one.json", "Link:<page-two>; rel=\"next\""));
+			.andRespond(withResource("comments-page-one.json", "Link:</page-two>; rel=\"next\""));
 		this.server.expect(requestTo("/page-two"))
 			.andExpect(method(HttpMethod.GET))
 			.andExpect(basicAuth())
 			.andRespond(withResource("comments-page-two.json"));
 		Page<Comment> pageOne = this.gitHub
-			.getComments(new Issue(null, "commentsUrl", null, null, null, null, null, null));
+			.getComments(new Issue(null, "/commentsUrl", null, null, null, null, null, null));
 		assertThat(pageOne.getContent()).hasSize(17);
 		Page<Comment> pageTwo = pageOne.next();
 		assertThat(pageTwo).isNotNull();
@@ -206,24 +221,22 @@ void singlePageOfEvents() {
 			.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));
+		Page<Event> events = this.gitHub.getEvents(new Issue(null, null, "/eventsUrl", null, null, null, null, null));
 		assertThat(events.getContent()).hasSize(12);
 		assertThat(events.next()).isNull();
 	}
 
 	@Test
 	void multiplePagesOfEvents() {
-		HttpHeaders headers = new HttpHeaders();
-		headers.set("Link", "<page-two>; rel=\"next\"");
 		this.server.expect(requestTo("/eventsUrl"))
 			.andExpect(method(HttpMethod.GET))
 			.andExpect(basicAuth())
-			.andRespond(withResource("events-page-one.json", "Link:<page-two>; rel=\"next\""));
+			.andRespond(withResource("events-page-one.json", "Link:</page-two>; rel=\"next\""));
 		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));
+		Page<Event> pageOne = this.gitHub.getEvents(new Issue(null, null, "/eventsUrl", null, null, null, null, null));
 		assertThat(pageOne.getContent()).hasSize(12);
 		Page<Event> pageTwo = pageOne.next();
 		assertThat(pageTwo).isNotNull();