[jboss-svn-commits] JBL Code SVN: r20222 - in labs/jbossrules/trunk/drools-core/src: main/java/org/drools/time and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu May 29 15:55:38 EDT 2008
Author: mark.proctor at jboss.com
Date: 2008-05-29 15:55:38 -0400 (Thu, 29 May 2008)
New Revision: 20222
Added:
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/time/TimerServiceFactory.java
Removed:
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/time/SchedulerFactory.java
Modified:
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/timer/TimerManager.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/time/impl/jdk/JDKSchedulerTest.java
Log:
JBRULES-1625 Create Scheduler API with JDK implementation
-Basic refactoring for for TimerService, instead of Scheduler
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/timer/TimerManager.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/timer/TimerManager.java 2008-05-29 19:51:40 UTC (rev 20221)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/timer/TimerManager.java 2008-05-29 19:55:38 UTC (rev 20222)
@@ -9,7 +9,7 @@
import org.drools.time.JobContext;
import org.drools.time.JobHandle;
import org.drools.time.TimerService;
-import org.drools.time.SchedulerFactory;
+import org.drools.time.TimerServiceFactory;
import org.drools.time.Trigger;
public class TimerManager {
@@ -20,7 +20,7 @@
public TimerManager(WorkingMemory workingMemory) {
this.workingMemory = workingMemory;
- this.scheduler = SchedulerFactory.getScheduler();
+ this.scheduler = TimerServiceFactory.getTimerService();
}
public void registerTimer(final Timer timer,
Deleted: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/time/SchedulerFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/time/SchedulerFactory.java 2008-05-29 19:51:40 UTC (rev 20221)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/time/SchedulerFactory.java 2008-05-29 19:55:38 UTC (rev 20222)
@@ -1,11 +0,0 @@
-package org.drools.time;
-
-import org.drools.time.impl.JDKTimerService;
-
-public class SchedulerFactory {
- private static TimerService timerService = new JDKTimerService();
-
- public static TimerService getScheduler() {
- return timerService;
- }
-}
Copied: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/time/TimerServiceFactory.java (from rev 20220, labs/jbossrules/trunk/drools-core/src/main/java/org/drools/time/SchedulerFactory.java)
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/time/TimerServiceFactory.java (rev 0)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/time/TimerServiceFactory.java 2008-05-29 19:55:38 UTC (rev 20222)
@@ -0,0 +1,11 @@
+package org.drools.time;
+
+import org.drools.time.impl.JDKTimerService;
+
+public class TimerServiceFactory {
+ private static TimerService timerService = new JDKTimerService();
+
+ public static TimerService getTimerService() {
+ return timerService;
+ }
+}
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/time/impl/jdk/JDKSchedulerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/time/impl/jdk/JDKSchedulerTest.java 2008-05-29 19:51:40 UTC (rev 20221)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/time/impl/jdk/JDKSchedulerTest.java 2008-05-29 19:55:38 UTC (rev 20222)
@@ -11,37 +11,37 @@
import org.drools.time.JobContext;
import org.drools.time.JobHandle;
import org.drools.time.TimerService;
-import org.drools.time.SchedulerFactory;
+import org.drools.time.TimerServiceFactory;
import org.drools.time.Trigger;
public class JDKSchedulerTest extends TestCase {
- public void test1() throws Exception {
- TimerService scheduler = SchedulerFactory.getScheduler();
+ public void testSingleExecutionJob() throws Exception {
+ TimerService timeService = TimerServiceFactory.getTimerService();
Trigger trigger = new DelayedTrigger( 100 );
- HelloWorldJobContext ctx = new HelloWorldJobContext( "hello world", scheduler);
- scheduler.scheduleJob( new HelloWorldJob(), ctx, trigger);
+ HelloWorldJobContext ctx = new HelloWorldJobContext( "hello world", timeService);
+ timeService.scheduleJob( new HelloWorldJob(), ctx, trigger);
Thread.sleep( 500 );
assertEquals( 1, ctx.getList().size() );
}
- public void test2() throws Exception {
- TimerService scheduler = SchedulerFactory.getScheduler();
+ public void testRepeatedExecutionJob() throws Exception {
+ TimerService timeService = TimerServiceFactory.getTimerService();
Trigger trigger = new DelayedTrigger( new long[] { 100, 100, 100} );
- HelloWorldJobContext ctx = new HelloWorldJobContext( "hello world", scheduler);
- scheduler.scheduleJob( new HelloWorldJob(), ctx, trigger);
+ HelloWorldJobContext ctx = new HelloWorldJobContext( "hello world", timeService);
+ timeService.scheduleJob( new HelloWorldJob(), ctx, trigger);
Thread.sleep( 500 );
assertEquals( 3, ctx.getList().size() );
}
- public void test3() throws Exception {
- TimerService scheduler = SchedulerFactory.getScheduler();
+ public void testRepeatedExecutionJobWithRemove() throws Exception {
+ TimerService timeService = TimerServiceFactory.getTimerService();
Trigger trigger = new DelayedTrigger( new long[] { 100, 100, 100, 100, 100 } );
- HelloWorldJobContext ctx = new HelloWorldJobContext( "hello world", scheduler);
+ HelloWorldJobContext ctx = new HelloWorldJobContext( "hello world", timeService);
ctx.setLimit( 3 );
- scheduler.scheduleJob( new HelloWorldJob(), ctx, trigger);
+ timeService.scheduleJob( new HelloWorldJob(), ctx, trigger);
Thread.sleep( 1000 );
assertEquals( 4, ctx.getList().size() );
@@ -52,7 +52,7 @@
HelloWorldJobContext ctx = (HelloWorldJobContext) c;
int counter = ctx.increaseCounter();
if ( counter > 3 ) {
- ctx.scheduler.removeJob( ctx.getJobHandle() );
+ ctx.timeService.removeJob( ctx.getJobHandle() );
}
ctx.getList().add( ((HelloWorldJobContext)ctx).getMessage() + " : " + counter);
}
@@ -60,7 +60,7 @@
public static class HelloWorldJobContext implements JobContext {
private String message;
- private TimerService scheduler;
+ private TimerService timeService;
private JobHandle jobHandle;
private List list;
@@ -68,9 +68,9 @@
private int counter;
private int limit;
- public HelloWorldJobContext(String message, TimerService scheduler) {
+ public HelloWorldJobContext(String message, TimerService timeService) {
this.message = message;
- this.scheduler = scheduler;
+ this.timeService = timeService;
this.list = new ArrayList();
}
More information about the jboss-svn-commits
mailing list