From 553e4f1a0454f64390e5aeec4de6347a7a354ab7 Mon Sep 17 00:00:00 2001
From: Justin Albano <albano.justin@gmail.com>
Date: Tue, 21 Apr 2020 14:27:42 -0400
Subject: [PATCH] BAEL-3965: Moved examples to new spring-core module

---
 pom.xml                                       |  2 +
 spring-core-4/README.md                       |  7 ++
 spring-core-4/pom.xml                         | 88 +++++++++++++++++++
 .../java/com/baeldung/factorymethod/Bar.java  |  0
 .../java/com/baeldung/factorymethod/Foo.java  |  0
 .../factorymethod/InstanceBarFactory.java     |  0
 .../factorymethod/InstanceFooFactory.java     |  0
 .../factorymethod/SingletonBarFactory.java    |  0
 .../factorymethod/SingletonFooFactory.java    |  0
 .../InstanceBarFactoryIntegrationTest.java    |  0
 .../InstanceFooFactoryIntegrationTest.java    |  0
 .../SingletonBarFactoryIntegrationTest.java   |  0
 .../SingletonFooFactoryIntegrationTest.java   |  0
 .../factorymethod/instance-bar-config.xml     |  0
 .../factorymethod/instance-foo-config.xml     |  0
 .../factorymethod/static-bar-config.xml       | 18 ++--
 .../factorymethod/static-foo-config.xml       |  0
 17 files changed, 106 insertions(+), 9 deletions(-)
 create mode 100644 spring-core-4/README.md
 create mode 100644 spring-core-4/pom.xml
 rename {spring-core-3 => spring-core-4}/src/main/java/com/baeldung/factorymethod/Bar.java (100%)
 rename {spring-core-3 => spring-core-4}/src/main/java/com/baeldung/factorymethod/Foo.java (100%)
 rename {spring-core-3 => spring-core-4}/src/main/java/com/baeldung/factorymethod/InstanceBarFactory.java (100%)
 rename {spring-core-3 => spring-core-4}/src/main/java/com/baeldung/factorymethod/InstanceFooFactory.java (100%)
 rename {spring-core-3 => spring-core-4}/src/main/java/com/baeldung/factorymethod/SingletonBarFactory.java (100%)
 rename {spring-core-3 => spring-core-4}/src/main/java/com/baeldung/factorymethod/SingletonFooFactory.java (100%)
 rename {spring-core-3 => spring-core-4}/src/test/java/com/baeldung/factorymethod/InstanceBarFactoryIntegrationTest.java (100%)
 rename {spring-core-3 => spring-core-4}/src/test/java/com/baeldung/factorymethod/InstanceFooFactoryIntegrationTest.java (100%)
 rename {spring-core-3 => spring-core-4}/src/test/java/com/baeldung/factorymethod/SingletonBarFactoryIntegrationTest.java (100%)
 rename {spring-core-3 => spring-core-4}/src/test/java/com/baeldung/factorymethod/SingletonFooFactoryIntegrationTest.java (100%)
 rename {spring-core-3 => spring-core-4}/src/test/resources/factorymethod/instance-bar-config.xml (100%)
 rename {spring-core-3 => spring-core-4}/src/test/resources/factorymethod/instance-foo-config.xml (100%)
 rename {spring-core-3 => spring-core-4}/src/test/resources/factorymethod/static-bar-config.xml (55%)
 rename {spring-core-3 => spring-core-4}/src/test/resources/factorymethod/static-foo-config.xml (100%)

diff --git a/pom.xml b/pom.xml
index 9e3b354d74..ab6870c780 100644
--- a/pom.xml
+++ b/pom.xml
@@ -651,6 +651,7 @@
                 <module>spring-core</module>
                 <module>spring-core-2</module>
                 <module>spring-core-3</module>
+                <module>spring-core-4</module>
                 <module>spring-cucumber</module>
 
                 <module>spring-data-rest</module>
@@ -1155,6 +1156,7 @@
                 <module>spring-core</module>
                 <module>spring-core-2</module>
                 <module>spring-core-3</module>
+                <module>spring-core-4</module>
                 <module>spring-cucumber</module>
 
                 <module>spring-data-rest</module>
diff --git a/spring-core-4/README.md b/spring-core-4/README.md
new file mode 100644
index 0000000000..f882c77179
--- /dev/null
+++ b/spring-core-4/README.md
@@ -0,0 +1,7 @@
+## Spring Core
+
+This module contains articles about core Spring functionality
+
+## Relevant Articles:
+
+- More articles: [[<-- prev]](/spring-core-3)
diff --git a/spring-core-4/pom.xml b/spring-core-4/pom.xml
new file mode 100644
index 0000000000..06598fb41e
--- /dev/null
+++ b/spring-core-4/pom.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>spring-core-4</artifactId>
+    <name>spring-core-4</name>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-spring-5</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../parent-spring-5</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jdbc</artifactId>
+            <version>${spring.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-context</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${annotation-api.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${spring.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit-jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>${junit-jupiter.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven.surefire.version}</version>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <maven.surefire.version>2.22.1</maven.surefire.version>
+        <annotation-api.version>1.3.2</annotation-api.version>
+        <spring.boot.version>2.2.2.RELEASE</spring.boot.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/spring-core-3/src/main/java/com/baeldung/factorymethod/Bar.java b/spring-core-4/src/main/java/com/baeldung/factorymethod/Bar.java
similarity index 100%
rename from spring-core-3/src/main/java/com/baeldung/factorymethod/Bar.java
rename to spring-core-4/src/main/java/com/baeldung/factorymethod/Bar.java
diff --git a/spring-core-3/src/main/java/com/baeldung/factorymethod/Foo.java b/spring-core-4/src/main/java/com/baeldung/factorymethod/Foo.java
similarity index 100%
rename from spring-core-3/src/main/java/com/baeldung/factorymethod/Foo.java
rename to spring-core-4/src/main/java/com/baeldung/factorymethod/Foo.java
diff --git a/spring-core-3/src/main/java/com/baeldung/factorymethod/InstanceBarFactory.java b/spring-core-4/src/main/java/com/baeldung/factorymethod/InstanceBarFactory.java
similarity index 100%
rename from spring-core-3/src/main/java/com/baeldung/factorymethod/InstanceBarFactory.java
rename to spring-core-4/src/main/java/com/baeldung/factorymethod/InstanceBarFactory.java
diff --git a/spring-core-3/src/main/java/com/baeldung/factorymethod/InstanceFooFactory.java b/spring-core-4/src/main/java/com/baeldung/factorymethod/InstanceFooFactory.java
similarity index 100%
rename from spring-core-3/src/main/java/com/baeldung/factorymethod/InstanceFooFactory.java
rename to spring-core-4/src/main/java/com/baeldung/factorymethod/InstanceFooFactory.java
diff --git a/spring-core-3/src/main/java/com/baeldung/factorymethod/SingletonBarFactory.java b/spring-core-4/src/main/java/com/baeldung/factorymethod/SingletonBarFactory.java
similarity index 100%
rename from spring-core-3/src/main/java/com/baeldung/factorymethod/SingletonBarFactory.java
rename to spring-core-4/src/main/java/com/baeldung/factorymethod/SingletonBarFactory.java
diff --git a/spring-core-3/src/main/java/com/baeldung/factorymethod/SingletonFooFactory.java b/spring-core-4/src/main/java/com/baeldung/factorymethod/SingletonFooFactory.java
similarity index 100%
rename from spring-core-3/src/main/java/com/baeldung/factorymethod/SingletonFooFactory.java
rename to spring-core-4/src/main/java/com/baeldung/factorymethod/SingletonFooFactory.java
diff --git a/spring-core-3/src/test/java/com/baeldung/factorymethod/InstanceBarFactoryIntegrationTest.java b/spring-core-4/src/test/java/com/baeldung/factorymethod/InstanceBarFactoryIntegrationTest.java
similarity index 100%
rename from spring-core-3/src/test/java/com/baeldung/factorymethod/InstanceBarFactoryIntegrationTest.java
rename to spring-core-4/src/test/java/com/baeldung/factorymethod/InstanceBarFactoryIntegrationTest.java
diff --git a/spring-core-3/src/test/java/com/baeldung/factorymethod/InstanceFooFactoryIntegrationTest.java b/spring-core-4/src/test/java/com/baeldung/factorymethod/InstanceFooFactoryIntegrationTest.java
similarity index 100%
rename from spring-core-3/src/test/java/com/baeldung/factorymethod/InstanceFooFactoryIntegrationTest.java
rename to spring-core-4/src/test/java/com/baeldung/factorymethod/InstanceFooFactoryIntegrationTest.java
diff --git a/spring-core-3/src/test/java/com/baeldung/factorymethod/SingletonBarFactoryIntegrationTest.java b/spring-core-4/src/test/java/com/baeldung/factorymethod/SingletonBarFactoryIntegrationTest.java
similarity index 100%
rename from spring-core-3/src/test/java/com/baeldung/factorymethod/SingletonBarFactoryIntegrationTest.java
rename to spring-core-4/src/test/java/com/baeldung/factorymethod/SingletonBarFactoryIntegrationTest.java
diff --git a/spring-core-3/src/test/java/com/baeldung/factorymethod/SingletonFooFactoryIntegrationTest.java b/spring-core-4/src/test/java/com/baeldung/factorymethod/SingletonFooFactoryIntegrationTest.java
similarity index 100%
rename from spring-core-3/src/test/java/com/baeldung/factorymethod/SingletonFooFactoryIntegrationTest.java
rename to spring-core-4/src/test/java/com/baeldung/factorymethod/SingletonFooFactoryIntegrationTest.java
diff --git a/spring-core-3/src/test/resources/factorymethod/instance-bar-config.xml b/spring-core-4/src/test/resources/factorymethod/instance-bar-config.xml
similarity index 100%
rename from spring-core-3/src/test/resources/factorymethod/instance-bar-config.xml
rename to spring-core-4/src/test/resources/factorymethod/instance-bar-config.xml
diff --git a/spring-core-3/src/test/resources/factorymethod/instance-foo-config.xml b/spring-core-4/src/test/resources/factorymethod/instance-foo-config.xml
similarity index 100%
rename from spring-core-3/src/test/resources/factorymethod/instance-foo-config.xml
rename to spring-core-4/src/test/resources/factorymethod/instance-foo-config.xml
diff --git a/spring-core-3/src/test/resources/factorymethod/static-bar-config.xml b/spring-core-4/src/test/resources/factorymethod/static-bar-config.xml
similarity index 55%
rename from spring-core-3/src/test/resources/factorymethod/static-bar-config.xml
rename to spring-core-4/src/test/resources/factorymethod/static-bar-config.xml
index 4d1befc645..e709da36a1 100644
--- a/spring-core-3/src/test/resources/factorymethod/static-bar-config.xml
+++ b/spring-core-4/src/test/resources/factorymethod/static-bar-config.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:util="http://www.springframework.org/schema/util"
-	xsi:schemaLocation="
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:context="http://www.springframework.org/schema/context"
+    xmlns:util="http://www.springframework.org/schema/util"
+    xsi:schemaLocation="
         http://www.springframework.org/schema/beans
         http://www.springframework.org/schema/beans/spring-beans.xsd
         http://www.springframework.org/schema/context
@@ -11,10 +11,10 @@
         http://www.springframework.org/schema/util
         http://www.springframework.org/schema/util/spring-util.xsd">
 
-	<bean id="bar"
-		class="com.baeldung.factorymethod.SingletonBarFactory"
-		factory-method="createInstance">
-		<constructor-arg value="someName" />	
-	</bean>
+    <bean id="bar"
+        class="com.baeldung.factorymethod.SingletonBarFactory"
+        factory-method="createInstance">
+        <constructor-arg value="someName" />
+    </bean>
 
 </beans>
\ No newline at end of file
diff --git a/spring-core-3/src/test/resources/factorymethod/static-foo-config.xml b/spring-core-4/src/test/resources/factorymethod/static-foo-config.xml
similarity index 100%
rename from spring-core-3/src/test/resources/factorymethod/static-foo-config.xml
rename to spring-core-4/src/test/resources/factorymethod/static-foo-config.xml