Merge branch '3.5.x'

Author: CodeCasterX

framework/fel/java/services/tool-service/src/test/java/modelengine/fel/tool/support/HttpToolTest.java

@@ -71,7 +71,9 @@ static void setupAll() {
 
     @AfterAll
     static void teardownAll() {
+        System.out.println("Test runtime will be stop.");
         TestFitRuntime.INSTANCE.stop();
+        System.out.println("Test runtime has been stopped.");
     }
 
     private static Tool.Info readToolInfo(String fileName) {
@@ -132,11 +134,13 @@ void shouldReturnMap() {
 
         Address address = Address.create("jiangsu", "suzhou", 3205);
         Education education = Education.create("QUST", "UCAS");
+        System.out.println("Test shouldReturnMap, before execute tool");
         Map<String, Object> result = cast(tool.execute("Alice",
                 26,
                 address,
                 education,
                 Stream.of("0123-4567-8888", "0123-4567-9999").collect(Collectors.toList())));
+        System.out.println("Test shouldReturnMap, after execute tool");
         Map<String, Object> addressResult = cast(result.get("address"));
         Map<String, Object> educationResult = cast(result.get("education"));
         List<String> phoneNumbers = cast(result.get("phoneNumbers"));
@@ -156,7 +160,9 @@ void shouldReturnString() {
         Tool.Info info = readToolInfo("string.json");
         Tool tool = createTool(info);
 
+        System.out.println("Test shouldReturnString, before execute tool");
         String result = cast(tool.execute(Stream.of("abc", "def", "ghi").collect(Collectors.toList())));
+        System.out.println("Test shouldReturnString, after execute tool");
         assertThat(result).isEqualTo("abc,def,ghi");
     }
 
@@ -166,7 +172,9 @@ void shouldReturnInteger() {
         Tool.Info info = readToolInfo("integer.json");
         Tool tool = createTool(info);
 
+        System.out.println("Test shouldReturnInteger, before execute tool");
         Integer result = cast(tool.execute(Stream.of(1, 2, 3).collect(Collectors.toList())));
+        System.out.println("Test shouldReturnInteger, after execute tool");
         assertThat(result).isEqualTo(6);
     }
 
@@ -176,7 +184,9 @@ void shouldReturnNull() {
         Tool.Info info = readToolInfo("void.json");
         Tool tool = createTool(info);
 
+        System.out.println("Test shouldReturnNull, before execute tool");
         Object result = tool.execute();
+        System.out.println("Test shouldReturnNull, after execute tool");
         assertThat(result).isEqualTo(null);
     }
 
@@ -186,7 +196,9 @@ void BasicShouldReturnOk() {
         Tool.Info info = readToolInfo("basic-auth.json");
         Tool tool = createTool(info);
 
+        System.out.println("Test BasicShouldReturnOk, before execute tool");
         boolean result = cast(tool.execute("{\"name\":\"testuser\", \"pwd\":\"testpass\"}"));
+        System.out.println("Test BasicShouldReturnOk, after execute tool");
         assertThat(result).isEqualTo(true);
     }
 
@@ -196,7 +208,9 @@ void ApiKeyShouldReturnOk() {
         Tool.Info info = readToolInfo("api-key-auth.json");
         Tool tool = createTool(info);
 
+        System.out.println("Test ApiKeyShouldReturnOk, before execute tool");
         boolean result = cast(tool.execute("{\"name\":\"ApiKey\", \"pwd\":\"ApiKeyValue\"}"));
+        System.out.println("Test ApiKeyShouldReturnOk, after execute tool");
         assertThat(result).isEqualTo(true);
     }
 
@@ -206,7 +220,9 @@ void ApiKeyQueryShouldReturnOk() {
         Tool.Info info = readToolInfo("api-key-query-auth.json");
         Tool tool = createTool(info);
 
+        System.out.println("Test ApiKeyQueryShouldReturnOk, before execute tool");
         boolean result = cast(tool.execute("{\"name\":\"ApiKey\", \"pwd\":\"ApiKeyValue\"}"));
+        System.out.println("Test ApiKeyQueryShouldReturnOk, after execute tool");
         assertThat(result).isEqualTo(true);
     }
 
@@ -216,7 +232,9 @@ void BearerShouldReturnOk() {
         Tool.Info info = readToolInfo("bearer-auth.json");
         Tool tool = createTool(info);
 
+        System.out.println("Test BearerShouldReturnOk, before execute tool");
         boolean result = cast(tool.execute("{\"name\":\"test666666666\", \"pwd\":\"invalid\"}"));
+        System.out.println("Test BearerShouldReturnOk, after execute tool");
         assertThat(result).isEqualTo(true);
     }
 }

framework/fit/java/fit-util/src/main/java/modelengine/fitframework/util/ExceptionUtils.java

@@ -55,7 +55,7 @@ public static Throwable getActualCause(MethodInvocationException exception) {
     /**
      * 获取异常的原因。
      *
-     * @param throwable 表示指定异常的 {@link Exception}。
+     * @param throwable 表示指定异常的 {@link Throwable}。
      * @return 表示异常原因的 {@link String}。
      */
     public static String getReason(Throwable throwable) {
@@ -64,4 +64,23 @@ public static String getReason(Throwable throwable) {
         }
         return throwable.getClass().getSimpleName() + ": " + throwable.getMessage();
     }
+
+    /**
+     * 获取从异常链中找出第一个非空的异常消息。
+     *
+     * @param throwable 表示指定异常的 {@link Throwable}。
+     * @return 表示异常原因的 {@link String}。
+     */
+    public static String getActualMessage(Throwable throwable) {
+        Set<Throwable> visited = new HashSet<>();
+        while (throwable != null && !visited.contains(throwable)) {
+            visited.add(throwable);
+            String message = throwable.getMessage();
+            if (StringUtils.isNotBlank(message)) {
+                return message;
+            }
+            throwable = throwable.getCause();
+        }
+        return null;
+    }
 }

framework/fit/java/fit-util/src/test/java/modelengine/fitframework/util/ExceptionUtilsTest.java

@@ -106,4 +106,43 @@ void givenExceptionCauseHasAnotherTypeCauseThenGetItsDescendantsCause() {
             assertThat(actualCause).isNotNull().hasMessage("error");
         }
     }
+
+    @Nested
+    @DisplayName("test getActualMessage(Throwable throwable)")
+    class WhenGetActualMessage {
+        @Test
+        @DisplayName("when throwable has non-blank message, return the message")
+        void givenThrowableWithMessageThenReturnMessage() {
+            Throwable throwable = new Exception("Error occurred");
+            String message = ExceptionUtils.getActualMessage(throwable);
+            assertThat(message).isEqualTo("Error occurred");
+        }
+
+        @Test
+        @DisplayName("when throwable chain has non-blank message in deep cause, return the first valid message")
+        void givenDeepThrowableChainThenReturnFirstValidMessage() {
+            Throwable cause = new Exception("Root cause");
+            Throwable throwable = new Exception(null, new Exception("   ", cause));
+            String message = ExceptionUtils.getActualMessage(throwable);
+            assertThat(message).isEqualTo("Root cause");
+        }
+
+        @Test
+        @DisplayName("when throwable chain has all blank messages, return null")
+        void givenAllBlankMessagesThenReturnNull() {
+            Throwable throwable = new Exception(null, new Exception("   "));
+            String message = ExceptionUtils.getActualMessage(throwable);
+            assertThat(message).isNull();
+        }
+
+        @Test
+        @DisplayName("when throwable chain has circular reference, return valid message")
+        void givenCircularReferenceThenReturnFirstValidMessage() {
+            Exception e1 = new Exception("e1");
+            Exception e2 = new Exception("e2", e1);
+            e1.initCause(e2);
+            assertThat(ExceptionUtils.getActualMessage(e1)).isEqualTo("e1");
+            assertThat(ExceptionUtils.getActualMessage(e2)).isEqualTo("e2");
+        }
+    }
 }