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

study/src/test/java/aop/stage0/Stage0Test.java

@@ -76,7 +76,7 @@ void testTransactionRollback() {
     private @NotNull Object createUserServiceProxy(AppUserService appUserService) {
         return Proxy.newProxyInstance(
                 getClass().getClassLoader(),
-                new Class[]{UserService.class},
+                new Class[]{UserService.class},  // JDK Dynamic Proxy는 인터페이스 기반 프록시만 생성 가능
                 new TransactionHandler(platformTransactionManager, appUserService)
         );
     }

study/src/test/java/aop/stage1/Stage1Test.java

@@ -1,5 +1,8 @@
 package aop.stage1;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 import aop.DataAccessException;
 import aop.StubUserHistoryDao;
 import aop.domain.User;
@@ -9,13 +12,11 @@
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.aop.framework.ProxyFactoryBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.transaction.PlatformTransactionManager;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 class Stage1Test {
 
@@ -33,15 +34,23 @@ class Stage1Test {
     @Autowired
     private PlatformTransactionManager platformTransactionManager;
 
+    private final ProxyFactoryBean proxyFactoryBean = new ProxyFactoryBean();
+
     @BeforeEach
     void setUp() {
         final var user = new User("gugu", "password", "hkkang@woowahan.com");
         userDao.insert(user);
+        proxyFactoryBean.setProxyTargetClass(true);
+        proxyFactoryBean.addAdvisor(new TransactionAdvisor(
+                new TransactionPointcut(),
+                new TransactionAdvice(platformTransactionManager)
+        ));
     }
 
     @Test
     void testChangePassword() {
-        final UserService userService = null;
+        proxyFactoryBean.setTarget(new UserService(userDao, userHistoryDao));
+        final UserService userService = (UserService) proxyFactoryBean.getObject();
 
         final var newPassword = "qqqqq";
         final var createBy = "gugu";
@@ -54,7 +63,8 @@ void testChangePassword() {
 
     @Test
     void testTransactionRollback() {
-        final UserService userService = null;
+        proxyFactoryBean.setTarget(new UserService(userDao, stubUserHistoryDao));
+        final UserService userService = (UserService) proxyFactoryBean.getObject();
 
         final var newPassword = "newPassword";
         final var createBy = "gugu";

study/src/test/java/aop/stage1/TransactionAdvice.java

@@ -1,15 +1,34 @@
 package aop.stage1;
 
+import aop.DataAccessException;
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.DefaultTransactionDefinition;
+
 
 /**
  * 어드바이스(advice). 부가기능을 담고 있는 클래스
  */
-public class TransactionAdvice  implements MethodInterceptor {
+public class TransactionAdvice implements MethodInterceptor {
+
+    private final PlatformTransactionManager platformTransactionManager;
+
+    public TransactionAdvice(PlatformTransactionManager platformTransactionManager) {
+        this.platformTransactionManager = platformTransactionManager;
+    }
 
     @Override
-    public Object invoke(final MethodInvocation invocation) throws Throwable {
-        return null;
+    public Object invoke(MethodInvocation invocation) throws Throwable {
+        TransactionStatus transactionStatus = platformTransactionManager.getTransaction(new DefaultTransactionDefinition());
+        try {
+            Object result = invocation.getMethod().invoke(invocation.getThis(), invocation.getArguments());
+            platformTransactionManager.commit(transactionStatus);
+            return result;
+        } catch (Throwable e) {
+            platformTransactionManager.rollback(transactionStatus);
+            throw new DataAccessException(e);
+        }
     }
 }

study/src/test/java/aop/stage1/TransactionAdvisor.java

@@ -1,23 +1,31 @@
 package aop.stage1;
 
 import org.aopalliance.aop.Advice;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.aop.Pointcut;
 import org.springframework.aop.PointcutAdvisor;
 
 /**
- * 어드바이저(advisor). 포인트컷과 어드바이스를 하나씩 갖고 있는 객체.
- * AOP의 애스팩트(aspect)에 해당되는 클래스다.
+ * 어드바이저(advisor). 포인트컷과 어드바이스를 하나씩 갖고 있는 객체. AOP의 애스팩트(aspect)에 해당되는 클래스다.
  */
 public class TransactionAdvisor implements PointcutAdvisor {
 
+    private final Pointcut pointcut;
+    private final Advice advice;
+
+    public TransactionAdvisor(Pointcut pointcut, Advice advice) {
+        this.pointcut = pointcut;
+        this.advice = advice;
+    }
+
     @Override
-    public Pointcut getPointcut() {
-        return null;
+    public @NotNull Pointcut getPointcut() {
+        return pointcut;
     }
 
     @Override
-    public Advice getAdvice() {
-        return null;
+    public @NotNull Advice getAdvice() {
+        return advice;
     }
 
     @Override

study/src/test/java/aop/stage1/TransactionPointcut.java

@@ -1,5 +1,6 @@
 package aop.stage1;
 
+import aop.Transactional;
 import org.springframework.aop.support.StaticMethodMatcherPointcut;
 
 import java.lang.reflect.Method;
@@ -14,6 +15,6 @@ public class TransactionPointcut extends StaticMethodMatcherPointcut {
 
     @Override
     public boolean matches(final Method method, final Class<?> targetClass) {
-        return false;
+        return method.isAnnotationPresent(Transactional.class);
     }
 }