deps(jobrunr): upgrade to 7.2.2

informatique-cdc · Aug 1, 2024 · 69f25e5 · 69f25e5
1 parent f156d5c
commit 69f25e5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -60,7 +60,7 @@
         <usertype-core.version>7.0.0.CR1</usertype-core.version>
         <project.testresult.directory>${project.build.directory}/test-results</project.testresult.directory>
         <pf4j-spring.version>0.9.0</pf4j-spring.version>
-        <jobrunr.version>5.3.3</jobrunr.version>
+        <jobrunr.version>7.2.2</jobrunr.version>
         <pf4j.version>3.12.0</pf4j.version>
         <git.user />
         <git.password />
@@ -95,7 +95,7 @@
         </dependency>
         <dependency>
             <groupId>org.jobrunr</groupId>
-            <artifactId>jobrunr-spring-boot-starter</artifactId>
+            <artifactId>jobrunr-spring-boot-3-starter</artifactId>
             <version>${jobrunr.version}</version>
             <exclusions>
                 <exclusion>

diff --git a/src/main/java/fr/icdc/ebad/service/BatchService.java b/src/main/java/fr/icdc/ebad/service/BatchService.java
@@ -14,6 +14,7 @@
 import fr.icdc.ebad.repository.SchedulingRepository;
 import fr.icdc.ebad.security.SecurityUtils;
 import fr.icdc.ebad.service.util.EbadServiceException;
+import org.jobrunr.jobs.JobId;
 import org.jobrunr.jobs.annotations.Job;
 import org.jobrunr.scheduling.JobScheduler;
 import org.slf4j.Logger;
@@ -254,7 +255,7 @@ public void deleteBatch(Long id) {
     public void deleteScheduledJobFromBatch(Long batchId){
         List<Scheduling> schedulings = schedulingRepository.findAllByBatchId(batchId);
         schedulings.forEach(scheduling -> {
-            jobScheduler.delete(String.valueOf(scheduling.getId()));
+            jobScheduler.deleteRecurringJob(String.valueOf(scheduling.getId()));
             schedulingRepository.delete(scheduling);
         });
     }

diff --git a/src/main/java/fr/icdc/ebad/service/EnvironnementService.java b/src/main/java/fr/icdc/ebad/service/EnvironnementService.java
@@ -24,6 +24,7 @@
 import fr.icdc.ebad.service.util.EbadServiceException;
 import jakarta.annotation.Nullable;
 import jakarta.validation.constraints.NotNull;
+import org.jobrunr.jobs.JobId;
 import org.jobrunr.scheduling.JobScheduler;
 import org.pf4j.PluginRuntimeException;
 import org.pf4j.PluginWrapper;
@@ -154,7 +155,7 @@ public String getEspaceDisque(Long id) {
     public void deleteScheduledJobFromEnvironment(Long environmentId){
         List<Scheduling> schedulings = schedulingRepository.findAllByEnvironnementId(environmentId);
         schedulings.forEach(scheduling -> {
-            jobScheduler.delete(String.valueOf(scheduling.getId()));
+            jobScheduler.deleteRecurringJob(String.valueOf(scheduling.getId()));
             schedulingRepository.delete(scheduling);
         });
     }

diff --git a/src/main/java/fr/icdc/ebad/service/SchedulingService.java b/src/main/java/fr/icdc/ebad/service/SchedulingService.java
@@ -65,7 +65,7 @@ public Scheduling saveAndRun(Long batchId, Long environnementId, String paramete
     @Transactional
     public void remove(Long schedulingId) {
         Scheduling scheduling = schedulingRepository.getById(schedulingId);
-        jobScheduler.delete(String.valueOf(scheduling.getId()));
+        jobScheduler.deleteRecurringJob(String.valueOf(scheduling.getId()));
         schedulingRepository.delete(scheduling);
     }