RESOLVED - issue BATCH-1372: Namespace support for partitioning

Also tidied up (changed) construction pattern for SimpleStepExecutionSplitter, so it doesn't need a step instance.
2009-12-09 07:36:41 +00:00
parent 743a5f84fe
commit 8e1f054bd2
13 changed files with 625 additions and 188 deletions
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/PartitionStepParserTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/PartitionStepParserTests.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2006-2007 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.batch.core.configuration.xml;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.batch.core.BatchStatus;
+import org.springframework.batch.core.Job;
+import org.springframework.batch.core.JobExecution;
+import org.springframework.batch.core.JobParameters;
+import org.springframework.batch.core.StepExecution;
+import org.springframework.batch.core.repository.JobRepository;
+import org.springframework.batch.core.repository.support.MapJobRepositoryFactoryBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+
+/**
+ * @author Dave Syer
+ *
+ */
+@ContextConfiguration
+@RunWith(SpringJUnit4ClassRunner.class)
+public class PartitionStepParserTests {
+	
+	@Autowired
+	@Qualifier("job1")
+	private Job job1;
+
+	@Autowired
+	@Qualifier("job2")
+	private Job job2;
+
+	@Autowired
+	private JobRepository jobRepository;
+
+	@Autowired
+	private MapJobRepositoryFactoryBean mapJobRepositoryFactoryBean;
+	
+	@Before
+	public void setUp() {
+		mapJobRepositoryFactoryBean.clear();
+	}
+
+	@Test
+	public void testDefaultHandlerStep() throws Exception {
+		assertNotNull(job1);
+		JobExecution jobExecution = jobRepository.createJobExecution(job1.getName(), new JobParameters());
+		job1.execute(jobExecution);
+		assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
+		List<String> stepNames = getStepNames(jobExecution);
+		assertEquals(7, stepNames.size());
+		assertEquals("[s1, step1:partition0, step1:partition1, step1:partition2, step1:partition3, step1:partition4, step1:partition5]", stepNames.toString());
+	}
+
+	@Test
+	public void testHandlerRefStep() throws Exception {
+		assertNotNull(job2);
+		JobExecution jobExecution = jobRepository.createJobExecution(job2.getName(), new JobParameters());
+		job2.execute(jobExecution);
+		assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus());
+		List<String> stepNames = getStepNames(jobExecution);
+		assertEquals(3, stepNames.size());
+		assertEquals("[s2, s3, step1:partition0]", stepNames.toString());
+	}
+
+	private List<String> getStepNames(JobExecution jobExecution) {
+		List<String> list = new ArrayList<String>();
+		for (StepExecution stepExecution : jobExecution.getStepExecutions()) {
+			list.add(stepExecution.getStepName());
+		}
+		Collections.sort(list);
+		return list;
+	}
+
+}
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/partition/support/PartitionStepTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/partition/support/PartitionStepTests.java
@@ -56,7 +56,7 @@ public class PartitionStepTests {

 	@Test
 	public void testVanillaStepExecution() throws Exception {
-		step.setStepExecutionSplitter(new SimpleStepExecutionSplitter(jobRepository, remote));
+		step.setStepExecutionSplitter(new SimpleStepExecutionSplitter(jobRepository, remote, new SimplePartitioner()));
 		step.setPartitionHandler(new PartitionHandler() {
 			public Collection<StepExecution> handle(StepExecutionSplitter stepSplitter, StepExecution stepExecution)
 					throws Exception {
@@ -80,7 +80,7 @@ public class PartitionStepTests {

 	@Test
 	public void testFailedStepExecution() throws Exception {
-		step.setStepExecutionSplitter(new SimpleStepExecutionSplitter(jobRepository, remote));
+		step.setStepExecutionSplitter(new SimpleStepExecutionSplitter(jobRepository, remote, new SimplePartitioner()));
 		step.setPartitionHandler(new PartitionHandler() {
 			public Collection<StepExecution> handle(StepExecutionSplitter stepSplitter, StepExecution stepExecution)
 					throws Exception {
@@ -104,7 +104,7 @@ public class PartitionStepTests {

 	@Test
 	public void testStoppedStepExecution() throws Exception {
-		step.setStepExecutionSplitter(new SimpleStepExecutionSplitter(jobRepository, remote));
+		step.setStepExecutionSplitter(new SimpleStepExecutionSplitter(jobRepository, remote, new SimplePartitioner()));
 		step.setPartitionHandler(new PartitionHandler() {
 			public Collection<StepExecution> handle(StepExecutionSplitter stepSplitter, StepExecution stepExecution)
 					throws Exception {
@@ -135,7 +135,7 @@ public class PartitionStepTests {
 				result.getExecutionContext().put("aggregated", true);
 			}
 		});
-		step.setStepExecutionSplitter(new SimpleStepExecutionSplitter(jobRepository, remote));
+		step.setStepExecutionSplitter(new SimpleStepExecutionSplitter(jobRepository, remote, new SimplePartitioner()));
 		step.setPartitionHandler(new PartitionHandler() {
 			public Collection<StepExecution> handle(StepExecutionSplitter stepSplitter, StepExecution stepExecution)
 					throws Exception {
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/partition/support/SimpleStepExecutionSplitterTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/partition/support/SimpleStepExecutionSplitterTests.java
@@ -1,6 +1,7 @@
 package org.springframework.batch.core.partition.support;

-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;

 import java.util.Collections;
 import java.util.Map;
@@ -11,8 +12,6 @@ import org.junit.Test;
 import org.springframework.batch.core.JobExecution;
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.StepExecution;
-import org.springframework.batch.core.partition.support.Partitioner;
-import org.springframework.batch.core.partition.support.SimpleStepExecutionSplitter;
 import org.springframework.batch.core.repository.JobRepository;
 import org.springframework.batch.core.repository.support.MapJobRepositoryFactoryBean;
 import org.springframework.batch.core.step.tasklet.TaskletStep;
@@ -35,10 +34,11 @@ public class SimpleStepExecutionSplitterTests {

 	@Test
 	public void testSimpleStepExecutionProviderJobRepositoryStep() throws Exception {
-		SimpleStepExecutionSplitter splitter = new SimpleStepExecutionSplitter(jobRepository, step);
+		SimpleStepExecutionSplitter splitter = new SimpleStepExecutionSplitter(jobRepository, step,
+				new SimplePartitioner());
 		Set<StepExecution> execs = splitter.split(stepExecution, 2);
 		assertEquals(2, execs.size());
-		
+
 		for (StepExecution execution : execs) {
 			assertNotNull("step execution partition is saved", execution.getId());
 		}
@@ -57,14 +57,16 @@ public class SimpleStepExecutionSplitterTests {

 	@Test
 	public void testRememberGridSize() throws Exception {
-		SimpleStepExecutionSplitter provider = new SimpleStepExecutionSplitter(jobRepository, step);
+		SimpleStepExecutionSplitter provider = new SimpleStepExecutionSplitter(jobRepository, step,
+				new SimplePartitioner());
 		assertEquals(2, provider.split(stepExecution, 2).size());
 		assertEquals(2, provider.split(stepExecution, 3).size());
 	}

 	@Test
 	public void testGetStepName() {
-		SimpleStepExecutionSplitter provider = new SimpleStepExecutionSplitter(jobRepository, step);
+		SimpleStepExecutionSplitter provider = new SimpleStepExecutionSplitter(jobRepository, step,
+				new SimplePartitioner());
 		assertEquals("step", provider.getStepName());
 	}

--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/PartitionStepParserTests-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/xml/PartitionStepParserTests-context.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans:beans xmlns="http://www.springframework.org/schema/batch"
+	xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/batch http://www.springframework.org/schema/batch/spring-batch-2.1.xsd
+	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+	<beans:import resource="common-context.xml" />
+
+	<job id="job1">
+		<step id="s1">
+			<partition step="step1" partitioner="partitioner">
+				<handler task-executor="taskExecutor" grid-size="2" />
+			</partition>
+		</step>
+	</job>
+
+	<job id="job2">
+		<step id="s2" next="s3">
+			<partition step="step1" handler="handler" partitioner="partitioner"/>
+		</step>
+		<step id="s3" parent="step2"/>
+	</job>
+
+	<bean id="handler"
+		class="org.springframework.batch.core.partition.support.TaskExecutorPartitionHandler"
+		xmlns="http://www.springframework.org/schema/beans">
+		<property name="step" ref="step1"/>
+	</bean>
+
+	<beans:bean id="taskExecutor"
+		class="org.springframework.core.task.SimpleAsyncTaskExecutor" />
+
+	<beans:bean id="partitioner"
+		class="org.springframework.batch.core.partition.support.SimplePartitioner" />
+
+</beans:beans>
--- a/spring-batch-core/src/test/resources/org/springframework/batch/core/partition/launch-context.xml
+++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/partition/launch-context.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<beans xmlns="http://www.springframework.org/schema/beans"
+	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.xsd
 		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd">

-	<import resource="classpath:/org/springframework/batch/core/repository/dao/data-source-context.xml" />
+	<import
+		resource="classpath:/org/springframework/batch/core/repository/dao/data-source-context.xml" />

 	<bean id="job1" parent="simpleJob">
 		<property name="steps">
-			<bean name="step1:master" class="org.springframework.batch.core.partition.support.PartitionStep">
+			<bean name="step1:master"
+				class="org.springframework.batch.core.partition.support.PartitionStep">
 				<property name="partitionHandler">
-					<bean class="org.springframework.batch.core.partition.support.TaskExecutorPartitionHandler">
+					<bean
+						class="org.springframework.batch.core.partition.support.TaskExecutorPartitionHandler">
 						<property name="taskExecutor">
 							<bean class="org.springframework.core.task.SimpleAsyncTaskExecutor" />
 						</property>
@@ -21,9 +24,14 @@
 					</bean>
 				</property>
 				<property name="stepExecutionSplitter">
-					<bean class="org.springframework.batch.core.partition.support.SimpleStepExecutionSplitter">
-						<constructor-arg ref="jobRepository" />
-						<constructor-arg ref="step1" />
+					<bean
+						class="org.springframework.batch.core.partition.support.SimpleStepExecutionSplitter">
+						<property name="jobRepository" ref="jobRepository" />
+						<property name="stepName" value="step1" />
+						<property name="partitioner">
+							<bean
+								class="org.springframework.batch.core.partition.support.SimplePartitioner" />
+						</property>
 					</bean>
 				</property>
 				<property name="jobRepository" ref="jobRepository" />
@@ -32,7 +40,8 @@
 	</bean>
 	<bean id="step1" parent="simpleStep">
 		<property name="itemReader">
-			<bean class="org.springframework.batch.core.partition.ExampleItemReader" scope="step">
+			<bean class="org.springframework.batch.core.partition.ExampleItemReader"
+				scope="step">
 				<!--
 					<property name="resource"
 					value="#{stepAttributes[jobParameters['resource']]}"/>
@@ -44,23 +53,29 @@
 		</property>
 	</bean>

-	<bean id="simpleJob" class="org.springframework.batch.core.job.SimpleJob" abstract="true">
+	<bean id="simpleJob" class="org.springframework.batch.core.job.SimpleJob"
+		abstract="true">
 		<property name="jobRepository" ref="jobRepository" />
 		<property name="restartable" value="true" />
 	</bean>

-	<bean id="simpleStep" class="org.springframework.batch.core.step.item.SimpleStepFactoryBean" abstract="true">
+	<bean id="simpleStep"
+		class="org.springframework.batch.core.step.item.SimpleStepFactoryBean"
+		abstract="true">
 		<property name="transactionManager" ref="transactionManager" />
 		<property name="jobRepository" ref="jobRepository" />
 		<property name="startLimit" value="100" />
 		<property name="commitInterval" value="1" />
 	</bean>

-	<bean id="jobLauncher" class="org.springframework.batch.core.launch.support.SimpleJobLauncher">
+	<bean id="jobLauncher"
+		class="org.springframework.batch.core.launch.support.SimpleJobLauncher">
 		<property name="jobRepository" ref="jobRepository" />
 	</bean>
-	<bean id="jobRepository" class="org.springframework.batch.core.repository.support.JobRepositoryFactoryBean"
-		p:databaseType="hsql" p:dataSource-ref="dataSource" p:transactionManager-ref="transactionManager" />
+	<bean id="jobRepository"
+		class="org.springframework.batch.core.repository.support.JobRepositoryFactoryBean"
+		p:databaseType="hsql" p:dataSource-ref="dataSource"
+		p:transactionManager-ref="transactionManager" />

 	<bean class="org.springframework.batch.core.scope.StepScope" />