code cleanup

Author: bnasslahsen

Diff for: springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/AbstractSpringDocTest.java

@@ -8,7 +8,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
@@ -27,7 +26,6 @@
 @RunWith(SpringRunner.class)
 @SpringBootTest
 @ActiveProfiles("test")
-@ComponentScan(basePackages = {"test.org.springdoc.aop"})
 @AutoConfigureMockMvc
 public abstract class AbstractSpringDocTest {
 

Diff for: springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app1/SpringDocApp1Test.java

@@ -1,8 +1,10 @@
 package test.org.springdoc.api.app1;
 
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import test.org.springdoc.api.AbstractSpringDocTest;
 
 public class SpringDocApp1Test extends AbstractSpringDocTest {
 
-
+    @SpringBootApplication
+    static class SpringDocTestApp { }
 }

Diff for: springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app1/SpringDocTestApp.java

@@ -1,7 +1,10 @@
 package test.org.springdoc.api.app3;
 
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import test.org.springdoc.api.AbstractSpringDocTest;
 
 public class SpringDocApp3Test extends AbstractSpringDocTest {
 
+    @SpringBootApplication
+    static class SpringDocTestApp { }
 }

Diff for: springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app3/SpringDocApp3Test.java

@@ -1,6 +1,7 @@
 package test.org.springdoc.ui.app1;
 
 import org.junit.Test;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.test.web.servlet.MvcResult;
 import test.org.springdoc.ui.AbstractSpringDocTest;
 
@@ -10,6 +11,9 @@
 
 public class SpringDocApp1Test extends AbstractSpringDocTest {
 
+    @SpringBootApplication
+    static class SpringDocTestApp { }
+
     @Test
     public void shouldDisplaySwaggerUiPage() throws Exception {
         MvcResult mvcResult = mockMvc.perform(get("/swagger-ui/index.html")).andExpect(status().isOk()).andReturn();

Diff for: springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app3/SpringDocTestApp.java

@@ -1,6 +1,7 @@
 package test.org.springdoc.ui.app1;
 
 import org.junit.Test;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.web.servlet.MvcResult;
 import test.org.springdoc.ui.AbstractSpringDocTest;
@@ -14,6 +15,9 @@
 })
 public class SpringDocConfigPathsTest extends AbstractSpringDocTest {
 
+    @SpringBootApplication
+    static class SpringDocTestApp { }
+
     @Test
     public void should_display_swaggerui_page() throws Exception {
         mockMvc.perform(get("/context-path/servlet-path/test/swagger.html").contextPath("/context-path").servletPath("/servlet-path")).andExpect(status().isFound()).andReturn();

Diff for: springdoc-openapi-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocApp1Test.java

@@ -1,6 +1,7 @@
 package test.org.springdoc.ui.app1;
 
 import org.junit.Test;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.web.servlet.MvcResult;
 import test.org.springdoc.ui.AbstractSpringDocTest;
@@ -15,6 +16,9 @@
 })
 public class SpringDocRedirectConfigUrlTest extends AbstractSpringDocTest {
 
+    @SpringBootApplication
+    static class SpringDocTestApp { }
+
     @Test
     public void shouldRedirectWithConfigUrlIgnoringQueryParams() throws Exception {
         MvcResult mvcResult = mockMvc.perform(get("/swagger-ui.html"))

Diff for: springdoc-openapi-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocConfigPathsTest.java

@@ -1,6 +1,7 @@
 package test.org.springdoc.ui.app1;
 
 import org.junit.Test;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.test.web.servlet.MvcResult;
 import test.org.springdoc.ui.AbstractSpringDocTest;
 
@@ -10,6 +11,9 @@
 
 public class SpringDocRedirectDefaultTest extends AbstractSpringDocTest {
 
+    @SpringBootApplication
+    static class SpringDocTestApp { }
+
     @Test
     public void shouldRedirectWithDefaultQueryParams() throws Exception {
         MvcResult mvcResult = mockMvc.perform(get("/swagger-ui.html"))

Diff for: springdoc-openapi-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocRedirectConfigUrlTest.java

@@ -1,6 +1,7 @@
 package test.org.springdoc.ui.app1;
 
 import org.junit.Test;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.web.servlet.MvcResult;
 import test.org.springdoc.ui.AbstractSpringDocTest;
@@ -17,6 +18,9 @@
 })
 public class SpringDocRedirectWithConfigTest extends AbstractSpringDocTest {
 
+    @SpringBootApplication
+    static class SpringDocTestApp { }
+
     @Test
     public void shouldRedirectWithConfiguredParams() throws Exception {
         MvcResult mvcResult = mockMvc.perform(get("/swagger-ui.html"))

Diff for: springdoc-openapi-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocRedirectDefaultTest.java

@@ -3,6 +3,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
@@ -18,6 +19,9 @@
 @AutoConfigureMockMvc
 public class SpringDocApp2Test {
 
+    @SpringBootApplication
+    static class SpringDocTestApp { }
+
     @Autowired
     private MockMvc mockMvc;
 

Diff for: springdoc-openapi-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocRedirectWithConfigTest.java

@@ -1,6 +1,7 @@
 package test.org.springdoc.ui.app3;
 
 import org.junit.Test;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
@@ -14,6 +15,9 @@
 
 public class SpringDocApp3Test extends AbstractSpringDocTest {
 
+    @SpringBootApplication
+    static class SpringDocTestApp { }
+
     @Test
     public void appLoads() throws Exception {
         this.mockMvc.perform(MockMvcRequestBuilders.get("/"))

Diff for: springdoc-openapi-ui/src/test/java/test/org/springdoc/ui/app1/SpringDocTestApp.java

@@ -1,6 +1,7 @@
 package test.org.springdoc.ui.app5;
 
 import org.junit.Test;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
 import test.org.springdoc.ui.AbstractSpringDocTest;
 
@@ -12,6 +13,9 @@
 @SpringBootTest(properties = "server.servlet.context-path=/context-path")
 public class SpringDocOauthContextPathTest extends AbstractSpringDocTest {
 
+    @SpringBootApplication
+    static class SpringDocTestApp { }
+
     @Test
     public void oauth2_redirect_url_calculated_with_context_path() throws Exception {
         mockMvc.perform(get("/context-path/v3/api-docs/swagger-config").contextPath("/context-path"))

Diff for: springdoc-openapi-ui/src/test/java/test/org/springdoc/ui/app2/SpringDocApp2Test.java

@@ -1,6 +1,7 @@
 package test.org.springdoc.ui.app5;
 
 import org.junit.Test;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import test.org.springdoc.ui.AbstractSpringDocTest;
 
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -10,6 +11,9 @@
 
 public class SpringDocOauthPathsTest extends AbstractSpringDocTest {
 
+    @SpringBootApplication
+    static class SpringDocTestApp { }
+
     @Test
     public void oauth2_redirect_url_calculated() throws Exception {
         mockMvc.perform(get("/v3/api-docs/swagger-config"))

Diff for: springdoc-openapi-ui/src/test/java/test/org/springdoc/ui/app2/SpringDocTestApp.java

@@ -1,6 +1,7 @@
 package test.org.springdoc.ui.app5;
 
 import org.junit.Test;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
 import test.org.springdoc.ui.AbstractSpringDocTest;
 
@@ -12,6 +13,9 @@
 @SpringBootTest(properties = "springdoc.swagger-ui.oauth2RedirectUrl=http://localhost:8080/toto/test/swagger-ui/oauth2-redirect.html")
 public class SpringDocOauthPathsWithPropertyTest extends AbstractSpringDocTest {
 
+    @SpringBootApplication
+    static class SpringDocTestApp { }
+
     @Test
     public void oauth2_redirect_url_calculated() throws Exception {
         mockMvc.perform(get("/v3/api-docs/swagger-config"))

Diff for: springdoc-openapi-ui/src/test/java/test/org/springdoc/ui/app3/SpringDocApp3Test.java

@@ -1,6 +1,7 @@
 package test.org.springdoc.ui.app5;
 
 import org.junit.Test;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.context.SpringBootTest;
 import test.org.springdoc.ui.AbstractSpringDocTest;
 
@@ -15,6 +16,9 @@
 })
 public class SpringDocOauthServletPathsTest extends AbstractSpringDocTest {
 
+    @SpringBootApplication
+    static class SpringDocTestApp { }
+
     @Test
     public void should_display_oauth2_redirect_page() throws Exception {
         mockMvc.perform(get("/context-path/servlet-path/test/swagger-ui/oauth2-redirect.html").contextPath("/context-path").servletPath("/servlet-path")).andExpect(status().isOk()).andReturn();

Diff for: springdoc-openapi-ui/src/test/java/test/org/springdoc/ui/app3/SpringDocTestApp.java

@@ -2,10 +2,16 @@
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
 import test.org.springdoc.api.AbstractSpringDocTest;
 
 public class SpringDocApp63Test extends AbstractSpringDocTest {
 
+    @SpringBootApplication
+    @ComponentScan(basePackages = {"org.springdoc", "test.org.springdoc.api.app63"})
+    static class SpringDocTestApp { }
+
     @BeforeClass
     public static void beforeClass() {
         System.setProperty("springdoc.packagesToScan", "hell,hello1, hello.me");

Diff for: springdoc-openapi-ui/src/test/java/test/org/springdoc/ui/app5/SpringDocOauthContextPathTest.java

@@ -2,10 +2,16 @@
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
 import test.org.springdoc.api.AbstractSpringDocTest;
 
 public class SpringDocApp64Test extends AbstractSpringDocTest {
 
+    @SpringBootApplication
+    @ComponentScan(basePackages = {"org.springdoc", "test.org.springdoc.api.app64"})
+    static class SpringDocTestApp { }
+
     @BeforeClass
     public static void beforeClass() {
         System.setProperty("springdoc.pathsToMatch", "/v1, /api/**");

Diff for: springdoc-openapi-ui/src/test/java/test/org/springdoc/ui/app5/SpringDocOauthPathsTest.java

@@ -1,7 +1,12 @@
 package test.org.springdoc.api.app65;
 
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
 import test.org.springdoc.api.AbstractSpringDocTest;
 
 public class SpringDocApp65Test extends AbstractSpringDocTest {
 
+    @SpringBootApplication
+    @ComponentScan(basePackages = {"org.springdoc", "test.org.springdoc.api.app65"})
+    static class SpringDocTestApp { }
 }