diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/DecisionParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/DecisionParser.java index a457f1f07..e52c410ee 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/DecisionParser.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/DecisionParser.java @@ -17,9 +17,9 @@ package org.springframework.batch.core.configuration.xml; import java.util.Collection; -import org.springframework.batch.core.job.flow.DecisionState; -import org.springframework.batch.core.job.flow.JobExecutionDecider; -import org.springframework.batch.core.job.flow.StateTransition; +import org.springframework.batch.core.job.flow.support.DecisionState; +import org.springframework.batch.core.job.flow.support.JobExecutionDecider; +import org.springframework.batch.core.job.flow.support.StateTransition; import org.springframework.beans.factory.config.RuntimeBeanReference; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/FlowParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/FlowParser.java index 566b613ca..7e952d19c 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/FlowParser.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/FlowParser.java @@ -19,7 +19,7 @@ import java.util.ArrayList; import java.util.List; import org.springframework.batch.core.job.flow.Flow; -import org.springframework.batch.core.job.flow.SimpleFlow; +import org.springframework.batch.core.job.flow.support.SimpleFlow; import org.springframework.beans.factory.config.RuntimeBeanReference; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/SplitParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/SplitParser.java index d5e8d8b8c..6408ee94a 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/SplitParser.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/SplitParser.java @@ -19,9 +19,9 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.springframework.batch.core.job.flow.JobExecutionDecider; -import org.springframework.batch.core.job.flow.SplitState; -import org.springframework.batch.core.job.flow.StateTransition; +import org.springframework.batch.core.job.flow.support.JobExecutionDecider; +import org.springframework.batch.core.job.flow.support.SplitState; +import org.springframework.batch.core.job.flow.support.StateTransition; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.RuntimeBeanReference; import org.springframework.beans.factory.support.BeanDefinitionBuilder; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParser.java index 4ef90ad41..86623d3a2 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParser.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParser.java @@ -21,9 +21,9 @@ import java.util.List; import org.springframework.batch.core.BatchStatus; import org.springframework.batch.core.Step; -import org.springframework.batch.core.job.flow.EndState; -import org.springframework.batch.core.job.flow.StateTransition; -import org.springframework.batch.core.job.flow.StepState; +import org.springframework.batch.core.job.flow.support.EndState; +import org.springframework.batch.core.job.flow.support.StateTransition; +import org.springframework.batch.core.job.flow.support.StepState; import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.RuntimeBeanReference; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/Flow.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/Flow.java index bb741ed79..882a2fae4 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/Flow.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/Flow.java @@ -15,7 +15,6 @@ */ package org.springframework.batch.core.job.flow; - /** * @author Dave Syer * @@ -33,8 +32,8 @@ public interface Flow { FlowExecution start(JobFlowExecutor executor) throws FlowExecutionException; /** - * @param stateName the name of the {@link State} to resume on - * @param executor the context to be passed into each {@link State} executed + * @param stateName the name of the state to resume on + * @param executor the context to be passed into each state executed * @return a {@link FlowExecution} containing the exit status of the flow * @throws FlowExecutionException */ diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/AbstractState.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/AbstractState.java similarity index 90% rename from spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/AbstractState.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/AbstractState.java index c7f7cd303..79ef219aa 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/AbstractState.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/AbstractState.java @@ -13,7 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.job.flow; +package org.springframework.batch.core.job.flow.support; + +import org.springframework.batch.core.job.flow.JobFlowExecutor; /** diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/DecisionState.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/DecisionState.java similarity index 66% rename from spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/DecisionState.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/DecisionState.java index df045c5fb..2f1111118 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/DecisionState.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/DecisionState.java @@ -1,4 +1,6 @@ -package org.springframework.batch.core.job.flow; +package org.springframework.batch.core.job.flow.support; + +import org.springframework.batch.core.job.flow.JobFlowExecutor; /** @@ -12,7 +14,7 @@ public class DecisionState extends AbstractState { /** * @param name */ - DecisionState(JobExecutionDecider decider, String name) { + public DecisionState(JobExecutionDecider decider, String name) { super(name); this.decider = decider; } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/EndState.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/EndState.java similarity index 81% rename from spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/EndState.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/EndState.java index 39e03e607..edb1ce1b0 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/EndState.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/EndState.java @@ -1,7 +1,9 @@ -package org.springframework.batch.core.job.flow; +package org.springframework.batch.core.job.flow.support; import org.springframework.batch.core.BatchStatus; import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.job.flow.FlowExecution; +import org.springframework.batch.core.job.flow.JobFlowExecutor; /** * {@link State} implementation for ending a job if it is in progress and @@ -17,7 +19,7 @@ public class EndState extends AbstractState { /** * @param name */ - EndState(BatchStatus status, String name) { + public EndState(BatchStatus status, String name) { super(name); this.status = status; } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecutionAggregator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/FlowExecutionAggregator.java similarity index 89% rename from spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecutionAggregator.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/FlowExecutionAggregator.java index 39e38967f..edeb85c85 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecutionAggregator.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/FlowExecutionAggregator.java @@ -13,10 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.job.flow; +package org.springframework.batch.core.job.flow.support; import java.util.Collection; +import org.springframework.batch.core.job.flow.FlowExecution; + /** * Strategy interface for aggregating {@link FlowExecution} instances into a * single exit status. diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/JobExecutionDecider.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/JobExecutionDecider.java similarity index 95% rename from spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/JobExecutionDecider.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/JobExecutionDecider.java index 6f476d493..8c750eb0f 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/JobExecutionDecider.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/JobExecutionDecider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.job.flow; +package org.springframework.batch.core.job.flow.support; import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.StepExecution; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/MaxValueFlowExecutionAggregator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/MaxValueFlowExecutionAggregator.java similarity index 89% rename from spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/MaxValueFlowExecutionAggregator.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/MaxValueFlowExecutionAggregator.java index e4cfb0e71..41dc45986 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/MaxValueFlowExecutionAggregator.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/MaxValueFlowExecutionAggregator.java @@ -13,11 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.job.flow; +package org.springframework.batch.core.job.flow.support; import java.util.Collection; import java.util.Collections; +import org.springframework.batch.core.job.flow.FlowExecution; + /** * @author Dave Syer * diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/PatternMatcher.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/PatternMatcher.java similarity index 98% rename from spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/PatternMatcher.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/PatternMatcher.java index 0ac7a4c09..18b03bc48 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/PatternMatcher.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/PatternMatcher.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.job.flow; +package org.springframework.batch.core.job.flow.support; /** * @author Dave Syer diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/PauseState.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/PauseState.java similarity index 78% rename from spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/PauseState.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/PauseState.java index 17acd05c0..dabfca848 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/PauseState.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/PauseState.java @@ -1,7 +1,9 @@ -package org.springframework.batch.core.job.flow; +package org.springframework.batch.core.job.flow.support; import org.springframework.batch.core.BatchStatus; import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.job.flow.FlowExecution; +import org.springframework.batch.core.job.flow.JobFlowExecutor; /** * @author Dave Syer @@ -12,7 +14,7 @@ public class PauseState extends AbstractState { /** * @param name */ - PauseState(String name) { + public PauseState(String name) { super(name); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/SimpleFlow.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/SimpleFlow.java similarity index 96% rename from spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/SimpleFlow.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/SimpleFlow.java index 573b1f735..71768f4ef 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/SimpleFlow.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/SimpleFlow.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.job.flow; +package org.springframework.batch.core.job.flow.support; import java.util.Collection; import java.util.HashMap; @@ -24,6 +24,10 @@ import java.util.SortedSet; import java.util.TreeSet; import org.springframework.batch.core.JobExecutionException; +import org.springframework.batch.core.job.flow.Flow; +import org.springframework.batch.core.job.flow.FlowExecution; +import org.springframework.batch.core.job.flow.FlowExecutionException; +import org.springframework.batch.core.job.flow.JobFlowExecutor; import org.springframework.beans.factory.InitializingBean; import com.sun.org.apache.xerces.internal.impl.xpath.XPath.Step; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/SplitState.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/SplitState.java similarity index 89% rename from spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/SplitState.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/SplitState.java index 961cb417f..c1afeb58b 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/SplitState.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/SplitState.java @@ -13,13 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.job.flow; +package org.springframework.batch.core.job.flow.support; import java.util.ArrayList; import java.util.Collection; import java.util.concurrent.Callable; import java.util.concurrent.FutureTask; +import org.springframework.batch.core.job.flow.Flow; +import org.springframework.batch.core.job.flow.FlowExecution; +import org.springframework.batch.core.job.flow.FlowExecutionException; +import org.springframework.batch.core.job.flow.JobFlowExecutor; import org.springframework.core.task.SyncTaskExecutor; import org.springframework.core.task.TaskExecutor; import org.springframework.core.task.TaskRejectedException; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/State.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/State.java similarity index 89% rename from spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/State.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/State.java index d8192e22d..5c3bf084a 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/State.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/State.java @@ -13,7 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.job.flow; +package org.springframework.batch.core.job.flow.support; + +import org.springframework.batch.core.job.flow.FlowExecution; +import org.springframework.batch.core.job.flow.JobFlowExecutor; /** diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/StateTransition.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/StateTransition.java similarity index 98% rename from spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/StateTransition.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/StateTransition.java index 21f67f2d6..c6f1e0c2c 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/StateTransition.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/StateTransition.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.job.flow; +package org.springframework.batch.core.job.flow.support; import org.springframework.batch.repeat.ExitStatus; import org.springframework.util.StringUtils; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/StepState.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/StepState.java similarity index 76% rename from spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/StepState.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/StepState.java index f20f37df1..961f2458a 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/StepState.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/StepState.java @@ -1,6 +1,7 @@ -package org.springframework.batch.core.job.flow; +package org.springframework.batch.core.job.flow.support; import org.springframework.batch.core.Step; +import org.springframework.batch.core.job.flow.JobFlowExecutor; /** * {@link State} implementation that delegates to a {@link JobFlowExecutor} to @@ -16,7 +17,7 @@ public class StepState extends AbstractState { /** * @param step the step that will be executed */ - StepState(Step step) { + public StepState(Step step) { super(step.getName()); this.step = step; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DecisionJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DecisionJobParserTests.java index 08d2e9d61..a907a44e6 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DecisionJobParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DecisionJobParserTests.java @@ -26,7 +26,7 @@ import org.springframework.batch.core.Job; import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.StepExecution; -import org.springframework.batch.core.job.flow.JobExecutionDecider; +import org.springframework.batch.core.job.flow.support.JobExecutionDecider; import org.springframework.batch.core.repository.JobRepository; import org.springframework.batch.core.repository.support.MapJobRepositoryFactoryBean; import org.springframework.beans.factory.annotation.Autowired; diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopJobParserTests.java index 92548f461..c5afb63c8 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopJobParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopJobParserTests.java @@ -26,7 +26,7 @@ import org.springframework.batch.core.Job; import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.StepExecution; -import org.springframework.batch.core.job.flow.JobExecutionDecider; +import org.springframework.batch.core.job.flow.support.JobExecutionDecider; import org.springframework.batch.core.repository.JobRepository; import org.springframework.batch.core.repository.support.MapJobRepositoryFactoryBean; import org.springframework.beans.factory.annotation.Autowired; diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowJobTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowJobTests.java index 5a945254e..a1325a879 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowJobTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowJobTests.java @@ -32,6 +32,13 @@ import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.Step; import org.springframework.batch.core.StepExecution; import org.springframework.batch.core.UnexpectedJobExecutionException; +import org.springframework.batch.core.job.flow.support.DecisionState; +import org.springframework.batch.core.job.flow.support.EndState; +import org.springframework.batch.core.job.flow.support.JobExecutionDecider; +import org.springframework.batch.core.job.flow.support.PauseState; +import org.springframework.batch.core.job.flow.support.SimpleFlow; +import org.springframework.batch.core.job.flow.support.StateTransition; +import org.springframework.batch.core.job.flow.support.StepState; import org.springframework.batch.core.repository.JobRepository; import org.springframework.batch.core.repository.support.MapJobRepositoryFactoryBean; import org.springframework.batch.core.step.StepSupport; diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/BasicFlowTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/BasicFlowTests.java similarity index 95% rename from spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/BasicFlowTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/BasicFlowTests.java index c950db67e..790e1c221 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/BasicFlowTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/BasicFlowTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.job.flow; +package org.springframework.batch.core.job.flow.support; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -25,6 +25,11 @@ import java.util.Collections; import java.util.List; import org.junit.Test; +import org.springframework.batch.core.job.flow.FlowExecution; +import org.springframework.batch.core.job.flow.FlowExecutionException; +import org.springframework.batch.core.job.flow.JobFlowExecutor; +import org.springframework.batch.core.job.flow.support.SimpleFlow; +import org.springframework.batch.core.job.flow.support.StateTransition; /** * @author Dave Syer diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/EndStateTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/EndStateTests.java similarity index 93% rename from spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/EndStateTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/EndStateTests.java index b33ebd9b3..88d667387 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/EndStateTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/EndStateTests.java @@ -13,14 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.job.flow; +package org.springframework.batch.core.job.flow.support; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import org.junit.Before; import org.junit.Test; import org.springframework.batch.core.BatchStatus; import org.springframework.batch.core.JobExecution; +import org.springframework.batch.core.job.flow.JobFlowExecutor; /** * @author Dave Syer diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/JobFlowExecutorSupport.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/JobFlowExecutorSupport.java similarity index 88% rename from spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/JobFlowExecutorSupport.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/JobFlowExecutorSupport.java index fda6695e5..ade45314b 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/JobFlowExecutorSupport.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/JobFlowExecutorSupport.java @@ -13,13 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.job.flow; +package org.springframework.batch.core.job.flow.support; import org.springframework.batch.core.JobExecution; import org.springframework.batch.core.JobInterruptedException; import org.springframework.batch.core.StartLimitExceededException; import org.springframework.batch.core.Step; import org.springframework.batch.core.StepExecution; +import org.springframework.batch.core.job.flow.FlowExecution; +import org.springframework.batch.core.job.flow.JobFlowExecutor; import org.springframework.batch.core.repository.JobRestartException; /** diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/SimpleFlowExecutionAggregatorTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/SimpleFlowExecutionAggregatorTests.java similarity index 91% rename from spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/SimpleFlowExecutionAggregatorTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/SimpleFlowExecutionAggregatorTests.java index d98d85c6c..763394807 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/SimpleFlowExecutionAggregatorTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/SimpleFlowExecutionAggregatorTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.job.flow; +package org.springframework.batch.core.job.flow.support; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -23,7 +23,7 @@ import java.util.Collections; import org.junit.Test; import org.springframework.batch.core.job.flow.FlowExecution; -import org.springframework.batch.core.job.flow.MaxValueFlowExecutionAggregator; +import org.springframework.batch.core.job.flow.support.MaxValueFlowExecutionAggregator; /** * @author Dave Syer diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/SplitStateTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/SplitStateTests.java similarity index 90% rename from spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/SplitStateTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/SplitStateTests.java index b7b7e2375..201bf1098 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/SplitStateTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/SplitStateTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.job.flow; +package org.springframework.batch.core.job.flow.support; import static org.junit.Assert.assertEquals; @@ -22,6 +22,9 @@ import java.util.Collection; import org.easymock.EasyMock; import org.junit.Test; +import org.springframework.batch.core.job.flow.Flow; +import org.springframework.batch.core.job.flow.FlowExecution; +import org.springframework.batch.core.job.flow.support.SplitState; import org.springframework.core.task.SimpleAsyncTaskExecutor; diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/StateSupport.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/StateSupport.java similarity index 80% rename from spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/StateSupport.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/StateSupport.java index 360807f61..a91f57599 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/StateSupport.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/StateSupport.java @@ -13,11 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.job.flow; +package org.springframework.batch.core.job.flow.support; -import org.springframework.batch.core.job.flow.AbstractState; import org.springframework.batch.core.job.flow.FlowExecution; -import org.springframework.batch.core.job.flow.State; +import org.springframework.batch.core.job.flow.JobFlowExecutor; +import org.springframework.batch.core.job.flow.support.AbstractState; +import org.springframework.batch.core.job.flow.support.State; /** * Base class for {@link State} implementations. diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/StateTransitionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/StateTransitionTests.java similarity index 97% rename from spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/StateTransitionTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/StateTransitionTests.java index 60ea1f255..0acfb276d 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/StateTransitionTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/StateTransitionTests.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.batch.core.job.flow; +package org.springframework.batch.core.job.flow.support; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import org.junit.Test; +import org.springframework.batch.core.job.flow.support.StateTransition; /** * @author Dave Syer