remove sys and added test cases (#7894)

* BAEL-3286 added component scan filter example

* Remove unused class

* Corrected formatting

* formatted code

* Update code

* added test cases

* Fix tests name

spring-boot-di/pom.xml

@@ -36,6 +36,11 @@
 			<artifactId>tomcat-embed-jasper</artifactId>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
 
 	</dependencies>
 

spring-boot-di/src/main/java/com/baeldung/componentscan/filter/annotation/Animal.java

@@ -7,4 +7,5 @@ import java.lang.annotation.Target;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
-public @interface Animal { }
+public @interface Animal {
+}

spring-boot-di/src/main/java/com/baeldung/componentscan/filter/annotation/ComponentScanAnnotationFilterApp.java

@@ -1,21 +1,13 @@
 package com.baeldung.componentscan.filter.annotation;
 
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.FilterType;
 
-import java.util.Arrays;
-
 @Configuration
 @ComponentScan(includeFilters = @ComponentScan.Filter(type = FilterType.ANNOTATION, classes = Animal.class))
 public class ComponentScanAnnotationFilterApp {
-    private static ApplicationContext applicationContext;
 
     public static void main(String[] args) {
-        applicationContext = new AnnotationConfigApplicationContext(ComponentScanAnnotationFilterApp.class);
-        Arrays.stream(applicationContext.getBeanDefinitionNames())
-                .forEach(System.out::println);
     }
 }

spring-boot-di/src/main/java/com/baeldung/componentscan/filter/annotation/Elephant.java

@@ -1,4 +1,5 @@
 package com.baeldung.componentscan.filter.annotation;
 
 @Animal
-public class Elephant { }
+public class Elephant {
+}

spring-boot-di/src/main/java/com/baeldung/componentscan/filter/aspectj/Cat.java

@@ -1,3 +1,4 @@
 package com.baeldung.componentscan.filter.aspectj;
 
-public class Cat { }
+public class Cat {
+}

spring-boot-di/src/main/java/com/baeldung/componentscan/filter/aspectj/ComponentScanAspectJFilterApp.java

@@ -0,0 +1,15 @@
+package com.baeldung.componentscan.filter.aspectj;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.FilterType;
+
+@Configuration
+@ComponentScan(includeFilters = @ComponentScan.Filter(type = FilterType.ASPECTJ, 
+pattern = "com.baeldung.componentscan.filter.aspectj.* " 
+            + "&& !(com.baeldung.componentscan.filter.aspectj.L* " 
+            + "|| com.baeldung.componentscan.filter.aspectj.C*)"))
+public class ComponentScanAspectJFilterApp {
+    public static void main(String[] args) {
+    }
+}

spring-boot-di/src/main/java/com/baeldung/componentscan/filter/aspectj/ComponentScanCustomFilterApp.java

@@ -1,24 +0,0 @@
-package com.baeldung.componentscan.filter.aspectj;
-
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.FilterType;
-
-import java.util.Arrays;
-
-@Configuration
-@ComponentScan(includeFilters = @ComponentScan.Filter(type = FilterType.ASPECTJ,
-        pattern = "com.baeldung.componentscan.filter.aspectj.* "
-                + "&& !(com.baeldung.componentscan.filter.aspectj.L* "
-                + "|| com.baeldung.componentscan.filter.aspectj.E*)"))
-public class ComponentScanCustomFilterApp {
-    private static ApplicationContext applicationContext;
-
-    public static void main(String[] args) {
-        applicationContext = new AnnotationConfigApplicationContext(ComponentScanCustomFilterApp.class);
-        Arrays.stream(applicationContext.getBeanDefinitionNames())
-                .forEach(System.out::println);
-    }
-}

spring-boot-di/src/main/java/com/baeldung/componentscan/filter/aspectj/Elephant.java

@@ -1,3 +1,4 @@
 package com.baeldung.componentscan.filter.aspectj;
 
-public class Elephant { }
+public class Elephant {
+}

spring-boot-di/src/main/java/com/baeldung/componentscan/filter/aspectj/Loin.java

@@ -1,3 +1,4 @@
 package com.baeldung.componentscan.filter.aspectj;
 
-public class Loin { }
+public class Loin {
+}

spring-boot-di/src/main/java/com/baeldung/componentscan/filter/assignable/Animal.java

@@ -1,3 +1,4 @@
 package com.baeldung.componentscan.filter.assignable;
 
-public interface Animal { }
+public interface Animal {
+}

spring-boot-di/src/main/java/com/baeldung/componentscan/filter/assignable/Cat.java

@@ -1,3 +1,4 @@
 package com.baeldung.componentscan.filter.assignable;
 
-public class Cat implements Animal { }
+public class Cat implements Animal {
+}

spring-boot-di/src/main/java/com/baeldung/componentscan/filter/assignable/ComponentScanAssignableTypeFilterApp.java

@@ -1,21 +1,13 @@
 package com.baeldung.componentscan.filter.assignable;
 
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.FilterType;
 
-import java.util.Arrays;
-
 @Configuration
 @ComponentScan(includeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = Animal.class))
 public class ComponentScanAssignableTypeFilterApp {
-    private static ApplicationContext applicationContext;
 
     public static void main(String[] args) {
-        applicationContext = new AnnotationConfigApplicationContext(ComponentScanAssignableTypeFilterApp.class);
-        Arrays.stream(applicationContext.getBeanDefinitionNames())
-                .forEach(System.out::println);
     }
 }

spring-boot-di/src/main/java/com/baeldung/componentscan/filter/assignable/Elephant.java

@@ -1,3 +1,4 @@
 package com.baeldung.componentscan.filter.assignable;
 
-public class Elephant implements Animal { }
+public class Elephant implements Animal {
+}

spring-boot-di/src/main/java/com/baeldung/componentscan/filter/custom/Cat.java

@@ -1,3 +1,4 @@
 package com.baeldung.componentscan.filter.custom;
 
-public class Cat extends Pet { }
+public class Cat extends Pet {
+}

spring-boot-di/src/main/java/com/baeldung/componentscan/filter/custom/ComponentScanCustomFilter.java

@@ -10,11 +10,11 @@ import java.io.IOException;
 public class ComponentScanCustomFilter implements TypeFilter {
 
     @Override
-    public boolean match(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory)
+    public boolean match(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory) throws IOException {
-            throws IOException {
         ClassMetadata classMetadata = metadataReader.getClassMetadata();
         String superClass = classMetadata.getSuperClassName();
-        if (Pet.class.getName().equalsIgnoreCase(superClass)) {
+        if (Pet.class.getName()
+            .equalsIgnoreCase(superClass)) {
             return true;
         }
         return false;

spring-boot-di/src/main/java/com/baeldung/componentscan/filter/custom/ComponentScanCustomFilterApp.java

@@ -1,21 +1,13 @@
 package com.baeldung.componentscan.filter.custom;
 
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.FilterType;
 
-import java.util.Arrays;
-
 @Configuration
 @ComponentScan(includeFilters = @ComponentScan.Filter(type = FilterType.CUSTOM, classes = ComponentScanCustomFilter.class))
 public class ComponentScanCustomFilterApp {
-    private static ApplicationContext applicationContext;
 
     public static void main(String[] args) {
-        applicationContext = new AnnotationConfigApplicationContext(ComponentScanCustomFilterApp.class);
-        Arrays.stream(applicationContext.getBeanDefinitionNames())
-                .forEach(System.out::println);
     }
 }

spring-boot-di/src/main/java/com/baeldung/componentscan/filter/custom/Loin.java

@@ -1,3 +1,4 @@
 package com.baeldung.componentscan.filter.custom;
 
-public class Loin { }
+public class Loin {
+}

spring-boot-di/src/main/java/com/baeldung/componentscan/filter/custom/Pet.java

@@ -1,3 +1,4 @@
 package com.baeldung.componentscan.filter.custom;
 
-public class Pet { }
+public class Pet {
+}

spring-boot-di/src/main/java/com/baeldung/componentscan/filter/regex/Cat.java

@@ -1,3 +1,4 @@
 package com.baeldung.componentscan.filter.regex;
 
-public class Cat { }
+public class Cat {
+}

spring-boot-di/src/main/java/com/baeldung/componentscan/filter/regex/ComponentScanRegexFilterApp.java

@@ -1,20 +1,13 @@
 package com.baeldung.componentscan.filter.regex;
 
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.FilterType;
 
-import java.util.Arrays;
-
 @Configuration
 @ComponentScan(includeFilters = @ComponentScan.Filter(type = FilterType.REGEX, pattern = ".*[t]"))
 public class ComponentScanRegexFilterApp {
-    private static ApplicationContext applicationContext;
 
     public static void main(String[] args) {
-        applicationContext = new AnnotationConfigApplicationContext(ComponentScanRegexFilterApp.class);
-        Arrays.stream(applicationContext.getBeanDefinitionNames()).forEach(System.out::println);
     }
 }

spring-boot-di/src/main/java/com/baeldung/componentscan/filter/regex/Elephant.java

@@ -1,3 +1,4 @@
 package com.baeldung.componentscan.filter.regex;
 
-public class Elephant { }
+public class Elephant {
+}

spring-boot-di/src/main/java/com/baeldung/componentscan/filter/regex/Loin.java

@@ -1,3 +1,4 @@
 package com.baeldung.componentscan.filter.regex;
 
-public class Loin { }
+public class Loin {
+}

spring-boot-di/src/test/java/com/baeldung/componentscan/filter/annotation/ComponentScanAnnotationFilterAppIntegrationTest.java

@@ -0,0 +1,30 @@
+package com.baeldung.componentscan.filter.annotation;
+
+import static org.junit.Assert.assertThat;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.test.context.junit4.SpringRunner;
+import static org.hamcrest.CoreMatchers.*;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = ComponentScanAnnotationFilterApp.class)
+public class ComponentScanAnnotationFilterAppIntegrationTest {
+
+    @Test
+    public void testBean() {
+        ApplicationContext applicationContext = new AnnotationConfigApplicationContext(ComponentScanAnnotationFilterApp.class);
+        List<String> beans = Arrays.stream(applicationContext.getBeanDefinitionNames())
+            .filter(bean -> !bean.contains("org.springframework") && !bean.contains("componentScanAnnotationFilterApp"))
+            .collect(Collectors.toList());
+        assertThat(beans.size(), equalTo(1));
+        assertThat(beans.get(0), equalTo("elephant"));
+    }
+}

spring-boot-di/src/test/java/com/baeldung/componentscan/filter/aspectj/ComponentScanAspectJFilterAppIntegrationTest.java

@@ -0,0 +1,30 @@
+package com.baeldung.componentscan.filter.aspectj;
+
+import static org.junit.Assert.assertThat;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.test.context.junit4.SpringRunner;
+import static org.hamcrest.CoreMatchers.*;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = ComponentScanAspectJFilterApp.class)
+public class ComponentScanAspectJFilterAppIntegrationTest {
+
+    @Test
+    public void testBean() {
+        ApplicationContext applicationContext = new AnnotationConfigApplicationContext(ComponentScanAspectJFilterApp.class);
+        List<String> beans = Arrays.stream(applicationContext.getBeanDefinitionNames())
+            .filter(bean -> !bean.contains("org.springframework") && !bean.contains("componentScanCustomFilterApp"))
+            .collect(Collectors.toList());
+        assertThat(beans.size(), equalTo(1));
+        assertThat(beans.get(0), equalTo("elephant"));
+    }
+}

spring-boot-di/src/test/java/com/baeldung/componentscan/filter/assignable/ComponentScanAssignableTypeFilterAppIntegrationTest.java

@@ -0,0 +1,31 @@
+package com.baeldung.componentscan.filter.assignable;
+
+import static org.junit.Assert.assertThat;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.test.context.junit4.SpringRunner;
+import static org.hamcrest.CoreMatchers.*;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = ComponentScanAssignableTypeFilterApp.class)
+public class ComponentScanAssignableTypeFilterAppIntegrationTest {
+
+    @Test
+    public void testBean() {
+        ApplicationContext applicationContext = new AnnotationConfigApplicationContext(ComponentScanAssignableTypeFilterApp.class);
+        List<String> beans = Arrays.stream(applicationContext.getBeanDefinitionNames())
+            .filter(bean -> !bean.contains("org.springframework") && !bean.contains("componentScanAssignableTypeFilterApp"))
+            .collect(Collectors.toList());
+        assertThat(beans.size(), equalTo(2));
+        assertThat(beans.contains("cat"), equalTo(true));
+        assertThat(beans.contains("elephant"), equalTo(true));
+    }
+}

spring-boot-di/src/test/java/com/baeldung/componentscan/filter/custom/ComponentScanCustomFilterAppIntegrationTest.java

@@ -0,0 +1,30 @@
+package com.baeldung.componentscan.filter.custom;
+
+import static org.junit.Assert.assertThat;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.test.context.junit4.SpringRunner;
+import static org.hamcrest.CoreMatchers.*;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = ComponentScanCustomFilterApp.class)
+public class ComponentScanCustomFilterAppIntegrationTest {
+
+    @Test
+    public void testBean() {
+        ApplicationContext applicationContext = new AnnotationConfigApplicationContext(ComponentScanCustomFilterApp.class);
+        List<String> beans = Arrays.stream(applicationContext.getBeanDefinitionNames())
+            .filter(bean -> !bean.contains("org.springframework") && !bean.contains("componentScanCustomFilterApp"))
+            .collect(Collectors.toList());
+        assertThat(beans.size(), equalTo(1));
+        assertThat(beans.get(0), equalTo("cat"));
+    }
+}

spring-boot-di/src/test/java/com/baeldung/componentscan/filter/regex/ComponentScanRegexFilterAppIntegrationTest.java

@@ -0,0 +1,31 @@
+package com.baeldung.componentscan.filter.regex;
+
+import static org.junit.Assert.assertThat;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.test.context.junit4.SpringRunner;
+import static org.hamcrest.CoreMatchers.*;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = ComponentScanRegexFilterApp.class)
+public class ComponentScanRegexFilterAppIntegrationTest {
+
+    @Test
+    public void testBean() {
+        ApplicationContext applicationContext = new AnnotationConfigApplicationContext(ComponentScanRegexFilterApp.class);
+        List<String> beans = Arrays.stream(applicationContext.getBeanDefinitionNames())
+            .filter(bean -> !bean.contains("org.springframework") && !bean.contains("componentScanRegexFilterApp"))
+            .collect(Collectors.toList());
+        assertThat(beans.size(), equalTo(2));
+        assertThat(beans.contains("cat"), equalTo(true));
+        assertThat(beans.contains("elephant"), equalTo(true));
+    }
+}