[AB-xx] improving scheduling interface

moving renaming module to int
removing duplicated starboard feature validator
sonar fixes
This commit is contained in:
Sheldan
2021-03-08 01:27:50 +01:00
parent 9c6333281b
commit 66061b7719
424 changed files with 95 additions and 154 deletions

View File

@@ -1,6 +1,7 @@
package dev.sheldan.abstracto.scheduling.service;
import dev.sheldan.abstracto.scheduling.factory.QuartzConfigFactory;
import dev.sheldan.abstracto.scheduling.model.JobParameters;
import dev.sheldan.abstracto.scheduling.model.database.SchedulerJob;
import dev.sheldan.abstracto.scheduling.service.management.SchedulerJobManagementServiceBean;
import lombok.extern.slf4j.Slf4j;
@@ -150,8 +151,10 @@ public class SchedulerServiceBean implements SchedulerService {
}
@Override
public String executeJobWithParametersOnce(String name, String group, JobDataMap dataMap, Date date) {
Trigger onceOnlyTriggerForJob = scheduleCreator.createOnceOnlyTriggerForJob(name, group, date, dataMap);
public String executeJobWithParametersOnce(String name, String group, JobParameters dataMap, Date date) {
JobDataMap map = new JobDataMap();
dataMap.getParameters().keySet().forEach(o -> map.put(o.toString(), dataMap.getParameters().get(o)));
Trigger onceOnlyTriggerForJob = scheduleCreator.createOnceOnlyTriggerForJob(name, group, date, map);
try {
schedulerFactoryBean.getScheduler().scheduleJob(onceOnlyTriggerForJob);
return onceOnlyTriggerForJob.getKey().getName();

View File

@@ -1,5 +1,6 @@
package dev.sheldan.abstracto.scheduling.factory;
import dev.sheldan.abstracto.scheduling.model.JobParameters;
import dev.sheldan.abstracto.scheduling.model.database.SchedulerJob;
import dev.sheldan.abstracto.scheduling.service.SchedulerServiceBean;
import dev.sheldan.abstracto.scheduling.service.management.SchedulerJobManagementServiceBean;
@@ -98,7 +99,7 @@ public class SchedulerServiceBeanTest {
public void executeJobOnce() throws SchedulerException {
when(scheduleCreator.createOnceOnlyTriggerForJob(eq(JOB_NAME), eq(GROUP_NAME), any(Date.class), any(JobDataMap.class))).thenReturn(trigger);
when(trigger.getKey()).thenReturn(TriggerKey.triggerKey("random key"));
classToTest.executeJobWithParametersOnce(JOB_NAME, GROUP_NAME, new JobDataMap(), new Date());
classToTest.executeJobWithParametersOnce(JOB_NAME, GROUP_NAME, JobParameters.builder().build(), new Date());
verify(scheduler, times(1)).scheduleJob(any(Trigger.class));
}