From 374905467e7ed9769c9cd6d834652a7198a22350 Mon Sep 17 00:00:00 2001
From: Justin Albano <albano.justin@gmail.com>
Date: Sat, 18 Apr 2020 11:48:26 -0400
Subject: [PATCH 1/4] BAEL-3965: Created examples for instance and static
 factory methods.

---
 .../java/com/baeldung/factorymethod/Bar.java  | 18 ++++++++++++++
 .../java/com/baeldung/factorymethod/Foo.java  |  5 ++++
 .../factorymethod/InstanceBarFactory.java     |  8 +++++++
 .../factorymethod/InstanceFooFactory.java     |  8 +++++++
 .../factorymethod/SingletonBarFactory.java    | 11 +++++++++
 .../factorymethod/SingletonFooFactory.java    | 10 ++++++++
 .../InstanceBarFactoryIntegrationTest.java    | 24 +++++++++++++++++++
 .../InstanceFooFactoryIntegrationTest.java    | 22 +++++++++++++++++
 .../SingletonBarFactoryIntegrationTest.java   | 24 +++++++++++++++++++
 .../SingletonFooFactoryIntegrationTest.java   | 22 +++++++++++++++++
 .../factorymethod/instance-bar-config.xml     | 20 ++++++++++++++++
 .../factorymethod/instance-foo-config.xml     | 18 ++++++++++++++
 .../factorymethod/static-bar-config.xml       | 20 ++++++++++++++++
 .../factorymethod/static-foo-config.xml       | 18 ++++++++++++++
 14 files changed, 228 insertions(+)
 create mode 100644 spring-core-3/src/main/java/com/baeldung/factorymethod/Bar.java
 create mode 100644 spring-core-3/src/main/java/com/baeldung/factorymethod/Foo.java
 create mode 100644 spring-core-3/src/main/java/com/baeldung/factorymethod/InstanceBarFactory.java
 create mode 100644 spring-core-3/src/main/java/com/baeldung/factorymethod/InstanceFooFactory.java
 create mode 100644 spring-core-3/src/main/java/com/baeldung/factorymethod/SingletonBarFactory.java
 create mode 100644 spring-core-3/src/main/java/com/baeldung/factorymethod/SingletonFooFactory.java
 create mode 100644 spring-core-3/src/test/java/com/baeldung/factorymethod/InstanceBarFactoryIntegrationTest.java
 create mode 100644 spring-core-3/src/test/java/com/baeldung/factorymethod/InstanceFooFactoryIntegrationTest.java
 create mode 100644 spring-core-3/src/test/java/com/baeldung/factorymethod/SingletonBarFactoryIntegrationTest.java
 create mode 100644 spring-core-3/src/test/java/com/baeldung/factorymethod/SingletonFooFactoryIntegrationTest.java
 create mode 100644 spring-core-3/src/test/resources/factorymethod/instance-bar-config.xml
 create mode 100644 spring-core-3/src/test/resources/factorymethod/instance-foo-config.xml
 create mode 100644 spring-core-3/src/test/resources/factorymethod/static-bar-config.xml
 create mode 100644 spring-core-3/src/test/resources/factorymethod/static-foo-config.xml

diff --git a/spring-core-3/src/main/java/com/baeldung/factorymethod/Bar.java b/spring-core-3/src/main/java/com/baeldung/factorymethod/Bar.java
new file mode 100644
index 0000000000..22ef5b3429
--- /dev/null
+++ b/spring-core-3/src/main/java/com/baeldung/factorymethod/Bar.java
@@ -0,0 +1,18 @@
+package com.baeldung.factorymethod;
+
+public class Bar {
+
+    private String name;
+
+    public Bar(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
diff --git a/spring-core-3/src/main/java/com/baeldung/factorymethod/Foo.java b/spring-core-3/src/main/java/com/baeldung/factorymethod/Foo.java
new file mode 100644
index 0000000000..54bd0c9ff4
--- /dev/null
+++ b/spring-core-3/src/main/java/com/baeldung/factorymethod/Foo.java
@@ -0,0 +1,5 @@
+package com.baeldung.factorymethod;
+
+public class Foo {
+
+}
diff --git a/spring-core-3/src/main/java/com/baeldung/factorymethod/InstanceBarFactory.java b/spring-core-3/src/main/java/com/baeldung/factorymethod/InstanceBarFactory.java
new file mode 100644
index 0000000000..f834b82aee
--- /dev/null
+++ b/spring-core-3/src/main/java/com/baeldung/factorymethod/InstanceBarFactory.java
@@ -0,0 +1,8 @@
+package com.baeldung.factorymethod;
+
+public class InstanceBarFactory {
+
+    public Bar createInstance(String name) {
+        return new Bar(name);
+    }
+}
diff --git a/spring-core-3/src/main/java/com/baeldung/factorymethod/InstanceFooFactory.java b/spring-core-3/src/main/java/com/baeldung/factorymethod/InstanceFooFactory.java
new file mode 100644
index 0000000000..c3125d3339
--- /dev/null
+++ b/spring-core-3/src/main/java/com/baeldung/factorymethod/InstanceFooFactory.java
@@ -0,0 +1,8 @@
+package com.baeldung.factorymethod;
+
+public class InstanceFooFactory {
+
+    public Foo createInstance() {
+        return new Foo();
+    }
+}
diff --git a/spring-core-3/src/main/java/com/baeldung/factorymethod/SingletonBarFactory.java b/spring-core-3/src/main/java/com/baeldung/factorymethod/SingletonBarFactory.java
new file mode 100644
index 0000000000..93802819b1
--- /dev/null
+++ b/spring-core-3/src/main/java/com/baeldung/factorymethod/SingletonBarFactory.java
@@ -0,0 +1,11 @@
+package com.baeldung.factorymethod;
+
+public class SingletonBarFactory {
+
+    private static final Bar INSTANCE = new Bar("unnamed");
+    
+    public static Bar createInstance(String name) {
+        INSTANCE.setName(name);
+        return INSTANCE;
+    }
+}
diff --git a/spring-core-3/src/main/java/com/baeldung/factorymethod/SingletonFooFactory.java b/spring-core-3/src/main/java/com/baeldung/factorymethod/SingletonFooFactory.java
new file mode 100644
index 0000000000..77d56cc7f6
--- /dev/null
+++ b/spring-core-3/src/main/java/com/baeldung/factorymethod/SingletonFooFactory.java
@@ -0,0 +1,10 @@
+package com.baeldung.factorymethod;
+
+public class SingletonFooFactory {
+
+    private static final Foo INSTANCE = new Foo();
+    
+    public static Foo createInstance() {
+        return INSTANCE;
+    }
+}
diff --git a/spring-core-3/src/test/java/com/baeldung/factorymethod/InstanceBarFactoryIntegrationTest.java b/spring-core-3/src/test/java/com/baeldung/factorymethod/InstanceBarFactoryIntegrationTest.java
new file mode 100644
index 0000000000..b5728316e7
--- /dev/null
+++ b/spring-core-3/src/test/java/com/baeldung/factorymethod/InstanceBarFactoryIntegrationTest.java
@@ -0,0 +1,24 @@
+package com.baeldung.factorymethod;
+
+import static org.junit.Assert.assertEquals;
+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.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("/factorymethod/instance-bar-config.xml")
+public class InstanceBarFactoryIntegrationTest {
+
+    @Autowired
+    private Bar instance;
+    
+    @Test
+    public void givenValidInstanceFactoryConfig_whenCreateInstance_thenNameIsCorrect() {
+        assertNotNull(instance);
+        assertEquals("someName", instance.getName());
+    }
+}
diff --git a/spring-core-3/src/test/java/com/baeldung/factorymethod/InstanceFooFactoryIntegrationTest.java b/spring-core-3/src/test/java/com/baeldung/factorymethod/InstanceFooFactoryIntegrationTest.java
new file mode 100644
index 0000000000..6b1857c2f2
--- /dev/null
+++ b/spring-core-3/src/test/java/com/baeldung/factorymethod/InstanceFooFactoryIntegrationTest.java
@@ -0,0 +1,22 @@
+package com.baeldung.factorymethod;
+
+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.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("/factorymethod/instance-foo-config.xml")
+public class InstanceFooFactoryIntegrationTest {
+
+    @Autowired
+    private Foo foo;
+    
+    @Test
+    public void givenValidInstanceFactoryConfig_whenCreateFooInstance_thenInstanceIsNotNull() {
+        assertNotNull(foo);
+    }
+}
diff --git a/spring-core-3/src/test/java/com/baeldung/factorymethod/SingletonBarFactoryIntegrationTest.java b/spring-core-3/src/test/java/com/baeldung/factorymethod/SingletonBarFactoryIntegrationTest.java
new file mode 100644
index 0000000000..403b46156b
--- /dev/null
+++ b/spring-core-3/src/test/java/com/baeldung/factorymethod/SingletonBarFactoryIntegrationTest.java
@@ -0,0 +1,24 @@
+package com.baeldung.factorymethod;
+
+import static org.junit.Assert.assertEquals;
+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.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("/factorymethod/static-bar-config.xml")
+public class SingletonBarFactoryIntegrationTest {
+
+    @Autowired
+    private Bar instance;
+    
+    @Test
+    public void givenValidStaticFactoryConfig_whenCreateInstance_thenNameIsCorrect() {
+        assertNotNull(instance);
+        assertEquals("someName", instance.getName());
+    }
+}
diff --git a/spring-core-3/src/test/java/com/baeldung/factorymethod/SingletonFooFactoryIntegrationTest.java b/spring-core-3/src/test/java/com/baeldung/factorymethod/SingletonFooFactoryIntegrationTest.java
new file mode 100644
index 0000000000..52154b81ab
--- /dev/null
+++ b/spring-core-3/src/test/java/com/baeldung/factorymethod/SingletonFooFactoryIntegrationTest.java
@@ -0,0 +1,22 @@
+package com.baeldung.factorymethod;
+
+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.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("/factorymethod/static-foo-config.xml")
+public class SingletonFooFactoryIntegrationTest {
+
+    @Autowired
+    private Foo singleton;
+    
+    @Test
+    public void givenValidStaticFactoryConfig_whenCreateInstance_thenInstanceIsNotNull() {
+        assertNotNull(singleton);
+    }
+}
diff --git a/spring-core-3/src/test/resources/factorymethod/instance-bar-config.xml b/spring-core-3/src/test/resources/factorymethod/instance-bar-config.xml
new file mode 100644
index 0000000000..40d2f33683
--- /dev/null
+++ b/spring-core-3/src/test/resources/factorymethod/instance-bar-config.xml
@@ -0,0 +1,20 @@
+<?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: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/util
+        http://www.springframework.org/schema/util/spring-util.xsd">
+
+    <bean id="instanceBarFactory"
+        class="com.baeldung.factorymethod.InstanceBarFactory" />
+
+    <bean id="bar"
+        factory-bean="instanceBarFactory"
+        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/instance-foo-config.xml b/spring-core-3/src/test/resources/factorymethod/instance-foo-config.xml
new file mode 100644
index 0000000000..c45bef6a85
--- /dev/null
+++ b/spring-core-3/src/test/resources/factorymethod/instance-foo-config.xml
@@ -0,0 +1,18 @@
+<?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: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/util
+        http://www.springframework.org/schema/util/spring-util.xsd">
+
+    <bean id="instanceFooFactory"
+        class="com.baeldung.factorymethod.InstanceFooFactory" />
+
+    <bean id="foo"
+        factory-bean="instanceFooFactory"
+        factory-method="createInstance" />
+
+</beans>
\ No newline at end of file
diff --git a/spring-core-3/src/test/resources/factorymethod/static-bar-config.xml b/spring-core-3/src/test/resources/factorymethod/static-bar-config.xml
new file mode 100644
index 0000000000..4d1befc645
--- /dev/null
+++ b/spring-core-3/src/test/resources/factorymethod/static-bar-config.xml
@@ -0,0 +1,20 @@
+<?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="
+        http://www.springframework.org/schema/beans
+        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/context
+        http://www.springframework.org/schema/context/spring-context.xsd
+        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>
+
+</beans>
\ No newline at end of file
diff --git a/spring-core-3/src/test/resources/factorymethod/static-foo-config.xml b/spring-core-3/src/test/resources/factorymethod/static-foo-config.xml
new file mode 100644
index 0000000000..83e61a656c
--- /dev/null
+++ b/spring-core-3/src/test/resources/factorymethod/static-foo-config.xml
@@ -0,0 +1,18 @@
+<?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="
+        http://www.springframework.org/schema/beans
+        http://www.springframework.org/schema/beans/spring-beans.xsd
+        http://www.springframework.org/schema/context
+        http://www.springframework.org/schema/context/spring-context.xsd
+        http://www.springframework.org/schema/util
+        http://www.springframework.org/schema/util/spring-util.xsd">
+
+    <bean id="foo"
+        class="com.baeldung.factorymethod.SingletonFooFactory"
+        factory-method="createInstance" />
+
+</beans>
\ No newline at end of file

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 2/4] 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

From 56153d65d8134d26ef0f6a2a2759b822b3c6ca9f Mon Sep 17 00:00:00 2001
From: Justin Albano <albano.justin@gmail.com>
Date: Wed, 22 Apr 2020 06:18:31 -0400
Subject: [PATCH 3/4] BAEL-3965: Corrected XML formatting in code examples

---
 .../factorymethod/instance-bar-config.xml     | 20 +++++++++---------
 .../factorymethod/instance-foo-config.xml     | 20 +++++++++---------
 .../factorymethod/static-bar-config.xml       | 21 ++++++++-----------
 .../factorymethod/static-foo-config.xml       | 21 ++++++++-----------
 4 files changed, 38 insertions(+), 44 deletions(-)

diff --git a/spring-core-4/src/test/resources/factorymethod/instance-bar-config.xml b/spring-core-4/src/test/resources/factorymethod/instance-bar-config.xml
index 40d2f33683..a4281aee4e 100644
--- a/spring-core-4/src/test/resources/factorymethod/instance-bar-config.xml
+++ b/spring-core-4/src/test/resources/factorymethod/instance-bar-config.xml
@@ -1,19 +1,19 @@
 <?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: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/util
-        http://www.springframework.org/schema/util/spring-util.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  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/util
+    http://www.springframework.org/schema/util/spring-util.xsd">
 
     <bean id="instanceBarFactory"
-        class="com.baeldung.factorymethod.InstanceBarFactory" />
+      class="com.baeldung.factorymethod.InstanceBarFactory" />
 
     <bean id="bar"
-        factory-bean="instanceBarFactory"
-        factory-method="createInstance">
+      factory-bean="instanceBarFactory"
+      factory-method="createInstance">
         <constructor-arg value="someName" />
     </bean>
 
diff --git a/spring-core-4/src/test/resources/factorymethod/instance-foo-config.xml b/spring-core-4/src/test/resources/factorymethod/instance-foo-config.xml
index c45bef6a85..0f21f06f5a 100644
--- a/spring-core-4/src/test/resources/factorymethod/instance-foo-config.xml
+++ b/spring-core-4/src/test/resources/factorymethod/instance-foo-config.xml
@@ -1,18 +1,18 @@
 <?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: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/util
-        http://www.springframework.org/schema/util/spring-util.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  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/util
+    http://www.springframework.org/schema/util/spring-util.xsd">
 
     <bean id="instanceFooFactory"
-        class="com.baeldung.factorymethod.InstanceFooFactory" />
+      class="com.baeldung.factorymethod.InstanceFooFactory" />
 
     <bean id="foo"
-        factory-bean="instanceFooFactory"
-        factory-method="createInstance" />
+      factory-bean="instanceFooFactory"
+      factory-method="createInstance" />
 
 </beans>
\ No newline at end of file
diff --git a/spring-core-4/src/test/resources/factorymethod/static-bar-config.xml b/spring-core-4/src/test/resources/factorymethod/static-bar-config.xml
index e709da36a1..2cacc293bc 100644
--- a/spring-core-4/src/test/resources/factorymethod/static-bar-config.xml
+++ b/spring-core-4/src/test/resources/factorymethod/static-bar-config.xml
@@ -1,19 +1,16 @@
 <?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="
-        http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
-        http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context.xsd
-        http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  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/util
+    http://www.springframework.org/schema/util/spring-util.xsd">
 
     <bean id="bar"
-        class="com.baeldung.factorymethod.SingletonBarFactory"
-        factory-method="createInstance">
+      class="com.baeldung.factorymethod.SingletonBarFactory"
+      factory-method="createInstance">
         <constructor-arg value="someName" />
     </bean>
 
diff --git a/spring-core-4/src/test/resources/factorymethod/static-foo-config.xml b/spring-core-4/src/test/resources/factorymethod/static-foo-config.xml
index 83e61a656c..ffe1480638 100644
--- a/spring-core-4/src/test/resources/factorymethod/static-foo-config.xml
+++ b/spring-core-4/src/test/resources/factorymethod/static-foo-config.xml
@@ -1,18 +1,15 @@
 <?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="
-        http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans.xsd
-        http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context.xsd
-        http://www.springframework.org/schema/util
-        http://www.springframework.org/schema/util/spring-util.xsd">
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  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/util
+    http://www.springframework.org/schema/util/spring-util.xsd">
 
     <bean id="foo"
-        class="com.baeldung.factorymethod.SingletonFooFactory"
-        factory-method="createInstance" />
+      class="com.baeldung.factorymethod.SingletonFooFactory"
+      factory-method="createInstance" />
 
 </beans>
\ No newline at end of file

From fd5fcf29c55e234cb26262edf42b2c55ea55e7ef Mon Sep 17 00:00:00 2001
From: Justin Albano <albano.justin@gmail.com>
Date: Sat, 25 Apr 2020 16:05:50 -0400
Subject: [PATCH 4/4] BAEL-3965: Removed unneeded dependencies

---
 spring-core-4/pom.xml | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/spring-core-4/pom.xml b/spring-core-4/pom.xml
index 06598fb41e..53f7ca6912 100644
--- a/spring-core-4/pom.xml
+++ b/spring-core-4/pom.xml
@@ -14,26 +14,6 @@
     </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>
@@ -44,11 +24,6 @@
             <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>