From 76f8cad29aaf881c50c2d9b9ca0967828f385eb4 Mon Sep 17 00:00:00 2001 From: Mahmoud Ben Hassine Date: Wed, 24 Oct 2018 15:24:19 +0200 Subject: [PATCH] Fix incorrect `@Nullable` on `ItemReadListener#afterRead` implementations Resolves BATCH-2763 --- .../batch/core/jsr/ItemReadListenerAdapter.java | 3 +-- .../batch/core/listener/MulticasterBatchListener.java | 2 +- .../batch/core/listener/StepListenerSupport.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/ItemReadListenerAdapter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/ItemReadListenerAdapter.java index 3c70044cd..dd4cb449b 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/ItemReadListenerAdapter.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/ItemReadListenerAdapter.java @@ -19,7 +19,6 @@ import javax.batch.operations.BatchRuntimeException; import org.springframework.batch.core.ItemReadListener; import org.springframework.batch.item.ItemReader; -import org.springframework.lang.Nullable; import org.springframework.util.Assert; /** @@ -51,7 +50,7 @@ public class ItemReadListenerAdapter implements ItemReadListener { } @Override - public void afterRead(@Nullable T item) { + public void afterRead(T item) { try { delegate.afterRead(item); } catch (Exception e) { 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 c9dae84c6..eef5b4cb9 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 @@ -223,7 +223,7 @@ ItemProcessListener, ItemWriteListener, SkipListener, RetryReadLi * @see org.springframework.batch.core.listener.CompositeItemReadListener#afterRead(java.lang.Object) */ @Override - public void afterRead(@Nullable T item) { + public void afterRead(T item) { try { itemReadListener.afterRead(item); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerSupport.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerSupport.java index be9dd19a7..e6f438348 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerSupport.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerSupport.java @@ -72,7 +72,7 @@ ItemReadListener, ItemProcessListener, ItemWriteListener, SkipListene * @see org.springframework.batch.core.domain.ItemReadListener#afterRead(java.lang.Object) */ @Override - public void afterRead(@Nullable T item) { + public void afterRead(T item) { } /* (non-Javadoc)