Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Explicit type takes precedence over build and format

Browse Source 
Prior to this commit, specifying the --format and/or --build options
alongside --type did not use the explicit type as it should. This commit
ignores the --build and --format options if a type is explicitly set.

Fixes gh-1807
This commit is contained in:
Stephane Nicoll
2014-11-03 13:12:06 +01:00
parent a85e02fbb9
commit 6a18ece6a2
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-boot-cli/src/test/java/org/springframework/boot/cli/command/init/ProjectGenerationRequestTests.java
View File

@@ -138,6 +138,15 @@ public class ProjectGenerationRequestTests {
this.request.generateUrl(metadata));
}
@Test
public void typeAndBuildAndFormat() {
InitializrServiceMetadata metadata = readMetadata();
setBuildAndFormat("gradle", "project");
request.setType("maven-build");
assertEquals(createUrl("/pom.xml?type=maven-build"),
this.request.generateUrl(metadata));
}
@Test
public void invalidType() throws URISyntaxException {
this.request.setType("does-not-exist");
@@ -152,16 +161,19 @@ public class ProjectGenerationRequestTests {
this.request.generateUrl(readMetadata("types-conflict"));
}
private static URI createDefaultUrl(String param) {
private static URI createUrl(String actionAndParam) {
try {
return new URI(ProjectGenerationRequest.DEFAULT_SERVICE_URL + "/starter.zip"
+ param);
return new URI(ProjectGenerationRequest.DEFAULT_SERVICE_URL + actionAndParam);
}
catch (URISyntaxException ex) {
throw new IllegalStateException(ex);
}
}
private static URI createDefaultUrl(String param) {
return createUrl("/starter.zip" + param);
}
public void setBuildAndFormat(String build, String format) {
this.request.setBuild(build != null ? build : "maven");
this.request.setFormat(format != null ? format : "project");