[jbpm-commits] JBoss JBPM SVN: r3318 - jbpm3/trunk/modules/core/src/main/java/org/jbpm/command.
do-not-reply at jboss.org
do-not-reply at jboss.org
Wed Dec 10 08:45:18 EST 2008
Author: camunda
Date: 2008-12-10 08:45:18 -0500 (Wed, 10 Dec 2008)
New Revision: 3318
Added:
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractBaseCommand.java
Modified:
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractGetObjectBaseCommand.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractProcessInstanceBaseCommand.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/BatchSignalCommand.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CancelTokenCommand.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CancelWorkOnTaskCommand.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CompositeCommand.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/DeleteProcessDefinitionCommand.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ExecuteJobsCommand.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessDefinitionCommand.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessDefinitionsCommand.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstanceCommand.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstanceLogCommand.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstancesCommand.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetTaskInstanceCommand.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetTaskListCommand.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/NewProcessInstanceCommand.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ResumeProcessInstanceCommand.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/SignalCommand.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/StartProcessInstanceCommand.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/StartWorkOnTaskCommand.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/SuspendProcessInstanceCommand.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/TaskInstanceEndCommand.java
jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/VariablesCommand.java
Log:
JBPM-1904:
Introduced new Command Base class (AbstractBaseCommand).
Added improved toString method for Commands.
Added: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractBaseCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractBaseCommand.java (rev 0)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractBaseCommand.java 2008-12-10 13:45:18 UTC (rev 3318)
@@ -0,0 +1,23 @@
+package org.jbpm.command;
+
+
+/**
+ * Base class for all internal commands. Implements some
+ * convenience methods for {@link Command}s and generic toString
+ * method.
+ *
+ * @author bernd.ruecker at camunda.com
+ */
+public abstract class AbstractBaseCommand implements Command
+{
+ public String toString() {
+ return this.getClass().getName()
+ + " ["
+ + getAdditionalToStringInformation()
+ + "]";
+ }
+
+ public String getAdditionalToStringInformation() {
+ return "";
+ }
+}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractGetObjectBaseCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractGetObjectBaseCommand.java 2008-12-10 13:19:08 UTC (rev 3317)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractGetObjectBaseCommand.java 2008-12-10 13:45:18 UTC (rev 3318)
@@ -19,7 +19,7 @@
*
* @author Bernd Ruecker (bernd.ruecker at camunda.com)
*/
-public abstract class AbstractGetObjectBaseCommand implements Command
+public abstract class AbstractGetObjectBaseCommand extends AbstractBaseCommand
{
static final Log log = LogFactory.getLog(AbstractGetObjectBaseCommand.class);
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractProcessInstanceBaseCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractProcessInstanceBaseCommand.java 2008-12-10 13:19:08 UTC (rev 3317)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/AbstractProcessInstanceBaseCommand.java 2008-12-10 13:45:18 UTC (rev 3318)
@@ -6,7 +6,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.hibernate.Query;
import org.jbpm.JbpmContext;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
@@ -25,7 +24,7 @@
*
* @author bernd.ruecker at camunda.com
*/
-public abstract class AbstractProcessInstanceBaseCommand implements Command
+public abstract class AbstractProcessInstanceBaseCommand extends AbstractBaseCommand
{
protected Log log = LogFactory.getLog(this.getClass());
@@ -117,6 +116,9 @@
return this;
}
+ /**
+ * Overwrite toString to keep semantic of getAdditionalToStringInformation
+ */
public String toString() {
if (processName!=null) {
return this.getClass().getName()
@@ -135,10 +137,6 @@
}
}
- public String getAdditionalToStringInformation() {
- return "";
- }
-
public String getProcessName()
{
return processName;
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/BatchSignalCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/BatchSignalCommand.java 2008-12-10 13:19:08 UTC (rev 3317)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/BatchSignalCommand.java 2008-12-10 13:45:18 UTC (rev 3318)
@@ -59,4 +59,11 @@
this.inStateAtLeastSince = inStateAtLeastSince;
}
+ @Override
+ public String getAdditionalToStringInformation()
+ {
+ return ";transitionName=" + transitionName
+ + ";inStateAtLeastSince=" + inStateAtLeastSince;
+ }
+
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CancelTokenCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CancelTokenCommand.java 2008-12-10 13:19:08 UTC (rev 3317)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CancelTokenCommand.java 2008-12-10 13:45:18 UTC (rev 3318)
@@ -1,11 +1,12 @@
package org.jbpm.command;
import org.jbpm.JbpmContext;
+import org.jbpm.graph.exe.Token;
/**
+ * Cancel a {@link Token}
*
* @author Bernd Ruecker (bernd.ruecker at camunda.com)
- *
*/
public class CancelTokenCommand extends AbstractCancelCommand implements Command
{
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CancelWorkOnTaskCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CancelWorkOnTaskCommand.java 2008-12-10 13:19:08 UTC (rev 3317)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CancelWorkOnTaskCommand.java 2008-12-10 13:45:18 UTC (rev 3318)
@@ -11,7 +11,7 @@
*
* @author Bernd Ruecker
*/
-public class CancelWorkOnTaskCommand implements Command
+public class CancelWorkOnTaskCommand extends AbstractBaseCommand
{
private static final long serialVersionUID = -172457633891242288L;
@@ -45,4 +45,10 @@
this.taskInstanceId = taskInstanceId;
}
+ @Override
+ public String getAdditionalToStringInformation()
+ {
+ return ";taskInstanceId=" + taskInstanceId;
+ }
+
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CompositeCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CompositeCommand.java 2008-12-10 13:19:08 UTC (rev 3317)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/CompositeCommand.java 2008-12-10 13:45:18 UTC (rev 3318)
@@ -75,4 +75,11 @@
}
return field;
}
+
+ @Override
+ public String toString()
+ {
+ return this.getClass().getSimpleName() + " consists of (" + commands + ")";
+ }
+
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/DeleteProcessDefinitionCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/DeleteProcessDefinitionCommand.java 2008-12-10 13:19:08 UTC (rev 3317)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/DeleteProcessDefinitionCommand.java 2008-12-10 13:45:18 UTC (rev 3318)
@@ -47,4 +47,10 @@
return Boolean.TRUE;
}
+ @Override
+ public String toString()
+ {
+ return this.getClass().getSimpleName() + " [processDefinition.id=" + id + "]";
+ }
+
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ExecuteJobsCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ExecuteJobsCommand.java 2008-12-10 13:19:08 UTC (rev 3317)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ExecuteJobsCommand.java 2008-12-10 13:45:18 UTC (rev 3318)
@@ -23,7 +23,7 @@
*
* @author ruecker
*/
-public class ExecuteJobsCommand implements Command
+public class ExecuteJobsCommand extends AbstractBaseCommand
{
private static final long serialVersionUID = -2457066688404533959L;
@@ -171,4 +171,5 @@
}
return nextDueDate;
}
+
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessDefinitionCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessDefinitionCommand.java 2008-12-10 13:19:08 UTC (rev 3317)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessDefinitionCommand.java 2008-12-10 13:45:18 UTC (rev 3318)
@@ -60,4 +60,12 @@
{
this.version = version;
}
+
+ @Override
+ public String getAdditionalToStringInformation()
+ {
+ return "name=" + name
+ + ";version=" + version;
+ }
+
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessDefinitionsCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessDefinitionsCommand.java 2008-12-10 13:19:08 UTC (rev 3317)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessDefinitionsCommand.java 2008-12-10 13:45:18 UTC (rev 3318)
@@ -54,5 +54,10 @@
{
this.onlyLatest = onlyLatest;
}
+ @Override
+ public String getAdditionalToStringInformation()
+ {
+ return "onlyLatest=" + onlyLatest;
+ }
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstanceCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstanceCommand.java 2008-12-10 13:19:08 UTC (rev 3317)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstanceCommand.java 2008-12-10 13:45:18 UTC (rev 3318)
@@ -84,4 +84,12 @@
this.tokenId = tokenId;
}
+ @Override
+ public String getAdditionalToStringInformation()
+ {
+ return "processInstanceId=" + processInstanceId
+ + ";tokenId=" + tokenId
+ + ";taskInstanceId=" + taskInstanceId;
+ }
+
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstanceLogCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstanceLogCommand.java 2008-12-10 13:19:08 UTC (rev 3317)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstanceLogCommand.java 2008-12-10 13:45:18 UTC (rev 3318)
@@ -16,7 +16,7 @@
* @author Bernd Ruecker (bernd.ruecker at camunda.com)
*
*/
-public class GetProcessInstanceLogCommand implements Command
+public class GetProcessInstanceLogCommand extends AbstractBaseCommand
{
private static final long serialVersionUID = -2812852941518870502L;
@@ -90,4 +90,10 @@
this.processInstanceId = processInstanceId;
}
+ @Override
+ public String getAdditionalToStringInformation()
+ {
+ return "processInstanceId=" + processInstanceId;
+ }
+
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstancesCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstancesCommand.java 2008-12-10 13:19:08 UTC (rev 3317)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetProcessInstancesCommand.java 2008-12-10 13:45:18 UTC (rev 3318)
@@ -221,4 +221,17 @@
{
this.processId = processId;
}
+
+ @Override
+ public String getAdditionalToStringInformation()
+ {
+ return "processInstanceId=" + processId
+ + ";processDefinitionName=" + processName
+ + ";version=" + version
+ + ";stateName=" + stateName
+ + ";fromStartDate=" + fromStartDate
+ + ";untilStartDate=" + untilStartDate
+ + ";onlyRunning=" + onlyRunning;
+ }
+
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetTaskInstanceCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetTaskInstanceCommand.java 2008-12-10 13:19:08 UTC (rev 3317)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetTaskInstanceCommand.java 2008-12-10 13:45:18 UTC (rev 3318)
@@ -125,4 +125,11 @@
this.processInstanceId = processInstanceId;
}
+ @Override
+ public String getAdditionalToStringInformation()
+ {
+ return "processInstanceId=" + processInstanceId
+ + ";tokenId=" + tokenId
+ + ";taskInstanceId=" + taskInstanceId;
+ }
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetTaskListCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetTaskListCommand.java 2008-12-10 13:19:08 UTC (rev 3317)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/GetTaskListCommand.java 2008-12-10 13:45:18 UTC (rev 3318)
@@ -93,4 +93,11 @@
{
this.actor = actor;
}
+
+ @Override
+ public String getAdditionalToStringInformation()
+ {
+ return "actors=" + Arrays.toString( actor );
+ }
+
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/NewProcessInstanceCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/NewProcessInstanceCommand.java 2008-12-10 13:19:08 UTC (rev 3317)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/NewProcessInstanceCommand.java 2008-12-10 13:45:18 UTC (rev 3318)
@@ -36,7 +36,7 @@
*
* @author Jim Rigsbee, Tom Baeyens, Bernd Ruecker
*/
-public class NewProcessInstanceCommand implements Command
+public class NewProcessInstanceCommand extends AbstractBaseCommand
{
private static final long serialVersionUID = 1L;
@@ -175,4 +175,15 @@
{
this.key = key;
}
+
+ @Override
+ public String getAdditionalToStringInformation()
+ {
+ return "processDefinitionId=" + processDefinitionId
+ + ";processDefinitionName=" + processDefinitionName
+ + ";createStartTask=" + createStartTask
+ + ";businessKey=" + key
+ // TODO: not sure how this is
+ + ";variables=" + variables;
+ }
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ResumeProcessInstanceCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ResumeProcessInstanceCommand.java 2008-12-10 13:19:08 UTC (rev 3317)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/ResumeProcessInstanceCommand.java 2008-12-10 13:45:18 UTC (rev 3318)
@@ -1,6 +1,5 @@
package org.jbpm.command;
-import org.jbpm.JbpmContext;
import org.jbpm.graph.exe.ProcessInstance;
/**
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/SignalCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/SignalCommand.java 2008-12-10 13:19:08 UTC (rev 3317)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/SignalCommand.java 2008-12-10 13:45:18 UTC (rev 3318)
@@ -35,7 +35,7 @@
*
* @author ??, Bernd Ruecker
*/
-public class SignalCommand implements Command
+public class SignalCommand extends AbstractBaseCommand
{
private static final long serialVersionUID = 1L;
@@ -156,4 +156,15 @@
{
this.expectedStateName = expectedStateName;
}
+
+ @Override
+ public String getAdditionalToStringInformation()
+ {
+ return "tokenId=" + tokenId
+ + ";transitionName=" + transitionName
+ + ";processDefinitionName=" + expectedStateName
+ // TODO: not sure how this is
+ + ";variables=" + variables;
+ }
+
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/StartProcessInstanceCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/StartProcessInstanceCommand.java 2008-12-10 13:19:08 UTC (rev 3317)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/StartProcessInstanceCommand.java 2008-12-10 13:45:18 UTC (rev 3318)
@@ -45,4 +45,11 @@
this.startTransitionName = startTransitionName;
}
+ @Override
+ public String getAdditionalToStringInformation()
+ {
+ return super.getAdditionalToStringInformation()
+ + ";startTransitionName=" + startTransitionName;
+ }
+
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/StartWorkOnTaskCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/StartWorkOnTaskCommand.java 2008-12-10 13:19:08 UTC (rev 3317)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/StartWorkOnTaskCommand.java 2008-12-10 13:45:18 UTC (rev 3318)
@@ -10,7 +10,7 @@
*
* @author Bernd Ruecker
*/
-public class StartWorkOnTaskCommand implements Command
+public class StartWorkOnTaskCommand extends AbstractBaseCommand
{
private static final long serialVersionUID = 53004484398726736L;
@@ -78,4 +78,12 @@
{
return actorId;
}
+
+ @Override
+ public String getAdditionalToStringInformation()
+ {
+ return "tokenId=" + taskInstanceId
+ + ";transitionName=" + actorId
+ + ";processDefinitionName=" + overwriteSwimlane;
+ }
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/SuspendProcessInstanceCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/SuspendProcessInstanceCommand.java 2008-12-10 13:19:08 UTC (rev 3317)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/SuspendProcessInstanceCommand.java 2008-12-10 13:45:18 UTC (rev 3318)
@@ -1,6 +1,5 @@
package org.jbpm.command;
-import org.jbpm.JbpmContext;
import org.jbpm.graph.def.ProcessDefinition;
import org.jbpm.graph.exe.ProcessInstance;
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/TaskInstanceEndCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/TaskInstanceEndCommand.java 2008-12-10 13:19:08 UTC (rev 3317)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/TaskInstanceEndCommand.java 2008-12-10 13:45:18 UTC (rev 3318)
@@ -31,7 +31,7 @@
*
* @author ??, Bernd Ruecker (bernd.ruecker at camunda.com)
*/
-public class TaskInstanceEndCommand implements Command
+public class TaskInstanceEndCommand extends AbstractBaseCommand
{
private static final long serialVersionUID = 5721341060757950369L;
@@ -120,4 +120,12 @@
this.variables = variables;
}
+ @Override
+ public String getAdditionalToStringInformation()
+ {
+ return "taskInstanceId=" + taskInstanceId
+ + ";transitionName=" + transitionName
+ + ";variables=" + variables;
+ }
+
}
Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/VariablesCommand.java
===================================================================
--- jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/VariablesCommand.java 2008-12-10 13:19:08 UTC (rev 3317)
+++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/command/VariablesCommand.java 2008-12-10 13:45:18 UTC (rev 3318)
@@ -8,7 +8,7 @@
import org.jbpm.graph.exe.Token;
import org.jbpm.taskmgmt.exe.TaskInstance;
-public class VariablesCommand implements Command
+public class VariablesCommand extends AbstractBaseCommand
{
private static final long serialVersionUID = 1L;
@@ -91,4 +91,13 @@
{
this.variables = variables;
}
+
+ @Override
+ public String getAdditionalToStringInformation()
+ {
+ return "tokenId=" + tokenId
+ + ";taskInstanceId=" + taskInstanceId
+ + ";variables=" + variables;
+ }
+
}
More information about the jbpm-commits
mailing list