From acc9fecc815d690ed51898905c815c1dfb25280e Mon Sep 17 00:00:00 2001 From: tianwenbo Date: Fri, 10 Mar 2023 16:34:23 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91=20JobRegistryMoni?= =?UTF-8?q?torHelper.java=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/thread/JobRegistryMonitorHelper.java | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java index 5c23237d..804f6774 100644 --- a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java +++ b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java @@ -25,9 +25,7 @@ public class JobRegistryMonitorHelper { private Thread registryThread; private volatile boolean toStop = false; public void start(){ - registryThread = new Thread(new Runnable() { - @Override - public void run() { + registryThread = new Thread(()-> { while (!toStop) { try { // auto registry group @@ -36,12 +34,12 @@ public class JobRegistryMonitorHelper { // remove dead address (admin/executor) List ids = XxlJobAdminConfig.getAdminConfig().getXxlJobRegistryDao().findDead(RegistryConfig.DEAD_TIMEOUT, new Date()); - if (ids!=null && ids.size()>0) { + if (ids!=null && !ids.isEmpty()) { XxlJobAdminConfig.getAdminConfig().getXxlJobRegistryDao().removeDead(ids); } // fresh online address (admin/executor) - HashMap> appAddressMap = new HashMap>(); + HashMap> appAddressMap = new HashMap<>(); List list = XxlJobAdminConfig.getAdminConfig().getXxlJobRegistryDao().findAll(RegistryConfig.DEAD_TIMEOUT, new Date()); if (list != null) { for (XxlJobRegistry item: list) { @@ -49,7 +47,7 @@ public class JobRegistryMonitorHelper { String appname = item.getRegistryKey(); List registryList = appAddressMap.get(appname); if (registryList == null) { - registryList = new ArrayList(); + registryList = new ArrayList<>(); } if (!registryList.contains(item.getRegistryValue())) { @@ -63,16 +61,16 @@ public class JobRegistryMonitorHelper { // fresh group address for (XxlJobGroup group: groupList) { List registryList = appAddressMap.get(group.getAppname()); - String addressListStr = null; + StringBuilder addressListStr = null; if (registryList!=null && !registryList.isEmpty()) { Collections.sort(registryList); - addressListStr = ""; + addressListStr = new StringBuilder(); for (String item:registryList) { - addressListStr += item + ","; + addressListStr.append(item).append(","); } - addressListStr = addressListStr.substring(0, addressListStr.length()-1); + addressListStr = new StringBuilder(addressListStr.substring(0, addressListStr.length() - 1)); } - group.setAddressList(addressListStr); + group.setAddressList(addressListStr.toString()); XxlJobAdminConfig.getAdminConfig().getXxlJobGroupDao().update(group); } } @@ -90,7 +88,6 @@ public class JobRegistryMonitorHelper { } } logger.info(">>>>>>>>>>> xxl-job, job registry monitor thread stop"); - } }); registryThread.setDaemon(true); registryThread.setName("xxl-job, admin JobRegistryMonitorHelper");