From 60ebd626db44160afc22c226afe8a5e7242d9b26 Mon Sep 17 00:00:00 2001 From: tianwenbo Date: Fri, 10 Mar 2023 15:59:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91=20CookieUtil.?= =?UTF-8?q?java=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xxl/job/admin/core/util/CookieUtil.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/core/util/CookieUtil.java b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/core/util/CookieUtil.java index a1523aa4..595e3f82 100644 --- a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/core/util/CookieUtil.java +++ b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/core/util/CookieUtil.java @@ -15,14 +15,17 @@ public class CookieUtil { private static final int COOKIE_MAX_AGE = Integer.MAX_VALUE; // 保存路径,根路径 private static final String COOKIE_PATH = "/"; - + + private CookieUtil() { + } + /** * 保存 * * @param response * @param key * @param value - * @param ifRemember + * @param ifRemember */ public static void set(HttpServletResponse response, String key, String value, boolean ifRemember) { int age = ifRemember?COOKIE_MAX_AGE:-1; @@ -47,7 +50,7 @@ public class CookieUtil { cookie.setHttpOnly(isHttpOnly); response.addCookie(cookie); } - + /** * 查询value * @@ -70,9 +73,9 @@ public class CookieUtil { * @param key */ private static Cookie get(HttpServletRequest request, String key) { - Cookie[] arr_cookie = request.getCookies(); - if (arr_cookie != null && arr_cookie.length > 0) { - for (Cookie cookie : arr_cookie) { + Cookie[] arrCookie = request.getCookies(); + if (arrCookie != null && arrCookie.length > 0) { + for (Cookie cookie : arrCookie) { if (cookie.getName().equals(key)) { return cookie; } @@ -80,7 +83,7 @@ public class CookieUtil { } return null; } - + /** * 删除Cookie * @@ -95,4 +98,4 @@ public class CookieUtil { } } -} \ No newline at end of file +} From 94d55a235905f49877970da2d40a59f654e7f11f Mon Sep 17 00:00:00 2001 From: tianwenbo Date: Fri, 10 Mar 2023 16:06:37 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91ExecutorRouteR?= =?UTF-8?q?ound.java=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/core/route/strategy/ExecutorRouteRound.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRound.java b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRound.java index 936ef0ed..d43183df 100644 --- a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRound.java +++ b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRound.java @@ -14,13 +14,13 @@ import java.util.concurrent.ConcurrentMap; */ public class ExecutorRouteRound extends ExecutorRouter { - private static ConcurrentMap routeCountEachJob = new ConcurrentHashMap(); - private static long CACHE_VALID_TIME = 0; + private static ConcurrentMap routeCountEachJob = new ConcurrentHashMap<>(); + private static long cacheValidTime = 0; private static int count(int jobId) { // cache clear - if (System.currentTimeMillis() > CACHE_VALID_TIME) { + if (System.currentTimeMillis() > cacheValidTime) { routeCountEachJob.clear(); - CACHE_VALID_TIME = System.currentTimeMillis() + 1000*60*60*24; + cacheValidTime = System.currentTimeMillis() + 1000*60*60*24; } // count++ @@ -33,7 +33,7 @@ public class ExecutorRouteRound extends ExecutorRouter { @Override public ReturnT route(TriggerParam triggerParam, List addressList) { String address = addressList.get(count(triggerParam.getJobId())%addressList.size()); - return new ReturnT(address); + return new ReturnT<>(address); } } From 46ce65166b5a2e793a509d6184b92fac9c74391f Mon Sep 17 00:00:00 2001 From: tianwenbo Date: Fri, 10 Mar 2023 16:08:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91=20XxlJobSched?= =?UTF-8?q?uler.java=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xxl/job/admin/core/scheduler/XxlJobScheduler.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/core/scheduler/XxlJobScheduler.java b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/core/scheduler/XxlJobScheduler.java index 6dc6b6c2..21df50db 100644 --- a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/core/scheduler/XxlJobScheduler.java +++ b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/core/scheduler/XxlJobScheduler.java @@ -20,7 +20,7 @@ public class XxlJobScheduler { private static final Logger logger = LoggerFactory.getLogger(XxlJobScheduler.class); - public void init() throws Exception { + public void init() { // init i18n initI18n(); @@ -45,8 +45,8 @@ public class XxlJobScheduler { logger.info(">>>>>>>>> init xxl-job admin success."); } - - public void destroy() throws Exception { + + public void destroy() { // stop-schedule JobScheduleHelper.getInstance().toStop(); @@ -77,8 +77,8 @@ public class XxlJobScheduler { } // ---------------------- executor-client ---------------------- - private static ConcurrentMap executorBizRepository = new ConcurrentHashMap(); - public static ExecutorBiz getExecutorBiz(String address) throws Exception { + private static ConcurrentMap executorBizRepository = new ConcurrentHashMap<>(); + public static ExecutorBiz getExecutorBiz(String address) { // valid if (address==null || address.trim().length()==0) { return null;