3:18 p.m.
Author: alex.guizar(a)jboss.com
Date: 2010-06-30 16:18:22 -0400 (Wed, 30 Jun 2010)
New Revision: 6445
Removed:
jbpm4/trunk/modules/integration/console/scripts/
Modified:
jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/JBPMIntegration.java
jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/services/HistoryService.java
jbpm4/trunk/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/exception/ConvertException.java
jbpm4/trunk/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/problem/Problem.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/ConfigurationImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/EnvironmentBindings.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/GroovyCompiledScript.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/JtaTransaction.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/JtaTransactionInterceptor.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransaction.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ClassDescriptor.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ClassWireTest.java
jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/LoadTestCase.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ContinuationTest.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveTestCommand.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceMessageTest.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingMessageTest.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingTestCommand.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/JobExecutorTestCase.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/NormalMessageTest.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/executions/ProcessExecutionTest.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/AddCommentCmd.java
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/MessageProcessingTest.java
Log:
JBPM-2893: fix raw type and unused import warnings
Modified:
jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/JBPMIntegration.java
===================================================================
---
jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/JBPMIntegration.java 2010-06-30
17:48:23 UTC (rev 6444)
+++
jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/JBPMIntegration.java 2010-06-30
20:18:22 UTC (rev 6445)
@@ -21,15 +21,12 @@
*/
package org.jbpm.integration.console;
-import org.jbpm.api.Configuration;
import org.jbpm.api.ExecutionService;
import org.jbpm.api.HistoryService;
import org.jbpm.api.ProcessEngine;
import org.jbpm.api.RepositoryService;
import org.jbpm.api.TaskService;
-import javax.naming.InitialContext;
-
/**
* Base class for jbpm integration
*
Modified:
jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/services/HistoryService.java
===================================================================
---
jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/services/HistoryService.java 2010-06-30
17:48:23 UTC (rev 6444)
+++
jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/services/HistoryService.java 2010-06-30
20:18:22 UTC (rev 6445)
@@ -10,13 +10,14 @@
import org.jboss.errai.bus.client.api.base.MessageBuilder;
import org.jboss.errai.bus.client.framework.MessageBus;
import org.jboss.errai.bus.server.annotations.Service;
+
+import org.jbpm.api.JbpmException;
import org.jbpm.api.history.HistoryActivityInstance;
import org.jbpm.api.history.HistoryProcessInstance;
import org.jbpm.integration.console.JBPMIntegration;
import org.jbpm.integration.console.ModelAdaptor;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
/**
@@ -43,26 +44,19 @@
String definitionId = message.get(String.class,
HistoryParts.PROCESS_DEFINITION_ID);
List<HistoryProcessInstanceRef> results =
getFinishedProcessInstances(definitionId);
- try
- {
- MessageBuilder.createConversation(message)
- .subjectProvided()
- .command(HistoryCommands.GET_FINISHED_PROCESS_INSTANCES)
- .with(HistoryParts.PROCESS_DEFINITION_ID, definitionId)
- .with(HistoryParts.INSTANCE_LIST, results)
- .errorsHandledBy(new ErrorCallback()
+ MessageBuilder.createConversation(message)
+ .subjectProvided()
+ .command(HistoryCommands.GET_FINISHED_PROCESS_INSTANCES)
+ .with(HistoryParts.PROCESS_DEFINITION_ID, definitionId)
+ .with(HistoryParts.INSTANCE_LIST, results)
+ .errorsHandledBy(new ErrorCallback()
+ {
+ public boolean error(Message message, Throwable throwable)
{
- public boolean error(Message message, Throwable throwable)
- {
- throw new RuntimeException("Failed to send message",
throwable);
- }
- })
- .sendNowWith(bus);
- }
- catch (Throwable e)
- {
- throw new RuntimeException("Sending failed", e);
- }
+ throw new JbpmException("Failed to send message", throwable);
+ }
+ })
+ .sendNowWith(bus);
break;
case GET_PROCESS_INSTANCE_HISTORY:
Modified:
jbpm4/trunk/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/exception/ConvertException.java
===================================================================
---
jbpm4/trunk/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/exception/ConvertException.java 2010-06-30
17:48:23 UTC (rev 6444)
+++
jbpm4/trunk/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/exception/ConvertException.java 2010-06-30
20:18:22 UTC (rev 6445)
@@ -30,9 +30,9 @@
private static final long serialVersionUID = 1L;
- protected List problems = null;
+ protected List<Problem> problems = null;
- public ConvertException(List problems) {
+ public ConvertException(List<Problem> problems) {
super(problems.toString());
this.problems = problems;
}
@@ -42,7 +42,7 @@
public ConvertException(String msg, Throwable e ) {
this(Collections.singletonList(new Problem(Problem.LEVEL_ERROR, msg, e)));
}
- public List getProblems() {
+ public List<Problem> getProblems() {
return problems;
}
}
Modified:
jbpm4/trunk/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/problem/Problem.java
===================================================================
---
jbpm4/trunk/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/problem/Problem.java 2010-06-30
17:48:23 UTC (rev 6444)
+++
jbpm4/trunk/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/problem/Problem.java 2010-06-30
20:18:22 UTC (rev 6445)
@@ -23,11 +23,9 @@
import java.io.Serializable;
import java.util.Collection;
-import java.util.Iterator;
/**
- * This class orginates from jpbm3 codebase
- *
+ * This class orginates from jbbm3 codebase
*/
public class Problem implements Serializable {
@@ -74,10 +72,8 @@
return buffer.toString();
}
- public static boolean containsProblemsOfLevel(Collection c, int level) {
- Iterator iter = c.iterator();
- while (iter.hasNext()) {
- Problem problem = (Problem) iter.next();
+ public static boolean containsProblemsOfLevel(Collection<Problem> problems, int
level) {
+ for (Problem problem : problems) {
if (problem.level <= level) {
return true;
}
Modified:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/ConfigurationImpl.java
===================================================================
---
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/ConfigurationImpl.java 2010-06-30
17:48:23 UTC (rev 6444)
+++
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cfg/ConfigurationImpl.java 2010-06-30
20:18:22 UTC (rev 6445)
@@ -89,7 +89,7 @@
if (isSpringEnabled) {
return SpringProcessEngine.create(this);
}
- return new ProcessEngineImpl(this);
+ return instantiateProcessEngine();
}
/**
Modified:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/EnvironmentBindings.java
===================================================================
---
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/EnvironmentBindings.java 2010-06-30
17:48:23 UTC (rev 6444)
+++
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/EnvironmentBindings.java 2010-06-30
20:18:22 UTC (rev 6445)
@@ -22,7 +22,6 @@
package org.jbpm.pvm.internal.script;
import java.util.Collection;
-import java.util.Collections;
import java.util.Map;
import java.util.Set;
@@ -30,7 +29,6 @@
import org.jbpm.pvm.internal.env.EnvironmentImpl;
-
/**
* @author Tom Baeyens
* @author Huisheng Xu
@@ -44,50 +42,52 @@
}
public Object get(Object key) {
- return environment.get((String)key);
+ return environment.get((String) key);
}
public boolean containsKey(Object key) {
- return (get(key)!=null);
+ return get(key) != null;
}
public Object put(String key, Object value) {
- return null;
+ // return named object, if any, to comply with Map contract
+ // ignore put otherwise
+ return environment.get(key);
}
- public void putAll(Map< ? extends String, ? extends Object> toMerge) {
- //
+ public void putAll(Map<? extends String, ? extends Object> toMerge) {
+ // ignore puts
}
public Object remove(Object key) {
- return null;
+ throw new UnsupportedOperationException();
}
public void clear() {
- //
+ throw new UnsupportedOperationException();
}
public boolean containsValue(Object value) {
- return false;
+ throw new UnsupportedOperationException();
}
- public Set<java.util.Map.Entry<String, Object>> entrySet() {
- return Collections.EMPTY_SET;
+ public Set<Entry<String, Object>> entrySet() {
+ throw new UnsupportedOperationException();
}
public boolean isEmpty() {
- return true;
+ throw new UnsupportedOperationException();
}
public Set<String> keySet() {
- return Collections.EMPTY_SET;
+ throw new UnsupportedOperationException();
}
public int size() {
- return 0;
+ throw new UnsupportedOperationException();
}
public Collection<Object> values() {
- return Collections.EMPTY_SET;
+ throw new UnsupportedOperationException();
}
}
Modified:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/GroovyCompiledScript.java
===================================================================
---
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/GroovyCompiledScript.java 2010-06-30
17:48:23 UTC (rev 6444)
+++
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/script/GroovyCompiledScript.java 2010-06-30
20:18:22 UTC (rev 6445)
@@ -29,25 +29,28 @@
*/
package org.jbpm.pvm.internal.script;
-import javax.script.*;
+import javax.script.CompiledScript;
+import javax.script.ScriptContext;
+import javax.script.ScriptEngine;
+import javax.script.ScriptException;
public class GroovyCompiledScript extends CompiledScript {
-
- private GroovyScriptEngine engine;
- private Class clasz;
-
- public GroovyCompiledScript(GroovyScriptEngine engine, Class clasz) {
- this.engine = engine;
- this.clasz = clasz;
- }
-
- public Object eval(ScriptContext context) throws ScriptException {
- return engine.eval(clasz, context);
- }
-
- public ScriptEngine getEngine() {
- return engine;
- }
-
+
+ private GroovyScriptEngine engine;
+ private Class<?> clasz;
+
+ public GroovyCompiledScript(GroovyScriptEngine engine, Class<?> clasz) {
+ this.engine = engine;
+ this.clasz = clasz;
+ }
+
+ public Object eval(ScriptContext context) throws ScriptException {
+ return engine.eval(clasz, context);
+ }
+
+ public ScriptEngine getEngine() {
+ return engine;
+ }
+
}
Modified:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/JtaTransaction.java
===================================================================
---
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/JtaTransaction.java 2010-06-30
17:48:23 UTC (rev 6444)
+++
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/JtaTransaction.java 2010-06-30
20:18:22 UTC (rev 6445)
@@ -31,12 +31,11 @@
import org.jbpm.api.JbpmException;
import org.jbpm.internal.log.Log;
-
/**
* @author Tom Baeyens
* @author Huisheng Xu
*/
-public class JtaTransaction extends AbstractTransaction implements Transaction {
+public class JtaTransaction extends AbstractTransaction {
private static Log log = Log.getLog(JtaTransaction.class.getName());
Modified:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/JtaTransactionInterceptor.java
===================================================================
---
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/JtaTransactionInterceptor.java 2010-06-30
17:48:23 UTC (rev 6444)
+++
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/JtaTransactionInterceptor.java 2010-06-30
20:18:22 UTC (rev 6445)
@@ -27,19 +27,15 @@
import org.jbpm.api.JbpmException;
import org.jbpm.api.cmd.Command;
-import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.svc.Interceptor;
import org.jbpm.pvm.internal.svc.Policy;
-
/**
* @author Tom Baeyens
*/
public class JtaTransactionInterceptor extends Interceptor {
- private static Log log = Log.getLog(JtaTransactionInterceptor.class.getName());
-
protected Policy policy = Policy.REQUIRES;
public <T> T execute(Command<T> command) {
Modified:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransaction.java
===================================================================
---
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransaction.java 2010-06-30
17:48:23 UTC (rev 6444)
+++
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/tx/StandardTransaction.java 2010-06-30
20:18:22 UTC (rev 6445)
@@ -127,7 +127,7 @@
// here is the point of no return :-)
// commit ///////////////////////////////////////////////////////////////
- Throwable commitException = null;
+ RuntimeException commitException = null;
if (resources!=null) {
// The commit loop will try to send the commit to every resource,
// No matter what it takes. If exceptions come out of resource.commit's
@@ -140,7 +140,7 @@
// Exceptions in the commit phase will not lead to rollback, since some
resources
// might have committed and can't go back.
- } catch (Throwable t) {
+ } catch (RuntimeException t) {
// TODO this should go to a special log for sys admin recovery
log.error("commit failed for resource "+standardResource, t);
if (commitException==null) {
@@ -155,12 +155,7 @@
if (log.isTraceEnabled()) log.trace("committed "+this);
if (commitException!=null) {
- if (commitException instanceof RuntimeException) {
- throw (RuntimeException) commitException;
- } else if (commitException instanceof Error) {
- throw (Error) commitException;
- }
- throw new TransactionException("resource failed to commit",
commitException);
+ throw commitException;
}
}
Modified:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java
===================================================================
---
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java 2010-06-30
17:48:23 UTC (rev 6444)
+++
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/util/ReflectUtil.java 2010-06-30
20:18:22 UTC (rev 6445)
@@ -57,8 +57,6 @@
try {
field = clazz.getDeclaredField(fieldName);
if (log.isTraceEnabled()) log.trace("found field "+fieldName+" in
"+clazz.getName());
- } catch (SecurityException e) {
- throw new JbpmException("wasn't allowed to get field
'"+clazz.getName()+"."+fieldName+"'", e);
} catch (NoSuchFieldException e) {
if (clazz.getSuperclass()!=null) {
return findField(clazz.getSuperclass(), fieldName, original);
@@ -83,8 +81,6 @@
if (log.isTraceEnabled()) log.trace("found method
"+clazz.getName()+"."+methodName+"("+Arrays.toString(parameterTypes)+")");
- } catch (SecurityException e) {
- throw new JbpmException("wasn't allowed to get method
'"+clazz.getName()+"."+methodName+"("+getParameterTypesText(parameterTypes)+")'",
e);
} catch (NoSuchMethodException e) {
if (clazz.getSuperclass()!=null) {
return getMethod(clazz.getSuperclass(), methodName, parameterTypes, original);
@@ -110,37 +106,40 @@
}
public static <T> T newInstance(Class<T> clazz) {
- return newInstance(clazz, null, null);
+ if (clazz==null) {
+ throw new IllegalArgumentException("cannot create new instance without
class");
+ }
+ try {
+ return newInstance(clazz.getConstructor());
+ }
+ catch (NoSuchMethodException e) {
+ throw new IllegalArgumentException("cannot instantiate class without default
constructor");
+ }
}
- public static <T> T newInstance(Constructor<T> constructor) {
- return newInstance(null, constructor, null);
- }
- public static <T> T newInstance(Constructor<T> constructor, Object[] args)
{
- return newInstance(null, constructor, args);
- }
- private static <T> T newInstance(Class<T> clazz, Constructor<T>
constructor, Object[] args) {
- if ( (clazz==null)
- && (constructor==null)
- ) {
- throw new IllegalArgumentException("can't create new instance without
clazz or constructor");
+ public static <T> T newInstance(Constructor<T> constructor, Object... args)
{
+ if (constructor==null) {
+ throw new IllegalArgumentException("cannot create new instance without
constructor");
}
+ Class<T> clazz = constructor.getDeclaringClass();
+ if (log.isTraceEnabled()) log.trace("creating new instance for
"+clazz+" with args "+Arrays.toString(args));
+ if (!constructor.isAccessible()) {
+ if (log.isTraceEnabled()) log.trace("making constructor accessible");
+ constructor.setAccessible(true);
+ }
try {
- if (log.isTraceEnabled()) log.trace("creating new instance for class
'"+clazz.getName()+"' with args "+Arrays.toString(args));
- if (constructor==null) {
- if (log.isTraceEnabled()) log.trace("getting default constructor");
- constructor = clazz.getConstructor((Class[])null);
- }
- if (!constructor.isAccessible()) {
- if (log.isTraceEnabled()) log.trace("making constructor accessible");
- constructor.setAccessible(true);
- }
return constructor.newInstance(args);
-
- } catch (Throwable t) {
- throw new JbpmException("couldn't construct new
'"+clazz.getName()+"' with args "+Arrays.toString(args), t);
}
+ catch (InstantiationException e) {
+ throw new JbpmException("failed to instantiate " + clazz, e);
+ }
+ catch (IllegalAccessException e) {
+ throw new JbpmException(ReflectUtil.class + " has no access to " +
constructor, e);
+ }
+ catch (InvocationTargetException e) {
+ throw new JbpmException(constructor + " threw exception", e.getCause());
+ }
}
public static Object get(Field field, Object object) {
@@ -446,15 +445,16 @@
* @return The class reference.
* @throws ClassNotFoundException From {@link Class#forName(String)}.
*/
- public static Class classForName(String name) throws ClassNotFoundException {
- try {
- ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
- if (contextClassLoader != null) {
- return contextClassLoader.loadClass(name);
+ public static Class<?> classForName(String name) throws ClassNotFoundException {
+ ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+ if (contextClassLoader != null) {
+ try {
+ return Class.forName(name, true, contextClassLoader);
}
+ catch (ClassNotFoundException e) {
+ // keep going to load through the loader of the current class
+ }
}
- catch (Throwable ignore) {
- }
return Class.forName(name);
}
}
Modified:
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ClassDescriptor.java
===================================================================
---
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ClassDescriptor.java 2010-06-30
17:48:23 UTC (rev 6444)
+++
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/wire/descriptor/ClassDescriptor.java 2010-06-30
20:18:22 UTC (rev 6445)
@@ -15,29 +15,24 @@
private static final long serialVersionUID = 1L;
- String text;
+ String className;
/** loads the class from the class loader of the specified WireContext.
* @throws WireException if the class could not be loaded.
*/
public Object construct(WireContext wireContext) {
try {
- return ReflectUtil.classForName(text);
- } catch (Exception e) {
- Throwable cause = (e.getCause()!=null ? e.getCause() : e);
- throw new WireException("couldn't load class '"+text+"':
"+cause.getMessage(), cause);
+ return ReflectUtil.classForName(className);
+ } catch (ClassNotFoundException e) {
+ throw new WireException("could not find class: "+className, e);
}
}
public void setClassName(String className) {
- this.text = className;
+ this.className = className;
}
public void setClass(Class<?> clazz) {
- if (clazz==null) {
- text = null;
- } else {
- this.text = clazz.getName();
- }
+ className = clazz != null ? clazz.getName() : null;
}
}
Modified:
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java
===================================================================
---
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2010-06-30
17:48:23 UTC (rev 6444)
+++
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/expr/JuelExpressionTest.java 2010-06-30
20:18:22 UTC (rev 6445)
@@ -23,7 +23,6 @@
import org.jbpm.pvm.activities.WaitState;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
-import org.jbpm.pvm.internal.client.ClientExecution;
import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.EnvironmentFactory;
import org.jbpm.pvm.internal.env.ExecutionContext;
@@ -32,7 +31,6 @@
import org.jbpm.pvm.internal.script.ScriptManager;
import org.jbpm.test.BaseJbpmTestCase;
-
/**
* @author Tom Baeyens
*/
Modified:
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ClassWireTest.java
===================================================================
---
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ClassWireTest.java 2010-06-30
17:48:23 UTC (rev 6444)
+++
jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/wire/ClassWireTest.java 2010-06-30
20:18:22 UTC (rev 6445)
@@ -53,7 +53,7 @@
wireContext.get("o");
fail("expected exception");
} catch (WireException e) {
- assertTextPresent("couldn't load class
'"+className+"'", e.getMessage());
+ assertTextPresent(className, e.getMessage());
}
}
Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2010-06-30
17:48:23 UTC (rev 6444)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/JbpmTestCase.java 2010-06-30
20:18:22 UTC (rev 6445)
@@ -61,7 +61,7 @@
*/
public abstract class JbpmTestCase extends BaseJbpmTestCase {
- protected static ProcessEngine processEngine = null;
+ protected static ProcessEngine processEngine;
protected static RepositoryService repositoryService;
protected static ExecutionService executionService;
Modified:
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/LoadTestCase.java
===================================================================
---
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/LoadTestCase.java 2010-06-30
17:48:23 UTC (rev 6444)
+++
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/LoadTestCase.java 2010-06-30
20:18:22 UTC (rev 6445)
@@ -132,6 +132,8 @@
public boolean areJobsAvailable() {
return commandService.execute(new Command<Boolean>() {
+ private static final long serialVersionUID = 1L;
+
public Boolean execute(Environment environment) {
Session session = environment.get(Session.class);
Modified:
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ContinuationTest.java
===================================================================
---
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ContinuationTest.java 2010-06-30
17:48:23 UTC (rev 6444)
+++
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ContinuationTest.java 2010-06-30
20:18:22 UTC (rev 6445)
@@ -25,8 +25,9 @@
import java.util.List;
import org.hibernate.Session;
-import org.jbpm.api.cmd.Command;
+
import org.jbpm.api.cmd.Environment;
+import org.jbpm.api.cmd.VoidCommand;
import org.jbpm.pvm.internal.builder.ProcessDefinitionBuilder;
import org.jbpm.pvm.internal.model.OpenProcessDefinition;
@@ -67,8 +68,11 @@
}
public void deployProcess() {
- commandService.execute(new Command<Object>() {
- public Object execute(Environment environment) throws Exception {
+ commandService.execute(new VoidCommand() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void executeVoid(Environment environment) throws Exception {
OpenProcessDefinition processDefinition =
ProcessDefinitionBuilder.startProcess("continuations")
.key("continuations")
.startActivity("start", AutomaticActivity.class)
@@ -94,7 +98,6 @@
Session session = environment.get(Session.class);
session.save(processDefinition);
- return null;
}
});
}
Modified:
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveTestCommand.java
===================================================================
---
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveTestCommand.java 2010-06-30
17:48:23 UTC (rev 6444)
+++
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/ExclusiveTestCommand.java 2010-06-30
20:18:22 UTC (rev 6445)
@@ -26,23 +26,21 @@
import java.util.Set;
import org.hibernate.Session;
+
import org.jbpm.api.Execution;
-import org.jbpm.api.cmd.Command;
import org.jbpm.api.cmd.Environment;
-import org.jbpm.internal.log.Log;
+import org.jbpm.api.cmd.VoidCommand;
import org.jbpm.pvm.internal.job.CommandMessage;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
import org.jbpm.pvm.internal.wire.descriptor.StringDescriptor;
-
/**
* @author Tom Baeyens
*/
-public class ExclusiveTestCommand implements Command<Object> {
+public class ExclusiveTestCommand extends VoidCommand {
private static final long serialVersionUID = 1L;
- private static final Log log = Log.getLog(ExclusiveTestCommand.class.getName());
static Random random = new Random();
String executionId;
@@ -61,7 +59,7 @@
return commandMessage;
}
- public Object execute(Environment environment) throws Exception {
+ protected void executeVoid(Environment environment) throws Exception {
Long threadId = Thread.currentThread().getId();
Session session = environment.get(Session.class);
@@ -92,8 +90,6 @@
log.debug("sleeping was interrupted");
}
*/
-
- return null;
}
}
Modified:
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceMessageTest.java
===================================================================
---
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceMessageTest.java 2010-06-30
17:48:23 UTC (rev 6444)
+++
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailOnceMessageTest.java 2010-06-30
20:18:22 UTC (rev 6445)
@@ -28,13 +28,14 @@
import org.hibernate.Session;
import org.jbpm.api.cmd.Command;
import org.jbpm.api.cmd.Environment;
+import org.jbpm.api.cmd.VoidCommand;
import org.jbpm.api.history.HistoryComment;
import org.jbpm.internal.log.Log;
import org.jbpm.pvm.internal.history.model.HistoryDetailImpl;
import org.jbpm.pvm.internal.job.CommandMessage;
import org.jbpm.pvm.internal.session.MessageSession;
+import org.jbpm.pvm.internal.util.CollectionUtil;
-
/**
* @author Tom Baeyens
*/
@@ -66,20 +67,21 @@
log.debug("==== all messages processed, now checking if all messages have
arrived exactly once ====");
- commandService.execute(new Command<Object>() {
+ commandService.execute(new VoidCommand() {
+ private static final long serialVersionUID = 1L;
- public Object execute(Environment environment) throws Exception {
+ @Override
+ protected void executeVoid(Environment environment) throws Exception {
Session session = environment.get(Session.class);
- List<HistoryComment> comments = session.createQuery("from " +
HistoryDetailImpl.class.getName()).list();
+ List<?> comments = session.createCriteria(HistoryDetailImpl.class).list();
- for (HistoryComment comment : comments) {
+ for (HistoryComment comment : CollectionUtil.checkList(comments,
HistoryComment.class)) {
log.debug("retrieved message: "+comment.getMessage());
Integer messageId = new Integer(comment.getMessage());
assertTrue("message " + messageId + " committed twice",
failOnceMessageIds.remove(messageId));
}
assertTrue("not all messages made a successful commit: " +
failOnceMessageIds, failOnceMessageIds.isEmpty());
- return null;
}
});
}
Modified:
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingMessageTest.java
===================================================================
---
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingMessageTest.java 2010-06-30
17:48:23 UTC (rev 6444)
+++
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingMessageTest.java 2010-06-30
20:18:22 UTC (rev 6445)
@@ -24,13 +24,12 @@
import java.util.List;
import org.jbpm.api.JbpmException;
-import org.jbpm.api.cmd.Command;
import org.jbpm.api.cmd.Environment;
+import org.jbpm.api.cmd.VoidCommand;
import org.jbpm.api.job.Job;
import org.jbpm.pvm.internal.job.CommandMessage;
import org.jbpm.pvm.internal.session.MessageSession;
-
/**
* @author Tom Baeyens
*/
@@ -40,13 +39,14 @@
public void testFailedMessageProcessing() {
jobExecutor.start();
try {
- commandService.execute(new Command<Object>() {
+ commandService.execute(new VoidCommand() {
+ private static final long serialVersionUID = 1L;
- public Object execute(Environment environment) throws Exception {
+ @Override
+ protected void executeVoid(Environment environment) throws Exception {
MessageSession messageSession = environment.get(MessageSession.class);
CommandMessage commandMessage = FailingTestCommand.createMessage();
messageSession.send(commandMessage);
- return null;
}
});
@@ -56,16 +56,17 @@
jobExecutor.stop(true);
}
- commandService.execute(new Command<Object>() {
+ commandService.execute(new VoidCommand() {
+ private static final long serialVersionUID = 1L;
- public Object execute(Environment environment) throws Exception {
+ @Override
+ public void executeVoid(Environment environment) throws Exception {
List<Job> deadJobs = null;
throw new JbpmException("todo get the jobs with exception");
// Session session = environment.get(Session.class);
// List commands = session.createQuery("from " +
HistoryCommentImpl.class.getName()).list();
// assertTrue("command insertion should have been rolled back",
commands.isEmpty());
-// return null;
}
});
}
Modified:
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingTestCommand.java
===================================================================
---
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingTestCommand.java 2010-06-30
17:48:23 UTC (rev 6444)
+++
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/FailingTestCommand.java 2010-06-30
20:18:22 UTC (rev 6445)
@@ -27,7 +27,6 @@
import org.jbpm.pvm.internal.session.DbSession;
import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
-
/**
* @author Tom Baeyens
*/
Modified:
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/JobExecutorTestCase.java
===================================================================
---
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/JobExecutorTestCase.java 2010-06-30
17:48:23 UTC (rev 6444)
+++
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/JobExecutorTestCase.java 2010-06-30
20:18:22 UTC (rev 6445)
@@ -93,6 +93,8 @@
public boolean areJobsAvailable() {
return commandService.execute(new Command<Boolean>() {
+ private static final long serialVersionUID = 1L;
+
public Boolean execute(Environment environment) {
Session session = environment.get(Session.class);
Modified:
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/NormalMessageTest.java
===================================================================
---
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/NormalMessageTest.java 2010-06-30
17:48:23 UTC (rev 6444)
+++
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/async/NormalMessageTest.java 2010-06-30
20:18:22 UTC (rev 6445)
@@ -32,6 +32,7 @@
import org.jbpm.pvm.internal.job.CommandMessage;
import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
import org.jbpm.pvm.internal.session.MessageSession;
+import org.jbpm.pvm.internal.util.CollectionUtil;
import org.jbpm.test.Db;
/**
@@ -64,11 +65,13 @@
}
List<Integer> processedMessageNumbers = commandService.execute(new
Command<List<Integer>>() {
+ private static final long serialVersionUID = 1L;
+
public List<Integer> execute(Environment environment) {
List<Integer> processedMessageNumbers = new ArrayList<Integer>();
Session session = environment.get(Session.class);
- List<HistoryComment> comments =
session.createCriteria(HistoryDetailImpl.class).list();
- for (HistoryComment comment: comments) {
+ List<?> comments = session.createCriteria(HistoryDetailImpl.class).list();
+ for (HistoryComment comment: CollectionUtil.checkList(comments,
HistoryComment.class)) {
int processedMessageNumber = Integer.parseInt(comment.getMessage());
processedMessageNumbers.add(processedMessageNumber);
// make sure the db stays clean
Modified:
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/executions/ProcessExecutionTest.java
===================================================================
---
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/executions/ProcessExecutionTest.java 2010-06-30
17:48:23 UTC (rev 6444)
+++
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/executions/ProcessExecutionTest.java 2010-06-30
20:18:22 UTC (rev 6445)
@@ -94,8 +94,8 @@
for (int i=0; i<processes; i++) {
executeProcess();
}
- } catch (Throwable t) {
- exception = t;
+ } catch (RuntimeException e) {
+ exception = e;
}
}
public void executeProcess() {
Modified:
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/AddCommentCmd.java
===================================================================
---
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/AddCommentCmd.java 2010-06-30
17:48:23 UTC (rev 6444)
+++
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/AddCommentCmd.java 2010-06-30
20:18:22 UTC (rev 6445)
@@ -22,24 +22,23 @@
package org.jbpm.test.load.messages;
import org.hibernate.Session;
-import org.jbpm.api.cmd.Command;
import org.jbpm.api.cmd.Environment;
+import org.jbpm.api.cmd.VoidCommand;
import org.jbpm.pvm.internal.history.model.HistoryDetailImpl;
/**
* @author Tom Baeyens
*/
-public class AddCommentCmd implements Command<Void> {
+public class AddCommentCmd extends VoidCommand {
private static final long serialVersionUID = 1L;
protected String message;
- public Void execute(Environment environment) throws Exception {
+ public void executeVoid(Environment environment) throws Exception {
// HistoryDetailImpl comment = new HistoryDetailImpl(message);
// Session session = environment.get(Session.class);
// session.save(comment);
// MessageProcessingTest.commentAdded();
- return null;
}
}
Modified:
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/MessageProcessingTest.java
===================================================================
---
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/MessageProcessingTest.java 2010-06-30
17:48:23 UTC (rev 6444)
+++
jbpm4/trunk/modules/test-load/src/test/java/org/jbpm/test/load/messages/MessageProcessingTest.java 2010-06-30
20:18:22 UTC (rev 6445)
@@ -34,6 +34,7 @@
import org.jbpm.pvm.internal.history.model.HistoryDetailImpl;
import org.jbpm.pvm.internal.job.CommandMessage;
import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
+import org.jbpm.pvm.internal.util.CollectionUtil;
import org.jbpm.pvm.internal.wire.descriptor.ObjectDescriptor;
import org.jbpm.pvm.internal.wire.descriptor.StringDescriptor;
import org.jbpm.test.load.LoadTestCase;
@@ -116,11 +117,13 @@
log.info("processing "+nbrOfTestMessages+" messages took
"+getMeasuredTime());
List<Integer> processedMessageNumbers = commandService.execute(new
Command<List<Integer>>() {
+ private static final long serialVersionUID = 1L;
+
public List<Integer> execute(Environment environment) {
List<Integer> processedMessageNumbers = new ArrayList<Integer>();
Session session = environment.get(Session.class);
- List<HistoryComment> comments =
session.createCriteria(HistoryDetailImpl.class).list();
- for (HistoryComment comment: comments) {
+ List<?> comments = session.createCriteria(HistoryDetailImpl.class).list();
+ for (HistoryComment comment: CollectionUtil.checkList(comments,
HistoryComment.class)) {
int processedMessageNumber = Integer.parseInt(comment.getMessage());
processedMessageNumbers.add(processedMessageNumber);
// make sure the db stays clean