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

Add JSR-305 annotations to public APIs

Browse Source 
(Partially) Resolves BATCH-2688
This commit is contained in:
Mahmoud Ben Hassine
2018-07-17 10:50:23 +02:00
committed by Michael Minella
parent 295def2b89
commit 70d0e3c510
10 changed files with 75 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/StepContextRepeatCallback.java
View File

@@ -25,7 +25,6 @@ import org.springframework.batch.core.StepExecution;
import org.springframework.batch.repeat.RepeatCallback;
import org.springframework.batch.repeat.RepeatContext;
import org.springframework.batch.repeat.RepeatStatus;
import org.springframework.lang.Nullable;
import org.springframework.util.ObjectUtils;
/**
@@ -62,7 +61,6 @@ public abstract class StepContextRepeatCallback implements RepeatCallback {
* @see RepeatCallback#doInIteration(RepeatContext)
*/
@Override
@Nullable
public RepeatStatus doInIteration(RepeatContext context) throws Exception {
// The StepContext has to be the same for all chunks,
@@ -109,7 +107,6 @@ public abstract class StepContextRepeatCallback implements RepeatCallback {
* @throws Exception implementations can throw an exception if anything goes
* wrong
*/
@Nullable
public abstract RepeatStatus doInChunkContext(RepeatContext context, ChunkContext chunkContext) throws Exception;
}

5
spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/TaskletStep.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2006-2014 the original author or authors.
* Copyright 2006-2018 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.
@@ -72,6 +72,7 @@ import java.util.concurrent.Semaphore;
* @author Robert Kasanicky
* @author Michael Minella
* @author Will Schipp
* @author Mahmoud Ben Hassine
*/
@SuppressWarnings("serial")
public class TaskletStep extends AbstractStep {
@@ -283,7 +284,7 @@ public class TaskletStep extends AbstractStep {
// caller
interruptionPolicy.checkInterrupted(stepExecution);
return result;
return result == null ? RepeatStatus.FINISHED : result;
}
});