lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2025-09-18 17:48:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Map project version from version capability

Browse Source 
Closes gh-832
This commit is contained in:
Stephane Nicoll
2019-02-14 14:52:07 +01:00
parent 24887e1ab3
commit 701f3f6277
11 changed files with 56 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/BuildProjectGenerationConfiguration.java
View File

@@ -92,8 +92,8 @@ public class BuildProjectGenerationConfiguration {
@Bean
public SimpleBuildCustomizer projectDescriptionBuildCustomizer(
ResolvedProjectDescription projectDescription, InitializrMetadata metadata) {
return new SimpleBuildCustomizer(projectDescription, metadata);
ResolvedProjectDescription projectDescription) {
return new SimpleBuildCustomizer(projectDescription);
}
@Bean

9
initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/SimpleBuildCustomizer.java
View File

@@ -18,7 +18,6 @@ package io.spring.initializr.generator.spring.build;
import io.spring.initializr.generator.buildsystem.Build;
import io.spring.initializr.generator.project.ResolvedProjectDescription;
import io.spring.initializr.metadata.InitializrMetadata;
import org.springframework.core.Ordered;
@@ -33,19 +32,15 @@ public class SimpleBuildCustomizer implements BuildCustomizer<Build> {
private final ResolvedProjectDescription projectDescription;
private final InitializrMetadata metadata;
public SimpleBuildCustomizer(ResolvedProjectDescription projectDescription,
InitializrMetadata metadata) {
public SimpleBuildCustomizer(ResolvedProjectDescription projectDescription) {
this.projectDescription = projectDescription;
this.metadata = metadata;
}
@Override
public void customize(Build build) {
build.setGroup(this.projectDescription.getGroupId());
build.setArtifact(this.projectDescription.getArtifactId());
build.setVersion(this.metadata.getVersion().getContent());
build.setVersion(this.projectDescription.getVersion());
this.projectDescription.getRequestedDependencies()
.forEach((id, dependency) -> build.dependencies().add(id, dependency));
}

1
initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/AbstractComplianceTests.java
View File

@@ -118,6 +118,7 @@ public abstract class AbstractComplianceTests {
description.setLanguage(language);
description.setBuildSystem(buildSystem);
description.setPlatformVersion(Version.parse(version));
description.setVersion("0.0.1-SNAPSHOT");
description.setName("demo");
description.setDescription("Demo project for Spring Boot");
}

33
initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/SimpleBuildCustomizerTests.java
View File

@@ -22,9 +22,7 @@ import io.spring.initializr.generator.buildsystem.maven.MavenBuild;
import io.spring.initializr.generator.language.java.JavaLanguage;
import io.spring.initializr.generator.project.ProjectDescription;
import io.spring.initializr.generator.project.ResolvedProjectDescription;
import io.spring.initializr.generator.spring.test.InitializrMetadataTestBuilder;
import io.spring.initializr.generator.version.Version;
import io.spring.initializr.metadata.InitializrMetadata;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -39,46 +37,39 @@ class SimpleBuildCustomizerTests {
@Test
void customizeProjectCoordinates() {
InitializrMetadata metadata = InitializrMetadataTestBuilder.withDefaults()
.build();
ProjectDescription description = initializeDescription();
description.setGroupId("com.example.acme");
description.setArtifactId("my-test-project");
MavenBuild build = customizeBuild(metadata, description);
MavenBuild build = customizeBuild(description);
assertThat(build.getGroup()).isEqualTo("com.example.acme");
assertThat(build.getArtifact()).isEqualTo("my-test-project");
}
@Test
void customizeShouldSetVersionFromMetadata() {
InitializrMetadata metadata = InitializrMetadataTestBuilder.withDefaults()
.build();
metadata.getVersion().setContent("1.5.6.RELEASE");
MavenBuild build = customizeBuild(metadata);
void customizeVersion() {
ProjectDescription description = initializeDescription();
description.setVersion("1.5.6.RELEASE");
MavenBuild build = customizeBuild(description);
assertThat(build.getVersion()).isEqualTo("1.5.6.RELEASE");
}
@Test
void customizeWithNoDependency() {
InitializrMetadata metadata = InitializrMetadataTestBuilder.withDefaults()
.build();
ProjectDescription description = initializeDescription();
MavenBuild build = customizeBuild(metadata, description);
MavenBuild build = customizeBuild(description);
assertThat(build.dependencies().ids()).isEmpty();
assertThat(build.dependencies().items()).isEmpty();
}
@Test
void customizeDependencies() {
InitializrMetadata metadata = InitializrMetadataTestBuilder.withDefaults()
.build();
ProjectDescription description = initializeDescription();
Dependency one = new Dependency("com.example", "one", DependencyScope.COMPILE);
Dependency two = new Dependency("com.example.acme", "two",
DependencyScope.COMPILE);
description.addDependency("two", two);
description.addDependency("one", one);
MavenBuild build = customizeBuild(metadata, description);
MavenBuild build = customizeBuild(description);
assertThat(build.dependencies().ids()).containsExactly("two", "one");
assertThat(build.dependencies().items()).containsExactly(two, one);
}
@@ -90,18 +81,12 @@ class SimpleBuildCustomizerTests {
return description;
}
private MavenBuild customizeBuild(InitializrMetadata metadata) {
ProjectDescription description = initializeDescription();
return customizeBuild(metadata, description);
}
private MavenBuild customizeBuild(InitializrMetadata metadata,
ProjectDescription description) {
private MavenBuild customizeBuild(ProjectDescription description) {
MavenBuild build = new MavenBuild();
ResolvedProjectDescription resolvedProjectDescription = new ResolvedProjectDescription(
description);
SimpleBuildCustomizer customizer = new SimpleBuildCustomizer(
resolvedProjectDescription, metadata);
resolvedProjectDescription);
customizer.customize(build);
return build;
}

10
initializr-generator/src/main/java/io/spring/initializr/generator/project/ProjectDescription.java
View File

@@ -47,6 +47,8 @@ public class ProjectDescription {
private String artifactId;
private String version;
private String name;
private String description;
@@ -121,6 +123,14 @@ public class ProjectDescription {
this.artifactId = artifactId;
}
public String getVersion() {
return this.version;
}
public void setVersion(String version) {
this.version = version;
}
public String getName() {
return this.name;
}

7
initializr-generator/src/main/java/io/spring/initializr/generator/project/ResolvedProjectDescription.java
View File

@@ -49,6 +49,8 @@ public final class ResolvedProjectDescription {
private final String artifactId;
private final String version;
private final String name;
private final String description;
@@ -66,6 +68,7 @@ public final class ResolvedProjectDescription {
this.language = description.getLanguage();
this.groupId = description.getGroupId();
this.artifactId = description.getArtifactId();
this.version = description.getVersion();
this.name = description.getName();
this.description = description.getDescription();
this.applicationName = description.getApplicationName();
@@ -115,6 +118,10 @@ public final class ResolvedProjectDescription {
return this.artifactId;
}
public String getVersion() {
return this.version;
}
public String getName() {
return this.name;
}

4
initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/gradle/GradleBuildWriterTests.java
View File

@@ -40,9 +40,9 @@ class GradleBuildWriterTests {
void gradleBuildWithCoordinates() throws IOException {
GradleBuild build = new GradleBuild();
build.setGroup("com.example");
build.setVersion("0.0.1-SNAPSHOT");
build.setVersion("1.0.1-SNAPSHOT");
List<String> lines = generateBuild(build);
assertThat(lines).contains("group = 'com.example'", "version = '0.0.1-SNAPSHOT'");
assertThat(lines).contains("group = 'com.example'", "version = '1.0.1-SNAPSHOT'");
}
@Test

3
initializr-generator/src/test/java/io/spring/initializr/generator/buildsystem/maven/MavenBuildWriterTests.java
View File

@@ -40,11 +40,12 @@ class MavenBuildWriterTests {
MavenBuild build = new MavenBuild();
build.setGroup("com.example.demo");
build.setArtifact("demo");
build.setVersion("1.0.1-SNAPSHOT");
generatePom(build, (pom) -> {
assertThat(pom).textAtPath("/project/modelVersion").isEqualTo("4.0.0");
assertThat(pom).textAtPath("/project/groupId").isEqualTo("com.example.demo");
assertThat(pom).textAtPath("/project/artifactId").isEqualTo("demo");
assertThat(pom).textAtPath("/project/version").isEqualTo("0.0.1-SNAPSHOT");
assertThat(pom).textAtPath("/project/version").isEqualTo("1.0.1-SNAPSHOT");
});
}

3
initializr-generator/src/test/java/io/spring/initializr/generator/test/project/AbstractProjectGenerationTester.java
View File

@@ -102,6 +102,9 @@ public abstract class AbstractProjectGenerationTester<SELF extends AbstractProje
if (projectDescription.getArtifactId() == null) {
projectDescription.setArtifactId("demo");
}
if (projectDescription.getVersion() == null) {
projectDescription.setVersion("0.0.1-SNAPSHOT");
}
if (projectDescription.getApplicationName() == null) {
projectDescription.setApplicationName("DemoApplication");
}

2
initializr-web/src/main/java/io/spring/initializr/web/project/ProjectRequestToDescriptionConverter.java
View File

@@ -66,6 +66,8 @@ public class ProjectRequestToDescriptionConverter {
description.setPackageName(getPackageName(request, metadata));
description.setPackaging(Packaging.forId(request.getPackaging()));
description.setPlatformVersion(Version.parse(springBootVersion));
description.setVersion(determineValue(request.getVersion(),
() -> metadata.getVersion().getContent()));
resolvedDependencies
.forEach((dependency) -> description.addDependency(dependency.getId(),
MetadataBuildItemMapper.toDependency(dependency)));

16
initializr-web/src/test/java/io/spring/initializr/web/project/ProjectRequestToDescriptionConverterTests.java
View File

@@ -143,6 +143,22 @@ public class ProjectRequestToDescriptionConverterTests {
assertThat(description.getArtifactId()).isEqualTo("foo");
}
@Test
void convertShouldSetVersionFromRequest() {
ProjectRequest request = createProjectRequest();
request.setVersion("1.0.2-SNAPSHOT");
ProjectDescription description = this.converter.convert(request, this.metadata);
assertThat(description.getVersion()).isEqualTo("1.0.2-SNAPSHOT");
}
@Test
void convertShouldUseDefaultFromMetadataOnEmptyVersion() {
ProjectRequest request = createProjectRequest();
request.setVersion(" ");
ProjectDescription description = this.converter.convert(request, this.metadata);
assertThat(description.getVersion()).isEqualTo("0.0.1-SNAPSHOT");
}
@Test
void convertShouldSetBaseDirectoryFromRequest() {
ProjectRequest request = createProjectRequest();