Merge pull request #9709 from sampada07/JAVA-628

JAVA-628: Split or move spring-core-2 module

spring-core-2/README.md

@@ -6,13 +6,9 @@ This module contains articles about core Spring functionality
 
 - [Guide to Spring @Autowired](http://www.baeldung.com/spring-autowire)
 - [Spring Profiles](http://www.baeldung.com/spring-profiles)
-- [A Spring Custom Annotation for a Better DAO](http://www.baeldung.com/spring-annotation-bean-pre-processor)
 - [Quick Guide to Spring Bean Scopes](http://www.baeldung.com/spring-bean-scopes)
-- [Custom Scope in Spring](http://www.baeldung.com/spring-custom-scope)
 - [@Order in Spring](http://www.baeldung.com/spring-order)
 - [Spring @Primary Annotation](http://www.baeldung.com/spring-primary)
 - [Spring Events](https://www.baeldung.com/spring-events)
 - [Spring Null-Safety Annotations](https://www.baeldung.com/spring-null-safety-annotations)
-- [Using @Autowired in Abstract Classes](https://www.baeldung.com/spring-autowired-abstract-class)
-- [Running Setup Data on Startup in Spring](https://www.baeldung.com/running-setup-logic-on-startup-in-spring)
 - More articles: [[<-- prev]](/spring-core)[[next -->]](/spring-core-3)

spring-core-3/README.md

@@ -7,8 +7,8 @@ This module contains articles about core Spring functionality
 - [Understanding getBean() in Spring](https://www.baeldung.com/spring-getbean)
 - [Guide to the Spring BeanFactory](https://www.baeldung.com/spring-beanfactory)
 - [How to use the Spring FactoryBean?](https://www.baeldung.com/spring-factorybean)
-- [Spring – Injecting Collections](https://www.baeldung.com/spring-injecting-collections)
 - [Design Patterns in the Spring Framework](https://www.baeldung.com/spring-framework-design-patterns)
-- [Injecting a Value in a Static Field in Spring](https://www.baeldung.com/spring-inject-static-field)
 - [Difference Between BeanFactory and ApplicationContext](https://www.baeldung.com/spring-beanfactory-vs-applicationcontext)
+- [A Spring Custom Annotation for a Better DAO](http://www.baeldung.com/spring-annotation-bean-pre-processor)
+- [Custom Scope in Spring](http://www.baeldung.com/spring-custom-scope)
 - More articles: [[<-- prev]](/spring-core-2)

spring-core-4/README.md

@@ -8,4 +8,7 @@ This module contains articles about core Spring functionality
 - [How to dynamically Autowire a Bean in Spring](https://www.baeldung.com/spring-dynamic-autowire)
 - [Spring @Import Annotation](https://www.baeldung.com/spring-import-annotation)
 - [Spring BeanPostProcessor](https://www.baeldung.com/spring-beanpostprocessor)
+- [Using @Autowired in Abstract Classes](https://www.baeldung.com/spring-autowired-abstract-class)
+- [Running Setup Data on Startup in Spring](https://www.baeldung.com/running-setup-logic-on-startup-in-spring)
+- [Constructor Injection in Spring with Lombok](https://www.baeldung.com/spring-injection-lombok)
 - More articles: [[<-- prev]](/spring-core-3)

spring-core-4/pom.xml

@@ -29,6 +29,11 @@
             <artifactId>spring-expression</artifactId>
             <version>${spring.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>

spring-core/README.md

@@ -3,10 +3,8 @@
 This module contains articles about core Spring functionality
 
 ### Relevant Articles:
-- [Wiring in Spring: @Autowired, @Resource and @Inject](https://www.baeldung.com/spring-annotations-resource-inject-autowire)
-- [Constructor Injection in Spring with Lombok](https://www.baeldung.com/spring-injection-lombok)
+
 - [Introduction to Spring’s StreamUtils](https://www.baeldung.com/spring-stream-utils)
-- [XML-Based Injection in Spring](https://www.baeldung.com/spring-xml-injection)
 - [A Quick Guide to the Spring @Lazy Annotation](https://www.baeldung.com/spring-lazy-annotation)
 - [BeanNameAware and BeanFactoryAware Interfaces in Spring](https://www.baeldung.com/spring-bean-name-factory-aware)
 - [Access a File from the Classpath in a Spring Application](https://www.baeldung.com/spring-classpath-file-access)

spring-di-2/README.md

@@ -0,0 +1,11 @@
+## Spring Dependency Injection
+
+This module contains articles about dependency injection with Spring
+
+### Relevant Articles
+
+- [Injecting Spring Beans into Unmanaged Objects](https://www.baeldung.com/spring-inject-bean-into-unmanaged-objects)
+- [Injecting a Value in a Static Field in Spring](https://www.baeldung.com/spring-inject-static-field)
+- [Spring – Injecting Collections](https://www.baeldung.com/spring-injecting-collections)
+- [Wiring in Spring: @Autowired, @Resource and @Inject](https://www.baeldung.com/spring-annotations-resource-inject-autowire)
+- More articles: [[<-- prev]](/spring-di)

spring-di-2/pom.xml

@@ -25,11 +25,26 @@
             <artifactId>spring-boot-starter-data-jpa</artifactId>
             <version>${spring-boot.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>${spring-boot.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aspects</artifactId>
             <version>${spring.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+            <version>${javax.inject.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -61,5 +76,6 @@
     <properties>
         <spring-boot.version>2.3.1.RELEASE</spring-boot.version>
         <aspectj-plugin.version>1.11</aspectj-plugin.version>
+        <javax.inject.version>1</javax.inject.version>
     </properties>
 </project>

spring-di-2/src/main/java/com/baeldung/staticvalue/injection/Application.java

@@ -2,9 +2,10 @@ package com.baeldung.staticvalue.injection;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.context.annotation.PropertySource;
 
-@SpringBootApplication
+@SpringBootApplication(exclude={DataSourceAutoConfiguration.class})
 @PropertySource("/application.properties")
 
 public class Application {

spring-di-2/src/main/resources/application.properties

@@ -0,0 +1 @@
+name = Inject a value to a static field

spring-di-2/src/test/java/com/baeldung/wiring/configuration/ApplicationContextTestAutowiredName.java

@@ -1,4 +1,4 @@
-package com.baeldung.configuration;
+package com.baeldung.wiring.configuration;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;

spring-di-2/src/test/java/com/baeldung/wiring/configuration/ApplicationContextTestAutowiredQualifier.java

@@ -1,9 +1,10 @@
-package com.baeldung.configuration;
+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-2/src/test/java/com/baeldung/wiring/configuration/ApplicationContextTestAutowiredType.java

@@ -1,9 +1,10 @@
-package com.baeldung.configuration;
+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-2/src/test/java/com/baeldung/wiring/configuration/ApplicationContextTestInjectName.java

@@ -1,9 +1,10 @@
-package com.baeldung.configuration;
+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-2/src/test/java/com/baeldung/wiring/configuration/ApplicationContextTestInjectQualifier.java

@@ -1,9 +1,10 @@
-package com.baeldung.configuration;
+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-2/src/test/java/com/baeldung/wiring/configuration/ApplicationContextTestInjectType.java

@@ -1,9 +1,10 @@
-package com.baeldung.configuration;
+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-2/src/test/java/com/baeldung/wiring/configuration/ApplicationContextTestResourceNameType.java

@@ -1,4 +1,4 @@
-package com.baeldung.configuration;
+package com.baeldung.wiring.configuration;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

spring-di-2/src/test/java/com/baeldung/wiring/configuration/ApplicationContextTestResourceQualifier.java

@@ -1,4 +1,4 @@
-package com.baeldung.configuration;
+package com.baeldung.wiring.configuration;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

spring-di-2/src/test/java/com/baeldung/wiring/configuration/autowired/FieldAutowiredIntegrationTest.java

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

spring-di-2/src/test/java/com/baeldung/wiring/configuration/autowired/FieldAutowiredNameIntegrationTest.java

@@ -1,7 +1,8 @@
-package com.baeldung.autowired;
+package com.baeldung.wiring.configuration.autowired;
 
-import com.baeldung.configuration.ApplicationContextTestAutowiredName;
 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-2/src/test/java/com/baeldung/wiring/configuration/autowired/FieldQualifierAutowiredIntegrationTest.java

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

spring-di-2/src/test/java/com/baeldung/wiring/configuration/inject/FieldByNameInjectIntegrationTest.java

@@ -1,18 +1,19 @@
-package com.baeldung.inject;
+package com.baeldung.wiring.configuration.inject;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import javax.inject.Inject;
+import javax.inject.Named;
 
-import com.baeldung.configuration.ApplicationContextTestInjectName;
-import com.baeldung.dependency.ArbitraryDependency;
 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 javax.inject.Inject;
-import javax.inject.Named;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import com.baeldung.dependency.ArbitraryDependency;
+import com.baeldung.wiring.configuration.ApplicationContextTestInjectName;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(

spring-di-2/src/test/java/com/baeldung/wiring/configuration/inject/FieldInjectIntegrationTest.java

@@ -1,17 +1,18 @@
-package com.baeldung.inject;
+package com.baeldung.wiring.configuration.inject;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import javax.inject.Inject;
 
-import com.baeldung.configuration.ApplicationContextTestInjectType;
-import com.baeldung.dependency.ArbitraryDependency;
 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 javax.inject.Inject;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import com.baeldung.dependency.ArbitraryDependency;
+import com.baeldung.wiring.configuration.ApplicationContextTestInjectType;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(

spring-di-2/src/test/java/com/baeldung/wiring/configuration/inject/FieldQualifierInjectIntegrationTest.java

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

spring-di-2/src/test/java/com/baeldung/wiring/configuration/resource/FieldResourceInjectionIntegrationTest.java

@@ -1,17 +1,19 @@
-package com.baeldung.resource;
+package com.baeldung.wiring.configuration.resource;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.io.File;
+
+import javax.annotation.Resource;
 
-import com.baeldung.configuration.ApplicationContextTestResourceNameType;
 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 javax.annotation.Resource;
-import java.io.File;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import com.baeldung.wiring.configuration.ApplicationContextTestResourceNameType;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(

spring-di-2/src/test/java/com/baeldung/wiring/configuration/resource/MethodByQualifierResourceIntegrationTest.java

@@ -1,6 +1,5 @@
-package com.baeldung.resource;
+package com.baeldung.wiring.configuration.resource;
 
-import com.baeldung.configuration.ApplicationContextTestResourceQualifier;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -8,6 +7,8 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
+import com.baeldung.wiring.configuration.ApplicationContextTestResourceQualifier;
+
 import javax.annotation.Resource;
 import java.io.File;
 

spring-di-2/src/test/java/com/baeldung/wiring/configuration/resource/MethodByTypeResourceIntegrationTest.java

@@ -1,12 +1,13 @@
-package com.baeldung.resource;
+package com.baeldung.wiring.configuration.resource;
 
-import com.baeldung.configuration.ApplicationContextTestResourceNameType;
 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.wiring.configuration.ApplicationContextTestResourceNameType;
+
 import javax.annotation.Resource;
 import java.io.File;
 

spring-di-2/src/test/java/com/baeldung/wiring/configuration/resource/MethodResourceInjectionIntegrationTest.java

@@ -1,12 +1,13 @@
-package com.baeldung.resource;
+package com.baeldung.wiring.configuration.resource;
 
-import com.baeldung.configuration.ApplicationContextTestResourceNameType;
 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.wiring.configuration.ApplicationContextTestResourceNameType;
+
 import javax.annotation.Resource;
 import java.io.File;
 

spring-di-2/src/test/java/com/baeldung/wiring/configuration/resource/NamedResourceIntegrationTest.java

@@ -1,12 +1,13 @@
-package com.baeldung.resource;
+package com.baeldung.wiring.configuration.resource;
 
-import com.baeldung.configuration.ApplicationContextTestResourceNameType;
 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.wiring.configuration.ApplicationContextTestResourceNameType;
+
 import javax.annotation.Resource;
 import java.io.File;
 

spring-di-2/src/test/java/com/baeldung/wiring/configuration/resource/QualifierResourceInjectionIntegrationTest.java

@@ -1,6 +1,5 @@
-package com.baeldung.resource;
+package com.baeldung.wiring.configuration.resource;
 
-import com.baeldung.configuration.ApplicationContextTestResourceQualifier;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -8,6 +7,8 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
+import com.baeldung.wiring.configuration.ApplicationContextTestResourceQualifier;
+
 import javax.annotation.Resource;
 import java.io.File;
 

spring-di-2/src/test/java/com/baeldung/wiring/configuration/resource/SetterResourceInjectionIntegrationTest.java

@@ -1,12 +1,13 @@
-package com.baeldung.resource;
+package com.baeldung.wiring.configuration.resource;
 
-import com.baeldung.configuration.ApplicationContextTestResourceNameType;
 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.wiring.configuration.ApplicationContextTestResourceNameType;
+
 import javax.annotation.Resource;
 import java.io.File;
 

spring-di/README.md

@@ -13,3 +13,5 @@ This module contains articles about dependency injection with Spring
 - [Controlling Bean Creation Order with @DependsOn Annotation](https://www.baeldung.com/spring-depends-on)
 - [Unsatisfied Dependency in Spring](https://www.baeldung.com/spring-unsatisfied-dependency)
 - [Circular Dependencies in Spring](https://www.baeldung.com/circular-dependencies-in-spring)
+- [XML-Based Injection in Spring](https://www.baeldung.com/spring-xml-injection)
+- More articles: [[next -->]](/spring-di-2)