From b17b8b4456630e7fbd8dee9bc0bb17284c724025 Mon Sep 17 00:00:00 2001
From: Yiding He <yiding.he@gmail.com>
Date: Sun, 23 Dec 2018 23:52:49 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=B7=BB=E5=8A=A0=E5=8D=95=E5=85=83?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BE=9D=E8=B5=96=E5=85=B3=E7=B3=BB=EF=BC=9B?=
 =?UTF-8?q?2=E3=80=81=E6=B7=BB=E5=8A=A0=20RequestDataAop=20=E7=9A=84?=
 =?UTF-8?q?=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95=EF=BC=9B3=E3=80=81?=
 =?UTF-8?q?=E9=87=8D=E6=9E=84=20RequestDataAop=20=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roses/core/aop/RequestDataAop.java        | 18 ++---
 .../roses/core/aop/RequestDataAopTest.java    | 75 +++++++++++++++++++
 pom.xml                                       |  8 ++
 3 files changed, 88 insertions(+), 13 deletions(-)
 create mode 100644 kernel-core/src/test/java/cn/stylefeng/roses/core/aop/RequestDataAopTest.java

diff --git a/kernel-core/src/main/java/cn/stylefeng/roses/core/aop/RequestDataAop.java b/kernel-core/src/main/java/cn/stylefeng/roses/core/aop/RequestDataAop.java
index ae209cd..af7f7e9 100644
--- a/kernel-core/src/main/java/cn/stylefeng/roses/core/aop/RequestDataAop.java
+++ b/kernel-core/src/main/java/cn/stylefeng/roses/core/aop/RequestDataAop.java
@@ -50,18 +50,10 @@ public class RequestDataAop {
             }
         }
 
-        //是否需要删除ThreadLocal的标识，如果proceed()过程中有异常
-        //会执行ExceptionHandler，并在ExceptionHandler中清除ThreadLocal中的内容
-        boolean needToRemove = true;
-        try {
-            return point.proceed();
-        } catch (Throwable exception) {
-            needToRemove = false;
-            throw exception;
-        } finally {
-            if (needToRemove) {
-                RequestDataHolder.remove();
-            }
-        }
+        // 如果 joint 顺利执行，则清空 RequestDataHolder
+        Object result = point.proceed();
+        RequestDataHolder.remove();
+
+        return result;
     }
 }
diff --git a/kernel-core/src/test/java/cn/stylefeng/roses/core/aop/RequestDataAopTest.java b/kernel-core/src/test/java/cn/stylefeng/roses/core/aop/RequestDataAopTest.java
new file mode 100644
index 0000000..4f43add
--- /dev/null
+++ b/kernel-core/src/test/java/cn/stylefeng/roses/core/aop/RequestDataAopTest.java
@@ -0,0 +1,75 @@
+package cn.stylefeng.roses.core.aop;
+
+import cn.stylefeng.roses.core.context.RequestDataHolder;
+import cn.stylefeng.roses.core.reqres.request.RequestData;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.assertj.core.api.Assertions;
+import org.junit.Assert;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
+
+import static junit.framework.TestCase.assertSame;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.*;
+
+public class RequestDataAopTest {
+
+    @Test
+    public void testNoArgNoReturn() throws Throwable {
+        ProceedingJoinPoint joinPoint = mock(ProceedingJoinPoint.class);
+        when(joinPoint.getArgs()).thenReturn(new Object[0]);
+        when(joinPoint.proceed()).thenReturn(null);
+
+        RequestDataAop rda = new RequestDataAop();
+        Object result = rda.sessionKit(joinPoint);
+
+        assertThat(result).isNull();
+        assertThat(RequestDataHolder.get()).isNull();
+    }
+
+    @Test
+    public void testRequestDataArg() throws Throwable {
+        RequestData requestData = new RequestData();
+        ProceedingJoinPoint joinPoint = mock(ProceedingJoinPoint.class);
+        when(joinPoint.getArgs()).thenReturn(new Object[] {requestData});
+
+        when(joinPoint.proceed()).then(invocationOnMock -> {
+            assertSame(requestData, RequestDataHolder.get());  // 确认参数放到 RequestDataHolder 里面
+            return null;
+        });
+
+        RequestDataAop rda = new RequestDataAop();
+        Object result = rda.sessionKit(joinPoint);
+
+        assertThat(result).isNull();
+        assertThat(RequestDataHolder.get()).isNull(); // 确认参数清除了
+    }
+
+    @Test
+    public void testException() throws Throwable {
+        RequestData requestData = new RequestData();
+        ProceedingJoinPoint joinPoint = mock(ProceedingJoinPoint.class);
+        when(joinPoint.getArgs()).thenReturn(new Object[] {requestData});
+
+        Exception exception = new Exception();
+        when(joinPoint.proceed()).then(invocationOnMock -> {
+            assertSame(requestData, RequestDataHolder.get());  // 确认参数放到 RequestDataHolder 里面
+            throw exception;
+        });
+
+        RequestDataAop rda = new RequestDataAop();
+        Object result = null;
+
+        try {
+            result = rda.sessionKit(joinPoint);
+        } catch (Throwable throwable) {
+            assertSame(throwable, exception);
+        }
+
+        assertThat(result).isNull();
+        assertSame(requestData, RequestDataHolder.get()); // 确认参数没有清除
+    }
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index fd117cb..aa218d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,14 @@
         <lombok.versin>1.18.0</lombok.versin>
     </properties>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
     <dependencyManagement>
         <dependencies>
             <dependency>
-- 
Gitee