From 58e82a56e7175f6d795f0a641aa32ee1cddf74ee Mon Sep 17 00:00:00 2001
From: Parikshit Dutta <parikshitdutta@hotmail.com>
Date: Mon, 26 Apr 2021 16:18:17 +0530
Subject: [PATCH] Update SimpleStepBuilder to assign ItemProcessor lambda at
 construction

Issue #3749
---
 .../core/step/builder/SimpleStepBuilder.java  |  2 ++
 .../core/step/builder/StepBuilderTests.java   | 32 +++++++++++++------
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/SimpleStepBuilder.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/SimpleStepBuilder.java
index 79cea8e86..40aa86f21 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/SimpleStepBuilder.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/SimpleStepBuilder.java
@@ -64,6 +64,7 @@ import org.springframework.util.Assert;
  *
  * @author Dave Syer
  * @author Mahmoud Ben Hassine
+ * @author Parikshit Dutta
  *
  * @since 2.2
  */
@@ -111,6 +112,7 @@ public class SimpleStepBuilder<I, O> extends AbstractTaskletStepBuilder<SimpleSt
 		this.reader = parent.reader;
 		this.writer = parent.writer;
 		this.processor = parent.processor;
+		this.itemProcessorFunction = parent.itemProcessorFunction;
 		this.itemListeners = parent.itemListeners;
 		this.readerTransactionalQueue = parent.readerTransactionalQueue;
 	}
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/builder/StepBuilderTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/builder/StepBuilderTests.java
index 81f2f073d..6c4b697af 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/builder/StepBuilderTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/builder/StepBuilderTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -56,6 +56,7 @@ import static org.junit.Assert.assertEquals;
  * @author Dave Syer
  * @author Michael Minella
  * @author Mahmoud Ben Hassine
+ * @author Parikshit Dutta
  *
  */
 @SuppressWarnings("serial")
@@ -214,6 +215,15 @@ public class StepBuilderTests {
 
 	@Test
 	public void testFunctions() throws Exception {
+		assertStepFunctions(false);
+	}
+
+	@Test
+	public void testFunctionsWithFaultTolerantStep() throws Exception {
+		assertStepFunctions(true);
+	}
+
+	private void assertStepFunctions(boolean faultTolerantStep) throws Exception {
 		JobRepository jobRepository = new MapJobRepositoryFactoryBean().getObject();
 		StepExecution execution = jobRepository.createJobExecution("foo", new JobParameters()).createStepExecution("step");
 		jobRepository.add(execution);
@@ -228,15 +238,19 @@ public class StepBuilderTests {
 		ItemReader<Long> reader = new ListItemReader<>(items);
 
 		ListItemWriter<String> itemWriter = new ListItemWriter<>();
-		@SuppressWarnings("unchecked")
+
 		SimpleStepBuilder<Object, String> builder = new StepBuilder("step")
-											 .repository(jobRepository)
-											 .transactionManager(transactionManager)
-											 .<Object, String>chunk(3)
-											 .reader(reader)
-											 .processor((Function<Object, String>) s -> s.toString())
-											 .writer(itemWriter)
-											 .listener(new AnnotationBasedStepExecutionListener());
+				.repository(jobRepository)
+				.transactionManager(transactionManager)
+				.<Object, String>chunk(3)
+				.reader(reader)
+				.processor((Function<Object, String>) s -> s.toString())
+				.writer(itemWriter)
+				.listener(new AnnotationBasedStepExecutionListener());
+
+		if (faultTolerantStep) {
+			builder = builder.faultTolerant();
+		}
 		builder.build().execute(execution);
 
 		assertEquals(BatchStatus.COMPLETED, execution.getStatus());