rpc 统一异常处理 & 服务调用范型改造

Silencesk · Silencesk · commit 8b53029b5f87 · 2020-12-16T07:50:11.000+08:00
diff --git a/07rpc/rpc01/pom.xml b/07rpc/rpc01/pom.xml
@@ -48,6 +48,11 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+		</dependency>
 	</dependencies>
 
 </project>
diff --git a/07rpc/rpc01/rpcfx-core/src/main/java/io/kimmking/rpcfx/api/RpcfxResolver.java b/07rpc/rpc01/rpcfx-core/src/main/java/io/kimmking/rpcfx/api/RpcfxResolver.java
@@ -2,6 +2,6 @@
 
 public interface RpcfxResolver {
 
-    Object resolve(String serviceClass);
+    <T> T resolve(String serviceClass);
 
 }
diff --git a/07rpc/rpc01/rpcfx-core/src/main/java/io/kimmking/rpcfx/common/BusinessException.java b/07rpc/rpc01/rpcfx-core/src/main/java/io/kimmking/rpcfx/common/BusinessException.java
@@ -0,0 +1,16 @@
+package io.kimmking.rpcfx.common;
+
+/**
+ * 业务异常
+ */
+public class BusinessException extends RuntimeException {
+    static final long serialVersionUID = 1352244900202885015L;
+
+    public BusinessException(String msg) {
+        super(msg);
+    }
+
+    public BusinessException(String msg, Throwable cause) {
+        super(msg, cause);
+    }
+}
diff --git a/07rpc/rpc01/rpcfx-core/src/main/java/io/kimmking/rpcfx/common/RpcfxException.java b/07rpc/rpc01/rpcfx-core/src/main/java/io/kimmking/rpcfx/common/RpcfxException.java
@@ -0,0 +1,28 @@
+package io.kimmking.rpcfx.common;
+
+/**
+ * 远程调用异常
+ */
+public class RpcfxException extends RuntimeException {
+
+    static final long serialVersionUID = -472231417416444970L;
+
+    /**
+     * This field holds the target if the
+     * InvocationTargetException(Throwable target) constructor was
+     * used to instantiate the object
+     *
+     * @serial
+     *
+     */
+    private Throwable target;
+
+    public RpcfxException(String msg) {
+        super(msg);
+    }
+
+    public RpcfxException(Throwable target, String msg) {
+        super(msg);
+        this.target = target;
+    }
+}
diff --git a/07rpc/rpc01/rpcfx-core/src/main/java/io/kimmking/rpcfx/server/RpcfxInvoker.java b/07rpc/rpc01/rpcfx-core/src/main/java/io/kimmking/rpcfx/server/RpcfxInvoker.java
@@ -5,16 +5,19 @@
 import io.kimmking.rpcfx.api.RpcfxRequest;
 import io.kimmking.rpcfx.api.RpcfxResolver;
 import io.kimmking.rpcfx.api.RpcfxResponse;
+import io.kimmking.rpcfx.common.RpcfxException;
+import lombok.extern.slf4j.Slf4j;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 
+@Slf4j
 public class RpcfxInvoker {
 
     private RpcfxResolver resolver;
 
-    public RpcfxInvoker(RpcfxResolver resolver){
+    public RpcfxInvoker(RpcfxResolver resolver) {
         this.resolver = resolver;
     }
 
@@ -23,6 +26,7 @@ public RpcfxResponse invoke(RpcfxRequest request) {
         String serviceClass = request.getServiceClass();
 
         // 作业1：改成泛型和反射
+        // TODO 处理beanException
         Object service = resolver.resolve(serviceClass);//this.applicationContext.getBean(serviceClass);
 
         try {
@@ -32,14 +36,21 @@ public RpcfxResponse invoke(RpcfxRequest request) {
             response.setResult(JSON.toJSONString(result, SerializerFeature.WriteClassName));
             response.setStatus(true);
             return response;
-        } catch ( IllegalAccessException | InvocationTargetException e) {
+        } catch (IllegalAccessException | InvocationTargetException e) {
 
             // 3.Xstream
 
             // 2.封装一个统一的RpcfxException
             // 客户端也需要判断异常
-            e.printStackTrace();
-            response.setException(e);
+            String msg = "invoke error: " + request.getServiceClass() + "." + request.getMethod();
+            log.error(msg, e);
+            RpcfxException rpcfxException;
+            if (e instanceof InvocationTargetException) {
+                rpcfxException = new RpcfxException(((InvocationTargetException)e).getTargetException(), msg);
+            } else {
+                rpcfxException = new RpcfxException(e, msg);
+            }
+            response.setException(rpcfxException);
             response.setStatus(false);
             return response;
         }
diff --git a/07rpc/rpc01/rpcfx-demo-provider/src/main/java/io/kimmking/rpcfx/demo/provider/DemoResolver.java b/07rpc/rpc01/rpcfx-demo-provider/src/main/java/io/kimmking/rpcfx/demo/provider/DemoResolver.java
@@ -1,6 +1,8 @@
 package io.kimmking.rpcfx.demo.provider;
 
 import io.kimmking.rpcfx.api.RpcfxResolver;
+import io.kimmking.rpcfx.common.BusinessException;
+import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 
@@ -14,7 +16,14 @@ public void setApplicationContext(ApplicationContext applicationContext) {
     }
 
     @Override
-    public Object resolve(String serviceClass) {
-        return this.applicationContext.getBean(serviceClass);
+    public <T> T resolve(String serviceClass) {
+        Class<T> clazz;
+        try {
+            clazz = (Class<T>) Class.forName(serviceClass);
+        } catch (ClassNotFoundException e) {
+            throw new BusinessException("illegalArgument of  serviceClass: " + serviceClass);
+        }
+
+        return this.applicationContext.getBean(clazz);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`
`3`	`3`	`public interface RpcfxResolver {`
`4`	`4`
`5`		`- Object resolve(String serviceClass);`
	`5`	`+ <T> T resolve(String serviceClass);`
`6`	`6`
`7`	`7`	`}`