From afa9732b954a15ffc8cfb651e1bd2c877523a08a Mon Sep 17 00:00:00 2001 From: robokaso Date: Thu, 24 Jul 2008 13:14:22 +0000 Subject: [PATCH] generified the integration module and cleaned up the warnings --- .../support/DelegatingItemWriterTests.java | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 60 ++++++++++++++++++- .../batch/integration/chunk/ChunkHandler.java | 4 +- .../chunk/ChunkMessageChannelItemWriter.java | 16 ++--- .../batch/integration/chunk/ChunkRequest.java | 8 +-- .../chunk/ItemWriterChunkHandler.java | 10 ++-- .../file/FileToMessagesJobFactoryBean.java | 16 ++--- .../item/MessageChannelItemWriter.java | 6 +- ...hunkMessageItemWriterIntegrationTests.java | 18 +++--- .../chunk/ItemWriterChunkHandlerTests.java | 2 +- .../integration/chunk/TestItemWriter.java | 4 +- .../FileToMessagesJobFactoryBeanTests.java | 8 +-- ...sageChannelItemWriterIntegrationTests.java | 2 +- .../item/MessageChannelItemWriterTests.java | 6 +- .../job/StepExecutionMessageHandlerTests.java | 7 --- .../retry/PollableSourceRetryTests.java | 13 +--- 16 files changed, 113 insertions(+), 69 deletions(-) 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 f91be55fb..53f169281 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 @@ -69,7 +69,7 @@ public class DelegatingItemWriterTests extends TestCase { public void testWrite() throws Exception{ - ProcessingWriter writer = new ProcessingWriter(); + ProcessingWriter writer = new ProcessingWriter(); writer.setDelegate(itemWriter); Object item = new Object(); itemWriter.write(item); diff --git a/spring-batch-integration/.settings/org.eclipse.jdt.core.prefs b/spring-batch-integration/.settings/org.eclipse.jdt.core.prefs index f0eda8040..4210aeae5 100644 --- a/spring-batch-integration/.settings/org.eclipse.jdt.core.prefs +++ b/spring-batch-integration/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Mon Jun 02 08:35:20 BST 2008 +#Thu Jul 24 14:51:08 CEST 2008 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 @@ -7,6 +7,64 @@ org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.autoboxing=ignore +org.eclipse.jdt.core.compiler.problem.deprecation=warning +org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled +org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled +org.eclipse.jdt.core.compiler.problem.discouragedReference=warning +org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore +org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled +org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore +org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning +org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=error +org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning +org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning +org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore +org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore +org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore +org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning +org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore +org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore +org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning +org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning +org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore +org.eclipse.jdt.core.compiler.problem.nullReference=warning +org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning +org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore +org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore +org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore +org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning +org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore +org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore +org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled +org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning +org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled +org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore +org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning +org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning +org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore +org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore +org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled +org.eclipse.jdt.core.compiler.problem.unusedImport=warning +org.eclipse.jdt.core.compiler.problem.unusedLabel=warning +org.eclipse.jdt.core.compiler.problem.unusedLocal=warning +org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore +org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled +org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled +org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning +org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning +org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.source=1.5 diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkHandler.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkHandler.java index 5032022bb..9c7bfc84e 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkHandler.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkHandler.java @@ -1,8 +1,8 @@ package org.springframework.batch.integration.chunk; -public interface ChunkHandler { +public interface ChunkHandler { - ChunkResponse handleChunk(ChunkRequest chunk); + ChunkResponse handleChunk(ChunkRequest chunk); } \ No newline at end of file diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java index c998f3a89..11d2cc8e9 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java @@ -22,7 +22,7 @@ import org.springframework.integration.message.Message; import org.springframework.transaction.support.TransactionSynchronizationManager; import org.springframework.util.Assert; -public class ChunkMessageChannelItemWriter extends StepExecutionListenerSupport implements ItemWriter, ItemStream { +public class ChunkMessageChannelItemWriter extends StepExecutionListenerSupport implements ItemWriter, ItemStream { private static final Log logger = LogFactory.getLog(ChunkMessageChannelItemWriter.class); @@ -63,7 +63,7 @@ public class ChunkMessageChannelItemWriter extends StepExecutionListenerSupport this.requestChannel = requestChannel; } - public void write(Object item) throws Exception { + public void write(T item) throws Exception { bindTransactionResources(); getProcessed().add(item); logger.debug("Added item to chunk: " + item); @@ -88,13 +88,13 @@ public class ChunkMessageChannelItemWriter extends StepExecutionListenerSupport getNextResult(100); } - List processed = getProcessed(); + List processed = getProcessed(); if (!processed.isEmpty()) { logger.debug("Dispatching chunk: " + processed); - ChunkRequest request = new ChunkRequest(processed, localState.getJobId(), localState.getSkipCount()); - GenericMessage message = new GenericMessage(request); + ChunkRequest request = new ChunkRequest(processed, localState.getJobId(), localState.getSkipCount()); + GenericMessage> message = new GenericMessage>(request); requestChannel.send(message); localState.expected++; @@ -197,11 +197,11 @@ public class ChunkMessageChannelItemWriter extends StepExecutionListenerSupport * * @return the processed */ - @SuppressWarnings("unchecked") - private List getProcessed() { + private List getProcessed() { Assert.state(TransactionSynchronizationManager.hasResource(ITEMS_PROCESSED), "Processed items not bound to transaction."); - List processed = (List) TransactionSynchronizationManager.getResource(ITEMS_PROCESSED); + @SuppressWarnings("unchecked") + List processed = (List) TransactionSynchronizationManager.getResource(ITEMS_PROCESSED); return processed; } diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkRequest.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkRequest.java index 21e1b9577..d0a7493cb 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkRequest.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkRequest.java @@ -3,13 +3,13 @@ package org.springframework.batch.integration.chunk; import java.io.Serializable; import java.util.Collection; -public class ChunkRequest implements Serializable { +public class ChunkRequest implements Serializable { private final int skipCount; private final Long jobId; - private final Collection items; + private final Collection items; - public ChunkRequest(Collection items, Long jobId, int skipCount) { + public ChunkRequest(Collection items, Long jobId, int skipCount) { this.items = items; this.jobId = jobId; this.skipCount = skipCount; @@ -23,7 +23,7 @@ public class ChunkRequest implements Serializable { return jobId; } - public Collection getItems() { + public Collection getItems() { return items; } diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ItemWriterChunkHandler.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ItemWriterChunkHandler.java index b95fc8275..e729763c1 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ItemWriterChunkHandler.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ItemWriterChunkHandler.java @@ -11,11 +11,11 @@ import org.springframework.batch.repeat.ExitStatus; import org.springframework.integration.annotation.Handler; import org.springframework.transaction.annotation.Transactional; -public class ItemWriterChunkHandler implements ChunkHandler { +public class ItemWriterChunkHandler implements ChunkHandler { private static final Log logger = LogFactory.getLog(ItemWriterChunkHandler.class); - private ItemWriter itemWriter; + private ItemWriter itemWriter; private ItemSkipPolicy itemSkipPolicy = new NeverSkipItemSkipPolicy(); @@ -25,7 +25,7 @@ public class ItemWriterChunkHandler implements ChunkHandler { this.itemSkipPolicy = itemSkipPolicy; } - public void setItemWriter(ItemWriter itemWriter) { + public void setItemWriter(ItemWriter itemWriter) { this.itemWriter = itemWriter; } @@ -45,7 +45,7 @@ public class ItemWriterChunkHandler implements ChunkHandler { */ @Handler @Transactional - public ChunkResponse handleChunk(ChunkRequest chunk) { + public ChunkResponse handleChunk(ChunkRequest chunk) { logger.debug("Handling chunk: " + chunk); @@ -53,7 +53,7 @@ public class ItemWriterChunkHandler implements ChunkHandler { int skipCount = 0; try { - for (Object item : chunk.getItems()) { + for (T item : chunk.getItems()) { try { itemWriter.write(item); } diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/file/FileToMessagesJobFactoryBean.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/file/FileToMessagesJobFactoryBean.java index a8e0c4411..8cc3ffcfc 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/file/FileToMessagesJobFactoryBean.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/file/FileToMessagesJobFactoryBean.java @@ -51,11 +51,11 @@ import org.springframework.util.Assert; * @author Dave Syer * */ -public class FileToMessagesJobFactoryBean implements FactoryBean, BeanNameAware { +public class FileToMessagesJobFactoryBean implements FactoryBean, BeanNameAware { private String name = "fileToMessageJob"; - private ItemReader itemReader; + private ItemReader itemReader; private MessageChannel channel; @@ -80,7 +80,7 @@ public class FileToMessagesJobFactoryBean implements FactoryBean, BeanNameAware * @param itemReader the itemReader to set */ @Required - public void setItemReader(ItemReader itemReader) { + public void setItemReader(ItemReader itemReader) { this.itemReader = itemReader; } @@ -125,7 +125,7 @@ public class FileToMessagesJobFactoryBean implements FactoryBean, BeanNameAware job.setName(name); job.setJobRepository(jobRepository); - SimpleStepFactoryBean stepFactory = new SimpleStepFactoryBean(); + SimpleStepFactoryBean stepFactory = new SimpleStepFactoryBean(); stepFactory.setBeanName("step"); Assert.state((itemReader instanceof FlatFileItemReader) || (itemReader instanceof StaxEventItemReader), @@ -139,7 +139,7 @@ public class FileToMessagesJobFactoryBean implements FactoryBean, BeanNameAware Assert.notNull(channel, "A channel must be provided"); Assert.state(channel instanceof DirectChannel, "The channel must be a DirectChannel (otherwise failures can not be recovered from)"); - MessageChannelItemWriter itemWriter = new MessageChannelItemWriter(); + MessageChannelItemWriter itemWriter = new MessageChannelItemWriter(); itemWriter.setChannel(channel); stepFactory.setItemWriter(itemWriter); @@ -157,12 +157,12 @@ public class FileToMessagesJobFactoryBean implements FactoryBean, BeanNameAware * @param itemReader * @param resource */ - private void setResource(ItemReader itemReader, Resource resource) { + private void setResource(ItemReader itemReader, Resource resource) { if (itemReader instanceof FlatFileItemReader) { - ((FlatFileItemReader) itemReader).setResource(resource); + ((FlatFileItemReader) itemReader).setResource(resource); } else { - ((StaxEventItemReader) itemReader).setResource(resource); + ((StaxEventItemReader) itemReader).setResource(resource); } } diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/item/MessageChannelItemWriter.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/item/MessageChannelItemWriter.java index dbc7fff1e..881ad29da 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/item/MessageChannelItemWriter.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/item/MessageChannelItemWriter.java @@ -24,7 +24,7 @@ import org.springframework.integration.message.GenericMessage; * @author Dave Syer * */ -public class MessageChannelItemWriter extends AbstractItemWriter { +public class MessageChannelItemWriter extends AbstractItemWriter { private MessageChannel channel; @@ -41,8 +41,8 @@ public class MessageChannelItemWriter extends AbstractItemWriter { * (non-Javadoc) * @see org.springframework.batch.item.ItemWriter#write(java.lang.Object) */ - public void write(Object item) throws Exception { - channel.send(new GenericMessage(item)); + public void write(T item) throws Exception { + channel.send(new GenericMessage(item)); } } diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests.java index e78037c9b..37e42d03f 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests.java @@ -42,7 +42,7 @@ import org.springframework.util.StringUtils; @RunWith(SpringJUnit4ClassRunner.class) public class ChunkMessageItemWriterIntegrationTests { - private ChunkMessageChannelItemWriter writer = new ChunkMessageChannelItemWriter(); + private ChunkMessageChannelItemWriter writer = new ChunkMessageChannelItemWriter(); @Autowired @Qualifier("requests") @@ -52,7 +52,7 @@ public class ChunkMessageItemWriterIntegrationTests { @Qualifier("replies") private MessageChannel replies; - private SimpleStepFactoryBean factory; + private SimpleStepFactoryBean factory; private SimpleJobRepository jobRepository; @@ -61,7 +61,7 @@ public class ChunkMessageItemWriterIntegrationTests { @Before public void setUp() { - factory = new SimpleStepFactoryBean(); + factory = new SimpleStepFactoryBean(); jobRepository = new SimpleJobRepository(new MapJobInstanceDao(), new MapJobExecutionDao(), new MapStepExecutionDao()); factory.setJobRepository(jobRepository); @@ -114,7 +114,7 @@ public class ChunkMessageItemWriterIntegrationTests { @Test public void testVanillaIteration() throws Exception { - factory.setItemReader(new ListItemReader(Arrays.asList(StringUtils + factory.setItemReader(new ListItemReader(Arrays.asList(StringUtils .commaDelimitedListToStringArray("1,2,3,4,5,6")))); Step step = (Step) factory.getObject(); @@ -132,7 +132,7 @@ public class ChunkMessageItemWriterIntegrationTests { @Test public void testSimulatedRestart() throws Exception { - factory.setItemReader(new ListItemReader(Arrays.asList(StringUtils + factory.setItemReader(new ListItemReader(Arrays.asList(StringUtils .commaDelimitedListToStringArray("1,2,3,4,5,6")))); Step step = (Step) factory.getObject(); @@ -159,7 +159,7 @@ public class ChunkMessageItemWriterIntegrationTests { @Test public void testSimulatedRestartWithBadMessagesFromAnotherJob() throws Exception { - factory.setItemReader(new ListItemReader(Arrays.asList(StringUtils + factory.setItemReader(new ListItemReader(Arrays.asList(StringUtils .commaDelimitedListToStringArray("1,2,3,4,5,6")))); Step step = (Step) factory.getObject(); @@ -204,7 +204,7 @@ public class ChunkMessageItemWriterIntegrationTests { @Test public void testEarlyCompletionSignalledInHandler() throws Exception { - factory.setItemReader(new ListItemReader(Arrays.asList(StringUtils + factory.setItemReader(new ListItemReader(Arrays.asList(StringUtils .commaDelimitedListToStringArray("1,bad,3,4,5,6")))); factory.setCommitInterval(2); @@ -232,7 +232,7 @@ public class ChunkMessageItemWriterIntegrationTests { @Test public void testSimulatedRestartWithNoBacklog() throws Exception { - factory.setItemReader(new ListItemReader(Arrays.asList(StringUtils + factory.setItemReader(new ListItemReader(Arrays.asList(StringUtils .commaDelimitedListToStringArray("1,2,3,4,5,6")))); Step step = (Step) factory.getObject(); @@ -272,7 +272,7 @@ public class ChunkMessageItemWriterIntegrationTests { @Test public void testFailureInStepListener() throws Exception { - factory.setItemReader(new ListItemReader(Arrays.asList(StringUtils + factory.setItemReader(new ListItemReader(Arrays.asList(StringUtils .commaDelimitedListToStringArray("wait,bad,3,4,5,6")))); Step step = (Step) factory.getObject(); diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ItemWriterChunkHandlerTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ItemWriterChunkHandlerTests.java index c769ff2eb..a38b8d1a1 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ItemWriterChunkHandlerTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ItemWriterChunkHandlerTests.java @@ -15,7 +15,7 @@ import org.springframework.util.StringUtils; public class ItemWriterChunkHandlerTests { - private ItemWriterChunkHandler handler = new ItemWriterChunkHandler(); + private ItemWriterChunkHandler handler = new ItemWriterChunkHandler(); protected int count = 0; diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/TestItemWriter.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/TestItemWriter.java index 850075886..55536e76e 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/TestItemWriter.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/TestItemWriter.java @@ -6,7 +6,7 @@ import org.springframework.batch.item.support.AbstractItemWriter; import org.springframework.stereotype.Component; @Component -public class TestItemWriter extends AbstractItemWriter { +public class TestItemWriter extends AbstractItemWriter { private static final Log logger = LogFactory.getLog(TestItemWriter.class); @@ -25,7 +25,7 @@ public class TestItemWriter extends AbstractItemWriter { */ public static final String WAIT_ON = "wait"; - public void write(Object item) throws Exception { + public void write(T item) throws Exception { count++; diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/file/FileToMessagesJobFactoryBeanTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/file/FileToMessagesJobFactoryBeanTests.java index 91c3d0171..24e1d66de 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/file/FileToMessagesJobFactoryBeanTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/file/FileToMessagesJobFactoryBeanTests.java @@ -54,7 +54,7 @@ import org.springframework.util.ReflectionUtils; public class FileToMessagesJobFactoryBeanTests { private static final String FILE_INPUT_PATH = ResourcePayloadAsJobParameterStrategy.FILE_INPUT_PATH; - private FileToMessagesJobFactoryBean factory = new FileToMessagesJobFactoryBean(); + private FileToMessagesJobFactoryBean
factory = new FileToMessagesJobFactoryBean
(); private ThreadLocalChannel receiver = new ThreadLocalChannel(); private JobRepositorySupport jobRepository; @@ -63,7 +63,7 @@ public class FileToMessagesJobFactoryBeanTests { jobRepository = new JobRepositorySupport(); factory.setJobRepository(jobRepository); factory.setTransactionManager(new ResourcelessTransactionManager()); - FlatFileItemReader itemReader = new FlatFileItemReader(); + FlatFileItemReader
itemReader = new FlatFileItemReader
(); itemReader.setFieldSetMapper(new PassThroughFieldSetMapper()); factory.setItemReader(itemReader); DirectChannel channel = new DirectChannel(); @@ -158,7 +158,7 @@ public class FileToMessagesJobFactoryBeanTests { */ @Test public void testGetObjectType() { - FileToMessagesJobFactoryBean factory = new FileToMessagesJobFactoryBean(); + FileToMessagesJobFactoryBean factory = new FileToMessagesJobFactoryBean(); assertEquals(Job.class, factory.getObjectType()); } @@ -168,7 +168,7 @@ public class FileToMessagesJobFactoryBeanTests { */ @Test public void testIsSingleton() { - FileToMessagesJobFactoryBean factory = new FileToMessagesJobFactoryBean(); + FileToMessagesJobFactoryBean factory = new FileToMessagesJobFactoryBean(); assertEquals(true, factory.isSingleton()); } diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/item/MessageChannelItemWriterIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/item/MessageChannelItemWriterIntegrationTests.java index 6c1deba8e..0e1d9ab3a 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/item/MessageChannelItemWriterIntegrationTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/item/MessageChannelItemWriterIntegrationTests.java @@ -39,7 +39,7 @@ public class MessageChannelItemWriterIntegrationTests { private MessageChannel channel; @Autowired - private ItemWriter itemWriter; + private ItemWriter itemWriter; @Test public void testSend() throws Exception { diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/item/MessageChannelItemWriterTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/item/MessageChannelItemWriterTests.java index c497e8412..34a2a67c3 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/item/MessageChannelItemWriterTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/item/MessageChannelItemWriterTests.java @@ -61,7 +61,7 @@ public class MessageChannelItemWriterTests { DirectChannel channel = new DirectChannel(); ThreadLocalChannel receiver = new ThreadLocalChannel(); channel.subscribe(receiver); - MessageChannelItemWriter writer = new MessageChannelItemWriter(); + MessageChannelItemWriter writer = new MessageChannelItemWriter(); writer.setChannel(channel); writer.write("foo"); Message message = receiver.receive(10); @@ -81,7 +81,7 @@ public class MessageChannelItemWriterTests { throw new RuntimeException("Planned failure"); } }); - MessageChannelItemWriter writer = new MessageChannelItemWriter(); + MessageChannelItemWriter writer = new MessageChannelItemWriter(); writer.setChannel(channel); try { writer.write("foo"); @@ -105,7 +105,7 @@ public class MessageChannelItemWriterTests { } }); channel.subscribe(endpoint); - MessageChannelItemWriter writer = new MessageChannelItemWriter(); + MessageChannelItemWriter writer = new MessageChannelItemWriter(); writer.setChannel(channel); try { writer.write("foo"); diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/job/StepExecutionMessageHandlerTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/job/StepExecutionMessageHandlerTests.java index 869c211d5..b5ff8a287 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/job/StepExecutionMessageHandlerTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/job/StepExecutionMessageHandlerTests.java @@ -76,7 +76,6 @@ public class StepExecutionMessageHandlerTests { assertEquals(Required.class, annotations[0].annotationType()); } - @SuppressWarnings("unchecked") @Test public void testVanillaHandle() throws Exception { JobRepositorySupport jobRepository = new JobRepositorySupport(); @@ -87,7 +86,6 @@ public class StepExecutionMessageHandlerTests { assertEquals(BatchStatus.COMPLETED, message.getStatus()); } - @SuppressWarnings("unchecked") @Test public void testHandleWithInputs() throws Exception { JobRepositorySupport jobRepository = new JobRepositorySupport(); @@ -101,7 +99,6 @@ public class StepExecutionMessageHandlerTests { assertTrue(jobExecution.getExecutionContext().containsKey("foo")); } - @SuppressWarnings("unchecked") @Test public void testHandleWithInputsAndOutputs() throws Exception { JobRepositorySupport jobRepository = new JobRepositorySupport(); @@ -122,7 +119,6 @@ public class StepExecutionMessageHandlerTests { assertTrue(jobExecution.getExecutionContext().containsKey("bar")); } - @SuppressWarnings("unchecked") @Test public void testHandleFailedJob() throws Exception { JobRepositorySupport jobRepository = new JobRepositorySupport(); @@ -133,7 +129,6 @@ public class StepExecutionMessageHandlerTests { assertEquals(0, message.getJobExecution().getStepExecutions().size()); } - @SuppressWarnings("unchecked") @Test public void testHandleRestart() throws Exception { JobRepositorySupport jobRepository = new JobRepositorySupport() { @@ -171,7 +166,6 @@ public class StepExecutionMessageHandlerTests { assertTrue(stepExecution.getExecutionContext().containsKey("foo")); } - @SuppressWarnings("unchecked") @Test public void testHandleRestartAlreadyComplete() throws Exception { JobRepositorySupport jobRepository = new JobRepositorySupport() { @@ -199,7 +193,6 @@ public class StepExecutionMessageHandlerTests { assertTrue(stepExecution.getExecutionContext().containsKey("foo")); } - @SuppressWarnings("unchecked") @Test public void testHandleRestartStartLimitExceeded() throws Exception { JobRepositorySupport jobRepository = new JobRepositorySupport() { diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/PollableSourceRetryTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/PollableSourceRetryTests.java index 6e154647a..8d9f381db 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/PollableSourceRetryTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/PollableSourceRetryTests.java @@ -71,7 +71,6 @@ public class PollableSourceRetryTests { private PlatformTransactionManager transactionManager = new ResourcelessTransactionManager();; - @SuppressWarnings("unchecked") @Test public void testSimpleTransactionalPolling() throws Exception { @@ -104,7 +103,6 @@ public class PollableSourceRetryTests { } - @SuppressWarnings("unchecked") @Test public void testNonTransactionalPollingWithRollback() throws Exception { @@ -139,7 +137,6 @@ public class PollableSourceRetryTests { } - @SuppressWarnings("unchecked") @Test public void testTransactionalHandlingWithUnconditionalRollback() throws Exception { @@ -177,7 +174,6 @@ public class PollableSourceRetryTests { } - @SuppressWarnings("unchecked") @Test public void testTransactionalHandlingWithRollback() throws Exception { @@ -222,7 +218,6 @@ public class PollableSourceRetryTests { } - @SuppressWarnings("unchecked") @Test public void testTransactionalHandlingWithRepeat() throws Exception { @@ -269,7 +264,6 @@ public class PollableSourceRetryTests { } - @SuppressWarnings("unchecked") @Test public void testTransactionalHandlingWithRetry() throws Exception { @@ -322,7 +316,6 @@ public class PollableSourceRetryTests { } - @SuppressWarnings("unchecked") @Test public void testTransactionalHandlingWithRepeatAndRetry() throws Exception { @@ -408,9 +401,9 @@ public class PollableSourceRetryTests { } private MessageSource getPollableSource(List list) { - final ItemReader reader = new ListItemReader(list) { - public Object read() { - Object item = super.read(); + final ItemReader reader = new ListItemReader(list) { + public String read() { + String item = super.read(); logger.debug("Reading: " + item); return item; }