diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/openapi/OpenApiController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/openapi/OpenApiController.java index 12430023..04c1afc1 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/openapi/OpenApiController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/openapi/OpenApiController.java @@ -3,7 +3,7 @@ package com.xxl.job.admin.scheduler.openapi; import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; import com.xxl.job.core.constant.Const; import com.xxl.job.core.openapi.AdminBiz; -import com.xxl.job.core.openapi.model.HandleCallbackRequest; +import com.xxl.job.core.openapi.model.CallbackRequest; import com.xxl.job.core.openapi.model.RegistryRequest; import com.xxl.sso.core.annotation.XxlSso; import com.xxl.tool.core.StringTool; @@ -57,7 +57,7 @@ public class OpenApiController { try { switch (uri) { case "callback": { - List callbackParamList = GsonTool.fromJson(requestBody, List.class, HandleCallbackRequest.class); + List callbackParamList = GsonTool.fromJson(requestBody, List.class, CallbackRequest.class); return adminBiz.callback(callbackParamList); } case "registry": { diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobCompleteHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobCompleteHelper.java index d977435c..ae9a443e 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobCompleteHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/scheduler/thread/JobCompleteHelper.java @@ -3,7 +3,7 @@ package com.xxl.job.admin.scheduler.thread; import com.xxl.job.admin.model.XxlJobLog; import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; import com.xxl.job.admin.util.I18nUtil; -import com.xxl.job.core.openapi.model.HandleCallbackRequest; +import com.xxl.job.core.openapi.model.CallbackRequest; import com.xxl.job.core.context.XxlJobContext; import com.xxl.tool.core.DateTool; import com.xxl.tool.response.Response; @@ -20,7 +20,7 @@ import java.util.concurrent.*; * @author xuxueli 2015-9-1 18:05:56 */ public class JobCompleteHelper { - private static Logger logger = LoggerFactory.getLogger(JobCompleteHelper.class); + private static final Logger logger = LoggerFactory.getLogger(JobCompleteHelper.class); // ---------------------- monitor ---------------------- @@ -137,15 +137,15 @@ public class JobCompleteHelper { // ---------------------- helper ---------------------- - public Response callback(List callbackParamList) { + public Response callback(List callbackParamList) { callbackThreadPool.execute(new Runnable() { @Override public void run() { - for (HandleCallbackRequest handleCallbackParam: callbackParamList) { - Response callbackResult = doCallback(handleCallbackParam); - logger.debug(">>>>>>>>> JobApiController.callback {}, handleCallbackParam={}, callbackResult={}", - (callbackResult.isSuccess()?"success":"fail"), handleCallbackParam, callbackResult); + for (CallbackRequest callbackRequest: callbackParamList) { + Response callbackResult = doCallback(callbackRequest); + logger.debug(">>>>>>>>> JobApiController.callback {}, callbackRequest={}, callbackResult={}", + (callbackResult.isSuccess()?"success":"fail"), callbackRequest, callbackResult); } } }); @@ -153,7 +153,7 @@ public class JobCompleteHelper { return Response.ofSuccess(); } - private Response doCallback(HandleCallbackRequest handleCallbackParam) { + private Response doCallback(CallbackRequest handleCallbackParam) { // valid log item XxlJobLog log = XxlJobAdminBootstrap.getInstance().getXxlJobLogMapper().load(handleCallbackParam.getLogId()); if (log == null) { diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java index 7cfd3d60..5575edb5 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java @@ -2,7 +2,7 @@ package com.xxl.job.admin.service.impl; import com.xxl.job.admin.scheduler.config.XxlJobAdminBootstrap; import com.xxl.job.core.openapi.AdminBiz; -import com.xxl.job.core.openapi.model.HandleCallbackRequest; +import com.xxl.job.core.openapi.model.CallbackRequest; import com.xxl.job.core.openapi.model.RegistryRequest; import com.xxl.tool.response.Response; import org.springframework.stereotype.Service; @@ -16,8 +16,8 @@ import java.util.List; public class AdminBizImpl implements AdminBiz { @Override - public Response callback(List handleCallbackRequestList) { - return XxlJobAdminBootstrap.getInstance().getJobCompleteHelper().callback(handleCallbackRequestList); + public Response callback(List callbackRequestList) { + return XxlJobAdminBootstrap.getInstance().getJobCompleteHelper().callback(callbackRequestList); } @Override diff --git a/xxl-job-admin/src/test/java/com/xxl/job/openapi/AdminBizTest.java b/xxl-job-admin/src/test/java/com/xxl/job/openapi/AdminBizTest.java index 8df54297..a21b5cb3 100644 --- a/xxl-job-admin/src/test/java/com/xxl/job/openapi/AdminBizTest.java +++ b/xxl-job-admin/src/test/java/com/xxl/job/openapi/AdminBizTest.java @@ -2,7 +2,7 @@ package com.xxl.job.openapi; import com.xxl.job.core.constant.RegistType; import com.xxl.job.core.openapi.AdminBiz; -import com.xxl.job.core.openapi.model.HandleCallbackRequest; +import com.xxl.job.core.openapi.model.CallbackRequest; import com.xxl.job.core.openapi.model.RegistryRequest; import com.xxl.job.core.context.XxlJobContext; import com.xxl.job.core.constant.Const; @@ -42,11 +42,11 @@ public class AdminBizTest { public void callback() throws Exception { AdminBiz adminBiz = buildClient(); - HandleCallbackRequest param = new HandleCallbackRequest(); + CallbackRequest param = new CallbackRequest(); param.setLogId(1); param.setHandleCode(XxlJobContext.HANDLE_CODE_SUCCESS); - List callbackParamList = Arrays.asList(param); + List callbackParamList = Arrays.asList(param); Response returnT = adminBiz.callback(callbackParamList); assertTrue(returnT.isSuccess()); diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/AdminBiz.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/AdminBiz.java index 529cb94b..11cd42e5 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/AdminBiz.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/AdminBiz.java @@ -1,6 +1,6 @@ package com.xxl.job.core.openapi; -import com.xxl.job.core.openapi.model.HandleCallbackRequest; +import com.xxl.job.core.openapi.model.CallbackRequest; import com.xxl.job.core.openapi.model.RegistryRequest; import com.xxl.tool.response.Response; @@ -17,10 +17,10 @@ public interface AdminBiz { /** * callback * - * @param handleCallbackRequestList + * @param callbackRequestList * @return */ - public Response callback(List handleCallbackRequestList); + public Response callback(List callbackRequestList); // ---------------------- registry ---------------------- diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/HandleCallbackRequest.java b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/CallbackRequest.java similarity index 87% rename from xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/HandleCallbackRequest.java rename to xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/CallbackRequest.java index 3202535d..bb739e57 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/HandleCallbackRequest.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/openapi/model/CallbackRequest.java @@ -5,7 +5,7 @@ import java.io.Serializable; /** * Created by xuxueli on 17/3/2. */ -public class HandleCallbackRequest implements Serializable { +public class CallbackRequest implements Serializable { private static final long serialVersionUID = 42L; private long logId; @@ -14,8 +14,8 @@ public class HandleCallbackRequest implements Serializable { private int handleCode; private String handleMsg; - public HandleCallbackRequest(){} - public HandleCallbackRequest(long logId, long logDateTim, int handleCode, String handleMsg) { + public CallbackRequest(){} + public CallbackRequest(long logId, long logDateTim, int handleCode, String handleMsg) { this.logId = logId; this.logDateTim = logDateTim; this.handleCode = handleCode; diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java b/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java index 93e098a7..9000f40c 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java @@ -1,6 +1,6 @@ package com.xxl.job.core.thread; -import com.xxl.job.core.openapi.model.HandleCallbackRequest; +import com.xxl.job.core.openapi.model.CallbackRequest; import com.xxl.job.core.openapi.model.TriggerRequest; import com.xxl.job.core.context.XxlJobContext; import com.xxl.job.core.context.XxlJobHelper; @@ -201,7 +201,7 @@ public class JobThread extends Thread{ // callback handler info if (!toStop) { // common - TriggerCallbackThread.pushCallBack(new HandleCallbackRequest( + TriggerCallbackThread.pushCallBack(new CallbackRequest( triggerParam.getLogId(), triggerParam.getLogDateTime(), XxlJobContext.getXxlJobContext().getHandleCode(), @@ -209,7 +209,7 @@ public class JobThread extends Thread{ ); } else { // is killed - TriggerCallbackThread.pushCallBack(new HandleCallbackRequest( + TriggerCallbackThread.pushCallBack(new CallbackRequest( triggerParam.getLogId(), triggerParam.getLogDateTime(), XxlJobContext.HANDLE_CODE_FAIL, @@ -225,7 +225,7 @@ public class JobThread extends Thread{ TriggerRequest triggerParam = triggerQueue.poll(); if (triggerParam!=null) { // is killed - TriggerCallbackThread.pushCallBack(new HandleCallbackRequest( + TriggerCallbackThread.pushCallBack(new CallbackRequest( triggerParam.getLogId(), triggerParam.getLogDateTime(), XxlJobContext.HANDLE_CODE_FAIL, diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java b/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java index 9234a32b..4252dbed 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java @@ -1,7 +1,7 @@ package com.xxl.job.core.thread; import com.xxl.job.core.openapi.AdminBiz; -import com.xxl.job.core.openapi.model.HandleCallbackRequest; +import com.xxl.job.core.openapi.model.CallbackRequest; import com.xxl.job.core.context.XxlJobContext; import com.xxl.job.core.context.XxlJobHelper; import com.xxl.job.core.constant.Const; @@ -41,8 +41,8 @@ public class TriggerCallbackThread { /** * job results callback queue */ - private final LinkedBlockingQueue callBackQueue = new LinkedBlockingQueue<>(); - public static void pushCallBack(HandleCallbackRequest callback){ + private final LinkedBlockingQueue callBackQueue = new LinkedBlockingQueue<>(); + public static void pushCallBack(CallbackRequest callback){ getInstance().callBackQueue.add(callback); logger.debug(">>>>>>>>>>> xxl-job, push callback request, logId:{}", callback.getLogId()); } @@ -72,11 +72,11 @@ public class TriggerCallbackThread { // normal callback while(!toStop){ try { - HandleCallbackRequest callback = getInstance().callBackQueue.take(); + CallbackRequest callback = getInstance().callBackQueue.take(); if (callback != null) { // collect callback data - List callbackParamList = new ArrayList<>(); + List callbackParamList = new ArrayList<>(); callbackParamList.add(callback); // add one element int drainToNum = getInstance().callBackQueue.drainTo(callbackParamList); // drainTo other all elements @@ -95,7 +95,7 @@ public class TriggerCallbackThread { // thead stop, callback lasttime try { // collect callback data - List callbackParamList = new ArrayList<>(); + List callbackParamList = new ArrayList<>(); int drainToNum = getInstance().callBackQueue.drainTo(callbackParamList); // do callback @@ -176,7 +176,7 @@ public class TriggerCallbackThread { * * @param callbackParamList callback param list */ - private void doCallback(List callbackParamList){ + private void doCallback(List callbackParamList){ boolean callbackRet = false; // callback, will retry if error for (AdminBiz adminBiz: XxlJobExecutor.getAdminBizList()) { @@ -201,8 +201,8 @@ public class TriggerCallbackThread { /** * callback log */ - private void callbackLog(List callbackParamList, String logContent){ - for (HandleCallbackRequest callbackParam: callbackParamList) { + private void callbackLog(List callbackParamList, String logContent){ + for (CallbackRequest callbackParam: callbackParamList) { String logFileName = XxlJobFileAppender.makeLogFileName(new Date(callbackParam.getLogDateTim()), callbackParam.getLogId()); XxlJobContext.setXxlJobContext(new XxlJobContext( -1, @@ -232,7 +232,7 @@ public class TriggerCallbackThread { * * @param callbackParamList callback param list */ - private void appendFailCallbackFile(List callbackParamList) { + private void appendFailCallbackFile(List callbackParamList) { // valid if (CollectionTool.isEmpty(callbackParamList)) { return; @@ -285,7 +285,7 @@ public class TriggerCallbackThread { } // parse callback param - List callbackParamList = GsonTool.fromJsonList(callbackData, HandleCallbackRequest.class); + List callbackParamList = GsonTool.fromJsonList(callbackData, CallbackRequest.class); FileTool.delete(callbackLogFile); // retry callback