Default event-based item readers to bean name and remove strict name assertions

Added BeanNameAware to event item readers to use the bean name when no
explicit  name is provided. Removed name assertions from the
corresponding builders.

Closes: gh-5149

Signed-off-by: Andrey Litvitski <[email protected]>

Author: therepanic

spring-batch-infrastructure/src/main/java/org/springframework/batch/infrastructure/item/data/MongoCursorItemReader.java

@@ -28,6 +28,7 @@
 import org.jspecify.annotations.Nullable;
 import org.springframework.batch.infrastructure.item.ItemReader;
 import org.springframework.batch.infrastructure.item.support.AbstractItemCountingItemStreamItemReader;
+import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoOperations;
@@ -45,9 +46,11 @@
  * @author LEE Juchan
  * @author Mahmoud Ben Hassine
  * @author Jimmy Praet
+ * @author Andrey Litvitski
  * @since 5.1
  */
-public class MongoCursorItemReader<T> extends AbstractItemCountingItemStreamItemReader<T> implements InitializingBean {
+public class MongoCursorItemReader<T> extends AbstractItemCountingItemStreamItemReader<T>
+		implements InitializingBean, BeanNameAware {
 
 	private MongoOperations template;
 

spring-batch-infrastructure/src/main/java/org/springframework/batch/infrastructure/item/data/MongoPagingItemReader.java

@@ -25,6 +25,7 @@
 import org.jspecify.annotations.Nullable;
 import org.springframework.batch.infrastructure.item.ExecutionContext;
 import org.springframework.batch.infrastructure.item.ItemReader;
+import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -79,8 +80,10 @@
  * @author Mahmoud Ben Hassine
  * @author Parikshit Dutta
  * @author Jimmy Praet
+ * @author Andrey Litvitski
  */
-public class MongoPagingItemReader<T> extends AbstractPaginatedDataItemReader<T> implements InitializingBean {
+public class MongoPagingItemReader<T> extends AbstractPaginatedDataItemReader<T>
+		implements InitializingBean, BeanNameAware {
 
 	protected MongoOperations template;
 

spring-batch-infrastructure/src/main/java/org/springframework/batch/infrastructure/item/data/RepositoryItemReader.java

@@ -31,6 +31,7 @@
 import org.springframework.batch.infrastructure.item.adapter.AbstractMethodInvokingDelegator.InvocationTargetThrowableWrapper;
 import org.springframework.batch.infrastructure.item.adapter.DynamicMethodInvocationException;
 import org.springframework.batch.infrastructure.item.support.AbstractItemCountingItemStreamItemReader;
+import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -80,9 +81,11 @@
  * @author Antoine Kapps
  * @author Mahmoud Ben Hassine
  * @author Jimmy Praet
+ * @author Andrey Litvitski
  * @since 2.2
  */
-public class RepositoryItemReader<T> extends AbstractItemCountingItemStreamItemReader<T> implements InitializingBean {
+public class RepositoryItemReader<T> extends AbstractItemCountingItemStreamItemReader<T>
+		implements InitializingBean, BeanNameAware {
 
 	protected Log logger = LogFactory.getLog(getClass());
 

spring-batch-infrastructure/src/main/java/org/springframework/batch/infrastructure/item/data/builder/MongoCursorItemReaderBuilder.java

@@ -37,6 +37,7 @@
  * @author LEE Juchan
  * @author Mahmoud Ben Hassine
  * @author Stefano Cordio
+ * @author Andrey Litvitski
  * @since 5.1
  * @see MongoCursorItemReader
  */
@@ -278,9 +279,6 @@ public MongoCursorItemReaderBuilder<T> maxTime(Duration maxTime) {
 
 	public MongoCursorItemReader<T> build() {
 		Assert.notNull(this.template, "template is required.");
-		if (this.saveState) {
-			Assert.hasText(this.name, "A name is required when saveState is set to true");
-		}
 		Assert.notNull(this.targetType, "targetType is required.");
 		Assert.state(StringUtils.hasText(this.jsonQuery) || this.query != null, "A query is required");
 		Assert.notNull(this.sorts, "sorts map is required.");

spring-batch-infrastructure/src/main/java/org/springframework/batch/infrastructure/item/data/builder/MongoPagingItemReaderBuilder.java

@@ -41,6 +41,7 @@
  * @author Drummond Dawson
  * @author Parikshit Dutta
  * @author Stefano Cordio
+ * @author Andrey Litvitski
  * @since 5.1
  */
 public class MongoPagingItemReaderBuilder<T> {
@@ -263,9 +264,6 @@ public MongoPagingItemReaderBuilder<T> query(Query query) {
 
 	public MongoPagingItemReader<T> build() {
 		Assert.notNull(this.template, "template is required.");
-		if (this.saveState) {
-			Assert.hasText(this.name, "A name is required when saveState is set to true");
-		}
 		Assert.notNull(this.targetType, "targetType is required.");
 		Assert.state(StringUtils.hasText(this.jsonQuery) || this.query != null, "A query is required");
 

spring-batch-infrastructure/src/main/java/org/springframework/batch/infrastructure/item/data/builder/RepositoryItemReaderBuilder.java

@@ -37,6 +37,7 @@
  * @author Glenn Renfro
  * @author Mahmoud Ben Hassine
  * @author Drummond Dawson
+ * @author Andrey Litvitski
  * @since 4.0
  * @see RepositoryItemReader
  */
@@ -192,9 +193,6 @@ public RepositoryItemReader<T> build() {
 		Assert.notNull(this.repository, "repository is required.");
 		Assert.isTrue(this.pageSize > 0, "Page size must be greater than 0");
 		Assert.hasText(this.methodName, "methodName is required.");
-		if (this.saveState) {
-			Assert.state(StringUtils.hasText(this.name), "A name is required when saveState is set to true.");
-		}
 
 		RepositoryItemReader<T> reader = new RepositoryItemReader<>(this.repository, this.sorts);
 		if (this.arguments != null) {

spring-batch-infrastructure/src/main/java/org/springframework/batch/infrastructure/item/database/JdbcCursorItemReader.java

@@ -24,6 +24,7 @@
 
 import javax.sql.DataSource;
 
+import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.jdbc.core.PreparedStatementSetter;
 
 import org.jspecify.annotations.Nullable;
@@ -62,8 +63,9 @@
  * @author Mahmoud Ben Hassine
  * @author Stefano Cordio
  * @author Jimmy Praet
+ * @author Andrey Litvitski
  */
-public class JdbcCursorItemReader<T> extends AbstractCursorItemReader<T> {
+public class JdbcCursorItemReader<T> extends AbstractCursorItemReader<T> implements BeanNameAware {
 
 	private @Nullable PreparedStatement preparedStatement;
 

spring-batch-infrastructure/src/main/java/org/springframework/batch/infrastructure/item/database/JdbcPagingItemReader.java

@@ -34,6 +34,7 @@
 import org.springframework.batch.infrastructure.item.ItemReader;
 import org.springframework.batch.infrastructure.item.ExecutionContext;
 import org.springframework.batch.infrastructure.item.ItemStreamException;
+import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
@@ -75,9 +76,10 @@
  * @author Mahmoud Ben Hassine
  * @author Stefano Cordio
  * @author Jimmy Praet
+ * @author Andrey Litvitski
  * @since 2.0
  */
-public class JdbcPagingItemReader<T> extends AbstractPagingItemReader<T> implements InitializingBean {
+public class JdbcPagingItemReader<T> extends AbstractPagingItemReader<T> implements InitializingBean, BeanNameAware {
 
 	private static final String START_AFTER_VALUE = "start.after";
 

spring-batch-infrastructure/src/main/java/org/springframework/batch/infrastructure/item/database/JpaCursorItemReader.java

@@ -28,6 +28,7 @@
 import org.springframework.batch.infrastructure.item.ItemStreamReader;
 import org.springframework.batch.infrastructure.item.database.orm.JpaQueryProvider;
 import org.springframework.batch.infrastructure.item.support.AbstractItemCountingItemStreamItemReader;
+import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.util.Assert;
@@ -46,10 +47,12 @@
  * @author Jinwoo Bae
  * @author Stefano Cordio
  * @author Jimmy Praet
+ * @author Andrey Litvitski
  * @param <T> type of items to read
  * @since 4.3
  */
-public class JpaCursorItemReader<T> extends AbstractItemCountingItemStreamItemReader<T> implements InitializingBean {
+public class JpaCursorItemReader<T> extends AbstractItemCountingItemStreamItemReader<T>
+		implements InitializingBean, BeanNameAware {
 
 	private EntityManagerFactory entityManagerFactory;
 

spring-batch-infrastructure/src/main/java/org/springframework/batch/infrastructure/item/database/JpaPagingItemReader.java

@@ -31,6 +31,7 @@
 import org.springframework.batch.infrastructure.item.ItemReader;
 import org.springframework.batch.infrastructure.item.ExecutionContext;
 import org.springframework.batch.infrastructure.item.database.orm.JpaQueryProvider;
+import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
@@ -83,9 +84,10 @@
  * @author Mahmoud Ben Hassine
  * @author Jinwoo Bae
  * @author Jimmy Praet
+ * @author Andrey Litvitski
  * @since 2.0
  */
-public class JpaPagingItemReader<T> extends AbstractPagingItemReader<T> {
+public class JpaPagingItemReader<T> extends AbstractPagingItemReader<T> implements BeanNameAware {
 
 	private EntityManagerFactory entityManagerFactory;