Support nested exception hierarchies without an abstract base class (#25

)
coveooss · Nov 6, 2023 · 1921507 · 1921507
1 parent c14c4f7
commit 1921507
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ The plugin is available on Maven Central :
     <dependency>
       <groupId>com.coveo</groupId>
       <artifactId>feign-error-decoder</artifactId>
-      <version>3.0.0</version>
+      <version>3.1.0</version>
     </dependency>
 ```
 

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.coveo</groupId>
     <artifactId>feign-error-decoder</artifactId>
-    <version>3.0.0</version>
+    <version>3.1.0</version>
     <packaging>jar</packaging>
 
     <name>Feign Reflection Error Decoder</name>

diff --git a/src/main/java/com/coveo/feign/ReflectionErrorDecoder.java b/src/main/java/com/coveo/feign/ReflectionErrorDecoder.java
@@ -173,7 +173,7 @@ private void processDeclaredThrownExceptions(Class<?>[] thrownExceptionsClasses)
       throws InstantiationException, IllegalAccessException, InvocationTargetException {
     for (Class<?> clazz : thrownExceptionsClasses) {
       if (baseExceptionClass.isAssignableFrom(clazz)) {
-        if (Modifier.isAbstract(clazz.getModifiers())) {
+        if (!classHierarchySupplier.getSubClasses(clazz, basePackage).isEmpty()) {
           extractExceptionInfoFromSubClasses(classHierarchySupplier, clazz);
         } else {
           extractExceptionInfo((Class<? extends S>) clazz);

diff --git a/src/test/java/com/coveo/feign/ReflectionErrorDecoderTest.java b/src/test/java/com/coveo/feign/ReflectionErrorDecoderTest.java
@@ -22,6 +22,8 @@
 
 import com.coveo.feign.ReflectionErrorDecoderTestClasses.AdditionalNotInterfacedRuntimeException;
 import com.coveo.feign.ReflectionErrorDecoderTestClasses.AdditionalRuntimeException;
+import com.coveo.feign.ReflectionErrorDecoderTestClasses.BaseNotAbstractException;
+import com.coveo.feign.ReflectionErrorDecoderTestClasses.ChildOfBaseNotAbstractException;
 import com.coveo.feign.ReflectionErrorDecoderTestClasses.ConcreteServiceException;
 import com.coveo.feign.ReflectionErrorDecoderTestClasses.ConcreteSubServiceException;
 import com.coveo.feign.ReflectionErrorDecoderTestClasses.ConcreteSubServiceExceptionWithoutInterface;
@@ -32,9 +34,11 @@
 import com.coveo.feign.ReflectionErrorDecoderTestClasses.ExceptionWithStringConstructorException;
 import com.coveo.feign.ReflectionErrorDecoderTestClasses.ExceptionWithThrowableConstructorException;
 import com.coveo.feign.ReflectionErrorDecoderTestClasses.ExceptionWithTwoStringsConstructorException;
+import com.coveo.feign.ReflectionErrorDecoderTestClasses.GrandChildOfBaseNotAbstractException;
 import com.coveo.feign.ReflectionErrorDecoderTestClasses.MultipleConstructorsException;
 import com.coveo.feign.ReflectionErrorDecoderTestClasses.MultipleConstructorsWithOnlyThrowableArgumentsException;
 import com.coveo.feign.ReflectionErrorDecoderTestClasses.TestApiClassWithDuplicateErrorCodeException;
+import com.coveo.feign.ReflectionErrorDecoderTestClasses.TestApiClassWithInheritedButNotAbstractExceptions;
 import com.coveo.feign.ReflectionErrorDecoderTestClasses.TestApiClassWithInheritedExceptions;
 import com.coveo.feign.ReflectionErrorDecoderTestClasses.TestApiClassWithNoErrorCodeServiceException;
 import com.coveo.feign.ReflectionErrorDecoderTestClasses.TestApiClassWithPlainExceptions;
@@ -139,6 +143,19 @@ public void testWithInheritedExceptions() throws Exception {
             ConcreteServiceException.ERROR_CODE, ConcreteSubServiceException.ERROR_CODE);
   }
 
+  @Test
+  public void testWithNotAbstractInheritedExceptions() throws Exception {
+    Map<String, ThrownExceptionDetails<ServiceException>> exceptionsThrown =
+        getExceptionsThrownMapFromErrorDecoder(
+            TestApiClassWithInheritedButNotAbstractExceptions.class);
+
+    assertThat(exceptionsThrown.keySet())
+        .containsExactly(
+            BaseNotAbstractException.ERROR_CODE,
+            ChildOfBaseNotAbstractException.ERROR_CODE,
+            GrandChildOfBaseNotAbstractException.ERROR_CODE);
+  }
+
   @Test
   public void testWithUnannotatedMethod() throws Exception {
     Map<String, ThrownExceptionDetails<ServiceException>> exceptionsThrown =

diff --git a/src/test/java/com/coveo/feign/ReflectionErrorDecoderTestClasses.java b/src/test/java/com/coveo/feign/ReflectionErrorDecoderTestClasses.java
@@ -111,6 +111,11 @@ public interface TestApiClassWithInheritedExceptions {
     void methodWithAbstractException() throws AbstractServiceException;
   }
 
+  public interface TestApiClassWithInheritedButNotAbstractExceptions {
+    @RequestLine("")
+    void methodWithInheritedNotAbstractException() throws BaseNotAbstractException;
+  }
+
   public interface TestApiClassWithDuplicateErrorCodeException {
     @RequestLine("")
     void methodWithDuplicateErrorCodeException()
@@ -349,4 +354,40 @@ public MultipleConstructorsWithOnlyThrowableArgumentsException(Throwable cause)
       super(ERROR_CODE, "", cause);
     }
   }
+
+  public static class BaseNotAbstractException extends ServiceException {
+    private static final long serialVersionUID = 1L;
+    public static final String ERROR_CODE = "ABSTRACT CONSIDERED HARMFUL";
+
+    public BaseNotAbstractException(Throwable e) {
+      super(ERROR_CODE, e);
+    }
+
+    protected BaseNotAbstractException(String errorCode, String message) {
+      super(errorCode, message);
+    }
+  }
+
+  public static class ChildOfBaseNotAbstractException extends BaseNotAbstractException {
+    private static final long serialVersionUID = 1L;
+    public static final String ERROR_CODE = "THIS IS PERFECTLY ACCEPTABLE";
+
+    public ChildOfBaseNotAbstractException(String message) {
+      super(ERROR_CODE, message);
+    }
+
+    protected ChildOfBaseNotAbstractException(String errorCode, String message) {
+      super(errorCode, message);
+    }
+  }
+
+  public static class GrandChildOfBaseNotAbstractException extends ChildOfBaseNotAbstractException {
+    private static final long serialVersionUID = 1L;
+    public static final String ERROR_CODE =
+        "THIS IS ARGUABLY A BAD PRACTICE BUT IT SHOULD STILL WORK";
+
+    public GrandChildOfBaseNotAbstractException(String message) {
+      super(ERROR_CODE, message);
+    }
+  }
 }