You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2018/09/17 01:47:05 UTC

[incubator-servicecomb-java-chassis] 02/02: [SCB-911]improve exception converters to support generic inheritance

This is an automated email from the ASF dual-hosted git repository.

liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git

commit 43d937ae296583c9a196755d533c05b16cca766d
Author: liubao <ba...@huawei.com>
AuthorDate: Fri Sep 14 15:21:42 2018 +0800

    [SCB-911]improve exception converters to support generic inheritance
---
 .../exception/ExceptionToResponseConverters.java   | 18 +++++--
 .../TestExceptionToResponseConverters.java         | 56 ++++++++++++++++++++--
 2 files changed, 66 insertions(+), 8 deletions(-)

diff --git a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/ExceptionToResponseConverters.java b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/ExceptionToResponseConverters.java
index 60706a9..997b75c 100644
--- a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/ExceptionToResponseConverters.java
+++ b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/ExceptionToResponseConverters.java
@@ -33,7 +33,9 @@ public class ExceptionToResponseConverters {
   public ExceptionToResponseConverters() {
     SPIServiceUtils.getSortedService(ExceptionToResponseConverter.class).forEach(converter -> {
       if (converter.getExceptionClass() == null) {
-        defaultConverter = converter;
+        if (defaultConverter == null) {
+          defaultConverter = converter;
+        }
         return;
       }
 
@@ -42,8 +44,18 @@ public class ExceptionToResponseConverters {
   }
 
   public Response convertExceptionToResponse(SwaggerInvocation swaggerInvocation, Throwable e) {
-    ExceptionToResponseConverter<Throwable> converter =
-        exceptionToResponseConverters.getOrDefault(e.getClass(), defaultConverter);
+    ExceptionToResponseConverter<Throwable> converter = null;
+    Class<?> clazz = e.getClass();
+    while (converter == null) {
+      converter = exceptionToResponseConverters.get(clazz);
+      if (clazz == Throwable.class) {
+        break;
+      }
+      clazz = clazz.getSuperclass();
+    }
+    if (converter == null) {
+      converter = defaultConverter;
+    }
     return converter.convert(swaggerInvocation, e);
   }
 }
diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestExceptionToResponseConverters.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestExceptionToResponseConverters.java
index 022ff8c..d2d6d6d 100644
--- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestExceptionToResponseConverters.java
+++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestExceptionToResponseConverters.java
@@ -16,8 +16,11 @@
  */
 package org.apache.servicecomb.swagger.invocation.exception;
 
+import java.io.IOException;
 import java.util.Arrays;
 
+import javax.ws.rs.core.Response.Status;
+
 import org.apache.servicecomb.foundation.common.utils.SPIServiceUtils;
 import org.apache.servicecomb.swagger.invocation.Response;
 import org.apache.servicecomb.swagger.invocation.SwaggerInvocation;
@@ -34,8 +37,7 @@ public class TestExceptionToResponseConverters {
       @Mocked Response r1,
       @Mocked ExceptionToResponseConverter c2,
       @Mocked Response r2,
-      @Mocked ExceptionToResponseConverter cDef,
-      @Mocked Response rDef) {
+      @Mocked ExceptionToResponseConverter cDef) {
     new Expectations(SPIServiceUtils.class) {
       {
         SPIServiceUtils.getSortedService(ExceptionToResponseConverter.class);
@@ -53,8 +55,6 @@ public class TestExceptionToResponseConverters {
 
         cDef.getExceptionClass();
         result = null;
-        cDef.convert((SwaggerInvocation) any, (Throwable) any);
-        result = rDef;
       }
     };
 
@@ -64,8 +64,54 @@ public class TestExceptionToResponseConverters {
         exceptionToResponseConverters.convertExceptionToResponse((SwaggerInvocation) null, new Throwable()));
     Assert.assertSame(r2,
         exceptionToResponseConverters.convertExceptionToResponse((SwaggerInvocation) null, new Exception()));
-    Assert.assertSame(rDef,
+    Assert.assertSame(r2,
         exceptionToResponseConverters.convertExceptionToResponse((SwaggerInvocation) null,
             new IllegalStateException()));
   }
+
+  @SuppressWarnings({"rawtypes", "unchecked"})
+  @Test
+  public void convertExceptionToResponse2(@Mocked ExceptionToResponseConverter c1,
+      @Mocked Response r1,
+      @Mocked ExceptionToResponseConverter c2,
+      @Mocked Response r2,
+      @Mocked ExceptionToResponseConverter cDef,
+      @Mocked Response rDef,
+      @Mocked ExceptionToResponseConverter cDef2) {
+    new Expectations(SPIServiceUtils.class) {
+      {
+        SPIServiceUtils.getSortedService(ExceptionToResponseConverter.class);
+        result = Arrays.asList(c1, c2, cDef, cDef2);
+
+        c1.getExceptionClass();
+        result = RuntimeException.class;
+        c1.convert((SwaggerInvocation) any, (Throwable) any);
+        result = r1;
+
+        c2.getExceptionClass();
+        result = InvocationException.class;
+        c2.convert((SwaggerInvocation) any, (Throwable) any);
+        result = r2;
+
+        cDef.getExceptionClass();
+        result = null;
+        cDef.convert((SwaggerInvocation) any, (Throwable) any);
+        result = rDef;
+
+        cDef2.getExceptionClass();
+        result = null;
+      }
+    };
+
+    ExceptionToResponseConverters exceptionToResponseConverters = new ExceptionToResponseConverters();
+
+    Assert.assertSame(r2,
+        exceptionToResponseConverters
+            .convertExceptionToResponse((SwaggerInvocation) null, new InvocationException(Status.UNAUTHORIZED, "")));
+    Assert.assertSame(r1,
+        exceptionToResponseConverters.convertExceptionToResponse((SwaggerInvocation) null, new RuntimeException()));
+    Assert.assertSame(rDef,
+        exceptionToResponseConverters.convertExceptionToResponse((SwaggerInvocation) null,
+            new IOException()));
+  }
 }