You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by he...@apache.org on 2013/06/05 12:10:25 UTC
[1/2] git commit: [Spring Batch] JobExecution instance is now passed
to the output message.
Updated Branches:
refs/heads/master fb3537e98 -> e8fdf3fde
[Spring Batch] JobExecution instance is now passed to the output message.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fee40c7e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fee40c7e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fee40c7e
Branch: refs/heads/master
Commit: fee40c7ef1163e9869dbc3f3d701778121371ece
Parents: 8aa6aa6
Author: Henryk Konsek <he...@gmail.com>
Authored: Wed Jun 5 12:08:51 2013 +0200
Committer: Henryk Konsek <he...@gmail.com>
Committed: Wed Jun 5 12:08:51 2013 +0200
----------------------------------------------------------------------
.../spring/batch/SpringBatchProducer.java | 4 ++-
.../spring/batch/SpringBatchEndpointTest.java | 21 ++++++++++++++-
2 files changed, 23 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/fee40c7e/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchProducer.java b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchProducer.java
index e6041ea..8f25f2a 100644
--- a/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchProducer.java
+++ b/components/camel-spring-batch/src/main/java/org/apache/camel/component/spring/batch/SpringBatchProducer.java
@@ -23,6 +23,7 @@ import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultProducer;
import org.springframework.batch.core.Job;
+import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.JobParametersBuilder;
import org.springframework.batch.core.launch.JobLauncher;
@@ -42,7 +43,8 @@ public class SpringBatchProducer extends DefaultProducer {
@Override
public void process(Exchange exchange) throws Exception {
JobParameters jobParameters = prepareJobParameters(exchange.getIn().getHeaders());
- jobLauncher.run(job, jobParameters);
+ JobExecution jobExecution = jobLauncher.run(job, jobParameters);
+ exchange.getOut().setBody(jobExecution);
}
protected JobParameters prepareJobParameters(Map<String, Object> headers) {
http://git-wip-us.apache.org/repos/asf/camel/blob/fee40c7e/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointTest.java b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointTest.java
index 7789a1a..92c1e93 100644
--- a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointTest.java
+++ b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointTest.java
@@ -19,8 +19,10 @@ package org.apache.camel.component.spring.batch;
import java.util.Date;
import org.apache.camel.CamelContext;
+import org.apache.camel.EndpointInject;
import org.apache.camel.FailedToCreateRouteException;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.impl.SimpleRegistry;
@@ -32,6 +34,7 @@ import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
import org.springframework.batch.core.Job;
+import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.JobParameters;
import org.springframework.batch.core.launch.JobLauncher;
@@ -54,12 +57,15 @@ public class SpringBatchEndpointTest extends CamelTestSupport {
// Camel fixtures
+ @EndpointInject(uri = "mock:test")
+ MockEndpoint mockEndpoint;
+
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("direct:start").to("spring-batch:mockJob");
+ from("direct:start").to("spring-batch:mockJob").to("mock:test");
}
};
}
@@ -91,6 +97,19 @@ public class SpringBatchEndpointTest extends CamelTestSupport {
verify(jobLauncher).run(eq(job), any(JobParameters.class));
}
+ @Test
+ public void shouldReturnJobExecution() throws Exception {
+ // Given
+ JobExecution jobExecution = mock(JobExecution.class);
+ when(jobLauncher.run(eq(job), any(JobParameters.class))).thenReturn(jobExecution);
+
+ // When
+ sendBody("direct:start", "Start the job, please.");
+
+ // Then
+ mockEndpoint.expectedBodiesReceived(jobExecution);
+ }
+
@Test(expected = UnsupportedOperationException.class)
public void shouldThrowExceptionIfUsedAsConsumer() throws Exception {
// When
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/camel
Posted by he...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/camel
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e8fdf3fd
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e8fdf3fd
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e8fdf3fd
Branch: refs/heads/master
Commit: e8fdf3fde824835004f1aab820281f4d7e96216c
Parents: fee40c7 fb3537e
Author: Henryk Konsek <he...@gmail.com>
Authored: Wed Jun 5 12:09:36 2013 +0200
Committer: Henryk Konsek <he...@gmail.com>
Committed: Wed Jun 5 12:09:36 2013 +0200
----------------------------------------------------------------------
.../main/java/org/apache/camel/StreamCache.java | 2 +-
.../mbean/ManagedBacklogDebuggerMBean.java | 5 +-
.../org/apache/camel/builder/ValueBuilder.java | 10 ++
.../apache/camel/component/ResourceEndpoint.java | 4 +-
.../apache/camel/component/bean/BeanEndpoint.java | 2 +-
.../component/controlbus/ControlBusEndpoint.java | 5 +
.../camel/component/dataset/DataSetEndpoint.java | 10 ++-
.../component/direct/DirectBlockingProducer.java | 2 +-
.../apache/camel/component/file/FileEndpoint.java | 5 +-
.../camel/component/file/GenericFileEndpoint.java | 45 +++++++-
.../camel/component/language/LanguageEndpoint.java | 5 +
.../apache/camel/component/log/LogComponent.java | 6 +-
.../apache/camel/component/log/LogEndpoint.java | 63 +++++++++-
.../apache/camel/component/seda/SedaEndpoint.java | 14 ++-
.../apache/camel/component/test/TestComponent.java | 11 ++-
.../apache/camel/component/test/TestEndpoint.java | 10 ++
.../org/apache/camel/impl/DefaultEndpoint.java | 3 +
.../management/mbean/ManagedBacklogDebugger.java | 4 +
.../processor/interceptor/BacklogDebugger.java | 16 +++
.../component/log/LogEndpointOptionsTest.java | 46 +++++++
.../language/TokenXMLPairNamespaceSplitTest.java | 19 +++
.../camel/management/BacklogDebuggerTest.java | 96 +++++++++++++++
.../component/netty/http/NettyHttpComponent.java | 2 -
.../component/netty/http/NettyHttpSSLTest.java | 2 +-
.../netty/DefaultClientPipelineFactory.java | 11 ++
.../camel/component/netty/NettyConfiguration.java | 27 ++++
.../camel/component/netty/NettyConsumer.java | 1 +
.../netty/NettyConsumerExceptionHandler.java | 66 ++++++++++
.../netty/handlers/ServerChannelHandler.java | 9 +-
.../component/netty/NettyRequestTimeoutTest.java | 84 +++++++++++++
.../component/sap/netweaver/NetWeaverEndpoint.java | 7 +
.../component/sap/netweaver/NetWeaverProducer.java | 6 +-
components/camel-saxon/pom.xml | 11 +--
.../component/twitter/TwitterConfiguration.java | 32 ++++-
parent/pom.xml | 6 +-
35 files changed, 595 insertions(+), 52 deletions(-)
----------------------------------------------------------------------