JAVA-39220-Moving-some-article-links-on-spring-di (#17555)

Co-authored-by: tienvn <[email protected]>

Author: vunamtien

spring-di-2/README.md

@@ -32,6 +32,10 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-aspects</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

spring-di-2/pom.xml

@@ -4,7 +4,6 @@
 import com.baeldung.dependencyinjectiontypes.model.Car;
 import com.baeldung.dependencyinjectiontypes.model.CarHandler;
 import com.baeldung.dependencyinjectiontypes.model.Motorcycle;
-import com.baeldung.dependencyinjectiontypes.model.Vehicle;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.ConfigurableApplicationContext;

spring-di/src/main/java/com/baeldung/dependencyinjectiontypes/annotation/CarQualifier.java renamed to spring-di-2/src/main/java/com/baeldung/dependencyinjectiontypes/annotation/CarQualifier.java

@@ -1,11 +1,13 @@
 package com.baeldung.di.spring;
 
-import static org.junit.Assert.*;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 public class BeanInjectionIntegrationTest {
 
     private ApplicationContext applicationContext;

spring-di/src/main/java/com/baeldung/dependencyinjectiontypes/app/CustomConfiguration.java renamed to spring-di-2/src/main/java/com/baeldung/dependencyinjectiontypes/app/CustomConfiguration.java

@@ -1,14 +1,14 @@
 package com.baeldung.di.spring;
 
-import static org.junit.Assert.assertNotNull;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import static org.junit.Assert.assertNotNull;
+
 @RunWith(SpringRunner.class)
 @ContextConfiguration(classes = { SpringMainConfig.class })
 public class SpringUnitTest {

spring-di/src/main/java/com/baeldung/dependencyinjectiontypes/model/Car.java renamed to spring-di-2/src/main/java/com/baeldung/dependencyinjectiontypes/model/Car.java

@@ -36,6 +36,22 @@
             <artifactId>aspectjweaver</artifactId>
             <version>${aspectjweaver.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

spring-di/src/main/java/com/baeldung/dependencyinjectiontypes/model/CarHandler.java renamed to spring-di-2/src/main/java/com/baeldung/dependencyinjectiontypes/model/CarHandler.java

@@ -1,12 +1,12 @@
 package com.baeldung.autowire.sample;
 
+import org.springframework.beans.factory.annotation.Qualifier;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.springframework.beans.factory.annotation.Qualifier;
-
 @Qualifier
 @Target({ ElementType.FIELD, ElementType.METHOD, ElementType.TYPE, ElementType.PARAMETER })
 @Retention(RetentionPolicy.RUNTIME)

spring-di/src/main/java/com/baeldung/dependencyinjectiontypes/model/Motorcycle.java renamed to spring-di-2/src/main/java/com/baeldung/dependencyinjectiontypes/model/Motorcycle.java

@@ -1,7 +1,7 @@
 package com.baeldung.order;
 
-import org.springframework.stereotype.Component;
 import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
 
 @Component
 @Order(1)

spring-di/src/main/java/com/baeldung/dependencyinjectiontypes/model/Vehicle.java renamed to spring-di-2/src/main/java/com/baeldung/dependencyinjectiontypes/model/Vehicle.java

@@ -1,2 +1,3 @@
 spring.profiles.active=prod
+ambiguous-bean=B
 

spring-di/src/main/java/com/baeldung/di/spring/Account.java renamed to spring-di-2/src/main/java/com/baeldung/di/spring/Account.java

@@ -6,9 +6,7 @@
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)

spring-di/src/main/java/com/baeldung/di/spring/AccountService.java renamed to spring-di-2/src/main/java/com/baeldung/di/spring/AccountService.java

@@ -1,12 +1,6 @@
 package com.baeldung.order;
 
 
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import java.util.List;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +10,12 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
+import java.util.List;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(loader = AnnotationConfigContextLoader.class)
 public class RatingRetrieverUnitTest {

spring-di/src/main/java/com/baeldung/di/spring/AccountServiceImpl.java renamed to spring-di-2/src/main/java/com/baeldung/di/spring/AccountServiceImpl.java

@@ -1,10 +1,9 @@
 package com.baeldung.wiring.configuration;
 
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
 import com.baeldung.dependency.AnotherArbitraryDependency;
 import com.baeldung.dependency.ArbitraryDependency;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 
 @Configuration
 public class ApplicationContextTestAutowiredQualifier {

spring-di/src/main/java/com/baeldung/di/spring/AudioBookService.java renamed to spring-di-2/src/main/java/com/baeldung/di/spring/AudioBookService.java

@@ -1,10 +1,9 @@
 package com.baeldung.wiring.configuration;
 
+import com.baeldung.dependency.ArbitraryDependency;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import com.baeldung.dependency.ArbitraryDependency;
-
 @Configuration
 public class ApplicationContextTestAutowiredType {
 

spring-di/src/main/java/com/baeldung/di/spring/AudioBookServiceImpl.java renamed to spring-di-2/src/main/java/com/baeldung/di/spring/AudioBookServiceImpl.java

@@ -1,10 +1,9 @@
 package com.baeldung.wiring.configuration;
 
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
 import com.baeldung.dependency.ArbitraryDependency;
 import com.baeldung.dependency.YetAnotherArbitraryDependency;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 
 @Configuration
 public class ApplicationContextTestInjectName {

spring-di/src/main/java/com/baeldung/di/spring/AuthorService.java renamed to spring-di-2/src/main/java/com/baeldung/di/spring/AuthorService.java

@@ -1,10 +1,9 @@
 package com.baeldung.wiring.configuration;
 
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
 import com.baeldung.dependency.AnotherArbitraryDependency;
 import com.baeldung.dependency.ArbitraryDependency;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 
 @Configuration
 public class ApplicationContextTestInjectQualifier {

spring-di/src/main/java/com/baeldung/di/spring/AuthorServiceImpl.java renamed to spring-di-2/src/main/java/com/baeldung/di/spring/AuthorServiceImpl.java

@@ -1,10 +1,9 @@
 package com.baeldung.wiring.configuration;
 
+import com.baeldung.dependency.ArbitraryDependency;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import com.baeldung.dependency.ArbitraryDependency;
-
 @Configuration
 public class ApplicationContextTestInjectType {
 

spring-di/src/main/java/com/baeldung/di/spring/BookService.java renamed to spring-di-2/src/main/java/com/baeldung/di/spring/BookService.java

@@ -1,17 +1,16 @@
 package com.baeldung.wiring.configuration.autowired;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
+import com.baeldung.dependency.ArbitraryDependency;
+import com.baeldung.wiring.configuration.ApplicationContextTestAutowiredType;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
-import com.baeldung.dependency.ArbitraryDependency;
-import com.baeldung.wiring.configuration.ApplicationContextTestAutowiredType;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(

spring-di/src/main/java/com/baeldung/di/spring/BookServiceImpl.java renamed to spring-di-2/src/main/java/com/baeldung/di/spring/BookServiceImpl.java

@@ -2,7 +2,6 @@
 
 import com.baeldung.dependency.ArbitraryDependency;
 import com.baeldung.wiring.configuration.ApplicationContextTestAutowiredName;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;

spring-di/src/main/java/com/baeldung/di/spring/Foo.java renamed to spring-di-2/src/main/java/com/baeldung/di/spring/Foo.java

@@ -1,8 +1,7 @@
 package com.baeldung.wiring.configuration.autowired;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
+import com.baeldung.dependency.ArbitraryDependency;
+import com.baeldung.wiring.configuration.ApplicationContextTestAutowiredQualifier;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,8 +10,8 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
-import com.baeldung.dependency.ArbitraryDependency;
-import com.baeldung.wiring.configuration.ApplicationContextTestAutowiredQualifier;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(

spring-di/src/main/java/com/baeldung/di/spring/FooProcessor.java renamed to spring-di-2/src/main/java/com/baeldung/di/spring/FooProcessor.java

@@ -1,19 +1,17 @@
 package com.baeldung.wiring.configuration.inject;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
+import com.baeldung.dependency.ArbitraryDependency;
+import com.baeldung.wiring.configuration.ApplicationContextTestInjectName;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
-import com.baeldung.dependency.ArbitraryDependency;
-import com.baeldung.wiring.configuration.ApplicationContextTestInjectName;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(

spring-di/src/main/java/com/baeldung/di/spring/IService.java renamed to spring-di-2/src/main/java/com/baeldung/di/spring/IService.java

@@ -1,18 +1,16 @@
 package com.baeldung.wiring.configuration.inject;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
+import com.baeldung.dependency.ArbitraryDependency;
+import com.baeldung.wiring.configuration.ApplicationContextTestInjectType;
 import jakarta.inject.Inject;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
-import com.baeldung.dependency.ArbitraryDependency;
-import com.baeldung.wiring.configuration.ApplicationContextTestInjectType;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(

spring-di/src/main/java/com/baeldung/di/spring/IndexApp.java renamed to spring-di-2/src/main/java/com/baeldung/di/spring/IndexApp.java

@@ -1,19 +1,17 @@
 package com.baeldung.wiring.configuration.inject;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
+import com.baeldung.dependency.ArbitraryDependency;
+import com.baeldung.wiring.configuration.ApplicationContextTestInjectQualifier;
 import jakarta.inject.Inject;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
-import com.baeldung.dependency.ArbitraryDependency;
-import com.baeldung.wiring.configuration.ApplicationContextTestInjectQualifier;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(loader = AnnotationConfigContextLoader.class,