From c534dad74342c7b2a1f89bf9857404d3527837e2 Mon Sep 17 00:00:00 2001
From: robokaso <robokaso@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Tue, 10 Feb 2009 13:16:27 +0000
Subject: [PATCH] IN PROGRESS - BATCH-1010: StepFactoryBeans cleanup

---
 .../item/FaultTolerantStepFactoryBean.java    | 72 +++++++++++--------
 1 file changed, 44 insertions(+), 28 deletions(-)

diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBean.java
index fe5d7030f..d43ea0562 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBean.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBean.java
@@ -208,6 +208,7 @@ public class FaultTolerantStepFactoryBean<T, S> extends SimpleStepFactoryBean<T,
 		this.fatalExceptionClasses = fatalExceptionClasses;
 	}
 
+	@Override
 	protected void applyConfiguration(TaskletStep step) {
 		super.applyConfiguration(step);
 
@@ -219,30 +220,8 @@ public class FaultTolerantStepFactoryBean<T, S> extends SimpleStepFactoryBean<T,
 		addFatalExceptionIfMissing(SkipLimitExceededException.class, NonSkippableReadException.class,
 				SkipListenerFailedException.class, RetryException.class);
 
-		SkipPolicy readSkipPolicy = new LimitCheckingItemSkipPolicy(skipLimit, skippableExceptionClasses,
-				fatalExceptionClasses);
-
-		// TODO why are retryable exceptions automatically skippable?
-		SkipPolicy writeSkipPolicy = new LimitCheckingItemSkipPolicy(skipLimit, skippableExceptionClasses,
-				fatalExceptionClasses);
-
-		Classifier<Throwable, Boolean> rollbackClassifier = new Classifier<Throwable, Boolean>() {
-			public Boolean classify(Throwable classifiable) {
-				return getTransactionAttribute().rollbackOn(classifiable);
-			}
-		};
-
-		BatchRetryTemplate batchRetryTemplate = configureRetry();
-
-		FaultTolerantChunkProvider<T> chunkProvider = new FaultTolerantChunkProvider<T>(getItemReader(),
-				getChunkOperations());
-		chunkProvider.setSkipPolicy(readSkipPolicy);
-		FaultTolerantChunkProcessor<T, S> chunkProcessor = new FaultTolerantChunkProcessor<T, S>(getItemProcessor(),
-				getItemWriter(), batchRetryTemplate);
-		chunkProcessor.setBuffering(!isReaderTransactionalQueue);
-		chunkProcessor.setWriteSkipPolicy(writeSkipPolicy);
-		chunkProcessor.setProcessSkipPolicy(writeSkipPolicy);
-		chunkProcessor.setRollbackClassifier(rollbackClassifier);
+		SimpleChunkProvider<T> chunkProvider = configureChunkProvider();
+		SimpleChunkProcessor<T, S> chunkProcessor = configureChunkProcessor();
 
 		registerExplicitItemListeners(chunkProvider, chunkProcessor);
 		registerImplicitItemListeners(chunkProvider, chunkProcessor);
@@ -255,8 +234,47 @@ public class FaultTolerantStepFactoryBean<T, S> extends SimpleStepFactoryBean<T,
 	}
 
 	/**
-	 * @return fully configured retry template to be used for item processing
-	 * phase.
+	 * @return {@link ChunkProcessor} configured for fault-tolerance.
+	 */
+	private FaultTolerantChunkProcessor<T, S> configureChunkProcessor() {
+
+		SkipPolicy writeSkipPolicy = new LimitCheckingItemSkipPolicy(skipLimit, skippableExceptionClasses,
+				fatalExceptionClasses);
+
+		Classifier<Throwable, Boolean> rollbackClassifier = new Classifier<Throwable, Boolean>() {
+			public Boolean classify(Throwable classifiable) {
+				return getTransactionAttribute().rollbackOn(classifiable);
+			}
+		};
+
+		BatchRetryTemplate batchRetryTemplate = configureRetry();
+
+		FaultTolerantChunkProcessor<T, S> chunkProcessor = new FaultTolerantChunkProcessor<T, S>(getItemProcessor(),
+				getItemWriter(), batchRetryTemplate);
+		chunkProcessor.setBuffering(!isReaderTransactionalQueue);
+		chunkProcessor.setWriteSkipPolicy(writeSkipPolicy);
+		chunkProcessor.setProcessSkipPolicy(writeSkipPolicy);
+		chunkProcessor.setRollbackClassifier(rollbackClassifier);
+
+		return chunkProcessor;
+	}
+
+	/**
+	 * @return {@link ChunkProvider} configured for fault-tolerance.
+	 */
+	private FaultTolerantChunkProvider<T> configureChunkProvider() {
+
+		SkipPolicy readSkipPolicy = new LimitCheckingItemSkipPolicy(skipLimit, skippableExceptionClasses,
+				fatalExceptionClasses);
+		FaultTolerantChunkProvider<T> chunkProvider = new FaultTolerantChunkProvider<T>(getItemReader(),
+				getChunkOperations());
+		chunkProvider.setSkipPolicy(readSkipPolicy);
+
+		return chunkProvider;
+	}
+
+	/**
+	 * @return fully configured retry template for item processing phase.
 	 */
 	private BatchRetryTemplate configureRetry() {
 
@@ -303,8 +321,6 @@ public class FaultTolerantStepFactoryBean<T, S> extends SimpleStepFactoryBean<T,
 	 */
 	private RetryPolicy fatalExceptionAwareProxy(final RetryPolicy retryPolicy) {
 
-		// wrapper of the injected retry policy takes care of fatal
-		// exceptions (never retried)
 		final NeverRetryPolicy neverRetryPolicy = new NeverRetryPolicy();
 		ExceptionClassifierRetryPolicy retryPolicyWrapper = new ExceptionClassifierRetryPolicy();
 		retryPolicyWrapper.setExceptionClassifier(new Classifier<Throwable, RetryPolicy>() {