wip

Author: janvanmansum

src/main/java/nl/knaw/dans/lib/util/pollingtaskexec/ExecutorServiceTaskScheduler.java

@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2021 DANS - Data Archiving and Networked Services (info@dans.knaw.nl)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package nl.knaw.dans.lib.util.pollingtaskexec;
+
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+public class ExecutorServiceTaskScheduler implements TaskScheduler {
+    private final java.util.concurrent.ExecutorService executorService;
+
+    @Override
+    public void schedule(Runnable task) {
+        executorService.submit(task);
+    }
+}

src/main/java/nl/knaw/dans/lib/util/pollingtaskexec/ImmediateTaskScheduler.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2021 DANS - Data Archiving and Networked Services (info@dans.knaw.nl)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package nl.knaw.dans.lib.util.pollingtaskexec;
+
+public class ImmediateTaskScheduler implements TaskScheduler {
+    @Override
+    public void schedule(Runnable task) {
+        task.run();
+    }
+}

src/main/java/nl/knaw/dans/lib/util/pollingtaskexec/PollingTaskExecutor.java

@@ -40,9 +40,14 @@ public class PollingTaskExecutor<R> implements Managed {
     private final Duration pollingInterval;
     private final TaskSource<R> taskSource;
     private final TaskFactory<R> taskFactory;
+    private final TaskScheduler taskScheduler;
 
     private ScheduledFuture<?> future;
 
+    public PollingTaskExecutor(String name, ScheduledExecutorService scheduler, Duration pollingInterval, TaskSource<R> taskSource, TaskFactory<R> taskFactory) {
+        this(name, scheduler, pollingInterval, taskSource, taskFactory, new ImmediateTaskScheduler());
+    }
+
     /**
      * Copy constructor. The source executor must not be running. The purpose of this constructor is only to be able to wrap a PollingTaskExecutor in a UnitOfWorkAwareProxy. In general, no copies
      * should be created of a PollingTaskExecutor, and in particular should the schedular not be shared among PollingTaskExecutors.
@@ -59,6 +64,7 @@ public PollingTaskExecutor(PollingTaskExecutor<R> other) {
         this.pollingInterval = other.pollingInterval;
         this.taskSource = other.taskSource;
         this.taskFactory = other.taskFactory;
+        this.taskScheduler = other.taskScheduler;
     }
 
     @Override
@@ -86,7 +92,7 @@ public void tick() {
             }
             log.debug("{}: found next task record(s): {}", name, inputs);
             Runnable task = taskFactory.create(inputs);
-            task.run();
+            taskScheduler.schedule(task);
         }
         catch (Exception e) {
             log.error("{}: error while polling or running task", name, e);

src/main/java/nl/knaw/dans/lib/util/pollingtaskexec/TaskScheduler.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2021 DANS - Data Archiving and Networked Services (info@dans.knaw.nl)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package nl.knaw.dans.lib.util.pollingtaskexec;
+
+public interface TaskScheduler {
+
+    /**
+     * Schedules the task for execution.
+     *
+     * @param task the task to schedule
+     */
+    void schedule(Runnable task);
+}