Polish a7092a2

spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java

@@ -165,7 +165,6 @@ public String getName() {
 	 * @param stepName name of the step
 	 * @return the Step
 	 */
-	@Nullable
 	@Override
 	public abstract Step getStep(String stepName);
 

spring-batch-core/src/main/java/org/springframework/batch/core/job/SimpleJob.java

@@ -29,7 +29,6 @@
 import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.repository.JobRestartException;
 import org.springframework.batch.core.step.StepLocator;
-import org.springframework.lang.Nullable;
 
 /**
  * Simple implementation of {@link Job} interface providing the ability to run a
@@ -40,6 +39,7 @@
  * @author Lucas Ward
  * @author Dave Syer
  * @author Michael Minella
+ * @author Mahmoud Ben Hassine
  */
 public class SimpleJob extends AbstractJob {
 
@@ -103,7 +103,6 @@ public void addStep(Step step) {
 	 * @see
 	 * org.springframework.batch.core.job.AbstractJob#getStep(java.lang.String)
 	 */
-	@Nullable
 	@Override
 	public Step getStep(String stepName) {
 		for (Step step : this.steps) {

spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowJob.java

@@ -27,7 +27,6 @@
 import org.springframework.batch.core.job.SimpleStepHandler;
 import org.springframework.batch.core.step.StepHolder;
 import org.springframework.batch.core.step.StepLocator;
-import org.springframework.lang.Nullable;
 
 /**
  * Implementation of the {@link Job} interface that allows for complex flows of
@@ -36,6 +35,7 @@
  * namespace to abstract away details.
  *
  * @author Dave Syer
+ * @author Mahmoud Ben Hassine
  * @since 2.0
  */
 public class FlowJob extends AbstractJob {
@@ -74,7 +74,6 @@ public void setFlow(Flow flow) {
 	/**
 	 * {@inheritDoc}
 	 */
-	@Nullable
 	@Override
 	public Step getStep(String stepName) {
 		if (!initialized) {

spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/StepState.java

@@ -27,14 +27,14 @@
 import org.springframework.batch.core.step.NoSuchStepException;
 import org.springframework.batch.core.step.StepHolder;
 import org.springframework.batch.core.step.StepLocator;
-import org.springframework.lang.Nullable;
 
 /**
  * {@link State} implementation that delegates to a {@link FlowExecutor} to
  * execute the specified {@link Step}.
  *
  * @author Dave Syer
  * @author Michael Minella
+ * @author Mahmoud Ben Hassine
  * @since 2.0
  */
 public class StepState extends AbstractState implements StepLocator, StepHolder {
@@ -100,7 +100,6 @@ public Collection<String> getStepNames() {
 	/* (non-Javadoc)
 	 * @see org.springframework.batch.core.step.StepLocator#getStep(java.lang.String)
 	 */
-	@Nullable
 	@Override
 	public Step getStep(String stepName) throws NoSuchStepException {
 		Step result = null;

spring-batch-core/src/main/java/org/springframework/batch/core/jsr/step/PartitionStep.java

@@ -32,14 +32,14 @@
 import org.springframework.batch.core.step.NoSuchStepException;
 import org.springframework.batch.core.step.StepLocator;
 import org.springframework.batch.item.ExecutionContext;
-import org.springframework.lang.Nullable;
 
 /**
  * An extension of the {@link PartitionStep} that provides additional semantics
  * required by JSR-352.  Specifically, this implementation adds the required
  * lifecycle calls to the {@link PartitionReducer} if it is used.
  *
  * @author Michael Minella
+ * @author Mahmoud Ben Hassine
  * @since 3.0
  */
 public class PartitionStep extends org.springframework.batch.core.partition.support.PartitionStep implements StepLocator {
@@ -103,7 +103,6 @@ public Collection<String> getStepNames() {
 	/* (non-Javadoc)
 	 * @see org.springframework.batch.core.step.StepLocator#getStep(java.lang.String)
 	 */
-	@Nullable
 	@Override
 	public Step getStep(String stepName) throws NoSuchStepException {
 		JsrPartitionHandler partitionHandler =  (JsrPartitionHandler) getPartitionHandler();

spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/DefaultJobLoaderTests.java

@@ -42,6 +42,7 @@
 /**
  * @author Dave Syer
  * @author Stephane Nicoll
+ * @author Mahmoud Ben Hassine
  */
 public class DefaultJobLoaderTests {
 
@@ -266,7 +267,6 @@ public Collection<String> getStepNames() {
             return Collections.emptyList();
         }
 
-        @Nullable
 		@Override
 		public Step getStep(String stepName) throws NoSuchStepException {
             throw new NoSuchStepException("Step [" + stepName + "] does not exist");

spring-batch-core/src/test/java/org/springframework/batch/core/job/ExtendedAbstractJobTests.java

@@ -42,6 +42,7 @@
 
 /**
  * @author Dave Syer
+ * @author Mahmoud Ben Hassine
  *
  */
 public class ExtendedAbstractJobTests {
@@ -215,7 +216,6 @@ public StubJob() {
 		protected void doExecute(JobExecution execution) throws JobExecutionException {
 		}
 
-		@Nullable
 		@Override
 		public Step getStep(String stepName) {
 			return null;

spring-batch-core/src/test/java/org/springframework/batch/core/job/JobSupport.java

@@ -41,6 +41,7 @@
  *
  * @author Lucas Ward
  * @author Dave Syer
+ * @author Mahmoud Ben Hassine
  */
 public class JobSupport implements BeanNameAware, Job, StepLocator {
 
@@ -192,7 +193,6 @@ public Collection<String> getStepNames() {
 		return steps.keySet();
 	}
 
-	@Nullable
 	@Override
 	public Step getStep(String stepName) throws NoSuchStepException {
 		final Step step = steps.get(stepName);

spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/SimpleJobOperatorTests.java

@@ -453,7 +453,6 @@ class MockJob extends AbstractJob {
 
 		private TaskletStep taskletStep;
 
-		@Nullable
 		@Override
 		public Step getStep(String stepName) {
 			return taskletStep;

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemReader.java

@@ -192,7 +192,7 @@ protected T doRead() throws Exception {
 	 * @return next line (skip comments).getCurrentResource
 	 */
 	@Nullable
-	protected String readLine() {
+	private String readLine() {
 
 		if (reader == null) {
 			throw new ReaderNotOpenException("Reader must be open before it can be read.");

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

@@ -9,14 +9,14 @@
 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;
 
 /**
  * A {@link StepLocator} implementation that just looks in its enclosing bean
  * factory for components of type {@link Step}.
  * 
  * @author Dave Syer
+ * @author Mahmoud Ben Hassine
  * 
  */
 public class BeanFactoryStepLocator implements StepLocator, BeanFactoryAware {
@@ -31,7 +31,6 @@ public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
 	 * 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);
 	}