ReturnT 重构,简化代码结构,提升API易用性以及可维护性;

3.2.0-release
xuxueli 4 weeks ago
parent 3a97151cae
commit f51834df14

@ -199,7 +199,7 @@ public class JobGroupController {
@PermissionLimit(adminuser = true)
public ReturnT<XxlJobGroup> loadById(@RequestParam("id") int id){
XxlJobGroup jobGroup = xxlJobGroupDao.load(id);
return jobGroup!=null?new ReturnT<XxlJobGroup>(jobGroup):new ReturnT<XxlJobGroup>(ReturnT.FAIL_CODE, null);
return jobGroup!=null?ReturnT.ofSuccess(jobGroup):ReturnT.ofFail();
}
}

@ -157,7 +157,7 @@ public class JobInfoController {
logger.error("nextTriggerTime error. scheduleType = {}, scheduleConf= {}", scheduleType, scheduleConf, e);
return new ReturnT<List<String>>(ReturnT.FAIL_CODE, (I18nUtil.getString("schedule_type")+I18nUtil.getString("system_unvalid")) + e.getMessage());
}
return new ReturnT<List<String>>(result);
return ReturnT.ofSuccess(result);
}

@ -84,7 +84,7 @@ public class JobLogController {
@ResponseBody
public ReturnT<List<XxlJobInfo>> getJobsByGroup(@RequestParam("jobGroup") int jobGroup){
List<XxlJobInfo> list = xxlJobInfoDao.getJobsByGroup(jobGroup);
return new ReturnT<List<XxlJobInfo>>(list);
return ReturnT.ofSuccess(list);
}
@RequestMapping("/pageList")
@ -236,9 +236,9 @@ public class JobLogController {
log.setHandleMsg( I18nUtil.getString("joblog_kill_log_byman")+":" + (runResult.getMsg()!=null?runResult.getMsg():""));
log.setHandleTime(new Date());
XxlJobCompleter.updateHandleInfoAndFinish(log);
return new ReturnT<String>(runResult.getMsg());
return ReturnT.ofSuccess(runResult.getMsg());
} else {
return new ReturnT<String>(500, runResult.getMsg());
return ReturnT.ofFail(runResult.getMsg());
}
}

@ -79,7 +79,7 @@ public class ExecutorRouteConsistentHash extends ExecutorRouter {
@Override
public ReturnT<String> route(TriggerParam triggerParam, List<String> addressList) {
String address = hashJob(triggerParam.getJobId(), addressList);
return new ReturnT<String>(address);
return ReturnT.ofSuccess(address);
}
}

@ -13,7 +13,7 @@ public class ExecutorRouteFirst extends ExecutorRouter {
@Override
public ReturnT<String> route(TriggerParam triggerParam, List<String> addressList){
return new ReturnT<String>(addressList.get(0));
return ReturnT.ofSuccess(addressList.get(0));
}
}

@ -73,7 +73,7 @@ public class ExecutorRouteLFU extends ExecutorRouter {
@Override
public ReturnT<String> route(TriggerParam triggerParam, List<String> addressList) {
String address = route(triggerParam.getJobId(), addressList);
return new ReturnT<String>(address);
return ReturnT.ofSuccess(address);
}
}

@ -70,7 +70,7 @@ public class ExecutorRouteLRU extends ExecutorRouter {
@Override
public ReturnT<String> route(TriggerParam triggerParam, List<String> addressList) {
String address = route(triggerParam.getJobId(), addressList);
return new ReturnT<String>(address);
return ReturnT.ofSuccess(address);
}
}

@ -13,7 +13,7 @@ public class ExecutorRouteLast extends ExecutorRouter {
@Override
public ReturnT<String> route(TriggerParam triggerParam, List<String> addressList) {
return new ReturnT<String>(addressList.get(addressList.size()-1));
return ReturnT.ofSuccess(addressList.get(addressList.size()-1));
}
}

@ -17,7 +17,7 @@ public class ExecutorRouteRandom extends ExecutorRouter {
@Override
public ReturnT<String> route(TriggerParam triggerParam, List<String> addressList) {
String address = addressList.get(localRandom.nextInt(addressList.size()));
return new ReturnT<String>(address);
return ReturnT.ofSuccess(address);
}
}

@ -40,7 +40,7 @@ public class ExecutorRouteRound extends ExecutorRouter {
@Override
public ReturnT<String> route(TriggerParam triggerParam, List<String> addressList) {
String address = addressList.get(count(triggerParam.getJobId())%addressList.size());
return new ReturnT<String>(address);
return ReturnT.ofSuccess(address);
}
}

@ -162,7 +162,7 @@ public class XxlJobServiceImpl implements XxlJobService {
return new ReturnT<String>(ReturnT.FAIL_CODE, (I18nUtil.getString("jobinfo_field_add")+I18nUtil.getString("system_fail")) );
}
return new ReturnT<String>(String.valueOf(jobInfo.getId()));
return ReturnT.ofSuccess(String.valueOf(jobInfo.getId()));
}
private boolean isNumeric(String str){
@ -494,7 +494,7 @@ public class XxlJobServiceImpl implements XxlJobService {
result.put("triggerCountSucTotal", triggerCountSucTotal);
result.put("triggerCountFailTotal", triggerCountFailTotal);
return new ReturnT<Map<String, Object>>(result);
return ReturnT.ofSuccess(result);
}
}

@ -166,7 +166,7 @@ public class ExecutorBizImpl implements ExecutorBiz {
String logFileName = XxlJobFileAppender.makeLogFileName(new Date(logParam.getLogDateTim()), logParam.getLogId());
LogResult logResult = XxlJobFileAppender.readLog(logFileName, logParam.getFromLineNum());
return new ReturnT<LogResult>(logResult);
return ReturnT.ofSuccess(logResult);
}
}

@ -30,11 +30,6 @@ public class ReturnT<T> implements Serializable {
this.content = content;
}
public ReturnT(T content) {
this.code = SUCCESS_CODE;
this.content = content;
}
public int getCode() {
return code;
}

Loading…
Cancel
Save