spring-boot: switch test configurations to TestConfiguration (#31936)

Author: mshima

generators/spring-boot/generators/data-elasticsearch/generator.ts

@@ -95,13 +95,21 @@ export default class ElasticsearchGenerator extends SpringBootApplicationGenerat
       },
       integrationTest({ application, source }) {
         source.editJavaFile!(`${application.javaPackageTestDir}IntegrationTest.java`, {
-          imports: [`${application.packageName}.config.ElasticsearchTestContainer`],
+          imports: [
+            `${application.packageName}.config.ElasticsearchTestContainer`,
+            `${application.packageName}.config.ElasticsearchTestConfiguration`,
+          ],
           annotations: [
             {
               package: 'org.springframework.boot.testcontainers.context',
               annotation: 'ImportTestcontainers',
               parameters: (_, cb) => cb.addKeyValue('value', 'ElasticsearchTestContainer.class'),
             },
+            {
+              package: 'org.springframework.boot.test.context',
+              annotation: 'SpringBootTest',
+              parameters: (_, cb) => cb.addKeyValue('classes', 'ElasticsearchTestConfiguration.class'),
+            },
           ],
         });
       },

generators/spring-boot/generators/data-elasticsearch/templates/src/test/java/_package_/config/ElasticsearchTestConfiguration.java.ejs

@@ -21,11 +21,11 @@ package <%= packageName %>.config;
 import jakarta.annotation.PostConstruct;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.data.elasticsearch.client.elc.<%= reactive ? 'ReactiveElasticsearchTemplate' : 'ElasticsearchTemplate' %>;
 import org.springframework.data.elasticsearch.core.RefreshPolicy;
 
-@Configuration
+@TestConfiguration(proxyBeanMethods = false)
 public class ElasticsearchTestConfiguration {
     @Autowired
     <%= reactive ? 'ReactiveElasticsearchTemplate' : 'ElasticsearchTemplate' %> template;

generators/spring-boot/generators/oauth2/templates/src/test/java/_package_/config/TestSecurityConfiguration.java.ejs

@@ -40,7 +40,7 @@ import org.springframework.context.annotation.Import;
 /**
  * This class allows you to run unit and integration tests without an IdP.
  */
-@TestConfiguration
+@TestConfiguration(proxyBeanMethods = false)
 <%_ if (applicationTypeMonolith) { _%>
 @Import(OAuth2Configuration.class)
 <%_ } _%>

generators/spring-boot/templates/src/test/java/_package_/config/AsyncSyncConfiguration.java.ejs

@@ -18,15 +18,15 @@
 -%>
 package <%=packageName%>.config;
 
+import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
 
 import org.springframework.context.annotation.Primary;
 import org.springframework.core.task.SyncTaskExecutor;
 
 import java.util.concurrent.Executor;
 
-@Configuration
+@TestConfiguration(proxyBeanMethods = false)
 public class AsyncSyncConfiguration {
 
     @Bean(name = "taskExecutor")