From 323cdf6f151ffbec9f5d88ca3be79e0de8e35028 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Sat, 19 Mar 2011 14:17:51 +0000 Subject: [PATCH] BATCH-1693: remove use of deprecated constructor --- .../partition/support/PartitionStepTests.java | 14 +++++--------- .../SimpleStepExecutionSplitterTests.java | 19 ++++++++++--------- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git 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 index c5d71ee30..3f1e2fbcc 100644 --- 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 @@ -29,13 +29,11 @@ import org.springframework.batch.core.BatchStatus; import org.springframework.batch.core.ExitStatus; import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobParameters; -import org.springframework.batch.core.Step; import org.springframework.batch.core.StepExecution; import org.springframework.batch.core.partition.PartitionHandler; import org.springframework.batch.core.partition.StepExecutionSplitter; import org.springframework.batch.core.repository.JobRepository; import org.springframework.batch.core.repository.support.MapJobRepositoryFactoryBean; -import org.springframework.batch.core.step.StepSupport; /** * @author Dave Syer @@ -45,8 +43,6 @@ public class PartitionStepTests { private PartitionStep step = new PartitionStep(); - private Step remote = new StepSupport("remote"); - private JobRepository jobRepository; @Before @@ -58,7 +54,7 @@ public class PartitionStepTests { @Test public void testVanillaStepExecution() throws Exception { - step.setStepExecutionSplitter(new SimpleStepExecutionSplitter(jobRepository, remote, new SimplePartitioner())); + step.setStepExecutionSplitter(new SimpleStepExecutionSplitter(jobRepository, true, step.getName(), new SimplePartitioner())); step.setPartitionHandler(new PartitionHandler() { public Collection handle(StepExecutionSplitter stepSplitter, StepExecution stepExecution) throws Exception { @@ -82,7 +78,7 @@ public class PartitionStepTests { @Test public void testFailedStepExecution() throws Exception { - step.setStepExecutionSplitter(new SimpleStepExecutionSplitter(jobRepository, remote, new SimplePartitioner())); + step.setStepExecutionSplitter(new SimpleStepExecutionSplitter(jobRepository, true, step.getName(), new SimplePartitioner())); step.setPartitionHandler(new PartitionHandler() { public Collection handle(StepExecutionSplitter stepSplitter, StepExecution stepExecution) throws Exception { @@ -107,7 +103,7 @@ public class PartitionStepTests { @Test public void testRestartStepExecution() throws Exception { final AtomicBoolean started = new AtomicBoolean(false); - step.setStepExecutionSplitter(new SimpleStepExecutionSplitter(jobRepository, remote, new SimplePartitioner())); + step.setStepExecutionSplitter(new SimpleStepExecutionSplitter(jobRepository, true, step.getName(), new SimplePartitioner())); step.setPartitionHandler(new PartitionHandler() { public Collection handle(StepExecutionSplitter stepSplitter, StepExecution stepExecution) throws Exception { @@ -153,7 +149,7 @@ public class PartitionStepTests { @Test public void testStoppedStepExecution() throws Exception { - step.setStepExecutionSplitter(new SimpleStepExecutionSplitter(jobRepository, remote, new SimplePartitioner())); + step.setStepExecutionSplitter(new SimpleStepExecutionSplitter(jobRepository, true, step.getName(), new SimplePartitioner())); step.setPartitionHandler(new PartitionHandler() { public Collection handle(StepExecutionSplitter stepSplitter, StepExecution stepExecution) throws Exception { @@ -184,7 +180,7 @@ public class PartitionStepTests { result.getExecutionContext().put("aggregated", true); } }); - step.setStepExecutionSplitter(new SimpleStepExecutionSplitter(jobRepository, remote, new SimplePartitioner())); + step.setStepExecutionSplitter(new SimpleStepExecutionSplitter(jobRepository, true, step.getName(), new SimplePartitioner())); step.setPartitionHandler(new PartitionHandler() { public Collection handle(StepExecutionSplitter stepSplitter, StepExecution stepExecution) throws Exception { diff --git 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 index 247dafb88..9d56b8c92 100644 --- 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 @@ -42,7 +42,7 @@ public class SimpleStepExecutionSplitterTests { @Test public void testSimpleStepExecutionProviderJobRepositoryStep() throws Exception { - SimpleStepExecutionSplitter splitter = new SimpleStepExecutionSplitter(jobRepository, step, + SimpleStepExecutionSplitter splitter = new SimpleStepExecutionSplitter(jobRepository, true, step.getName(), new SimplePartitioner()); Set execs = splitter.split(stepExecution, 2); assertEquals(2, execs.size()); @@ -55,7 +55,7 @@ public class SimpleStepExecutionSplitterTests { @Test public void testSimpleStepExecutionProviderJobRepositoryStepPartitioner() throws Exception { final Map map = Collections.singletonMap("foo", new ExecutionContext()); - SimpleStepExecutionSplitter splitter = new SimpleStepExecutionSplitter(jobRepository, step, new Partitioner() { + SimpleStepExecutionSplitter splitter = new SimpleStepExecutionSplitter(jobRepository, true, step.getName(), new Partitioner() { public Map partition(int gridSize) { return map; } @@ -65,7 +65,7 @@ public class SimpleStepExecutionSplitterTests { @Test public void testRememberGridSize() throws Exception { - SimpleStepExecutionSplitter provider = new SimpleStepExecutionSplitter(jobRepository, step, + SimpleStepExecutionSplitter provider = new SimpleStepExecutionSplitter(jobRepository, true, step.getName(), new SimplePartitioner()); Set split = provider.split(stepExecution, 2); assertEquals(2, split.size()); @@ -79,11 +79,12 @@ public class SimpleStepExecutionSplitterTests { public Map partition(int gridSize) { return Collections.singletonMap("foo", new ExecutionContext()); } + public Collection getPartitionNames(int gridSize) { return Arrays.asList("foo"); } } - SimpleStepExecutionSplitter provider = new SimpleStepExecutionSplitter(jobRepository, step, + SimpleStepExecutionSplitter provider = new SimpleStepExecutionSplitter(jobRepository, true, step.getName(), new CustomPartitioner()); Set split = provider.split(stepExecution, 2); assertEquals(1, split.size()); @@ -95,14 +96,14 @@ public class SimpleStepExecutionSplitterTests { @Test public void testGetStepName() { - SimpleStepExecutionSplitter provider = new SimpleStepExecutionSplitter(jobRepository, step, + SimpleStepExecutionSplitter provider = new SimpleStepExecutionSplitter(jobRepository, true, step.getName(), new SimplePartitioner()); assertEquals("step", provider.getStepName()); } @Test public void testUnkownStatus() throws Exception { - SimpleStepExecutionSplitter provider = new SimpleStepExecutionSplitter(jobRepository, step, + SimpleStepExecutionSplitter provider = new SimpleStepExecutionSplitter(jobRepository, true, step.getName(), new SimplePartitioner()); Set split = provider.split(stepExecution, 2); assertEquals(2, split.size()); @@ -118,7 +119,7 @@ public class SimpleStepExecutionSplitterTests { @Test public void testCompleteStatus() throws Exception { - SimpleStepExecutionSplitter provider = new SimpleStepExecutionSplitter(jobRepository, step, + SimpleStepExecutionSplitter provider = new SimpleStepExecutionSplitter(jobRepository, false, step.getName(), new SimplePartitioner()); Set split = provider.split(stepExecution, 2); assertEquals(2, split.size()); @@ -129,7 +130,7 @@ public class SimpleStepExecutionSplitterTests { @Test public void testIncompleteStatus() throws Exception { - SimpleStepExecutionSplitter provider = new SimpleStepExecutionSplitter(jobRepository, step, + SimpleStepExecutionSplitter provider = new SimpleStepExecutionSplitter(jobRepository, true, step.getName(), new SimplePartitioner()); Set split = provider.split(stepExecution, 2); assertEquals(2, split.size()); @@ -146,7 +147,7 @@ public class SimpleStepExecutionSplitterTests { @Test public void testAbandonedStatus() throws Exception { - SimpleStepExecutionSplitter provider = new SimpleStepExecutionSplitter(jobRepository, step, + SimpleStepExecutionSplitter provider = new SimpleStepExecutionSplitter(jobRepository, true, step.getName(), new SimplePartitioner()); Set split = provider.split(stepExecution, 2); assertEquals(2, split.size());