Merge pull request #12949 from panos-kakos/JAVA-15588

[JAVA-15588] Moved code from spring-di to spring-boot-di

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

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

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

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

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

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

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

@@ -1,6 +1,5 @@
 package com.baeldung.componentscan.filter.annotation;
 
-import static org.junit.Assert.assertThat;
 
 import java.util.Arrays;
 import java.util.List;
@@ -13,6 +12,7 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.test.context.junit4.SpringRunner;
 import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = ComponentScanAnnotationFilterApp.class)

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

@@ -1,6 +1,5 @@
 package com.baeldung.componentscan.filter.aspectj;
 
-import static org.junit.Assert.assertThat;
 
 import java.util.Arrays;
 import java.util.List;
@@ -13,6 +12,7 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.test.context.junit4.SpringRunner;
 import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = ComponentScanAspectJFilterApp.class)

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

@@ -1,6 +1,5 @@
 package com.baeldung.componentscan.filter.assignable;
 
-import static org.junit.Assert.assertThat;
 
 import java.util.Arrays;
 import java.util.List;
@@ -13,6 +12,7 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.test.context.junit4.SpringRunner;
 import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = ComponentScanAssignableTypeFilterApp.class)

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

@@ -12,7 +12,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = ComponentScanCustomFilterApp.class)

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

@@ -1,6 +1,5 @@
 package com.baeldung.componentscan.filter.regex;
 
-import static org.junit.Assert.assertThat;
 
 import java.util.Arrays;
 import java.util.List;
@@ -13,6 +12,7 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.test.context.junit4.SpringRunner;
 import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = ComponentScanRegexFilterApp.class)

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

@@ -1,11 +0,0 @@
-package com.baeldung.componentscan.filter.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface Animal {
-}

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

@@ -1,13 +0,0 @@
-package com.baeldung.componentscan.filter.annotation;
-
-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.ANNOTATION, classes = Animal.class))
-public class ComponentScanAnnotationFilterApp {
-
-    public static void main(String[] args) {
-    }
-}

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

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