[DROOLS-795] fix timers serialization

kiegroup · Jul 7, 2015 · 57c29a8 · 57c29a8
1 parent 5404f83
commit 57c29a8
Show file tree

Hide file tree

Showing 10 changed files with 104 additions and 99 deletions.
diff --git a/jbpm-flow/src/main/java/org/jbpm/process/core/timer/impl/GlobalTimerService.java b/jbpm-flow/src/main/java/org/jbpm/process/core/timer/impl/GlobalTimerService.java
@@ -15,24 +15,18 @@
  */
 package org.jbpm.process.core.timer.impl;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-
 import org.drools.core.command.CommandService;
 import org.drools.core.command.impl.CommandBasedStatefulKnowledgeSession;
 import org.drools.core.command.impl.KnowledgeCommandContext;
 import org.drools.core.common.InternalKnowledgeRuntime;
-import org.drools.core.time.AcceptsTimerJobFactoryManager;
 import org.drools.core.time.InternalSchedulerService;
 import org.drools.core.time.Job;
 import org.drools.core.time.JobContext;
 import org.drools.core.time.JobHandle;
 import org.drools.core.time.SelfRemovalJobContext;
 import org.drools.core.time.TimerService;
 import org.drools.core.time.Trigger;
+import org.drools.core.time.impl.CommandServiceTimerJobFactoryManager;
 import org.drools.core.time.impl.DefaultJobHandle;
 import org.drools.core.time.impl.TimerJobFactoryManager;
 import org.drools.core.time.impl.TimerJobInstance;
@@ -49,8 +43,14 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+
 
-public class GlobalTimerService implements TimerService, InternalSchedulerService, AcceptsTimerJobFactoryManager {
+public class GlobalTimerService implements TimerService, InternalSchedulerService {
 
 	private static final Logger logger = LoggerFactory.getLogger(GlobalTimerService.class);
 
@@ -179,8 +179,10 @@ public void internalSchedule(TimerJobInstance timerJobInstance) {
 
     @Override
     public void setTimerJobFactoryManager(TimerJobFactoryManager timerJobFactoryManager) {
-    	if (this.jobFactoryManager.getCommandService() == null) {
+    	if (jobFactoryManager instanceof CommandServiceTimerJobFactoryManager &&
-    		this.jobFactoryManager.setCommandService(timerJobFactoryManager.getCommandService());
+            timerJobFactoryManager instanceof CommandServiceTimerJobFactoryManager &&
+            getCommandService() == null) {
+            ( (CommandServiceTimerJobFactoryManager) jobFactoryManager ).setCommandService( ( (CommandServiceTimerJobFactoryManager) timerJobFactoryManager ).getCommandService() );
     	}
     }
 
@@ -200,7 +202,7 @@ public CommandService getCommandService(JobContext jobContext) {
         } else if(ctxorig instanceof NamedJobContext){
         	return getCommandService(((NamedJobContext)ctxorig).getProcessInstanceId(), ctx);
         } else {
-            return jobFactoryManager.getCommandService(); 
+            return getCommandService();
         }
 
         return getCommandService(ctx.getProcessInstanceId(), ctx);
@@ -238,9 +240,14 @@ protected CommandService getCommandService(Long processInstanceId, ProcessJobCon
             ctx.setKnowledgeRuntime((InternalKnowledgeRuntime) runtime.getKieSession());
         }
 
-        return new DisposableCommandService(jobFactoryManager.getCommandService(), manager, runtime, schedulerService.retryEnabled());
+        return new DisposableCommandService(getCommandService(), manager, runtime, schedulerService.retryEnabled());
     }
 
+    private CommandService getCommandService() {
+        return jobFactoryManager instanceof CommandServiceTimerJobFactoryManager ?
+               ( (CommandServiceTimerJobFactoryManager) jobFactoryManager ).getCommandService() :
+               null;
+    }
 
     public static class GlobalJobHandle extends DefaultJobHandle
         implements

diff --git a/jbpm-flow/src/main/java/org/jbpm/process/core/timer/impl/QuartzSchedulerService.java b/jbpm-flow/src/main/java/org/jbpm/process/core/timer/impl/QuartzSchedulerService.java
@@ -15,14 +15,6 @@
  */
 package org.jbpm.process.core.timer.impl;
 
-import java.io.NotSerializableException;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.concurrent.Callable;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-
-import org.drools.core.time.AcceptsTimerJobFactoryManager;
 import org.drools.core.time.InternalSchedulerService;
 import org.drools.core.time.Job;
 import org.drools.core.time.JobContext;
@@ -53,6 +45,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.NotSerializableException;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+
 /**
  * Quartz based <code>GlobalSchedulerService</code> that is configured according
  * to Quartz rules and allows to store jobs in data base. With that it survives 
@@ -108,7 +107,7 @@ public JobHandle scheduleJob(Job job, JobContext ctx, Trigger trigger) {
 
         }
         GlobalQuartzJobHandle quartzJobHandle = new GlobalQuartzJobHandle(id, jobname, "jbpm");
-        TimerJobInstance jobInstance = ((AcceptsTimerJobFactoryManager) globalTimerService).
+        TimerJobInstance jobInstance = globalTimerService.
                 getTimerJobFactoryManager().createTimerJobInstance( job,
                                                                     ctx,
                                                                     trigger,
@@ -163,7 +162,7 @@ public void internalSchedule(TimerJobInstance timerJobInstance) {
             if (scheduler.isShutdown()) {
                 return;
             }
-            ((AcceptsTimerJobFactoryManager) globalTimerService).getTimerJobFactoryManager().addTimerJobInstance( timerJobInstance );
+            globalTimerService.getTimerJobFactoryManager().addTimerJobInstance( timerJobInstance );
             JobDetail jobDetail = scheduler.getJobDetail(quartzJobHandle.getJobName(), quartzJobHandle.getJobGroup());
             if (jobDetail == null) {
                 scheduler.scheduleJob(jobq, triggerq);
@@ -186,11 +185,11 @@ public void internalSchedule(TimerJobInstance timerJobInstance) {
                 // in case job cannot be persisted, like rule timer then make it in memory
                 internalSchedule(new InmemoryTimerJobInstanceDelegate(quartzJobHandle.getJobName(), ((GlobalTimerService) globalTimerService).getTimerServiceId()));
             } else {
-                ((AcceptsTimerJobFactoryManager) globalTimerService).getTimerJobFactoryManager().removeTimerJobInstance(timerJobInstance);
+                globalTimerService.getTimerJobFactoryManager().removeTimerJobInstance(timerJobInstance);
                 throw new RuntimeException(e);
             }
         } catch (SchedulerException e) {
-            ((AcceptsTimerJobFactoryManager) globalTimerService).getTimerJobFactoryManager().removeTimerJobInstance(timerJobInstance);
+            globalTimerService.getTimerJobFactoryManager().removeTimerJobInstance(timerJobInstance);
             throw new RuntimeException("Exception while scheduling job", e);
         }
     }
@@ -384,7 +383,7 @@ public JobContext getJobContext() {
 
         protected void findDelegate() {
             if (delegate == null) {
-                Collection<TimerJobInstance> timers = ((AcceptsTimerJobFactoryManager)TimerServiceRegistry.getInstance().get(timerServiceId))
+                Collection<TimerJobInstance> timers = TimerServiceRegistry.getInstance().get(timerServiceId)
                 .getTimerJobFactoryManager().getTimerJobInstances();
                 for (TimerJobInstance instance : timers) {
                     if (((GlobalQuartzJobHandle)instance.getJobHandle()).getJobName().equals(jobname)) {

diff --git a/jbpm-flow/src/main/java/org/jbpm/process/core/timer/impl/RegisteredTimerServiceDelegate.java b/jbpm-flow/src/main/java/org/jbpm/process/core/timer/impl/RegisteredTimerServiceDelegate.java
@@ -15,9 +15,6 @@
  */
 package org.jbpm.process.core.timer.impl;
 
-import java.util.Collection;
-
-import org.drools.core.time.AcceptsTimerJobFactoryManager;
 import org.drools.core.time.InternalSchedulerService;
 import org.drools.core.time.Job;
 import org.drools.core.time.JobContext;
@@ -29,6 +26,8 @@
 import org.jbpm.process.core.timer.TimerServiceRegistry;
 import org.kie.api.time.SessionClock;
 
+import java.util.Collection;
+
 /**
  * Simple delegate for timer service that fetches the real instance of timer service from
  * TimerServiceRegistry under "default" key.
@@ -44,8 +43,7 @@
  * </code>
  *
  */
-public class RegisteredTimerServiceDelegate implements TimerService, InternalSchedulerService,
+public class RegisteredTimerServiceDelegate implements TimerService, InternalSchedulerService, SessionClock {
-                                                    AcceptsTimerJobFactoryManager, SessionClock {
 
     private TimerService timerService;
 
@@ -74,12 +72,12 @@ public boolean removeJob(JobHandle jobHandle) {
     @Override
     public void setTimerJobFactoryManager(
             TimerJobFactoryManager timerJobFactoryManager) {
-        ((AcceptsTimerJobFactoryManager)timerService).setTimerJobFactoryManager(timerJobFactoryManager);
+        timerService.setTimerJobFactoryManager(timerJobFactoryManager);
     }
 
     @Override
     public TimerJobFactoryManager getTimerJobFactoryManager() {
-        return ((AcceptsTimerJobFactoryManager)timerService).getTimerJobFactoryManager();
+        return timerService.getTimerJobFactoryManager();
     }
 
     @Override

diff --git a/jbpm-flow/src/main/java/org/jbpm/process/core/timer/impl/ThreadPoolSchedulerService.java b/jbpm-flow/src/main/java/org/jbpm/process/core/timer/impl/ThreadPoolSchedulerService.java
@@ -15,16 +15,6 @@
  */
 package org.jbpm.process.core.timer.impl;
 
-import java.io.Serializable;
-import java.util.Date;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicLong;
-
-import org.drools.core.time.AcceptsTimerJobFactoryManager;
 import org.drools.core.time.InternalSchedulerService;
 import org.drools.core.time.Job;
 import org.drools.core.time.JobContext;
@@ -40,6 +30,15 @@
 import org.jbpm.process.instance.timer.TimerManager.ProcessJobContext;
 import org.jbpm.process.instance.timer.TimerManager.StartProcessJobContext;
 
+import java.io.Serializable;
+import java.util.Date;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+
 /**
  * ThreadPool based scheduler service backed by <code>ThreadPoolSchedulerService</code>
  *
@@ -99,7 +98,7 @@ public JobHandle scheduleJob(Job job, JobContext ctx, Trigger trigger) {
             }
             GlobalJDKJobHandle jobHandle = new GlobalJDKJobHandle( idCounter.getAndIncrement() );
 
-            TimerJobInstance jobInstance = ((AcceptsTimerJobFactoryManager) globalTimerService).
+            TimerJobInstance jobInstance = globalTimerService.
                                  getTimerJobFactoryManager().createTimerJobInstance( job,
                                                                                      ctx,
                                                                                      trigger,
@@ -137,8 +136,7 @@ public boolean removeJob(JobHandle jobHandle) {
                 jobname = "StartProcess-"+((StartProcessJobContext) processCtx).getProcessId()+ "-" + processCtx.getTimer().getId();
             }
             activeTimer.remove(jobname);
-            ((AcceptsTimerJobFactoryManager) globalTimerService).getTimerJobFactoryManager().
+            globalTimerService.getTimerJobFactoryManager().removeTimerJobInstance( ((GlobalJDKJobHandle) jobHandle).getTimerJobInstance() );
-            removeTimerJobInstance( ((GlobalJDKJobHandle) jobHandle).getTimerJobInstance() );
         } catch (ClassCastException e) {
             // do nothing in case ProcessJobContext was not given
         }
@@ -169,7 +167,7 @@ public void internalSchedule(TimerJobInstance timerJobInstance) {
         }
 
         jobHandle.setFuture( future );
-        ((AcceptsTimerJobFactoryManager) globalTimerService).getTimerJobFactoryManager().addTimerJobInstance( timerJobInstance );
+        globalTimerService.getTimerJobFactoryManager().addTimerJobInstance( timerJobInstance );
     }
 
     public static class GlobalJDKJobHandle extends GlobalJobHandle implements Serializable {

diff --git a/jbpm-flow/src/main/java/org/jbpm/process/instance/ProcessRuntimeImpl.java b/jbpm-flow/src/main/java/org/jbpm/process/instance/ProcessRuntimeImpl.java
@@ -28,11 +28,11 @@
 import org.drools.core.marshalling.impl.MarshallerWriteContext;
 import org.drools.core.marshalling.impl.ProtobufMessages.ActionQueue.Action;
 import org.drools.core.phreak.PropagationEntry;
-import org.drools.core.time.AcceptsTimerJobFactoryManager;
 import org.drools.core.time.TimeUtils;
+import org.drools.core.time.TimerService;
+import org.drools.core.time.impl.CommandServiceTimerJobFactoryManager;
 import org.drools.core.time.impl.CronExpression;
-import org.drools.core.time.impl.DefaultTimerJobFactoryManager;
+import org.drools.core.time.impl.ThreadSafeTrackableTimeJobFactoryManager;
-import org.drools.core.time.impl.TrackableTimeJobFactoryManager;
 import org.jbpm.process.core.event.EventFilter;
 import org.jbpm.process.core.event.EventTransformer;
 import org.jbpm.process.core.event.EventTypeFilter;
@@ -87,11 +87,11 @@ public class ProcessRuntimeImpl implements InternalProcessRuntime {
 
 	public ProcessRuntimeImpl(InternalKnowledgeRuntime kruntime) {
 		this.kruntime = kruntime;
-        AcceptsTimerJobFactoryManager jfm = ( AcceptsTimerJobFactoryManager ) kruntime.getTimerService();
+        TimerService timerService = kruntime.getTimerService();
-        if ( jfm.getTimerJobFactoryManager() instanceof DefaultTimerJobFactoryManager ) {
+        if ( !(timerService.getTimerJobFactoryManager() instanceof CommandServiceTimerJobFactoryManager) ) {
-            jfm.setTimerJobFactoryManager( new TrackableTimeJobFactoryManager() );
+            timerService.setTimerJobFactoryManager( new ThreadSafeTrackableTimeJobFactoryManager() );
-        }		
+        }
-		((AcceptsTimerJobFactoryManager)kruntime.getTimerService()).setTimerJobFactoryManager( new TrackableTimeJobFactoryManager() );		
+
 		((CompositeClassLoader) getRootClassLoader()).addClassLoader( getClass().getClassLoader() );
 		initProcessInstanceManager();
 		initSignalManager();
@@ -116,10 +116,10 @@ private void initStartTimers() {
     }
 
 	public ProcessRuntimeImpl(InternalWorkingMemory workingMemory) {
-		AcceptsTimerJobFactoryManager jfm = ( AcceptsTimerJobFactoryManager ) workingMemory.getTimerService();
+        TimerService timerService = workingMemory.getTimerService();
-		if ( jfm.getTimerJobFactoryManager() instanceof DefaultTimerJobFactoryManager ) {
+        if ( !(timerService.getTimerJobFactoryManager() instanceof CommandServiceTimerJobFactoryManager) ) {
-		    jfm.setTimerJobFactoryManager( new TrackableTimeJobFactoryManager() );
+            timerService.setTimerJobFactoryManager( new ThreadSafeTrackableTimeJobFactoryManager() );
-		}
+        }
 
 		this.kruntime = (InternalKnowledgeRuntime) workingMemory.getKnowledgeRuntime();
 		initProcessInstanceManager();

diff --git a/jbpm-flow/src/main/java/org/jbpm/process/instance/timer/TimerManager.java b/jbpm-flow/src/main/java/org/jbpm/process/instance/timer/TimerManager.java
@@ -17,6 +17,7 @@
 package org.jbpm.process.instance.timer;
 
 import org.drools.core.common.InternalKnowledgeRuntime;
+import org.drools.core.common.InternalWorkingMemory;
 import org.drools.core.marshalling.impl.MarshallerReaderContext;
 import org.drools.core.marshalling.impl.MarshallerWriteContext;
 import org.drools.core.marshalling.impl.ProtobufInputMarshaller;
@@ -409,6 +410,10 @@ public void setKnowledgeRuntime(InternalKnowledgeRuntime kruntime) {
             this.kruntime = kruntime;
         }
 
+        @Override
+        public InternalWorkingMemory getWorkingMemory() {
+            return kruntime instanceof InternalWorkingMemory ? (InternalWorkingMemory)kruntime : null;
+        }
     }
 
     public static class StartProcessJobContext extends ProcessJobContext {

diff --git a/...m-human-task-core/src/main/java/org/jbpm/services/task/impl/TaskDeadlinesServiceImpl.java b/...m-human-task-core/src/main/java/org/jbpm/services/task/impl/TaskDeadlinesServiceImpl.java
@@ -15,17 +15,7 @@
  */
 package org.jbpm.services.task.impl;
 
-import java.io.Serializable;
+import org.drools.core.common.InternalWorkingMemory;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
 import org.drools.core.time.Job;
 import org.drools.core.time.JobContext;
 import org.drools.core.time.JobHandle;
@@ -50,6 +40,17 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.Serializable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
 public class TaskDeadlinesServiceImpl implements TaskDeadlinesService {
 
     private static final Logger logger = LoggerFactory.getLogger(TaskDeadlinesServiceImpl.class);
@@ -349,7 +350,11 @@ public String getJobName() {
 		public Long getProcessInstanceId() {
 			return processInstanceId;
 		}
-
+
+        @Override
+        public InternalWorkingMemory getWorkingMemory() {
+            return null;
+        }
     }