First version of crystalball added to Explorer

p13766 · Jul 21, 2014 · f2eb4b7 · f2eb4b7
1 parent ad69603
commit f2eb4b7
Show file tree

Hide file tree

Showing 21 changed files with 379 additions and 68 deletions.
diff --git a/...i-crystalball/src/main/java/org/activiti/crystalball/simulator/AbstractSimulationRun.java b/...i-crystalball/src/main/java/org/activiti/crystalball/simulator/AbstractSimulationRun.java
@@ -14,15 +14,15 @@
  */
 
 
-import org.activiti.engine.delegate.VariableScope;
-import org.activiti.engine.impl.ProcessEngineImpl;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.activiti.engine.ProcessEngine;
+import org.activiti.engine.delegate.VariableScope;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * This class implements all methods for Simulation run
  *
@@ -37,7 +37,7 @@ public abstract class AbstractSimulationRun implements SimulationRun, Simulation
    * Map for eventType -> event handlers to execute events on simulation engine
    */
   protected Map<String, SimulationEventHandler> eventHandlerMap = new HashMap<String, SimulationEventHandler>();
-  protected ProcessEngineImpl processEngine;
+  protected ProcessEngine processEngine;
 
   public AbstractSimulationRun(Map<String, SimulationEventHandler> eventHandlers) {
     if (eventHandlers != null && !eventHandlers.isEmpty()) {

diff --git a/.../activiti-crystalball/src/main/java/org/activiti/crystalball/simulator/EventCalendar.java b/.../activiti-crystalball/src/main/java/org/activiti/crystalball/simulator/EventCalendar.java
@@ -1,5 +1,7 @@
 package org.activiti.crystalball.simulator;
 
+import java.util.List;
+
 /* 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
@@ -27,6 +29,8 @@ public interface EventCalendar {
   SimulationEvent removeFirstEvent();
 
   void addEvent(SimulationEvent event);
+
+  List<SimulationEvent> getEvents();
 
   void clear();
 }
diff --git a/...iti-crystalball/src/main/java/org/activiti/crystalball/simulator/ReplaySimulationRun.java b/...iti-crystalball/src/main/java/org/activiti/crystalball/simulator/ReplaySimulationRun.java
@@ -14,11 +14,12 @@
  */
 
 
-import org.activiti.engine.delegate.VariableScope;
-import org.activiti.engine.impl.ProcessEngineImpl;
-
 import java.util.Map;
 
+import org.activiti.engine.ProcessEngine;
+import org.activiti.engine.delegate.VariableScope;
+import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
+
 /**
  * This class provides simulation run for replay purposes
  * replay uses real time and running engine to execute simulation events.
@@ -29,11 +30,11 @@ public class ReplaySimulationRun extends AbstractSimulationRun {
 
   private final EventCalendar eventCalendar;
 
-  public ReplaySimulationRun(ProcessEngineImpl processEngine, Map<String, SimulationEventHandler> customEventHandlerMap) {
+  public ReplaySimulationRun(ProcessEngine processEngine, Map<String, SimulationEventHandler> customEventHandlerMap) {
     this(processEngine, new SimpleEventCalendar(processEngine.getProcessEngineConfiguration().getClock(), new SimulationEventComparator()), customEventHandlerMap);
   }
 
-  public ReplaySimulationRun(ProcessEngineImpl processEngine, EventCalendar eventCalendar, Map<String, SimulationEventHandler> customEventHandlerMap) {
+  public ReplaySimulationRun(ProcessEngine processEngine, EventCalendar eventCalendar, Map<String, SimulationEventHandler> customEventHandlerMap) {
     super(customEventHandlerMap);
     this.processEngine = processEngine;
     this.eventCalendar = eventCalendar;
@@ -43,7 +44,8 @@ public ReplaySimulationRun(ProcessEngineImpl processEngine, EventCalendar eventC
   protected void initSimulationRunContext(VariableScope execution) {
     SimulationRunContext.setEventCalendar(eventCalendar);
     SimulationRunContext.setProcessEngine(processEngine);
-    SimulationRunContext.setSimulationRunId(processEngine.getProcessEngineConfiguration().getIdGenerator().getNextId());
+    ProcessEngineConfigurationImpl configuration = (ProcessEngineConfigurationImpl) processEngine.getProcessEngineConfiguration();
+    SimulationRunContext.setSimulationRunId(configuration.getIdGenerator().getNextId());
   }
 
   /**

diff --git a/...iti-crystalball/src/main/java/org/activiti/crystalball/simulator/SimpleEventCalendar.java b/...iti-crystalball/src/main/java/org/activiti/crystalball/simulator/SimpleEventCalendar.java
@@ -14,15 +14,16 @@
  */
 
 
-import org.activiti.engine.runtime.ClockReader;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
 
+import org.activiti.engine.ActivitiException;
+import org.activiti.engine.runtime.ClockReader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 /**
  * @author martin.grofcik
  */
@@ -63,8 +64,9 @@ public SimulationEvent removeFirstEvent() {
 
 		SimulationEvent minEvent = eventList.remove( minIndex );
 
-		if (minEvent.hasSimulationTime() && minEvent.getSimulationTime() < this.clockReader.getCurrentTime().getTime())
-			throw new RuntimeException("Unable to execute event from the past");
+		if (minEvent.hasSimulationTime() && minEvent.getSimulationTime() < this.clockReader.getCurrentTime().getTime()) {
+			throw new ActivitiException("Unable to execute event from the past");
+		}
 
 		if (eventList.isEmpty()) { 
 			minIndex = NULL;
@@ -80,6 +82,11 @@ public SimulationEvent removeFirstEvent() {
 		}
 		return minEvent;
 	}
+
+  @Override
+  public List<SimulationEvent> getEvents() {
+    return eventList;
+  }
 
 	@Override
   public void addEvent(SimulationEvent event) {

diff --git a/...ti-crystalball/src/main/java/org/activiti/crystalball/simulator/SimulationRunContext.java b/...ti-crystalball/src/main/java/org/activiti/crystalball/simulator/SimulationRunContext.java
@@ -12,16 +12,16 @@
  */
 package org.activiti.crystalball.simulator;
 
+import java.util.Stack;
+
 import org.activiti.engine.HistoryService;
+import org.activiti.engine.ProcessEngine;
 import org.activiti.engine.RepositoryService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.delegate.VariableScope;
-import org.activiti.engine.impl.ProcessEngineImpl;
 import org.activiti.engine.runtime.Clock;
 
-import java.util.Stack;
-
 /**
  * Context in which simulation is run.
  * It contains references to process engine, event calendar.
@@ -33,7 +33,7 @@ public abstract class SimulationRunContext {
 	//
 	//  Process engine on which simulation will be executed
 	//
-	protected static ThreadLocal<Stack<ProcessEngineImpl>> processEngineThreadLocal = new ThreadLocal<Stack<ProcessEngineImpl>>();
+	protected static ThreadLocal<Stack<ProcessEngine>> processEngineThreadLocal = new ThreadLocal<Stack<ProcessEngine>>();
 
   //
   // Simulation objects
@@ -51,18 +51,18 @@ public abstract class SimulationRunContext {
   protected static ThreadLocal<Stack<VariableScope>> executionThreadLocal = new ThreadLocal<Stack<VariableScope>>();
 
   public static RuntimeService getRuntimeService() {
-		Stack<ProcessEngineImpl> stack = getStack(processEngineThreadLocal);
+		Stack<ProcessEngine> stack = getStack(processEngineThreadLocal);
 		if (stack.isEmpty()) {
 			return null;
 		}
 		return stack.peek().getRuntimeService();
 	}
 
-	public static void setProcessEngine(ProcessEngineImpl processEngine) {
+	public static void setProcessEngine(ProcessEngine processEngine) {
 	  getStack(processEngineThreadLocal).push(processEngine);
 	}
 
-  public static ProcessEngineImpl getProcessEngine() {
+  public static ProcessEngine getProcessEngine() {
     return getStack(processEngineThreadLocal).peek();
   }
 
@@ -71,7 +71,7 @@ public static void removeProcessEngine() {
 	}
 
 	public static TaskService getTaskService() {
-		Stack<ProcessEngineImpl> stack = getStack(processEngineThreadLocal);
+		Stack<ProcessEngine> stack = getStack(processEngineThreadLocal);
 		if (stack.isEmpty()) {
 			return null;
 		}
@@ -107,7 +107,7 @@ public static void removeEventCalendar() {
 	}
 
 	public static HistoryService getHistoryService() {
-		Stack<ProcessEngineImpl> stack = getStack(processEngineThreadLocal);
+		Stack<ProcessEngine> stack = getStack(processEngineThreadLocal);
 		if (stack.isEmpty()) {
 			return null;
 		}
@@ -116,7 +116,7 @@ public static HistoryService getHistoryService() {
 
 
   public static RepositoryService getRepositoryService() {
-		Stack<ProcessEngineImpl> stack = getStack(processEngineThreadLocal);
+		Stack<ProcessEngine> stack = getStack(processEngineThreadLocal);
 		if (stack.isEmpty()) {
 			return null;
 		}

diff --git a/...i/crystalball/simulator/delegate/event/impl/EventLogProcessInstanceCreateTransformer.java b/...i/crystalball/simulator/delegate/event/impl/EventLogProcessInstanceCreateTransformer.java
@@ -66,10 +66,10 @@ public SimulationEvent apply(EventLogEntry event) {
       simEventProperties.put(variablesKey, variableMap);
       simEventProperties.put(PROCESS_INSTANCE_ID, processInstanceId);
 
-      return new SimulationEvent.Builder(simulationEventType).
-                  priority((int) event.getLogNumber()).
-                  properties(simEventProperties).
-                  build();
+      return new SimulationEvent.Builder(simulationEventType)
+          .priority((int) event.getLogNumber())
+          .properties(simEventProperties)
+          .build();
     }
     return null;
   }

diff --git a/...tiviti/crystalball/simulator/delegate/event/impl/EventLogUserTaskCompleteTransformer.java b/...tiviti/crystalball/simulator/delegate/event/impl/EventLogUserTaskCompleteTransformer.java
@@ -73,11 +73,10 @@ public SimulationEvent apply(EventLogEntry event) {
         properties.put(VARIABLES_LOCAL_SCOPE, localScope);
       }
 
-      return
-          new SimulationEvent.Builder(this.simulationEventType).
-            priority((int) event.getLogNumber()).
-            properties(properties).
-            build();
+      return new SimulationEvent.Builder(this.simulationEventType)
+          .priority((int) event.getLogNumber())
+          .properties(properties)
+          .build();
     }
     return null;
   }

diff --git a/...all/src/main/java/org/activiti/crystalball/simulator/impl/StartReplayLogEventHandler.java b/...all/src/main/java/org/activiti/crystalball/simulator/impl/StartReplayLogEventHandler.java
@@ -59,7 +59,7 @@ public void init() {
   public void handle(SimulationEvent event) {
     // start process now
     String processDefinitionId = (String) event.getProperty(processToStartIdKey);
-    String businessKey = (String) event.getProperty(this.businessKey);
+    String eventBusinessKey = (String) event.getProperty(this.businessKey);
     Map<String, Object> variables = new HashMap<String, Object>();
     Map<String, Object> processVariables = (Map<String, Object>) event.getProperty(variablesKey);
     if (processVariables != null) {
@@ -68,7 +68,13 @@ public void handle(SimulationEvent event) {
     variables.put(PROCESS_INSTANCE_ID, processInstanceId);
     variables.put(SIMULATION_RUN_ID, SimulationRunContext.getSimulationRunId());
 
-    log.debug("Starting new processDefId[{}] businessKey[{}] with variables[{}]", processDefinitionId, businessKey, variables);
-    SimulationRunContext.getRuntimeService().startProcessInstanceById(processDefinitionId, businessKey, variables);
+    String startBusinessKey = null;
+    if (eventBusinessKey != null) {
+      startBusinessKey = eventBusinessKey;
+    } else {
+      startBusinessKey = this.businessKey;
+    }
+    log.debug("Starting new processDefId[{}] businessKey[{}] with variables[{}]", processDefinitionId, startBusinessKey, variables);
+    SimulationRunContext.getRuntimeService().startProcessInstanceById(processDefinitionId, startBusinessKey, variables);
   }
 }
diff --git a/...ystalball/src/test/java/org/activiti/crystalball/simulator/impl/replay/ReplayRunTest.java b/...ystalball/src/test/java/org/activiti/crystalball/simulator/impl/replay/ReplayRunTest.java
@@ -122,7 +122,7 @@ private ProcessEngineConfigurationImpl getProcessEngineConfiguration() {
     ProcessEngineConfigurationImpl configuration = new org.activiti.engine.impl.cfg.StandaloneInMemProcessEngineConfiguration();
     configuration.
       setHistory("full").
-      setDatabaseSchemaUpdate("create-drop").
+      setDatabaseSchemaUpdate("drop-create").
       setJobExecutorActivate(false);
     configuration.setCustomDefaultBpmnParseHandlers(Arrays.<BpmnParseHandler>asList(new AddListenerUserTaskParseHandler(TaskListener.EVENTNAME_CREATE, new UserTaskExecutionListener(USER_TASK_COMPLETED_EVENT_TYPE, USER_TASK_COMPLETED_EVENT_TYPE, listener.getSimulationEvents()))));
     configuration.setEventListeners(Arrays.<ActivitiEventListener>asList(listener));

diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/ManagementService.java b/modules/activiti-engine/src/main/java/org/activiti/engine/ManagementService.java
@@ -144,6 +144,17 @@ public interface ManagementService {
    */
   List<EventLogEntry> getEventLogEntries(Long startLogNr, Long pageSize);
 
+  /**
+   * [EXPERIMENTAL]
+   * 
+   * Returns a list of event log entries for a specific process instance id.
+   * Note that the event logging must specifically must be enabled in the process engine configuration.
+   * 
+   * Passing null as arguments will effectively fetch ALL event log entries. 
+   * Be careful, as this list might be huge!
+   */
+  List<EventLogEntry> getEventLogEntriesByProcessInstanceId(String processInstanceId);
+
   /**
    * Delete a EventLogEntry.
    * Typically only used in testing, as deleting log entries defeats the whole purpose of keeping a log.

diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/ManagementServiceImpl.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/ManagementServiceImpl.java
@@ -12,10 +12,25 @@
  */
 package org.activiti.engine.impl;
 
+import java.sql.Connection;
+import java.util.List;
+import java.util.Map;
+
 import org.activiti.engine.ActivitiIllegalArgumentException;
 import org.activiti.engine.ManagementService;
 import org.activiti.engine.event.EventLogEntry;
-import org.activiti.engine.impl.cmd.*;
+import org.activiti.engine.impl.cmd.CancelJobCmd;
+import org.activiti.engine.impl.cmd.CustomSqlExecution;
+import org.activiti.engine.impl.cmd.DeleteEventLogEntry;
+import org.activiti.engine.impl.cmd.ExecuteCustomSqlCmd;
+import org.activiti.engine.impl.cmd.ExecuteJobsCmd;
+import org.activiti.engine.impl.cmd.GetEventLogEntriesCmd;
+import org.activiti.engine.impl.cmd.GetJobExceptionStacktraceCmd;
+import org.activiti.engine.impl.cmd.GetPropertiesCmd;
+import org.activiti.engine.impl.cmd.GetTableCountCmd;
+import org.activiti.engine.impl.cmd.GetTableMetaDataCmd;
+import org.activiti.engine.impl.cmd.GetTableNameCmd;
+import org.activiti.engine.impl.cmd.SetJobRetriesCmd;
 import org.activiti.engine.impl.db.DbSqlSession;
 import org.activiti.engine.impl.db.DbSqlSessionFactory;
 import org.activiti.engine.impl.interceptor.Command;
@@ -25,10 +40,6 @@
 import org.activiti.engine.management.TablePageQuery;
 import org.activiti.engine.runtime.JobQuery;
 
-import java.sql.Connection;
-import java.util.List;
-import java.util.Map;
-
 
 /**
  * @author Tom Baeyens
@@ -118,6 +129,11 @@ public List<EventLogEntry> getEventLogEntries(Long startLogNr, Long pageSize) {
   	return commandExecutor.execute(new GetEventLogEntriesCmd(startLogNr, pageSize));
   }
 
+  @Override
+  public List<EventLogEntry> getEventLogEntriesByProcessInstanceId(String processInstanceId) {
+    return commandExecutor.execute(new GetEventLogEntriesCmd(processInstanceId));
+  }
+
   @Override
   public void deleteEventLogEntry(long logNr) {
   	commandExecutor.execute(new DeleteEventLogEntry(logNr));

diff --git a/...les/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetEventLogEntriesCmd.java b/...les/activiti-engine/src/main/java/org/activiti/engine/impl/cmd/GetEventLogEntriesCmd.java
@@ -11,26 +11,36 @@
  */
 public class GetEventLogEntriesCmd implements Command<List<EventLogEntry>> {
 
+  protected String processInstanceId = null;
 	protected Long startLogNr = null;
 	protected Long pageSize = null;
 
 	public GetEventLogEntriesCmd() {
 
 	}
 
+	public GetEventLogEntriesCmd(String processInstanceId) {
+    this.processInstanceId = processInstanceId;
+	}
+
 	public GetEventLogEntriesCmd(Long startLogNr, Long pageSize) {
 		this.startLogNr = startLogNr;
 		this.pageSize = pageSize;
 	}
 
 	@Override
 	public List<EventLogEntry> execute(CommandContext commandContext) {
-		if (startLogNr == null) {
-			return commandContext.getEventLogEntryEntityManager().findAllEventLogEntries();
-		}
-		return commandContext.getEventLogEntryEntityManager().findEventLogEntries(
-					startLogNr,
-					pageSize != null ? pageSize : -1);
+	  if (processInstanceId != null) {
+	    return commandContext.getEventLogEntryEntityManager().findEventLogEntriesByProcessInstanceId(processInstanceId);
+
+	  } else if (startLogNr != null) {
+	    return commandContext.getEventLogEntryEntityManager().findEventLogEntries(
+          startLogNr,
+          pageSize != null ? pageSize : -1);
+
+	  } else {
+	    return commandContext.getEventLogEntryEntityManager().findAllEventLogEntries();
+	  }
 	}
 
 }
diff --git a/modules/activiti-engine/src/main/java/org/activiti/engine/impl/db/DbSqlSessionFactory.java b/modules/activiti-engine/src/main/java/org/activiti/engine/impl/db/DbSqlSessionFactory.java
@@ -91,6 +91,7 @@ public class DbSqlSessionFactory implements SessionFactory {
     addDatabaseSpecificStatement("postgres", "insertEventLogEntry", "insertEventLogEntry_postgres");
     addDatabaseSpecificStatement("postgres", "selectAllEventLogEntries", "selectAllEventLogEntries_postgres");
     addDatabaseSpecificStatement("postgres", "selectEventLogEntries", "selectEventLogEntries_postgres");
+    addDatabaseSpecificStatement("postgres", "selectEventLogEntriesByProcessInstanceId", "selectEventLogEntriesByProcessInstanceId_postgres");
 
     // oracle
     databaseSpecificLimitBeforeStatements.put("oracle", "select * from ( select a.*, ROWNUM rnum from (");