diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/MulticasterBatchListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/MulticasterBatchListener.java index fc25b32d4..eb9aa9a14 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/MulticasterBatchListener.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/MulticasterBatchListener.java @@ -78,22 +78,22 @@ public class MulticasterBatchListener implements StepExecutionListener, Ch if (listener instanceof ChunkListener) { this.chunkListener.register((ChunkListener) listener); } - if (listener instanceof ItemReadListener) { + if (listener instanceof ItemReadListener) { @SuppressWarnings("unchecked") ItemReadListener itemReadListener = (ItemReadListener) listener; this.itemReadListener.register(itemReadListener); } - if (listener instanceof ItemProcessListener) { + if (listener instanceof ItemProcessListener) { @SuppressWarnings("unchecked") ItemProcessListener itemProcessListener = (ItemProcessListener) listener; this.itemProcessListener.register(itemProcessListener); } - if (listener instanceof ItemWriteListener) { + if (listener instanceof ItemWriteListener) { @SuppressWarnings("unchecked") ItemWriteListener itemWriteListener = (ItemWriteListener) listener; this.itemWriteListener.register(itemWriteListener); } - if (listener instanceof SkipListener) { + if (listener instanceof SkipListener) { @SuppressWarnings("unchecked") SkipListener skipListener = (SkipListener) listener; this.skipListener.register(skipListener); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBean.java index f07d4c0c2..061b328a3 100755 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBean.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBean.java @@ -274,6 +274,7 @@ public class FaultTolerantStepFactoryBean extends SimpleStepFactoryBean extends SimpleStepFactoryBean itemReader = getItemReader(); for (ItemStream stream : streams) { - if (stream instanceof ItemReader) { + if (stream instanceof ItemReader) { streamIsReader = true; chunkMonitor.registerItemStream(stream); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleStepFactoryBean.java index 85a997c3d..18ebbc929 100755 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleStepFactoryBean.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleStepFactoryBean.java @@ -301,6 +301,7 @@ public class SimpleStepFactoryBean implements FactoryBean, BeanNameAware { * Getter for the {@link TransactionAttribute} for subclasses only. * @return the transactionAttribute */ + @SuppressWarnings("serial") protected TransactionAttribute getTransactionAttribute() { DefaultTransactionAttribute attribute = new DefaultTransactionAttribute(); @@ -617,16 +618,16 @@ public class SimpleStepFactoryBean implements FactoryBean, BeanNameAware { if (StepListenerFactoryBean.isListener(itemHandler)) { StepListener listener = StepListenerFactoryBean.getListener(itemHandler); - if (listener instanceof SkipListener) { + if (listener instanceof SkipListener) { chunkProvider.registerListener(listener); chunkProcessor.registerListener(listener); // already registered with both so avoid double-registering continue; } - if (listener instanceof ItemReadListener) { + if (listener instanceof ItemReadListener) { chunkProvider.registerListener(listener); } - if (listener instanceof ItemProcessListener || listener instanceof ItemWriteListener) { + if (listener instanceof ItemProcessListener || listener instanceof ItemWriteListener) { chunkProcessor.registerListener(listener); } } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBeanTests.java index 9c0e23a7a..76e6cb210 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBeanTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBeanTests.java @@ -121,7 +121,7 @@ public class StepParserStepFactoryBeanTests { Object step = fb.getObject(); assertTrue(step instanceof TaskletStep); Object tasklet = ReflectionTestUtils.getField(step, "tasklet"); - assertTrue(tasklet instanceof ChunkOrientedTasklet); + assertTrue(tasklet instanceof ChunkOrientedTasklet); } @Test(expected = IllegalStateException.class) @@ -153,7 +153,7 @@ public class StepParserStepFactoryBeanTests { Object step = fb.getObject(); assertTrue(step instanceof TaskletStep); Object tasklet = ReflectionTestUtils.getField(step, "tasklet"); - assertTrue(tasklet instanceof ChunkOrientedTasklet); + assertTrue(tasklet instanceof ChunkOrientedTasklet); } @Test @@ -179,7 +179,7 @@ public class StepParserStepFactoryBeanTests { Object step = fb.getObject(); assertTrue(step instanceof TaskletStep); Object tasklet = ReflectionTestUtils.getField(step, "tasklet"); - assertTrue(tasklet instanceof ChunkOrientedTasklet); + assertTrue(tasklet instanceof ChunkOrientedTasklet); } @Test @@ -212,7 +212,7 @@ public class StepParserStepFactoryBeanTests { Object throttleLimit = ReflectionTestUtils.getField(ReflectionTestUtils.getField(step, "stepOperations"), "throttleLimit"); assertEquals(new Integer(10), throttleLimit); Object tasklet = ReflectionTestUtils.getField(step, "tasklet"); - assertTrue(tasklet instanceof ChunkOrientedTasklet); + assertTrue(tasklet instanceof ChunkOrientedTasklet); } } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserTests.java index f109f955d..65534857b 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserTests.java @@ -353,7 +353,7 @@ public class StepParserTests { assertTrue(ctx.containsBean("&s12")); Object factoryBean = ctx.getBean("&s12"); - assertTrue(factoryBean instanceof StepParserStepFactoryBean); + assertTrue(factoryBean instanceof StepParserStepFactoryBean); assertTrue(ctx.containsBean("dummyStep")); Object dummyStep = ctx.getBean("dummyStep"); @@ -370,7 +370,7 @@ public class StepParserTests { assertTrue(ctx.containsBean("&s13")); Object factoryBean = ctx.getBean("&s13"); - assertTrue(factoryBean instanceof StepParserStepFactoryBean); + assertTrue(factoryBean instanceof StepParserStepFactoryBean); assertTrue(ctx.containsBean("s13")); Object bean = ctx.getBean("s13"); @@ -378,7 +378,7 @@ public class StepParserTests { assertTrue(ctx.containsBean("&dummyStepWithTaskletOnParent")); Object dummyStepFb = ctx.getBean("&dummyStepWithTaskletOnParent"); - assertTrue(dummyStepFb instanceof StepParserStepFactoryBean); + assertTrue(dummyStepFb instanceof StepParserStepFactoryBean); assertTrue(ctx.containsBean("dummyStepWithTaskletOnParent")); Object dummyStep = ctx.getBean("dummyStepWithTaskletOnParent"); @@ -386,7 +386,7 @@ public class StepParserTests { assertTrue(ctx.containsBean("&standaloneStepWithTasklet")); Object standaloneStepFb = ctx.getBean("&standaloneStepWithTasklet"); - assertTrue(standaloneStepFb instanceof StepParserStepFactoryBean); + assertTrue(standaloneStepFb instanceof StepParserStepFactoryBean); assertTrue(ctx.containsBean("standaloneStepWithTasklet")); Object standaloneStep = ctx.getBean("standaloneStepWithTasklet"); @@ -399,7 +399,7 @@ public class StepParserTests { assertTrue(ctx.containsBean("&s14")); Object factoryBean = ctx.getBean("&s14"); - assertTrue(factoryBean instanceof StepParserStepFactoryBean); + assertTrue(factoryBean instanceof StepParserStepFactoryBean); assertTrue(ctx.containsBean("s12")); Object bean = ctx.getBean("s12"); @@ -407,7 +407,7 @@ public class StepParserTests { assertTrue(ctx.containsBean("&standaloneStepWithTaskletAndDummyParent")); Object standaloneWithTaskletFb = ctx.getBean("&standaloneStepWithTaskletAndDummyParent"); - assertTrue(standaloneWithTaskletFb instanceof StepParserStepFactoryBean); + assertTrue(standaloneWithTaskletFb instanceof StepParserStepFactoryBean); assertTrue(ctx.containsBean("standaloneStepWithTaskletAndDummyParent")); Object standaloneWithTasklet = ctx.getBean("standaloneStepWithTaskletAndDummyParent"); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanTests.java index 565db22fc..58367c81a 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanTests.java @@ -776,8 +776,6 @@ public class FaultTolerantStepFactoryBeanTests { private static class ItemProcessListenerStub implements ItemProcessListener { - private boolean errorEncountered = false; - private boolean filterEncountered = false; public void afterProcess(T item, S result) { @@ -791,11 +789,7 @@ public class FaultTolerantStepFactoryBeanTests { } public void onProcessError(T item, Exception e) { - errorEncountered = true; - } - public boolean isErrorEncountered() { - return errorEncountered; } public boolean isFilterEncountered() { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DefaultPropertyEditorRegistrar.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DefaultPropertyEditorRegistrar.java index 0f49148ff..319cea4ca 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DefaultPropertyEditorRegistrar.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DefaultPropertyEditorRegistrar.java @@ -66,7 +66,7 @@ public class DefaultPropertyEditorRegistrar implements PropertyEditorRegistrar { for (Entry entry : customEditors.entrySet()) { Object key = entry.getKey(); Class requiredType = null; - if (key instanceof Class) { + if (key instanceof Class) { requiredType = (Class) key; } else if (key instanceof String) { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/DefaultPropertEditorRegistrarTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/DefaultPropertEditorRegistrarTests.java index a203befaf..299ec8050 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/DefaultPropertEditorRegistrarTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/DefaultPropertEditorRegistrarTests.java @@ -70,11 +70,13 @@ public class DefaultPropertEditorRegistrarTests { mapper.setCustomEditors(Collections.singletonMap(new Object(), new CustomNumberEditor(Long.class, true))); } + @SuppressWarnings("unused") private static class BeanWithIntArray { private int[] numbers; private long number; + public void setNumbers(int[] numbers) { this.numbers = numbers; }