Resolve dependencies in WarPackagingWebStarterBuildCustomizer

Closes gh-1707

Author: mhalbritter

initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/WarPackagingWebStarterBuildCustomizer.java

@@ -18,6 +18,7 @@
 
 import io.spring.initializr.generator.buildsystem.Build;
 import io.spring.initializr.generator.project.ProjectDescription;
+import io.spring.initializr.generator.version.Version;
 import io.spring.initializr.metadata.Dependency;
 import io.spring.initializr.metadata.InitializrMetadata;
 import io.spring.initializr.metadata.support.MetadataBuildItemMapper;
@@ -30,29 +31,35 @@
  *
  * @author Andy Wilkinson
  * @author Stephane Nicoll
+ * @author Moritz Halbritter
  */
 public class WarPackagingWebStarterBuildCustomizer implements BuildCustomizer<Build> {
 
 	private final InitializrMetadata metadata;
 
+	private final Version platformVersion;
+
 	private final BuildMetadataResolver buildMetadataResolver;
 
 	public WarPackagingWebStarterBuildCustomizer(InitializrMetadata metadata, ProjectDescription projectDescription) {
 		this.metadata = metadata;
-		this.buildMetadataResolver = new BuildMetadataResolver(metadata, projectDescription.getPlatformVersion());
+		this.platformVersion = projectDescription.getPlatformVersion();
+		this.buildMetadataResolver = new BuildMetadataResolver(metadata, this.platformVersion);
 	}
 
 	@Override
 	public void customize(Build build) {
 		if (!this.buildMetadataResolver.hasFacet(build, "web")) {
 			// Need to be able to bootstrap the web app
 			Dependency dependency = determineWebDependency(this.metadata);
-			build.dependencies().add(dependency.getId(), MetadataBuildItemMapper.toDependency(dependency));
+			build.dependencies()
+				.add(dependency.getId(),
+						MetadataBuildItemMapper.toDependency(dependency.resolve(this.platformVersion)));
 		}
 		// Add the tomcat starter in provided scope
-		Dependency tomcat = Dependency.createSpringBootStarter("tomcat");
+		Dependency tomcat = determineTomcatDependency(this.metadata);
 		tomcat.setScope(Dependency.SCOPE_PROVIDED);
-		build.dependencies().add("tomcat", MetadataBuildItemMapper.toDependency(tomcat));
+		build.dependencies().add("tomcat", MetadataBuildItemMapper.toDependency(tomcat.resolve(this.platformVersion)));
 	}
 
 	@Override
@@ -65,4 +72,9 @@ private Dependency determineWebDependency(InitializrMetadata metadata) {
 		return (web != null) ? web : Dependency.createSpringBootStarter("web");
 	}
 
+	private Dependency determineTomcatDependency(InitializrMetadata metadata) {
+		Dependency tomcat = metadata.getDependencies().get("tomcat");
+		return (tomcat != null) ? tomcat : Dependency.createSpringBootStarter("tomcat");
+	}
+
 }

initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/WarPackagingWebStarterBuildCustomizerTests.java

@@ -36,15 +36,18 @@
  * Tests for {@link WarPackagingWebStarterBuildCustomizer}.
  *
  * @author Stephane Nicoll
+ * @author Moritz Halbritter
  */
 class WarPackagingWebStarterBuildCustomizerTests {
 
+	private static final String PLATFORM_VERSION = "1.0.0";
+
 	private ProjectDescription projectDescription;
 
 	@BeforeEach
 	void setUp() {
 		MutableProjectDescription description = new MutableProjectDescription();
-		description.setPlatformVersion(Version.parse("1.0.0"));
+		description.setPlatformVersion(Version.parse(PLATFORM_VERSION));
 		this.projectDescription = description;
 	}
 
@@ -86,6 +89,30 @@ void addWebStarterDoesNotReplaceWebFacetDependency() {
 		assertThat(build.dependencies().ids()).containsOnly("test", "tomcat");
 	}
 
+	@Test
+	void shouldUseResolvedDependencies() {
+		Dependency web = Dependency.withId("web", "com.example", "web", null, Dependency.SCOPE_COMPILE);
+		Dependency.Mapping webMapping = new Dependency.Mapping();
+		webMapping.setCompatibilityRange(PLATFORM_VERSION);
+		webMapping.setArtifactId("mapped-web");
+		web.getMappings().add(webMapping);
+		Dependency tomcat = Dependency.withId("tomcat", "com.example", "tomcat", null, Dependency.SCOPE_COMPILE);
+		Dependency.Mapping tomcatMapping = new Dependency.Mapping();
+		tomcatMapping.setCompatibilityRange(PLATFORM_VERSION);
+		tomcatMapping.setArtifactId("mapped-tomcat");
+		tomcat.getMappings().add(tomcatMapping);
+		InitializrMetadata metadata = InitializrMetadataTestBuilder.withDefaults()
+			.addDependencyGroup("web", web, tomcat)
+			.build();
+		Build build = createBuild(metadata);
+		new WarPackagingWebStarterBuildCustomizer(metadata, this.projectDescription).customize(build);
+		assertThat(build.dependencies().ids()).containsOnly("web", "tomcat");
+		io.spring.initializr.generator.buildsystem.Dependency webDependency = build.dependencies().get("web");
+		assertThat(webDependency.getArtifactId()).isEqualTo("mapped-web");
+		io.spring.initializr.generator.buildsystem.Dependency tomcatDependency = build.dependencies().get("tomcat");
+		assertThat(tomcatDependency.getArtifactId()).isEqualTo("mapped-tomcat");
+	}
+
 	private Build createBuild(InitializrMetadata metadata) {
 		return new MavenBuild(new MetadataBuildItemResolver(metadata, Version.parse("2.0.0.RELEASE")));
 	}