spring-boot: cleanup IntegrationTest annotation (#32048)

Author: mshima

generators/spring-boot/generators/oauth2/__snapshots__/generator.spec.ts.snap

@@ -19,6 +19,23 @@ exports[`generator - spring-boot:oauth2 with defaults options should call source
       "spring-boot-starter-oauth2-resource-server",
     ],
   ],
+  "editJavaFile": [
+    [
+      "src/test/java/com/mycompany/myapp/IntegrationTest.java",
+      {
+        "annotations": [
+          {
+            "annotation": "SpringBootTest",
+            "package": "org.springframework.boot.test.context",
+            "parameters": [Function],
+          },
+        ],
+        "imports": [
+          "com.mycompany.myapp.config.TestSecurityConfiguration",
+        ],
+      },
+    ],
+  ],
 }
 `;
 
@@ -81,6 +98,23 @@ exports[`generator - spring-boot:oauth2 with reactive should call source snapsho
       "spring-boot-starter-oauth2-resource-server",
     ],
   ],
+  "editJavaFile": [
+    [
+      "src/test/java/com/mycompany/myapp/IntegrationTest.java",
+      {
+        "annotations": [
+          {
+            "annotation": "SpringBootTest",
+            "package": "org.springframework.boot.test.context",
+            "parameters": [Function],
+          },
+        ],
+        "imports": [
+          "com.mycompany.myapp.config.TestSecurityConfiguration",
+        ],
+      },
+    ],
+  ],
 }
 `;
 

generators/spring-boot/generators/oauth2/generator.ts

@@ -117,6 +117,18 @@ export default class Oauth2Generator extends SpringBootApplicationGenerator {
           dependencies: [{ groupId: 'com.github.ben-manes.caffeine', artifactId: 'caffeine' }],
         });
       },
+      integrationTest({ application, source }) {
+        source.editJavaFile!(`${application.javaPackageTestDir}IntegrationTest.java`, {
+          imports: [`${application.packageName}.config.TestSecurityConfiguration`],
+          annotations: [
+            {
+              package: 'org.springframework.boot.test.context',
+              annotation: 'SpringBootTest',
+              parameters: (_, cb) => cb.addKeyValue('classes', 'TestSecurityConfiguration.class'),
+            },
+          ],
+        });
+      },
     });
   }
 

generators/spring-boot/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs

@@ -273,8 +273,8 @@ public class SecurityConfiguration {
 <%_ } else if (authenticationTypeJwt) { _%>
             .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
             .exceptionHandling((exceptions) -> exceptions
-				.authenticationEntryPoint(new BearerTokenAuthenticationEntryPoint())
-				.accessDeniedHandler(new BearerTokenAccessDeniedHandler()))
+                .authenticationEntryPoint(new BearerTokenAuthenticationEntryPoint())
+                .accessDeniedHandler(new BearerTokenAccessDeniedHandler()))
             .oauth2ResourceServer(oauth2 -> oauth2.jwt(withDefaults()));
 <%_ } else if (authenticationTypeOauth2) { _%>
   <%_ if (!applicationTypeMicroservice) { _%>

generators/spring-boot/templates/src/main/java/_package_/web/rest/errors/ExceptionTranslator.java.ejs

@@ -195,7 +195,7 @@ _%>
 
         Map<String, Object> problemProperties = problem.getProperties();
         if (problemProperties == null || !problemProperties.containsKey(MESSAGE_KEY))
-        	problem.setProperty(MESSAGE_KEY,
+            problem.setProperty(MESSAGE_KEY,
                 getMappedMessageKey(err) != null
                     ? getMappedMessageKey(err)
                     : "error.http." + problem.getStatus());
@@ -286,15 +286,15 @@ _%>
     }
 
     private String getCustomizedErrorDetails(Throwable err) {
-    	Collection<String> activeProfiles = Arrays.asList(env.getActiveProfiles());
-    	if (activeProfiles.contains(JHipsterConstants.SPRING_PROFILE_PRODUCTION)) {
-	        if (err instanceof HttpMessageConversionException) return "Unable to convert http message";
+        Collection<String> activeProfiles = Arrays.asList(env.getActiveProfiles());
+        if (activeProfiles.contains(JHipsterConstants.SPRING_PROFILE_PRODUCTION)) {
+            if (err instanceof HttpMessageConversionException) return "Unable to convert http message";
     <%_ if (!databaseTypeNo) { _%>
-	        if (err instanceof DataAccessException) return "Failure during data access";
+            if (err instanceof DataAccessException) return "Failure during data access";
     <%_ } _%>
-	        if (containsPackageName(err.getMessage())) return "Unexpected runtime exception";
+            if (containsPackageName(err.getMessage())) return "Unexpected runtime exception";
         }
-    	return err.getCause() != null ? err.getCause().getMessage() : err.getMessage();
+        return err.getCause() != null ? err.getCause().getMessage() : err.getMessage();
     }
 
     private HttpStatus getMappedStatus(Throwable err) {

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

@@ -21,16 +21,6 @@ package <%= packageName %>;
 import <%= packageName %>.<%= mainClass %>;
 import <%= packageName %>.config.AsyncSyncConfiguration;
 import <%= packageName %>.config.JacksonConfiguration;
-<%_ if (databaseTypeCouchbase) { _%>
-import org.springframework.test.context.ActiveProfiles;
-import tech.jhipster.config.JHipsterConstants;
-<%_ } _%>
-<%_ if (authenticationTypeOauth2) { _%>
-import <%= packageName %>.config.TestSecurityConfiguration;
-<%_ } _%>
-<%_ if (cacheProviderRedis) { _%>
-import org.junit.jupiter.api.extension.ExtendWith;
-<%_ } _%>
 import org.springframework.boot.test.context.SpringBootTest;
 
 import java.lang.annotation.ElementType;
@@ -43,7 +33,7 @@ import java.lang.annotation.Target;
  */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
-@SpringBootTest(classes = {<%= mainClass %>.class, JacksonConfiguration.class, AsyncSyncConfiguration.class<% if (authenticationTypeOauth2) { %>, TestSecurityConfiguration.class<% } %>})
+@SpringBootTest(classes = {<%= mainClass %>.class, JacksonConfiguration.class, AsyncSyncConfiguration.class })
 public @interface IntegrationTest {
 <%_ if (reactive) { _%>
     // 5s is Spring's default https://github.com/spring-projects/spring-framework/blob/main/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java#L106

generators/spring-boot/templates/src/test/java/_package_/_entityPackage_/web/rest/PublicUserResourceIT.java.ejs

@@ -24,9 +24,6 @@ import <%= packageName %>.IntegrationTest;
 <%_ if (databaseTypeSql && reactive) { _%>
 import <%= packageName %>.config.Constants;
 <%_ } _%>
-<%_ if (authenticationTypeOauth2) { _%>
-import <%= packageName %>.config.TestSecurityConfiguration;
-<%_ } _%>
 import <%= user.entityAbsoluteClass %>;
 import <%= packageName %>.repository.UserRepository;
 <%_ if (!requiresDeleteAllUsers) { _%>

generators/spring-boot/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_imperative.java.ejs

@@ -21,7 +21,6 @@ package <%= packageName %>.web.rest.errors;
 import <%= packageName %>.IntegrationTest;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.security.test.context.support.WithMockUser;
 
 import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;

generators/spring-boot/templates/src/test/java/_package_/web/rest/errors/ExceptionTranslatorIT_reactive.java.ejs

@@ -23,7 +23,6 @@ import org.hamcrest.core.AnyOf;
 import org.hamcrest.core.IsEqual;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.security.test.context.support.WithMockUser;
 <%_ if (authenticationUsesCsrf) { _%>
 import org.junit.jupiter.api.BeforeEach;

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

@@ -30,14 +30,14 @@ import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.utility.DockerImageName;
 
 public interface ElasticsearchTestContainer {
-	@Container
-	ElasticsearchContainer elasticsearchContainer = new ElasticsearchContainer(DockerImageName.parse("<%- dockerContainers.elasticsearchImage %>").withTag("<%- dockerContainers.elasticsearchTag %>"))
-	    .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger(ElasticsearchTestContainer.class)))
-		.withEnv("xpack.security.enabled", "false")
-	    .withReuse(true);
+    @Container
+    ElasticsearchContainer elasticsearchContainer = new ElasticsearchContainer(DockerImageName.parse("<%- dockerContainers.elasticsearchImage %>").withTag("<%- dockerContainers.elasticsearchTag %>"))
+        .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger(ElasticsearchTestContainer.class)))
+        .withEnv("xpack.security.enabled", "false")
+        .withReuse(true);
 
     @DynamicPropertySource
     static void registerProperties(DynamicPropertyRegistry registry) {
         registry.add("spring.elasticsearch.uris", () -> "http://" + elasticsearchContainer.getHttpHostAddress());
-	}
+    }
 }

generators/spring-data/generators/mongodb/templates/src/test/java/_package_/config/MongoDbTestContainer.java.ejs

@@ -29,13 +29,13 @@ import org.testcontainers.mongodb.MongoDBContainer;
 import org.testcontainers.junit.jupiter.Container;
 
 public interface MongoDbTestContainer {
-	@Container
-	MongoDBContainer mongoDbContainer = new MongoDBContainer("<%- dockerContainers.mongodb %>")
-	    .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger(MongoDbTestContainer.class)))
-	    .withReuse(true);
+    @Container
+    MongoDBContainer mongoDbContainer = new MongoDBContainer("<%- dockerContainers.mongodb %>")
+        .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger(MongoDbTestContainer.class)))
+        .withReuse(true);
 
     @DynamicPropertySource
     static void registerProperties(DynamicPropertyRegistry registry) {
         registry.add("spring.mongodb.uri", mongoDbContainer::getReplicaSetUrl);
-	}
+    }
 }