github/quartz-manager
1
0
Fork 0
mirror of https://github.com/fabioformosa/quartz-manager.git synced 2026-05-14 22:00:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

fixed sonar issues

Browse Source
This commit is contained in:
Fabio Formosa
2026-05-14 08:22:33 +02:00
parent b6529b453a
commit 501ef6c062
8 changed files with 41 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/services/JobService.java
View File

@@ -115,6 +115,13 @@ public class JobService {
scheduler.deleteJob(jobKey);
}
public Class<? extends Job> getEligibleJobClass(String jobClassName) throws ClassNotFoundException {
return jobClasses.stream()
.filter(jobClass -> jobClass.getName().equals(jobClassName))
.findFirst()
.orElseThrow(() -> new ClassNotFoundException("Job class " + jobClassName + " is not eligible"));
}
private JobKey requireJob(String group, String name) throws SchedulerException, JobNotFoundException {
JobKey jobKey = JobKey.jobKey(name, group);
if (!scheduler.checkExists(jobKey))
@@ -123,7 +130,7 @@ public class JobService {
}
private JobDetail buildJobDetail(JobKey jobKey, ScheduledJobInputDTO scheduledJobInputDTO) throws ClassNotFoundException {
Class<? extends Job> jobClass = Class.forName(scheduledJobInputDTO.getJobClass()).asSubclass(Job.class);
Class<? extends Job> jobClass = getEligibleJobClass(scheduledJobInputDTO.getJobClass());
JobBuilder jobBuilder = JobBuilder.newJob(jobClass)
.withIdentity(jobKey)
.storeDurably(scheduledJobInputDTO.isDurable())

7
quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/services/SimpleTriggerService.java
View File

@@ -13,8 +13,11 @@ import org.springframework.stereotype.Service;
@Service
public class SimpleTriggerService extends AbstractSchedulerService {
public SimpleTriggerService(@Qualifier("quartzManagerScheduler") Scheduler scheduler, ConversionService conversionService) {
private final JobService jobService;
public SimpleTriggerService(@Qualifier("quartzManagerScheduler") Scheduler scheduler, ConversionService conversionService, JobService jobService) {
super(scheduler, conversionService);
this.jobService = jobService;
}
public SimpleTriggerDTO getSimpleTriggerByName(String name) throws SchedulerException, TriggerNotFoundException {
@@ -49,7 +52,7 @@ public class SimpleTriggerService extends AbstractSchedulerService {
scheduler.scheduleJob(newSimpleTrigger);
}
else {
Class<? extends Job> jobClass = Class.forName(simpleTriggerCommandDTO.getSimpleTriggerInputDTO().getJobClass()).asSubclass(Job.class);
Class<? extends Job> jobClass = jobService.getEligibleJobClass(simpleTriggerCommandDTO.getSimpleTriggerInputDTO().getJobClass());
JobDetail jobDetail = JobBuilder.newJob()
.ofType(jobClass)
.storeDurably(false)

21
quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/services/TriggerService.java
View File

@@ -15,7 +15,6 @@ import org.quartz.CronTrigger;
import org.quartz.DailyTimeIntervalScheduleBuilder;
import org.quartz.DailyTimeIntervalTrigger;
import org.quartz.DateBuilder;
import org.quartz.Job;
import org.quartz.JobBuilder;
import org.quartz.JobDataMap;
import org.quartz.JobDetail;
@@ -43,13 +42,17 @@ import java.util.TimeZone;
public class TriggerService {
private static final int DEFAULT_PRIORITY = Trigger.DEFAULT_PRIORITY;
private static final String MISFIRE_DO_NOTHING = "DO_NOTHING";
private static final String MISFIRE_IGNORE_MISFIRES = "IGNORE_MISFIRES";
private final Scheduler scheduler;
private final ConversionService conversionService;
private final JobService jobService;
public TriggerService(@Qualifier("quartzManagerScheduler") Scheduler scheduler, ConversionService conversionService) {
public TriggerService(@Qualifier("quartzManagerScheduler") Scheduler scheduler, ConversionService conversionService, JobService jobService) {
this.scheduler = scheduler;
this.conversionService = conversionService;
this.jobService = jobService;
}
public List<TriggerKeyDTO> fetchTriggers() throws SchedulerException {
@@ -83,7 +86,7 @@ public class TriggerService {
}
else {
JobDetail jobDetail = JobBuilder.newJob()
.ofType(Class.forName(triggerInputDTO.getJobClass()).asSubclass(Job.class))
.ofType(jobService.getEligibleJobClass(triggerInputDTO.getJobClass()))
.storeDurably(false)
.build();
scheduler.scheduleJob(jobDetail, newTrigger);
@@ -262,24 +265,24 @@ public class TriggerService {
private CronScheduleBuilder applyCronMisfireInstruction(CronScheduleBuilder scheduleBuilder, String misfireInstruction) {
return switch (normalizeMisfireInstruction(misfireInstruction)) {
case "DO_NOTHING" -> scheduleBuilder.withMisfireHandlingInstructionDoNothing();
case "IGNORE_MISFIRES" -> scheduleBuilder.withMisfireHandlingInstructionIgnoreMisfires();
case MISFIRE_DO_NOTHING -> scheduleBuilder.withMisfireHandlingInstructionDoNothing();
case MISFIRE_IGNORE_MISFIRES -> scheduleBuilder.withMisfireHandlingInstructionIgnoreMisfires();
default -> scheduleBuilder.withMisfireHandlingInstructionFireAndProceed();
};
}
private DailyTimeIntervalScheduleBuilder applyDailyMisfireInstruction(DailyTimeIntervalScheduleBuilder scheduleBuilder, String misfireInstruction) {
return switch (normalizeMisfireInstruction(misfireInstruction)) {
case "DO_NOTHING" -> scheduleBuilder.withMisfireHandlingInstructionDoNothing();
case "IGNORE_MISFIRES" -> scheduleBuilder.withMisfireHandlingInstructionIgnoreMisfires();
case MISFIRE_DO_NOTHING -> scheduleBuilder.withMisfireHandlingInstructionDoNothing();
case MISFIRE_IGNORE_MISFIRES -> scheduleBuilder.withMisfireHandlingInstructionIgnoreMisfires();
default -> scheduleBuilder.withMisfireHandlingInstructionFireAndProceed();
};
}
private CalendarIntervalScheduleBuilder applyCalendarIntervalMisfireInstruction(CalendarIntervalScheduleBuilder scheduleBuilder, String misfireInstruction) {
return switch (normalizeMisfireInstruction(misfireInstruction)) {
case "DO_NOTHING" -> scheduleBuilder.withMisfireHandlingInstructionDoNothing();
case "IGNORE_MISFIRES" -> scheduleBuilder.withMisfireHandlingInstructionIgnoreMisfires();
case MISFIRE_DO_NOTHING -> scheduleBuilder.withMisfireHandlingInstructionDoNothing();
case MISFIRE_IGNORE_MISFIRES -> scheduleBuilder.withMisfireHandlingInstructionIgnoreMisfires();
default -> scheduleBuilder.withMisfireHandlingInstructionFireAndProceed();
};
}

1
quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/services/CalendarServiceTest.java
View File

@@ -20,7 +20,6 @@ import org.quartz.TriggerBuilder;
import org.quartz.TriggerKey;
import org.quartz.impl.calendar.AnnualCalendar;
import org.quartz.impl.calendar.CronCalendar;
import org.quartz.impl.calendar.DailyCalendar;
import org.quartz.impl.calendar.HolidayCalendar;
import org.quartz.impl.calendar.MonthlyCalendar;
import org.quartz.impl.calendar.WeeklyCalendar;

3
quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/services/JobServiceTest.java
View File

@@ -47,6 +47,7 @@ class JobServiceTest {
void setUp() {
MockitoAnnotations.openMocks(this);
schedulerBackedJobService = new JobService("", scheduler, conversionService);
schedulerBackedJobService.getJobClasses().add(SampleJob.class);
}
@Test
@@ -106,7 +107,7 @@ class JobServiceTest {
Assertions.assertThat(scheduledJobs.get(0).getDescription()).isEqualTo("sample");
Assertions.assertThat(scheduledJobs.get(0).isDurable()).isTrue();
Assertions.assertThat(scheduledJobs.get(0).isRequestsRecovery()).isTrue();
Assertions.assertThat(scheduledJobs.get(0).getJobDataMap().get("key")).isEqualTo("value");
Assertions.assertThat((Map<String, Object>) scheduledJobs.get(0).getJobDataMap()).containsEntry("key", "value");
Assertions.assertThat(scheduledJobs.get(0).getTriggerKeys()).hasSize(1);
}

11
quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/services/SimpleTriggerServiceTest.java
View File

@@ -3,6 +3,7 @@ package it.fabioformosa.quartzmanager.api.services;
import it.fabioformosa.quartzmanager.api.common.utils.DateUtils;
import it.fabioformosa.quartzmanager.api.dto.*;
import it.fabioformosa.quartzmanager.api.exceptions.TriggerNotFoundException;
import it.fabioformosa.quartzmanager.api.jobs.SampleJob;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -29,9 +30,13 @@ class SimpleTriggerServiceTest {
@Mock
private ConversionService conversionService;
@Mock
private JobService jobService;
@BeforeEach
void setUp() {
void setUp() throws ClassNotFoundException {
openMocks(this);
Mockito.doReturn(SampleJob.class).when(jobService).getEligibleJobClass(SampleJob.class.getName());
}
@Test
@@ -62,7 +67,7 @@ class SimpleTriggerServiceTest {
@Test
void givenASimpleTriggerCommandDTO_whenASimpleTriggerIsScheduled_thenATriggerDTOIsReturned() throws SchedulerException, ClassNotFoundException {
SimpleTriggerInputDTO triggerInputDTO = SimpleTriggerInputDTO.builder()
.jobClass("it.fabioformosa.quartzmanager.api.jobs.SampleJob")
.jobClass(SampleJob.class.getName())
.startDate(new Date())
.repeatInterval(5000L).repeatCount(5)
.endDate(DateUtils.addHoursToNow(1))
@@ -98,7 +103,7 @@ class SimpleTriggerServiceTest {
}
@Test
void givenASimpleTriggerCommandDTO_whenASimpleTriggerIsRecheduled_thenATriggerDTOIsReturned() throws SchedulerException, ClassNotFoundException, TriggerNotFoundException {
void givenASimpleTriggerCommandDTO_whenASimpleTriggerIsRecheduled_thenATriggerDTOIsReturned() throws SchedulerException, TriggerNotFoundException {
SimpleTriggerInputDTO triggerInputDTO = SimpleTriggerInputDTO.builder()
.jobClass("it.fabioformosa.quartzmanager.api.jobs.SampleJob")
.startDate(new Date())

6
quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/services/TriggerServiceTest.java
View File

@@ -50,9 +50,13 @@ class TriggerServiceTest {
@Mock
private ConversionService conversionService;
@Mock
private JobService jobService;
@BeforeEach
void setUp(){
void setUp() throws ClassNotFoundException {
MockitoAnnotations.openMocks(this);
Mockito.doReturn(SampleJob.class).when(jobService).getEligibleJobClass(SampleJob.class.getName());
}
@Test

2
quartz-manager-parent/quartz-manager-starter-api/src/test/resources/application.yml
View File

@@ -2,7 +2,7 @@ quartz:
enabled: true
quartz-manager:
jobClassPackages: it.fabioformosa.quartzmanager.api.jobs
jobClassPackages: it.fabioformosa.quartzmanager.api.jobs, it.fabioformosa.samplepackage
logging:
level: