diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/JobContext.java b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/JsrJobContext.java similarity index 97% rename from spring-batch-core/src/main/java/org/springframework/batch/core/jsr/JobContext.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/jsr/JsrJobContext.java index fec0f38d1..e98104662 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/JobContext.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/JsrJobContext.java @@ -33,7 +33,7 @@ import org.springframework.util.Assert; * @author Chris Schaefer * @since 3.0 */ -public class JobContext implements javax.batch.runtime.context.JobContext { +public class JsrJobContext implements javax.batch.runtime.context.JobContext { private Object transientUserData; private Properties properties; private JobExecution jobExecution; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/JobContextFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/JsrJobContextFactoryBean.java similarity index 95% rename from spring-batch-core/src/main/java/org/springframework/batch/core/jsr/JobContextFactoryBean.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/jsr/JsrJobContextFactoryBean.java index 7994c25e4..65df3c567 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/JobContextFactoryBean.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/JsrJobContextFactoryBean.java @@ -40,7 +40,7 @@ import org.springframework.util.Assert; * @author Michael Minella * @since 3.0 */ -public class JobContextFactoryBean implements FactoryBean { +public class JsrJobContextFactoryBean implements FactoryBean { private JobExecution jobExecution; @Autowired @@ -116,7 +116,7 @@ public class JobContextFactoryBean implements FactoryBean { throw new FactoryBeanNotInitializedException("A JobExecution is required"); } - org.springframework.batch.core.jsr.JobContext jobContext = new org.springframework.batch.core.jsr.JobContext(); + JsrJobContext jobContext = new JsrJobContext(); jobContext.setJobExecution(jobExecution); if(propertyContext != null) { diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/JobExecution.java b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/JsrJobExecution.java similarity index 92% rename from spring-batch-core/src/main/java/org/springframework/batch/core/jsr/JobExecution.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/jsr/JsrJobExecution.java index 16541e54e..60b093b49 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/JobExecution.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/JsrJobExecution.java @@ -25,12 +25,12 @@ import org.springframework.util.Assert; /** * Wrapper class to adapt the {@link javax.batch.runtime.JobExecution} to - * a {@link JobExecution}. + * a {@link org.springframework.batch.core.JobExecution}. * * @author Michael Minella * @since 3.0 */ -public class JobExecution implements javax.batch.runtime.JobExecution { +public class JsrJobExecution implements javax.batch.runtime.JobExecution { private org.springframework.batch.core.JobExecution execution; private JobParametersConverter parametersConverter; @@ -38,7 +38,7 @@ public class JobExecution implements javax.batch.runtime.JobExecution { /** * @param execution for all information to be delegated from */ - public JobExecution(org.springframework.batch.core.JobExecution execution, JobParametersConverter parametersConverter) { + public JsrJobExecution(org.springframework.batch.core.JobExecution execution, JobParametersConverter parametersConverter) { Assert.notNull(execution, "A JobExecution is required"); this.execution = execution; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/StepContext.java b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/JsrStepContext.java similarity index 97% rename from spring-batch-core/src/main/java/org/springframework/batch/core/jsr/StepContext.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/jsr/JsrStepContext.java index d3d915d87..3bab12bc3 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/StepContext.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/JsrStepContext.java @@ -38,15 +38,15 @@ import org.springframework.util.ClassUtils; * @author Chris Schaefer * @since 3.0 */ -public class StepContext implements javax.batch.runtime.context.StepContext { +public class JsrStepContext implements javax.batch.runtime.context.StepContext { private final static String PERSISTENT_USER_DATA_KEY = "batch_jsr_persistentUserData"; private StepExecution stepExecution; private Object transientUserData; private Properties properties = new Properties(); private AtomicBoolean exitStatusSet = new AtomicBoolean(); - private final ExecutionContextUserSupport executionContextUserSupport = new ExecutionContextUserSupport(ClassUtils.getShortName(StepContext.class)); + private final ExecutionContextUserSupport executionContextUserSupport = new ExecutionContextUserSupport(ClassUtils.getShortName(JsrStepContext.class)); - public StepContext(StepExecution stepExecution, Properties properties) { + public JsrStepContext(StepExecution stepExecution, Properties properties) { Assert.notNull(stepExecution, "A StepExecution is required"); this.stepExecution = stepExecution; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/StepContextFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/JsrStepContextFactoryBean.java similarity index 91% rename from spring-batch-core/src/main/java/org/springframework/batch/core/jsr/StepContextFactoryBean.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/jsr/JsrStepContextFactoryBean.java index 94edb84ca..e8dcfb2e7 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/StepContextFactoryBean.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/JsrStepContextFactoryBean.java @@ -35,7 +35,7 @@ import org.springframework.util.Assert; * @author Chris Schaefer * @since 3.0 */ -public class StepContextFactoryBean implements FactoryBean, InitializingBean { +public class JsrStepContextFactoryBean implements FactoryBean, InitializingBean { @Autowired private BatchPropertyContext batchPropertyContext; @@ -74,9 +74,9 @@ public class StepContextFactoryBean implements FactoryBean, Initial Properties stepProperties = batchPropertyContext.getStepProperties(curStepExecution.getStepName()); if(stepProperties != null) { - context = new org.springframework.batch.core.jsr.StepContext(curStepExecution, stepProperties); + context = new JsrStepContext(curStepExecution, stepProperties); } else { - context = new org.springframework.batch.core.jsr.StepContext(curStepExecution, new Properties()); + context = new JsrStepContext(curStepExecution, new Properties()); } contextHolder.set(context); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/StepExecution.java b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/JsrStepExecution.java similarity index 80% rename from spring-batch-core/src/main/java/org/springframework/batch/core/jsr/StepExecution.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/jsr/JsrStepExecution.java index 3fc971565..5aaceb0f4 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/StepExecution.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/JsrStepExecution.java @@ -27,32 +27,32 @@ import org.springframework.util.Assert; import org.springframework.util.ClassUtils; /** - * Implementation of the StepExecution as defined in JSR-352. This implementation + * Implementation of the JsrStepExecution as defined in JSR-352. This implementation * wraps a {@link org.springframework.batch.core.StepExecution} as it's source of * data. * * @author Michael Minella * @since 3.0 */ -public class StepExecution implements javax.batch.runtime.StepExecution{ +public class JsrStepExecution implements javax.batch.runtime.StepExecution{ private final static String PERSISTENT_USER_DATA_KEY = "batch_jsr_persistentUserData"; private final org.springframework.batch.core.StepExecution stepExecution; - // The API for the persistent user data is handled by the StepContext which is why the name here is based on the StepContext. - private final ExecutionContextUserSupport executionContextUserSupport = new ExecutionContextUserSupport(ClassUtils.getShortName(StepContext.class)); + // The API for the persistent user data is handled by the JsrStepContext which is why the name here is based on the JsrStepContext. + private final ExecutionContextUserSupport executionContextUserSupport = new ExecutionContextUserSupport(ClassUtils.getShortName(JsrStepContext.class)); /** * @param stepExecution The {@link org.springframework.batch.core.StepExecution} used * as the basis for the data. */ - public StepExecution(org.springframework.batch.core.StepExecution stepExecution) { + public JsrStepExecution(org.springframework.batch.core.StepExecution stepExecution) { Assert.notNull(stepExecution, "A StepExecution is required"); this.stepExecution = stepExecution; } /* (non-Javadoc) - * @see javax.batch.runtime.StepExecution#getStepExecutionId() + * @see javax.batch.runtime.JsrStepExecution#getStepExecutionId() */ @Override public long getStepExecutionId() { @@ -60,7 +60,7 @@ public class StepExecution implements javax.batch.runtime.StepExecution{ } /* (non-Javadoc) - * @see javax.batch.runtime.StepExecution#getStepName() + * @see javax.batch.runtime.JsrStepExecution#getStepName() */ @Override public String getStepName() { @@ -68,7 +68,7 @@ public class StepExecution implements javax.batch.runtime.StepExecution{ } /* (non-Javadoc) - * @see javax.batch.runtime.StepExecution#getBatchStatus() + * @see javax.batch.runtime.JsrStepExecution#getBatchStatus() */ @Override public BatchStatus getBatchStatus() { @@ -76,7 +76,7 @@ public class StepExecution implements javax.batch.runtime.StepExecution{ } /* (non-Javadoc) - * @see javax.batch.runtime.StepExecution#getStartTime() + * @see javax.batch.runtime.JsrStepExecution#getStartTime() */ @Override public Date getStartTime() { @@ -84,7 +84,7 @@ public class StepExecution implements javax.batch.runtime.StepExecution{ } /* (non-Javadoc) - * @see javax.batch.runtime.StepExecution#getEndTime() + * @see javax.batch.runtime.JsrStepExecution#getEndTime() */ @Override public Date getEndTime() { @@ -92,7 +92,7 @@ public class StepExecution implements javax.batch.runtime.StepExecution{ } /* (non-Javadoc) - * @see javax.batch.runtime.StepExecution#getExitStatus() + * @see javax.batch.runtime.JsrStepExecution#getExitStatus() */ @Override public String getExitStatus() { @@ -106,7 +106,7 @@ public class StepExecution implements javax.batch.runtime.StepExecution{ } /* (non-Javadoc) - * @see javax.batch.runtime.StepExecution#getPersistentUserData() + * @see javax.batch.runtime.JsrStepExecution#getPersistentUserData() */ @Override public Serializable getPersistentUserData() { @@ -114,7 +114,7 @@ public class StepExecution implements javax.batch.runtime.StepExecution{ } /* (non-Javadoc) - * @see javax.batch.runtime.StepExecution#getMetrics() + * @see javax.batch.runtime.JsrStepExecution#getMetrics() */ @Override public Metric[] getMetrics() { diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/FlowParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/FlowParser.java index fc457c6f1..4daf50081 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/FlowParser.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/FlowParser.java @@ -25,7 +25,7 @@ import java.util.Set; import org.springframework.batch.core.configuration.xml.AbstractFlowParser; import org.springframework.batch.core.job.flow.FlowExecutionStatus; -import org.springframework.batch.core.jsr.job.flow.support.DefaultFlow; +import org.springframework.batch.core.jsr.job.flow.support.JsrFlow; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.ManagedList; @@ -79,7 +79,7 @@ public class FlowParser extends AbstractFlowParser { protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { builder.getRawBeanDefinition().setAttribute("flowName", flowName); builder.addPropertyValue("name", flowName); - builder.addPropertyValue("flowType", DefaultFlow.class); + builder.addPropertyValue("flowType", JsrFlow.class); List stateTransitions = new ArrayList(); @@ -94,9 +94,9 @@ public class FlowParser extends AbstractFlowParser { if (nodeName.equals(STEP_ELE)) { stateTransitions.addAll(stepParser.parse(child, parserContext, builder)); } else if(nodeName.equals(SPLIT_ELE)) { - stateTransitions.addAll(new SplitParser(flowName).parse(child, parserContext)); + stateTransitions.addAll(new JsrSplitParser(flowName).parse(child, parserContext)); } else if(nodeName.equals(DECISION_ELE)) { - stateTransitions.addAll(new DecisionParser().parse(child, parserContext, flowName)); + stateTransitions.addAll(new JsrDecisionParser().parse(child, parserContext, flowName)); } else if(nodeName.equals(FLOW_ELE)) { stateTransitions.addAll(parseFlow(child, parserContext, builder)); } @@ -229,7 +229,7 @@ public class FlowParser extends AbstractFlowParser { if (status.isEnd()) { BeanDefinitionBuilder endBuilder = BeanDefinitionBuilder - .genericBeanDefinition("org.springframework.batch.core.jsr.job.flow.support.state.EndState"); + .genericBeanDefinition("org.springframework.batch.core.jsr.job.flow.support.state.JsrEndState"); boolean exitCodeExists = StringUtils.hasText(exitCode); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/DecisionParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/JsrDecisionParser.java similarity index 97% rename from spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/DecisionParser.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/JsrDecisionParser.java index 8c04da538..f42880452 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/DecisionParser.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/JsrDecisionParser.java @@ -19,7 +19,7 @@ import java.util.Collection; import org.springframework.batch.core.job.flow.JobExecutionDecider; import org.springframework.batch.core.jsr.configuration.support.BatchArtifact; -import org.springframework.batch.core.jsr.job.flow.support.state.StepState; +import org.springframework.batch.core.jsr.job.flow.support.state.JsrStepState; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.RuntimeBeanReference; import org.springframework.beans.factory.parsing.BeanComponentDefinition; @@ -37,7 +37,7 @@ import org.w3c.dom.Element; * @author Chris Schaefer * @since 3.0 */ -public class DecisionParser { +public class JsrDecisionParser { private static final String ID_ATTRIBUTE = "id"; private static final String REF_ATTRIBUTE = "ref"; @@ -47,7 +47,7 @@ public class DecisionParser { AbstractBeanDefinition factoryDefinition = factoryBuilder.getRawBeanDefinition(); factoryDefinition.setBeanClass(DecisionStepFactoryBean.class); - BeanDefinitionBuilder stateBuilder = BeanDefinitionBuilder.genericBeanDefinition(StepState.class); + BeanDefinitionBuilder stateBuilder = BeanDefinitionBuilder.genericBeanDefinition(JsrStepState.class); String idAttribute = element.getAttribute(ID_ATTRIBUTE); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/JsrFlowFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/JsrFlowFactoryBean.java index 14d1f83b5..24e3a6f08 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/JsrFlowFactoryBean.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/JsrFlowFactoryBean.java @@ -17,10 +17,10 @@ package org.springframework.batch.core.jsr.configuration.xml; import org.springframework.batch.core.configuration.xml.SimpleFlowFactoryBean; import org.springframework.batch.core.job.flow.State; -import org.springframework.batch.core.jsr.job.flow.support.state.StepState; +import org.springframework.batch.core.jsr.job.flow.support.state.JsrStepState; /** - * Extension to the {@link SimpleFlowFactoryBean} that provides {@link StepState} + * Extension to the {@link SimpleFlowFactoryBean} that provides {@link org.springframework.batch.core.jsr.job.flow.support.state.JsrStepState} * implementations for JSR-352 based jobs. * * @author Michael Minella @@ -34,6 +34,6 @@ public class JsrFlowFactoryBean extends SimpleFlowFactoryBean { @Override protected State createNewStepState(State state, String oldName, String stateName) { - return new StepState(stateName, ((StepState) state).getStep(oldName)); + return new JsrStepState(stateName, ((JsrStepState) state).getStep(oldName)); } } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/JobListenerFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/JsrJobListenerFactoryBean.java similarity index 94% rename from spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/JobListenerFactoryBean.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/JsrJobListenerFactoryBean.java index 6db8ad29c..9f3bbd4e3 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/JobListenerFactoryBean.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/JsrJobListenerFactoryBean.java @@ -34,7 +34,7 @@ import org.springframework.beans.factory.FactoryBean; * @author Michael Minella * @since 3.0 */ -public class JobListenerFactoryBean extends org.springframework.batch.core.listener.JobListenerFactoryBean { +public class JsrJobListenerFactoryBean extends org.springframework.batch.core.listener.JobListenerFactoryBean { @Override public Class getObjectType() { diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/JobParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/JsrJobParser.java similarity index 89% rename from spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/JobParser.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/JsrJobParser.java index 3179aea50..633176fcf 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/JobParser.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/JsrJobParser.java @@ -16,7 +16,7 @@ package org.springframework.batch.core.jsr.configuration.xml; import org.springframework.batch.core.configuration.xml.CoreNamespaceUtils; -import org.springframework.batch.core.jsr.StepContextFactoryBean; +import org.springframework.batch.core.jsr.JsrStepContextFactoryBean; import org.springframework.batch.core.jsr.configuration.support.BatchArtifact; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.AbstractBeanDefinition; @@ -34,7 +34,7 @@ import org.w3c.dom.Element; * @author Chris Schaefer * @since 3.0 */ -public class JobParser extends AbstractSingleBeanDefinitionParser { +public class JsrJobParser extends AbstractSingleBeanDefinitionParser { private static final String ID_ATTRIBUTE = "id"; private static final String RESTARTABLE_ATTRIBUTE = "restartable"; @@ -66,13 +66,13 @@ public class JobParser extends AbstractSingleBeanDefinitionParser { BeanDefinition flowDef = new FlowParser(jobName, jobName).parse(element, parserContext); builder.addPropertyValue("flow", flowDef); - AbstractBeanDefinition stepContextBeanDefinition = BeanDefinitionBuilder.genericBeanDefinition(StepContextFactoryBean.class) + AbstractBeanDefinition stepContextBeanDefinition = BeanDefinitionBuilder.genericBeanDefinition(JsrStepContextFactoryBean.class) .getBeanDefinition(); stepContextBeanDefinition.setScope("step"); parserContext.getRegistry().registerBeanDefinition("stepContextFactory", stepContextBeanDefinition); - new ListenerParser(JobListenerFactoryBean.class, "jobExecutionListeners").parseListeners(element, parserContext, builder); + new ListenerParser(JsrJobListenerFactoryBean.class, "jobExecutionListeners").parseListeners(element, parserContext, builder); } } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/JsrNamespaceHandler.java b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/JsrNamespaceHandler.java index 6ea579671..29cf72129 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/JsrNamespaceHandler.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/JsrNamespaceHandler.java @@ -26,7 +26,7 @@ public class JsrNamespaceHandler extends NamespaceHandlerSupport { @Override public void init() { - this.registerBeanDefinitionParser("job", new JobParser()); + this.registerBeanDefinitionParser("job", new JsrJobParser()); this.registerBeanDefinitionParser("batch-artifacts", new BatchParser()); } } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/SplitParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/JsrSplitParser.java similarity index 96% rename from spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/SplitParser.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/JsrSplitParser.java index 4f06310c9..5c74d9345 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/SplitParser.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/JsrSplitParser.java @@ -36,13 +36,13 @@ import org.w3c.dom.Element; * @author Chris Schaefer * @since 3.0 */ -public class SplitParser { +public class JsrSplitParser { private static final String TASK_EXECUTOR_PROPERTY_NAME = "taskExecutor"; private static final String JSR_352_SPLIT_TASK_EXECUTOR_BEAN_NAME = "jsr352splitTaskExecutor"; private String jobFactoryRef; - public SplitParser(String jobFactoryRef) { + public JsrSplitParser(String jobFactoryRef) { this.jobFactoryRef = jobFactoryRef; } @@ -51,7 +51,7 @@ public class SplitParser { String idAttribute = element.getAttribute("id"); BeanDefinitionBuilder stateBuilder = BeanDefinitionBuilder - .genericBeanDefinition("org.springframework.batch.core.jsr.job.flow.support.state.SplitState"); + .genericBeanDefinition("org.springframework.batch.core.jsr.job.flow.support.state.JsrSplitState"); List flowElements = DomUtils.getChildElementsByTagName(element, "flow"); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/ListenerParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/ListenerParser.java index c09561f2d..568d85eff 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/ListenerParser.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/ListenerParser.java @@ -124,11 +124,11 @@ public class ListenerParser { } private boolean isLazyInit() { - return listenerType == JobListenerFactoryBean.class; + return listenerType == JsrJobListenerFactoryBean.class; } private String getListenerScope() { - if (listenerType == JobListenerFactoryBean.class) { + if (listenerType == JsrJobListenerFactoryBean.class) { return SCOPE_JOB; } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/StepParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/StepParser.java index f93150814..2170c8f31 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/StepParser.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/StepParser.java @@ -18,7 +18,7 @@ package org.springframework.batch.core.jsr.configuration.xml; import java.util.Collection; import org.springframework.batch.core.jsr.configuration.support.BatchArtifact; -import org.springframework.batch.core.jsr.job.flow.support.state.StepState; +import org.springframework.batch.core.jsr.job.flow.support.state.JsrStepState; import org.springframework.batch.core.listener.StepListenerFactoryBean; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.RuntimeBeanReference; @@ -54,7 +54,7 @@ public class StepParser extends AbstractSingleBeanDefinitionParser { bd.setBeanClass(StepFactoryBean.class); bd.getPropertyValues().addPropertyValue("batchPropertyContext", new RuntimeBeanReference("batchPropertyContext")); - BeanDefinitionBuilder stateBuilder = BeanDefinitionBuilder.genericBeanDefinition(StepState.class); + BeanDefinitionBuilder stateBuilder = BeanDefinitionBuilder.genericBeanDefinition(JsrStepState.class); String stepName = element.getAttribute(SPLIT_ID_ATTRIBUTE); builder.addPropertyValue("name", stepName); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/DefaultStepHandler.java b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/JsrStepHandler.java similarity index 96% rename from spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/DefaultStepHandler.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/JsrStepHandler.java index eb836edbd..a745da83d 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/DefaultStepHandler.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/JsrStepHandler.java @@ -40,16 +40,16 @@ import org.springframework.util.StringUtils; * @author Michael Minella * @since 3.0 */ -public class DefaultStepHandler extends SimpleStepHandler { +public class JsrStepHandler extends SimpleStepHandler { - private static final Log logger = LogFactory.getLog(DefaultStepHandler.class); + private static final Log logger = LogFactory.getLog(JsrStepHandler.class); private JobExplorer jobExplorer; /** * @param jobRepository */ - public DefaultStepHandler(JobRepository jobRepository, JobExplorer jobExplorer) { + public JsrStepHandler(JobRepository jobRepository, JobExplorer jobExplorer) { super(jobRepository, new ExecutionContext()); this.jobExplorer = jobExplorer; } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/JsrFlowJob.java b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/JsrFlowJob.java index 0b8af8fb7..757cf14fd 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/JsrFlowJob.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/JsrFlowJob.java @@ -29,9 +29,9 @@ import org.springframework.batch.core.job.flow.FlowJob; import org.springframework.batch.core.job.flow.JobFlowExecutor; import org.springframework.batch.core.job.flow.State; import org.springframework.batch.core.job.flow.support.state.FlowState; -import org.springframework.batch.core.jsr.job.DefaultStepHandler; -import org.springframework.batch.core.jsr.job.flow.support.DefaultFlow; -import org.springframework.batch.core.jsr.job.flow.support.state.StepState; +import org.springframework.batch.core.jsr.job.JsrStepHandler; +import org.springframework.batch.core.jsr.job.flow.support.JsrFlow; +import org.springframework.batch.core.jsr.job.flow.support.state.JsrStepState; import org.springframework.batch.core.jsr.step.DecisionStep; import org.springframework.batch.core.launch.NoSuchJobException; import org.springframework.batch.core.launch.support.ExitCodeMapper; @@ -73,9 +73,9 @@ public class JsrFlowJob extends FlowJob { protected void doExecute(final JobExecution execution) throws JobExecutionException { try { JobFlowExecutor executor = new JsrFlowExecutor(getJobRepository(), - new DefaultStepHandler(getJobRepository(), jobExplorer), execution); + new JsrStepHandler(getJobRepository(), jobExplorer), execution); - State startState = ((DefaultFlow)flow).getStartState(); + State startState = ((JsrFlow)flow).getStartState(); validateFirstStep(startState); @@ -94,9 +94,9 @@ public class JsrFlowJob extends FlowJob { while(true) { if(startState instanceof DelegateState) { startState = ((DelegateState) startState).getState(); - } else if(startState instanceof StepState) { + } else if(startState instanceof JsrStepState) { String stepName = startState.getName().substring(startState.getName().indexOf(".") + 1, startState.getName().length()); - Step step = ((StepState) startState).getStep(stepName); + Step step = ((JsrStepState) startState).getStep(stepName); if(step instanceof DecisionStep) { throw new JobExecutionException("Decision step is an invalid first step"); } else { diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/support/DefaultFlow.java b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/support/JsrFlow.java similarity index 96% rename from spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/support/DefaultFlow.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/support/JsrFlow.java index 295af79bd..783f0030d 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/support/DefaultFlow.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/support/JsrFlow.java @@ -27,7 +27,7 @@ import org.springframework.batch.core.job.flow.FlowExecutionStatus; import org.springframework.batch.core.job.flow.State; import org.springframework.batch.core.job.flow.support.SimpleFlow; import org.springframework.batch.core.job.flow.support.StateTransition; -import org.springframework.batch.core.jsr.job.flow.support.state.StepState; +import org.springframework.batch.core.jsr.job.flow.support.state.JsrStepState; import org.springframework.batch.item.ExecutionContext; import org.springframework.util.StringUtils; @@ -41,14 +41,14 @@ import org.springframework.util.StringUtils; * @author Michael Minella * @since 3.0 */ -public class DefaultFlow extends SimpleFlow { +public class JsrFlow extends SimpleFlow { - private StepState currentStep; + private JsrStepState currentStep; /** * @param name name of the flow */ - public DefaultFlow(String name) { + public JsrFlow(String name) { super(name); } @@ -66,8 +66,8 @@ public class DefaultFlow extends SimpleFlow { state = ((DelegateState) state).getState(); } - if(state instanceof StepState) { - currentStep = (StepState) state; + if(state instanceof JsrStepState) { + currentStep = (JsrStepState) state; } return super.isFlowContinued(state, status, stepExecution); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/support/state/EndState.java b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/support/state/JsrEndState.java similarity index 89% rename from spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/support/state/EndState.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/support/state/JsrEndState.java index c0b25b67d..0f6c5b9a7 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/support/state/EndState.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/support/state/JsrEndState.java @@ -32,7 +32,7 @@ import org.springframework.batch.item.ExecutionContext; * @author Michael Minella * @since 3.0 */ -public class EndState extends org.springframework.batch.core.job.flow.support.state.EndState { +public class JsrEndState extends org.springframework.batch.core.job.flow.support.state.EndState { private JobRepository jobRepository; private String restart; @@ -41,7 +41,7 @@ public class EndState extends org.springframework.batch.core.job.flow.support.st * @param status The {@link FlowExecutionStatus} to end with * @param name The name of the state */ - public EndState(FlowExecutionStatus status, String name) { + public JsrEndState(FlowExecutionStatus status, String name) { super(status, status.getName(), name); } @@ -49,7 +49,7 @@ public class EndState extends org.springframework.batch.core.job.flow.support.st * @param status The {@link FlowExecutionStatus} to end with * @param name The name of the state */ - public EndState(FlowExecutionStatus status, String code, String name) { + public JsrEndState(FlowExecutionStatus status, String code, String name) { super(status, code, name, false); } @@ -60,11 +60,11 @@ public class EndState extends org.springframework.batch.core.job.flow.support.st * marked as abandoned (if there is one) * */ - public EndState(FlowExecutionStatus status, String code, String name, boolean abandon) { + public JsrEndState(FlowExecutionStatus status, String code, String name, boolean abandon) { super(status, code, name, abandon); } - public EndState(FlowExecutionStatus status, String code, String name, String restart, boolean abandon, JobRepository jobRepository) { + public JsrEndState(FlowExecutionStatus status, String code, String name, String restart, boolean abandon, JobRepository jobRepository) { super(status, code, name, abandon); this.jobRepository = jobRepository; this.restart = restart; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/support/state/SplitState.java b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/support/state/JsrSplitState.java similarity index 89% rename from spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/support/state/SplitState.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/support/state/JsrSplitState.java index 2a8f767da..8fad9088a 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/support/state/SplitState.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/support/state/JsrSplitState.java @@ -24,7 +24,7 @@ import org.springframework.batch.core.job.flow.Flow; import org.springframework.batch.core.job.flow.FlowExecution; import org.springframework.batch.core.job.flow.FlowExecutionStatus; import org.springframework.batch.core.job.flow.FlowExecutor; -import org.springframework.batch.core.jsr.job.flow.support.DefaultFlow; +import org.springframework.batch.core.jsr.job.flow.support.JsrFlow; /** * JSR-352 states that artifacts cannot set the ExitStatus from within a split for a job. Because @@ -34,13 +34,13 @@ import org.springframework.batch.core.jsr.job.flow.support.DefaultFlow; * @author Michael Minella * @since 3.0 */ -public class SplitState extends org.springframework.batch.core.job.flow.support.state.SplitState { +public class JsrSplitState extends org.springframework.batch.core.job.flow.support.state.SplitState { /** * @param flows {@link Flow}s to be executed in parallel * @param name */ - public SplitState(Collection flows, String name) { + public JsrSplitState(Collection flows, String name) { super(flows, name); } @@ -56,7 +56,7 @@ public class SplitState extends org.springframework.batch.core.job.flow.support. List stepNames = new ArrayList(); for (Flow curFlow : getFlows()) { - DefaultFlow flow = (DefaultFlow) curFlow; + JsrFlow flow = (JsrFlow) curFlow; if(flow.getMostRecentStepName() != null) { stepNames.add(flow.getMostRecentStepName()); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/support/state/StepState.java b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/support/state/JsrStepState.java similarity index 90% rename from spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/support/state/StepState.java rename to spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/support/state/JsrStepState.java index 7ec541d00..4f92b8926 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/support/state/StepState.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/job/flow/support/state/JsrStepState.java @@ -28,12 +28,12 @@ import org.springframework.batch.core.job.flow.FlowExecutor; * @author Michael Minella * @since 3.0 */ -public class StepState extends org.springframework.batch.core.job.flow.support.state.StepState { +public class JsrStepState extends org.springframework.batch.core.job.flow.support.state.StepState { /** * @param step the step that will be executed */ - public StepState(Step step) { + public JsrStepState(Step step) { super(step); } @@ -41,7 +41,7 @@ public class StepState extends org.springframework.batch.core.job.flow.support.s * @param name for the step that will be executed * @param step the step that will be executed */ - public StepState(String name, Step step) { + public JsrStepState(String name, Step step) { super(name, step); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/launch/JsrJobOperator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/launch/JsrJobOperator.java index fe26b4701..a2af9eafe 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/launch/JsrJobOperator.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/launch/JsrJobOperator.java @@ -54,8 +54,10 @@ import org.springframework.batch.core.Step; import org.springframework.batch.core.configuration.DuplicateJobException; import org.springframework.batch.core.converter.JobParametersConverter; import org.springframework.batch.core.explore.JobExplorer; -import org.springframework.batch.core.jsr.JobContextFactoryBean; +import org.springframework.batch.core.jsr.JsrJobContextFactoryBean; +import org.springframework.batch.core.jsr.JsrJobExecution; import org.springframework.batch.core.jsr.JsrJobParametersConverter; +import org.springframework.batch.core.jsr.JsrStepExecution; import org.springframework.batch.core.jsr.configuration.xml.JsrXmlApplicationContext; import org.springframework.batch.core.repository.JobRepository; import org.springframework.batch.core.scope.context.StepSynchronizationManager; @@ -255,7 +257,7 @@ public class JsrJobOperator implements JobOperator, InitializingBean { throw new NoSuchJobExecutionException("No execution was found for executionId " + executionId); } - return new org.springframework.batch.core.jsr.JobExecution(jobExecution, jobParametersConverter); + return new JsrJobExecution(jobExecution, jobParametersConverter); } /* (non-Javadoc) @@ -277,7 +279,7 @@ public class JsrJobOperator implements JobOperator, InitializingBean { List results = new ArrayList(batchExecutions.size()); for (org.springframework.batch.core.JobExecution jobExecution : batchExecutions) { - results.add(new org.springframework.batch.core.jsr.JobExecution(jobExecution, jobParametersConverter)); + results.add(new JsrJobExecution(jobExecution, jobParametersConverter)); } return results; @@ -398,7 +400,7 @@ public class JsrJobOperator implements JobOperator, InitializingBean { if(executions != null) { for (org.springframework.batch.core.StepExecution stepExecution : executions) { if(!stepExecution.getStepName().contains(":partition")) { - batchExecutions.add(new org.springframework.batch.core.jsr.StepExecution(jobExplorer.getStepExecution(executionId, stepExecution.getId()))); + batchExecutions.add(new JsrStepExecution(jobExplorer.getStepExecution(executionId, stepExecution.getId()))); } } } @@ -465,7 +467,7 @@ public class JsrJobOperator implements JobOperator, InitializingBean { batchContext.load(jobXml); } - AbstractBeanDefinition beanDefinition = BeanDefinitionBuilder.genericBeanDefinition("org.springframework.batch.core.jsr.JobContextFactoryBean").getBeanDefinition(); + AbstractBeanDefinition beanDefinition = BeanDefinitionBuilder.genericBeanDefinition("org.springframework.batch.core.jsr.JsrJobContextFactoryBean").getBeanDefinition(); beanDefinition.setScope(BeanDefinition.SCOPE_SINGLETON); batchContext.registerBeanDefinition(JSR_JOB_CONTEXT_BEAN_NAME, beanDefinition); @@ -495,9 +497,9 @@ public class JsrJobOperator implements JobOperator, InitializingBean { @Override public void run() { - JobContextFactoryBean factoryBean = null; + JsrJobContextFactoryBean factoryBean = null; try { - factoryBean = (JobContextFactoryBean) batchContext.getBean("&" + JSR_JOB_CONTEXT_BEAN_NAME); + factoryBean = (JsrJobContextFactoryBean) batchContext.getBean("&" + JSR_JOB_CONTEXT_BEAN_NAME); factoryBean.setJobExecution(jobExecution); final Job job = batchContext.getBean(Job.class); @@ -597,7 +599,7 @@ public class JsrJobOperator implements JobOperator, InitializingBean { batchContext.load(jobXml); } - AbstractBeanDefinition beanDefinition = BeanDefinitionBuilder.genericBeanDefinition("org.springframework.batch.core.jsr.JobContextFactoryBean").getBeanDefinition(); + AbstractBeanDefinition beanDefinition = BeanDefinitionBuilder.genericBeanDefinition("org.springframework.batch.core.jsr.JsrJobContextFactoryBean").getBeanDefinition(); beanDefinition.setScope(BeanDefinition.SCOPE_SINGLETON); batchContext.registerBeanDefinition(JSR_JOB_CONTEXT_BEAN_NAME, beanDefinition); @@ -636,9 +638,9 @@ public class JsrJobOperator implements JobOperator, InitializingBean { @Override public void run() { - JobContextFactoryBean factoryBean = null; + JsrJobContextFactoryBean factoryBean = null; try { - factoryBean = (JobContextFactoryBean) batchContext.getBean("&" + JSR_JOB_CONTEXT_BEAN_NAME); + factoryBean = (JsrJobContextFactoryBean) batchContext.getBean("&" + JSR_JOB_CONTEXT_BEAN_NAME); factoryBean.setJobExecution(jobExecution); final Job job = batchContext.getBean(Job.class); semaphore.release(); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/step/DecisionStep.java b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/step/DecisionStep.java index 3ef72f6eb..55332d018 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/step/DecisionStep.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/step/DecisionStep.java @@ -24,6 +24,7 @@ import javax.batch.api.Decider; import org.springframework.batch.core.ExitStatus; import org.springframework.batch.core.Step; import org.springframework.batch.core.StepExecution; +import org.springframework.batch.core.jsr.JsrStepExecution; import org.springframework.batch.core.step.AbstractStep; import org.springframework.batch.item.ExecutionContext; @@ -58,7 +59,7 @@ public class DecisionStep extends AbstractStep { for (String stepName : stepNames) { StepExecution curStepExecution = getJobRepository().getLastStepExecution(stepExecution.getJobExecution().getJobInstance(), stepName); - stepExecutions.add(new org.springframework.batch.core.jsr.StepExecution(curStepExecution)); + stepExecutions.add(new JsrStepExecution(curStepExecution)); } } else { Collection currentRunStepExecutions = stepExecution.getJobExecution().getStepExecutions(); @@ -72,7 +73,7 @@ public class DecisionStep extends AbstractStep { } } - stepExecutions.add(new org.springframework.batch.core.jsr.StepExecution(lastExecution)); + stepExecutions.add(new JsrStepExecution(lastExecution)); } } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/JobContextFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/JsrJobContextFactoryBeanTests.java similarity index 96% rename from spring-batch-core/src/test/java/org/springframework/batch/core/jsr/JobContextFactoryBeanTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/jsr/JsrJobContextFactoryBeanTests.java index 7d2875b7f..ebbaa01db 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/JobContextFactoryBeanTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/JsrJobContextFactoryBeanTests.java @@ -39,15 +39,15 @@ import org.springframework.beans.factory.FactoryBeanNotInitializedException; import org.springframework.core.task.AsyncTaskExecutor; import org.springframework.core.task.SimpleAsyncTaskExecutor; -public class JobContextFactoryBeanTests { +public class JsrJobContextFactoryBeanTests { - private JobContextFactoryBean factoryBean; + private JsrJobContextFactoryBean factoryBean; private BatchPropertyContext propertyContext; @Before public void setUp() throws Exception { propertyContext = new BatchPropertyContext(); - factoryBean = new JobContextFactoryBean(); + factoryBean = new JsrJobContextFactoryBean(); } @After diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/JobContextTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/JsrJobContextTests.java similarity index 96% rename from spring-batch-core/src/test/java/org/springframework/batch/core/jsr/JobContextTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/jsr/JsrJobContextTests.java index 4e74d0cca..d58b0512f 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/JobContextTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/JsrJobContextTests.java @@ -32,9 +32,9 @@ import org.springframework.batch.core.JobInstance; import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.JobParametersBuilder; -public class JobContextTests { +public class JsrJobContextTests { - private JobContext context; + private JsrJobContext context; @Mock private JobExecution execution; @Mock @@ -47,7 +47,7 @@ public class JobContextTests { Properties properties = new Properties(); properties.put("jobLevelProperty1", "jobLevelValue1"); - context = new JobContext(); + context = new JsrJobContext(); context.setProperties(properties); context.setJobExecution(execution); @@ -56,7 +56,7 @@ public class JobContextTests { @Test(expected=IllegalArgumentException.class) public void testCreateWithNull() { - context = new JobContext(); + context = new JsrJobContext(); context.setJobExecution(null); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/JobExecutionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/JsrJobExecutionTests.java similarity index 89% rename from spring-batch-core/src/test/java/org/springframework/batch/core/jsr/JobExecutionTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/jsr/JsrJobExecutionTests.java index 116ade354..c87b739fe 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/JobExecutionTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/JsrJobExecutionTests.java @@ -15,9 +15,9 @@ import org.springframework.batch.core.JobParameters; import org.springframework.batch.core.JobParametersBuilder; import org.springframework.batch.core.converter.JobParametersConverterSupport; -public class JobExecutionTests { +public class JsrJobExecutionTests { - private JobExecution adapter; + private JsrJobExecution adapter; @Before public void setUp() throws Exception { @@ -36,12 +36,12 @@ public class JobExecutionTests { execution.setStatus(BatchStatus.FAILED); execution.setVersion(21); - adapter = new JobExecution(execution, new JobParametersConverterSupport()); + adapter = new JsrJobExecution(execution, new JobParametersConverterSupport()); } @Test(expected=IllegalArgumentException.class) public void testCreateWithNull() { - adapter = new JobExecution(null, new JobParametersConverterSupport()); + adapter = new JsrJobExecution(null, new JobParametersConverterSupport()); } @Test diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/StepContextFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/JsrStepContextFactoryBeanTests.java similarity index 97% rename from spring-batch-core/src/test/java/org/springframework/batch/core/jsr/StepContextFactoryBeanTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/jsr/JsrStepContextFactoryBeanTests.java index 5f3afc194..84f80fbae 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/StepContextFactoryBeanTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/JsrStepContextFactoryBeanTests.java @@ -28,9 +28,9 @@ import org.springframework.beans.factory.FactoryBeanNotInitializedException; import org.springframework.core.task.AsyncTaskExecutor; import org.springframework.core.task.SimpleAsyncTaskExecutor; -public class StepContextFactoryBeanTests { +public class JsrStepContextFactoryBeanTests { - private StepContextFactoryBean factory; + private JsrStepContextFactoryBean factory; @Mock private BatchPropertyContext propertyContext; @@ -46,7 +46,7 @@ public class StepContextFactoryBeanTests { @Before public void setUp() throws Exception { MockitoAnnotations.initMocks(this); - factory = new StepContextFactoryBean(); + factory = new JsrStepContextFactoryBean(); factory.setBatchPropertyContext(propertyContext); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/StepContextTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/JsrStepContextTests.java similarity index 95% rename from spring-batch-core/src/test/java/org/springframework/batch/core/jsr/StepContextTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/jsr/JsrStepContextTests.java index 1b40bf8c4..a4c4550fc 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/StepContextTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/JsrStepContextTests.java @@ -23,6 +23,7 @@ import static org.junit.Assert.fail; import java.util.Properties; import javax.batch.runtime.Metric; +import javax.batch.runtime.context.StepContext; import org.junit.Before; import org.junit.Test; @@ -35,12 +36,12 @@ import org.springframework.batch.item.ExecutionContext; import org.springframework.batch.item.util.ExecutionContextUserSupport; import org.springframework.util.ClassUtils; -public class StepContextTests { +public class JsrStepContextTests { private StepExecution stepExecution; private StepContext stepContext; private ExecutionContext executionContext; - private ExecutionContextUserSupport executionContextUserSupport = new ExecutionContextUserSupport(ClassUtils.getShortName(StepContext.class)); + private ExecutionContextUserSupport executionContextUserSupport = new ExecutionContextUserSupport(ClassUtils.getShortName(JsrStepContext.class)); @Before public void setUp() throws Exception { @@ -64,7 +65,7 @@ public class StepContextTests { Properties properties = new Properties(); properties.put("key", "value"); - stepContext = new StepContext(stepExecution, properties); + stepContext = new JsrStepContext(stepExecution, properties); stepContext.setTransientUserData("This is my transient data"); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/StepExecutionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/JsrStepExecutionTests.java similarity index 89% rename from spring-batch-core/src/test/java/org/springframework/batch/core/jsr/StepExecutionTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/jsr/JsrStepExecutionTests.java index 00055ca0e..9083ddf47 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/StepExecutionTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/JsrStepExecutionTests.java @@ -18,12 +18,12 @@ import org.springframework.batch.core.StepExecution; import org.springframework.batch.item.util.ExecutionContextUserSupport; import org.springframework.util.ClassUtils; -public class StepExecutionTests { +public class JsrStepExecutionTests { private StepExecution stepExecution; private javax.batch.runtime.StepExecution jsrStepExecution; - //The API that sets the persisted user data is on the StepContext so the key within the ExecutionContext is StepContext - private ExecutionContextUserSupport executionContextUserSupport = new ExecutionContextUserSupport(ClassUtils.getShortName(StepContext.class)); + //The API that sets the persisted user data is on the JsrStepContext so the key within the ExecutionContext is JsrStepContext + private ExecutionContextUserSupport executionContextUserSupport = new ExecutionContextUserSupport(ClassUtils.getShortName(JsrStepContext.class)); @Before public void setUp() throws Exception { @@ -45,12 +45,12 @@ public class StepExecutionTests { stepExecution.setEndTime(new Date(10000000)); stepExecution.getExecutionContext().put(executionContextUserSupport.getKey("batch_jsr_persistentUserData"), "persisted data"); - jsrStepExecution = new org.springframework.batch.core.jsr.StepExecution(stepExecution); + jsrStepExecution = new JsrStepExecution(stepExecution); } @Test(expected=IllegalArgumentException.class) public void testWithNullStepExecution() { - new org.springframework.batch.core.jsr.StepExecution(null); + new JsrStepExecution(null); } @Test diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/configuration/xml/DecisionParsingTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/configuration/xml/JsrDecisionParsingTests.java similarity index 97% rename from spring-batch-core/src/test/java/org/springframework/batch/core/jsr/configuration/xml/DecisionParsingTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/jsr/configuration/xml/JsrDecisionParsingTests.java index 5ab178c90..1f4fb96fb 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/configuration/xml/DecisionParsingTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/configuration/xml/JsrDecisionParsingTests.java @@ -32,7 +32,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @ContextConfiguration @RunWith(SpringJUnit4ClassRunner.class) -public class DecisionParsingTests { +public class JsrDecisionParsingTests { @Autowired public Job job; diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/configuration/xml/SplitParsingTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/configuration/xml/JsrSplitParsingTests.java similarity index 91% rename from spring-batch-core/src/test/java/org/springframework/batch/core/jsr/configuration/xml/SplitParsingTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/jsr/configuration/xml/JsrSplitParsingTests.java index 4d2d2af1d..68e7192c2 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/configuration/xml/SplitParsingTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/configuration/xml/JsrSplitParsingTests.java @@ -39,14 +39,14 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.core.task.SimpleAsyncTaskExecutor; -public class SplitParsingTests { +public class JsrSplitParsingTests { @Rule public ExpectedException expectedException = ExpectedException.none(); @Test public void test() throws Exception { - javax.batch.runtime.JobExecution execution = runJob("SplitParsingTests-context", null, 10000l); + javax.batch.runtime.JobExecution execution = runJob("JsrSplitParsingTests-context", null, 10000l); assertEquals(javax.batch.runtime.BatchStatus.COMPLETED, execution.getBatchStatus()); assertEquals("COMPLETED", execution.getExitStatus()); @@ -70,7 +70,7 @@ public class SplitParsingTests { public void testUserSpecifiedTaskExecutor() { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("/org/springframework/batch/core/jsr/configuration/xml/user-specified-split-task-executor-context.xml"); BeanDefinitionRegistry registry = (BeanDefinitionRegistry) context.getBeanFactory(); - PropertyValue propertyValue = new SplitParser(null).getSplitTaskExecutorPropertyValue(registry); + PropertyValue propertyValue = new JsrSplitParser(null).getSplitTaskExecutorPropertyValue(registry); RuntimeBeanReference runtimeBeanReferenceValue = (RuntimeBeanReference) propertyValue.getValue(); @@ -82,7 +82,7 @@ public class SplitParsingTests { public void testDefaultTaskExecutor() { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("/org/springframework/batch/core/jsr/configuration/xml/default-split-task-executor-context.xml"); BeanDefinitionRegistry registry = (BeanDefinitionRegistry) context.getBeanFactory(); - PropertyValue propertyValue = new SplitParser(null).getSplitTaskExecutorPropertyValue(registry); + PropertyValue propertyValue = new JsrSplitParser(null).getSplitTaskExecutorPropertyValue(registry); Assert.assertTrue("Task executor not an instance of SimpleAsyncTaskExecutor" , (propertyValue.getValue() instanceof SimpleAsyncTaskExecutor)); context.close(); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/configuration/xml/ListenerParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/configuration/xml/ListenerParserTests.java index fde9dcb48..993ba8d79 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/configuration/xml/ListenerParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/configuration/xml/ListenerParserTests.java @@ -56,7 +56,7 @@ public class ListenerParserTests { applicationContext.registerBeanDefinition("jobListener", newBeanDefinition); - ListenerParser listenerParser = new ListenerParser(JobListenerFactoryBean.class, "jobExecutionListeners"); + ListenerParser listenerParser = new ListenerParser(JsrJobListenerFactoryBean.class, "jobExecutionListeners"); listenerParser.applyListenerScope("jobListener", applicationContext); BeanDefinition beanDefinition = applicationContext.getBeanDefinition("jobListener"); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/job/flow/JsrFlowJobTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/job/flow/JsrFlowJobTests.java index 9517cb7c9..cf56b0d93 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/job/flow/JsrFlowJobTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/job/flow/JsrFlowJobTests.java @@ -52,7 +52,8 @@ import org.springframework.batch.core.job.flow.support.state.EndState; import org.springframework.batch.core.job.flow.support.state.FlowState; import org.springframework.batch.core.job.flow.support.state.SplitState; import org.springframework.batch.core.job.flow.support.state.StepState; -import org.springframework.batch.core.jsr.job.flow.support.DefaultFlow; +import org.springframework.batch.core.jsr.JsrStepExecution; +import org.springframework.batch.core.jsr.job.flow.support.JsrFlow; import org.springframework.batch.core.repository.JobRepository; import org.springframework.batch.core.repository.dao.JobExecutionDao; import org.springframework.batch.core.repository.support.MapJobRepositoryFactoryBean; @@ -94,7 +95,7 @@ public class JsrFlowJobTests { @Test public void testGetSteps() throws Exception { - SimpleFlow flow = new DefaultFlow("job"); + SimpleFlow flow = new JsrFlow("job"); List transitions = new ArrayList(); transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step1")), "step2")); transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step2")), "end0")); @@ -108,7 +109,7 @@ public class JsrFlowJobTests { @Test public void testTwoSteps() throws Exception { - SimpleFlow flow = new DefaultFlow("job"); + SimpleFlow flow = new JsrFlow("job"); List transitions = new ArrayList(); transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step1")), "step2")); StepState step2 = new StepState(new StubStep("step2")); @@ -127,7 +128,7 @@ public class JsrFlowJobTests { @Test public void testFailedStep() throws Exception { - SimpleFlow flow = new DefaultFlow("job"); + SimpleFlow flow = new JsrFlow("job"); List transitions = new ArrayList(); transitions.add(StateTransition.createStateTransition(new StateSupport("step1", FlowExecutionStatus.FAILED), "step2")); @@ -148,7 +149,7 @@ public class JsrFlowJobTests { @Test public void testFailedStepRestarted() throws Exception { - SimpleFlow flow = new DefaultFlow("job"); + SimpleFlow flow = new JsrFlow("job"); List transitions = new ArrayList(); transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step1")), "step2")); State step2State = new StateSupport("step2") { @@ -186,7 +187,7 @@ public class JsrFlowJobTests { @Test public void testStoppingStep() throws Exception { - SimpleFlow flow = new DefaultFlow("job"); + SimpleFlow flow = new JsrFlow("job"); List transitions = new ArrayList(); transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step1")), "step2")); State state2 = new StateSupport("step2", FlowExecutionStatus.FAILED); @@ -207,7 +208,7 @@ public class JsrFlowJobTests { @Test public void testInterrupted() throws Exception { - SimpleFlow flow = new DefaultFlow("job"); + SimpleFlow flow = new JsrFlow("job"); List transitions = new ArrayList(); transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step1") { @Override @@ -230,7 +231,7 @@ public class JsrFlowJobTests { @Test public void testUnknownStatusStopsJob() throws Exception { - SimpleFlow flow = new DefaultFlow("job"); + SimpleFlow flow = new JsrFlow("job"); List transitions = new ArrayList(); transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step1") { @Override @@ -255,9 +256,9 @@ public class JsrFlowJobTests { @Test public void testInterruptedSplit() throws Exception { - SimpleFlow flow = new DefaultFlow("job"); - SimpleFlow flow1 = new DefaultFlow("flow1"); - SimpleFlow flow2 = new DefaultFlow("flow2"); + SimpleFlow flow = new JsrFlow("job"); + SimpleFlow flow1 = new JsrFlow("flow1"); + SimpleFlow flow2 = new JsrFlow("flow2"); List transitions = new ArrayList(); transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step1") { @@ -301,7 +302,7 @@ public class JsrFlowJobTests { @Test public void testInterruptedException() throws Exception { - SimpleFlow flow = new DefaultFlow("job"); + SimpleFlow flow = new JsrFlow("job"); List transitions = new ArrayList(); transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step1") { @Override @@ -323,9 +324,9 @@ public class JsrFlowJobTests { @Test public void testInterruptedSplitException() throws Exception { - SimpleFlow flow = new DefaultFlow("job"); - SimpleFlow flow1 = new DefaultFlow("flow1"); - SimpleFlow flow2 = new DefaultFlow("flow2"); + SimpleFlow flow = new JsrFlow("job"); + SimpleFlow flow1 = new JsrFlow("flow1"); + SimpleFlow flow2 = new JsrFlow("flow2"); List transitions = new ArrayList(); transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step1") { @@ -358,7 +359,7 @@ public class JsrFlowJobTests { @Test public void testEndStateStopped() throws Exception { - SimpleFlow flow = new DefaultFlow("job"); + SimpleFlow flow = new JsrFlow("job"); List transitions = new ArrayList(); transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step1")), "end")); transitions.add(StateTransition @@ -377,7 +378,7 @@ public class JsrFlowJobTests { } public void testEndStateFailed() throws Exception { - SimpleFlow flow = new DefaultFlow("job"); + SimpleFlow flow = new JsrFlow("job"); List transitions = new ArrayList(); transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step1")), "end")); transitions @@ -398,7 +399,7 @@ public class JsrFlowJobTests { @Test public void testEndStateStoppedWithRestart() throws Exception { - SimpleFlow flow = new DefaultFlow("job"); + SimpleFlow flow = new JsrFlow("job"); List transitions = new ArrayList(); transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step1")), "end")); transitions.add(StateTransition @@ -426,7 +427,7 @@ public class JsrFlowJobTests { @Test public void testBranching() throws Exception { - SimpleFlow flow = new DefaultFlow("job"); + SimpleFlow flow = new JsrFlow("job"); List transitions = new ArrayList(); StepState step1 = new StepState(new StubStep("step1")); transitions.add(StateTransition.createStateTransition(step1, "step2")); @@ -452,7 +453,7 @@ public class JsrFlowJobTests { @Test public void testBasicFlow() throws Throwable { - SimpleFlow flow = new DefaultFlow("job"); + SimpleFlow flow = new JsrFlow("job"); List transitions = new ArrayList(); transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step")), "end0")); transitions.add(StateTransition.createEndStateTransition(new EndState(FlowExecutionStatus.COMPLETED, "end0"))); @@ -468,7 +469,7 @@ public class JsrFlowJobTests { @Test public void testDecisionFlow() throws Throwable { - SimpleFlow flow = new DefaultFlow("job"); + SimpleFlow flow = new JsrFlow("job"); Decider decider = new Decider() { @Override @@ -512,7 +513,7 @@ public class JsrFlowJobTests { @Test public void testDecisionFlowWithExceptionInDecider() throws Throwable { - SimpleFlow flow = new DefaultFlow("job"); + SimpleFlow flow = new JsrFlow("job"); JobExecutionDecider decider = new JobExecutionDecider() { @Override public FlowExecutionStatus decide(JobExecution jobExecution, StepExecution stepExecution) { @@ -555,7 +556,7 @@ public class JsrFlowJobTests { @Test public void testGetStepExists() throws Exception { - SimpleFlow flow = new DefaultFlow("job"); + SimpleFlow flow = new JsrFlow("job"); List transitions = new ArrayList(); transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step1")), "step2")); transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step2")), "end0")); @@ -572,7 +573,7 @@ public class JsrFlowJobTests { @Test public void testGetStepExistsWithPrefix() throws Exception { - SimpleFlow flow = new DefaultFlow("job"); + SimpleFlow flow = new JsrFlow("job"); List transitions = new ArrayList(); transitions.add(StateTransition.createStateTransition(new StepState("job.step", new StubStep("step")), "end0")); transitions.add(StateTransition.createEndStateTransition(new EndState(FlowExecutionStatus.COMPLETED, "end0"))); @@ -589,7 +590,7 @@ public class JsrFlowJobTests { @Test public void testGetStepNamesWithPrefix() throws Exception { - SimpleFlow flow = new DefaultFlow("job"); + SimpleFlow flow = new JsrFlow("job"); List transitions = new ArrayList(); transitions.add(StateTransition.createStateTransition(new StepState("job.step", new StubStep("step")), "end0")); transitions.add(StateTransition.createEndStateTransition(new EndState(FlowExecutionStatus.COMPLETED, "end0"))); @@ -604,7 +605,7 @@ public class JsrFlowJobTests { @Test public void testGetStepNotExists() throws Exception { - SimpleFlow flow = new DefaultFlow("job"); + SimpleFlow flow = new JsrFlow("job"); List transitions = new ArrayList(); transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step1")), "step2")); transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step2")), "end0")); @@ -620,7 +621,7 @@ public class JsrFlowJobTests { @Test public void testGetStepNotStepState() throws Exception { - SimpleFlow flow = new DefaultFlow("job"); + SimpleFlow flow = new JsrFlow("job"); List transitions = new ArrayList(); transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step1")), "step2")); transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step2")), "end0")); @@ -636,14 +637,14 @@ public class JsrFlowJobTests { @Test public void testGetStepNestedFlow() throws Exception { - SimpleFlow nested = new DefaultFlow("nested"); + SimpleFlow nested = new JsrFlow("nested"); List transitions = new ArrayList(); transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step2")), "end1")); transitions.add(StateTransition.createEndStateTransition(new EndState(FlowExecutionStatus.COMPLETED, "end1"))); nested.setStateTransitions(transitions); nested.afterPropertiesSet(); - SimpleFlow flow = new DefaultFlow("job"); + SimpleFlow flow = new JsrFlow("job"); transitions = new ArrayList(); transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step1")), "nested")); transitions.add(StateTransition.createStateTransition(new FlowState(nested, "nested"), "end0")); @@ -660,9 +661,9 @@ public class JsrFlowJobTests { @Test public void testGetStepSplitFlow() throws Exception { - SimpleFlow flow = new DefaultFlow("job"); - SimpleFlow flow1 = new DefaultFlow("flow1"); - SimpleFlow flow2 = new DefaultFlow("flow2"); + SimpleFlow flow = new JsrFlow("job"); + SimpleFlow flow1 = new JsrFlow("flow1"); + SimpleFlow flow2 = new JsrFlow("flow2"); List transitions = new ArrayList(); transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step1")), "end0")); @@ -725,7 +726,7 @@ public class JsrFlowJobTests { public void execute(StepExecution stepExecution) throws JobInterruptedException { stepExecution.setStatus(BatchStatus.COMPLETED); try { - stepExecution.setExitStatus(new ExitStatus(decider.decide(new javax.batch.runtime.StepExecution [] {new org.springframework.batch.core.jsr.StepExecution(stepExecution)}))); + stepExecution.setExitStatus(new ExitStatus(decider.decide(new javax.batch.runtime.StepExecution [] {new JsrStepExecution(stepExecution)}))); } catch (Exception e) { throw new RuntimeException(e); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/job/flow/support/DefaultFlowTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/job/flow/support/JsrFlowTests.java similarity index 96% rename from spring-batch-core/src/test/java/org/springframework/batch/core/jsr/job/flow/support/DefaultFlowTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/jsr/job/flow/support/JsrFlowTests.java index f72326239..64b98e8cd 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/job/flow/support/DefaultFlowTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/job/flow/support/JsrFlowTests.java @@ -31,12 +31,12 @@ import org.springframework.batch.core.job.flow.support.JobFlowExecutorSupport; import org.springframework.batch.core.job.flow.support.SimpleFlowTests; import org.springframework.batch.core.job.flow.support.StateTransition; -public class DefaultFlowTests extends SimpleFlowTests { +public class JsrFlowTests extends SimpleFlowTests { @Override @Before public void setUp() { - flow = new DefaultFlow("flow1"); + flow = new JsrFlow("flow1"); } @Test diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/job/flow/support/state/EndStateTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/job/flow/support/state/JsrEndStateTests.java similarity index 94% rename from spring-batch-core/src/test/java/org/springframework/batch/core/jsr/job/flow/support/state/EndStateTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/jsr/job/flow/support/state/JsrEndStateTests.java index f811a920e..21bc5d189 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/job/flow/support/state/EndStateTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/job/flow/support/state/JsrEndStateTests.java @@ -26,11 +26,11 @@ import org.junit.Test; import org.springframework.batch.core.jsr.JsrTestUtils; /** - * Tests for the JSR-352 version of {@link EndState} + * Tests for the JSR-352 version of {@link JsrEndState} * * @author Michael Minella */ -public class EndStateTests { +public class JsrEndStateTests { @Test public void test() throws Exception { diff --git a/spring-batch-core/src/test/resources/META-INF/batch-jobs/SplitParsingTests-context.xml b/spring-batch-core/src/test/resources/META-INF/batch-jobs/JsrSplitParsingTests-context.xml similarity index 92% rename from spring-batch-core/src/test/resources/META-INF/batch-jobs/SplitParsingTests-context.xml rename to spring-batch-core/src/test/resources/META-INF/batch-jobs/JsrSplitParsingTests-context.xml index 48b43b1e6..e57502cb7 100644 --- a/spring-batch-core/src/test/resources/META-INF/batch-jobs/SplitParsingTests-context.xml +++ b/spring-batch-core/src/test/resources/META-INF/batch-jobs/JsrSplitParsingTests-context.xml @@ -9,17 +9,17 @@ - + - + - + diff --git a/spring-batch-core/src/test/resources/META-INF/batch-jobs/jobWithEndTransition.xml b/spring-batch-core/src/test/resources/META-INF/batch-jobs/jobWithEndTransition.xml index 17f948608..d31dc6640 100644 --- a/spring-batch-core/src/test/resources/META-INF/batch-jobs/jobWithEndTransition.xml +++ b/spring-batch-core/src/test/resources/META-INF/batch-jobs/jobWithEndTransition.xml @@ -1,12 +1,12 @@ - + - + diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/jsr/configuration/xml/DecisionParsingTests-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/jsr/configuration/xml/JsrDecisionParsingTests-context.xml similarity index 96% rename from spring-batch-core/src/test/resources/org/springframework/batch/core/jsr/configuration/xml/DecisionParsingTests-context.xml rename to spring-batch-core/src/test/resources/org/springframework/batch/core/jsr/configuration/xml/JsrDecisionParsingTests-context.xml index b05a7fe20..b6dfd0f0d 100644 --- a/spring-batch-core/src/test/resources/org/springframework/batch/core/jsr/configuration/xml/DecisionParsingTests-context.xml +++ b/spring-batch-core/src/test/resources/org/springframework/batch/core/jsr/configuration/xml/JsrDecisionParsingTests-context.xml @@ -29,7 +29,7 @@ - +