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

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,41 @@
+package com.techcourse.service;
+
+import com.techcourse.domain.User;
+import javax.sql.DataSource;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
+
+public class TxUserService implements UserService {
+
+  private final UserService userService;
+  private final DataSource dataSource;
+
+  public TxUserService(final UserService userService, final DataSource dataSource) {
+    this.userService = userService;
+    this.dataSource = dataSource;
+  }
+
+  @Override
+  public User findById(final long id) {
+    return userService.findById(id);
+  }
+
+  @Override
+  public void insert(final User user) {
+    userService.insert(user);
+  }
+
+  @Override
+  public void changePassword(final long id, final String newPassword, final String createBy) {
+    TransactionSynchronizationManager.start();
+
+    try {
+      userService.changePassword(id, newPassword, createBy);
+      TransactionSynchronizationManager.commit(dataSource);
+    } catch (Exception e) {
+      TransactionSynchronizationManager.rollback(dataSource);
+      throw e;
+    } finally {
+      TransactionSynchronizationManager.release(dataSource);
+    }
+  }
+}

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

@@ -1,43 +1,11 @@
 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.jdbc.core.TransactionManager;
 
-public class UserService {
+public interface UserService {
 
-  private final UserDao userDao;
-  private final UserHistoryDao userHistoryDao;
+  User findById(final long id);
+  void insert(final User user);
+  void changePassword(final long id, final String newPassword, final String createBy);
 
-  public UserService(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);
-
-    TransactionManager.start();
-    try {
-      user.changePassword(newPassword);
-      userDao.update(user);
-      userHistoryDao.log(new UserHistory(user, createBy));
-      TransactionManager.commit();
-    } catch (Exception e) {
-      TransactionManager.rollback();
-      throw e;
-    } finally {
-      TransactionManager.release();
-    }
-  }
 }

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

@@ -5,6 +5,7 @@
 import com.techcourse.dao.UserHistoryDao;
 import com.techcourse.domain.User;
 import com.techcourse.support.jdbc.init.DatabasePopulatorUtils;
+import javax.sql.DataSource;
 import org.springframework.dao.DataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.junit.jupiter.api.BeforeEach;
@@ -13,25 +14,27 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-class UserServiceTest {
+class AppUserServiceTest {
 
     private JdbcTemplate jdbcTemplate;
     private UserDao userDao;
+    private DataSource dataSource;
 
     @BeforeEach
     void setUp() {
-        this.jdbcTemplate = new JdbcTemplate(DataSourceConfig.getInstance());
+        dataSource = DataSourceConfig.getInstance();
+        this.jdbcTemplate = new JdbcTemplate(dataSource);
         this.userDao = new UserDao(jdbcTemplate);
 
-        DatabasePopulatorUtils.execute(DataSourceConfig.getInstance());
+        DatabasePopulatorUtils.execute(dataSource);
         final var user = new User("gugu", "password", "hkkang@woowahan.com");
         userDao.insert(user);
     }
 
     @Test
     void testChangePassword() {
         final var userHistoryDao = new UserHistoryDao(jdbcTemplate);
-        final var userService = new UserService(userDao, userHistoryDao);
+        final var userService = new AppUserService(userDao, userHistoryDao);
 
         final var newPassword = "qqqqq";
         final var createBy = "gugu";
@@ -46,7 +49,8 @@ void testChangePassword() {
     void testTransactionRollback() {
         // 트랜잭션 롤백 테스트를 위해 mock으로 교체
         final var userHistoryDao = new MockUserHistoryDao(jdbcTemplate);
-        final var userService = new UserService(userDao, userHistoryDao);
+        final var appUserService = new AppUserService(userDao, userHistoryDao);
+        final TxUserService userService = new TxUserService(appUserService, dataSource);
 
         final var newPassword = "newPassword";
         final var createBy = "gugu";

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

@@ -10,6 +10,8 @@
 import javax.sql.DataSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.dao.DataAccessException;
+import org.springframework.jdbc.datasource.DataSourceUtils;
 
 public class JdbcTemplate {
 
@@ -42,7 +44,7 @@ public <T> Optional<T> query(final String sql, RowMapper<T> rowMapper, final Obj
       return Optional.ofNullable(result.get(0));
     } catch (SQLException e) {
       log.error(e.getMessage(), e);
-      throw new RuntimeException(e);
+      throw new DataAccessException(e);
     }
   }
 
@@ -71,7 +73,7 @@ public <T> List<T> queryPlural(
       return extractResultFrom(resultSet, rowMapper);
     } catch (SQLException e) {
       log.error(e.getMessage(), e);
-      throw new RuntimeException(e);
+      throw new DataAccessException(e);
     }
   }
 
@@ -88,7 +90,7 @@ private <T> List<T> extractResultFrom(final ResultSet resultSet, final RowMapper
 
   public void execute(final String sql, final Object... values) {
 
-    final Connection connection = TransactionManager.getConnection(dataSource);
+    final Connection connection = DataSourceUtils.getConnection(dataSource);
 
     try (
         final PreparedStatement pstmt = connection.prepareStatement(sql)
@@ -101,7 +103,7 @@ public void execute(final String sql, final Object... values) {
       pstmt.executeUpdate();
     } catch (SQLException e) {
       log.error(e.getMessage(), e);
-      throw new RuntimeException(e);
+      throw new DataAccessException(e);
     }
   }
 }

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

@@ -1,5 +1,6 @@
 package org.springframework.jdbc.datasource;
 
+import java.util.function.Function;
 import org.springframework.jdbc.CannotGetJdbcConnectionException;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 
@@ -10,28 +11,29 @@
 // 4단계 미션에서 사용할 것
 public abstract class DataSourceUtils {
 
-    private 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(DataSource dataSource) {
+    return TransactionSynchronizationManager.getResource(dataSource)
+        .orElseGet(() -> createConnection(dataSource));
+  }
 
-        try {
-            connection = dataSource.getConnection();
-            TransactionSynchronizationManager.bindResource(dataSource, connection);
-            return connection;
-        } catch (SQLException ex) {
-            throw new CannotGetJdbcConnectionException("Failed to obtain JDBC Connection", ex);
-        }
+  private static Connection createConnection(final DataSource dataSource) {
+    try {
+      final Connection connection = dataSource.getConnection();
+      TransactionSynchronizationManager.bindResource(dataSource, connection);
+      return connection;
+    } catch (SQLException ex) {
+      throw new CannotGetJdbcConnectionException("Failed to obtain JDBC Connection", ex);
     }
+  }
 
-    public static void releaseConnection(Connection connection, DataSource dataSource) {
-        try {
-            connection.close();
-        } catch (SQLException ex) {
-            throw new CannotGetJdbcConnectionException("Failed to close JDBC Connection");
-        }
+  public static void releaseConnection(Connection connection) {
+    try {
+      connection.close();
+    } catch (SQLException ex) {
+      throw new CannotGetJdbcConnectionException("Failed to close JDBC Connection");
     }
+  }
 }