Support for ScheduledExecutorService

lukas-krecan · lukas-krecan · commit d411ee6e2d84 · 2017-01-07T10:04:14.000+01:00
diff --git a/shedlock-spring/src/main/java/net/javacrumbs/shedlock/spring/SpringLockableTaskSchedulerFactory.java b/shedlock-spring/src/main/java/net/javacrumbs/shedlock/spring/SpringLockableTaskSchedulerFactory.java
@@ -18,8 +18,11 @@
 import net.javacrumbs.shedlock.core.DefaultLockManager;
 import net.javacrumbs.shedlock.core.LockProvider;
 import org.springframework.scheduling.TaskScheduler;
+import org.springframework.scheduling.concurrent.ConcurrentTaskScheduler;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
 
+import java.util.concurrent.ScheduledExecutorService;
+
 /**
  * Helper class to simplify configuration of Spring LockableTaskScheduler.
  */
@@ -36,6 +39,17 @@ public static LockableTaskScheduler newLockableTaskScheduler(TaskScheduler taskS
         return new LockableTaskScheduler(taskScheduler, new DefaultLockManager(lockProvider, new SpringLockConfigurationExtractor()));
     }
 
+    /**
+     * Wraps ScheduledExecutorService and ensures that {@link net.javacrumbs.shedlock.core.SchedulerLock} annotated methods
+     * are locked using the lockProvider
+     *
+     * @param scheduledExecutorService wrapped ScheduledExecutorService
+     * @param lockProvider             lock provider to be used
+     */
+    public static LockableTaskScheduler newLockableTaskScheduler(ScheduledExecutorService scheduledExecutorService, LockProvider lockProvider) {
+        return newLockableTaskScheduler(new ConcurrentTaskScheduler(scheduledExecutorService), lockProvider);
+    }
+
     /**
      * Creates {@link ThreadPoolTaskScheduler} and ensures that {@link net.javacrumbs.shedlock.core.SchedulerLock} annotated methods
      * are locked using the lockProvider
diff --git a/shedlock-spring/src/test/java/net/javacrumbs/shedlock/spring/SpringLockableTaskSchedulerFactoryTest.java b/shedlock-spring/src/test/java/net/javacrumbs/shedlock/spring/SpringLockableTaskSchedulerFactoryTest.java
@@ -0,0 +1,30 @@
+package net.javacrumbs.shedlock.spring;
+
+import net.javacrumbs.shedlock.core.LockProvider;
+import org.junit.Test;
+
+import java.util.Date;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+public class SpringLockableTaskSchedulerFactoryTest {
+
+
+    private LockProvider lockProvider = mock(LockProvider.class);
+    private Runnable task = mock(Runnable.class);
+
+    @Test
+    public void shouldWrapScheduledExecutorService() {
+        ScheduledExecutorService scheduledExecutorService = mock(ScheduledExecutorService.class);
+        LockableTaskScheduler lockableTaskScheduler = SpringLockableTaskSchedulerFactory.newLockableTaskScheduler(scheduledExecutorService, lockProvider);
+        lockableTaskScheduler.schedule(task, new Date());
+        verify(scheduledExecutorService).schedule(any(Runnable.class), anyLong(), eq(TimeUnit.MILLISECONDS));
+    }
+
+}
