From d4a928cdfac363353c293a7f0b0abcd936a77919 Mon Sep 17 00:00:00 2001
From: Gang Wu <wugagnca@hotmail.com>
Date: Mon, 16 Mar 2020 01:01:01 -0600
Subject: [PATCH 1/6] BAEL-3069 Spring jdbcTemplate Unit Testing

---
 .../spring-persistence-simple/pom.xml         |  7 +++
 .../baeldung/jdbc/EmployeeDAOUnitTest.java    | 49 +++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/jdbc/EmployeeDAOUnitTest.java

diff --git a/persistence-modules/spring-persistence-simple/pom.xml b/persistence-modules/spring-persistence-simple/pom.xml
index 8a03310048..45605c853e 100644
--- a/persistence-modules/spring-persistence-simple/pom.xml
+++ b/persistence-modules/spring-persistence-simple/pom.xml
@@ -92,6 +92,12 @@
             <version>${org.springframework.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId> 
+            <artifactId>mockito-core</artifactId>
+            <version>${mockito.version}</version> 
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.querydsl</groupId>
             <artifactId>querydsl-jpa</artifactId>
@@ -137,6 +143,7 @@
         <tomcat-dbcp.version>9.0.0.M26</tomcat-dbcp.version>
         <jta.version>1.1</jta.version>
         <querydsl.version>4.2.1</querydsl.version>
+        <mockito.version>3.3.3</mockito.version>
 
         <!-- util -->
         <guava.version>21.0</guava.version>
diff --git a/persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/jdbc/EmployeeDAOUnitTest.java b/persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/jdbc/EmployeeDAOUnitTest.java
new file mode 100644
index 0000000000..9894801a53
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/jdbc/EmployeeDAOUnitTest.java
@@ -0,0 +1,49 @@
+package com.baeldung.jdbc;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import javax.sql.DataSource;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
+import org.springframework.test.util.ReflectionTestUtils;
+
+
+@RunWith(MockitoJUnitRunner.class)
+
+public class EmployeeDAOUnitTest {
+
+    @Mock
+    JdbcTemplate jdbcTemplate;
+
+    @Test
+    public void whenMockJdbcTemplate_thenReturnCorrectEmployeeCount() {
+        EmployeeDAO employeeDAO = new EmployeeDAO();
+        ReflectionTestUtils.setField(employeeDAO, "jdbcTemplate", jdbcTemplate);
+        Mockito.when(jdbcTemplate.queryForObject("SELECT COUNT(*) FROM EMPLOYEE", Integer.class))
+            .thenReturn(4);
+        assertEquals(4, employeeDAO.getCountOfEmployees());
+
+        Mockito.when(jdbcTemplate.queryForObject(Mockito.anyString(), Mockito.eq(Integer.class)))
+            .thenReturn(3);
+        assertEquals(3, employeeDAO.getCountOfEmployees());
+    }
+
+    @Test
+    public void whenInjectInMemoryDataSource_thenReturnCorrectEmployeeCount() {
+        DataSource dataSource = new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.H2)
+            .addScript("classpath:jdbc/schema.sql")
+            .addScript("classpath:jdbc/test-data.sql")
+            .build();
+        EmployeeDAO employeeDAO = new EmployeeDAO();
+        employeeDAO.setDataSource(dataSource);
+        assertEquals(4, employeeDAO.getCountOfEmployees());
+    }
+
+}

From 5e97741b072cf19eec9e7c7e33ae4ebae2366f53 Mon Sep 17 00:00:00 2001
From: Gang Wu <wugagnca@hotmail.com>
Date: Sat, 21 Mar 2020 11:29:55 -0600
Subject: [PATCH 2/6] Revert "BAEL-3069 Spring jdbcTemplate Unit Testing"

This reverts commit d4a928cdfac363353c293a7f0b0abcd936a77919.
---
 .../spring-persistence-simple/pom.xml         |  7 ---
 .../baeldung/jdbc/EmployeeDAOUnitTest.java    | 49 -------------------
 2 files changed, 56 deletions(-)
 delete mode 100644 persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/jdbc/EmployeeDAOUnitTest.java

diff --git a/persistence-modules/spring-persistence-simple/pom.xml b/persistence-modules/spring-persistence-simple/pom.xml
index 45605c853e..8a03310048 100644
--- a/persistence-modules/spring-persistence-simple/pom.xml
+++ b/persistence-modules/spring-persistence-simple/pom.xml
@@ -92,12 +92,6 @@
             <version>${org.springframework.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId> 
-            <artifactId>mockito-core</artifactId>
-            <version>${mockito.version}</version> 
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.querydsl</groupId>
             <artifactId>querydsl-jpa</artifactId>
@@ -143,7 +137,6 @@
         <tomcat-dbcp.version>9.0.0.M26</tomcat-dbcp.version>
         <jta.version>1.1</jta.version>
         <querydsl.version>4.2.1</querydsl.version>
-        <mockito.version>3.3.3</mockito.version>
 
         <!-- util -->
         <guava.version>21.0</guava.version>
diff --git a/persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/jdbc/EmployeeDAOUnitTest.java b/persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/jdbc/EmployeeDAOUnitTest.java
deleted file mode 100644
index 9894801a53..0000000000
--- a/persistence-modules/spring-persistence-simple/src/test/java/com/baeldung/jdbc/EmployeeDAOUnitTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.baeldung.jdbc;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import javax.sql.DataSource;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
-import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
-import org.springframework.test.util.ReflectionTestUtils;
-
-
-@RunWith(MockitoJUnitRunner.class)
-
-public class EmployeeDAOUnitTest {
-
-    @Mock
-    JdbcTemplate jdbcTemplate;
-
-    @Test
-    public void whenMockJdbcTemplate_thenReturnCorrectEmployeeCount() {
-        EmployeeDAO employeeDAO = new EmployeeDAO();
-        ReflectionTestUtils.setField(employeeDAO, "jdbcTemplate", jdbcTemplate);
-        Mockito.when(jdbcTemplate.queryForObject("SELECT COUNT(*) FROM EMPLOYEE", Integer.class))
-            .thenReturn(4);
-        assertEquals(4, employeeDAO.getCountOfEmployees());
-
-        Mockito.when(jdbcTemplate.queryForObject(Mockito.anyString(), Mockito.eq(Integer.class)))
-            .thenReturn(3);
-        assertEquals(3, employeeDAO.getCountOfEmployees());
-    }
-
-    @Test
-    public void whenInjectInMemoryDataSource_thenReturnCorrectEmployeeCount() {
-        DataSource dataSource = new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.H2)
-            .addScript("classpath:jdbc/schema.sql")
-            .addScript("classpath:jdbc/test-data.sql")
-            .build();
-        EmployeeDAO employeeDAO = new EmployeeDAO();
-        employeeDAO.setDataSource(dataSource);
-        assertEquals(4, employeeDAO.getCountOfEmployees());
-    }
-
-}

From c986147850ef773d8bfeb6cfac18256368adf683 Mon Sep 17 00:00:00 2001
From: Gang Wu <wugagnca@hotmail.com>
Date: Sat, 21 Mar 2020 11:50:07 -0600
Subject: [PATCH 3/6] BAEL-3069 Spring jdbcTemplate Unit Testing. Create a new
 module for this article.

---
 .../spring-persistence-simple-1/.gitignore    | 13 ++++
 .../spring-persistence-simple-1/pom.xml       | 60 +++++++++++++++++++
 .../main/java/com/baeldung/jdbc/Employee.java | 44 ++++++++++++++
 .../java/com/baeldung/jdbc/EmployeeDAO.java   | 21 +++++++
 .../src/main/resources/jdbc/schema.sql        |  7 +++
 .../src/main/resources/jdbc/test-data.sql     |  4 ++
 .../baeldung/jdbc/EmployeeDAOUnitTest.java    | 47 +++++++++++++++
 7 files changed, 196 insertions(+)
 create mode 100644 persistence-modules/spring-persistence-simple-1/.gitignore
 create mode 100644 persistence-modules/spring-persistence-simple-1/pom.xml
 create mode 100644 persistence-modules/spring-persistence-simple-1/src/main/java/com/baeldung/jdbc/Employee.java
 create mode 100644 persistence-modules/spring-persistence-simple-1/src/main/java/com/baeldung/jdbc/EmployeeDAO.java
 create mode 100644 persistence-modules/spring-persistence-simple-1/src/main/resources/jdbc/schema.sql
 create mode 100644 persistence-modules/spring-persistence-simple-1/src/main/resources/jdbc/test-data.sql
 create mode 100644 persistence-modules/spring-persistence-simple-1/src/test/java/com/baeldung/jdbc/EmployeeDAOUnitTest.java

diff --git a/persistence-modules/spring-persistence-simple-1/.gitignore b/persistence-modules/spring-persistence-simple-1/.gitignore
new file mode 100644
index 0000000000..83c05e60c8
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple-1/.gitignore
@@ -0,0 +1,13 @@
+*.class
+
+#folders#
+/target
+/neoDb*
+/data
+/src/main/webapp/WEB-INF/classes
+*/META-INF/*
+
+# Packaged files #
+*.jar
+*.war
+*.ear
\ No newline at end of file
diff --git a/persistence-modules/spring-persistence-simple-1/pom.xml b/persistence-modules/spring-persistence-simple-1/pom.xml
new file mode 100644
index 0000000000..a60db4b9e1
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple-1/pom.xml
@@ -0,0 +1,60 @@
+<?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-persistence-simple-1</artifactId>
+    <version>0.1-SNAPSHOT</version>
+    <name>spring-persistence-simple-1</name>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>persistence-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <!-- Spring -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-orm</artifactId>
+            <version>${org.springframework.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${org.springframework.version}</version>
+        </dependency>
+
+        <!-- persistence -->
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>${h2.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- test scoped -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${org.springframework.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId> 
+            <artifactId>mockito-core</artifactId>
+            <version>${mockito.version}</version> 
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <!-- Spring -->
+        <org.springframework.version>5.2.4.RELEASE</org.springframework.version>
+        <!-- persistence -->
+        <h2.version>1.4.200</h2.version>
+        <!-- test scoped -->
+        <mockito.version>3.3.3</mockito.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/persistence-modules/spring-persistence-simple-1/src/main/java/com/baeldung/jdbc/Employee.java b/persistence-modules/spring-persistence-simple-1/src/main/java/com/baeldung/jdbc/Employee.java
new file mode 100644
index 0000000000..a43eb265c7
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple-1/src/main/java/com/baeldung/jdbc/Employee.java
@@ -0,0 +1,44 @@
+package com.baeldung.jdbc;
+
+public class Employee {
+    private int id;
+
+    private String firstName;
+
+    private String lastName;
+
+    private String address;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(final int id) {
+        this.id = id;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public void setFirstName(final String firstName) {
+        this.firstName = firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public void setLastName(final String lastName) {
+        this.lastName = lastName;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(final String address) {
+        this.address = address;
+    }
+
+}
diff --git a/persistence-modules/spring-persistence-simple-1/src/main/java/com/baeldung/jdbc/EmployeeDAO.java b/persistence-modules/spring-persistence-simple-1/src/main/java/com/baeldung/jdbc/EmployeeDAO.java
new file mode 100644
index 0000000000..a7adb7933a
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple-1/src/main/java/com/baeldung/jdbc/EmployeeDAO.java
@@ -0,0 +1,21 @@
+package com.baeldung.jdbc;
+
+import javax.sql.DataSource;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class EmployeeDAO {
+    private JdbcTemplate jdbcTemplate;
+
+    public void setDataSource(final DataSource dataSource) {
+        jdbcTemplate = new JdbcTemplate(dataSource);
+    }
+
+    public int getCountOfEmployees() {
+        return jdbcTemplate.queryForObject("SELECT COUNT(*) FROM EMPLOYEE", Integer.class);
+    }
+
+   
+}
diff --git a/persistence-modules/spring-persistence-simple-1/src/main/resources/jdbc/schema.sql b/persistence-modules/spring-persistence-simple-1/src/main/resources/jdbc/schema.sql
new file mode 100644
index 0000000000..3401c5d963
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple-1/src/main/resources/jdbc/schema.sql
@@ -0,0 +1,7 @@
+CREATE TABLE EMPLOYEE
+(
+    ID int NOT NULL PRIMARY KEY,
+    FIRST_NAME varchar(255),
+    LAST_NAME varchar(255),
+    ADDRESS varchar(255)
+);
\ No newline at end of file
diff --git a/persistence-modules/spring-persistence-simple-1/src/main/resources/jdbc/test-data.sql b/persistence-modules/spring-persistence-simple-1/src/main/resources/jdbc/test-data.sql
new file mode 100644
index 0000000000..c1669c156d
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple-1/src/main/resources/jdbc/test-data.sql
@@ -0,0 +1,4 @@
+INSERT INTO EMPLOYEE VALUES (1, 'James', 'Gosling', 'Canada');
+INSERT INTO EMPLOYEE VALUES (2, 'Donald', 'Knuth', 'USA');
+INSERT INTO EMPLOYEE VALUES (3, 'Linus', 'Torvalds', 'Finland');
+INSERT INTO EMPLOYEE VALUES (4, 'Dennis', 'Ritchie', 'USA');
\ No newline at end of file
diff --git a/persistence-modules/spring-persistence-simple-1/src/test/java/com/baeldung/jdbc/EmployeeDAOUnitTest.java b/persistence-modules/spring-persistence-simple-1/src/test/java/com/baeldung/jdbc/EmployeeDAOUnitTest.java
new file mode 100644
index 0000000000..a64ba9b2f0
--- /dev/null
+++ b/persistence-modules/spring-persistence-simple-1/src/test/java/com/baeldung/jdbc/EmployeeDAOUnitTest.java
@@ -0,0 +1,47 @@
+package com.baeldung.jdbc;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import javax.sql.DataSource;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
+import org.springframework.test.util.ReflectionTestUtils;
+
+
+@RunWith(MockitoJUnitRunner.class)
+
+public class EmployeeDAOUnitTest {
+    @Mock
+    JdbcTemplate jdbcTemplate;
+
+    @Test
+    public void whenMockJdbcTemplate_thenReturnCorrectEmployeeCount() {
+        EmployeeDAO employeeDAO = new EmployeeDAO();
+        ReflectionTestUtils.setField(employeeDAO, "jdbcTemplate", jdbcTemplate);
+        Mockito.when(jdbcTemplate.queryForObject("SELECT COUNT(*) FROM EMPLOYEE", Integer.class))
+          .thenReturn(4);
+        assertEquals(4, employeeDAO.getCountOfEmployees());
+
+        Mockito.when(jdbcTemplate.queryForObject(Mockito.anyString(), Mockito.eq(Integer.class)))
+          .thenReturn(3);
+        assertEquals(3, employeeDAO.getCountOfEmployees());
+    }
+
+    @Test
+    public void whenInjectInMemoryDataSource_thenReturnCorrectEmployeeCount() {
+        DataSource dataSource = new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.H2)
+          .addScript("classpath:jdbc/schema.sql")
+          .addScript("classpath:jdbc/test-data.sql")
+          .build();
+        EmployeeDAO employeeDAO = new EmployeeDAO();
+        employeeDAO.setDataSource(dataSource);
+        assertEquals(4, employeeDAO.getCountOfEmployees());
+    }
+}

From 9f3c94929a1a761146e372c73a4c8dbd7fb4b6ec Mon Sep 17 00:00:00 2001
From: Gang Wu <wugagnca@hotmail.com>
Date: Sat, 21 Mar 2020 11:57:30 -0600
Subject: [PATCH 4/6] BAEL-3069 Rename the folder name to
 spring-persistence-simple-2

---
 .../.gitignore                                                | 0
 .../pom.xml                                                   | 4 ++--
 .../src/main/java/com/baeldung/jdbc/Employee.java             | 0
 .../src/main/java/com/baeldung/jdbc/EmployeeDAO.java          | 0
 .../src/main/resources/jdbc/schema.sql                        | 0
 .../src/main/resources/jdbc/test-data.sql                     | 0
 .../src/test/java/com/baeldung/jdbc/EmployeeDAOUnitTest.java  | 0
 7 files changed, 2 insertions(+), 2 deletions(-)
 rename persistence-modules/{spring-persistence-simple-1 => spring-persistence-simple-2}/.gitignore (100%)
 rename persistence-modules/{spring-persistence-simple-1 => spring-persistence-simple-2}/pom.xml (95%)
 rename persistence-modules/{spring-persistence-simple-1 => spring-persistence-simple-2}/src/main/java/com/baeldung/jdbc/Employee.java (100%)
 rename persistence-modules/{spring-persistence-simple-1 => spring-persistence-simple-2}/src/main/java/com/baeldung/jdbc/EmployeeDAO.java (100%)
 rename persistence-modules/{spring-persistence-simple-1 => spring-persistence-simple-2}/src/main/resources/jdbc/schema.sql (100%)
 rename persistence-modules/{spring-persistence-simple-1 => spring-persistence-simple-2}/src/main/resources/jdbc/test-data.sql (100%)
 rename persistence-modules/{spring-persistence-simple-1 => spring-persistence-simple-2}/src/test/java/com/baeldung/jdbc/EmployeeDAOUnitTest.java (100%)

diff --git a/persistence-modules/spring-persistence-simple-1/.gitignore b/persistence-modules/spring-persistence-simple-2/.gitignore
similarity index 100%
rename from persistence-modules/spring-persistence-simple-1/.gitignore
rename to persistence-modules/spring-persistence-simple-2/.gitignore
diff --git a/persistence-modules/spring-persistence-simple-1/pom.xml b/persistence-modules/spring-persistence-simple-2/pom.xml
similarity index 95%
rename from persistence-modules/spring-persistence-simple-1/pom.xml
rename to persistence-modules/spring-persistence-simple-2/pom.xml
index a60db4b9e1..8380d635de 100644
--- a/persistence-modules/spring-persistence-simple-1/pom.xml
+++ b/persistence-modules/spring-persistence-simple-2/pom.xml
@@ -2,9 +2,9 @@
 <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-persistence-simple-1</artifactId>
+    <artifactId>spring-persistence-simple-2</artifactId>
     <version>0.1-SNAPSHOT</version>
-    <name>spring-persistence-simple-1</name>
+    <name>spring-persistence-simple-2</name>
 
     <parent>
         <groupId>com.baeldung</groupId>
diff --git a/persistence-modules/spring-persistence-simple-1/src/main/java/com/baeldung/jdbc/Employee.java b/persistence-modules/spring-persistence-simple-2/src/main/java/com/baeldung/jdbc/Employee.java
similarity index 100%
rename from persistence-modules/spring-persistence-simple-1/src/main/java/com/baeldung/jdbc/Employee.java
rename to persistence-modules/spring-persistence-simple-2/src/main/java/com/baeldung/jdbc/Employee.java
diff --git a/persistence-modules/spring-persistence-simple-1/src/main/java/com/baeldung/jdbc/EmployeeDAO.java b/persistence-modules/spring-persistence-simple-2/src/main/java/com/baeldung/jdbc/EmployeeDAO.java
similarity index 100%
rename from persistence-modules/spring-persistence-simple-1/src/main/java/com/baeldung/jdbc/EmployeeDAO.java
rename to persistence-modules/spring-persistence-simple-2/src/main/java/com/baeldung/jdbc/EmployeeDAO.java
diff --git a/persistence-modules/spring-persistence-simple-1/src/main/resources/jdbc/schema.sql b/persistence-modules/spring-persistence-simple-2/src/main/resources/jdbc/schema.sql
similarity index 100%
rename from persistence-modules/spring-persistence-simple-1/src/main/resources/jdbc/schema.sql
rename to persistence-modules/spring-persistence-simple-2/src/main/resources/jdbc/schema.sql
diff --git a/persistence-modules/spring-persistence-simple-1/src/main/resources/jdbc/test-data.sql b/persistence-modules/spring-persistence-simple-2/src/main/resources/jdbc/test-data.sql
similarity index 100%
rename from persistence-modules/spring-persistence-simple-1/src/main/resources/jdbc/test-data.sql
rename to persistence-modules/spring-persistence-simple-2/src/main/resources/jdbc/test-data.sql
diff --git a/persistence-modules/spring-persistence-simple-1/src/test/java/com/baeldung/jdbc/EmployeeDAOUnitTest.java b/persistence-modules/spring-persistence-simple-2/src/test/java/com/baeldung/jdbc/EmployeeDAOUnitTest.java
similarity index 100%
rename from persistence-modules/spring-persistence-simple-1/src/test/java/com/baeldung/jdbc/EmployeeDAOUnitTest.java
rename to persistence-modules/spring-persistence-simple-2/src/test/java/com/baeldung/jdbc/EmployeeDAOUnitTest.java

From 05e79680cfee68d6df3b8681fe9129bc3011b3e2 Mon Sep 17 00:00:00 2001
From: Gang Wu <wugagnca@hotmail.com>
Date: Sat, 21 Mar 2020 20:58:04 -0600
Subject: [PATCH 5/6] BAEL-3069 Remove git ignore file, add the new module name
 to the parent pom file.

---
 persistence-modules/pom.xml                         |  1 +
 .../spring-persistence-simple-2/.gitignore          | 13 -------------
 2 files changed, 1 insertion(+), 13 deletions(-)
 delete mode 100644 persistence-modules/spring-persistence-simple-2/.gitignore

diff --git a/persistence-modules/pom.xml b/persistence-modules/pom.xml
index 15b62d5d77..675f8270eb 100644
--- a/persistence-modules/pom.xml
+++ b/persistence-modules/pom.xml
@@ -69,6 +69,7 @@
         <module>spring-jpa</module>
         <!-- <module>spring-mybatis</module> --> <!-- needs fixing in BAEL-9021 -->
         <module>spring-persistence-simple</module>
+        <module>spring-persistence-simple-2</module>
     </modules>
 
 </project>
diff --git a/persistence-modules/spring-persistence-simple-2/.gitignore b/persistence-modules/spring-persistence-simple-2/.gitignore
deleted file mode 100644
index 83c05e60c8..0000000000
--- a/persistence-modules/spring-persistence-simple-2/.gitignore
+++ /dev/null
@@ -1,13 +0,0 @@
-*.class
-
-#folders#
-/target
-/neoDb*
-/data
-/src/main/webapp/WEB-INF/classes
-*/META-INF/*
-
-# Packaged files #
-*.jar
-*.war
-*.ear
\ No newline at end of file

From ff87d3ecc246a9c8cc3eed792dad0ce44338e54b Mon Sep 17 00:00:00 2001
From: Gang Wu <wugagnca@hotmail.com>
Date: Mon, 23 Mar 2020 22:00:55 -0600
Subject: [PATCH 6/6] BAEL-3069 Remove final keyword, add more empty lines for
 readability.

---
 .../src/main/java/com/baeldung/jdbc/EmployeeDAO.java          | 2 +-
 .../src/test/java/com/baeldung/jdbc/EmployeeDAOUnitTest.java  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/persistence-modules/spring-persistence-simple-2/src/main/java/com/baeldung/jdbc/EmployeeDAO.java b/persistence-modules/spring-persistence-simple-2/src/main/java/com/baeldung/jdbc/EmployeeDAO.java
index a7adb7933a..b5bf9452ed 100644
--- a/persistence-modules/spring-persistence-simple-2/src/main/java/com/baeldung/jdbc/EmployeeDAO.java
+++ b/persistence-modules/spring-persistence-simple-2/src/main/java/com/baeldung/jdbc/EmployeeDAO.java
@@ -9,7 +9,7 @@ import org.springframework.stereotype.Repository;
 public class EmployeeDAO {
     private JdbcTemplate jdbcTemplate;
 
-    public void setDataSource(final DataSource dataSource) {
+    public void setDataSource(DataSource dataSource) {
         jdbcTemplate = new JdbcTemplate(dataSource);
     }
 
diff --git a/persistence-modules/spring-persistence-simple-2/src/test/java/com/baeldung/jdbc/EmployeeDAOUnitTest.java b/persistence-modules/spring-persistence-simple-2/src/test/java/com/baeldung/jdbc/EmployeeDAOUnitTest.java
index a64ba9b2f0..71e8fb4263 100644
--- a/persistence-modules/spring-persistence-simple-2/src/test/java/com/baeldung/jdbc/EmployeeDAOUnitTest.java
+++ b/persistence-modules/spring-persistence-simple-2/src/test/java/com/baeldung/jdbc/EmployeeDAOUnitTest.java
@@ -27,10 +27,12 @@ public class EmployeeDAOUnitTest {
         ReflectionTestUtils.setField(employeeDAO, "jdbcTemplate", jdbcTemplate);
         Mockito.when(jdbcTemplate.queryForObject("SELECT COUNT(*) FROM EMPLOYEE", Integer.class))
           .thenReturn(4);
+
         assertEquals(4, employeeDAO.getCountOfEmployees());
 
         Mockito.when(jdbcTemplate.queryForObject(Mockito.anyString(), Mockito.eq(Integer.class)))
           .thenReturn(3);
+
         assertEquals(3, employeeDAO.getCountOfEmployees());
     }
 
@@ -40,8 +42,10 @@ public class EmployeeDAOUnitTest {
           .addScript("classpath:jdbc/schema.sql")
           .addScript("classpath:jdbc/test-data.sql")
           .build();
+
         EmployeeDAO employeeDAO = new EmployeeDAO();
         employeeDAO.setDataSource(dataSource);
+
         assertEquals(4, employeeDAO.getCountOfEmployees());
     }
 }