[JDBC 라이브러리 구현하기 - 4단계] 이레(이다형) 미션 제출합니다.

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

@@ -4,7 +4,6 @@
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 
-import java.sql.Connection;
 import java.util.List;
 
 public class UserDao {
@@ -31,11 +30,6 @@ public void update(final User user) {
         jdbcTemplate.update(sql, user.getAccount(), user.getPassword(), user.getEmail(), user.getId());
     }
 
-    public void update(final Connection conn, final User user) {
-        final var sql = "update users set account = ?, password = ?, email = ? where id = ?";
-        jdbcTemplate.update(conn, sql, user.getAccount(), user.getPassword(), user.getEmail(), user.getId());
-    }
-
     public List<User> findAll() {
         final var sql = "select * from users";
         return jdbcTemplate.query(sql, USER_MAPPER);

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

@@ -3,8 +3,6 @@
 import com.techcourse.domain.UserHistory;
 import org.springframework.jdbc.core.JdbcTemplate;
 
-import java.sql.Connection;
-
 public class UserHistoryDao {
 
     private final JdbcTemplate jdbcTemplate;
@@ -25,18 +23,4 @@ public void log(final UserHistory userHistory) {
         );
     }
 
-
-    public void log(final Connection conn, final UserHistory userHistory) {
-        final var sql = "insert into user_history (user_id, account, password, email, created_at, created_by) values (?, ?, ?, ?, ?, ?)";
-        jdbcTemplate.update(
-                conn,
-                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,32 @@
+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;
+    }
+
+    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) {
+        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,31 @@
+package com.techcourse.service;
+
+import com.techcourse.domain.User;
+import org.springframework.transaction.support.TransactionManager;
+
+public class TxUserService implements UserService {
+
+    private final TransactionManager transactionManager;
+    private final UserService userService;
+
+    public TxUserService(final TransactionManager transactionManager, final UserService userService) {
+        this.transactionManager = transactionManager;
+        this.userService = userService;
+    }
+
+    @Override
+    public User findById(final long id) {
+        return transactionManager.executeWithResult(() -> userService.findById(id));
+    }
+
+    @Override
+    public void insert(final User user) {
+        transactionManager.execute(() -> userService.insert(user));
+    }
+
+
+    @Override
+    public void changePassword(final long id, final String newPassword, final String createBy) {
+        transactionManager.execute(() -> userService.changePassword(id, newPassword, createBy));
+    }
+}

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

@@ -1,42 +1,12 @@
 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 org.springframework.transaction.support.TransactionManager;
 
-import java.sql.Connection;
+public interface UserService {
 
-public class UserService {
+    User findById(final long id);
 
-    private final UserDao userDao;
-    private final UserHistoryDao userHistoryDao;
+    void insert(final User user);
 
-    private final TransactionManager transactionManager;
-
-    public UserService(final UserDao userDao, final UserHistoryDao userHistoryDao, final TransactionManager transactionManager) {
-        this.userDao = userDao;
-        this.userHistoryDao = userHistoryDao;
-        this.transactionManager = transactionManager;
-    }
-
-    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) {
-        transactionManager.execute((conn) -> changePasswordInTransaction(id, newPassword, createBy, conn));
-    }
-
-    private void changePasswordInTransaction(final long id, final String newPassword, final String createBy, final Connection conn) {
-        final var user = findById(id);
-        user.changePassword(newPassword);
-        userDao.update(conn, user);
-        userHistoryDao.log(conn, new UserHistory(user, createBy));
-    }
+    void changePassword(final long id, final String newPassword, final String createBy);
 }

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

@@ -4,7 +4,6 @@
 import com.techcourse.domain.UserHistory;
 import org.springframework.dao.DataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
-import java.sql.Connection;
 
 public class MockUserHistoryDao extends UserHistoryDao {
 
@@ -16,9 +15,4 @@ public MockUserHistoryDao(final JdbcTemplate jdbcTemplate) {
     public void log(final UserHistory userHistory) {
         throw new DataAccessException();
     }
-
-    @Override
-    public void log(final Connection conn, final UserHistory userHistory) {
-        throw new DataAccessException();
-    }
 }

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

@@ -36,7 +36,7 @@ void setUp() {
     @Test
     void testChangePassword() {
         final var userHistoryDao = new UserHistoryDao(jdbcTemplate);
-        final var userService = new UserService(userDao, userHistoryDao, new TransactionManager(dataSource));
+        final var userService = new TxUserService(new TransactionManager(dataSource), new AppUserService(userDao, userHistoryDao));
 
         final var newPassword = "qqqqq";
         final var createBy = "gugu";
@@ -51,7 +51,12 @@ void testChangePassword() {
     void testTransactionRollback() {
         // 트랜잭션 롤백 테스트를 위해 mock으로 교체
         final var userHistoryDao = new MockUserHistoryDao(jdbcTemplate);
-        final var userService = new UserService(userDao, userHistoryDao, new TransactionManager(dataSource));
+        // 애플리케이션 서비스
+        final var appUserService = new AppUserService(userDao, userHistoryDao);
+        // 트랜잭션 매니저
+        final var transactionManager = new TransactionManager(dataSource);
+        // 트랜잭션 서비스 추상화
+        final var userService = new TxUserService(transactionManager,appUserService);
 
         final var newPassword = "newPassword";
         final var createBy = "gugu";

jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java

@@ -3,6 +3,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.DataAccessException;
+import org.springframework.jdbc.datasource.DataSourceUtils;
 import org.springframework.jdbc.exception.EmptyResultDataAccessException;
 import org.springframework.jdbc.exception.IncorrectResultSizeDataAccessException;
 
@@ -28,10 +29,6 @@ public void update(final String sql, final Object... args) {
         execute(sql, args, PreparedStatement::executeUpdate);
     }
 
-    public void update(final Connection conn, final String sql, final Object... args) {
-        execute(conn, sql, args, PreparedStatement::executeUpdate);
-    }
-
     public <T> T queryForObject(final String sql, final RowMapper<T> rowMapper, final Object... args) {
         List<T> result = query(sql, rowMapper, args);
         if (result.size() > 1) {
@@ -55,23 +52,8 @@ public <T> List<T> query(final String sql, final RowMapper<T> rowMapper, final O
     }
 
     private <T> T execute(final String sql, final Object[] args, final PreparedStatementFunction<T> preparedStatementExecutor) {
-        try (final Connection conn = dataSource.getConnection();
-             final PreparedStatement pstmt = conn.prepareStatement(sql)) {
-            log.debug("query : {}", sql);
-
-            for (int i = 0; i < args.length; i++) {
-                pstmt.setObject(i + 1, args[i]);
-            }
-            return preparedStatementExecutor.execute(pstmt);
-        } catch (SQLException e) {
-            log.error(e.getMessage(), e);
-            throw new DataAccessException(e);
-        }
-    }
-
-    private <T> T execute(final Connection conn, final String sql, final Object[] args, final PreparedStatementFunction<T> preparedStatementExecutor) {
-        try {
-            final PreparedStatement pstmt = conn.prepareStatement(sql);
+        final Connection conn = DataSourceUtils.getConnection(dataSource);
+        try (final PreparedStatement pstmt = conn.prepareStatement(sql)) {
             log.debug("query : {}", sql);
 
             for (int i = 0; i < args.length; i++) {
@@ -81,6 +63,8 @@ private <T> T execute(final Connection conn, final String sql, final Object[] ar
         } catch (SQLException e) {
             log.error(e.getMessage(), e);
             throw new DataAccessException(e);
+        } finally {
+            DataSourceUtils.releaseConnection(conn, dataSource);
         }
     }
 }

jdbc/src/main/java/org/springframework/jdbc/datasource/DataSourceUtils.java

@@ -1,6 +1,7 @@
 package org.springframework.jdbc.datasource;
 
-import org.springframework.jdbc.CannotGetJdbcConnectionException;
+import org.springframework.jdbc.exception.CannotGetJdbcConnectionException;
+import org.springframework.transaction.support.ConnectionHolder;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 import javax.sql.DataSource;
@@ -12,23 +13,32 @@ public abstract class DataSourceUtils {
 
     private DataSourceUtils() {}
 
-    public static Connection getConnection(DataSource dataSource) throws CannotGetJdbcConnectionException {
-        Connection connection = TransactionSynchronizationManager.getResource(dataSource);
-        if (connection != null) {
-            return connection;
+    public static Connection getConnection(final DataSource dataSource) throws CannotGetJdbcConnectionException {
+        ConnectionHolder connectionHolder = TransactionSynchronizationManager.getResource(dataSource);
+        if (connectionHolder != null) {
+            return connectionHolder.getConnection();
         }
 
         try {
-            connection = dataSource.getConnection();
-            TransactionSynchronizationManager.bindResource(dataSource, connection);
+            Connection connection = dataSource.getConnection();
+            TransactionSynchronizationManager.bindResource(dataSource, new ConnectionHolder(connection));
             return connection;
         } catch (SQLException ex) {
             throw new CannotGetJdbcConnectionException("Failed to obtain JDBC Connection", ex);
         }
     }
 
-    public static void releaseConnection(Connection connection, DataSource dataSource) {
+    public static void releaseConnection(final Connection connection, final DataSource dataSource) {
+        if(connection == null) {
+            return;
+        }
+        ConnectionHolder connectionHolder = TransactionSynchronizationManager.getResource(dataSource);
+        boolean isConnectionActive = connectionHolder.isConnectionTransactionActive();
+        if(isConnectionActive) {
+            return;
+        }
         try {
+            TransactionSynchronizationManager.unbindResource(dataSource);
             connection.close();
         } catch (SQLException ex) {
             throw new CannotGetJdbcConnectionException("Failed to close JDBC Connection");

jdbc/src/main/java/org/springframework/jdbc/CannotGetJdbcConnectionException.java → jdbc/src/main/java/org/springframework/jdbc/exception/CannotGetJdbcConnectionException.java

@@ -1,4 +1,4 @@
-package org.springframework.jdbc;
+package org.springframework.jdbc.exception;
 
 import java.sql.SQLException;
 

jdbc/src/main/java/org/springframework/transaction/support/ConnectionHolder.java

@@ -0,0 +1,26 @@
+package org.springframework.transaction.support;
+
+import java.sql.Connection;
+
+public class ConnectionHolder {
+
+    private final Connection connection;
+
+    private boolean isConnectionTransactionActive;
+
+    public ConnectionHolder(final Connection connection) {
+        this.connection = connection;
+    }
+
+    public void setConnectionTransactionActive(boolean isActive) {
+        this.isConnectionTransactionActive = isActive;
+    }
+
+    public Connection getConnection() {
+        return connection;
+    }
+
+    public boolean isConnectionTransactionActive() {
+        return isConnectionTransactionActive;
+    }
+}