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

Added @Nullable annotation to overriding methods.

Browse Source 
Resolves BATCH-2839
This commit is contained in:
mikeldpl
2019-09-01 15:45:10 +03:00
committed by Mahmoud Ben Hassine
parent 4ec227cd6e
commit a7092a21e4
199 changed files with 726 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-batch-integration/src/main/java/org/springframework/batch/integration/async/AsyncItemProcessor.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2006-2007 the original author or authors.
* Copyright 2006-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@ import org.springframework.batch.item.ItemWriter;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.core.task.SyncTaskExecutor;
import org.springframework.core.task.TaskExecutor;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
/**
@@ -91,6 +92,7 @@ public class AsyncItemProcessor<I, O> implements ItemProcessor<I, Future<O>>, In
*
* @see ItemProcessor#process(Object)
*/
@Nullable
public Future<O> process(final I item) throws Exception {
final StepExecution stepExecution = getStepExecution();
FutureTask<O> task = new FutureTask<>(new Callable<O>() {

4
spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2006-2007 the original author or authors.
* Copyright 2006-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -35,6 +35,7 @@ import org.springframework.batch.item.ItemStream;
import org.springframework.batch.item.ItemStreamException;
import org.springframework.batch.item.ItemWriter;
import org.springframework.integration.core.MessagingTemplate;
import org.springframework.lang.Nullable;
import org.springframework.messaging.Message;
import org.springframework.messaging.PollableChannel;
import org.springframework.messaging.support.GenericMessage;
@@ -116,6 +117,7 @@ public class ChunkMessageChannelItemWriter<T> extends StepExecutionListenerSuppo
localState.setStepExecution(stepExecution);
}
@Nullable
@Override
public ExitStatus afterStep(StepExecution stepExecution) {
if (!(stepExecution.getStatus() == BatchStatus.COMPLETED)) {

2
spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/BeanFactoryStepLocator.java
View File

@@ -9,6 +9,7 @@ import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
import org.springframework.beans.factory.ListableBeanFactory;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
/**
@@ -30,6 +31,7 @@ public class BeanFactoryStepLocator implements StepLocator, BeanFactoryAware {
* Look up a bean with the provided name of type {@link Step}.
* @see StepLocator#getStep(String)
*/
@Nullable
public Step getStep(String stepName) {
return beanFactory.getBean(stepName, Step.class);
}