BATCH-679: move flow abstraction to core

dictionary.txt

@@ -77,3 +77,8 @@ autowiring
 strategizing
 initialized
 locale
+savepoint
+middleware
+fallback
+idempotent
+reconstitute

spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/DecisionParser.java

@@ -19,7 +19,7 @@ import java.util.Collection;
 
 import org.springframework.batch.core.job.flow.DecisionState;
 import org.springframework.batch.core.job.flow.JobExecutionDecider;
-import org.springframework.batch.flow.StateTransition;
+import org.springframework.batch.core.job.flow.StateTransition;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.ParserContext;

spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/FlowParser.java

@@ -18,8 +18,8 @@ package org.springframework.batch.core.configuration.xml;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.springframework.batch.flow.Flow;
-import org.springframework.batch.flow.SimpleFlow;
+import org.springframework.batch.core.job.flow.Flow;
+import org.springframework.batch.core.job.flow.SimpleFlow;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;

spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/SplitParser.java

@@ -20,8 +20,8 @@ import java.util.Collection;
 import java.util.List;
 
 import org.springframework.batch.core.job.flow.JobExecutionDecider;
-import org.springframework.batch.flow.SplitState;
-import org.springframework.batch.flow.StateTransition;
+import org.springframework.batch.core.job.flow.SplitState;
+import org.springframework.batch.core.job.flow.StateTransition;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;

spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParser.java

@@ -22,8 +22,8 @@ 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.flow.StateTransition;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.RuntimeBeanReference;

spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/AbstractState.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.flow;
+package org.springframework.batch.core.job.flow;
 
 
 /**

spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/DecisionState.java

@@ -1,6 +1,5 @@
 package org.springframework.batch.core.job.flow;
 
-import org.springframework.batch.flow.AbstractState;
 
 /**
  * @author Dave Syer

spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/EndState.java

@@ -2,9 +2,6 @@ package org.springframework.batch.core.job.flow;
 
 import org.springframework.batch.core.BatchStatus;
 import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.flow.AbstractState;
-import org.springframework.batch.flow.FlowExecution;
-import org.springframework.batch.flow.State;
 
 /**
  * {@link State} implementation for ending a job if it is in progress and

spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/Flow.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.flow;
+package org.springframework.batch.core.job.flow;
 
 
 /**

spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecution.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.flow;
+package org.springframework.batch.core.job.flow;
 
 /**
  * @author Dave Syer

spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecutionAggregator.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.flow;
+package org.springframework.batch.core.job.flow;
 
 import java.util.Collection;
 

spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecutionException.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.flow;
+package org.springframework.batch.core.job.flow;
 
 /**
  * @author Dave Syer

spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecutionListener.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.flow;
+package org.springframework.batch.core.job.flow;
 
 /**
  * @author Dave Syer

spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecutionListenerSupport.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.flow;
+package org.springframework.batch.core.job.flow;
 
 /**
  * @author Dave Syer

spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowJob.java

@@ -23,10 +23,6 @@ import org.springframework.batch.core.Step;
 import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.job.AbstractJob;
 import org.springframework.batch.core.repository.JobRestartException;
-import org.springframework.batch.flow.Flow;
-import org.springframework.batch.flow.FlowExecution;
-import org.springframework.batch.flow.FlowExecutionException;
-import org.springframework.batch.flow.FlowExecutionListenerSupport;
 import org.springframework.util.Assert;
 
 

spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/JobFlowExecutor.java

@@ -21,7 +21,6 @@ import org.springframework.batch.core.StartLimitExceededException;
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.repository.JobRestartException;
-import org.springframework.batch.flow.Flow;
 
 /**
  * Context and execution strategy for {@link FlowJob} to allow it to delegate

spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/MaxValueFlowExecutionAggregator.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.flow;
+package org.springframework.batch.core.job.flow;
 
 import java.util.Collection;
 import java.util.Collections;

spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/PatternMatcher.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.flow;
+package org.springframework.batch.core.job.flow;
 
 /**
  * @author Dave Syer

spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/PauseState.java

@@ -2,8 +2,6 @@ package org.springframework.batch.core.job.flow;
 
 import org.springframework.batch.core.BatchStatus;
 import org.springframework.batch.core.JobExecution;
-import org.springframework.batch.flow.AbstractState;
-import org.springframework.batch.flow.FlowExecution;
 
 /**
  * @author Dave Syer

spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/SimpleFlow.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.flow;
+package org.springframework.batch.core.job.flow;
 
 import java.util.Collection;
 import java.util.HashMap;

spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/SplitState.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.flow;
+package org.springframework.batch.core.job.flow;
 
 import java.util.ArrayList;
 import java.util.Collection;

spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/State.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.flow;
+package org.springframework.batch.core.job.flow;
 
 
 /**

spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/StateTransition.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.flow;
+package org.springframework.batch.core.job.flow;
 
 import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.util.StringUtils;

spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/StepState.java

@@ -1,8 +1,6 @@
 package org.springframework.batch.core.job.flow;
 
 import org.springframework.batch.core.Step;
-import org.springframework.batch.flow.AbstractState;
-import org.springframework.batch.flow.State;
 
 /**
  * {@link State} implementation that delegates to a {@link JobFlowExecutor} to

spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/BasicFlowTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.flow;
+package org.springframework.batch.core.job.flow;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -25,10 +25,11 @@ import java.util.Collections;
 import java.util.List;
 
 import org.junit.Test;
-import org.springframework.batch.flow.FlowExecution;
-import org.springframework.batch.flow.FlowExecutionException;
-import org.springframework.batch.flow.SimpleFlow;
-import org.springframework.batch.flow.StateTransition;
+import org.springframework.batch.core.job.flow.FlowExecution;
+import org.springframework.batch.core.job.flow.FlowExecutionException;
+import org.springframework.batch.core.job.flow.FlowExecutionListenerSupport;
+import org.springframework.batch.core.job.flow.SimpleFlow;
+import org.springframework.batch.core.job.flow.StateTransition;
 
 /**
  * @author Dave Syer

spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowExecutionExceptionTests.java

@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.flow;
+package org.springframework.batch.core.job.flow;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
+import org.springframework.batch.core.job.flow.FlowExecutionException;
 
 /**
  * @author Dave Syer

spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowExecutionTests.java

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.flow;
+package org.springframework.batch.core.job.flow;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
-import org.springframework.batch.flow.FlowExecution;
+import org.springframework.batch.core.job.flow.FlowExecution;
 
 /**
  * @author Dave Syer

spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowJobTests.java

@@ -35,8 +35,6 @@ import org.springframework.batch.core.UnexpectedJobExecutionException;
 import org.springframework.batch.core.repository.JobRepository;
 import org.springframework.batch.core.repository.support.MapJobRepositoryFactoryBean;
 import org.springframework.batch.core.step.StepSupport;
-import org.springframework.batch.flow.SimpleFlow;
-import org.springframework.batch.flow.StateTransition;
 import org.springframework.batch.repeat.ExitStatus;
 import org.springframework.batch.support.transaction.ResourcelessTransactionManager;
 

spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/JobFlowExecutorSupport.java

@@ -21,7 +21,6 @@ import org.springframework.batch.core.StartLimitExceededException;
 import org.springframework.batch.core.Step;
 import org.springframework.batch.core.StepExecution;
 import org.springframework.batch.core.repository.JobRestartException;
-import org.springframework.batch.flow.FlowExecution;
 
 /**
  * @author Dave Syer

spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/SimpleFlowExecutionAggregatorTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.flow;
+package org.springframework.batch.core.job.flow;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -22,8 +22,8 @@ import java.util.Arrays;
 import java.util.Collections;
 
 import org.junit.Test;
-import org.springframework.batch.flow.FlowExecution;
-import org.springframework.batch.flow.MaxValueFlowExecutionAggregator;
+import org.springframework.batch.core.job.flow.FlowExecution;
+import org.springframework.batch.core.job.flow.MaxValueFlowExecutionAggregator;
 
 /**
  * @author Dave Syer

spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/SplitStateTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.flow;
+package org.springframework.batch.core.job.flow;
 
 import static org.junit.Assert.assertEquals;
 
@@ -22,9 +22,9 @@ import java.util.Collection;
 
 import org.easymock.EasyMock;
 import org.junit.Test;
-import org.springframework.batch.flow.Flow;
-import org.springframework.batch.flow.FlowExecution;
-import org.springframework.batch.flow.SplitState;
+import org.springframework.batch.core.job.flow.Flow;
+import org.springframework.batch.core.job.flow.FlowExecution;
+import org.springframework.batch.core.job.flow.SplitState;
 import org.springframework.core.task.SimpleAsyncTaskExecutor;
 
 

spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/StateSupport.java

@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.flow;
+package org.springframework.batch.core.job.flow;
 
-import org.springframework.batch.flow.AbstractState;
-import org.springframework.batch.flow.FlowExecution;
+import org.springframework.batch.core.job.flow.AbstractState;
+import org.springframework.batch.core.job.flow.FlowExecution;
+import org.springframework.batch.core.job.flow.State;
 
 /**
  * Base class for {@link State} implementations.

spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/StateTransitionTests.java

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.batch.flow;
+package org.springframework.batch.core.job.flow;
 
 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.flow.StateTransition;
+import org.springframework.batch.core.job.flow.StateTransition;
 
 /**
  * @author Dave Syer

src/site/apt/cases/pause.apt

@@ -16,8 +16,8 @@ Use Case: Pause and Resume Job Execution
   manual verification of business condition before continuing - a
   sanity check on critical data.  Assume that a job execution could
   receive hundreds of resume signals, and this is a "normal"
-  situation. It does not look like a horrible mess if we look at the
-  history of the execution - e.g. like hundreds of restarts.
+  situation, so it does not create a horrible mess in the history of
+  the execution - e.g. looking like hundreds of restarts.
 
 * Scope