diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/StepExecutionResourceProxy.java b/spring-batch-core/src/main/java/org/springframework/batch/core/resource/StepExecutionResourceProxy.java similarity index 97% rename from spring-batch-core/src/main/java/org/springframework/batch/core/converter/StepExecutionResourceProxy.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/resource/StepExecutionResourceProxy.java index 67a98d401..6b40fa4e8 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/StepExecutionResourceProxy.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/resource/StepExecutionResourceProxy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.core.converter; +package org.springframework.batch.core.resource; import java.io.File; import java.io.IOException; @@ -28,6 +28,8 @@ import java.util.Map.Entry; import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.StepExecution; import org.springframework.batch.core.StepListener; +import org.springframework.batch.core.converter.DefaultJobParametersConverter; +import org.springframework.batch.core.converter.JobParametersConverter; import org.springframework.batch.core.listener.StepListenerSupport; import org.springframework.context.ResourceLoaderAware; import org.springframework.core.io.FileSystemResourceLoader; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleRetryExceptionHandler.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleRetryExceptionHandler.java index 2a37fbf96..7e4ecb11e 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleRetryExceptionHandler.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleRetryExceptionHandler.java @@ -17,7 +17,7 @@ package org.springframework.batch.core.step.item; import org.springframework.batch.repeat.RepeatContext; import org.springframework.batch.repeat.exception.ExceptionHandler; -import org.springframework.batch.repeat.synch.RepeatSynchronizationManager; +import org.springframework.batch.repeat.support.RepeatSynchronizationManager; import org.springframework.batch.retry.RetryCallback; import org.springframework.batch.retry.RetryContext; import org.springframework.batch.retry.RetryPolicy; diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/converter/StepExecutionResourceProxyTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/resource/StepExecutionResourceProxyTests.java similarity index 96% rename from spring-batch-core/src/test/java/org/springframework/batch/core/converter/StepExecutionResourceProxyTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/resource/StepExecutionResourceProxyTests.java index d5987ed25..cace3d635 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/converter/StepExecutionResourceProxyTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/resource/StepExecutionResourceProxyTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.core.converter; +package org.springframework.batch.core.resource; import java.io.File; import java.io.IOException; @@ -27,8 +27,8 @@ import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.JobParametersBuilder; import org.springframework.batch.core.Step; import org.springframework.batch.core.StepExecution; -import org.springframework.batch.core.converter.StepExecutionResourceProxy; import org.springframework.batch.core.job.JobSupport; +import org.springframework.batch.core.resource.StepExecutionResourceProxy; import org.springframework.batch.core.step.StepSupport; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.DefaultResourceLoader; diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleRetryExceptionHandlerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleRetryExceptionHandlerTests.java index 62a78e14d..d26f985d6 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleRetryExceptionHandlerTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleRetryExceptionHandlerTests.java @@ -21,7 +21,7 @@ import org.springframework.batch.core.step.item.SimpleRetryExceptionHandler; import org.springframework.batch.repeat.RepeatContext; import org.springframework.batch.repeat.context.RepeatContextSupport; import org.springframework.batch.repeat.exception.SimpleLimitExceptionHandler; -import org.springframework.batch.repeat.synch.RepeatSynchronizationManager; +import org.springframework.batch.repeat.support.RepeatSynchronizationManager; import org.springframework.batch.retry.RetryContext; import org.springframework.batch.retry.RetryPolicy; import org.springframework.batch.retry.policy.AlwaysRetryPolicy; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/BatchSqlUpdateItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/BatchSqlUpdateItemWriter.java index 7df9c0e53..bb5979fd1 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/BatchSqlUpdateItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/BatchSqlUpdateItemWriter.java @@ -25,7 +25,7 @@ import org.springframework.batch.item.ClearFailedException; import org.springframework.batch.item.FlushFailedException; import org.springframework.batch.item.ItemWriter; import org.springframework.batch.repeat.RepeatContext; -import org.springframework.batch.repeat.synch.RepeatSynchronizationManager; +import org.springframework.batch.repeat.support.RepeatSynchronizationManager; import org.springframework.beans.factory.InitializingBean; import org.springframework.dao.DataAccessException; import org.springframework.jdbc.core.JdbcOperations; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateAwareItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateAwareItemWriter.java index 0f8c38f8e..1bb9a312e 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateAwareItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateAwareItemWriter.java @@ -23,7 +23,7 @@ import org.springframework.batch.item.ClearFailedException; import org.springframework.batch.item.FlushFailedException; import org.springframework.batch.item.ItemWriter; import org.springframework.batch.repeat.RepeatContext; -import org.springframework.batch.repeat.synch.RepeatSynchronizationManager; +import org.springframework.batch.repeat.support.RepeatSynchronizationManager; import org.springframework.beans.factory.InitializingBean; import org.springframework.orm.hibernate3.HibernateOperations; import org.springframework.orm.hibernate3.HibernateTemplate; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/synch/RepeatSynchronizationManager.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatSynchronizationManager.java similarity index 98% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/synch/RepeatSynchronizationManager.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatSynchronizationManager.java index c2eb302be..c1ec8f9aa 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/synch/RepeatSynchronizationManager.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatSynchronizationManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.repeat.synch; +package org.springframework.batch.repeat.support; import org.springframework.batch.repeat.RepeatCallback; import org.springframework.batch.repeat.RepeatContext; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatTemplate.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatTemplate.java index 2b9f51a81..5d80b291b 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatTemplate.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatTemplate.java @@ -32,7 +32,6 @@ import org.springframework.batch.repeat.RepeatOperations; import org.springframework.batch.repeat.exception.DefaultExceptionHandler; import org.springframework.batch.repeat.exception.ExceptionHandler; import org.springframework.batch.repeat.policy.DefaultResultCompletionPolicy; -import org.springframework.batch.repeat.synch.RepeatSynchronizationManager; import org.springframework.util.Assert; /** diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/synch/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/synch/package.html deleted file mode 100644 index 6494f15c5..000000000 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/synch/package.html +++ /dev/null @@ -1,7 +0,0 @@ - - -

-Infrastructure implementations of repeat synch concerns. -

- - diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/CompositeRetryPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/CompositeRetryPolicy.java index 0de071f8a..93df8396e 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/CompositeRetryPolicy.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/CompositeRetryPolicy.java @@ -24,7 +24,7 @@ import org.springframework.batch.retry.RetryContext; import org.springframework.batch.retry.RetryPolicy; import org.springframework.batch.retry.TerminatedRetryException; import org.springframework.batch.retry.context.RetryContextSupport; -import org.springframework.batch.retry.synch.RetrySynchronizationManager; +import org.springframework.batch.retry.support.RetrySynchronizationManager; /** * A {@link RetryPolicy} that composes a list of other policies and delegates diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/ExceptionClassifierRetryPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/ExceptionClassifierRetryPolicy.java index 4dbfcc708..d206cab70 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/ExceptionClassifierRetryPolicy.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/ExceptionClassifierRetryPolicy.java @@ -25,7 +25,7 @@ import org.springframework.batch.retry.RetryContext; import org.springframework.batch.retry.RetryPolicy; import org.springframework.batch.retry.TerminatedRetryException; import org.springframework.batch.retry.context.RetryContextSupport; -import org.springframework.batch.retry.synch.RetrySynchronizationManager; +import org.springframework.batch.retry.support.RetrySynchronizationManager; import org.springframework.batch.support.ExceptionClassifier; import org.springframework.batch.support.ExceptionClassifierSupport; import org.springframework.util.Assert; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/ItemReaderRetryPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/ItemReaderRetryPolicy.java index c8ce52e07..adf93b41f 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/ItemReaderRetryPolicy.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/ItemReaderRetryPolicy.java @@ -22,14 +22,14 @@ import org.springframework.batch.item.FailedItemIdentifier; import org.springframework.batch.item.ItemKeyGenerator; import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.ItemRecoverer; -import org.springframework.batch.repeat.synch.RepeatSynchronizationManager; +import org.springframework.batch.repeat.support.RepeatSynchronizationManager; import org.springframework.batch.retry.RetryCallback; import org.springframework.batch.retry.RetryContext; import org.springframework.batch.retry.RetryPolicy; import org.springframework.batch.retry.TerminatedRetryException; import org.springframework.batch.retry.callback.ItemReaderRetryCallback; import org.springframework.batch.retry.context.RetryContextSupport; -import org.springframework.batch.retry.synch.RetrySynchronizationManager; +import org.springframework.batch.retry.support.RetrySynchronizationManager; import org.springframework.util.Assert; /** diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/NeverRetryPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/NeverRetryPolicy.java index 5bad61406..39b4c9fe7 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/NeverRetryPolicy.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/NeverRetryPolicy.java @@ -21,7 +21,7 @@ import org.springframework.batch.retry.RetryContext; import org.springframework.batch.retry.RetryPolicy; import org.springframework.batch.retry.TerminatedRetryException; import org.springframework.batch.retry.context.RetryContextSupport; -import org.springframework.batch.retry.synch.RetrySynchronizationManager; +import org.springframework.batch.retry.support.RetrySynchronizationManager; /** * A {@link RetryPolicy} that allows the first attempt but never permits a diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/SimpleRetryPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/SimpleRetryPolicy.java index 9daea11b5..a1c66a86e 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/SimpleRetryPolicy.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/SimpleRetryPolicy.java @@ -20,7 +20,7 @@ import org.springframework.batch.repeat.RepeatContext; import org.springframework.batch.retry.RetryCallback; import org.springframework.batch.retry.RetryContext; import org.springframework.batch.retry.context.RetryContextSupport; -import org.springframework.batch.retry.synch.RetrySynchronizationManager; +import org.springframework.batch.retry.support.RetrySynchronizationManager; import org.springframework.batch.support.BinaryExceptionClassifier; /** diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/TimeoutRetryPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/TimeoutRetryPolicy.java index a64f12ae4..7f93599bc 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/TimeoutRetryPolicy.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/policy/TimeoutRetryPolicy.java @@ -21,7 +21,7 @@ import org.springframework.batch.retry.RetryContext; import org.springframework.batch.retry.RetryPolicy; import org.springframework.batch.retry.TerminatedRetryException; import org.springframework.batch.retry.context.RetryContextSupport; -import org.springframework.batch.retry.synch.RetrySynchronizationManager; +import org.springframework.batch.retry.support.RetrySynchronizationManager; /** * A {@link RetryPolicy} that allows a retry only if it hasn't timed out. The diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/synch/RetrySynchronizationManager.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/support/RetrySynchronizationManager.java similarity index 96% rename from spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/synch/RetrySynchronizationManager.java rename to spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/support/RetrySynchronizationManager.java index b3e3fbdc6..e24f10686 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/synch/RetrySynchronizationManager.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/support/RetrySynchronizationManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.batch.retry.synch; +package org.springframework.batch.retry.support; import org.springframework.batch.retry.RetryContext; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/support/RetryTemplate.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/support/RetryTemplate.java index 383a5b03f..eb0c22244 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/support/RetryTemplate.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/support/RetryTemplate.java @@ -33,7 +33,6 @@ import org.springframework.batch.retry.backoff.BackOffInterruptedException; import org.springframework.batch.retry.backoff.BackOffPolicy; import org.springframework.batch.retry.backoff.NoBackOffPolicy; import org.springframework.batch.retry.policy.SimpleRetryPolicy; -import org.springframework.batch.retry.synch.RetrySynchronizationManager; /** * Template class that simplifies the execution of operations with retry diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/synch/package.html b/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/synch/package.html deleted file mode 100644 index 77200b44a..000000000 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/retry/synch/package.html +++ /dev/null @@ -1,7 +0,0 @@ - - -

-Infrastructure implementations of retry synch concerns. -

- - diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/BatchSqlUpdateItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/BatchSqlUpdateItemWriterTests.java index 5e0cddc4a..b2dab9597 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/BatchSqlUpdateItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/BatchSqlUpdateItemWriterTests.java @@ -29,7 +29,7 @@ import junit.framework.TestCase; import org.easymock.MockControl; import org.springframework.batch.repeat.RepeatContext; import org.springframework.batch.repeat.context.RepeatContextSupport; -import org.springframework.batch.repeat.synch.RepeatSynchronizationManager; +import org.springframework.batch.repeat.support.RepeatSynchronizationManager; import org.springframework.dao.DataAccessException; import org.springframework.jdbc.UncategorizedSQLException; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateAwareItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateAwareItemWriterTests.java index 18ba1922c..c5f21dd03 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateAwareItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateAwareItemWriterTests.java @@ -26,7 +26,7 @@ import org.springframework.batch.item.ClearFailedException; import org.springframework.batch.item.FlushFailedException; import org.springframework.batch.item.ItemWriter; import org.springframework.batch.repeat.context.RepeatContextSupport; -import org.springframework.batch.repeat.synch.RepeatSynchronizationManager; +import org.springframework.batch.repeat.support.RepeatSynchronizationManager; import org.springframework.dao.DataAccessException; import org.springframework.orm.hibernate3.HibernateTemplate; import org.springframework.transaction.support.TransactionSynchronizationManager; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/synch/RepeatSynchronizationManagerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/RepeatSynchronizationManagerTests.java similarity index 94% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/synch/RepeatSynchronizationManagerTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/RepeatSynchronizationManagerTests.java index 11adcdf3e..de09b76e2 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/synch/RepeatSynchronizationManagerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/RepeatSynchronizationManagerTests.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.springframework.batch.repeat.synch; +package org.springframework.batch.repeat.support; import junit.framework.TestCase; import org.springframework.batch.repeat.RepeatContext; import org.springframework.batch.repeat.context.RepeatContextSupport; +import org.springframework.batch.repeat.support.RepeatSynchronizationManager; public class RepeatSynchronizationManagerTests extends TestCase { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/SimpleRepeatTemplateTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/SimpleRepeatTemplateTests.java index 2eeaa210b..5a99f02ae 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/SimpleRepeatTemplateTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/SimpleRepeatTemplateTests.java @@ -28,7 +28,6 @@ import org.springframework.batch.repeat.context.RepeatContextSupport; import org.springframework.batch.repeat.exception.ExceptionHandler; import org.springframework.batch.repeat.policy.CompletionPolicySupport; import org.springframework.batch.repeat.policy.SimpleCompletionPolicy; -import org.springframework.batch.repeat.synch.RepeatSynchronizationManager; /** * @author Dave Syer diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/AlwaysRetryPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/AlwaysRetryPolicyTests.java index f84166b83..cf9f56db9 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/AlwaysRetryPolicyTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/AlwaysRetryPolicyTests.java @@ -19,7 +19,7 @@ package org.springframework.batch.retry.policy; import junit.framework.TestCase; import org.springframework.batch.retry.RetryContext; -import org.springframework.batch.retry.synch.RetrySynchronizationManager; +import org.springframework.batch.retry.support.RetrySynchronizationManager; public class AlwaysRetryPolicyTests extends TestCase { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/CompositeRetryPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/CompositeRetryPolicyTests.java index c3dbc7e2c..2eeb77fd5 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/CompositeRetryPolicyTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/CompositeRetryPolicyTests.java @@ -24,7 +24,7 @@ import junit.framework.TestCase; import org.springframework.batch.retry.RetryContext; import org.springframework.batch.retry.RetryPolicy; import org.springframework.batch.retry.TerminatedRetryException; -import org.springframework.batch.retry.synch.RetrySynchronizationManager; +import org.springframework.batch.retry.support.RetrySynchronizationManager; public class CompositeRetryPolicyTests extends TestCase { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/ExceptionClassifierRetryPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/ExceptionClassifierRetryPolicyTests.java index 7229f780a..0526c9f24 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/ExceptionClassifierRetryPolicyTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/ExceptionClassifierRetryPolicyTests.java @@ -23,7 +23,7 @@ import java.util.Map; import junit.framework.TestCase; import org.springframework.batch.retry.RetryContext; -import org.springframework.batch.retry.synch.RetrySynchronizationManager; +import org.springframework.batch.retry.support.RetrySynchronizationManager; import org.springframework.batch.support.ExceptionClassifierSupport; public class ExceptionClassifierRetryPolicyTests extends TestCase { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/ItemReaderRetryPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/ItemReaderRetryPolicyTests.java index bed706b74..3618f3409 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/ItemReaderRetryPolicyTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/ItemReaderRetryPolicyTests.java @@ -30,7 +30,7 @@ import org.springframework.batch.item.ItemReader; import org.springframework.batch.item.support.ListItemReader; import org.springframework.batch.repeat.RepeatContext; import org.springframework.batch.repeat.context.RepeatContextSupport; -import org.springframework.batch.repeat.synch.RepeatSynchronizationManager; +import org.springframework.batch.repeat.support.RepeatSynchronizationManager; import org.springframework.batch.retry.ListItemReaderRecoverer; import org.springframework.batch.retry.RetryCallback; import org.springframework.batch.retry.RetryContext; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/NeverRetryPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/NeverRetryPolicyTests.java index befab5f3d..0af10b2dd 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/NeverRetryPolicyTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/NeverRetryPolicyTests.java @@ -19,7 +19,7 @@ package org.springframework.batch.retry.policy; import junit.framework.TestCase; import org.springframework.batch.retry.RetryContext; -import org.springframework.batch.retry.synch.RetrySynchronizationManager; +import org.springframework.batch.retry.support.RetrySynchronizationManager; public class NeverRetryPolicyTests extends TestCase { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/SimpleRetryPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/SimpleRetryPolicyTests.java index 6cbba7452..3a47680f5 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/SimpleRetryPolicyTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/SimpleRetryPolicyTests.java @@ -19,7 +19,7 @@ package org.springframework.batch.retry.policy; import junit.framework.TestCase; import org.springframework.batch.retry.RetryContext; -import org.springframework.batch.retry.synch.RetrySynchronizationManager; +import org.springframework.batch.retry.support.RetrySynchronizationManager; public class SimpleRetryPolicyTests extends TestCase { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/TimeoutRetryPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/TimeoutRetryPolicyTests.java index b93626beb..1b71c4ff4 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/TimeoutRetryPolicyTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/policy/TimeoutRetryPolicyTests.java @@ -19,7 +19,7 @@ package org.springframework.batch.retry.policy; import junit.framework.TestCase; import org.springframework.batch.retry.RetryContext; -import org.springframework.batch.retry.synch.RetrySynchronizationManager; +import org.springframework.batch.retry.support.RetrySynchronizationManager; public class TimeoutRetryPolicyTests extends TestCase { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/synch/RetrySynchronizationManagerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/support/RetrySynchronizationManagerTests.java similarity index 95% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/synch/RetrySynchronizationManagerTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/support/RetrySynchronizationManagerTests.java index 2cab6ab2c..971752a14 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/synch/RetrySynchronizationManagerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/support/RetrySynchronizationManagerTests.java @@ -14,13 +14,14 @@ * limitations under the License. */ -package org.springframework.batch.retry.synch; +package org.springframework.batch.retry.support; import junit.framework.TestCase; import org.springframework.batch.retry.RetryCallback; import org.springframework.batch.retry.RetryContext; import org.springframework.batch.retry.context.RetryContextSupport; +import org.springframework.batch.retry.support.RetrySynchronizationManager; import org.springframework.batch.retry.support.RetryTemplate; /** diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/support/RetryTemplateTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/support/RetryTemplateTests.java index 67f44a6f4..ef3d02214 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/support/RetryTemplateTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/retry/support/RetryTemplateTests.java @@ -27,7 +27,6 @@ import org.springframework.batch.retry.backoff.BackOffPolicy; import org.springframework.batch.retry.backoff.StatelessBackOffPolicy; import org.springframework.batch.retry.policy.NeverRetryPolicy; import org.springframework.batch.retry.policy.SimpleRetryPolicy; -import org.springframework.batch.retry.synch.RetrySynchronizationManager; /** * @author Rob Harrop diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ExceptionThrowingItemReaderProxyTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ExceptionThrowingItemReaderProxyTests.java index b0216f27f..00afd807d 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ExceptionThrowingItemReaderProxyTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/tasklet/ExceptionThrowingItemReaderProxyTests.java @@ -7,7 +7,7 @@ import junit.framework.TestCase; import org.springframework.batch.core.UnexpectedJobExecutionException; import org.springframework.batch.item.support.ListItemReader; import org.springframework.batch.repeat.context.RepeatContextSupport; -import org.springframework.batch.repeat.synch.RepeatSynchronizationManager; +import org.springframework.batch.repeat.support.RepeatSynchronizationManager; public class ExceptionThrowingItemReaderProxyTests extends TestCase {