Polish

spring-io · May 27, 2024 · 0e3cca2 · 0e3cca2
1 parent 730ab4f
commit 0e3cca2
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 17 deletions.
diff --git a/.../site/extension/dependency/elasticsearch/ElasticsearchProjectGenerationConfiguration.java b/.../site/extension/dependency/elasticsearch/ElasticsearchProjectGenerationConfiguration.java
@@ -35,7 +35,7 @@
 @ConditionalOnRequestedDependency("data-elasticsearch")
 class ElasticsearchProjectGenerationConfiguration {
 
-	private static String TESTCONTAINERS_CLASS_NAME = "org.testcontainers.elasticsearch.ElasticsearchContainer";
+	private static final String TESTCONTAINERS_CLASS_NAME = "org.testcontainers.elasticsearch.ElasticsearchContainer";
 
 	@Bean
 	@ConditionalOnRequestedDependency("testcontainers")

diff --git a/.../io/spring/start/site/extension/dependency/mysql/MysqlProjectGenerationConfiguration.java b/.../io/spring/start/site/extension/dependency/mysql/MysqlProjectGenerationConfiguration.java
@@ -35,7 +35,7 @@
 @ConditionalOnRequestedDependency("mysql")
 class MysqlProjectGenerationConfiguration {
 
-	private static String TESTCONTAINERS_CLASS_NAME = "org.testcontainers.containers.MySQLContainer";
+	private static final String TESTCONTAINERS_CLASS_NAME = "org.testcontainers.containers.MySQLContainer";
 
 	@Bean
 	@ConditionalOnRequestedDependency("testcontainers")

diff --git a/...o/spring/start/site/extension/dependency/oracle/OracleProjectGenerationConfiguration.java b/...o/spring/start/site/extension/dependency/oracle/OracleProjectGenerationConfiguration.java
@@ -35,12 +35,14 @@
 @ConditionalOnRequestedDependency("oracle")
 class OracleProjectGenerationConfiguration {
 
+	private static final String TESTCONTAINERS_CLASS_NAME = "org.testcontainers.oracle.OracleContainer";
+
 	@Bean
 	@ConditionalOnRequestedDependency("testcontainers")
 	ServiceConnectionsCustomizer oracleServiceConnectionsCustomizer(DockerServiceResolver serviceResolver) {
 		return (serviceConnections) -> serviceResolver.doWith("oracleFree",
-				(service) -> serviceConnections.addServiceConnection(ServiceConnection.ofContainer("oracleFree",
-						service, "org.testcontainers.oracle.OracleContainer", false)));
+				(service) -> serviceConnections.addServiceConnection(
+						ServiceConnection.ofContainer("oracleFree", service, TESTCONTAINERS_CLASS_NAME, false)));
 	}
 
 	@Bean

diff --git a/.../start/site/extension/dependency/springamqp/SpringAmqpProjectGenerationConfiguration.java b/.../start/site/extension/dependency/springamqp/SpringAmqpProjectGenerationConfiguration.java
@@ -35,7 +35,7 @@
 @ConditionalOnRequestedDependency("amqp")
 class SpringAmqpProjectGenerationConfiguration {
 
-	private static String TESTCONTAINERS_CLASS_NAME = "org.testcontainers.containers.RabbitMQContainer";
+	private static final String TESTCONTAINERS_CLASS_NAME = "org.testcontainers.containers.RabbitMQContainer";
 
 	@Bean
 	SpringRabbitTestBuildCustomizer springAmqpTestBuildCustomizer() {

diff --git a/...tart/site/extension/dependency/springcloud/SpringCloudProjectGenerationConfiguration.java b/...tart/site/extension/dependency/springcloud/SpringCloudProjectGenerationConfiguration.java
@@ -42,24 +42,24 @@
  * @author Stephane Nicoll
  */
 @ProjectGenerationConfiguration
-public class SpringCloudProjectGenerationConfiguration {
+class SpringCloudProjectGenerationConfiguration {
 
 	private final InitializrMetadata metadata;
 
 	private final ProjectDescription description;
 
-	public SpringCloudProjectGenerationConfiguration(InitializrMetadata metadata, ProjectDescription description) {
+	SpringCloudProjectGenerationConfiguration(InitializrMetadata metadata, ProjectDescription description) {
 		this.metadata = metadata;
 		this.description = description;
 	}
 
 	@Bean
-	public SpringCloudFunctionBuildCustomizer springCloudFunctionBuildCustomizer() {
+	SpringCloudFunctionBuildCustomizer springCloudFunctionBuildCustomizer() {
 		return new SpringCloudFunctionBuildCustomizer(this.metadata, this.description);
 	}
 
 	@Bean
-	public SpringCloudStreamBuildCustomizer springCloudStreamBuildCustomizer() {
+	SpringCloudStreamBuildCustomizer springCloudStreamBuildCustomizer() {
 		return new SpringCloudStreamBuildCustomizer();
 	}
 
@@ -69,14 +69,14 @@ SpringCloudProjectVersionResolver springCloudProjectVersionResolver(MavenVersion
 	}
 
 	@Bean
-	public SpringCloudFunctionHelpDocumentCustomizer springCloudFunctionHelpDocumentCustomizer(Build build,
+	SpringCloudFunctionHelpDocumentCustomizer springCloudFunctionHelpDocumentCustomizer(Build build,
 			MustacheTemplateRenderer templateRenderer, SpringCloudProjectVersionResolver versionResolver) {
 		return new SpringCloudFunctionHelpDocumentCustomizer(build, this.description, templateRenderer,
 				versionResolver);
 	}
 
 	@Bean
-	public SpringCloudCircuitBreakerBuildCustomizer springCloudCircuitBreakerBuildCustomizer() {
+	SpringCloudCircuitBreakerBuildCustomizer springCloudCircuitBreakerBuildCustomizer() {
 		return new SpringCloudCircuitBreakerBuildCustomizer(this.metadata, this.description);
 	}
 

diff --git a/...tart/site/extension/dependency/springkafka/SpringKafkaProjectGenerationConfiguration.java b/...tart/site/extension/dependency/springkafka/SpringKafkaProjectGenerationConfiguration.java
@@ -33,6 +33,8 @@
 @ConditionalOnRequestedDependency("kafka")
 class SpringKafkaProjectGenerationConfiguration {
 
+	private static final String TESTCONTAINERS_CLASS_NAME = "org.testcontainers.containers.KafkaContainer";
+
 	@Bean
 	SpringKafkaBuildCustomizer springKafkaBuildCustomizer() {
 		return new SpringKafkaBuildCustomizer();
@@ -41,9 +43,8 @@ SpringKafkaBuildCustomizer springKafkaBuildCustomizer() {
 	@Bean
 	@ConditionalOnRequestedDependency("testcontainers")
 	ServiceConnectionsCustomizer kafkaServiceConnectionsCustomizer(DockerServiceResolver serviceResolver) {
-		return (serviceConnections) -> serviceResolver.doWith("kafka",
-				(service) -> serviceConnections.addServiceConnection(ServiceConnection.ofContainer("kafka", service,
-						"org.testcontainers.containers.KafkaContainer", false)));
+		return (serviceConnections) -> serviceResolver.doWith("kafka", (service) -> serviceConnections
+			.addServiceConnection(ServiceConnection.ofContainer("kafka", service, TESTCONTAINERS_CLASS_NAME, false)));
 	}
 
 }
diff --git a/...ng/start/site/extension/dependency/sqlserver/SqlServerProjectGenerationConfiguration.java b/...ng/start/site/extension/dependency/sqlserver/SqlServerProjectGenerationConfiguration.java
@@ -35,7 +35,7 @@
 @ConditionalOnRequestedDependency("sqlserver")
 class SqlServerProjectGenerationConfiguration {
 
-	private static String TESTCONTAINERS_CLASS_NAME = "org.testcontainers.containers.MSSQLServerContainer";
+	private static final String TESTCONTAINERS_CLASS_NAME = "org.testcontainers.containers.MSSQLServerContainer";
 
 	@Bean
 	@ConditionalOnRequestedDependency("testcontainers")

diff --git a/...ite/extension/dependency/testcontainers/TestcontainersProjectGenerationConfiguration.java b/...ite/extension/dependency/testcontainers/TestcontainersProjectGenerationConfiguration.java
@@ -20,7 +20,6 @@
 import io.spring.initializr.generator.buildsystem.Dependency;
 import io.spring.initializr.generator.buildsystem.DependencyScope;
 import io.spring.initializr.generator.condition.ConditionalOnLanguage;
-import io.spring.initializr.generator.condition.ConditionalOnPlatformVersion;
 import io.spring.initializr.generator.condition.ConditionalOnRequestedDependency;
 import io.spring.initializr.generator.io.IndentingWriterFactory;
 import io.spring.initializr.generator.language.groovy.GroovyLanguage;
@@ -114,7 +113,6 @@ GroovyTestContainersApplicationCodeProjectContributor groovyTestContainersApplic
 
 		@Bean
 		@ConditionalOnLanguage(KotlinLanguage.ID)
-		@ConditionalOnPlatformVersion("3.1.1-SNAPSHOT") // https://github.com/spring-projects/spring-boot/issues/35756
 		KotlinTestContainersApplicationCodeProjectContributor kotlinTestContainersApplicationCodeProjectContributor(
 				ServiceConnections serviceConnections) {
 			return new KotlinTestContainersApplicationCodeProjectContributor(this.indentingWriterFactory,