Add amqp dependency if amqp-streams is selected

Closes gh-1862

Author: mhalbritter

start-site/src/main/java/io/spring/start/site/extension/dependency/springamqp/SpringAmqpProjectGenerationConfiguration.java

@@ -24,40 +24,57 @@
 import io.spring.start.site.container.ServiceConnectionsCustomizer;
 
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 
 /**
  * Configuration for generation of projects that depend on Spring AMQP.
  *
  * @author Stephane Nicoll
- * @author Stephane Nicoll
  */
 @ProjectGenerationConfiguration
-@ConditionalOnRequestedDependency("amqp")
 class SpringAmqpProjectGenerationConfiguration {
 
-	private static final String TESTCONTAINERS_CLASS_NAME = "org.testcontainers.containers.RabbitMQContainer";
+	@Configuration(proxyBeanMethods = false)
+	@ConditionalOnRequestedDependency("amqp")
+	static class AmqpConfiguration {
 
-	@Bean
-	SpringRabbitTestBuildCustomizer springAmqpTestBuildCustomizer() {
-		return new SpringRabbitTestBuildCustomizer();
-	}
+		private static final String TESTCONTAINERS_CLASS_NAME = "org.testcontainers.containers.RabbitMQContainer";
+
+		@Bean
+		SpringRabbitTestBuildCustomizer springAmqpTestBuildCustomizer() {
+			return new SpringRabbitTestBuildCustomizer();
+		}
+
+		@Bean
+		@ConditionalOnRequestedDependency("testcontainers")
+		ServiceConnectionsCustomizer rabbitServiceConnectionsCustomizer(DockerServiceResolver serviceResolver) {
+			return (serviceConnections) -> serviceResolver.doWith("rabbit",
+					(service) -> serviceConnections.addServiceConnection(
+							ServiceConnection.ofContainer("rabbit", service, TESTCONTAINERS_CLASS_NAME, false)));
+		}
+
+		@Bean
+		@ConditionalOnRequestedDependency("docker-compose")
+		ComposeFileCustomizer rabbitComposeFileCustomizer(DockerServiceResolver serviceResolver) {
+			return (composeFile) -> serviceResolver.doWith("rabbit",
+					(service) -> composeFile.services()
+						.add("rabbitmq",
+								service.andThen((builder) -> builder.environment("RABBITMQ_DEFAULT_USER", "myuser")
+									.environment("RABBITMQ_DEFAULT_PASS", "secret")
+									.ports(5672))));
+		}
 
-	@Bean
-	@ConditionalOnRequestedDependency("testcontainers")
-	ServiceConnectionsCustomizer rabbitServiceConnectionsCustomizer(DockerServiceResolver serviceResolver) {
-		return (serviceConnections) -> serviceResolver.doWith("rabbit", (service) -> serviceConnections
-			.addServiceConnection(ServiceConnection.ofContainer("rabbit", service, TESTCONTAINERS_CLASS_NAME, false)));
 	}
 
-	@Bean
-	@ConditionalOnRequestedDependency("docker-compose")
-	ComposeFileCustomizer rabbitComposeFileCustomizer(DockerServiceResolver serviceResolver) {
-		return (composeFile) -> serviceResolver.doWith("rabbit",
-				(service) -> composeFile.services()
-					.add("rabbitmq",
-							service.andThen((builder) -> builder.environment("RABBITMQ_DEFAULT_USER", "myuser")
-								.environment("RABBITMQ_DEFAULT_PASS", "secret")
-								.ports(5672))));
+	@ConditionalOnRequestedDependency("amqp-streams")
+	@Configuration(proxyBeanMethods = false)
+	static class AmqpStreamsConfiguration {
+
+		@Bean
+		SpringRabbitStreamsBuildCustomizer springRabbitStreamsBuildCustomizer() {
+			return new SpringRabbitStreamsBuildCustomizer();
+		}
+
 	}
 
 }

start-site/src/main/java/io/spring/start/site/extension/dependency/springamqp/SpringRabbitStreamsBuildCustomizer.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.springamqp;
+
+import io.spring.initializr.generator.buildsystem.Build;
+import io.spring.initializr.generator.spring.build.BuildCustomizer;
+
+/**
+ * Adds AMQP if RabbitMQ Streams is selected.
+ *
+ * @author Moritz Halbritter
+ */
+class SpringRabbitStreamsBuildCustomizer implements BuildCustomizer<Build> {
+
+	@Override
+	public void customize(Build build) {
+		build.dependencies().add("amqp");
+	}
+
+}

start-site/src/test/java/io/spring/start/site/extension/dependency/springamqp/SpringRabbitStreamsBuildCustomizerTests.java

@@ -0,0 +1,46 @@
+/*
+ * 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.springamqp;
+
+import io.spring.initializr.metadata.Dependency;
+import io.spring.initializr.web.project.ProjectRequest;
+import io.spring.start.site.extension.AbstractExtensionTests;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link SpringRabbitStreamsBuildCustomizer}.
+ *
+ * @author Moritz Halbritter
+ */
+class SpringRabbitStreamsBuildCustomizerTests extends AbstractExtensionTests {
+
+	@Test
+	void shouldDoNothingIfAmqpStreamsIsNotSelected() {
+		ProjectRequest project = createProjectRequest("web");
+		Dependency amqp = getDependency("amqp");
+		assertThat(mavenPom(project)).doesNotHaveDependency(amqp.getGroupId(), amqp.getArtifactId());
+	}
+
+	@Test
+	void shouldAddAmqpIfAmqpStreamsIsSelected() {
+		ProjectRequest project = createProjectRequest("amqp-streams");
+		assertThat(mavenPom(project)).hasDependency(getDependency("amqp"));
+	}
+
+}