Use spring-boot-kafka if Boot 4.0.x is selected

If Kafka Streams are selected, a dependency on kafka is added if using Spring Boot 4.0.0+

See gh-1861

Author: mhalbritter

start-site/src/main/java/io/spring/start/site/extension/dependency/springkafka/SpringKafkaProjectGenerationConfiguration.java

@@ -20,6 +20,7 @@
 import io.spring.initializr.generator.buildsystem.gradle.GradleBuildSystem;
 import io.spring.initializr.generator.buildsystem.maven.MavenBuildSystem;
 import io.spring.initializr.generator.condition.ConditionalOnBuildSystem;
+import io.spring.initializr.generator.condition.ConditionalOnPlatformVersion;
 import io.spring.initializr.generator.condition.ConditionalOnRequestedDependency;
 import io.spring.initializr.generator.project.ProjectDescription;
 import io.spring.initializr.generator.project.ProjectGenerationConfiguration;
@@ -73,6 +74,13 @@ ServiceConnectionsCustomizer kafkaServiceConnectionsCustomizer(ProjectDescriptio
 		};
 	}
 
+	@Bean
+	@ConditionalOnRequestedDependency("kafka-streams")
+	@ConditionalOnPlatformVersion("4.0.0-M1")
+	SpringKafkaStreamsBuildCustomizer springKafkaStreamsBuildCustomizer() {
+		return new SpringKafkaStreamsBuildCustomizer();
+	}
+
 	@Bean
 	@ConditionalOnRequestedDependency("kafka-streams")
 	@ConditionalOnBuildSystem(MavenBuildSystem.ID)

start-site/src/main/java/io/spring/start/site/extension/dependency/springkafka/SpringKafkaStreamsBuildCustomizer.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright 2012 - present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.spring.start.site.extension.dependency.springkafka;
+
+import io.spring.initializr.generator.buildsystem.Build;
+import io.spring.initializr.generator.spring.build.BuildCustomizer;
+
+/**
+ * Adds a dependency to Kafka.
+ *
+ * @author Moritz Halbritter
+ */
+class SpringKafkaStreamsBuildCustomizer implements BuildCustomizer<Build> {
+
+	@Override
+	public void customize(Build build) {
+		build.dependencies().add("kafka");
+	}
+
+}

start-site/src/main/resources/application.yml

@@ -788,8 +788,12 @@ initializr:
         - name: Spring for Apache Kafka
           id: kafka
           description: Publish, subscribe, store, and process streams of records.
-          groupId: org.springframework.kafka
-          artifactId: spring-kafka
+          mappings:
+            - compatibilityRange: "[3.4.0,4.0.0-M1)"
+              group-id: org.springframework.kafka
+              artifact-id: spring-kafka
+          groupId: org.springframework.boot
+          artifactId: spring-boot-kafka
           starter: false
           links:
             - rel: reference

start-site/src/test/java/io/spring/start/site/SupportedBootVersion.java

@@ -30,7 +30,11 @@ public enum SupportedBootVersion {
 	/**
 	 * 3.5.0.
 	 */
-	V3_5("3.5.0");
+	V3_5("3.5.0"),
+	/**
+	 * 4.0.0.
+	 */
+	V4_0("4.0.0-SNAPSHOT");
 
 	private final String version;
 

start-site/src/test/java/io/spring/start/site/extension/AbstractExtensionTests.java

@@ -71,7 +71,11 @@ protected InitializrMetadata getMetadata() {
 	}
 
 	protected Dependency getDependency(String id) {
-		return getMetadata().getDependencies().get(id);
+		return getDependency(SupportedBootVersion.latest(), id);
+	}
+
+	protected Dependency getDependency(SupportedBootVersion bootVersion, String id) {
+		return getMetadata().getDependencies().get(id).resolve(Version.parse(bootVersion.getVersion()));
 	}
 
 	protected BillOfMaterials getBom(String id, String version) {

start-site/src/test/java/io/spring/start/site/extension/dependency/springkafka/SpringKafkaStreamsBuildCustomizerTests.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2012 - present the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.spring.start.site.extension.dependency.springkafka;
+
+import io.spring.initializr.metadata.Dependency;
+import io.spring.initializr.web.project.ProjectRequest;
+import io.spring.start.site.SupportedBootVersion;
+import io.spring.start.site.extension.AbstractExtensionTests;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link SpringKafkaStreamsBuildCustomizer}.
+ *
+ * @author Moritz Halbritter
+ */
+class SpringKafkaStreamsBuildCustomizerTests extends AbstractExtensionTests {
+
+	@Test
+	void shouldAddDependencyToKafkaIfBoot40IsUsed() {
+		ProjectRequest request = createProjectRequest(SupportedBootVersion.V4_0, "kafka-streams");
+		assertThat(mavenPom(request)).hasDependency(getDependency(SupportedBootVersion.V4_0, "kafka"));
+	}
+
+	@Test
+	void shouldNotAddDependencyToKafkaIfBootBefore40IsUsed() {
+		ProjectRequest request = createProjectRequest(SupportedBootVersion.V3_5, "kafka-streams");
+		Dependency kafka = getDependency(SupportedBootVersion.V3_5, "kafka");
+		assertThat(mavenPom(request)).doesNotHaveDependency(kafka.getGroupId(), kafka.getArtifactId());
+	}
+
+}