[4단계 - Transaction synchronization 적용하기] 피글렛(김은수) 미션 제출합니다.

app/src/main/java/com/techcourse/dao/UserDao.java

@@ -3,7 +3,6 @@
 import com.interface21.jdbc.core.JdbcTemplate;
 import com.interface21.jdbc.core.RowMapper;
 import com.techcourse.domain.User;
-import java.sql.Connection;
 import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,14 +34,6 @@ public void update(final User user) {
         jdbcTemplate.update(sql, user.getPassword(), user.getEmail(), user.getId());
     }
 
-    /*
-    Connection 공유 버전 overloading
-     */
-    public void update(final Connection connection, final User user) {
-        final var sql = "update users set password = ?, email = ? where id = ?";
-        jdbcTemplate.update(connection, sql, user.getPassword(), user.getEmail(), user.getId());
-    }
-
     public List<User> findAll() {
         final var sql = "select id, account, password, email from users";
         return jdbcTemplate.query(sql, USER_ROW_MAPPER);

app/src/main/java/com/techcourse/dao/UserHistoryDao.java

@@ -2,7 +2,6 @@
 
 import com.interface21.jdbc.core.JdbcTemplate;
 import com.techcourse.domain.UserHistory;
-import java.sql.Connection;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -27,20 +26,4 @@ public void log(final UserHistory userHistory) {
                 userHistory.getCreateBy()
         );
     }
-
-    /*
-    Connection 공유 버전 overloading
-     */
-    public void log(final Connection connection, final UserHistory userHistory) {
-        final var sql = "insert into user_history (user_id, account, password, email, created_at, created_by) values (?, ?, ?, ?, ?, ?)";
-        jdbcTemplate.update(
-                connection, sql,
-                userHistory.getUserId(),
-                userHistory.getAccount(),
-                userHistory.getPassword(),
-                userHistory.getEmail(),
-                userHistory.getCreatedAt(),
-                userHistory.getCreateBy()
-        );
-    }
 }

app/src/main/java/com/techcourse/service/AppUserService.java

@@ -0,0 +1,35 @@
+package com.techcourse.service;
+
+import com.techcourse.dao.UserDao;
+import com.techcourse.dao.UserHistoryDao;
+import com.techcourse.domain.User;
+import com.techcourse.domain.UserHistory;
+
+public class AppUserService implements UserService {
+
+    private final UserDao userDao;
+    private final UserHistoryDao userHistoryDao;
+
+    public AppUserService(final UserDao userDao, final UserHistoryDao userHistoryDao) {
+        this.userDao = userDao;
+        this.userHistoryDao = userHistoryDao;
+    }
+
+    @Override
+    public User findById(final long id) {
+        return userDao.findById(id);
+    }
+
+    @Override
+    public void save(final User user) {
+        userDao.insert(user);
+    }
+
+    @Override
+    public void changePassword(final long id, final String newPassword, final String createBy) {
+        final var user = findById(id);
+        user.changePassword(newPassword);
+        userDao.update(user);
+        userHistoryDao.log(new UserHistory(user, createBy));
+    }
+}

app/src/main/java/com/techcourse/service/TxUserService.java

@@ -0,0 +1,80 @@
+package com.techcourse.service;
+
+import com.interface21.dao.DataAccessException;
+import com.interface21.jdbc.datasource.DataSourceUtils;
+import com.techcourse.domain.User;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.function.Consumer;
+import javax.sql.DataSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TxUserService implements UserService {
+
+    private static final Logger log = LoggerFactory.getLogger(TxUserService.class);
+
+    private final UserService userService;
+    private final DataSource dataSource;
+
+    public TxUserService(UserService userService, DataSource dataSource) {
+        this.userService = userService;
+        this.dataSource = dataSource;
+    }
+
+    @Override
+    public User findById(long id) {
+        return userService.findById(id);
+    }
+
+    @Override
+    public void save(User user) {
+        userService.save(user);
+    }
+
+    @Override
+    public void changePassword(final long id, final String newPassword, final String createdBy){
+        try {
+            doInTransaction(connection -> {
+                userService.changePassword(id, newPassword, createdBy);
+            });
+        } catch (SQLException e) {
+            throw new DataAccessException(e);
+        }
+    }
+
+    private void doInTransaction(Consumer<Connection> consumer) throws SQLException {
+        Connection connection = DataSourceUtils.getConnection(dataSource);
+        connection.setAutoCommit(false);
+        try {
+            consumer.accept(connection);
+            connection.commit();
+        } catch (Exception e) {
+            log.error("트랜잭션 수행 중 예외 발생");
+            handleTransactionException(e, connection);
+        } finally {
+            closeConnection(connection);
+        }
+    }
+
+    private void handleTransactionException(Exception e, Connection connection) {
+        if(connection != null) {
+            try { // 커넥션이 존재할 경우 롤백 시도
+                connection.rollback();
+                log.info("Rollback 완료");
+            } catch (SQLException ex) { // 롤백 도중 예외 발생
+                log.error("Rollback 실패", ex);
+            }
+        }
+        throw e instanceof RuntimeException ? (RuntimeException) e : new RuntimeException(e);
+    }
+
+    private void closeConnection(Connection connection) {
+        if(connection != null){
+            try {
+                connection.close();
+                DataSourceUtils.releaseConnection(connection, dataSource);
+            } catch (SQLException ignored) {}
+        }
+    }
+}

app/src/main/java/com/techcourse/service/UserService.java

@@ -1,79 +1,10 @@
 package com.techcourse.service;
 
-import com.techcourse.dao.UserDao;
-import com.techcourse.dao.UserHistoryDao;
 import com.techcourse.domain.User;
-import com.techcourse.domain.UserHistory;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.function.Consumer;
-import javax.sql.DataSource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
-public class UserService {
+public interface UserService {
 
-    private static final Logger log = LoggerFactory.getLogger(UserService.class);
-
-    private final DataSource dataSource;
-    private final UserDao userDao;
-    private final UserHistoryDao userHistoryDao;
-
-    public UserService(final DataSource dataSource, final UserDao userDao, final UserHistoryDao userHistoryDao) {
-        this.dataSource = dataSource;
-        this.userDao = userDao;
-        this.userHistoryDao = userHistoryDao;
-    }
-
-    public User findById(final long id) {
-        return userDao.findById(id);
-    }
-
-    public void insert(final User user) {
-        userDao.insert(user);
-    }
-
-    public void changePassword(final long id, final String newPassword, final String createBy) {
-        doInTransaction(connection -> {
-            final var user = findById(id);
-            user.changePassword(newPassword);
-            userDao.update(connection, user);
-            userHistoryDao.log(connection, new UserHistory(user, createBy));
-        });
-    }
-
-    private void doInTransaction(Consumer<Connection> consumer){
-        Connection connection = null;
-        try {
-            connection = dataSource.getConnection();
-            connection.setAutoCommit(false);
-            consumer.accept(connection);
-            connection.commit();
-        } catch (Exception e) {
-            log.error("비밀번호 변경 중 예외 발생");
-            handleTransactionException(e, connection);
-        } finally {
-            closeConnection(connection);
-        }
-    }
-
-    private void handleTransactionException(Exception e, Connection connection) {
-        if(connection != null) {
-            try { // 커넥션이 존재할 경우 롤백 시도
-                connection.rollback();
-                log.info("Rollback 완료");
-            } catch (SQLException ex) { // 롤백 도중 예외 발생
-                log.error("Rollback 실패", ex);
-            }
-        }
-        throw e instanceof RuntimeException ? (RuntimeException) e : new RuntimeException(e);
-    }
-
-    private void closeConnection(Connection connection) {
-        if(connection != null){ // 커넥션이 존재할 경우 close
-            try {
-                connection.close();
-            } catch (SQLException ignored) {}
-        }
-    }
+    User findById(final long id);
+    void save(final User user);
+    void changePassword(final long id, final String newPassword, final String createdBy);
 }

app/src/test/java/com/techcourse/service/MockUserHistoryDao.java

@@ -4,7 +4,6 @@
 import com.interface21.jdbc.core.JdbcTemplate;
 import com.techcourse.dao.UserHistoryDao;
 import com.techcourse.domain.UserHistory;
-import java.sql.Connection;
 
 public class MockUserHistoryDao extends UserHistoryDao {
 
@@ -13,7 +12,7 @@ public MockUserHistoryDao(final JdbcTemplate jdbcTemplate) {
     }
 
     @Override
-    public void log(final Connection connection, final UserHistory userHistory) {
+    public void log(final UserHistory userHistory) {
         throw new DataAccessException();
     }
 }

app/src/test/java/com/techcourse/service/UserServiceTest.java

@@ -7,7 +7,6 @@
 import com.interface21.jdbc.core.JdbcTemplate;
 import com.techcourse.config.DataSourceConfig;
 import com.techcourse.dao.UserDao;
-import com.techcourse.dao.UserHistoryDao;
 import com.techcourse.domain.User;
 import com.techcourse.support.jdbc.init.DatabasePopulatorUtils;
 import javax.sql.DataSource;
@@ -31,31 +30,20 @@ void setUp() {
         userDao.insert(user);
     }
 
-    @Test
-    void testChangePassword() {
-        final var userHistoryDao = new UserHistoryDao(jdbcTemplate);
-        final var userService = new UserService(dataSource, userDao, userHistoryDao);
-
-        final var newPassword = "qqqqq";
-        final var createBy = "gugu";
-        userService.changePassword(1L, newPassword, createBy);
-
-        final var actual = userService.findById(1L);
-
-        assertThat(actual.getPassword()).isEqualTo(newPassword);
-    }
-
     @Test
     void testTransactionRollback() {
         // 트랜잭션 롤백 테스트를 위해 mock으로 교체
         final var userHistoryDao = new MockUserHistoryDao(jdbcTemplate);
-        final var userService = new UserService(dataSource, userDao, userHistoryDao);
+        // 애플리케이션 서비스
+        final var appUserService = new AppUserService(userDao, userHistoryDao);
+        // 트랜잭션 서비스 추상화
+        final var userService = new TxUserService(appUserService, dataSource);
 
         final var newPassword = "newPassword";
-        final var createBy = "gugu";
+        final var createdBy = "gugu";
         // 트랜잭션이 정상 동작하는지 확인하기 위해 의도적으로 MockUserHistoryDao에서 예외를 발생시킨다.
         assertThrows(DataAccessException.class,
-                () -> userService.changePassword(1L, newPassword, createBy));
+                () -> userService.changePassword(1L, newPassword, createdBy));
 
         final var actual = userService.findById(1L);
 

jdbc/src/main/java/com/interface21/jdbc/core/JdbcTemplate.java

@@ -2,6 +2,7 @@
 
 import com.interface21.dao.DataAccessException;
 import com.interface21.jdbc.IncorrectResultSizeException;
+import com.interface21.jdbc.datasource.DataSourceUtils;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -23,22 +24,8 @@ public JdbcTemplate(final DataSource dataSource) {
     }
 
     public void update(String sql, Object... params){
-        try (Connection conn = dataSource.getConnection();
-             PreparedStatement pstmt = conn.prepareStatement(sql)){
-            log.debug("query : {}", sql);
-            setParameters(pstmt, params);
-            pstmt.executeUpdate();
-        } catch (SQLException e) {
-            log.error(e.getMessage(), e);
-            throw new DataAccessException(e.getMessage(), e);
-        }
-    }
-
-    /*
-    Connection 공유 버전 오버로딩
-     */
-    public void update(Connection connection, String sql, Object... params){
-        try (PreparedStatement pstmt = connection.prepareStatement(sql)){
+        Connection conn = DataSourceUtils.getConnection(dataSource);
+        try (PreparedStatement pstmt = conn.prepareStatement(sql)){
             log.debug("query : {}", sql);
             setParameters(pstmt, params);
             pstmt.executeUpdate();
@@ -49,9 +36,8 @@ public void update(Connection connection, String sql, Object... params){
     }
 
     public <T> List<T> query(String sql, RowMapper<T> rowMapper, Object... params){
-        try (Connection conn = dataSource.getConnection();
-             PreparedStatement pstmt = conn.prepareStatement(sql)){
-
+        Connection conn = DataSourceUtils.getConnection(dataSource);
+        try (PreparedStatement pstmt = conn.prepareStatement(sql)){
             log.debug("query : {}", sql);
             setParameters(pstmt, params);
             return executionResult(rowMapper, pstmt);

jdbc/src/main/java/com/interface21/jdbc/datasource/DataSourceUtils.java

@@ -2,10 +2,9 @@
 
 import com.interface21.jdbc.CannotGetJdbcConnectionException;
 import com.interface21.transaction.support.TransactionSynchronizationManager;
-
-import javax.sql.DataSource;
 import java.sql.Connection;
 import java.sql.SQLException;
+import javax.sql.DataSource;
 
 // 4단계 미션에서 사용할 것
 public abstract class DataSourceUtils {
@@ -30,6 +29,7 @@ public static Connection getConnection(DataSource dataSource) throws CannotGetJd
     public static void releaseConnection(Connection connection, DataSource dataSource) {
         try {
             connection.close();
+            TransactionSynchronizationManager.unbindResource(dataSource);
         } catch (SQLException ex) {
             throw new CannotGetJdbcConnectionException("Failed to close JDBC Connection");
         }