Spring/spring-data-dev-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#133 - Polishing.

Browse Source 
Use RestTemplate URI expansion instead of UriTemplate expansion.
This commit is contained in:
Mark Paluch
2019-12-04 11:37:41 +01:00
parent dea7e364bd
commit 730f13afd8
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
release-tools/src/main/java/org/springframework/data/release/issues/github/GitHub.java
View File

@@ -15,7 +15,6 @@
*/
package org.springframework.data.release.issues.github;
import java.net.URI;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -55,7 +54,6 @@ import org.springframework.util.Assert;
import org.springframework.web.client.HttpStatusCodeException;
import org.springframework.web.client.RestOperations;
import org.springframework.web.util.DefaultUriBuilderFactory;
import org.springframework.web.util.UriTemplate;
/**
* @author Oliver Gierke
@@ -368,9 +366,7 @@ class GitHub implements IssueTracker {
parameters.put("repoName", repositoryName);
parameters.put("state", state);
URI milestoneUri = new UriTemplate(MILESTONE_URI).expand(parameters);
logger.log(moduleIteration, "Looking up milestone from %s…", milestoneUri);
logger.log(moduleIteration, "Looking up milestone…");
doWithPaging(MILESTONE_URI, HttpMethod.GET, parameters, new HttpEntity<>(newUserScopedHttpHeaders()),
MILESTONES_TYPE, milestones -> {

7
release-tools/src/main/java/org/springframework/data/release/issues/jira/Jira.java
View File

@@ -54,7 +54,6 @@ import org.springframework.web.client.HttpClientErrorException;
import org.springframework.web.client.HttpStatusCodeException;
import org.springframework.web.client.RestOperations;
import org.springframework.web.util.DefaultUriBuilderFactory;
import org.springframework.web.util.UriTemplate;
/**
* @author Oliver Gierke
@@ -539,11 +538,9 @@ class Jira implements JiraConnector {
parameters.put("fields", "summary,status,resolution,fixVersions");
parameters.put("startAt", 0);
URI searchUri = new UriTemplate(SEARCH_TEMPLATE).expand(parameters);
logger.log(moduleIteration, "Looking up JIRA issues…");
logger.log(moduleIteration, "Looking up JIRA issues from %s…", searchUri);
JiraIssues issues = operations.getForObject(searchUri, JiraIssues.class);
JiraIssues issues = operations.getForObject(SEARCH_TEMPLATE, JiraIssues.class, parameters);
Tickets tickets = issues.stream().map(this::toTicket).collect(Tickets.toTicketsCollector());
logger.log(moduleIteration, "Created changelog with %s entries.", tickets.getOverallTotal());