You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by gp...@apache.org on 2015/05/01 22:56:46 UTC
deltaspike git commit: DELTASPIKE-888 added support for delete a job
from the scheduler
Repository: deltaspike
Updated Branches:
refs/heads/master 1d327a49b -> 9617b451c
DELTASPIKE-888 added support for delete a job from the scheduler
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/9617b451
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/9617b451
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/9617b451
Branch: refs/heads/master
Commit: 9617b451c08369523e3f95489936558404c9b6e5
Parents: 1d327a4
Author: Daniel Cunha <da...@gmail.com>
Authored: Fri May 1 22:51:33 2015 +0200
Committer: gpetracek <gp...@apache.org>
Committed: Fri May 1 22:51:33 2015 +0200
----------------------------------------------------------------------
.../org/apache/deltaspike/scheduler/spi/Scheduler.java | 2 ++
.../deltaspike/scheduler/impl/QuartzScheduler.java | 13 +++++++++++++
.../test/scheduler/custom/CustomSchedulerTest.java | 3 +++
.../test/scheduler/custom/MockedScheduler.java | 4 ++++
.../test/scheduler/custom/TestJobManager.java | 5 +++++
5 files changed, 27 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/9617b451/deltaspike/modules/scheduler/api/src/main/java/org/apache/deltaspike/scheduler/spi/Scheduler.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/scheduler/api/src/main/java/org/apache/deltaspike/scheduler/spi/Scheduler.java b/deltaspike/modules/scheduler/api/src/main/java/org/apache/deltaspike/scheduler/spi/Scheduler.java
index c09a1c3..e22842e 100644
--- a/deltaspike/modules/scheduler/api/src/main/java/org/apache/deltaspike/scheduler/spi/Scheduler.java
+++ b/deltaspike/modules/scheduler/api/src/main/java/org/apache/deltaspike/scheduler/spi/Scheduler.java
@@ -32,6 +32,8 @@ public interface Scheduler<T> extends Deactivatable
void interruptJob(Class<? extends T> jobClass);
+ boolean deleteJob(Class<? extends T> jobClass);
+
boolean isExecutingJob(Class<? extends T> jobClass);
void registerNewJob(Class<? extends T> jobClass);
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/9617b451/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/QuartzScheduler.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/QuartzScheduler.java b/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/QuartzScheduler.java
index b1d76ad..5de0578 100644
--- a/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/QuartzScheduler.java
+++ b/deltaspike/modules/scheduler/impl/src/main/java/org/apache/deltaspike/scheduler/impl/QuartzScheduler.java
@@ -264,6 +264,19 @@ public class QuartzScheduler implements Scheduler<Job>
}
@Override
+ public boolean deleteJob(Class<? extends Job> jobClass)
+ {
+ try
+ {
+ return this.scheduler.deleteJob(createJobKey(jobClass));
+ }
+ catch (SchedulerException e)
+ {
+ throw ExceptionUtils.throwAsRuntimeException(e);
+ }
+ }
+
+ @Override
public void pauseJob(Class<? extends Job> jobClass)
{
try
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/9617b451/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomSchedulerTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomSchedulerTest.java b/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomSchedulerTest.java
index 5a5a5a6..b7ec800 100644
--- a/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomSchedulerTest.java
+++ b/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/CustomSchedulerTest.java
@@ -92,6 +92,9 @@ public abstract class CustomSchedulerTest
this.scheduler.registerNewJob(AutoRegisteredJob.class);
Assert.assertEquals(1, testJobManager.getRegisteredJobs().size());
+
+ this.scheduler.deleteJob(AutoRegisteredJob.class);
+ Assert.assertEquals(0, testJobManager.getRegisteredJobs().size());
}
@Test
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/9617b451/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/MockedScheduler.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/MockedScheduler.java b/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/MockedScheduler.java
index b5d1958..14fac12 100644
--- a/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/MockedScheduler.java
+++ b/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/MockedScheduler.java
@@ -49,6 +49,10 @@ public class MockedScheduler implements Scheduler<CustomJob>
TestJobManager.getInstance().interruptJob(jobClass);
}
+ public boolean deleteJob(Class<? extends CustomJob> jobClass) {
+ return TestJobManager.getInstance().deleteJob(jobClass);
+ }
+
public boolean isExecutingJob(Class<? extends CustomJob> jobClass)
{
return TestJobManager.getInstance().isExecutingJob(jobClass);
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/9617b451/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/TestJobManager.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/TestJobManager.java b/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/TestJobManager.java
index 92f3b5e..6e28e97 100644
--- a/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/TestJobManager.java
+++ b/deltaspike/modules/scheduler/impl/src/test/java/org/apache/deltaspike/test/scheduler/custom/TestJobManager.java
@@ -71,6 +71,11 @@ public class TestJobManager
this.runningJobs.remove(jobClass);
}
+ public boolean deleteJob(Class<? extends CustomJob> jobClass)
+ {
+ return this.registeredJobs.remove(jobClass);
+ }
+
public boolean isExecutingJob(Class<? extends CustomJob> jobClass)
{
return this.runningJobs.contains(jobClass);