Improved JDBCtemplate impelmentation - used MapSqlParameterSource which feels more fluent and also used BeanPropertyRowMapper.newInstance which seems nicer than using constructor.

bretislav.wajtr · bretislav.wajtr · commit 970d1bf66187 · 2016-11-26T15:02:05.000+01:00
Additionally used PostgreSQL JDBC driver in version which supports JDBC 4.2 where Java8 Date/Time classes are fully supported (like LocalDate).
Improved verification of scenario three.
diff --git a/build.gradle b/build.gradle
@@ -29,7 +29,7 @@ dependencies {
     compile "org.springframework.boot:spring-boot-starter-jdbc"
     compile "org.springframework.boot:spring-boot-starter-jooq"
     compile 'org.mybatis.spring.boot:mybatis-spring-boot-starter:1.1.1'
-    compile "org.postgresql:postgresql:9.4.1211.jre7"
+    compile "org.postgresql:postgresql:9.4.1212"
     compile "org.apache.commons:commons-lang3:3.4"
     compile "org.apache.commons:commons-collections4:4.1"
 
diff --git a/jooq.gradle b/jooq.gradle
@@ -34,7 +34,7 @@ tasks.withType(JavaCompile) {
 }
 
 dependencies {
-    jooqRuntime "org.postgresql:postgresql:9.4.1211.jre7"
+    jooqRuntime "org.postgresql:postgresql:9.4.1212"
 }
 
 // jooq configuration
diff --git a/src/main/java/com/clevergang/dbtests/Scenarios.java b/src/main/java/com/clevergang/dbtests/Scenarios.java
@@ -79,9 +79,17 @@ public void saveNewEntityScenario() {
         Integer newPid = repository.insertProject(project);
 
         // check some post conditions
+        logger.info("Scenario three, pid of inserted entity: {}", newPid);
         assert newPid != null;
         assert newPid > 2;
-        logger.info("Scenario three, pid of inserted entity: {}", newPid);
+
+        Project storedProject = repository.findProject(newPid);
+        logger.info("Scenario three, stored project: {}", storedProject);
+
+        assert storedProject != null;
+        assert newPid.equals(storedProject.getPid());
+        assert project.getName().equals(storedProject.getName());
+        assert project.getDate().equals(storedProject.getDate());
    }
 
     /**
@@ -106,7 +114,7 @@ public void batchInsertMultipleEntitiesScenario() {
         // SCENARIO CODE STARTS HERE
         List<Integer> newPids = repository.insertProjects(projects);
 
-        // check some postconditions
+        // check some post conditions
         Integer projectsCount = repository.getProjectsCount();
         assert projectsCount == 1002;
         logger.info("Scenario 4. output {}", newPids);
diff --git a/src/main/java/com/clevergang/dbtests/repository/api/DataRepository.java b/src/main/java/com/clevergang/dbtests/repository/api/DataRepository.java
@@ -76,6 +76,12 @@ public interface DataRepository {
 
     // Projects
 
+    /**
+     * @param pid Primary key of the project record to be found
+     * @return Should return full record of the Project record identified by pid
+     */
+    Project findProject(Integer pid);
+
     /**
      * Insert project and return PID of newly created item
      *
diff --git a/src/main/java/com/clevergang/dbtests/repository/impl/jdbctemplate/JDBCDataRepositoryImpl.java b/src/main/java/com/clevergang/dbtests/repository/impl/jdbctemplate/JDBCDataRepositoryImpl.java
@@ -9,16 +9,12 @@
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
-import org.springframework.jdbc.core.namedparam.SqlParameterSource;
 import org.springframework.jdbc.support.GeneratedKeyHolder;
 import org.springframework.jdbc.support.KeyHolder;
 import org.springframework.stereotype.Repository;
 
 import java.math.BigDecimal;
-import java.sql.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -38,14 +34,16 @@ public class JDBCDataRepositoryImpl implements DataRepository {
     public Company findCompany(Integer pid) {
         logger.info("Finding Company by ID using JDBCTemplate");
 
-        String query;
-        query = "SELECT pid, address, name " +
+        String query = "SELECT pid, address, name " +
                 "FROM company " +
                 "WHERE pid = :pid";
 
-        Map<String, Object> params = new HashMap<>();
-        params.put("pid", pid);
+        MapSqlParameterSource params = new MapSqlParameterSource()
+                .addValue("pid", pid);
 
+        /*
+         * Note that you can use BeanPropertyRowMapper instead (see findDepartment())
+         */
         RowMapper<Company> mapper = (rs, rowNum) -> {
             Company row = new Company();
             row.setPid(rs.getInt("pid"));
@@ -90,16 +88,15 @@ public Company findCompanyUsingSimpleStaticStatement(Integer pid) {
 
     @Override
     public Department findDepartment(Integer pid) {
-        String query;
-        query = "SELECT pid, company_pid, name" +
+        String query = "SELECT pid, company_pid, name" +
                 "           FROM department " +
                 "           WHERE pid = :pid";
 
-        Map<String, Object> params = new HashMap<>();
-        params.put("pid", pid);
+        MapSqlParameterSource params = new MapSqlParameterSource()
+                .addValue("pid", pid);
 
         // using BeanPropertyRowMapper is easier, but with much worse performance than custom RowMapper
-        return jdbcTemplate.queryForObject(query, params, new BeanPropertyRowMapper<>(Department.class));
+        return jdbcTemplate.queryForObject(query, params, BeanPropertyRowMapper.newInstance(Department.class));
     }
 
     @Override
@@ -110,11 +107,11 @@ public List<Employee> employeesWithSalaryGreaterThan(Integer minSalary) {
                 "           FROM employee" +
                 "           WHERE salary > :salary";
 
-        Map<String, Object> params = new HashMap<>();
-        params.put("salary", minSalary);
+        MapSqlParameterSource params = new MapSqlParameterSource()
+                .addValue("salary", minSalary);
 
         // using BeanPropertyRowMapper is easier, but with much worse performance than custom RowMapper
-        return jdbcTemplate.query(query, params, new BeanPropertyRowMapper<>(Employee.class));
+        return jdbcTemplate.query(query, params, BeanPropertyRowMapper.newInstance(Employee.class));
     }
 
     @Override
@@ -124,15 +121,15 @@ public Integer insertProject(Project project) {
         String insertStatement = " INSERT INTO project (name, datestarted) " +
                 " VALUES (:name, :datestarted)";
 
-        MapSqlParameterSource params = new MapSqlParameterSource();
-        params.addValue("name", project.getName());
-        params.addValue("datestarted", Date.valueOf(project.getDate()));
+        MapSqlParameterSource params = new MapSqlParameterSource()
+                .addValue("name", project.getName())
+                .addValue("datestarted", project.getDate());
 
         KeyHolder generatedKey = new GeneratedKeyHolder();
 
         jdbcTemplate.update(insertStatement, params, generatedKey);
 
-        return (Integer)generatedKey.getKeys().get("pid");
+        return (Integer) generatedKey.getKeys().get("pid");
     }
 
     @Override
@@ -144,12 +141,9 @@ public List<Integer> insertProjects(List<Project> projects) {
 
         MapSqlParameterSource[] paramsList = projects
                 .stream()
-                .map(project -> {
-                    MapSqlParameterSource params = new MapSqlParameterSource();
-                    params.addValue("name", project.getName());
-                    params.addValue("datestarted", Date.valueOf(project.getDate()));
-                    return params;
-                })
+                .map(project -> new MapSqlParameterSource()
+                        .addValue("name", project.getName())
+                        .addValue("datestarted", project.getDate()))
                 .toArray(MapSqlParameterSource[]::new);
 
         jdbcTemplate.batchUpdate(insertStatement, paramsList);
@@ -170,13 +164,13 @@ public void updateEmployee(Employee employeeToUpdate) {
                 " salary = :salary" +
                 " WHERE pid = :pid";
 
-        MapSqlParameterSource params = new MapSqlParameterSource();
-        params.addValue("department_pid", employeeToUpdate.getDepartmentPid());
-        params.addValue("name", employeeToUpdate.getName());
-        params.addValue("surname", employeeToUpdate.getSurname());
-        params.addValue("email", employeeToUpdate.getEmail());
-        params.addValue("salary", employeeToUpdate.getSalary());
-        params.addValue("pid", employeeToUpdate.getPid());
+        MapSqlParameterSource params = new MapSqlParameterSource()
+                .addValue("department_pid", employeeToUpdate.getDepartmentPid())
+                .addValue("name", employeeToUpdate.getName())
+                .addValue("surname", employeeToUpdate.getSurname())
+                .addValue("email", employeeToUpdate.getEmail())
+                .addValue("salary", employeeToUpdate.getSalary())
+                .addValue("pid", employeeToUpdate.getPid());
 
         jdbcTemplate.update(updateStatement, params);
     }
@@ -202,8 +196,8 @@ public List<ProjectsWithCostsGreaterThanOutput> getProjectsWithCostsGreaterThan(
                 "GROUP BY project_name, total_cost, company_name\n" +
                 "ORDER BY company_name";
 
-        Map<String, Object> params = new HashMap<>();
-        params.put("totalCostBoundary", totalCostBoundary);
+        MapSqlParameterSource params = new MapSqlParameterSource()
+                .addValue("totalCostBoundary", totalCostBoundary);
 
         RowMapper<ProjectsWithCostsGreaterThanOutput> mapper = (rs, rowNum) -> {
             ProjectsWithCostsGreaterThanOutput row = new ProjectsWithCostsGreaterThanOutput();
@@ -220,13 +214,13 @@ public List<ProjectsWithCostsGreaterThanOutput> getProjectsWithCostsGreaterThan(
     @Override
     public Employee findEmployee(Integer pid) {
         String query;
-        query = "SELECT pid, email, name, salary, surname, department_pid as departmentPid FROM employee WHERE pid = :pid";
+        query = "SELECT pid, email, name, salary, surname, department_pid AS departmentPid FROM employee WHERE pid = :pid";
 
-        Map<String, Object> params = new HashMap<>();
-        params.put("pid", pid);
+        MapSqlParameterSource params = new MapSqlParameterSource()
+                .addValue("pid", pid);
 
         // using BeanPropertyRowMapper is easier, but with much worse performance than custom RowMapper
-        return jdbcTemplate.queryForObject(query, params, new BeanPropertyRowMapper<>(Employee.class));
+        return jdbcTemplate.queryForObject(query, params, BeanPropertyRowMapper.newInstance(Employee.class));
     }
 
     @Override
@@ -242,13 +236,14 @@ public RegisterEmployeeOutput callRegisterEmployee(String name, String surname,
                 "  _company_name := :companyName\n" +
                 ")";
 
-        Map<String, Object> params = new HashMap<>();
-        params.put("name", name);
-        params.put("surname", surname);
-        params.put("email", email);
-        params.put("salary", salary);
-        params.put("departmentName", departmentName);
-        params.put("companyName", companyName);
+
+        MapSqlParameterSource params = new MapSqlParameterSource()
+                .addValue("name", name)
+                .addValue("surname", surname)
+                .addValue("email", email)
+                .addValue("salary", salary)
+                .addValue("departmentName", departmentName)
+                .addValue("companyName", companyName);
 
         RowMapper<RegisterEmployeeOutput> mapper = (rs, rowNum) -> {
             RegisterEmployeeOutput row = new RegisterEmployeeOutput();
@@ -263,8 +258,8 @@ public RegisterEmployeeOutput callRegisterEmployee(String name, String surname,
 
     @Override
     public Integer getProjectsCount() {
-        String query = "SELECT count(*) from project";
-        return jdbcTemplate.queryForObject(query, (SqlParameterSource) null, Integer.class);
+        String query = "SELECT count(*) FROM project";
+        return jdbcTemplate.getJdbcOperations().queryForObject(query, Integer.class);
     }
 
     @Override
@@ -274,10 +269,10 @@ public List<Department> findDepartmentsOfCompany(Company company) {
                 "           WHERE company_pid = :pid" +
                 "           ORDER BY pid";
 
-        Map<String, Object> params = new HashMap<>();
-        params.put("pid", company.getPid());
+        MapSqlParameterSource params = new MapSqlParameterSource()
+                .addValue("pid", company.getPid());
 
-        return jdbcTemplate.query(query, params, new BeanPropertyRowMapper<>(Department.class));
+        return jdbcTemplate.query(query, params, BeanPropertyRowMapper.newInstance(Department.class));
     }
 
     @Override
@@ -286,10 +281,10 @@ public void deleteDepartments(List<Department> departmentsToDelete) {
                 .map(Department::getPid)
                 .collect(Collectors.toList());
 
-        Map<String, Object> params = new HashMap<>();
-        params.put("pids", ids);
+        MapSqlParameterSource params = new MapSqlParameterSource()
+                .addValue("pids", ids);
 
-        String updateStatement = "DELETE FROM department where pid IN (:pids)";
+        String updateStatement = "DELETE FROM department WHERE pid IN (:pids)";
 
         jdbcTemplate.update(updateStatement, params);
     }
@@ -314,16 +309,28 @@ public void insertDepartments(List<Department> departmentsToInsert) {
         batchUpdateDepartments(departmentsToInsert, insertStatement);
     }
 
+    @Override
+    public Project findProject(Integer pid) {
+        String query;
+        query = "SELECT pid, name, datestarted AS date" +
+                "           FROM project " +
+                "           WHERE pid = :pid";
+
+        MapSqlParameterSource params = new MapSqlParameterSource()
+                .addValue("pid", pid);
+
+        // using BeanPropertyRowMapper is easier, but with much worse performance than custom RowMapper
+        return jdbcTemplate.queryForObject(query, params, BeanPropertyRowMapper.newInstance(Project.class));
+    }
+
     private void batchUpdateDepartments(List<Department> departmentsToInsert, String statement) {
         MapSqlParameterSource[] paramsList = departmentsToInsert
                 .stream()
-                .map(department -> {
-                    MapSqlParameterSource params = new MapSqlParameterSource();
-                    params.addValue("pid", department.getPid());
-                    params.addValue("company_pid", department.getCompanyPid());
-                    params.addValue("name", department.getName());
-                    return params;
-                })
+                .map(department -> new MapSqlParameterSource()
+                        .addValue("pid", department.getPid())
+                        .addValue("company_pid", department.getCompanyPid())
+                        .addValue("name", department.getName())
+                )
                 .toArray(MapSqlParameterSource[]::new);
 
         jdbcTemplate.batchUpdate(statement, paramsList);
diff --git a/src/main/java/com/clevergang/dbtests/repository/impl/jooq/JooqDataRepositoryImpl.java b/src/main/java/com/clevergang/dbtests/repository/impl/jooq/JooqDataRepositoryImpl.java
@@ -329,5 +329,18 @@ public void insertDepartments(List<Department> departmentsToInsert) {
         batch.execute();
     }
 
+    @Override
+    public Project findProject(Integer pid) {
+        return create.selectFrom(PROJECT)
+                .where(PROJECT.PID.eq(pid))
+                .fetchOne(project -> {
+                    Project result = new Project();
+                    result.setPid(project.getPid());
+                    result.setName(project.getName());
+                    result.setDate(project.getDatestarted().toLocalDate());
+                    return result;
+                });
+    }
+
 }
 
diff --git a/src/main/java/com/clevergang/dbtests/repository/impl/mybatis/DataRepositoryMapper.java b/src/main/java/com/clevergang/dbtests/repository/impl/mybatis/DataRepositoryMapper.java
@@ -42,4 +42,6 @@ public interface DataRepositoryMapper {
     Integer getProjectsCount();
 
     Employee findEmployee(Integer pid);
+
+    Project findProject(Integer pid);
 }
diff --git a/src/main/java/com/clevergang/dbtests/repository/impl/mybatis/MyBatisDataRepositoryImpl.java b/src/main/java/com/clevergang/dbtests/repository/impl/mybatis/MyBatisDataRepositoryImpl.java
@@ -79,6 +79,11 @@ public void insertDepartments(List<Department> departmentsToInsert) {
         batchOperations.flushStatements();
     }
 
+    @Override
+    public Project findProject(Integer pid) {
+        return sql.findProject(pid);
+    }
+
     @Override
     public Integer insertProject(Project project) {
         sql.insertProject(project);
diff --git a/src/main/resources/mybatis/mappers/DataRepositoryMapper.xml b/src/main/resources/mybatis/mappers/DataRepositoryMapper.xml
@@ -128,4 +128,11 @@
         WHERE pid = #{pid}
     </select>
 
+    <select id="findProject" resultType="com.clevergang.dbtests.repository.api.data.Project">
+        SELECT pid, name, datestarted as date
+        FROM project
+        WHERE pid = #{pid}
+    </select>
+
+
 </mapper>

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ tasks.withType(JavaCompile) {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`dependencies {`
`37`		`- jooqRuntime "org.postgresql:postgresql:9.4.1211.jre7"`
	`37`	`+ jooqRuntime "org.postgresql:postgresql:9.4.1212"`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`// jooq configuration`
Original file line number	Diff line number	Diff line change
`@@ -42,4 +42,6 @@ public interface DataRepositoryMapper {`
`42`	`42`	`Integer getProjectsCount();`
`43`	`43`
`44`	`44`	`Employee findEmployee(Integer pid);`
	`45`	`+`
	`46`	`+ Project findProject(Integer pid);`
`45`	`47`	`}`