This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a04dd48755cc45fe81c1c2e190eb8cb2dfc47a6c
Author: Duncan Doyle <duncan.do...@gmail.com>
AuthorDate: Fri Nov 30 09:24:45 2018 +0100
Replaced hard-coded strings with constants. Changed WorkItem parameter
names to be inline with other WorkItemHandlers.
---
.../apache/camel/component/jbpm/JBPMConstants.java | 8 +++++
.../jbpm/server/CamelKieServerExtension.java | 5 ++--
.../jbpm/workitem/AbstractCamelCommand.java | 15 ++++------
.../workitem/AbstractCamelWorkItemHandler.java | 35 +++++++++++-----------
.../workitem/DeploymentContextCamelCommand.java | 5 ++--
.../jbpm/workitem/GlobalContextCamelCommand.java | 5 ++--
.../jbpm/workitem/InOnlyCamelWorkItemHandler.java | 7 +++--
.../jbpm/workitem/InOutCamelWorkItemHandler.java | 14 ++++-----
.../CamelWorkItemHandlerIntegrationTests.java | 33 ++++++++++----------
.../DeploymentContextCamelCommandTest.java | 9 +++---
.../workitem/GlobalContextCamelCommandTest.java | 9 +++---
.../workitem/InOnlyCamelWorkItemHandlerTest.java | 5 ++--
.../workitem/InOutCamelWorkItemHandlerTest.java | 13 ++++----
13 files changed, 85 insertions(+), 78 deletions(-)
diff --git
a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConstants.java
b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConstants.java
index 8341cfd..94ff0ca 100644
---
a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConstants.java
+++
b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConstants.java
@@ -43,4 +43,12 @@ public interface JBPMConstants {
String JBPM_TASK_EVENT_LISTENER = "task";
String JBPM_CASE_EVENT_LISTENER = "case";
String JBPM_EVENT_EMITTER = "emitter";
+
+ String GLOBAL_CAMEL_CONTEXT_SERVICE_KEY = "GlobalCamelService";
+ String DEPLOYMENT_CAMEL_CONTEXT_SERVICE_KEY_POSTFIX = "_CamelService";
+ String CAMEL_ENDPOINT_ID_WI_PARAM = "CamelEndpointId";
+ String RESPONSE_WI_PARAM = "Response";
+ String MESSAGE_WI_PARAM = "Message";
+
+
}
diff --git
a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java
b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java
index 0e297be..659a498 100644
---
a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java
+++
b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java
@@ -23,6 +23,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.camel.component.jbpm.JBPMConstants;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.model.FromDefinition;
import org.apache.camel.model.RouteDefinition;
@@ -85,7 +86,7 @@ public class CamelKieServerExtension implements
KieServerExtension {
}
}
- ServiceRegistry.get().register("GlobalCamelService", this.camel);
+
ServiceRegistry.get().register(JBPMConstants.GLOBAL_CAMEL_CONTEXT_SERVICE_KEY,
this.camel);
}
@Override
@@ -117,7 +118,7 @@ public class CamelKieServerExtension implements
KieServerExtension {
context.start();
camelContexts.put(id, context);
- ServiceRegistry.get().register(id + "_CamelService", context);
+ ServiceRegistry.get().register(id +
JBPMConstants.DEPLOYMENT_CAMEL_CONTEXT_SERVICE_KEY_POSTFIX, context);
}
} catch (Exception e) {
diff --git
a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelCommand.java
b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelCommand.java
index 3cb1ee4..adfd413 100644
---
a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelCommand.java
+++
b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelCommand.java
@@ -22,6 +22,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.ExchangeBuilder;
+import org.apache.camel.component.jbpm.JBPMConstants;
import org.jbpm.services.api.service.ServiceRegistry;
import org.kie.api.executor.Command;
import org.kie.api.executor.CommandContext;
@@ -40,17 +41,13 @@ import org.slf4j.LoggerFactory;
* {link WorkItem} via the <code>camel-endpoint-id</code> parameter, this
{@link Command} will send the {@link WorkItem} to
* the Camel URI <code>direct://myCamelEndpoint</code>.
* <p/>
- * The body of the result {@link Message} of the invocation is returned via
the <code>response</code> parameter. Access to the raw response
- * {@link Message} is provided via the <code>message</code> parameter. This
gives the user access to more advanced fields like message headers
+ * The body of the result {@link Message} of the invocation is returned via
the <code>Response</code> parameter. Access to the raw response
+ * {@link Message} is provided via the <code>Message</code> parameter. This
gives the user access to more advanced fields like message headers
* and attachments.
*/
public abstract class AbstractCamelCommand implements Command,
Cacheable {
- private static final String CAMEL_ENDPOINT_ID_PARAM =
"camel-endpoint-id";
- private static final String RESPONSE_PARAM = "response";
- private static final String MESSAGE_PARAM = "out-headers";
-
private static final Logger logger =
LoggerFactory.getLogger(AbstractCamelCommand.class);
public AbstractCamelCommand() {
@@ -62,7 +59,7 @@ public abstract class AbstractCamelCommand implements Command,
WorkItem workItem = (WorkItem) ctx.getData("workItem");
- String camelEndpointId = (String)
workItem.getParameter(CAMEL_ENDPOINT_ID_PARAM);
+ String camelEndpointId = (String)
workItem.getParameter(JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM);
// We only support direct. We don't need to support more, as
direct simply gives us the entrypoint into the actual Camel Routes.
String camelUri = "direct://" + camelEndpointId;
@@ -78,8 +75,8 @@ public abstract class AbstractCamelCommand implements Command,
ExecutionResults results = new ExecutionResults();
Object response = outMessage.getBody();
- results.setData(RESPONSE_PARAM, response);
- results.setData(MESSAGE_PARAM, outMessage);
+ results.setData(JBPMConstants.RESPONSE_WI_PARAM, response);
+ results.setData(JBPMConstants.MESSAGE_WI_PARAM, outMessage);
return results;
}
diff --git
a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelWorkItemHandler.java
b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelWorkItemHandler.java
index db88e70..743393c 100644
---
a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelWorkItemHandler.java
+++
b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelWorkItemHandler.java
@@ -21,6 +21,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.ProducerTemplate;
+import org.apache.camel.component.jbpm.JBPMConstants;
import org.jbpm.process.workitem.core.AbstractLogOrThrowWorkItemHandler;
import org.jbpm.services.api.service.ServiceRegistry;
import org.kie.api.runtime.manager.RuntimeManager;
@@ -35,29 +36,24 @@ import org.slf4j.LoggerFactory;
* Camel jBPM {@link WorkItemHandler} which allows to call Camel routes with a
<code>direct</code> endpoint.
* <p/>
* The handler passes the {@WorkItem} to the route that has a consumer on the
endpoint-id that can be passed with the
- * <code>camel-endpoint-id</code>{@link WorkItem} parameter. E.g. when a the
value "myCamelEndpoint" is passed to the {link WorkItem} via
- * the <code>camel-endpoint-id</code> parameter, this command will send the
{@link WorkItem} to the Camel URI
+ * <code>CamelEndpointId</code>{@link WorkItem} parameter. E.g. when a the
value "myCamelEndpoint" is passed to the {link WorkItem} via
+ * the <code>CamelEndpointId</code> parameter, this command will send the
{@link WorkItem} to the Camel URI
* <code>direct://myCamelEndpoint</code>.
* <p/>
- * The body of the result {@link Message} of the invocation is returned via
the <code>response</code> parameter. Access to the raw response
- * {@link Message} is provided via the <code>message</code> parameter. This
gives the user access to more advanced fields like message
+ * The body of the result {@link Message} of the invocation is returned via
the <code>Response</code> parameter. Access to the raw response
+ * {@link Message} is provided via the <code>Message</code> parameter. This
gives the user access to more advanced fields like message
* headers and attachments.
* <p/>
* This handler can be constructed in multiple ways. When you don't pass a
{@link RuntimeManager} to the constructor, the handler will try
* to find the global KIE {@link CamelContext} from the <code>jBPM</code>
{@link ServiceRegistry}. When the {@link RuntimeManager} is passed
* to the constructor, the handler will retrieve and use the {@link
CamelContext} bound to the {@link RuntimeManage} from the
- * {@link ServiceRegistry}. When a <code>camel-endpoint-id</code> is passed to
the constructor, the handler will send all requests to the
- * Camel route that is consuming from that endpoint, unless the endpoint is
overridden by passing a the <code>camel-endpoint-id</code> in
+ * {@link ServiceRegistry}. When a <code>CamelEndpointId</code> is passed to
the constructor, the handler will send all requests to the
+ * Camel route that is consuming from that endpoint, unless the endpoint is
overridden by passing a the <code>CamelEndpointId</code> in
* the {@link WorkItem} parameters.
*
*/
public abstract class AbstractCamelWorkItemHandler extends
AbstractLogOrThrowWorkItemHandler implements Cacheable {
- private static final String GLOBAL_CAMEL_CONTEXT_SERVICE_KEY =
"GlobalCamelService";
- private static final String RUNTIME_CAMEL_CONTEXT_SERVICE_POSTFIX =
"_CamelService";
-
- private static final String CAMEL_ENDPOINT_ID_PARAM = "camel-endpoint-id";
-
private static Logger logger =
LoggerFactory.getLogger(AbstractCamelWorkItemHandler.class);
private final ProducerTemplate producerTemplate;
@@ -72,7 +68,7 @@ public abstract class AbstractCamelWorkItemHandler extends
AbstractLogOrThrowWor
}
public AbstractCamelWorkItemHandler(String camelEndointId) {
- CamelContext globalCamelContext = (CamelContext)
ServiceRegistry.get().service(GLOBAL_CAMEL_CONTEXT_SERVICE_KEY);
+ CamelContext globalCamelContext = (CamelContext)
ServiceRegistry.get().service(JBPMConstants.GLOBAL_CAMEL_CONTEXT_SERVICE_KEY);
// TODO: Should we allow to set the maximumCacheSize on the producer?
this.producerTemplate = globalCamelContext.createProducerTemplate();
this.camelEndpointId = camelEndointId;
@@ -87,7 +83,7 @@ public abstract class AbstractCamelWorkItemHandler extends
AbstractLogOrThrowWor
}
public AbstractCamelWorkItemHandler(RuntimeManager runtimeManager, String
camelEndpointId) {
- String runtimeCamelContextKey = runtimeManager.getIdentifier() +
RUNTIME_CAMEL_CONTEXT_SERVICE_POSTFIX;
+ String runtimeCamelContextKey = runtimeManager.getIdentifier() +
JBPMConstants.DEPLOYMENT_CAMEL_CONTEXT_SERVICE_KEY_POSTFIX;
CamelContext runtimeCamelContext = (CamelContext)
ServiceRegistry.get().service(runtimeCamelContextKey);
// TODO: Should we allow to set the maximumCacheSize on the producer?
this.producerTemplate = runtimeCamelContext.createProducerTemplate();
@@ -115,13 +111,15 @@ public abstract class AbstractCamelWorkItemHandler
extends AbstractLogOrThrowWor
}
}
- private String getCamelEndpointId(WorkItem workItem) {
- String workItemCamelEndpointId = (String)
workItem.getParameter(CAMEL_ENDPOINT_ID_PARAM);
+ protected String getCamelEndpointId(WorkItem workItem) {
+ String workItemCamelEndpointId = (String)
workItem.getParameter(JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM);
if (camelEndpointId != null && !camelEndpointId.isEmpty()) {
if (workItemCamelEndpointId != null &&
!workItemCamelEndpointId.isEmpty()) {
logger.debug(
- "The Camel Endpoint ID has been set on both the
WorkItemHanlder and WorkItem. The camel-endpoint-id configured on the WorkItem
overrides the global configuation.");
+ "The Camel Endpoint ID has been set on both the
WorkItemHanlder and WorkItem. The '"
+ + JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM
+ + "' configured on the WorkItem overrides the
global configuation.");
} else {
workItemCamelEndpointId = camelEndpointId;
}
@@ -129,8 +127,9 @@ public abstract class AbstractCamelWorkItemHandler extends
AbstractLogOrThrowWor
if (workItemCamelEndpointId == null ||
workItemCamelEndpointId.isEmpty()) {
throw new IllegalArgumentException(
- "No Camel Endpoint ID specified. Please configure the
'camel-endpoint-id' in either the constructor of this WorkItemHandler, or pass
it via the "
- + CAMEL_ENDPOINT_ID_PARAM + "' WorkItem
parameter.");
+ "No Camel Endpoint ID specified. Please configure the '" +
JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM
+ + "' in either the constructor of this
WorkItemHandler, or pass it via the "
+ + JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM + "'
WorkItem parameter.");
}
return workItemCamelEndpointId;
}
diff --git
a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommand.java
b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommand.java
index e3d3fd1..009b909 100644
---
a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommand.java
+++
b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommand.java
@@ -22,6 +22,7 @@ import java.util.concurrent.ConcurrentHashMap;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
+import org.apache.camel.component.jbpm.JBPMConstants;
import org.jbpm.services.api.service.ServiceRegistry;
import org.kie.api.executor.CommandContext;
import org.slf4j.Logger;
@@ -32,8 +33,6 @@ import org.slf4j.LoggerFactory;
*/
public class DeploymentContextCamelCommand extends AbstractCamelCommand {
- private static final String RUNTIME_CAMEL_CONTEXT_SERVICE_POSTFIX =
"_CamelService";
-
private final Map<String, ProducerTemplate> templates = new
ConcurrentHashMap<>();
private static final Logger logger =
LoggerFactory.getLogger(DeploymentContextCamelCommand.class);
@@ -48,7 +47,7 @@ public class DeploymentContextCamelCommand extends
AbstractCamelCommand {
template = templates.get(deploymentId);
if (template == null) {
CamelContext deploymentCamelContext = (CamelContext)
ServiceRegistry.get()
- .service(deploymentId +
RUNTIME_CAMEL_CONTEXT_SERVICE_POSTFIX);
+ .service(deploymentId +
JBPMConstants.DEPLOYMENT_CAMEL_CONTEXT_SERVICE_KEY_POSTFIX);
template = deploymentCamelContext.createProducerTemplate();
templates.put(deploymentId, template);
}
diff --git
a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommand.java
b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommand.java
index 974b896..10950b3 100644
---
a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommand.java
+++
b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommand.java
@@ -19,6 +19,7 @@ package org.apache.camel.component.jbpm.workitem;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
+import org.apache.camel.component.jbpm.JBPMConstants;
import org.jbpm.services.api.service.ServiceRegistry;
import org.kie.api.executor.CommandContext;
import org.slf4j.Logger;
@@ -29,14 +30,12 @@ import org.slf4j.LoggerFactory;
*/
public class GlobalContextCamelCommand extends AbstractCamelCommand {
- private static final String GLOBAL_CAMEL_CONTEXT_SERVICE_KEY =
"GlobalCamelService";
-
private final ProducerTemplate globalContextProducerTemplate;
private static final Logger logger =
LoggerFactory.getLogger(GlobalContextCamelCommand.class);
public GlobalContextCamelCommand() {
- CamelContext globalCamelContext = (CamelContext)
ServiceRegistry.get().service(GLOBAL_CAMEL_CONTEXT_SERVICE_KEY);
+ CamelContext globalCamelContext = (CamelContext)
ServiceRegistry.get().service(JBPMConstants.GLOBAL_CAMEL_CONTEXT_SERVICE_KEY);
// TODO: Should we allow to set the maximumCacheSize on the producer?
this.globalContextProducerTemplate =
globalCamelContext.createProducerTemplate();
}
diff --git
a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/InOnlyCamelWorkItemHandler.java
b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/InOnlyCamelWorkItemHandler.java
index 0588c02..b97b0ad 100644
---
a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/InOnlyCamelWorkItemHandler.java
+++
b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/InOnlyCamelWorkItemHandler.java
@@ -22,6 +22,7 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Message;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.ExchangeBuilder;
+import org.apache.camel.component.jbpm.JBPMConstants;
import org.drools.core.process.instance.impl.WorkItemImpl;
import org.jbpm.process.workitem.core.util.Wid;
import org.jbpm.process.workitem.core.util.WidMavenDepends;
@@ -56,11 +57,11 @@ import org.kie.api.runtime.process.WorkItemManager;
defaultHandler = "mvel: new
org.apache.camel.component.jbpm.workitem.InOnlyCamelWorkitemHandler()",
documentation = "${artifactId}/index.html",
parameters = {
- @WidParameter(name = "camel-endpoint-id")
+ @WidParameter(name = JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM)
},
results = {
- @WidResult(name = "response"),
- @WidResult(name = "message") },
+ @WidResult(name = JBPMConstants.RESPONSE_WI_PARAM),
+ @WidResult(name = JBPMConstants.MESSAGE_WI_PARAM) },
mavenDepends = {
@WidMavenDepends(group = "${groupId}",
artifact = "${artifactId}",
diff --git
a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/InOutCamelWorkItemHandler.java
b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/InOutCamelWorkItemHandler.java
index d53c882..a8482dd 100644
---
a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/InOutCamelWorkItemHandler.java
+++
b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/InOutCamelWorkItemHandler.java
@@ -25,6 +25,7 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Message;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.ExchangeBuilder;
+import org.apache.camel.component.jbpm.JBPMConstants;
import org.drools.core.process.instance.impl.WorkItemImpl;
import org.jbpm.process.workitem.core.util.Wid;
import org.jbpm.process.workitem.core.util.WidMavenDepends;
@@ -58,11 +59,11 @@ import org.kie.api.runtime.process.WorkItemManager;
defaultHandler = "mvel: new
org.apache.camel.component.jbpm.workitem.InOutCamelWorkitemHandler()",
documentation = "${artifactId}/index.html",
parameters = {
- @WidParameter(name = "camel-endpoint-id")
+ @WidParameter(name = JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM)
},
results = {
- @WidResult(name = "response"),
- @WidResult(name = "message") },
+ @WidResult(name = JBPMConstants.RESPONSE_WI_PARAM),
+ @WidResult(name = JBPMConstants.MESSAGE_WI_PARAM) },
mavenDepends = {
@WidMavenDepends(group = "${groupId}",
artifact = "${artifactId}",
@@ -74,9 +75,6 @@ import org.kie.api.runtime.process.WorkItemManager;
action = @WidAction(title = "Send payload to a Camel
endpoint")))
public class InOutCamelWorkItemHandler extends AbstractCamelWorkItemHandler {
- private static final String RESPONSE_PARAM = "response";
- private static final String MESSAGE_PARAM = "message";
-
public InOutCamelWorkItemHandler() {
super();
}
@@ -99,8 +97,8 @@ public class InOutCamelWorkItemHandler extends
AbstractCamelWorkItemHandler {
Map<String, Object> result = new HashMap<>();
Object response = outMessage.getBody();
- result.put(RESPONSE_PARAM, response);
- result.put(MESSAGE_PARAM, outMessage);
+ result.put(JBPMConstants.RESPONSE_WI_PARAM, response);
+ result.put(JBPMConstants.MESSAGE_WI_PARAM, outMessage);
manager.completeWorkItem(workItem.getId(), result);
}
diff --git
a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerIntegrationTests.java
b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerIntegrationTests.java
index 39fd861..4e594dd 100644
---
a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerIntegrationTests.java
+++
b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerIntegrationTests.java
@@ -23,6 +23,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.jbpm.JBPMConstants;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.drools.core.process.instance.impl.WorkItemImpl;
@@ -50,22 +51,22 @@ public class CamelWorkItemHandlerIntegrationTests extends
CamelTestSupport {
@Override
public void configure() throws Exception {
from("direct:start").routeId(routeId)
- .setBody(simple("${body.getParameter(\"request\")}"))
+ .setBody(simple("${body.getParameter(\"Request\")}"))
.to("mock:result");
}
};
context.addRoutes(builder);
try {
// Register the Camel Context with the jBPM ServiceRegistry.
- ServiceRegistry.get().register("GlobalCamelService", context);
+
ServiceRegistry.get().register(JBPMConstants.GLOBAL_CAMEL_CONTEXT_SERVICE_KEY,
context);
// Test
String expectedBody = "helloRequest";
resultEndpoint.expectedBodiesReceived(expectedBody);
WorkItemImpl workItem = new WorkItemImpl();
- workItem.setParameter("camel-endpoint-id", "start");
- workItem.setParameter("request", expectedBody);
+ workItem.setParameter(JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM,
"start");
+ workItem.setParameter("Request", expectedBody);
TestWorkItemManager manager = new TestWorkItemManager();
@@ -90,7 +91,7 @@ public class CamelWorkItemHandlerIntegrationTests extends
CamelTestSupport {
@Override
public void configure() throws Exception {
from("direct:start").routeId(routeId)
- .setBody(simple("${body.getParameter(\"request\")}"))
+ .setBody(simple("${body.getParameter(\"Request\")}"))
.throwException(new IllegalArgumentException("Illegal
contennt!"))
.to("mock:result");
}
@@ -98,15 +99,15 @@ public class CamelWorkItemHandlerIntegrationTests extends
CamelTestSupport {
context.addRoutes(builder);
try {
// Register the Camel Context with the jBPM ServiceRegistry.
- ServiceRegistry.get().register("GlobalCamelService", context);
+
ServiceRegistry.get().register(JBPMConstants.GLOBAL_CAMEL_CONTEXT_SERVICE_KEY,
context);
// Test
String expectedBody = "helloRequest";
resultEndpoint.expectedBodiesReceived(expectedBody);
WorkItemImpl workItem = new WorkItemImpl();
- workItem.setParameter("camel-endpoint-id", "start");
- workItem.setParameter("request", expectedBody);
+ workItem.setParameter(JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM,
"start");
+ workItem.setParameter("Request", expectedBody);
TestWorkItemManager manager = new TestWorkItemManager();
@@ -131,22 +132,22 @@ public class CamelWorkItemHandlerIntegrationTests extends
CamelTestSupport {
@Override
public void configure() throws Exception {
from("direct:start").routeId(routeId)
- .setBody(simple("${body.getParameter(\"request\")}"))
+ .setBody(simple("${body.getParameter(\"Request\")}"))
.to("mock:result");
}
};
context.addRoutes(builder);
try {
// Register the Camel Context with the jBPM ServiceRegistry.
- ServiceRegistry.get().register("GlobalCamelService", context);
+
ServiceRegistry.get().register(JBPMConstants.GLOBAL_CAMEL_CONTEXT_SERVICE_KEY,
context);
// Test
String expectedBody = "helloRequest";
resultEndpoint.expectedBodiesReceived(expectedBody);
WorkItemImpl workItem = new WorkItemImpl();
- workItem.setParameter("camel-endpoint-id", "start");
- workItem.setParameter("request", expectedBody);
+ workItem.setParameter(JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM,
"start");
+ workItem.setParameter("Request", expectedBody);
TestWorkItemManager manager = new TestWorkItemManager();
@@ -172,7 +173,7 @@ public class CamelWorkItemHandlerIntegrationTests extends
CamelTestSupport {
@Override
public void configure() throws Exception {
from("direct:start").routeId(routeId)
- .setBody(simple("${body.getParameter(\"request\")}"))
+ .setBody(simple("${body.getParameter(\"Request\")}"))
.throwException(new IllegalArgumentException("Illegal
contennt!"))
.to("mock:result");
}
@@ -180,15 +181,15 @@ public class CamelWorkItemHandlerIntegrationTests extends
CamelTestSupport {
context.addRoutes(builder);
try {
// Register the Camel Context with the jBPM ServiceRegistry.
- ServiceRegistry.get().register("GlobalCamelService", context);
+
ServiceRegistry.get().register(JBPMConstants.GLOBAL_CAMEL_CONTEXT_SERVICE_KEY,
context);
// Test
String expectedBody = "helloRequest";
resultEndpoint.expectedBodiesReceived(expectedBody);
WorkItemImpl workItem = new WorkItemImpl();
- workItem.setParameter("camel-endpoint-id", "start");
- workItem.setParameter("request", expectedBody);
+ workItem.setParameter(JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM,
"start");
+ workItem.setParameter("Request", expectedBody);
TestWorkItemManager manager = new TestWorkItemManager();
diff --git
a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommandTest.java
b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommandTest.java
index b703456..e1aef21 100644
---
a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommandTest.java
+++
b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommandTest.java
@@ -25,6 +25,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.ProducerTemplate;
+import org.apache.camel.component.jbpm.JBPMConstants;
import org.drools.core.process.instance.impl.WorkItemImpl;
import org.jbpm.services.api.service.ServiceRegistry;
import org.junit.Test;
@@ -76,11 +77,11 @@ public class DeploymentContextCamelCommandTest {
when(outMessage.getBody()).thenReturn(testReponse);
//Register the RuntimeManager bound camelcontext.
- ServiceRegistry.get().register(deploymentId + "_CamelService",
camelContext);
+ ServiceRegistry.get().register(deploymentId +
JBPMConstants.DEPLOYMENT_CAMEL_CONTEXT_SERVICE_KEY_POSTFIX, camelContext);
WorkItemImpl workItem = new WorkItemImpl();
- workItem.setParameter("camel-endpoint-id", camelEndpointId);
- workItem.setParameter("request", "someRequest");
+ workItem.setParameter(JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM,
camelEndpointId);
+ workItem.setParameter("Request", "someRequest");
when(commandContext.getData("workItem")).thenReturn(workItem);
when(commandContext.getData("deploymentId")).thenReturn(deploymentId);
@@ -90,6 +91,6 @@ public class DeploymentContextCamelCommandTest {
assertNotNull(results);
assertEquals(2, results.getData().size());
- assertEquals(testReponse, results.getData().get("response"));
+ assertEquals(testReponse,
results.getData().get(JBPMConstants.RESPONSE_WI_PARAM));
}
}
diff --git
a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommandTest.java
b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommandTest.java
index ad36879..048ec72 100644
---
a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommandTest.java
+++
b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommandTest.java
@@ -25,6 +25,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.ProducerTemplate;
+import org.apache.camel.component.jbpm.JBPMConstants;
import org.drools.core.process.instance.impl.WorkItemImpl;
import org.jbpm.services.api.service.ServiceRegistry;
import org.junit.Test;
@@ -78,11 +79,11 @@ public class GlobalContextCamelCommandTest {
when(outMessage.getBody()).thenReturn(testReponse);
//Register the RuntimeManager bound camelcontext.
- ServiceRegistry.get().register("GlobalCamelService", camelContext);
+
ServiceRegistry.get().register(JBPMConstants.GLOBAL_CAMEL_CONTEXT_SERVICE_KEY,
camelContext);
WorkItemImpl workItem = new WorkItemImpl();
- workItem.setParameter("camel-endpoint-id", camelEndpointId);
- workItem.setParameter("request", "someRequest");
+ workItem.setParameter(JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM,
camelEndpointId);
+ workItem.setParameter("Request", "someRequest");
when(commandContext.getData(anyString())).thenReturn(workItem);
@@ -92,6 +93,6 @@ public class GlobalContextCamelCommandTest {
assertNotNull(results);
assertEquals(2, results.getData().size());
- assertEquals(testReponse, results.getData().get("response"));
+ assertEquals(testReponse,
results.getData().get(JBPMConstants.RESPONSE_WI_PARAM));
}
}
diff --git
a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/InOnlyCamelWorkItemHandlerTest.java
b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/InOnlyCamelWorkItemHandlerTest.java
index 1ad1bf9..a862f22 100644
---
a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/InOnlyCamelWorkItemHandlerTest.java
+++
b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/InOnlyCamelWorkItemHandlerTest.java
@@ -26,6 +26,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.ProducerTemplate;
+import org.apache.camel.component.jbpm.JBPMConstants;
import org.apache.camel.impl.DefaultHeadersMapFactory;
import org.apache.camel.spi.HeadersMapFactory;
import org.drools.core.process.instance.impl.WorkItemImpl;
@@ -79,8 +80,8 @@ public class InOnlyCamelWorkItemHandlerTest {
ServiceRegistry.get().register(runtimeManagerId + "_CamelService",
camelContext);
WorkItemImpl workItem = new WorkItemImpl();
- workItem.setParameter("camel-endpoint-id", camelEndpointId);
- workItem.setParameter("request", "someRequest");
+ workItem.setParameter(JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM,
camelEndpointId);
+ workItem.setParameter("Request", "someRequest");
workItem.setDeploymentId("testDeploymentId");
workItem.setProcessInstanceId(1L);
workItem.setId(1L);
diff --git
a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/InOutCamelWorkItemHandlerTest.java
b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/InOutCamelWorkItemHandlerTest.java
index e4bc6ba..1277f04 100644
---
a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/InOutCamelWorkItemHandlerTest.java
+++
b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/InOutCamelWorkItemHandlerTest.java
@@ -28,6 +28,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.ProducerTemplate;
+import org.apache.camel.component.jbpm.JBPMConstants;
import org.apache.camel.impl.DefaultHeadersMapFactory;
import org.apache.camel.spi.HeadersMapFactory;
import org.drools.core.process.instance.impl.WorkItemImpl;
@@ -80,8 +81,8 @@ public class InOutCamelWorkItemHandlerTest {
TestWorkItemManager manager = new TestWorkItemManager();
WorkItemImpl workItem = new WorkItemImpl();
- workItem.setParameter("camel-endpoint-id", camelEndpointId);
- workItem.setParameter("request", "someRequest");
+ workItem.setParameter("CamelEndpointId", camelEndpointId);
+ workItem.setParameter("Request", "someRequest");
workItem.setDeploymentId("testDeploymentId");
workItem.setProcessInstanceId(1L);
workItem.setId(1L);
@@ -95,7 +96,7 @@ public class InOutCamelWorkItemHandlerTest {
assertThat(manager.getResults().containsKey(workItem.getId()),
is(true));
Map<String, Object> results = manager.getResults(workItem.getId());
assertThat(results.size(), equalTo(2));
- assertThat(results.get("response"), equalTo(testReponse));
+ assertThat(results.get("Response"), equalTo(testReponse));
}
@Test
@@ -124,8 +125,8 @@ public class InOutCamelWorkItemHandlerTest {
ServiceRegistry.get().register(runtimeManagerId + "_CamelService",
camelContext);
WorkItemImpl workItem = new WorkItemImpl();
- workItem.setParameter("camel-endpoint-id", camelEndpointId);
- workItem.setParameter("request", "someRequest");
+ workItem.setParameter(JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM,
camelEndpointId);
+ workItem.setParameter("Request", "someRequest");
workItem.setDeploymentId("testDeploymentId");
workItem.setProcessInstanceId(1L);
workItem.setId(1L);
@@ -141,7 +142,7 @@ public class InOutCamelWorkItemHandlerTest {
Map<String, Object> results = manager.getResults(workItem.getId());
assertThat(results.size(), equalTo(2));
- assertThat(results.get("response"), equalTo(testReponse));
+ assertThat(results.get(JBPMConstants.RESPONSE_WI_PARAM),
equalTo(testReponse));
}
}
