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

benjobs pushed a commit to branch dev-2.1.3
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git


The following commit(s) were added to refs/heads/dev-2.1.3 by this push:
     new 8ef36cb44 [Improve] job failure alarm improvement
8ef36cb44 is described below

commit 8ef36cb44f2cc2c2638bd68bd8907ba14f9c6eb9
Author: benjobs <[email protected]>
AuthorDate: Tue Feb 6 16:23:56 2024 +0800

    [Improve] job failure alarm improvement
---
 .../java/org/apache/streampark/console/base/util/CommonUtils.java     | 4 ++--
 .../core/service/alert/impl/DingTalkAlertNotifyServiceImpl.java       | 2 +-
 .../streampark/console/core/service/impl/ExternalLinkServiceImpl.java | 2 +-
 .../org/apache/streampark/console/core/task/FlinkAppHttpWatcher.java  | 1 -
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/CommonUtils.java
 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/CommonUtils.java
index 5b80ba623..9083e1580 100644
--- 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/CommonUtils.java
+++ 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/base/util/CommonUtils.java
@@ -587,7 +587,7 @@ public final class CommonUtils implements Serializable {
    */
   public static <T> List<Map<String, Object>> objectsToMaps(List<T> objList) {
     List<Map<String, Object>> list = new ArrayList<>();
-    if (objList != null && objList.size() > 0) {
+    if (objList != null && !objList.isEmpty()) {
       Map<String, Object> map = null;
       T bean = null;
       for (T t : objList) {
@@ -611,7 +611,7 @@ public final class CommonUtils implements Serializable {
   public static <T> List<T> mapsToObjects(List<Map<String, Object>> maps, 
Class<T> clazz)
       throws InstantiationException, IllegalAccessException {
     List<T> list = new ArrayList<>();
-    if (maps != null && maps.size() > 0) {
+    if (maps != null && !maps.isEmpty()) {
       Map<String, Object> map;
       T bean;
       for (Map<String, Object> stringObjectMap : maps) {
diff --git 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/DingTalkAlertNotifyServiceImpl.java
 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/DingTalkAlertNotifyServiceImpl.java
index 298ee29aa..e7c0452e1 100644
--- 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/DingTalkAlertNotifyServiceImpl.java
+++ 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/alert/impl/DingTalkAlertNotifyServiceImpl.java
@@ -81,7 +81,7 @@ public class DingTalkAlertNotifyServiceImpl implements 
AlertNotifyService {
         Collections.addAll(contactList, contacts.split(","));
       }
       String title = alertTemplate.getTitle();
-      if (contactList.size() > 0) {
+      if (!contactList.isEmpty()) {
         StringJoiner joiner = new StringJoiner(",@", title + " @", "");
         contactList.forEach(joiner::add);
         title = joiner.toString();
diff --git 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ExternalLinkServiceImpl.java
 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ExternalLinkServiceImpl.java
index 41015e544..532d20f12 100644
--- 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ExternalLinkServiceImpl.java
+++ 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ExternalLinkServiceImpl.java
@@ -76,7 +76,7 @@ public class ExternalLinkServiceImpl extends 
ServiceImpl<ExternalLinkMapper, Ext
     Application app = applicationService.getById(appId);
     Utils.notNull(app, "Application doesn't exist");
     List<ExternalLink> externalLink = this.list();
-    if (externalLink != null && externalLink.size() > 0) {
+    if (externalLink != null && !externalLink.isEmpty()) {
       // Render the placeholder
       externalLink.forEach(link -> this.renderLinkUrl(link, app));
     }
diff --git 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkAppHttpWatcher.java
 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkAppHttpWatcher.java
index 9f406e655..cd5e46a68 100644
--- 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkAppHttpWatcher.java
+++ 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/task/FlinkAppHttpWatcher.java
@@ -232,7 +232,6 @@ public class FlinkAppHttpWatcher {
         if (StopFrom.NONE.equals(stopFrom)) {
           savePointService.expire(application.getId());
           application.setState(FlinkAppState.LOST.getValue());
-          alertService.alert(application, FlinkAppState.LOST);
         } else {
           application.setState(FlinkAppState.CANCELED.getValue());
         }

Reply via email to