#63 renamed a DTO

This commit is contained in:
Fabio Formosa
2022-10-04 23:26:16 +02:00
parent b4acc378e3
commit b92d8275db
2 changed files with 12 additions and 12 deletions

View File

@@ -1,6 +1,6 @@
package it.fabioformosa.quartzmanager.aspects;
import it.fabioformosa.quartzmanager.dto.TriggerStatus;
import it.fabioformosa.quartzmanager.dto.TriggerFiredBundleDTO;
import org.quartz.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.messaging.simp.SimpMessageSendingOperations;
@@ -28,27 +28,27 @@ public class WebSocketProgressNotifier implements ProgressNotifier {
@Override
public void send(JobExecutionContext jobExecutionContext) throws SchedulerException {
TriggerStatus currTriggerStatus = new TriggerStatus();
TriggerFiredBundleDTO triggerFiredBundleDTO = new TriggerFiredBundleDTO();
Trigger trigger = jobExecutionContext.getTrigger();
currTriggerStatus.setFinalFireTime(trigger.getFinalFireTime());
currTriggerStatus.setNextFireTime(trigger.getNextFireTime());
currTriggerStatus.setPreviousFireTime(trigger.getPreviousFireTime());
triggerFiredBundleDTO.setFinalFireTime(trigger.getFinalFireTime());
triggerFiredBundleDTO.setNextFireTime(trigger.getNextFireTime());
triggerFiredBundleDTO.setPreviousFireTime(trigger.getPreviousFireTime());
if (trigger instanceof SimpleTrigger) {
SimpleTrigger simpleTrigger = (SimpleTrigger) trigger;
currTriggerStatus.setRepeatCount(simpleTrigger.getRepeatCount() + 1);
currTriggerStatus.setTimesTriggered(simpleTrigger.getTimesTriggered());
triggerFiredBundleDTO.setRepeatCount(simpleTrigger.getRepeatCount() + 1);
triggerFiredBundleDTO.setTimesTriggered(simpleTrigger.getTimesTriggered());
} else if (trigger instanceof DailyTimeIntervalTrigger) {
DailyTimeIntervalTrigger dailyTrigger = (DailyTimeIntervalTrigger) trigger;
currTriggerStatus.setRepeatCount(dailyTrigger.getRepeatCount() + 1);
triggerFiredBundleDTO.setRepeatCount(dailyTrigger.getRepeatCount() + 1);
}
JobDetail jobDetail = jobExecutionContext.getJobDetail();
currTriggerStatus.setJobKey(jobDetail.getKey().getName());
currTriggerStatus.setJobClass(trigger.getClass().getSimpleName());
triggerFiredBundleDTO.setJobKey(jobDetail.getKey().getName());
triggerFiredBundleDTO.setJobClass(trigger.getClass().getSimpleName());
messagingTemplate.convertAndSend("/topic/progress", currTriggerStatus);
messagingTemplate.convertAndSend("/topic/progress", triggerFiredBundleDTO);
}
}

View File

@@ -2,7 +2,7 @@ package it.fabioformosa.quartzmanager.dto;
import java.util.Date;
public class TriggerStatus {
public class TriggerFiredBundleDTO {
private int timesTriggered;