diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobTests.java index 115fb7661..7fe43f59d 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobTests.java @@ -354,8 +354,8 @@ public class SimpleJobTests extends TestCase { public void testInterruptWithListener() throws Exception { step1.setProcessException(new JobInterruptedException("job interrupted!")); - MockControl control = MockControl.createStrictControl(JobExecutionListener.class); - JobExecutionListener listener = (JobExecutionListener) control.getMock(); + MockControl control = MockControl.createStrictControl(JobExecutionListener.class); + JobExecutionListener listener = control.getMock(); listener.beforeJob(jobExecution); control.setVoidCallable(); listener.onInterrupt(jobExecution); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/EmptyItemWriter.java b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/EmptyItemWriter.java index cf07fe156..9e7de05dd 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/EmptyItemWriter.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/EmptyItemWriter.java @@ -31,7 +31,7 @@ import org.springframework.beans.factory.InitializingBean; * Mock {@link ItemWriter} that will throw an exception when a certain * number of items have been written. */ -public class EmptyItemWriter implements ItemWriter, InitializingBean { +public class EmptyItemWriter implements ItemWriter, InitializingBean { private boolean failed = false; @@ -52,7 +52,7 @@ public class EmptyItemWriter implements ItemWriter, InitializingBean { this.failurePoint = failurePoint; } - public void write(Object data) { + public void write(T data) { if (!failed && list.size() == failurePoint) { failed = true; throw new RuntimeException("Failed processing: [" + data + "]"); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/SimpleJobLauncherTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/SimpleJobLauncherTests.java index b5e1cae96..24a19a24e 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/SimpleJobLauncherTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/SimpleJobLauncherTests.java @@ -39,7 +39,7 @@ public class SimpleJobLauncherTests extends TestCase { private SimpleJobLauncher jobLauncher; - private MockControl repositoryControl = MockControl.createControl(JobRepository.class); + private MockControl repositoryControl = MockControl.createControl(JobRepository.class); private Job job = new JobSupport("foo") { public void execute(JobExecution execution) { @@ -56,7 +56,7 @@ public class SimpleJobLauncherTests extends TestCase { super.setUp(); jobLauncher = new SimpleJobLauncher(); - jobRepository = (JobRepository) repositoryControl.getMock(); + jobRepository = repositoryControl.getMock(); jobLauncher.setJobRepository(jobRepository); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeChunkListenerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeChunkListenerTests.java index a3a0c165d..9e358f23b 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeChunkListenerTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeChunkListenerTests.java @@ -27,7 +27,7 @@ import junit.framework.TestCase; */ public class CompositeChunkListenerTests extends TestCase { - MockControl listenerControl = MockControl.createControl(ChunkListener.class); + MockControl listenerControl = MockControl.createControl(ChunkListener.class); ChunkListener listener; CompositeChunkListener compositeListener; @@ -35,7 +35,7 @@ public class CompositeChunkListenerTests extends TestCase { protected void setUp() throws Exception { super.setUp(); - listener = (ChunkListener)listenerControl.getMock(); + listener = listenerControl.getMock(); compositeListener = new CompositeChunkListener(); compositeListener.register(listener); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemReadListenerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemReadListenerTests.java index 152ad4fb0..5e67a1462 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemReadListenerTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemReadListenerTests.java @@ -27,7 +27,7 @@ import org.springframework.batch.core.listener.CompositeItemReadListener; */ public class CompositeItemReadListenerTests extends TestCase { - MockControl listenerControl = MockControl.createControl(ItemReadListener.class); + MockControl listenerControl = MockControl.createControl(ItemReadListener.class); ItemReadListener listener; CompositeItemReadListener compositeListener; @@ -35,7 +35,7 @@ public class CompositeItemReadListenerTests extends TestCase { protected void setUp() throws Exception { super.setUp(); - listener = (ItemReadListener)listenerControl.getMock(); + listener = listenerControl.getMock(); compositeListener = new CompositeItemReadListener(); compositeListener.register(listener); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemWriteListenerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemWriteListenerTests.java index e24f8bac2..a86c9fea4 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemWriteListenerTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemWriteListenerTests.java @@ -26,7 +26,7 @@ import org.springframework.batch.core.ItemWriteListener; */ public class CompositeItemWriteListenerTests extends TestCase { - MockControl listenerControl = MockControl.createControl(ItemWriteListener.class); + MockControl listenerControl = MockControl.createControl(ItemWriteListener.class); ItemWriteListener listener; CompositeItemWriteListener compositeListener; @@ -34,7 +34,7 @@ public class CompositeItemWriteListenerTests extends TestCase { protected void setUp() throws Exception { super.setUp(); - listener = (ItemWriteListener)listenerControl.getMock(); + listener = listenerControl.getMock(); compositeListener = new CompositeItemWriteListener(); compositeListener.register(listener); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/resource/JdbcCursorItemReaderPreparedStatementIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/resource/JdbcCursorItemReaderPreparedStatementIntegrationTests.java index 0b6d64fb2..1dfb94ffe 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/resource/JdbcCursorItemReaderPreparedStatementIntegrationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/resource/JdbcCursorItemReaderPreparedStatementIntegrationTests.java @@ -17,12 +17,12 @@ import org.springframework.util.ClassUtils; public class JdbcCursorItemReaderPreparedStatementIntegrationTests extends AbstractTransactionalDataSourceSpringContextTests { - JdbcCursorItemReader itemReader; + JdbcCursorItemReader itemReader; protected void onSetUpInTransaction() throws Exception { super.onSetUpInTransaction(); - itemReader = new JdbcCursorItemReader(); + itemReader = new JdbcCursorItemReader(); itemReader.setDataSource(super.getJdbcTemplate().getDataSource()); itemReader.setSql("select ID, NAME, VALUE from T_FOOS where ID > ? and ID < ?"); itemReader.setIgnoreWarnings(true); @@ -50,9 +50,9 @@ public class JdbcCursorItemReaderPreparedStatementIntegrationTests extends public void testRead() throws Exception{ itemReader.open(new ExecutionContext()); - Foo foo = (Foo)itemReader.read(); + Foo foo = itemReader.read(); assertEquals(2, foo.getId()); - foo = (Foo)itemReader.read(); + foo = itemReader.read(); assertEquals(3, foo.getId()); assertNull(itemReader.read()); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ItemOrientedStepIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ItemOrientedStepIntegrationTests.java index 5c9ad56c8..dd02c1499 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ItemOrientedStepIntegrationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ItemOrientedStepIntegrationTests.java @@ -79,8 +79,8 @@ public class ItemOrientedStepIntegrationTests extends AbstractDependencyInjectio this.dataSource = dataSource; } - private ItemReader getReader(String[] args) { - return new ListItemReader(Arrays.asList(args)); + private ItemReader getReader(String[] args) { + return new ListItemReader(Arrays.asList(args)); } protected void onSetUp() throws Exception { @@ -124,8 +124,8 @@ public class ItemOrientedStepIntegrationTests extends AbstractDependencyInjectio public void testStatusForCommitFailedException() throws Exception { - step.setItemHandler(new SimpleItemHandler(getReader(new String[] { "a", "b", "c" }), new AbstractItemWriter() { - public void write(Object data) throws Exception { + step.setItemHandler(new SimpleItemHandler(getReader(new String[] { "a", "b", "c" }), new AbstractItemWriter() { + public void write(String data) throws Exception { processed.add((String) data); TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() { public void beforeCommit(boolean readOnly) { diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ItemOrientedStepTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ItemOrientedStepTests.java index 83027e533..b4e2bd8d1 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ItemOrientedStepTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ItemOrientedStepTests.java @@ -67,9 +67,9 @@ public class ItemOrientedStepTests extends TestCase { private List list = new ArrayList(); - ItemWriter itemWriter = new AbstractItemWriter() { - public void write(Object data) throws Exception { - processed.add((String) data); + ItemWriter itemWriter = new AbstractItemWriter() { + public void write(String data) throws Exception { + processed.add(data); } }; @@ -80,20 +80,20 @@ public class ItemOrientedStepTests extends TestCase { private JobInstance jobInstance; private ResourcelessTransactionManager transactionManager; - + private ExecutionContext foobarEc = new ExecutionContext() { { put("foo", "bar"); } }; - private ItemReader getReader(String[] args) { - return new ListItemReader(Arrays.asList(args)); + private ItemReader getReader(String[] args) { + return new ListItemReader(Arrays.asList(args)); } private AbstractStep getStep(String[] strings) throws Exception { ItemOrientedStep step = new ItemOrientedStep("stepName"); - step.setItemHandler(new SimpleItemHandler(getReader(strings), itemWriter)); + step.setItemHandler(new SimpleItemHandler(getReader(strings), itemWriter)); step.setJobRepository(new JobRepositorySupport()); step.setTransactionManager(transactionManager); return step; @@ -168,22 +168,15 @@ public class ItemOrientedStepTests extends TestCase { public void testIncrementRollbackCount() { - ItemReader itemReader = new AbstractItemReader() { + ItemReader itemReader = new AbstractItemReader() { - public Object read() throws Exception { - int counter = 0; - counter++; - - if (counter == 1) { - throw new RuntimeException(); - } - - return ExitStatus.CONTINUABLE; + public String read() throws Exception { + throw new RuntimeException(); } }; - itemOrientedStep.setItemHandler(new SimpleItemHandler(itemReader, itemWriter)); + itemOrientedStep.setItemHandler(new SimpleItemHandler(itemReader, itemWriter)); JobExecution jobExecutionContext = new JobExecution(jobInstance); StepExecution stepExecution = new StepExecution(itemOrientedStep.getName(), jobExecutionContext); @@ -198,22 +191,16 @@ public class ItemOrientedStepTests extends TestCase { public void testExitCodeDefaultClassification() throws Exception { - ItemReader itemReader = new AbstractItemReader() { + ItemReader itemReader = new AbstractItemReader() { - public Object read() throws Exception { - int counter = 0; - counter++; + public String read() throws Exception { + throw new RuntimeException(); - if (counter == 1) { - throw new RuntimeException(); - } - - return ExitStatus.CONTINUABLE; } }; - itemOrientedStep.setItemHandler(new SimpleItemHandler(itemReader, itemWriter)); + itemOrientedStep.setItemHandler(new SimpleItemHandler(itemReader, itemWriter)); JobExecution jobExecutionContext = new JobExecution(jobInstance); StepExecution stepExecution = new StepExecution(itemOrientedStep.getName(), jobExecutionContext); @@ -228,22 +215,16 @@ public class ItemOrientedStepTests extends TestCase { public void testExitCodeCustomClassification() throws Exception { - ItemReader itemReader = new AbstractItemReader() { + ItemReader itemReader = new AbstractItemReader() { - public Object read() throws Exception { - int counter = 0; - counter++; + public String read() throws Exception { + throw new RuntimeException(); - if (counter == 1) { - throw new RuntimeException(); - } - - return ExitStatus.CONTINUABLE; } }; - itemOrientedStep.setItemHandler(new SimpleItemHandler(itemReader, itemWriter)); + itemOrientedStep.setItemHandler(new SimpleItemHandler(itemReader, itemWriter)); itemOrientedStep.registerStepExecutionListener(new StepExecutionListenerSupport() { public ExitStatus onErrorInStep(StepExecution stepExecution, Throwable e) { return ExitStatus.FAILED.addExitDescription("FOO"); @@ -269,7 +250,7 @@ public class ItemOrientedStepTests extends TestCase { */ public void testNonRestartedJob() throws Exception { MockRestartableItemReader tasklet = new MockRestartableItemReader(); - itemOrientedStep.setItemHandler(new SimpleItemHandler(tasklet, itemWriter)); + itemOrientedStep.setItemHandler(new SimpleItemHandler(tasklet, itemWriter)); itemOrientedStep.registerStream(tasklet); JobExecution jobExecutionContext = new JobExecution(jobInstance); StepExecution stepExecution = new StepExecution(itemOrientedStep.getName(), jobExecutionContext); @@ -327,7 +308,7 @@ public class ItemOrientedStepTests extends TestCase { */ public void testNoSaveExecutionAttributesRestartableJob() { MockRestartableItemReader tasklet = new MockRestartableItemReader(); - itemOrientedStep.setItemHandler(new SimpleItemHandler(tasklet, itemWriter)); + itemOrientedStep.setItemHandler(new SimpleItemHandler(tasklet, itemWriter)); JobExecution jobExecutionContext = new JobExecution(jobInstance); StepExecution stepExecution = new StepExecution(itemOrientedStep.getName(), jobExecutionContext); @@ -347,8 +328,8 @@ public class ItemOrientedStepTests extends TestCase { * Restartable. */ public void testRestartJobOnNonRestartableTasklet() throws Exception { - itemOrientedStep.setItemHandler(new SimpleItemHandler(new AbstractItemReader() { - public Object read() throws Exception { + itemOrientedStep.setItemHandler(new SimpleItemHandler(new AbstractItemReader() { + public String read() throws Exception { return "foo"; } }, itemWriter)); @@ -360,7 +341,7 @@ public class ItemOrientedStepTests extends TestCase { public void testStreamManager() throws Exception { MockRestartableItemReader reader = new MockRestartableItemReader() { - public Object read() throws Exception { + public String read() throws Exception { return "foo"; } @@ -368,7 +349,7 @@ public class ItemOrientedStepTests extends TestCase { executionContext.putString("foo", "bar"); } }; - itemOrientedStep.setItemHandler(new SimpleItemHandler(reader, itemWriter)); + itemOrientedStep.setItemHandler(new SimpleItemHandler(reader, itemWriter)); itemOrientedStep.registerStream(reader); JobExecution jobExecution = new JobExecution(jobInstance); StepExecution stepExecution = new StepExecution(itemOrientedStep.getName(), jobExecution); @@ -463,8 +444,8 @@ public class ItemOrientedStepTests extends TestCase { return null; } }); - itemOrientedStep.setItemHandler(new SimpleItemHandler(new MockRestartableItemReader() { - public Object read() throws Exception { + itemOrientedStep.setItemHandler(new SimpleItemHandler(new MockRestartableItemReader() { + public String read() throws Exception { throw new RuntimeException("FOO"); } }, itemWriter)); @@ -482,7 +463,7 @@ public class ItemOrientedStepTests extends TestCase { public void testDirectlyInjectedStreamWhichIsAlsoReader() throws Exception { MockRestartableItemReader reader = new MockRestartableItemReader() { - public Object read() throws Exception { + public String read() throws Exception { return "foo"; } @@ -490,7 +471,7 @@ public class ItemOrientedStepTests extends TestCase { executionContext.putString("foo", "bar"); } }; - itemOrientedStep.setItemHandler(new SimpleItemHandler(reader, itemWriter)); + itemOrientedStep.setItemHandler(new SimpleItemHandler(reader, itemWriter)); itemOrientedStep.setStreams(new ItemStream[] { reader }); JobExecution jobExecution = new JobExecution(jobInstance); StepExecution stepExecution = new StepExecution(itemOrientedStep.getName(), jobExecution); @@ -515,22 +496,16 @@ public class ItemOrientedStepTests extends TestCase { itemOrientedStep.setInterruptionPolicy(interruptionPolicy); - ItemReader itemReader = new AbstractItemReader() { + ItemReader itemReader = new AbstractItemReader() { - public Object read() throws Exception { - int counter = 0; - counter++; + public String read() throws Exception { + throw new RuntimeException(); - if (counter == 1) { - throw new RuntimeException(); - } - - return ExitStatus.CONTINUABLE; } }; - itemOrientedStep.setItemHandler(new SimpleItemHandler(itemReader, itemWriter)); + itemOrientedStep.setItemHandler(new SimpleItemHandler(itemReader, itemWriter)); JobExecution jobExecutionContext = new JobExecution(jobInstance); StepExecution stepExecution = new StepExecution(itemOrientedStep.getName(), jobExecutionContext); @@ -551,13 +526,13 @@ public class ItemOrientedStepTests extends TestCase { public void testStatusForNormalFailure() throws Exception { - ItemReader itemReader = new AbstractItemReader() { - public Object read() throws Exception { + ItemReader itemReader = new AbstractItemReader() { + public String read() throws Exception { // Trigger a rollback throw new RuntimeException("Foo"); } }; - itemOrientedStep.setItemHandler(new SimpleItemHandler(itemReader, itemWriter)); + itemOrientedStep.setItemHandler(new SimpleItemHandler(itemReader, itemWriter)); JobExecution jobExecutionContext = new JobExecution(jobInstance); StepExecution stepExecution = new StepExecution(itemOrientedStep.getName(), jobExecutionContext); @@ -578,13 +553,13 @@ public class ItemOrientedStepTests extends TestCase { public void testStatusForErrorFailure() throws Exception { - ItemReader itemReader = new AbstractItemReader() { - public Object read() throws Exception { + ItemReader itemReader = new AbstractItemReader() { + public String read() throws Exception { // Trigger a rollback throw new Error("Foo"); } }; - itemOrientedStep.setItemHandler(new SimpleItemHandler(itemReader, itemWriter)); + itemOrientedStep.setItemHandler(new SimpleItemHandler(itemReader, itemWriter)); JobExecution jobExecutionContext = new JobExecution(jobInstance); StepExecution stepExecution = new StepExecution(itemOrientedStep.getName(), jobExecutionContext); @@ -605,13 +580,13 @@ public class ItemOrientedStepTests extends TestCase { public void testStatusForResetFailedException() throws Exception { - ItemReader itemReader = new AbstractItemReader() { - public Object read() throws Exception { + ItemReader itemReader = new AbstractItemReader() { + public String read() throws Exception { // Trigger a rollback throw new RuntimeException("Foo"); } }; - itemOrientedStep.setItemHandler(new SimpleItemHandler(itemReader, itemWriter)); + itemOrientedStep.setItemHandler(new SimpleItemHandler(itemReader, itemWriter)); itemOrientedStep.setTransactionManager(new ResourcelessTransactionManager() { protected void doRollback(DefaultTransactionStatus status) throws TransactionException { // Simulate failure on rollback when stream resets @@ -690,8 +665,7 @@ public class ItemOrientedStepTests extends TestCase { String msg = stepExecution.getExitStatus().getExitDescription(); assertEquals("", msg); msg = ex.getMessage(); - assertTrue("Message does not contain 'closing step': " + msg, contains(msg, - "closing step")); + assertTrue("Message does not contain 'closing step': " + msg, contains(msg, "closing step")); // The original rollback was caused by this one: assertEquals("Bar", ex.getCause().getMessage()); } @@ -706,7 +680,7 @@ public class ItemOrientedStepTests extends TestCase { throw new RuntimeException("Bar"); } }; - itemOrientedStep.setItemHandler(new SimpleItemHandler(itemReader, itemWriter)); + itemOrientedStep.setItemHandler(new SimpleItemHandler(itemReader, itemWriter)); itemOrientedStep.registerStream(itemReader); JobExecution jobExecutionContext = new JobExecution(jobInstance); @@ -738,12 +712,12 @@ public class ItemOrientedStepTests extends TestCase { */ public void testRestartAfterFailureInFirstChunk() throws Exception { MockRestartableItemReader reader = new MockRestartableItemReader() { - public Object read() throws Exception { + public String read() throws Exception { // fail on the very first item throw new RuntimeException("CRASH!"); } }; - itemOrientedStep.setItemHandler(new SimpleItemHandler(reader, itemWriter)); + itemOrientedStep.setItemHandler(new SimpleItemHandler(reader, itemWriter)); itemOrientedStep.registerStream(reader); StepExecution stepExecution = new StepExecution(itemOrientedStep.getName(), new JobExecution(jobInstance)); @@ -805,7 +779,7 @@ public class ItemOrientedStepTests extends TestCase { return str.indexOf(searchStr) != -1; } - private class MockRestartableItemReader extends ItemStreamSupport implements ItemReader, StepExecutionListener { + private class MockRestartableItemReader extends ItemStreamSupport implements ItemReader, StepExecutionListener { private boolean getExecutionAttributesCalled = false; @@ -813,7 +787,7 @@ public class ItemOrientedStepTests extends TestCase { private boolean restoreFromCalledWithSomeContext = false; - public Object read() throws Exception { + public String read() throws Exception { return "item"; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ItemSkipPolicyItemHandlerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ItemSkipPolicyItemHandlerTests.java index a02944607..1b50823bb 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ItemSkipPolicyItemHandlerTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ItemSkipPolicyItemHandlerTests.java @@ -51,7 +51,7 @@ public class ItemSkipPolicyItemHandlerTests extends TestCase { private final SkipWriterStub writer = new SkipWriterStub(); - private ItemSkipPolicyItemHandler handler = new ItemSkipPolicyItemHandler(new SkipReaderStub(), writer); + private ItemSkipPolicyItemHandler handler = new ItemSkipPolicyItemHandler(new SkipReaderStub(), writer); private StepContribution contribution = new StepContribution(new JobExecution(new JobInstance(new Long(11), new JobParameters(), "jobName")).createStepExecution(new StepSupport("foo"))); @@ -138,7 +138,7 @@ public class ItemSkipPolicyItemHandlerTests extends TestCase { assertEquals(2, contribution.getSkipCount()); assertEquals(1, TransactionSynchronizationManager.getResourceMap().size()); - Set removed = (Set) TransactionSynchronizationManager.getResourceMap().values().iterator().next(); + Set removed = (Set) TransactionSynchronizationManager.getResourceMap().values().iterator().next(); // one skipped item was detected on read assertEquals(1, removed.size()); // mark() should remove the set of removed keys diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/MockItemReader.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/MockItemReader.java index b796ed440..6de928123 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/MockItemReader.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/MockItemReader.java @@ -19,7 +19,7 @@ import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.MarkFailedException; import org.springframework.batch.item.ResetFailedException; -public class MockItemReader implements ItemReader { +public class MockItemReader implements ItemReader { private final int returnItemCount; @@ -42,7 +42,7 @@ public class MockItemReader implements ItemReader { public void close() { } - public Object read() { + public String read() { if(fail) { fail = false; throw new RuntimeException(); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/RepeatOperationsStepFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/RepeatOperationsStepFactoryBeanTests.java index 6d029110d..5563a8736 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/RepeatOperationsStepFactoryBeanTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/RepeatOperationsStepFactoryBeanTests.java @@ -39,7 +39,7 @@ import org.springframework.batch.support.transaction.ResourcelessTransactionMana */ public class RepeatOperationsStepFactoryBeanTests extends TestCase { - private RepeatOperationsStepFactoryBean factory = new RepeatOperationsStepFactoryBean(); + private RepeatOperationsStepFactoryBean factory = new RepeatOperationsStepFactoryBean(); private List list; @@ -47,8 +47,8 @@ public class RepeatOperationsStepFactoryBeanTests extends TestCase { protected void setUp() throws Exception { factory.setBeanName("RepeatOperationsStep"); - factory.setItemReader(new ListItemReader(new ArrayList())); - factory.setItemWriter(new EmptyItemWriter()); + factory.setItemReader(new ListItemReader(new ArrayList())); + factory.setItemWriter(new EmptyItemWriter()); factory.setJobRepository(new JobRepositorySupport()); factory.setTransactionManager(new ResourcelessTransactionManager()); } @@ -63,8 +63,8 @@ public class RepeatOperationsStepFactoryBeanTests extends TestCase { public void testStepOperationsWithoutChunkListener() throws Exception { - factory.setItemReader(new ListItemReader(new ArrayList())); - factory.setItemWriter(new EmptyItemWriter()); + factory.setItemReader(new ListItemReader(new ArrayList())); + factory.setItemWriter(new EmptyItemWriter()); factory.setJobRepository(new JobRepositorySupport()); factory.setTransactionManager(new ResourcelessTransactionManager()); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleStepFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleStepFactoryBeanTests.java index d5fd24449..f6f44348a 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleStepFactoryBeanTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleStepFactoryBeanTests.java @@ -62,13 +62,13 @@ public class SimpleStepFactoryBeanTests extends TestCase { private List written = new ArrayList(); - private ItemWriter writer = new AbstractItemWriter() { - public void write(Object data) throws Exception { - written.add((String) data); + private ItemWriter writer = new AbstractItemWriter() { + public void write(String data) throws Exception { + written.add(data); } }; - private ItemReader reader; + private ItemReader reader; private AbstractJob job = new SimpleJob() { { @@ -84,21 +84,20 @@ public class SimpleStepFactoryBeanTests extends TestCase { MapStepExecutionDao.clear(); } - private SimpleStepFactoryBean getStepFactory(String arg) throws Exception { + private SimpleStepFactoryBean getStepFactory(String arg) throws Exception { return getStepFactory(new String[] { arg }); } - private SimpleStepFactoryBean getStepFactory(String arg0, String arg1) throws Exception { + private SimpleStepFactoryBean getStepFactory(String arg0, String arg1) throws Exception { return getStepFactory(new String[] { arg0, arg1 }); } - @SuppressWarnings("unchecked") - private SimpleStepFactoryBean getStepFactory(String[] args) throws Exception { - SimpleStepFactoryBean factory = new SimpleStepFactoryBean(); + private SimpleStepFactoryBean getStepFactory(String[] args) throws Exception { + SimpleStepFactoryBean factory = new SimpleStepFactoryBean(); List items = TransactionAwareProxyFactory.createTransactionalList(); items.addAll(Arrays.asList(args)); - reader = new ListItemReader(items); + reader = new ListItemReader(items); factory.setItemReader(reader); factory.setItemWriter(writer); @@ -129,7 +128,7 @@ public class SimpleStepFactoryBeanTests extends TestCase { public void testSimpleConcurrentJob() throws Exception { job.setSteps(new ArrayList()); - SimpleStepFactoryBean factory = getStepFactory("foo", "bar"); + SimpleStepFactoryBean factory = getStepFactory("foo", "bar"); factory.setTaskExecutor(new SimpleAsyncTaskExecutor()); factory.setThrottleLimit(1); @@ -163,10 +162,10 @@ public class SimpleStepFactoryBeanTests extends TestCase { * is recovered ("skipped") on the second attempt (see retry policy * definition above)... */ - SimpleStepFactoryBean factory = getStepFactory(new String[] { "foo", "bar", "spam" }); + SimpleStepFactoryBean factory = getStepFactory(new String[] { "foo", "bar", "spam" }); - factory.setItemWriter(new AbstractItemWriter() { - public void write(Object data) throws Exception { + factory.setItemWriter(new AbstractItemWriter() { + public void write(String data) throws Exception { throw new RuntimeException("Error!"); } }); @@ -196,10 +195,10 @@ public class SimpleStepFactoryBeanTests extends TestCase { } public void testExceptionTerminates() throws Exception { - SimpleStepFactoryBean factory = getStepFactory(new String[] { "foo", "bar", "spam" }); + SimpleStepFactoryBean factory = getStepFactory(new String[] { "foo", "bar", "spam" }); factory.setBeanName("exceptionStep"); - factory.setItemWriter(new AbstractItemWriter() { - public void write(Object data) throws Exception { + factory.setItemWriter(new AbstractItemWriter() { + public void write(String data) throws Exception { throw new RuntimeException("Foo"); } }); @@ -219,13 +218,13 @@ public class SimpleStepFactoryBeanTests extends TestCase { } public void testExceptionHandler() throws Exception { - SimpleStepFactoryBean factory = getStepFactory(new String[] { "foo", "bar", "spam" }); + SimpleStepFactoryBean factory = getStepFactory(new String[] { "foo", "bar", "spam" }); factory.setBeanName("exceptionStep"); factory.setExceptionHandler(new SimpleLimitExceptionHandler(1)); - factory.setItemWriter(new AbstractItemWriter() { + factory.setItemWriter(new AbstractItemWriter() { int count = 0; - public void write(Object data) throws Exception { + public void write(String data) throws Exception { if (count++ == 0) { throw new RuntimeException("Foo"); } @@ -245,7 +244,7 @@ public class SimpleStepFactoryBeanTests extends TestCase { String[] items = new String[] { "1", "2", "3", "4", "5", "6", "7" }; int commitInterval = 3; - SimpleStepFactoryBean factory = getStepFactory(items); + SimpleStepFactoryBean factory = getStepFactory(items); class CountingChunkListener implements ChunkListener { int beforeCount = 0; @@ -284,7 +283,7 @@ public class SimpleStepFactoryBeanTests extends TestCase { * @throws Exception */ public void testCommitIntervalMustBeGreaterThanZero() throws Exception { - SimpleStepFactoryBean factory = getStepFactory("foo"); + SimpleStepFactoryBean factory = getStepFactory("foo"); // nothing wrong here factory.getObject(); @@ -304,7 +303,7 @@ public class SimpleStepFactoryBeanTests extends TestCase { * @throws Exception */ public void testCommitIntervalAndCompletionPolicyBothSet() throws Exception { - SimpleStepFactoryBean factory = getStepFactory("foo"); + SimpleStepFactoryBean factory = getStepFactory("foo"); // but exception expected after setting commit interval and completion // policy diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SkipLimitStepFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SkipLimitStepFactoryBeanTests.java index 42224cf61..2a99afd23 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SkipLimitStepFactoryBeanTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SkipLimitStepFactoryBeanTests.java @@ -39,7 +39,7 @@ public class SkipLimitStepFactoryBeanTests extends TestCase { protected final Log logger = LogFactory.getLog(getClass()); - private SkipLimitStepFactoryBean factory = new SkipLimitStepFactoryBean(); + private SkipLimitStepFactoryBean factory = new SkipLimitStepFactoryBean(); private Class[] skippableExceptions = new Class[] { SkippableException.class, SkippableRuntimeException.class }; @@ -129,7 +129,7 @@ public class SkipLimitStepFactoryBeanTests extends TestCase { public void testFatalException() throws Exception { factory.setFatalExceptionClasses(new Class[] { FatalRuntimeException.class }); factory.setItemWriter(new SkipWriterStub() { - public void write(Object item) { + public void write(String item) { throw new FatalRuntimeException("Ouch!"); } }); @@ -305,7 +305,7 @@ public class SkipLimitStepFactoryBeanTests extends TestCase { /** * Simple item reader that supports skip functionality. */ - private static class SkipReaderStub implements ItemReader { + private static class SkipReaderStub implements ItemReader { protected final Log logger = LogFactory.getLog(getClass()); @@ -328,7 +328,7 @@ public class SkipLimitStepFactoryBeanTests extends TestCase { this.failures = failures; } - public Object read() throws Exception, UnexpectedInputException, NoWorkFoundException, ParseException { + public String read() throws Exception, UnexpectedInputException, NoWorkFoundException, ParseException { counter++; if (counter >= items.length) { logger.debug("Returning null at count=" + counter); @@ -359,7 +359,7 @@ public class SkipLimitStepFactoryBeanTests extends TestCase { /** * Simple item writer that supports skip functionality. */ - private static class SkipWriterStub implements ItemWriter { + private static class SkipWriterStub implements ItemWriter { protected final Log logger = LogFactory.getLog(getClass()); @@ -391,7 +391,7 @@ public class SkipLimitStepFactoryBeanTests extends TestCase { flushIndex = written.size() - 1; } - public void write(Object item) throws Exception { + public void write(String item) throws Exception { if (failures.contains(item)) { logger.debug("Throwing write exception on [" + item + "]"); throw new SkippableRuntimeException("exception in writer"); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StatefulRetryStepFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StatefulRetryStepFactoryBeanTests.java index 148e14ef5..effd71d79 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StatefulRetryStepFactoryBeanTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StatefulRetryStepFactoryBeanTests.java @@ -58,11 +58,11 @@ public class StatefulRetryStepFactoryBeanTests extends TestCase { protected final Log logger = LogFactory.getLog(getClass()); - private SkipLimitStepFactoryBean factory = new SkipLimitStepFactoryBean(); + private SkipLimitStepFactoryBean factory = new SkipLimitStepFactoryBean(); private List recovered = new ArrayList(); - private List processed = new ArrayList(); + private List processed = new ArrayList(); int count = 0; @@ -71,8 +71,8 @@ public class StatefulRetryStepFactoryBeanTests extends TestCase { JobExecution jobExecution; - private ItemWriter processor = new AbstractItemWriter() { - public void write(String data) throws Exception { + private ItemWriter processor = new AbstractItemWriter() { + public void write(Object data) throws Exception { processed.add(data); } }; @@ -89,7 +89,7 @@ public class StatefulRetryStepFactoryBeanTests extends TestCase { factory.setBeanName("step"); - factory.setItemReader(new ListItemReader(new ArrayList())); + factory.setItemReader(new ListItemReader(new ArrayList())); factory.setItemWriter(processor); factory.setJobRepository(repository); factory.setTransactionManager(new ResourcelessTransactionManager()); @@ -120,13 +120,12 @@ public class StatefulRetryStepFactoryBeanTests extends TestCase { * * @throws Exception */ - @SuppressWarnings("unchecked") public void testSuccessfulRetryWithReadFailure() throws Exception { - List items = TransactionAwareProxyFactory.createTransactionalList(); + List items = TransactionAwareProxyFactory.createTransactionalList(); items.addAll(Arrays.asList(new String[] { "a", "b", "c" })); - ItemReader provider = new ListItemReader(items) { - public String read() { - String item = super.read(); + ItemReader provider = new ListItemReader(items) { + public Object read() { + Object item = super.read(); count++; if (count == 2) { throw new RuntimeException("Temporary error - retry for success."); @@ -149,15 +148,14 @@ public class StatefulRetryStepFactoryBeanTests extends TestCase { assertEquals(3, stepExecution.getItemCount().intValue()); } - @SuppressWarnings("unchecked") public void testSkipAndRetry() throws Exception { factory.setSkippableExceptionClasses(new Class[] { Exception.class }); factory.setSkipLimit(2); - List items = TransactionAwareProxyFactory.createTransactionalList(); + List items = TransactionAwareProxyFactory.createTransactionalList(); items.addAll(Arrays.asList(new String[] { "a", "b", "c", "d", "e", "f" })); - ItemReader provider = new ListItemReader(items) { - public String read() { - String item = super.read(); + ItemReader provider = new ListItemReader(items) { + public Object read() { + Object item = super.read(); count++; if ("b".equals(item) || "d".equals(item)) { throw new RuntimeException("Read error - planned but skippable."); @@ -178,7 +176,6 @@ public class StatefulRetryStepFactoryBeanTests extends TestCase { assertEquals(4, stepExecution.getItemCount().intValue()); } - @SuppressWarnings("unchecked") public void testSkipAndRetryWithWriteFailure() throws Exception { factory.setSkippableExceptionClasses(new Class[] { RetryException.class }); @@ -189,18 +186,18 @@ public class StatefulRetryStepFactoryBeanTests extends TestCase { } } }); factory.setSkipLimit(2); - List items = TransactionAwareProxyFactory.createTransactionalList(); + List items = TransactionAwareProxyFactory.createTransactionalList(); items.addAll(Arrays.asList(new String[] { "a", "b", "c", "d", "e", "f" })); - ItemReader provider = new ListItemReader(items) { - public String read() { - String item = super.read(); + ItemReader provider = new ListItemReader(items) { + public Object read() { + Object item = super.read(); logger.debug("Read Called! Item: [" + item + "]"); count++; return item; } }; - ItemWriter itemWriter = new AbstractItemWriter() { + ItemWriter itemWriter = new AbstractItemWriter() { public void write(Object item) throws Exception { logger.debug("Write Called! Item: [" + item + "]"); if ("b".equals(item) || "d".equals(item)) { @@ -225,22 +222,21 @@ public class StatefulRetryStepFactoryBeanTests extends TestCase { assertEquals(17, count); } - @SuppressWarnings("unchecked") public void testRetryWithNoSkip() throws Exception { factory.setRetryableExceptionClasses(new Class[] { Exception.class }); factory.setRetryLimit(4); factory.setSkipLimit(0); - List items = TransactionAwareProxyFactory.createTransactionalList(); + List items = TransactionAwareProxyFactory.createTransactionalList(); items.addAll(Arrays.asList(new String[] { "b" })); - ItemReader provider = new ListItemReader(items) { - public String read() { - String item = super.read(); + ItemReader provider = new ListItemReader(items) { + public Object read() { + Object item = super.read(); count++; return item; } }; - ItemWriter itemWriter = new AbstractItemWriter() { - public void write(String item) throws Exception { + ItemWriter itemWriter = new AbstractItemWriter() { + public void write(Object item) throws Exception { logger.debug("Write Called! Item: [" + item + "]"); throw new RuntimeException("Write error - planned but retryable."); } @@ -264,21 +260,20 @@ public class StatefulRetryStepFactoryBeanTests extends TestCase { assertEquals(0, stepExecution.getItemCount().intValue()); } - @SuppressWarnings("unchecked") public void testRetryPolicy() throws Exception { factory.setRetryPolicy(new SimpleRetryPolicy(4)); factory.setSkipLimit(0); - List items = TransactionAwareProxyFactory.createTransactionalList(); + List items = TransactionAwareProxyFactory.createTransactionalList(); items.addAll(Arrays.asList(new String[] { "b" })); - ItemReader provider = new ListItemReader(items) { - public String read() { - String item = super.read(); + ItemReader provider = new ListItemReader(items) { + public Object read() { + Object item = super.read(); count++; return item; } }; - ItemWriter itemWriter = new AbstractItemWriter() { - public void write(String item) throws Exception { + ItemWriter itemWriter = new AbstractItemWriter() { + public void write(Object item) throws Exception { logger.debug("Write Called! Item: [" + item + "]"); throw new RuntimeException("Write error - planned but retryable."); } @@ -308,14 +303,14 @@ public class StatefulRetryStepFactoryBeanTests extends TestCase { // set the cache limit lower than the number of unique un-recovered // errors expected factory.setCacheCapacity(2); - ItemReader provider = new AbstractItemReader() { + ItemReader provider = new AbstractItemReader() { public Object read() { Object item = new Object(); count++; return item; } }; - ItemWriter itemWriter = new AbstractItemWriter() { + ItemWriter itemWriter = new AbstractItemWriter() { public void write(Object item) throws Exception { logger.debug("Write Called! Item: [" + item + "]"); throw new RuntimeException("Write error - planned but retryable."); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StepExecutorInterruptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StepExecutorInterruptionTests.java index 495589de3..dab8701cd 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StepExecutorInterruptionTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/StepExecutorInterruptionTests.java @@ -44,7 +44,7 @@ public class StepExecutorInterruptionTests extends TestCase { private JobExecution jobExecution; - private AbstractItemWriter itemWriter; + private AbstractItemWriter itemWriter; private StepExecution stepExecution; @@ -63,11 +63,11 @@ public class StepExecutorInterruptionTests extends TestCase { jobExecution = jobRepository.createJobExecution(jobConfiguration, new JobParameters()); step.setJobRepository(jobRepository); step.setTransactionManager(new ResourcelessTransactionManager()); - itemWriter = new AbstractItemWriter() { + itemWriter = new AbstractItemWriter() { public void write(Object item) throws Exception { } }; - step.setItemHandler(new SimpleItemHandler(new AbstractItemReader() { + step.setItemHandler(new SimpleItemHandler(new AbstractItemReader() { public Object read() throws Exception { return null; } @@ -107,7 +107,7 @@ public class StepExecutorInterruptionTests extends TestCase { Thread processingThread = createThread(stepExecution); - step.setItemHandler(new SimpleItemHandler(new AbstractItemReader() { + step.setItemHandler(new SimpleItemHandler(new AbstractItemReader() { public Object read() throws Exception { return null; } @@ -145,7 +145,7 @@ public class StepExecutorInterruptionTests extends TestCase { * @return */ private Thread createThread(final StepExecution stepExecution) { - step.setItemHandler(new SimpleItemHandler(new AbstractItemReader() { + step.setItemHandler(new SimpleItemHandler(new AbstractItemReader() { public Object read() throws Exception { // do something non-trivial (and not Thread.sleep()) double foo = 1; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/BatchSqlUpdateItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/BatchSqlUpdateItemWriterTests.java index 31906f251..59c39f716 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/BatchSqlUpdateItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/BatchSqlUpdateItemWriterTests.java @@ -72,8 +72,8 @@ public class BatchSqlUpdateItemWriterTests extends TestCase { }; writer.setSql("SQL"); writer.setJdbcTemplate(jdbcTemplate); - writer.setItemPreparedStatementSetter(new ItemPreparedStatementSetter() { - public void setValues(Object item, PreparedStatement ps) throws SQLException { + writer.setItemPreparedStatementSetter(new ItemPreparedStatementSetter() { + public void setValues(String item, PreparedStatement ps) throws SQLException { list.add(item); } }); @@ -193,8 +193,8 @@ public class BatchSqlUpdateItemWriterTests extends TestCase { public void testWriteAndFlushWithFailure() throws Exception { final RuntimeException ex = new RuntimeException("bar"); - writer.setItemPreparedStatementSetter(new ItemPreparedStatementSetter() { - public void setValues(Object item, PreparedStatement ps) throws SQLException { + writer.setItemPreparedStatementSetter(new ItemPreparedStatementSetter() { + public void setValues(String item, PreparedStatement ps) throws SQLException { list.add(item); throw ex; } @@ -213,8 +213,8 @@ public class BatchSqlUpdateItemWriterTests extends TestCase { } assertFalse(TransactionSynchronizationManager.hasResource(writer.getResourceKey())); assertEquals(2, list.size()); - writer.setItemPreparedStatementSetter(new ItemPreparedStatementSetter() { - public void setValues(Object item, PreparedStatement ps) throws SQLException { + writer.setItemPreparedStatementSetter(new ItemPreparedStatementSetter() { + public void setValues(String item, PreparedStatement ps) throws SQLException { list.add(item); } }); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/LineAggregatorItemTransformerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/LineAggregatorItemTransformerTests.java index b58ead759..f5b078a12 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/LineAggregatorItemTransformerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/LineAggregatorItemTransformerTests.java @@ -25,7 +25,7 @@ import org.springframework.batch.item.file.mapping.FieldSet; */ public class LineAggregatorItemTransformerTests extends TestCase { - private LineAggregatorItemTransformer transformer = new LineAggregatorItemTransformer(); + private LineAggregatorItemTransformer transformer = new LineAggregatorItemTransformer(); /** * Test method for {@link org.springframework.batch.item.file.transform.LineAggregatorItemTransformer#setAggregator(org.springframework.batch.item.file.transform.LineAggregator)}. @@ -50,17 +50,4 @@ public class LineAggregatorItemTransformerTests extends TestCase { assertTrue("Wrong value: "+value, value.startsWith("a,b")); } - /** - * Test method for {@link org.springframework.batch.item.file.transform.LineAggregatorItemTransformer#transform(java.lang.Object)}. - * @throws Exception - */ - public void testTransformWrongType() throws Exception { - try { - transformer.transform("foo"); - fail("Expected ConversionException"); - } catch (ConversionException e) { - // Expected - } - - } } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/RecursiveCollectionItemTransformerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/RecursiveCollectionItemTransformerTests.java index 625f0869a..9cb7d778a 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/RecursiveCollectionItemTransformerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/RecursiveCollectionItemTransformerTests.java @@ -16,6 +16,7 @@ package org.springframework.batch.item.file.transform; import java.util.Arrays; +import java.util.Collection; import java.util.Collections; import junit.framework.TestCase; @@ -39,8 +40,8 @@ public class RecursiveCollectionItemTransformerTests extends TestCase { * @throws Exception */ public void testSetDelegate() throws Exception { - transformer.setDelegate(new ItemTransformer() { - public Object transform(Object item) throws Exception { + transformer.setDelegate(new ItemTransformer() { + public String transform(Object item) throws Exception { return "bar"; } }); @@ -53,8 +54,8 @@ public class RecursiveCollectionItemTransformerTests extends TestCase { * @throws Exception */ public void testSetDelegateAndPassInString() throws Exception { - transformer.setDelegate(new ItemTransformer() { - public Object transform(Object item) throws Exception { + transformer.setDelegate(new ItemTransformer() { + public String transform(Object item) throws Exception { return "bar"; } }); @@ -67,8 +68,8 @@ public class RecursiveCollectionItemTransformerTests extends TestCase { * @throws Exception */ public void testSetDelegateReturnsList() throws Exception { - transformer.setDelegate(new ItemTransformer() { - public Object transform(Object item) throws Exception { + transformer.setDelegate(new ItemTransformer>() { + public Collection transform(Object item) throws Exception { return Collections.singletonList("bar"); } }); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/DelegatingItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/DelegatingItemWriterTests.java index e60947b58..f91be55fb 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/DelegatingItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/DelegatingItemWriterTests.java @@ -79,11 +79,11 @@ public class DelegatingItemWriterTests extends TestCase { assertTrue(writer.isDoProcessCalled()); } - private class ProcessingWriter extends DelegatingItemWriter{ + private class ProcessingWriter extends DelegatingItemWriter{ boolean doProcessCalled = false; - protected Object doProcess(Object item) throws Exception { + protected O doProcess(I item) throws Exception { doProcessCalled = true; return super.doProcess(item); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/transform/CompositeItemTransformerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/transform/CompositeItemTransformerTests.java index 4e8ba86a3..d0868c139 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/transform/CompositeItemTransformerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/transform/CompositeItemTransformerTests.java @@ -13,17 +13,17 @@ import org.easymock.MockControl; */ public class CompositeItemTransformerTests extends TestCase { - private CompositeItemTransformer composite = new CompositeItemTransformer(); + private CompositeItemTransformer composite = new CompositeItemTransformer(); - private ItemTransformer transformer1; - private ItemTransformer transformer2; + private ItemTransformer transformer1; + private ItemTransformer transformer2; - private MockControl tControl1 = MockControl.createControl(ItemTransformer.class); - private MockControl tControl2 = MockControl.createControl(ItemTransformer.class); + private MockControl tControl1 = MockControl.createControl(ItemTransformer.class); + private MockControl tControl2 = MockControl.createControl(ItemTransformer.class); protected void setUp() throws Exception { - transformer1 = (ItemTransformer) tControl1.getMock(); - transformer2 = (ItemTransformer) tControl2 .getMock(); + transformer1 = tControl1.getMock(); + transformer2 = tControl2 .getMock(); composite.setItemTransformers(new ArrayList() {{ add(transformer1); add(transformer2); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/transform/ItemTransformerItemWriterFunctionalTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/transform/ItemTransformerItemWriterFunctionalTests.java index 32d2d1a0e..dc299ca14 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/transform/ItemTransformerItemWriterFunctionalTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/transform/ItemTransformerItemWriterFunctionalTests.java @@ -35,20 +35,22 @@ public class ItemTransformerItemWriterFunctionalTests extends TestCase { public void testTransform() throws Exception{ - ItemTransformerItemWriter itemTransformerItemWriter = new ItemTransformerItemWriter(); + ItemTransformerItemWriter itemTransformerItemWriter = new ItemTransformerItemWriter(); itemTransformerItemWriter.setItemTransformer(new FooTransformer()); itemTransformerItemWriter.setDelegate(new BarWriter()); itemTransformerItemWriter.write(new Foo()); } + public void testComposite() throws Exception{ - CompositeItemTransformer compositeTransformer = new CompositeItemTransformer(); - List itemTransformers = new ArrayList(); + CompositeItemTransformer compositeTransformer = new CompositeItemTransformer(); + + @SuppressWarnings("unchecked") List itemTransformers = new ArrayList(); itemTransformers.add(new FooTransformer()); itemTransformers.add(new BarTransformer()); compositeTransformer.setItemTransformers(itemTransformers); - ItemTransformerItemWriter itemTransformerItemWriter = new ItemTransformerItemWriter(); + ItemTransformerItemWriter itemTransformerItemWriter = new ItemTransformerItemWriter(); itemTransformerItemWriter.setItemTransformer(compositeTransformer); itemTransformerItemWriter.setDelegate(new FoobarWriter()); itemTransformerItemWriter.write(new Foo()); @@ -67,21 +69,18 @@ public class ItemTransformerItemWriterFunctionalTests extends TestCase { public Foobar(Bar bar){} } - public class FooTransformer implements ItemTransformer{ + public class FooTransformer implements ItemTransformer{ //Preform simple transformation, convert a Foo to a Barr - public Object transform(Object item) throws Exception { - assertTrue(item instanceof Foo); - Foo foo = (Foo)item; + public Bar transform(Foo foo) throws Exception { return new Bar(foo); } } - public class BarTransformer implements ItemTransformer{ + public class BarTransformer implements ItemTransformer{ - public Object transform(Object item) throws Exception { - assertTrue(item instanceof Bar); - return new Foobar((Bar)item); + public Foobar transform(Bar bar) throws Exception { + return new Foobar(bar); } } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareProxyFactoryTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareProxyFactoryTests.java index f8b12ab56..ad8c241dc 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareProxyFactoryTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareProxyFactoryTests.java @@ -22,7 +22,6 @@ import java.util.Set; import junit.framework.TestCase; -@SuppressWarnings("unchecked") public class TransactionAwareProxyFactoryTests extends TestCase { public void testCreateList() throws Exception {