Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BATCH-1403:Cleaned up warnings

Browse Source
This commit is contained in:
lucasward
2009-09-12 23:23:44 +00:00
parent 380c975d21
commit e191ac7dd4
8 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-batch-core/src/main/java/org/springframework/batch/core/listener/MulticasterBatchListener.java
View File

@@ -78,22 +78,22 @@ public class MulticasterBatchListener<T, S> implements StepExecutionListener, Ch
if (listener instanceof ChunkListener) {
this.chunkListener.register((ChunkListener) listener);
}
if (listener instanceof ItemReadListener) {
if (listener instanceof ItemReadListener<?>) {
@SuppressWarnings("unchecked")
ItemReadListener<T> itemReadListener = (ItemReadListener) listener;
this.itemReadListener.register(itemReadListener);
}
if (listener instanceof ItemProcessListener) {
if (listener instanceof ItemProcessListener<?,?>) {
@SuppressWarnings("unchecked")
ItemProcessListener<T,S> itemProcessListener = (ItemProcessListener) listener;
this.itemProcessListener.register(itemProcessListener);
}
if (listener instanceof ItemWriteListener) {
if (listener instanceof ItemWriteListener<?>) {
@SuppressWarnings("unchecked")
ItemWriteListener<S> itemWriteListener = (ItemWriteListener) listener;
this.itemWriteListener.register(itemWriteListener);
}
if (listener instanceof SkipListener) {
if (listener instanceof SkipListener<?,?>) {
@SuppressWarnings("unchecked")
SkipListener<T,S> skipListener = (SkipListener) listener;
this.skipListener.register(skipListener);

3
spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBean.java
View File

@@ -274,6 +274,7 @@ public class FaultTolerantStepFactoryBean<T, S> extends SimpleStepFactoryBean<T,
*
* @return the transactionAttribute
*/
@SuppressWarnings("serial")
@Override
protected TransactionAttribute getTransactionAttribute() {
@@ -308,7 +309,7 @@ public class FaultTolerantStepFactoryBean<T, S> extends SimpleStepFactoryBean<T,
boolean streamIsReader = false;
ItemReader<? extends T> itemReader = getItemReader();
for (ItemStream stream : streams) {
if (stream instanceof ItemReader) {
if (stream instanceof ItemReader<?>) {
streamIsReader = true;
chunkMonitor.registerItemStream(stream);
}

7
spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleStepFactoryBean.java
View File

@@ -301,6 +301,7 @@ public class SimpleStepFactoryBean<T, S> 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<T, S> 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);
}
}

8
spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBeanTests.java
View File

@@ -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<?>);
}
}

12
spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserTests.java
View File

@@ -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");

6
spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanTests.java
View File

@@ -776,8 +776,6 @@ public class FaultTolerantStepFactoryBeanTests {
private static class ItemProcessListenerStub<T, S> implements ItemProcessListener<T, S> {
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() {

2
spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DefaultPropertyEditorRegistrar.java
View File

@@ -66,7 +66,7 @@ public class DefaultPropertyEditorRegistrar implements PropertyEditorRegistrar {
for (Entry<? extends Object, ? extends PropertyEditor> 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) {

2
spring-batch-infrastructure/src/test/java/org/springframework/batch/support/DefaultPropertEditorRegistrarTests.java
View File

@@ -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;
}