DELTASPIKE-1369: Switch to veto logic for job control.
This makes the implementation more similar to Quartz' TriggerListener.
Signed-off-by: Juri Berlanda <juriberlanda@hotmail.com>
diff --git a/deltaspike/modules/scheduler/api/src/main/java/org/apache/deltaspike/scheduler/spi/SchedulerControl.java b/deltaspike/modules/scheduler/api/src/main/java/org/apache/deltaspike/scheduler/spi/SchedulerControl.java
index ecaf1cc..346335e 100644
--- a/deltaspike/modules/scheduler/api/src/main/java/org/apache/deltaspike/scheduler/spi/SchedulerControl.java
+++ b/deltaspike/modules/scheduler/api/src/main/java/org/apache/deltaspike/scheduler/spi/SchedulerControl.java
@@ -22,7 +22,7 @@
* This interface provides high-level controls for the scheduler.
*
* It allows to control the scheduler as a whole ({@link #isSchedulerEnabled()}()) and on a per-job basis
- * ({@link #shouldJobBeStarted(Class)}.
+ * ({@link #vetoJobExecution(Class)}.
*
* The interface is meant to be implemented by a CDI bean.
*/
@@ -41,7 +41,7 @@
* NOTE: This only applies if the scheduler is actually running (see {@link #isSchedulerEnabled()}).
*
* @param jobClass the job which was triggered
- * @return if {@code true} the job will be executed, else not.
+ * @return if {@code false} the job will be executed, else not.
*/
- boolean shouldJobBeStarted(Class<?> jobClass);
+ boolean vetoJobExecution(Class<?> jobClass);
}
diff --git a/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/AbstractJobAdapter.java b/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/AbstractJobAdapter.java
index 3563205..f0a2aa6 100644
--- a/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/AbstractJobAdapter.java
+++ b/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/AbstractJobAdapter.java
@@ -41,7 +41,7 @@
ClassUtils.tryToLoadClassForName(context.getJobDetail().getKey().getName(), getJobBaseClass());
SchedulerControl schedulerControl = BeanProvider.getContextualReference(SchedulerControl.class, true);
- if (schedulerControl != null && !schedulerControl.shouldJobBeStarted(jobClass))
+ if (schedulerControl != null && schedulerControl.vetoJobExecution(jobClass))
{
return;
}
