BATCH-2686: Add tests for overridden setters

Author: fmbenhassine

spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkingMasterStepBuilder.java

@@ -15,10 +15,7 @@
  */
 package org.springframework.batch.integration.chunk;
 
-import java.util.function.Function;
-
 import org.springframework.batch.core.ChunkListener;
-import org.springframework.batch.core.ItemProcessListener;
 import org.springframework.batch.core.ItemReadListener;
 import org.springframework.batch.core.ItemWriteListener;
 import org.springframework.batch.core.SkipListener;
@@ -29,7 +26,6 @@
 import org.springframework.batch.core.step.item.KeyGenerator;
 import org.springframework.batch.core.step.skip.SkipPolicy;
 import org.springframework.batch.core.step.tasklet.TaskletStep;
-import org.springframework.batch.item.ItemProcessor;
 import org.springframework.batch.item.ItemReader;
 import org.springframework.batch.item.ItemStream;
 import org.springframework.batch.item.ItemWriter;
@@ -175,7 +171,7 @@ public TaskletStep build() {
 		if (this.messagingTemplate == null) {
 			this.messagingTemplate = new MessagingTemplate();
 		}
-		this.messagingTemplate.setDefaultChannel(outputChannel);
+		this.messagingTemplate.setDefaultChannel(this.outputChannel);
 
 		// configure item writer
 		ChunkMessageChannelItemWriter<O> chunkMessageChannelItemWriter = new ChunkMessageChannelItemWriter<>();
@@ -330,12 +326,6 @@ public RemoteChunkingMasterStepBuilder<I, O> retry(Class<? extends Throwable> ty
 		return this;
 	}
 
-	@Override
-	public RemoteChunkingMasterStepBuilder<I, O> processorNonTransactional() {
-		super.processorNonTransactional();
-		return this;
-	}
-
 	@Override
 	public RemoteChunkingMasterStepBuilder<I, O> stream(ItemStream stream) {
 		super.stream(stream);
@@ -368,18 +358,6 @@ public RemoteChunkingMasterStepBuilder<I, O> writer(ItemWriter<? super O> writer
 		return this;
 	}
 
-	@Override
-	public RemoteChunkingMasterStepBuilder<I, O> processor(ItemProcessor<? super I, ? extends O> processor) {
-		super.processor(processor);
-		return this;
-	}
-
-	@Override
-	public RemoteChunkingMasterStepBuilder<I, O> processor(Function<? super I, ? extends O> function) {
-		super.processor(function);
-		return this;
-	}
-
 	@Override
 	public RemoteChunkingMasterStepBuilder<I, O> readerIsTransactionalQueue() {
 		super.readerIsTransactionalQueue();
@@ -398,12 +376,6 @@ public RemoteChunkingMasterStepBuilder<I, O> listener(ItemWriteListener<? super
 		return this;
 	}
 
-	@Override
-	public RemoteChunkingMasterStepBuilder<I, O> listener(ItemProcessListener<? super I, ? super O> listener) {
-		super.listener(listener);
-		return this;
-	}
-
 	@Override
 	public RemoteChunkingMasterStepBuilder<I, O> chunkOperations(RepeatOperations repeatTemplate) {
 		super.chunkOperations(repeatTemplate);

spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkingMasterStepBuilderTest.java

@@ -24,18 +24,30 @@
 import org.junit.runner.RunWith;
 
 import org.springframework.batch.core.configuration.annotation.EnableBatchProcessing;
+import org.springframework.batch.core.listener.ChunkListenerSupport;
+import org.springframework.batch.core.listener.CompositeItemReadListener;
+import org.springframework.batch.core.listener.CompositeItemWriteListener;
+import org.springframework.batch.core.listener.SkipListenerSupport;
+import org.springframework.batch.core.listener.StepExecutionListenerSupport;
 import org.springframework.batch.core.repository.JobRepository;
 import org.springframework.batch.core.step.tasklet.TaskletStep;
 import org.springframework.batch.item.ItemReader;
+import org.springframework.batch.item.ItemStreamSupport;
 import org.springframework.batch.item.support.ListItemReader;
+import org.springframework.batch.repeat.exception.DefaultExceptionHandler;
+import org.springframework.batch.repeat.support.RepeatTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.channel.QueueChannel;
 import org.springframework.messaging.PollableChannel;
+import org.springframework.retry.backoff.NoBackOffPolicy;
+import org.springframework.retry.listener.RetryListenerSupport;
+import org.springframework.retry.policy.MapRetryContextCache;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.interceptor.DefaultTransactionAttribute;
 
 /**
  * @author Mahmoud Ben Hassine
@@ -52,6 +64,10 @@ public class RemoteChunkingMasterStepBuilderTest {
 	@Autowired
 	private PlatformTransactionManager transactionManager;
 
+	private PollableChannel inputChannel = new QueueChannel();
+	private DirectChannel outputChannel = new DirectChannel();
+	private ItemReader<String> itemReader = new ListItemReader<>(Arrays.asList("a", "b", "c"));
+
 	@Test
 	public void inputChannelMustNotBeNull() {
 		// given
@@ -146,7 +162,7 @@ public void testMandatoryInputChannel() {
 	public void testMandatoryOutputChannel() {
 		// given
 		RemoteChunkingMasterStepBuilder<String, String> builder = new RemoteChunkingMasterStepBuilder<String, String>("step")
-				.inputChannel(new QueueChannel());
+				.inputChannel(this.inputChannel);
 
 		this.expectedException.expect(IllegalArgumentException.class);
 		this.expectedException.expectMessage("An OutputChannel must be provided");
@@ -160,18 +176,58 @@ public void testMandatoryOutputChannel() {
 
 	@Test
 	public void testMasterStepCreation() {
-		// given
-		ItemReader<String> itemReader = new ListItemReader<>(Arrays.asList("a", "b", "c"));
-		PollableChannel inputChannel = new QueueChannel();
-		DirectChannel outputChannel = new DirectChannel();
+		// when
+		TaskletStep taskletStep = new RemoteChunkingMasterStepBuilder<String, String>("step")
+				.reader(this.itemReader)
+				.repository(this.jobRepository)
+				.transactionManager(this.transactionManager)
+				.inputChannel(this.inputChannel)
+				.outputChannel(this.outputChannel)
+				.build();
+
+		// then
+		Assert.assertNotNull(taskletStep);
+	}
 
+	/*
+	 * The following test is to cover setters that override those from parent builders.
+	 */
+	@Test
+	public void testSetters() {
 		// when
 		TaskletStep taskletStep = new RemoteChunkingMasterStepBuilder<String, String>("step")
-				.reader(itemReader)
+				.reader(this.itemReader)
+				.readerIsTransactionalQueue()
+				.writer(items -> { })
 				.repository(this.jobRepository)
 				.transactionManager(this.transactionManager)
-				.inputChannel(inputChannel)
-				.outputChannel(outputChannel)
+				.transactionAttribute(new DefaultTransactionAttribute())
+				.inputChannel(this.inputChannel)
+				.outputChannel(this.outputChannel)
+				.listener(new Object())
+				.listener(new SkipListenerSupport<>())
+				.listener(new ChunkListenerSupport())
+				.listener(new StepExecutionListenerSupport())
+				.listener(new CompositeItemReadListener<>())
+				.listener(new CompositeItemWriteListener<>())
+				.listener(new RetryListenerSupport())
+				.skip(Exception.class)
+				.noSkip(RuntimeException.class)
+				.skipLimit(10)
+				.retry(Exception.class)
+				.noRetry(RuntimeException.class)
+				.retryLimit(10)
+				.retryContextCache(new MapRetryContextCache())
+				.noRollback(Exception.class)
+				.chunk(10)
+				.startLimit(3)
+				.allowStartIfComplete(true)
+				.exceptionHandler(new DefaultExceptionHandler())
+				.stepOperations(new RepeatTemplate())
+				.chunkOperations(new RepeatTemplate())
+				.backOffPolicy(new NoBackOffPolicy())
+				.stream(new ItemStreamSupport() {})
+				.keyGenerator(Object::hashCode)
 				.build();
 
 		// then