Refactor job launching message handler to use special request object.

spring-batch-integration/src/test/resources/org/springframework/batch/integration/launch/JobLaunchingMessageHandlerIntegrationTests-context.xml

@@ -1,44 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:integration="http://www.springframework.org/schema/integration"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:aop="http://www.springframework.org/schema/aop" xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:p="http://www.springframework.org/schema/p" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
-		http://www.springframework.org/schema/integration
-                                 http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
-		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
-	
-	<import resource="classpath:simple-job-launcher-context.xml"/>
-	
-	<integration:message-bus auto-create-channels="true" />
-	<integration:annotation-driven />
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:integration="http://www.springframework.org/schema/integration"
+	xmlns:context="http://www.springframework.org/schema/context" xmlns:aop="http://www.springframework.org/schema/aop"
+	xmlns:tx="http://www.springframework.org/schema/tx" xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
+		http://www.springframework.org/schema/integration
+                                 http://www.springframework.org/schema/integration/spring-integration-1.0.xsd
+		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd">
+
+	<import resource="classpath:simple-job-launcher-context.xml" />
+
+	<integration:message-bus auto-create-channels="true" channel-factory="channelFactory" />
+	<integration:annotation-driven />
 	<integration:channel id="requests" />
-	<integration:channel id="response" />
-	
-	<integration:handler-endpoint input-channel="requests" handler="jobLaunchingHandler" method="handle"/>
-	
+	<integration:channel id="jobs" />
+	<integration:thread-local-channel id="response" />
+
+	<bean id="channelFactory" class="org.springframework.integration.dispatcher.DirectChannelFactory" />
+
+	<integration:handler-endpoint input-channel="requests" handler="jobLaunchingHandler" method="launch"
+		output-channel="null" return-address-overrides="true" />
+	<integration:handler-endpoint input-channel="none" output-channel="jobs" handler="jobRequestConverter"
+		method="convert" />
+
+	<bean id="jobRequestConverter" class="org.springframework.batch.integration.launch.JobRequestConverter" />
+
 	<bean id="jobLaunchingHandler" class="org.springframework.batch.integration.launch.JobLaunchingMessageHandler">
-		<constructor-arg ref="jobLauncher"/>
-		<constructor-arg ref="messageToJobStrategy"/>
+		<constructor-arg ref="jobLauncher" />
 	</bean>
-	
-	<bean id="messageToJobStrategy" class="org.springframework.batch.integration.launch.StringPayloadAsJobNameStrategy">
-		<constructor-arg ref="jobRegistry" />
-	</bean>
-	
+
 	<bean id="testJob" parent="simpleJob">
-		<property name="steps" ref="step"/>
+		<property name="steps" ref="step" />
 	</bean>
-	
+
 	<bean id="step" class="org.springframework.batch.core.step.tasklet.TaskletStep">
 		<property name="tasklet">
-				<bean class="org.springframework.batch.integration.job.TestTasklet"/>
+			<bean class="org.springframework.batch.integration.job.TestTasklet" />
 		</property>
-		<property name="jobRepository" ref="jobRepository"/>
+		<property name="jobRepository" ref="jobRepository" />
 	</bean>
-
+
 </beans>