You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2018/12/05 12:58:36 UTC
[camel] 26/35: CAMEL-12973 - Fixed CS
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 ead727282af2978c356737f399ee7ebb958cdfa4
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Dec 4 14:05:20 2018 +0100
CAMEL-12973 - Fixed CS
---
.../workitem/AbstractCamelWorkItemHandler.java | 5 ++-
.../workitem/InOutCamelWorkItemHandlerTest.java | 46 ++++++++++------------
2 files changed, 24 insertions(+), 27 deletions(-)
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 1361889..47e34a4 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
@@ -61,7 +61,7 @@ public abstract class AbstractCamelWorkItemHandler extends AbstractLogOrThrowWor
private final String camelContextKey;
- private boolean initialized = false;
+ private boolean initialized;
/**
* Default Constructor. This creates a {@link ProducerTemplate} for the global {@link CamelContext}.
@@ -97,7 +97,8 @@ public abstract class AbstractCamelWorkItemHandler extends AbstractLogOrThrowWor
this.initialized = true;
} catch (IllegalArgumentException iae) {
String message = "CamelContext with identifier '" + camelContextKey
- + "' not found in ServiceRegistry. This can be caused by the order in which the platform extensions are initialized. Deferring Camel ProducerTemplate creation until the first WorkItemHandler call.";
+ + "' not found in ServiceRegistry. This can be caused by the order in which the platform extensions are initialized. "
+ + "Deferring Camel ProducerTemplate creation until the first WorkItemHandler call.";
logger.info(message, iae);
}
}
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 8453f09..2aed17e 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
@@ -40,7 +40,6 @@ import static org.junit.Assert.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
-
@RunWith(MockitoJUnitRunner.class)
public class InOutCamelWorkItemHandlerTest {
@@ -78,31 +77,30 @@ public class InOutCamelWorkItemHandlerTest {
when(outMessage.getBody()).thenReturn(testReponse);
try {
- ServiceRegistry.get().register("GlobalCamelService", camelContext);
+ ServiceRegistry.get().register("GlobalCamelService", camelContext);
- TestWorkItemManager manager = new TestWorkItemManager();
- WorkItemImpl workItem = new WorkItemImpl();
- workItem.setParameter("CamelEndpointId", camelEndpointId);
- workItem.setParameter("Request", "someRequest");
- workItem.setDeploymentId("testDeploymentId");
- workItem.setProcessInstanceId(1L);
- workItem.setId(1L);
+ TestWorkItemManager manager = new TestWorkItemManager();
+ WorkItemImpl workItem = new WorkItemImpl();
+ workItem.setParameter("CamelEndpointId", camelEndpointId);
+ workItem.setParameter("Request", "someRequest");
+ workItem.setDeploymentId("testDeploymentId");
+ workItem.setProcessInstanceId(1L);
+ workItem.setId(1L);
+
+ AbstractCamelWorkItemHandler handler = new InOutCamelWorkItemHandler();
+
+ handler.executeWorkItem(workItem, manager);
+ assertThat(manager.getResults(), is(notNullValue()));
+ assertThat(manager.getResults().size(), equalTo(1));
+ 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));
- AbstractCamelWorkItemHandler handler = new InOutCamelWorkItemHandler();
-
- handler.executeWorkItem(workItem,
- manager);
- assertThat(manager.getResults(), is(notNullValue()));
- assertThat(manager.getResults().size(), equalTo(1));
- 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));
-
} finally {
ServiceRegistry.get().remove("GlobalCamelService");
}
-
+
}
@Test
@@ -141,8 +139,7 @@ public class InOutCamelWorkItemHandlerTest {
AbstractCamelWorkItemHandler handler = new InOutCamelWorkItemHandler(runtimeManager);
TestWorkItemManager manager = new TestWorkItemManager();
- handler.executeWorkItem(workItem,
- manager);
+ handler.executeWorkItem(workItem, manager);
assertThat(manager.getResults(), is(notNullValue()));
assertThat(manager.getResults().size(), equalTo(1));
assertThat(manager.getResults().containsKey(workItem.getId()), is(true));
@@ -191,8 +188,7 @@ public class InOutCamelWorkItemHandlerTest {
ServiceRegistry.get().register(runtimeManagerId + "_CamelService", camelContext);
TestWorkItemManager manager = new TestWorkItemManager();
- handler.executeWorkItem(workItem,
- manager);
+ handler.executeWorkItem(workItem, manager);
assertThat(manager.getResults(), is(notNullValue()));
assertThat(manager.getResults().size(), equalTo(1));
assertThat(manager.getResults().containsKey(workItem.getId()), is(true));