[JDBC 4단계] 민트(유재민) 미션 제출합니다.

README.md

@@ -46,4 +46,7 @@
 - [x] 공유자원 Singleton vs static
 - [x] JdbcTemplate 테스트 작성
 - [x] JdbcTemplate의 executeQuery 중복 제거
-- [x] TransactionTemplate catch 절 final
+- [x] TransactionTemplate catch 절 final
+
+### 3차
+- [x] EOF 해결(TransactionTemplateTest, PreparedStatementCreatorTest)

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

@@ -1,6 +1,8 @@
 package com.techcourse.dao;
 
 import com.techcourse.domain.User;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 
@@ -18,6 +20,8 @@ public class UserDao {
         return new User(id, account, password, email);
     };
 
+    private static final Logger log = LoggerFactory.getLogger(UserDao.class);
+
     private final JdbcTemplate jdbcTemplate;
 
     public UserDao(final DataSource dataSource) {

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

@@ -0,0 +1,34 @@
+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)
+                .orElseThrow(() -> new IllegalArgumentException("유저가 존재하지 않습니다."));
+    }
+
+    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,40 @@
+package com.techcourse.service;
+
+import com.techcourse.config.DataSourceConfig;
+import com.techcourse.domain.User;
+import org.springframework.transaction.support.TransactionTemplate;
+
+import javax.sql.DataSource;
+
+public class TxUserService implements UserService {
+
+    private final UserService userService;
+    private final TransactionTemplate transactionTemplate;
+
+    public TxUserService(final UserService userService) {
+        this.userService = userService;
+        final DataSource dataSource = DataSourceConfig.getInstance();
+        this.transactionTemplate = new TransactionTemplate(dataSource);
+    }
+
+    @Override
+    public User findById(final long id) {
+        return transactionTemplate.executeWithTransaction(() -> userService.findById(id));
+    }
+
+    @Override
+    public void insert(final User user) {
+        transactionTemplate.executeWithTransaction(() -> {
+            userService.insert(user);
+            return null;
+        });
+    }
+
+    @Override
+    public void changePassword(final long id, final String newPassword, final String createBy) {
+        transactionTemplate.executeWithTransaction(() -> {
+            userService.changePassword(id, newPassword, createBy);
+            return null;
+        });
+    }
+}

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

@@ -1,42 +1,10 @@
 package com.techcourse.service;
 
-import com.techcourse.config.DataSourceConfig;
-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.TransactionTemplate;
 
-import javax.sql.DataSource;
+public interface UserService {
 
-public class UserService {
-
-    private final UserDao userDao;
-    private final UserHistoryDao userHistoryDao;
-    private final TransactionTemplate transactionTemplate;
-
-    public UserService(final UserDao userDao, final UserHistoryDao userHistoryDao) {
-        this.userDao = userDao;
-        this.userHistoryDao = userHistoryDao;
-        final DataSource dataSource = DataSourceConfig.getInstance();
-        this.transactionTemplate = new TransactionTemplate(dataSource);
-    }
-
-    public User findById(final long id) {
-        return userDao.findById(id)
-                .orElseThrow(() -> new IllegalArgumentException("유저가 존재하지 않습니다."));
-    }
-
-    public void insert(final User user) {
-        userDao.insert(user);
-    }
-
-    public void changePassword(final long id, final String newPassword, final String createBy) {
-        transactionTemplate.executeWithTransaction(() -> {
-            final var user = findById(id);
-            user.changePassword(newPassword);
-            userDao.update(user);
-            userHistoryDao.log(new UserHistory(user, createBy));
-        });
-    }
+    User findById(final long id);
+    void insert(final User user);
+    void changePassword(final long id, final String newPassword, final String createBy);
 }

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

@@ -32,7 +32,7 @@ void setUp() {
     @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";
@@ -47,7 +47,10 @@ 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 var userService = new TxUserService(appUserService);
 
         final User user = userDao.findById(1L).get();
         final var oldPassword = user.getPassword();

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

@@ -2,7 +2,8 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.transaction.support.TransactionContext;
+import org.springframework.jdbc.datasource.DataSourceUtils;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
@@ -19,10 +20,10 @@ public ConnectionManager(final DataSource dataSource) {
     }
 
     public Connection getConnection() {
-        if (TransactionContext.isEmpty()) {
-            return getNewConnection();
+        if (TransactionSynchronizationManager.hasResource(dataSource)) {
+            return TransactionSynchronizationManager.getResource(dataSource);
         }
-        return TransactionContext.get();
+        return getNewConnection();
     }
 
     private Connection getNewConnection() {
@@ -38,22 +39,14 @@ public void closeNotTransactional(Connection connection) {
         if (isTransactional(connection)) {
             return;
         }
-        close(connection);
+        DataSourceUtils.releaseConnection(connection);
     }
 
     private boolean isTransactional(final Connection connection) {
-        if (TransactionContext.isEmpty()) {
-            return false;
+        if (TransactionSynchronizationManager.hasResource(dataSource)) {
+            return TransactionSynchronizationManager.getResource(dataSource) == connection;
         }
-        return TransactionContext.get() == (connection);
+        return false;
     }
 
-    private void close(final Connection connection) {
-        try {
-            connection.close();
-        } catch (SQLException e) {
-            log.error(e.getMessage(), e);
-            throw new RuntimeException(e);
-        }
-    }
 }

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

@@ -13,21 +13,20 @@ public abstract class DataSourceUtils {
     private DataSourceUtils() {}
 
     public static Connection getConnection(DataSource dataSource) throws CannotGetJdbcConnectionException {
-        Connection connection = TransactionSynchronizationManager.getResource(dataSource);
-        if (connection != null) {
-            return connection;
+        if (TransactionSynchronizationManager.hasResource(dataSource)) {
+            return TransactionSynchronizationManager.getResource(dataSource);
         }
 
         try {
-            connection = dataSource.getConnection();
+            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) {
+    public static void releaseConnection(Connection connection) {
         try {
             connection.close();
         } catch (SQLException ex) {

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

@@ -0,0 +1,13 @@
+package org.springframework.transaction.support;
+
+import javax.annotation.Nonnull;
+import javax.annotation.meta.TypeQualifierNickname;
+import javax.annotation.meta.When;
+import java.lang.annotation.*;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Nonnull(when = When.MAYBE)
+@TypeQualifierNickname
+public @interface Nullable {
+}

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

@@ -1,7 +1,8 @@
 package org.springframework.transaction.support;
 
 @FunctionalInterface
-public interface TransactionCallback {
+public interface TransactionCallback<T> {
 
-    void execute();
+    @Nullable
+    T execute();
 }

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

@@ -2,22 +2,28 @@
 
 import javax.sql.DataSource;
 import java.sql.Connection;
+import java.util.HashMap;
 import java.util.Map;
 
 public abstract class TransactionSynchronizationManager {
 
-    private static final ThreadLocal<Map<DataSource, Connection>> resources = new ThreadLocal<>();
+    private static final ThreadLocal<Map<DataSource, Connection>> resources = ThreadLocal.withInitial(HashMap::new);
 
     private TransactionSynchronizationManager() {}
 
     public static Connection getResource(DataSource key) {
-        return null;
+        return resources.get().get(key);
     }
 
     public static void bindResource(DataSource key, Connection value) {
+        resources.get().put(key, value);
     }
 
-    public static Connection unbindResource(DataSource key) {
-        return null;
+    public static void unbindResource(DataSource key) {
+        resources.get().remove(key);
+    }
+
+    public static boolean hasResource(DataSource dataSource) {
+        return resources.get().containsKey(dataSource);
     }
 }

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

@@ -3,6 +3,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.exception.UndeclaredThrowableException;
+import org.springframework.jdbc.datasource.DataSourceUtils;
 
 import javax.sql.DataSource;
 import java.sql.Connection;
@@ -18,14 +19,15 @@ public TransactionTemplate(final DataSource dataSource) {
         this.dataSource = dataSource;
     }
 
-    public void executeWithTransaction(final TransactionCallback transactionCallback) {
+    @Nullable
+    public <T> T executeWithTransaction(final TransactionCallback<T> transactionCallback) {
         Connection connection = null;
         try {
-            connection = dataSource.getConnection();
-            TransactionContext.set(connection);
+            connection = DataSourceUtils.getConnection(dataSource);
             connection.setAutoCommit(false);
-            transactionCallback.execute();
+            final T result = transactionCallback.execute();
             connection.commit();
+            return result;
         } catch (final RuntimeException e) {
             if (connection != null) {
                 rollback(connection);
@@ -37,13 +39,9 @@ public void executeWithTransaction(final TransactionCallback transactionCallback
             }
             throw new UndeclaredThrowableException(e);
         } finally {
-            TransactionContext.remove();
-            try {
-                if (connection != null) {
-                    connection.close();
-                }
-            } catch (final SQLException e) {
-                throw new RuntimeException(e);
+            TransactionSynchronizationManager.unbindResource(dataSource);
+            if (connection != null) {
+                DataSourceUtils.releaseConnection(connection);
             }
         }
     }

jdbc/src/test/java/org/springframework/jdbc/core/PreparedStatementCreatorTest.java

@@ -45,4 +45,4 @@ void createPreparedStatement() throws SQLException {
                 () -> assertThat(parameterMetaData.getParameterClassName(2)).contains("Integer")
         );
     }
-}
+}