diff --git a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java index 51fbff92..c158adb7 100644 --- a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java +++ b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java @@ -29,7 +29,7 @@ import java.util.List; */ @Service public class AdminBizImpl implements AdminBiz { - private static Logger logger = LoggerFactory.getLogger(AdminBizImpl.class); + private static final Logger logger = LoggerFactory.getLogger(AdminBizImpl.class); @Resource public XxlJobLogDao xxlJobLogDao; @@ -56,18 +56,18 @@ public class AdminBizImpl implements AdminBiz { // valid log item XxlJobLog log = xxlJobLogDao.load(handleCallbackParam.getLogId()); if (log == null) { - return new ReturnT(ReturnT.FAIL_CODE, "log item not found."); + return new ReturnT<>(ReturnT.FAIL_CODE, "log item not found."); } if (log.getHandleCode() > 0) { - return new ReturnT(ReturnT.FAIL_CODE, "log repeate callback."); // avoid repeat callback, trigger child job etc + return new ReturnT<>(ReturnT.FAIL_CODE, "log repeate callback."); // avoid repeat callback, trigger child job etc } // trigger success, to trigger child job - String callbackMsg = null; + StringBuilder callbackMsg = null; if (IJobHandler.SUCCESS.getCode() == handleCallbackParam.getExecuteResult().getCode()) { XxlJobInfo xxlJobInfo = xxlJobInfoDao.loadById(log.getJobId()); if (xxlJobInfo!=null && xxlJobInfo.getChildJobId()!=null && xxlJobInfo.getChildJobId().trim().length()>0) { - callbackMsg = "

>>>>>>>>>>>"+ I18nUtil.getString("jobconf_trigger_child_run") +"<<<<<<<<<<<
"; + callbackMsg = new StringBuilder("

>>>>>>>>>>>" + I18nUtil.getString("jobconf_trigger_child_run") + "<<<<<<<<<<<
"); String[] childJobIds = xxlJobInfo.getChildJobId().split(","); for (int i = 0; i < childJobIds.length; i++) { @@ -78,17 +78,17 @@ public class AdminBizImpl implements AdminBiz { ReturnT triggerChildResult = ReturnT.SUCCESS; // add msg - callbackMsg += MessageFormat.format(I18nUtil.getString("jobconf_callback_child_msg1"), - (i+1), + callbackMsg.append(MessageFormat.format(I18nUtil.getString("jobconf_callback_child_msg1"), + (i + 1), childJobIds.length, childJobIds[i], - (triggerChildResult.getCode()==ReturnT.SUCCESS_CODE?I18nUtil.getString("system_success"):I18nUtil.getString("system_fail")), - triggerChildResult.getMsg()); + (triggerChildResult.getCode() == ReturnT.SUCCESS_CODE ? I18nUtil.getString("system_success") : I18nUtil.getString("system_fail")), + triggerChildResult.getMsg())); } else { - callbackMsg += MessageFormat.format(I18nUtil.getString("jobconf_callback_child_msg2"), - (i+1), + callbackMsg.append(MessageFormat.format(I18nUtil.getString("jobconf_callback_child_msg2"), + (i + 1), childJobIds.length, - childJobIds[i]); + childJobIds[i])); } } @@ -96,7 +96,7 @@ public class AdminBizImpl implements AdminBiz { } // handle msg - StringBuffer handleMsg = new StringBuffer(); + StringBuilder handleMsg = new StringBuilder(); if (log.getHandleMsg()!=null) { handleMsg.append(log.getHandleMsg()).append("
"); } @@ -108,7 +108,7 @@ public class AdminBizImpl implements AdminBiz { } if (handleMsg.length() > 15000) { - handleMsg = new StringBuffer(handleMsg.substring(0, 15000)); // text最大64kb 避免长度过长 + handleMsg = new StringBuilder(handleMsg.substring(0, 15000)); // text最大64kb 避免长度过长 } // success, save log @@ -122,7 +122,7 @@ public class AdminBizImpl implements AdminBiz { private boolean isNumeric(String str){ try { - int result = Integer.valueOf(str); + Integer.valueOf(str); return true; } catch (NumberFormatException e) { return false; @@ -136,7 +136,7 @@ public class AdminBizImpl implements AdminBiz { if (!StringUtils.hasText(registryParam.getRegistryGroup()) || !StringUtils.hasText(registryParam.getRegistryKey()) || !StringUtils.hasText(registryParam.getRegistryValue())) { - return new ReturnT(ReturnT.FAIL_CODE, "Illegal Argument."); + return new ReturnT<>(ReturnT.FAIL_CODE, "Illegal Argument."); } int ret = xxlJobRegistryDao.registryUpdate(registryParam.getRegistryGroup(), registryParam.getRegistryKey(), registryParam.getRegistryValue(), new Date()); @@ -156,7 +156,7 @@ public class AdminBizImpl implements AdminBiz { if (!StringUtils.hasText(registryParam.getRegistryGroup()) || !StringUtils.hasText(registryParam.getRegistryKey()) || !StringUtils.hasText(registryParam.getRegistryValue())) { - return new ReturnT(ReturnT.FAIL_CODE, "Illegal Argument."); + return new ReturnT<>(ReturnT.FAIL_CODE, "Illegal Argument."); } int ret = xxlJobRegistryDao.registryDelete(registryParam.getRegistryGroup(), registryParam.getRegistryKey(), registryParam.getRegistryValue());