Remove not used GenericManagerFactory from DMN engine + change some u…

…sages of deprecated code
filiphr · Aug 9, 2023 · 797577e · 797577e
1 parent cc45310
commit 797577e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 60 deletions.
diff --git a/modules/flowable-common-rest/src/main/java/org/flowable/common/rest/api/PaginateRequest.java b/modules/flowable-common-rest/src/main/java/org/flowable/common/rest/api/PaginateRequest.java
@@ -15,7 +15,7 @@
 /**
  * Interface representing a paginated request object, use when paging is needed without using URL-parameters.
  * 
- * @see AbstractPaginateList
+ * @see PaginateListUtil
  * 
  * @author Frederik Heremans
  */

diff --git a/...-engine/src/main/java/org/flowable/dmn/engine/impl/persistence/GenericManagerFactory.java b/...-engine/src/main/java/org/flowable/dmn/engine/impl/persistence/GenericManagerFactory.java
diff --git a/...le/eventregistry/spring/management/DefaultSpringEventRegistryChangeDetectionExecutor.java b/...le/eventregistry/spring/management/DefaultSpringEventRegistryChangeDetectionExecutor.java
@@ -12,6 +12,7 @@
  */
 package org.flowable.eventregistry.spring.management;
 
+import java.time.Duration;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.Date;
@@ -28,8 +29,8 @@
  */
 public class DefaultSpringEventRegistryChangeDetectionExecutor implements EventRegistryChangeDetectionExecutor, DisposableBean {
 
-    protected long initialDelayInMs;
-    protected long delayInMs;
+    protected Duration initialDelay;
+    protected Duration delay;
     protected TaskScheduler taskScheduler;
     protected ThreadPoolTaskScheduler threadPoolTaskScheduler; // If non-null, it means the scheduler has been created in this class
 
@@ -40,8 +41,8 @@ public DefaultSpringEventRegistryChangeDetectionExecutor(long initialDelayInMs,
     }
 
     public DefaultSpringEventRegistryChangeDetectionExecutor(long initialDelayInMs, long delayInMs, TaskScheduler taskScheduler) {
-        this.initialDelayInMs = initialDelayInMs;
-        this.delayInMs = delayInMs;
+        this.initialDelay = Duration.ofMillis(initialDelayInMs);
+        this.delay = Duration.ofMillis(delayInMs);
 
         if (taskScheduler != null) {
             this.taskScheduler = taskScheduler;
@@ -64,9 +65,8 @@ public void initialize() {
             threadPoolTaskScheduler.initialize();
         }
 
-        Instant initialInstant = Instant.now().plus(initialDelayInMs, ChronoUnit.MILLIS);
-        // Note we cannot use the method with the Instant since it was added in Spring 5.0, and we still want to support 4.3
-        taskScheduler.scheduleWithFixedDelay(createChangeDetectionRunnable(), Date.from(initialInstant), delayInMs);
+        Instant initialInstant = Instant.now().plus(initialDelay);
+        taskScheduler.scheduleWithFixedDelay(createChangeDetectionRunnable(), initialInstant, delay);
     }
 
     protected Runnable createChangeDetectionRunnable() {