Fix visibility of Test Application class

Closes gh-1217
spring-io · Jun 14, 2023 · eb4173c · eb4173c
1 parent f66c418
commit eb4173c
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 18 deletions.
diff --git a/...sion/dependency/testcontainers/GroovyTestContainersApplicationCodeProjectContributor.java b/...sion/dependency/testcontainers/GroovyTestContainersApplicationCodeProjectContributor.java
@@ -52,13 +52,15 @@ class GroovyTestContainersApplicationCodeProjectContributor extends
 
 	@Override
 	protected void contributeCode(GroovySourceCode sourceCode) {
-		customizeApplicationTypeDeclaration(sourceCode,
-				(type) -> type.addMethodDeclaration(GroovyMethodDeclaration.method("main")
-					.modifiers(Modifier.PUBLIC | Modifier.STATIC)
-					.returning("void")
-					.parameters(Parameter.of("args", String[].class))
-					.body(CodeBlock.ofStatement("$T.from($L::main).with($L).run(args)", SpringApplication.class,
-							getDescription().getApplicationName(), getTestApplicationName()))));
+		customizeApplicationTypeDeclaration(sourceCode, (type) -> {
+			type.modifiers(Modifier.PUBLIC);
+			type.addMethodDeclaration(GroovyMethodDeclaration.method("main")
+				.modifiers(Modifier.PUBLIC | Modifier.STATIC)
+				.returning("void")
+				.parameters(Parameter.of("args", String[].class))
+				.body(CodeBlock.ofStatement("$T.from($L::main).with($L).run(args)", SpringApplication.class,
+						getDescription().getApplicationName(), getTestApplicationName())));
+		});
 	}
 
 	@Override

diff --git a/...ension/dependency/testcontainers/JavaTestContainersApplicationCodeProjectContributor.java b/...ension/dependency/testcontainers/JavaTestContainersApplicationCodeProjectContributor.java
@@ -52,13 +52,15 @@ class JavaTestContainersApplicationCodeProjectContributor extends
 
 	@Override
 	protected void contributeCode(JavaSourceCode sourceCode) {
-		customizeApplicationTypeDeclaration(sourceCode,
-				(type) -> type.addMethodDeclaration(JavaMethodDeclaration.method("main")
-					.modifiers(Modifier.PUBLIC | Modifier.STATIC)
-					.returning("void")
-					.parameters(Parameter.of("args", String[].class))
-					.body(CodeBlock.ofStatement("$T.from($L::main).with($L.class).run(args)", SpringApplication.class,
-							getDescription().getApplicationName(), getTestApplicationName()))));
+		customizeApplicationTypeDeclaration(sourceCode, (type) -> {
+			type.modifiers(Modifier.PUBLIC);
+			type.addMethodDeclaration(JavaMethodDeclaration.method("main")
+				.modifiers(Modifier.PUBLIC | Modifier.STATIC)
+				.returning("void")
+				.parameters(Parameter.of("args", String[].class))
+				.body(CodeBlock.ofStatement("$T.from($L::main).with($L.class).run(args)", SpringApplication.class,
+						getDescription().getApplicationName(), getTestApplicationName())));
+		});
 	}
 
 	@Override

diff --git a/...sion/dependency/testcontainers/KotlinTestContainersApplicationCodeProjectContributor.java b/...sion/dependency/testcontainers/KotlinTestContainersApplicationCodeProjectContributor.java
@@ -25,6 +25,7 @@
 import io.spring.initializr.generator.language.Parameter;
 import io.spring.initializr.generator.language.kotlin.KotlinCompilationUnit;
 import io.spring.initializr.generator.language.kotlin.KotlinFunctionDeclaration;
+import io.spring.initializr.generator.language.kotlin.KotlinModifier;
 import io.spring.initializr.generator.language.kotlin.KotlinSourceCode;
 import io.spring.initializr.generator.language.kotlin.KotlinSourceCodeWriter;
 import io.spring.initializr.generator.language.kotlin.KotlinTypeDeclaration;
@@ -53,6 +54,7 @@ class KotlinTestContainersApplicationCodeProjectContributor extends
 	@Override
 	protected void contributeCode(KotlinSourceCode sourceCode) {
 		customizeApplicationTypeDeclaration(sourceCode, (type) -> {
+			type.modifiers(KotlinModifier.PUBLIC);
 		});
 	}
 

diff --git a/...xtension/dependency/testcontainers/TestcontainersProjectGenerationConfigurationTests.java b/...xtension/dependency/testcontainers/TestcontainersProjectGenerationConfigurationTests.java
@@ -189,7 +189,7 @@ void testApplicationWithJavaAndGenericContainerIsContributed() {
 					import org.testcontainers.containers.GenericContainer;
 
 					@TestConfiguration(proxyBeanMethods = false)
-					class TestDemoApplication {
+					public class TestDemoApplication {
 
 						@Bean
 						@ServiceConnection(name = "redis")
@@ -223,7 +223,7 @@ void testApplicationWithKotlinAndGenericContainerIsContributed() {
 					import org.testcontainers.containers.GenericContainer
 
 					@TestConfiguration(proxyBeanMethods = false)
-					class TestDemoApplication {
+					public class TestDemoApplication {
 
 						@Bean
 						@ServiceConnection(name = "redis")
@@ -287,7 +287,7 @@ void testApplicationWithJavaAndSpecificContainerIsContributed() {
 					import org.testcontainers.containers.CassandraContainer;
 
 					@TestConfiguration(proxyBeanMethods = false)
-					class TestDemoApplication {
+					public class TestDemoApplication {
 
 						@Bean
 						@ServiceConnection
@@ -321,7 +321,7 @@ void testApplicationWithKotlinAndSpecificContainerIsContributed() {
 					import org.testcontainers.containers.CassandraContainer
 
 					@TestConfiguration(proxyBeanMethods = false)
-					class TestDemoApplication {
+					public class TestDemoApplication {
 
 						@Bean
 						@ServiceConnection