Upgrade to Spring Boot 2.2.0

This commit is contained in:
Stephane Nicoll
2019-10-16 11:31:07 +02:00
parent 8abd0a8d5c
commit a729fae5d3
7 changed files with 20 additions and 39 deletions

View File

@@ -67,22 +67,11 @@
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.spring.initializr</groupId>

View File

@@ -66,7 +66,7 @@ public class InitializrMetadataV21JsonMapper extends InitializrMetadataV2JsonMap
private ObjectNode dependenciesLink(String appUrl) {
String uri = (appUrl != null) ? appUrl + "/dependencies" : "/dependencies";
UriTemplate uriTemplate = new UriTemplate(uri, this.dependenciesVariables);
UriTemplate uriTemplate = UriTemplate.of(uri, this.dependenciesVariables);
ObjectNode result = nodeFactory().objectNode();
result.put("href", uriTemplate.toString());
result.put("templated", true);

View File

@@ -106,7 +106,7 @@ public class InitializrMetadataV2JsonMapper implements InitializrMetadataJsonMap
private String generateTemplatedUri(String appUrl, Type type) {
String uri = (appUrl != null) ? appUrl + type.getAction() : type.getAction();
uri = uri + "?type=" + type.getId();
UriTemplate uriTemplate = new UriTemplate(uri, this.templateVariables);
UriTemplate uriTemplate = UriTemplate.of(uri, this.templateVariables);
return uriTemplate.toString();
}