diff --git a/archetypes/simple-cli/pom.xml b/archetypes/simple-cli/pom.xml index ad3ed2ae9..c9a6e712a 100644 --- a/archetypes/simple-cli/pom.xml +++ b/archetypes/simple-cli/pom.xml @@ -200,8 +200,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.5 - 1.5 + 1.6 + 1.6 diff --git a/spring-batch-core-tests/pom.xml b/spring-batch-core-tests/pom.xml index 2fcb89c9d..d505f1caf 100644 --- a/spring-batch-core-tests/pom.xml +++ b/spring-batch-core-tests/pom.xml @@ -12,18 +12,6 @@ ../spring-batch-parent - - tiger - - 1.5 - - - - stax - stax - - - default diff --git a/spring-batch-core/pom.xml b/spring-batch-core/pom.xml index c36143482..728ab88a2 100644 --- a/spring-batch-core/pom.xml +++ b/spring-batch-core/pom.xml @@ -12,24 +12,6 @@ 2.2.0.BUILD-SNAPSHOT ../spring-batch-parent - - - tiger - - 1.5 - - - - stax - stax - - - javax.annotation - jsr250-api - - - - org.springframework.batch diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/Entity.java b/spring-batch-core/src/main/java/org/springframework/batch/core/Entity.java index 4b7b95b10..2d26a4a22 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/Entity.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/Entity.java @@ -124,6 +124,7 @@ public class Entity implements Serializable { * * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { if (id == null) { return super.hashCode(); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/ExitStatus.java b/spring-batch-core/src/main/java/org/springframework/batch/core/ExitStatus.java index 8146a8c55..d0dc8980f 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/ExitStatus.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/ExitStatus.java @@ -139,6 +139,7 @@ public class ExitStatus implements Serializable, Comparable { * @param status an {@link ExitStatus} to compare * @return 1,0,-1 according to the severity and exit code */ + @Override public int compareTo(ExitStatus status) { if (severity(status) > severity(this)) { return -1; @@ -180,6 +181,7 @@ public class ExitStatus implements Serializable, Comparable { * * @see java.lang.Object#toString() */ + @Override public String toString() { return String.format("exitCode=%s;exitDescription=%s", exitCode, exitDescription); } @@ -189,6 +191,7 @@ public class ExitStatus implements Serializable, Comparable { * * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object obj) { if (obj == null) { return false; @@ -201,6 +204,7 @@ public class ExitStatus implements Serializable, Comparable { * * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { return toString().hashCode(); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/JobExecution.java b/spring-batch-core/src/main/java/org/springframework/batch/core/JobExecution.java index 328dda516..7603e45bf 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/JobExecution.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/JobExecution.java @@ -315,6 +315,7 @@ public class JobExecution extends Entity { * * @see org.springframework.batch.core.domain.Entity#toString() */ + @Override public String toString() { return super.toString() + String.format(", startTime=%s, endTime=%s, lastUpdated=%s, status=%s, exitStatus=%s, job=[%s]", @@ -332,4 +333,4 @@ public class JobExecution extends Entity { } } -} \ No newline at end of file +} diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/JobInstance.java b/spring-batch-core/src/main/java/org/springframework/batch/core/JobInstance.java index 86482451c..f9b7798bf 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/JobInstance.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/JobInstance.java @@ -65,6 +65,7 @@ public class JobInstance extends Entity { return jobName; } + @Override public String toString() { return super.toString() + ", JobParameters=[" + jobParameters + "]" + ", Job=[" + jobName + "]"; } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/JobParameter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/JobParameter.java index f774b303b..ea58bc929 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/JobParameter.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/JobParameter.java @@ -112,6 +112,7 @@ public class JobParameter implements Serializable { : parameter.toString()); } + @Override public int hashCode() { return 7 + 21 * (parameter == null ? parameterType.hashCode() : parameter.hashCode()); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/StepContribution.java b/spring-batch-core/src/main/java/org/springframework/batch/core/StepContribution.java index 171de9130..bbaba57dc 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/StepContribution.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/StepContribution.java @@ -186,6 +186,7 @@ public class StepContribution implements Serializable { * * @see java.lang.Object#toString() */ + @Override public String toString() { return "[StepContribution: read=" + readCount + ", written=" + writeCount + ", filtered=" + filterCount + ", readSkips=" + readSkipCount + ", writeSkips=" + writeSkipCount + ", processSkips=" diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/StepExecution.java b/spring-batch-core/src/main/java/org/springframework/batch/core/StepExecution.java index 4d46bb266..648a77ba3 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/StepExecution.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/StepExecution.java @@ -469,6 +469,7 @@ public class StepExecution extends Entity { * org.springframework.batch.container.common.domain.Entity#equals(java. * lang.Object) */ + @Override public boolean equals(Object obj) { Object jobExecutionId = getJobExecutionId(); @@ -495,6 +496,7 @@ public class StepExecution extends Entity { * * @see org.springframework.batch.container.common.domain.Entity#hashCode() */ + @Override public int hashCode() { Object jobExecutionId = getJobExecutionId(); Long id = getId(); @@ -502,6 +504,7 @@ public class StepExecution extends Entity { * (jobExecutionId != null ? jobExecutionId.hashCode() : 0) + 59 * (id != null ? id.hashCode() : 0); } + @Override public String toString() { return String.format(getSummary() + ", exitDescription=%s", exitStatus.getExitDescription()); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/ModularBatchConfiguration.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/ModularBatchConfiguration.java index 37d44d5e1..1d0230850 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/ModularBatchConfiguration.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/ModularBatchConfiguration.java @@ -47,16 +47,19 @@ public class ModularBatchConfiguration extends AbstractBatchConfiguration { private AutomaticJobRegistrar registrar = new AutomaticJobRegistrar(); + @Override @Bean public JobRepository jobRepository() throws Exception { return getConfigurer(configurers).getJobRepository(); } + @Override @Bean public JobLauncher jobLauncher() throws Exception { return getConfigurer(configurers).getJobLauncher(); } + @Override @Bean public PlatformTransactionManager transactionManager() throws Exception { return getConfigurer(configurers).getTransactionManager(); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/SimpleBatchConfiguration.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/SimpleBatchConfiguration.java index 65b1c2ce1..c1952959a 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/SimpleBatchConfiguration.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/SimpleBatchConfiguration.java @@ -58,21 +58,25 @@ public class SimpleBatchConfiguration extends AbstractBatchConfiguration { private AtomicReference transactionManager = new AtomicReference(); + @Override @Bean public JobRepository jobRepository() throws Exception { return createLazyProxy(jobRepository, JobRepository.class); } + @Override @Bean public JobLauncher jobLauncher() throws Exception { return createLazyProxy(jobLauncher, JobLauncher.class); } + @Override @Bean public JobRegistry jobRegistry() throws Exception { return createLazyProxy(jobRegistry, JobRegistry.class); } + @Override @Bean public PlatformTransactionManager transactionManager() throws Exception { return createLazyProxy(transactionManager, PlatformTransactionManager.class); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/ApplicationContextJobFactory.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/ApplicationContextJobFactory.java index b68b3cb94..a489cb9af 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/ApplicationContextJobFactory.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/ApplicationContextJobFactory.java @@ -48,6 +48,7 @@ public class ApplicationContextJobFactory implements JobFactory { * * @see org.springframework.batch.core.configuration.JobFactory#createJob() */ + @Override public final Job createJob() { return job; } @@ -57,6 +58,7 @@ public class ApplicationContextJobFactory implements JobFactory { * * @see JobFactory#getJobName() */ + @Override public String getJobName() { return job.getName(); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/DefaultJobLoader.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/DefaultJobLoader.java index 6acefcfc6..228a0ee98 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/DefaultJobLoader.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/DefaultJobLoader.java @@ -107,6 +107,7 @@ public class DefaultJobLoader implements JobLoader, InitializingBean { * * @see JobLoader#clear() */ + @Override public void clear() { for (ConfigurableApplicationContext context : contexts.values()) { if (context.isActive()) { @@ -119,6 +120,7 @@ public class DefaultJobLoader implements JobLoader, InitializingBean { contexts.clear(); } + @Override public Collection reload(ApplicationContextFactory factory) { // If the same factory is loaded twice the context can be closed @@ -140,6 +142,7 @@ public class DefaultJobLoader implements JobLoader, InitializingBean { } } + @Override public Collection load(ApplicationContextFactory factory) throws DuplicateJobException { return doLoad(factory, false); } @@ -268,6 +271,7 @@ public class DefaultJobLoader implements JobLoader, InitializingBean { } + @Override public void afterPropertiesSet() { Assert.notNull(jobRegistry, "Job registry could not be null."); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/GroupAwareJob.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/GroupAwareJob.java index 31af67c13..9a7cbbf22 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/GroupAwareJob.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/GroupAwareJob.java @@ -67,6 +67,7 @@ public class GroupAwareJob implements Job { this.delegate = delegate; } + @Override public void execute(JobExecution execution) { delegate.execute(execution); } @@ -77,18 +78,22 @@ public class GroupAwareJob implements Job { * * @see org.springframework.batch.core.Job#getName() */ + @Override public String getName() { return groupName==null ? delegate.getName() : groupName + SEPARATOR + delegate.getName(); } + @Override public boolean isRestartable() { return delegate.isRestartable(); } + @Override public JobParametersIncrementer getJobParametersIncrementer() { return delegate.getJobParametersIncrementer(); } + @Override public JobParametersValidator getJobParametersValidator() { return delegate.getJobParametersValidator(); } @@ -121,4 +126,4 @@ public class GroupAwareJob implements Job { return ClassUtils.getShortName(delegate.getClass()) + ": [name=" + getName() + "]"; } -} \ No newline at end of file +} diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/JobRegistryBeanPostProcessor.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/JobRegistryBeanPostProcessor.java index f8dccf717..59cf3f266 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/JobRegistryBeanPostProcessor.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/JobRegistryBeanPostProcessor.java @@ -88,6 +88,7 @@ public class JobRegistryBeanPostProcessor implements BeanPostProcessor, BeanFact * org.springframework.beans.factory.BeanFactoryAware#setBeanFactory(org * .springframework.beans.factory.BeanFactory) */ + @Override public void setBeanFactory(BeanFactory beanFactory) throws BeansException { if (beanFactory instanceof DefaultListableBeanFactory) { this.beanFactory = (DefaultListableBeanFactory) beanFactory; @@ -99,6 +100,7 @@ public class JobRegistryBeanPostProcessor implements BeanPostProcessor, BeanFact * * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() */ + @Override public void afterPropertiesSet() throws Exception { Assert.notNull(jobRegistry, "JobRegistry must not be null"); } @@ -108,6 +110,7 @@ public class JobRegistryBeanPostProcessor implements BeanPostProcessor, BeanFact * post processor. * @see org.springframework.beans.factory.DisposableBean#destroy() */ + @Override public void destroy() throws Exception { for (String name : jobNames) { logger.debug("Unregistering job: " + name); @@ -123,6 +126,7 @@ public class JobRegistryBeanPostProcessor implements BeanPostProcessor, BeanFact * @see org.springframework.beans.factory.config.BeanPostProcessor#postProcessAfterInitialization(java.lang.Object, * java.lang.String) */ + @Override public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { if (bean instanceof Job) { Job job = (Job) bean; @@ -165,6 +169,7 @@ public class JobRegistryBeanPostProcessor implements BeanPostProcessor, BeanFact * @see org.springframework.beans.factory.config.BeanPostProcessor#postProcessBeforeInitialization(java.lang.Object, * java.lang.String) */ + @Override public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { return bean; } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/MapJobRegistry.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/MapJobRegistry.java index 0787440d0..f97c26ece 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/MapJobRegistry.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/MapJobRegistry.java @@ -41,6 +41,7 @@ public class MapJobRegistry implements JobRegistry { // The "final" ensures that it is visible and initialized when the constructor resolves. private final ConcurrentMap map = new ConcurrentHashMap(); + @Override public void register(JobFactory jobFactory) throws DuplicateJobException { Assert.notNull(jobFactory); String name = jobFactory.getJobName(); @@ -52,11 +53,13 @@ public class MapJobRegistry implements JobRegistry { } } + @Override public void unregister(String name) { Assert.notNull(name, "Job configuration must have a name."); map.remove(name); } + @Override public Job getJob(String name) throws NoSuchJobException { JobFactory factory = map.get(name); if (factory == null) { @@ -69,6 +72,7 @@ public class MapJobRegistry implements JobRegistry { /** * Provides an unmodifiable view of the job names. */ + @Override public Set getJobNames() { return Collections.unmodifiableSet(map.keySet()); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/MapStepRegistry.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/MapStepRegistry.java index d4d4dffc2..0fc7ca50c 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/MapStepRegistry.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/MapStepRegistry.java @@ -24,6 +24,7 @@ public class MapStepRegistry implements StepRegistry { private final ConcurrentMap> map = new ConcurrentHashMap>(); + @Override public void register(String jobName, Collection steps) throws DuplicateJobException { Assert.notNull(jobName, "The job name cannot be null."); Assert.notNull(steps, "The job steps cannot be null."); @@ -40,11 +41,13 @@ public class MapStepRegistry implements StepRegistry { } } + @Override public void unregisterStepsFromJob(String jobName) { Assert.notNull(jobName, "Job configuration must have a name."); map.remove(jobName); } + @Override public Step getStep(String jobName, String stepName) throws NoSuchJobException { Assert.notNull(jobName, "The job name cannot be null."); Assert.notNull(stepName, "The step name cannot be null."); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/OsgiBundleXmlApplicationContextFactory.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/OsgiBundleXmlApplicationContextFactory.java index e83d7fc3c..df4d62484 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/OsgiBundleXmlApplicationContextFactory.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/OsgiBundleXmlApplicationContextFactory.java @@ -61,6 +61,7 @@ public class OsgiBundleXmlApplicationContextFactory implements BundleContextAwar * * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext) */ + @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { parent = applicationContext; } @@ -71,6 +72,7 @@ public class OsgiBundleXmlApplicationContextFactory implements BundleContextAwar * * @see org.springframework.osgi.context.BundleContextAware#setBundleContext(org.osgi.framework.BundleContext) */ + @Override public void setBundleContext(BundleContext context) { this.bundleContext = context; } @@ -82,6 +84,7 @@ public class OsgiBundleXmlApplicationContextFactory implements BundleContextAwar * * @see ApplicationContextFactory#createApplicationContext() */ + @Override public ConfigurableApplicationContext createApplicationContext() { OsgiBundleXmlApplicationContext context = new OsgiBundleXmlApplicationContext(new String[] { path }, parent); String displayName = bundleContext.getBundle().getSymbolicName() + ":" + this.displayName; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/ReferenceJobFactory.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/ReferenceJobFactory.java index e4f60fef0..066f6d013 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/ReferenceJobFactory.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/ReferenceJobFactory.java @@ -41,6 +41,7 @@ public class ReferenceJobFactory implements JobFactory { * * @see JobFactory#createJob() */ + @Override public final Job createJob() { return job; } @@ -50,6 +51,7 @@ public class ReferenceJobFactory implements JobFactory { * * @see JobFactory#getJobName() */ + @Override public String getJobName() { return job.getName(); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/CoreNamespaceHandler.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/CoreNamespaceHandler.java index 2ff043353..ba486af05 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/CoreNamespaceHandler.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/CoreNamespaceHandler.java @@ -29,6 +29,7 @@ public class CoreNamespaceHandler extends NamespaceHandlerSupport { /** * @see NamespaceHandler#init() */ + @Override public void init() { this.registerBeanDefinitionParser("job", new JobParser()); this.registerBeanDefinitionParser("flow", new TopLevelFlowParser()); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/CoreNamespacePostProcessor.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/CoreNamespacePostProcessor.java index 0fca4ea9b..b3d44f246 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/CoreNamespacePostProcessor.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/CoreNamespacePostProcessor.java @@ -49,6 +49,7 @@ public class CoreNamespacePostProcessor implements BeanPostProcessor, BeanFactor private ApplicationContext applicationContext; + @Override public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException { for (String beanName : beanFactory.getBeanDefinitionNames()) { injectJobRepositoryIntoSteps(beanName, beanFactory); @@ -101,6 +102,7 @@ public class CoreNamespacePostProcessor implements BeanPostProcessor, BeanFactor } } + @Override public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { return injectDefaults(bean); } @@ -140,10 +142,12 @@ public class CoreNamespacePostProcessor implements BeanPostProcessor, BeanFactor return bean; } + @Override public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { return bean; } + @Override public void setApplicationContext(ApplicationContext applicationContext) { this.applicationContext = applicationContext; } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/JobExecutionListenerParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/JobExecutionListenerParser.java index 899c8f5ee..8da10a252 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/JobExecutionListenerParser.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/JobExecutionListenerParser.java @@ -31,10 +31,12 @@ import org.springframework.batch.core.listener.ListenerMetaData; */ public class JobExecutionListenerParser extends AbstractListenerParser { + @Override protected Class getBeanClass() { return JobListenerFactoryBean.class; } + @Override protected ListenerMetaData[] getMetaDataValues() { return JobListenerMetaData.values(); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/JobParserJobFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/JobParserJobFactoryBean.java index 5e56019e8..07d46cabd 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/JobParserJobFactoryBean.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/JobParserJobFactoryBean.java @@ -55,6 +55,7 @@ class JobParserJobFactoryBean implements SmartFactoryBean { this.name = name; } + @Override public final Object getObject() throws Exception { Assert.isTrue(StringUtils.hasText(name), "The job must have an id."); FlowJob flowJob = new FlowJob(name); @@ -115,18 +116,22 @@ class JobParserJobFactoryBean implements SmartFactoryBean { this.flow = flow; } + @Override public Class getObjectType() { return FlowJob.class; } + @Override public boolean isSingleton() { return true; } + @Override public boolean isEagerInit() { return true; } + @Override public boolean isPrototype() { return false; } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/SimpleFlowFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/SimpleFlowFactoryBean.java index 73549227b..bc396928f 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/SimpleFlowFactoryBean.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/SimpleFlowFactoryBean.java @@ -61,10 +61,12 @@ public class SimpleFlowFactoryBean implements FactoryBean, InitializingBean { * * @throws Exception */ + @Override public void afterPropertiesSet() throws Exception { Assert.hasText(name, "The flow must have a name"); } + @Override public Object getObject() throws Exception { SimpleFlow flow = new SimpleFlow(name); @@ -109,10 +111,12 @@ public class SimpleFlowFactoryBean implements FactoryBean, InitializingBean { return new DelegateState(stateName, state); } + @Override public Class getObjectType() { return SimpleFlow.class; } + @Override public boolean isSingleton() { return true; } @@ -132,6 +136,7 @@ public class SimpleFlowFactoryBean implements FactoryBean, InitializingBean { this.state = state; } + @Override public boolean isEndState() { return state.isEndState(); } @@ -141,6 +146,7 @@ public class SimpleFlowFactoryBean implements FactoryBean, InitializingBean { return state.handle(executor); } + @Override public Collection getFlows() { return (state instanceof FlowHolder) ? ((FlowHolder)state).getFlows() : Collections.emptyList(); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepListenerParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepListenerParser.java index c85bbcc5d..818d8e0eb 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepListenerParser.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepListenerParser.java @@ -53,10 +53,12 @@ public class StepListenerParser extends AbstractListenerParser { this.listenerMetaData = listenerMetaData; } + @Override protected Class getBeanClass() { return StepListenerFactoryBean.class; } + @Override protected ListenerMetaData[] getMetaDataValues() { return listenerMetaData; } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBean.java index 0012c76bb..dbc9e601f 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBean.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/StepParserStepFactoryBean.java @@ -220,6 +220,7 @@ class StepParserStepFactoryBean implements FactoryBean, BeanNameAware { * * @see FactoryBean#getObject() */ + @Override public final Object getObject() throws Exception { if (hasChunkElement) { Assert.isNull(tasklet, "Step [" + name @@ -525,10 +526,12 @@ class StepParserStepFactoryBean implements FactoryBean, BeanNameAware { return n != null && n > 0; } + @Override public Class getObjectType() { return TaskletStep.class; } + @Override public boolean isSingleton() { return true; } @@ -542,6 +545,7 @@ class StepParserStepFactoryBean implements FactoryBean, BeanNameAware { * * @see org.springframework.beans.factory.BeanNameAware#setBeanName(java.lang.String) */ + @Override public void setBeanName(String name) { if (this.name == null) { this.name = name; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/DefaultJobParametersConverter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/DefaultJobParametersConverter.java index 1b4a73959..444c9729e 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/DefaultJobParametersConverter.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/DefaultJobParametersConverter.java @@ -83,6 +83,7 @@ public class DefaultJobParametersConverter implements JobParametersConverter { * * @see org.springframework.batch.core.converter.JobParametersConverter#getJobParameters(java.util.Properties) */ + @Override public JobParameters getJobParameters(Properties props) { if (props == null || props.isEmpty()) { @@ -153,6 +154,7 @@ public class DefaultJobParametersConverter implements JobParametersConverter { * * @see org.springframework.batch.core.converter.JobParametersConverter#getProperties(org.springframework.batch.core.JobParameters) */ + @Override public Properties getProperties(JobParameters params) { if (params == null || params.isEmpty()) { diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/AbstractJobExplorerFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/AbstractJobExplorerFactoryBean.java index 8a1753335..2f097794c 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/AbstractJobExplorerFactoryBean.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/AbstractJobExplorerFactoryBean.java @@ -56,10 +56,12 @@ public abstract class AbstractJobExplorerFactoryBean implements FactoryBean { * @return JobExplorer.class * @see org.springframework.beans.factory.FactoryBean#getObjectType() */ + @Override public Class getObjectType() { return JobExplorer.class; } + @Override public boolean isSingleton() { return true; } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/JobExplorerFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/JobExplorerFactoryBean.java index c14e305de..8f5a9c097 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/JobExplorerFactoryBean.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/JobExplorerFactoryBean.java @@ -107,6 +107,7 @@ public class JobExplorerFactoryBean extends AbstractJobExplorerFactoryBean this.lobHandler = lobHandler; } + @Override public void afterPropertiesSet() throws Exception { Assert.notNull(dataSource, "DataSource must not be null."); @@ -168,6 +169,7 @@ public class JobExplorerFactoryBean extends AbstractJobExplorerFactoryBean return dao; } + @Override public Object getObject() throws Exception { return getTarget(); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/MapJobExplorerFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/MapJobExplorerFactoryBean.java index a8f63dbb1..dc967fa2f 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/MapJobExplorerFactoryBean.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/MapJobExplorerFactoryBean.java @@ -65,6 +65,7 @@ public class MapJobExplorerFactoryBean extends AbstractJobExplorerFactoryBean im * @throws Exception * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() */ + @Override public void afterPropertiesSet() throws Exception { Assert.state(repositoryFactory != null, "A MapJobRepositoryFactoryBean must be provided"); repositoryFactory.afterPropertiesSet(); @@ -90,6 +91,7 @@ public class MapJobExplorerFactoryBean extends AbstractJobExplorerFactoryBean im return repositoryFactory.getExecutionContextDao(); } + @Override public Object getObject() throws Exception { return new SimpleJobExplorer(createJobInstanceDao(), createJobExecutionDao(), createStepExecutionDao(), createExecutionContextDao()); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/SimpleJobExplorer.java b/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/SimpleJobExplorer.java index bc5924de1..145c76cd3 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/SimpleJobExplorer.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/explore/support/SimpleJobExplorer.java @@ -73,6 +73,7 @@ public class SimpleJobExplorer implements JobExplorer { * org.springframework.batch.core.explore.JobExplorer#findJobExecutions( * org.springframework.batch.core.JobInstance) */ + @Override public List getJobExecutions(JobInstance jobInstance) { List executions = jobExecutionDao.findJobExecutions(jobInstance); for (JobExecution jobExecution : executions) { @@ -91,6 +92,7 @@ public class SimpleJobExplorer implements JobExplorer { * org.springframework.batch.core.explore.JobExplorer#findRunningJobExecutions * (java.lang.String) */ + @Override public Set findRunningJobExecutions(String jobName) { Set executions = jobExecutionDao.findRunningJobExecutions(jobName); for (JobExecution jobExecution : executions) { @@ -109,6 +111,7 @@ public class SimpleJobExplorer implements JobExplorer { * org.springframework.batch.core.explore.JobExplorer#getJobExecution(java * .lang.Long) */ + @Override public JobExecution getJobExecution(Long executionId) { if (executionId == null) { return null; @@ -131,6 +134,7 @@ public class SimpleJobExplorer implements JobExplorer { * org.springframework.batch.core.explore.JobExplorer#getStepExecution(java * .lang.Long) */ + @Override public StepExecution getStepExecution(Long jobExecutionId, Long executionId) { JobExecution jobExecution = jobExecutionDao.getJobExecution(jobExecutionId); if (jobExecution == null) { @@ -148,6 +152,7 @@ public class SimpleJobExplorer implements JobExplorer { * org.springframework.batch.core.explore.JobExplorer#getJobInstance(java * .lang.Long) */ + @Override public JobInstance getJobInstance(Long instanceId) { return jobInstanceDao.getJobInstance(instanceId); } @@ -159,6 +164,7 @@ public class SimpleJobExplorer implements JobExplorer { * org.springframework.batch.core.explore.JobExplorer#getLastJobInstances * (java.lang.String, int) */ + @Override public List getJobInstances(String jobName, int start, int count) { return jobInstanceDao.getJobInstances(jobName, start, count); } @@ -168,6 +174,7 @@ public class SimpleJobExplorer implements JobExplorer { * * @see org.springframework.batch.core.explore.JobExplorer#getJobNames() */ + @Override public List getJobNames() { return jobInstanceDao.getJobNames(); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java index 25ffc629b..3a128b801 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/AbstractJob.java @@ -108,6 +108,7 @@ public abstract class AbstractJob implements Job, StepLocator, BeanNameAware, * * @see InitializingBean#afterPropertiesSet() */ + @Override public void afterPropertiesSet() throws Exception { Assert.notNull(jobRepository, "JobRepository must be set"); } @@ -121,6 +122,7 @@ public abstract class AbstractJob implements Job, StepLocator, BeanNameAware, * * @see org.springframework.beans.factory.BeanNameAware#setBeanName(java.lang.String) */ + @Override public void setBeanName(String name) { if (this.name == null) { this.name = name; @@ -142,6 +144,7 @@ public abstract class AbstractJob implements Job, StepLocator, BeanNameAware, * * @see org.springframework.batch.core.domain.IJob#getName() */ + @Override public String getName() { return name; } @@ -153,6 +156,7 @@ public abstract class AbstractJob implements Job, StepLocator, BeanNameAware, * @param stepName * @return the Step */ + @Override public abstract Step getStep(String stepName); /** @@ -160,8 +164,10 @@ public abstract class AbstractJob implements Job, StepLocator, BeanNameAware, * * @return the step names */ + @Override public abstract Collection getStepNames(); + @Override public JobParametersValidator getJobParametersValidator() { return jobParametersValidator; } @@ -180,6 +186,7 @@ public abstract class AbstractJob implements Job, StepLocator, BeanNameAware, /** * @see Job#isRestartable() */ + @Override public boolean isRestartable() { return restartable; } @@ -200,6 +207,7 @@ public abstract class AbstractJob implements Job, StepLocator, BeanNameAware, * * @see org.springframework.batch.core.Job#getJobParametersIncrementer() */ + @Override public JobParametersIncrementer getJobParametersIncrementer() { return this.jobParametersIncrementer; } @@ -273,6 +281,7 @@ public abstract class AbstractJob implements Job, StepLocator, BeanNameAware, * @throws StartLimitExceededException * if start limit of one of the steps was exceeded */ + @Override public final void execute(JobExecution execution) { logger.debug("Job execution starting: " + execution); @@ -402,6 +411,7 @@ public abstract class AbstractJob implements Job, StepLocator, BeanNameAware, jobRepository.update(jobExecution); } + @Override public String toString() { return ClassUtils.getShortName(getClass()) + ": [name=" + name + "]"; } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/CompositeJobParametersValidator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/CompositeJobParametersValidator.java index d9a3d006d..601193e69 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/CompositeJobParametersValidator.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/CompositeJobParametersValidator.java @@ -41,6 +41,7 @@ public class CompositeJobParametersValidator implements JobParametersValidator, * @param parameters some {@link JobParameters} * @throws JobParametersInvalidException if the parameters are invalid */ + @Override public void validate(JobParameters parameters) throws JobParametersInvalidException { for (JobParametersValidator validator : validators) { validator.validate(parameters); @@ -55,6 +56,7 @@ public class CompositeJobParametersValidator implements JobParametersValidator, this.validators = validators; } + @Override public void afterPropertiesSet() throws Exception { Assert.notNull(validators, "The 'validators' may not be null"); Assert.notEmpty(validators, "The 'validators' may not be empty"); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/DefaultJobParametersValidator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/DefaultJobParametersValidator.java index 259a2d472..c66cb43ff 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/DefaultJobParametersValidator.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/DefaultJobParametersValidator.java @@ -50,6 +50,7 @@ public class DefaultJobParametersValidator implements JobParametersValidator, In * Check that there are no overlaps between required and optional keys. * @throws IllegalStateException if there is an overlap */ + @Override public void afterPropertiesSet() throws IllegalStateException { for (String key : requiredKeys) { Assert.state(!optionalKeys.contains(key), "Optional keys canot be required: " + key); @@ -66,6 +67,7 @@ public class DefaultJobParametersValidator implements JobParametersValidator, In * * @throws JobParametersInvalidException if the parameters are not valid */ + @Override public void validate(JobParameters parameters) throws JobParametersInvalidException { if (parameters == null) { diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/SimpleJob.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/SimpleJob.java index f9e4363f9..03f37f8c3 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/SimpleJob.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/SimpleJob.java @@ -72,6 +72,7 @@ public class SimpleJob extends AbstractJob { * * @return the step names for this job */ + @Override public Collection getStepNames() { List names = new ArrayList(); for (Step step : steps) { @@ -95,6 +96,7 @@ public class SimpleJob extends AbstractJob { * @see * org.springframework.batch.core.job.AbstractJob#getStep(java.lang.String) */ + @Override public Step getStep(String stepName) { for (Step step : this.steps) { if (step.getName().equals(stepName)) { @@ -113,6 +115,7 @@ public class SimpleJob extends AbstractJob { * * @see AbstractJob#handleStep(Step, JobExecution) */ + @Override protected void doExecute(JobExecution execution) throws JobInterruptedException, JobRestartException, StartLimitExceededException { diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/SimpleStepHandler.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/SimpleStepHandler.java index 33a2e52f7..71dba7d51 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/SimpleStepHandler.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/SimpleStepHandler.java @@ -74,6 +74,7 @@ public class SimpleStepHandler implements StepHandler, InitializingBean { * * @see InitializingBean#afterPropertiesSet() */ + @Override public void afterPropertiesSet() throws Exception { Assert.state(jobRepository != null, "A JobRepository must be provided"); } @@ -95,6 +96,7 @@ public class SimpleStepHandler implements StepHandler, InitializingBean { this.executionContext = executionContext; } + @Override public StepExecution handleStep(Step step, JobExecution execution) throws JobInterruptedException, JobRestartException, StartLimitExceededException { if (execution.isStopping()) { diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/JobFlowBuilder.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/JobFlowBuilder.java index 55e7ec971..3a6730056 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/JobFlowBuilder.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/JobFlowBuilder.java @@ -56,6 +56,7 @@ public class JobFlowBuilder extends FlowBuilder { * * @see org.springframework.batch.core.job.builder.FlowBuilder#build() */ + @Override public FlowJobBuilder build() { Flow flow = flow(); parent.flow(flow); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecution.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecution.java index 07dca573a..2b28f9de9 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecution.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecution.java @@ -57,6 +57,7 @@ public class FlowExecution implements Comparable { * @param other * @return negative, zero or positive as per the contract */ + @Override public int compareTo(FlowExecution other) { return this.status.compareTo(other.getStatus()); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecutionStatus.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecutionStatus.java index 42a4131c2..776f75905 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecutionStatus.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowExecutionStatus.java @@ -107,6 +107,7 @@ public class FlowExecutionStatus implements Comparable { * @param other * @return negative, zero or positive as per the contract */ + @Override public int compareTo(FlowExecutionStatus other) { Status one = Status.match(this.name); Status two = Status.match(other.name); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/JobFlowExecutor.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/JobFlowExecutor.java index 6017d086e..af9d10c02 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/JobFlowExecutor.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/JobFlowExecutor.java @@ -56,6 +56,7 @@ public class JobFlowExecutor implements FlowExecutor { stepExecutionHolder.set(null); } + @Override public String executeStep(Step step) throws JobInterruptedException, JobRestartException, StartLimitExceededException { StepExecution stepExecution = stepHandler.handleStep(step, execution); @@ -69,6 +70,7 @@ public class JobFlowExecutor implements FlowExecutor { return stepExecution.getExitStatus().getExitCode(); } + @Override public void abandonStepExecution() { StepExecution lastStepExecution = stepExecutionHolder.get(); if (lastStepExecution != null && lastStepExecution.getStatus().isGreaterThan(BatchStatus.STOPPING)) { @@ -77,24 +79,29 @@ public class JobFlowExecutor implements FlowExecutor { } } + @Override public void updateJobExecutionStatus(FlowExecutionStatus status) { execution.setStatus(findBatchStatus(status)); exitStatus = exitStatus.and(new ExitStatus(status.getName())); execution.setExitStatus(exitStatus); } + @Override public JobExecution getJobExecution() { return execution; } + @Override public StepExecution getStepExecution() { return stepExecutionHolder.get(); } + @Override public void close(FlowExecution result) { stepExecutionHolder.set(null); } + @Override public boolean isRestart() { if (getStepExecution() != null && getStepExecution().getStatus() == BatchStatus.ABANDONED) { /* @@ -107,6 +114,7 @@ public class JobFlowExecutor implements FlowExecutor { return execution.getStepExecutions().isEmpty(); } + @Override public void addExitStatus(String code) { exitStatus = exitStatus.and(new ExitStatus(code)); } @@ -124,4 +132,4 @@ public class JobFlowExecutor implements FlowExecutor { return BatchStatus.UNKNOWN; } -} \ No newline at end of file +} diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/SimpleFlow.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/SimpleFlow.java index e3662dc26..489ec78c6 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/SimpleFlow.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/SimpleFlow.java @@ -75,6 +75,7 @@ public class SimpleFlow implements Flow, InitializingBean { * * @see Flow#getName() */ + @Override public String getName() { return name; } @@ -92,6 +93,7 @@ public class SimpleFlow implements Flow, InitializingBean { /** * {@inheritDoc} */ + @Override public State getState(String stateName) { return stateMap.get(stateName); } @@ -99,6 +101,7 @@ public class SimpleFlow implements Flow, InitializingBean { /** * {@inheritDoc} */ + @Override public Collection getStates() { return new HashSet(stateMap.values()); } @@ -108,6 +111,7 @@ public class SimpleFlow implements Flow, InitializingBean { * * @see InitializingBean#afterPropertiesSet() */ + @Override public void afterPropertiesSet() throws Exception { initializeTransitions(); } @@ -115,6 +119,7 @@ public class SimpleFlow implements Flow, InitializingBean { /** * @see Flow#start(FlowExecutor) */ + @Override public FlowExecution start(FlowExecutor executor) throws FlowExecutionException { if (startState == null) { initializeTransitions(); @@ -127,6 +132,7 @@ public class SimpleFlow implements Flow, InitializingBean { /** * @see Flow#resume(String, FlowExecutor) */ + @Override public FlowExecution resume(String stateName, FlowExecutor executor) throws FlowExecutionException { FlowExecutionStatus status = FlowExecutionStatus.UNKNOWN; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/StateTransition.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/StateTransition.java index 35c136166..5cbc2e5f7 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/StateTransition.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/StateTransition.java @@ -165,6 +165,7 @@ public final class StateTransition implements Comparable { * fo? > foo. * @see Comparable#compareTo(Object) */ + @Override public int compareTo(StateTransition other) { String value = other.pattern; if (pattern.equals(value)) { diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/AbstractState.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/AbstractState.java index 7104dacb9..560d39128 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/AbstractState.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/AbstractState.java @@ -35,6 +35,7 @@ public abstract class AbstractState implements State { this.name = name; } + @Override public String getName() { return name; } @@ -47,6 +48,7 @@ public abstract class AbstractState implements State { return getClass().getSimpleName()+": name=["+name+"]"; } + @Override public abstract FlowExecutionStatus handle(FlowExecutor executor) throws Exception; } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/DecisionState.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/DecisionState.java index 3265397a8..687a9efaa 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/DecisionState.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/DecisionState.java @@ -46,8 +46,9 @@ public class DecisionState extends AbstractState { /* (non-Javadoc) * @see org.springframework.batch.core.job.flow.State#isEndState() */ + @Override public boolean isEndState() { return false; } -} \ No newline at end of file +} diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/EndState.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/EndState.java index 046228a23..7cabbc553 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/EndState.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/EndState.java @@ -119,6 +119,7 @@ public class EndState extends AbstractState { * * @see org.springframework.batch.core.job.flow.State#isEndState() */ + @Override public boolean isEndState() { return !status.isStop(); } @@ -132,4 +133,4 @@ public class EndState extends AbstractState { public String toString() { return super.toString() + " status=[" + status + "]"; } -} \ No newline at end of file +} diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/FlowState.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/FlowState.java index 1f8f141a4..238ff8ad5 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/FlowState.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/FlowState.java @@ -45,6 +45,7 @@ public class FlowState extends AbstractState implements FlowHolder { /** * @return the flows */ + @Override public Collection getFlows() { return Collections.singleton(flow); } @@ -57,8 +58,9 @@ public class FlowState extends AbstractState implements FlowHolder { /* (non-Javadoc) * @see org.springframework.batch.core.job.flow.State#isEndState() */ + @Override public boolean isEndState() { return false; } -} \ No newline at end of file +} diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/MaxValueFlowExecutionAggregator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/MaxValueFlowExecutionAggregator.java index 718811833..1a25a9be0 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/MaxValueFlowExecutionAggregator.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/MaxValueFlowExecutionAggregator.java @@ -39,6 +39,7 @@ public class MaxValueFlowExecutionAggregator implements FlowExecutionAggregator * * @see FlowExecutionAggregator#aggregate(Collection) */ + @Override public FlowExecutionStatus aggregate(Collection executions) { if (executions == null || executions.size() == 0) { return FlowExecutionStatus.UNKNOWN; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/SplitState.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/SplitState.java index 887b611a7..459bb9404 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/SplitState.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/SplitState.java @@ -67,6 +67,7 @@ public class SplitState extends AbstractState implements FlowHolder { /** * @return the flows */ + @Override public Collection getFlows() { return flows; } @@ -87,6 +88,7 @@ public class SplitState extends AbstractState implements FlowHolder { for (final Flow flow : flows) { final FutureTask task = new FutureTask(new Callable() { + @Override public FlowExecution call() throws Exception { return flow.start(executor); } @@ -130,6 +132,7 @@ public class SplitState extends AbstractState implements FlowHolder { * * @see org.springframework.batch.core.job.flow.State#isEndState() */ + @Override public boolean isEndState() { return false; } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/StepState.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/StepState.java index f9b0b1a0c..36ce9a334 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/StepState.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/support/state/StepState.java @@ -63,6 +63,7 @@ public class StepState extends AbstractState implements StepHolder { /** * @return the step */ + @Override public Step getStep() { return step; } @@ -70,6 +71,7 @@ public class StepState extends AbstractState implements StepHolder { /* (non-Javadoc) * @see org.springframework.batch.core.job.flow.State#isEndState() */ + @Override public boolean isEndState() { return false; } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/JobRegistryBackgroundJobRunner.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/JobRegistryBackgroundJobRunner.java index 08b6e5293..dabe77af0 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/JobRegistryBackgroundJobRunner.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/JobRegistryBackgroundJobRunner.java @@ -202,6 +202,7 @@ public class JobRegistryBackgroundJobRunner { logger.info("Starting job registry in parent context from XML at: [" + args[0] + "]"); new Thread(new Runnable() { + @Override public void run() { try { launcher.run(); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/JvmSystemExiter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/JvmSystemExiter.java index 4dafcb42f..6d3b6d8d9 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/JvmSystemExiter.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/JvmSystemExiter.java @@ -34,6 +34,7 @@ public class JvmSystemExiter implements SystemExiter { * * @see org.springframework.batch.core.launch.support.SystemExiter#exit(int) */ + @Override public void exit(int status) { System.exit(status); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/RunIdIncrementer.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/RunIdIncrementer.java index 6bea1f53d..9a0d8f82d 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/RunIdIncrementer.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/RunIdIncrementer.java @@ -40,6 +40,7 @@ public class RunIdIncrementer implements JobParametersIncrementer { /** * Increment the run.id parameter (starting with 1). */ + @Override public JobParameters getNext(JobParameters parameters) { JobParameters params = (parameters == null) ? new JobParameters() : parameters; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/RuntimeExceptionTranslator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/RuntimeExceptionTranslator.java index 1321a2217..352e43946 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/RuntimeExceptionTranslator.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/RuntimeExceptionTranslator.java @@ -27,6 +27,7 @@ public class RuntimeExceptionTranslator implements MethodInterceptor { /* (non-Javadoc) * @see org.aopalliance.intercept.MethodInterceptor#invoke(org.aopalliance.intercept.MethodInvocation) */ + @Override public Object invoke(MethodInvocation invocation) throws Throwable { try { return invocation.proceed(); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/ScheduledJobParametersFactory.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/ScheduledJobParametersFactory.java index eadc1c40f..ee2fa4e7a 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/ScheduledJobParametersFactory.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/ScheduledJobParametersFactory.java @@ -43,6 +43,7 @@ public class ScheduledJobParametersFactory implements JobParametersConverter { * * @see org.springframework.batch.core.runtime.JobParametersFactory#getJobParameters(java.util.Properties) */ + @Override public JobParameters getJobParameters(Properties props) { if (props == null || props.isEmpty()) { @@ -73,6 +74,7 @@ public class ScheduledJobParametersFactory implements JobParametersConverter { * * @see org.springframework.batch.core.converter.JobParametersConverter#getProperties(org.springframework.batch.core.JobParameters) */ + @Override public Properties getProperties(JobParameters params) { if (params == null || params.isEmpty()) { diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJobLauncher.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJobLauncher.java index 44fddf184..64e43a03d 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJobLauncher.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJobLauncher.java @@ -83,6 +83,7 @@ public class SimpleJobLauncher implements JobLauncher, InitializingBean { * completed successfully * @throws JobParametersInvalidException */ + @Override public JobExecution run(final Job job, final JobParameters jobParameters) throws JobExecutionAlreadyRunningException, JobRestartException, JobInstanceAlreadyCompleteException, JobParametersInvalidException { @@ -113,6 +114,7 @@ public class SimpleJobLauncher implements JobLauncher, InitializingBean { try { taskExecutor.execute(new Runnable() { + @Override public void run() { try { logger.info("Job: [" + job + "] launched with the following parameters: [" + jobParameters @@ -173,6 +175,7 @@ public class SimpleJobLauncher implements JobLauncher, InitializingBean { * Ensure the required dependencies of a {@link JobRepository} have been * set. */ + @Override public void afterPropertiesSet() throws Exception { Assert.state(jobRepository != null, "A JobRepository has not been set."); if (taskExecutor == null) { diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJobOperator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJobOperator.java index 0556879b0..75db5bb7e 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJobOperator.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJobOperator.java @@ -98,6 +98,7 @@ public class SimpleJobOperator implements JobOperator, InitializingBean { * * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() */ + @Override public void afterPropertiesSet() throws Exception { Assert.notNull(jobLauncher, "JobLauncher must be provided"); Assert.notNull(jobRegistry, "JobLocator must be provided"); @@ -146,6 +147,7 @@ public class SimpleJobOperator implements JobOperator, InitializingBean { * * @see org.springframework.batch.core.launch.JobOperator#getExecutions(java.lang.Long) */ + @Override public List getExecutions(long instanceId) throws NoSuchJobInstanceException { JobInstance jobInstance = jobExplorer.getJobInstance(instanceId); if (jobInstance == null) { @@ -163,6 +165,7 @@ public class SimpleJobOperator implements JobOperator, InitializingBean { * * @see org.springframework.batch.core.launch.JobOperator#getJobNames() */ + @Override public Set getJobNames() { return new TreeSet(jobRegistry.getJobNames()); } @@ -172,6 +175,7 @@ public class SimpleJobOperator implements JobOperator, InitializingBean { * * @see JobOperator#getLastInstances(String, int, int) */ + @Override public List getJobInstances(String jobName, int start, int count) throws NoSuchJobException { List list = new ArrayList(); for (JobInstance jobInstance : jobExplorer.getJobInstances(jobName, start, count)) { @@ -190,6 +194,7 @@ public class SimpleJobOperator implements JobOperator, InitializingBean { * org.springframework.batch.core.launch.JobOperator#getParameters(java. * lang.Long) */ + @Override public String getParameters(long executionId) throws NoSuchJobExecutionException { JobExecution jobExecution = findExecutionById(executionId); @@ -204,6 +209,7 @@ public class SimpleJobOperator implements JobOperator, InitializingBean { * org.springframework.batch.core.launch.JobOperator#getRunningExecutions * (java.lang.String) */ + @Override public Set getRunningExecutions(String jobName) throws NoSuchJobException { Set set = new LinkedHashSet(); for (JobExecution jobExecution : jobExplorer.findRunningJobExecutions(jobName)) { @@ -222,6 +228,7 @@ public class SimpleJobOperator implements JobOperator, InitializingBean { * org.springframework.batch.core.launch.JobOperator#getStepExecutionSummaries * (java.lang.Long) */ + @Override public Map getStepExecutionSummaries(long executionId) throws NoSuchJobExecutionException { JobExecution jobExecution = findExecutionById(executionId); @@ -239,6 +246,7 @@ public class SimpleJobOperator implements JobOperator, InitializingBean { * org.springframework.batch.core.launch.JobOperator#getSummary(java.lang * .Long) */ + @Override public String getSummary(long executionId) throws NoSuchJobExecutionException { JobExecution jobExecution = findExecutionById(executionId); return jobExecution.toString(); @@ -250,6 +258,7 @@ public class SimpleJobOperator implements JobOperator, InitializingBean { * @see * org.springframework.batch.core.launch.JobOperator#resume(java.lang.Long) */ + @Override public Long restart(long executionId) throws JobInstanceAlreadyCompleteException, NoSuchJobExecutionException, NoSuchJobException, JobRestartException, JobParametersInvalidException { logger.info("Checking status of job execution with id=" + executionId); @@ -278,6 +287,7 @@ public class SimpleJobOperator implements JobOperator, InitializingBean { * org.springframework.batch.core.launch.JobOperator#start(java.lang.String, * java.lang.String) */ + @Override public Long start(String jobName, String parameters) throws NoSuchJobException, JobInstanceAlreadyExistsException, JobParametersInvalidException { logger.info("Checking status of job with name=" + jobName); @@ -317,6 +327,7 @@ public class SimpleJobOperator implements JobOperator, InitializingBean { * * @see JobOperator#startNextInstance(String ) */ + @Override public Long startNextInstance(String jobName) throws NoSuchJobException, JobParametersNotFoundException, UnexpectedJobExecutionException, JobParametersInvalidException { @@ -366,6 +377,7 @@ public class SimpleJobOperator implements JobOperator, InitializingBean { * @see * org.springframework.batch.core.launch.JobOperator#stop(java.lang.Long) */ + @Override @Transactional public boolean stop(long executionId) throws NoSuchJobExecutionException, JobExecutionNotRunningException { @@ -383,6 +395,7 @@ public class SimpleJobOperator implements JobOperator, InitializingBean { return true; } + @Override public JobExecution abandon(long jobExecutionId) throws NoSuchJobExecutionException, JobExecutionAlreadyRunningException { JobExecution jobExecution = findExecutionById(jobExecutionId); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJvmExitCodeMapper.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJvmExitCodeMapper.java index 43002b512..a8337f362 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJvmExitCodeMapper.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJvmExitCodeMapper.java @@ -67,6 +67,7 @@ public class SimpleJvmExitCodeMapper implements ExitCodeMapper { * Framework * @return The exitCode of the Batch Job as known by the JVM */ + @Override public int intValue(String exitCode) { Integer statusCode = null; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/AbstractListenerFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/AbstractListenerFactoryBean.java index 3bd6bb8c1..de6f06211 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/AbstractListenerFactoryBean.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/AbstractListenerFactoryBean.java @@ -68,6 +68,7 @@ public abstract class AbstractListenerFactoryBean implements FactoryBean, Initia private Map metaDataMap; + @Override public Object getObject() { if (metaDataMap == null) { @@ -174,6 +175,7 @@ public abstract class AbstractListenerFactoryBean implements FactoryBean, Initia } } + @Override public boolean isSingleton() { return true; } @@ -186,6 +188,7 @@ public abstract class AbstractListenerFactoryBean implements FactoryBean, Initia this.metaDataMap = metaDataMap; } + @Override public void afterPropertiesSet() throws Exception { Assert.notNull(delegate, "Delegate must not be null"); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ChunkListenerSupport.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ChunkListenerSupport.java index 06635cebb..5e9e55724 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ChunkListenerSupport.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ChunkListenerSupport.java @@ -28,12 +28,14 @@ public class ChunkListenerSupport implements ChunkListener { /* (non-Javadoc) * @see org.springframework.batch.core.domain.ChunkListener#afterChunk() */ + @Override public void afterChunk() { } /* (non-Javadoc) * @see org.springframework.batch.core.domain.ChunkListener#beforeChunk() */ + @Override public void beforeChunk() { } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeChunkListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeChunkListener.java index 98c411972..a8b81b1a7 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeChunkListener.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeChunkListener.java @@ -53,6 +53,7 @@ public class CompositeChunkListener implements ChunkListener { * * @see org.springframework.batch.core.ChunkListener#afterChunk() */ + @Override public void afterChunk() { for (Iterator iterator = listeners.iterator(); iterator.hasNext();) { ChunkListener listener = iterator.next(); @@ -65,6 +66,7 @@ public class CompositeChunkListener implements ChunkListener { * * @see org.springframework.batch.core.ChunkListener#beforeChunk() */ + @Override public void beforeChunk() { for (Iterator iterator = listeners.reverse(); iterator.hasNext();) { ChunkListener listener = iterator.next(); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemProcessListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemProcessListener.java index a0b05dec1..deee4280d 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemProcessListener.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemProcessListener.java @@ -53,6 +53,7 @@ public class CompositeItemProcessListener implements ItemProcessListener> iterator = listeners.reverse(); iterator.hasNext();) { ItemProcessListener listener = iterator.next(); @@ -65,6 +66,7 @@ public class CompositeItemProcessListener implements ItemProcessListener> iterator = listeners.iterator(); iterator.hasNext();) { ItemProcessListener listener = iterator.next(); @@ -78,6 +80,7 @@ public class CompositeItemProcessListener implements ItemProcessListener> iterator = listeners.reverse(); iterator.hasNext();) { ItemProcessListener listener = iterator.next(); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemReadListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemReadListener.java index e1841d1aa..428edf496 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemReadListener.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemReadListener.java @@ -53,6 +53,7 @@ public class CompositeItemReadListener implements ItemReadListener { * prioritising those that implement {@link Ordered}. * @see org.springframework.batch.core.ItemReadListener#afterRead(java.lang.Object) */ + @Override public void afterRead(T item) { for (Iterator> iterator = listeners.reverse(); iterator.hasNext();) { ItemReadListener listener = iterator.next(); @@ -65,6 +66,7 @@ public class CompositeItemReadListener implements ItemReadListener { * that implement {@link Ordered}. * @see org.springframework.batch.core.ItemReadListener#beforeRead() */ + @Override public void beforeRead() { for (Iterator> iterator = listeners.iterator(); iterator.hasNext();) { ItemReadListener listener = iterator.next(); @@ -77,6 +79,7 @@ public class CompositeItemReadListener implements ItemReadListener { * prioritising those that implement {@link Ordered}. * @see org.springframework.batch.core.ItemReadListener#onReadError(java.lang.Exception) */ + @Override public void onReadError(Exception ex) { for (Iterator> iterator = listeners.iterator(); iterator.hasNext();) { ItemReadListener listener = iterator.next(); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemWriteListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemWriteListener.java index 9aae1476b..c3d32f17c 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemWriteListener.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeItemWriteListener.java @@ -53,6 +53,7 @@ public class CompositeItemWriteListener implements ItemWriteListener { * prioritising those that implement {@link Ordered}. * @see ItemWriteListener#afterWrite(java.util.List) */ + @Override public void afterWrite(List items) { for (Iterator> iterator = listeners.reverse(); iterator.hasNext();) { ItemWriteListener listener = iterator.next(); @@ -65,6 +66,7 @@ public class CompositeItemWriteListener implements ItemWriteListener { * that implement {@link Ordered}. * @see ItemWriteListener#beforeWrite(List) */ + @Override public void beforeWrite(List items) { for (Iterator> iterator = listeners.iterator(); iterator.hasNext();) { ItemWriteListener listener = iterator.next(); @@ -77,6 +79,7 @@ public class CompositeItemWriteListener implements ItemWriteListener { * prioritising those that implement {@link Ordered}. * @see ItemWriteListener#onWriteError(Exception, List) */ + @Override public void onWriteError(Exception ex, List items) { for (Iterator> iterator = listeners.reverse(); iterator.hasNext();) { ItemWriteListener listener = iterator.next(); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeJobExecutionListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeJobExecutionListener.java index 7506b3689..579a63f7d 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeJobExecutionListener.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeJobExecutionListener.java @@ -53,6 +53,7 @@ public class CompositeJobExecutionListener implements JobExecutionListener { * prioritising those that implement {@link Ordered}. * @see org.springframework.batch.core.JobExecutionListener#afterJob(org.springframework.batch.core.JobExecution) */ + @Override public void afterJob(JobExecution jobExecution) { for (Iterator iterator = listeners.reverse(); iterator.hasNext();) { JobExecutionListener listener = iterator.next(); @@ -65,6 +66,7 @@ public class CompositeJobExecutionListener implements JobExecutionListener { * that implement {@link Ordered}. * @see org.springframework.batch.core.JobExecutionListener#beforeJob(org.springframework.batch.core.JobExecution) */ + @Override public void beforeJob(JobExecution jobExecution) { for (Iterator iterator = listeners.iterator(); iterator.hasNext();) { JobExecutionListener listener = iterator.next(); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeSkipListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeSkipListener.java index 9db7313be..7b99d9cdd 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeSkipListener.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeSkipListener.java @@ -52,6 +52,7 @@ public class CompositeSkipListener implements SkipListener { * that implement {@link Ordered}. * @see org.springframework.batch.core.SkipListener#onSkipInRead(java.lang.Throwable) */ + @Override public void onSkipInRead(Throwable t) { for (Iterator> iterator = listeners.iterator(); iterator.hasNext();) { SkipListener listener = iterator.next(); @@ -65,6 +66,7 @@ public class CompositeSkipListener implements SkipListener { * @see org.springframework.batch.core.SkipListener#onSkipInWrite(java.lang.Object, * java.lang.Throwable) */ + @Override public void onSkipInWrite(S item, Throwable t) { for (Iterator> iterator = listeners.iterator(); iterator.hasNext();) { SkipListener listener = iterator.next(); @@ -78,6 +80,7 @@ public class CompositeSkipListener implements SkipListener { * @see org.springframework.batch.core.SkipListener#onSkipInWrite(java.lang.Object, * java.lang.Throwable) */ + @Override public void onSkipInProcess(T item, Throwable t) { for (Iterator> iterator = listeners.iterator(); iterator.hasNext();) { SkipListener listener = iterator.next(); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeStepExecutionListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeStepExecutionListener.java index 2c9dc6428..12343bfd6 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeStepExecutionListener.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/CompositeStepExecutionListener.java @@ -55,6 +55,7 @@ public class CompositeStepExecutionListener implements StepExecutionListener { * prioritising those that implement {@link Ordered}. * @see org.springframework.batch.core.StepExecutionListener#afterStep(StepExecution) */ + @Override public ExitStatus afterStep(StepExecution stepExecution) { ExitStatus status = null; for (Iterator iterator = list.reverse(); iterator.hasNext();) { @@ -70,6 +71,7 @@ public class CompositeStepExecutionListener implements StepExecutionListener { * that implement {@link Ordered}. * @see org.springframework.batch.core.StepExecutionListener#beforeStep(StepExecution) */ + @Override public void beforeStep(StepExecution stepExecution) { for (Iterator iterator = list.iterator(); iterator.hasNext();) { StepExecutionListener listener = iterator.next(); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ExecutionContextPromotionListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ExecutionContextPromotionListener.java index b5e322d91..6b5cbb6e7 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ExecutionContextPromotionListener.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ExecutionContextPromotionListener.java @@ -46,6 +46,7 @@ public class ExecutionContextPromotionListener extends StepExecutionListenerSupp private boolean strict = false; + @Override public ExitStatus afterStep(StepExecution stepExecution) { ExecutionContext stepContext = stepExecution.getExecutionContext(); ExecutionContext jobContext = stepExecution.getJobExecution().getExecutionContext(); @@ -69,6 +70,7 @@ public class ExecutionContextPromotionListener extends StepExecutionListenerSupp return null; } + @Override public void afterPropertiesSet() throws Exception { Assert.notNull(this.keys, "The 'keys' property must be provided"); Assert.notEmpty(this.keys, "The 'keys' property must not be empty"); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ItemListenerSupport.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ItemListenerSupport.java index 5402580ed..c0a2da608 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ItemListenerSupport.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ItemListenerSupport.java @@ -37,6 +37,7 @@ public class ItemListenerSupport implements ItemReadListener, ItemProce * * @see org.springframework.batch.core.domain.ItemReadListener#afterRead(java.lang.Object) */ + @Override public void afterRead(I item) { } @@ -45,6 +46,7 @@ public class ItemListenerSupport implements ItemReadListener, ItemProce * * @see org.springframework.batch.core.domain.ItemReadListener#beforeRead() */ + @Override public void beforeRead() { } @@ -53,6 +55,7 @@ public class ItemListenerSupport implements ItemReadListener, ItemProce * * @see org.springframework.batch.core.domain.ItemReadListener#onReadError(java.lang.Exception) */ + @Override public void onReadError(Exception ex) { } @@ -62,6 +65,7 @@ public class ItemListenerSupport implements ItemReadListener, ItemProce * @see org.springframework.batch.core.ItemProcessListener#afterProcess(java.lang.Object, * java.lang.Object) */ + @Override public void afterProcess(I item, O result) { } @@ -70,6 +74,7 @@ public class ItemListenerSupport implements ItemReadListener, ItemProce * * @see org.springframework.batch.core.ItemProcessListener#beforeProcess(java.lang.Object) */ + @Override public void beforeProcess(I item) { } @@ -79,6 +84,7 @@ public class ItemListenerSupport implements ItemReadListener, ItemProce * @see org.springframework.batch.core.ItemProcessListener#onProcessError(java.lang.Object, * java.lang.Exception) */ + @Override public void onProcessError(I item, Exception e) { } @@ -87,6 +93,7 @@ public class ItemListenerSupport implements ItemReadListener, ItemProce * * @see org.springframework.batch.core.domain.ItemWriteListener#afterWrite() */ + @Override public void afterWrite(List item) { } @@ -95,6 +102,7 @@ public class ItemListenerSupport implements ItemReadListener, ItemProce * * @see org.springframework.batch.core.domain.ItemWriteListener#beforeWrite(java.lang.Object) */ + @Override public void beforeWrite(List item) { } @@ -104,6 +112,7 @@ public class ItemListenerSupport implements ItemReadListener, ItemProce * @see org.springframework.batch.core.domain.ItemWriteListener#onWriteError(java.lang.Exception, * java.lang.Object) */ + @Override public void onWriteError(Exception ex, List item) { } } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobExecutionListenerSupport.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobExecutionListenerSupport.java index 9f793c5f2..2e9d5239f 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobExecutionListenerSupport.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobExecutionListenerSupport.java @@ -27,12 +27,14 @@ public class JobExecutionListenerSupport implements JobExecutionListener { /* (non-Javadoc) * @see org.springframework.batch.core.domain.JobListener#afterJob() */ + @Override public void afterJob(JobExecution jobExecution) { } /* (non-Javadoc) * @see org.springframework.batch.core.domain.JobListener#beforeJob(org.springframework.batch.core.domain.JobExecution) */ + @Override public void beforeJob(JobExecution jobExecution) { } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobListenerFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobListenerFactoryBean.java index 1294477f7..e97f718da 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobListenerFactoryBean.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobListenerFactoryBean.java @@ -29,18 +29,22 @@ import org.springframework.batch.core.JobExecutionListener; */ public class JobListenerFactoryBean extends AbstractListenerFactoryBean { + @Override protected ListenerMetaData getMetaDataFromPropertyName(String propertyName) { return JobListenerMetaData.fromPropertyName(propertyName); } + @Override protected ListenerMetaData[] getMetaDataValues() { return JobListenerMetaData.values(); } + @Override protected Class getDefaultListenerClass() { return JobExecutionListener.class; } + @Override public Class getObjectType() { return JobExecutionListener.class; } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobListenerMetaData.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobListenerMetaData.java index 078faccf1..78404a1d8 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobListenerMetaData.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/JobListenerMetaData.java @@ -56,22 +56,27 @@ public enum JobListenerMetaData implements ListenerMetaData { } } + @Override public String getMethodName() { return methodName; } + @Override public Class getAnnotation() { return annotation; } + @Override public Class getListenerInterface() { return JobExecutionListener.class; } + @Override public String getPropertyName() { return propertyName; } + @Override public Class[] getParamTypes() { return new Class[]{ JobExecution.class }; } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/MethodInvokerMethodInterceptor.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/MethodInvokerMethodInterceptor.java index 7d8d39b9d..993f5bb9b 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/MethodInvokerMethodInterceptor.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/MethodInvokerMethodInterceptor.java @@ -51,6 +51,7 @@ public class MethodInvokerMethodInterceptor implements MethodInterceptor { this.invokerMap = invokerMap; } + @Override public Object invoke(MethodInvocation invocation) throws Throwable { String methodName = invocation.getMethod().getName(); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/MulticasterBatchListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/MulticasterBatchListener.java index f77a2f0d2..bebc48d5b 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/MulticasterBatchListener.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/MulticasterBatchListener.java @@ -106,6 +106,7 @@ public class MulticasterBatchListener implements StepExecutionListener, Ch * @see org.springframework.batch.core.listener.CompositeItemProcessListener#afterProcess(java.lang.Object, * java.lang.Object) */ + @Override public void afterProcess(T item, S result) { try { itemProcessListener.afterProcess(item, result); @@ -119,6 +120,7 @@ public class MulticasterBatchListener implements StepExecutionListener, Ch * @param item * @see org.springframework.batch.core.listener.CompositeItemProcessListener#beforeProcess(java.lang.Object) */ + @Override public void beforeProcess(T item) { try { itemProcessListener.beforeProcess(item); @@ -134,6 +136,7 @@ public class MulticasterBatchListener implements StepExecutionListener, Ch * @see org.springframework.batch.core.listener.CompositeItemProcessListener#onProcessError(java.lang.Object, * java.lang.Exception) */ + @Override public void onProcessError(T item, Exception ex) { try { itemProcessListener.onProcessError(item, ex); @@ -146,6 +149,7 @@ public class MulticasterBatchListener implements StepExecutionListener, Ch /** * @see org.springframework.batch.core.listener.CompositeStepExecutionListener#afterStep(StepExecution) */ + @Override public ExitStatus afterStep(StepExecution stepExecution) { try { return stepListener.afterStep(stepExecution); @@ -159,6 +163,7 @@ public class MulticasterBatchListener implements StepExecutionListener, Ch * @param stepExecution * @see org.springframework.batch.core.listener.CompositeStepExecutionListener#beforeStep(org.springframework.batch.core.StepExecution) */ + @Override public void beforeStep(StepExecution stepExecution) { try { stepListener.beforeStep(stepExecution); @@ -172,6 +177,7 @@ public class MulticasterBatchListener implements StepExecutionListener, Ch * * @see org.springframework.batch.core.listener.CompositeChunkListener#afterChunk() */ + @Override public void afterChunk() { try { chunkListener.afterChunk(); @@ -185,6 +191,7 @@ public class MulticasterBatchListener implements StepExecutionListener, Ch * * @see org.springframework.batch.core.listener.CompositeChunkListener#beforeChunk() */ + @Override public void beforeChunk() { try { chunkListener.beforeChunk(); @@ -198,6 +205,7 @@ public class MulticasterBatchListener implements StepExecutionListener, Ch * @param item * @see org.springframework.batch.core.listener.CompositeItemReadListener#afterRead(java.lang.Object) */ + @Override public void afterRead(T item) { try { itemReadListener.afterRead(item); @@ -211,6 +219,7 @@ public class MulticasterBatchListener implements StepExecutionListener, Ch * * @see org.springframework.batch.core.listener.CompositeItemReadListener#beforeRead() */ + @Override public void beforeRead() { try { itemReadListener.beforeRead(); @@ -224,6 +233,7 @@ public class MulticasterBatchListener implements StepExecutionListener, Ch * @param ex * @see org.springframework.batch.core.listener.CompositeItemReadListener#onReadError(java.lang.Exception) */ + @Override public void onReadError(Exception ex) { try { itemReadListener.onReadError(ex); @@ -237,6 +247,7 @@ public class MulticasterBatchListener implements StepExecutionListener, Ch * * @see ItemWriteListener#afterWrite(List) */ + @Override public void afterWrite(List items) { try { itemWriteListener.afterWrite(items); @@ -250,6 +261,7 @@ public class MulticasterBatchListener implements StepExecutionListener, Ch * @param items * @see ItemWriteListener#beforeWrite(List) */ + @Override public void beforeWrite(List items) { try { itemWriteListener.beforeWrite(items); @@ -264,6 +276,7 @@ public class MulticasterBatchListener implements StepExecutionListener, Ch * @param items * @see ItemWriteListener#onWriteError(Exception, List) */ + @Override public void onWriteError(Exception ex, List items) { try { itemWriteListener.onWriteError(ex, items); @@ -277,6 +290,7 @@ public class MulticasterBatchListener implements StepExecutionListener, Ch * @param t * @see org.springframework.batch.core.listener.CompositeSkipListener#onSkipInRead(java.lang.Throwable) */ + @Override public void onSkipInRead(Throwable t) { skipListener.onSkipInRead(t); } @@ -287,6 +301,7 @@ public class MulticasterBatchListener implements StepExecutionListener, Ch * @see org.springframework.batch.core.listener.CompositeSkipListener#onSkipInWrite(java.lang.Object, * java.lang.Throwable) */ + @Override public void onSkipInWrite(S item, Throwable t) { skipListener.onSkipInWrite(item, t); } @@ -297,6 +312,7 @@ public class MulticasterBatchListener implements StepExecutionListener, Ch * @see org.springframework.batch.core.listener.CompositeSkipListener#onSkipInProcess(Object, * Throwable) */ + @Override public void onSkipInProcess(T item, Throwable t) { skipListener.onSkipInProcess(item, t); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/SkipListenerSupport.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/SkipListenerSupport.java index 3ae689ee6..185c96b73 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/SkipListenerSupport.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/SkipListenerSupport.java @@ -28,19 +28,22 @@ public class SkipListenerSupport implements SkipListener { /* (non-Javadoc) * @see org.springframework.batch.core.SkipListener#onSkipInRead(java.lang.Throwable) */ + @Override public void onSkipInRead(Throwable t) { } /* (non-Javadoc) * @see org.springframework.batch.core.SkipListener#onSkipInWrite(java.lang.Object, java.lang.Throwable) */ + @Override public void onSkipInWrite(S item, Throwable t) { } /* (non-Javadoc) * @see org.springframework.batch.core.SkipListener#onSkipInProcess(java.lang.Object, java.lang.Throwable) */ - public void onSkipInProcess(T item, Throwable t) { + @Override + public void onSkipInProcess(T item, Throwable t) { } } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepExecutionListenerSupport.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepExecutionListenerSupport.java index 224dd7039..d22d2511c 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepExecutionListenerSupport.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepExecutionListenerSupport.java @@ -28,6 +28,7 @@ public class StepExecutionListenerSupport implements StepExecutionListener { /* (non-Javadoc) * @see org.springframework.batch.core.domain.StepListener#afterStep(StepExecution stepExecution) */ + @Override public ExitStatus afterStep(StepExecution stepExecution) { return null; } @@ -35,6 +36,7 @@ public class StepExecutionListenerSupport implements StepExecutionListener { /* (non-Javadoc) * @see org.springframework.batch.core.domain.StepListener#open(org.springframework.batch.item.ExecutionContext) */ + @Override public void beforeStep(StepExecution stepExecution) { } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerFactoryBean.java index 24500d6d3..1dc526c65 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerFactoryBean.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerFactoryBean.java @@ -29,18 +29,22 @@ import org.springframework.batch.core.StepListener; */ public class StepListenerFactoryBean extends AbstractListenerFactoryBean { + @Override protected ListenerMetaData getMetaDataFromPropertyName(String propertyName) { return StepListenerMetaData.fromPropertyName(propertyName); } + @Override protected ListenerMetaData[] getMetaDataValues() { return StepListenerMetaData.values(); } + @Override protected Class getDefaultListenerClass() { return StepListener.class; } + @Override @SuppressWarnings("rawtypes") public Class getObjectType() { return StepListener.class; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerMetaData.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerMetaData.java index 753d7d21f..21d2fc035 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerMetaData.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerMetaData.java @@ -94,22 +94,27 @@ public enum StepListenerMetaData implements ListenerMetaData { } } + @Override public String getMethodName() { return methodName; } + @Override public Class getAnnotation() { return annotation; } + @Override public Class getListenerInterface() { return listenerInterface; } + @Override public Class[] getParamTypes() { return paramTypes; } + @Override public String getPropertyName() { return propertyName; } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerSupport.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerSupport.java index 956c1a108..c415cca34 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerSupport.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerSupport.java @@ -39,6 +39,7 @@ public class StepListenerSupport implements StepExecutionListener, ChunkLis /* (non-Javadoc) * @see org.springframework.batch.core.StepExecutionListener#afterStep(org.springframework.batch.core.StepExecution) */ + @Override public ExitStatus afterStep(StepExecution stepExecution) { return null; } @@ -46,90 +47,105 @@ public class StepListenerSupport implements StepExecutionListener, ChunkLis /* (non-Javadoc) * @see org.springframework.batch.core.StepExecutionListener#beforeStep(org.springframework.batch.core.StepExecution) */ + @Override public void beforeStep(StepExecution stepExecution) { } /* (non-Javadoc) * @see org.springframework.batch.core.domain.ChunkListener#afterChunk() */ + @Override public void afterChunk() { } /* (non-Javadoc) * @see org.springframework.batch.core.domain.ChunkListener#beforeChunk() */ + @Override public void beforeChunk() { } /* (non-Javadoc) * @see org.springframework.batch.core.domain.ItemReadListener#afterRead(java.lang.Object) */ + @Override public void afterRead(T item) { } /* (non-Javadoc) * @see org.springframework.batch.core.domain.ItemReadListener#beforeRead() */ + @Override public void beforeRead() { } /* (non-Javadoc) * @see org.springframework.batch.core.domain.ItemReadListener#onReadError(java.lang.Exception) */ + @Override public void onReadError(Exception ex) { } /* (non-Javadoc) * @see org.springframework.batch.core.ItemWriteListener#afterWrite(java.util.List) */ + @Override public void afterWrite(List items) { } /* (non-Javadoc) * @see org.springframework.batch.core.ItemWriteListener#beforeWrite(java.util.List) */ + @Override public void beforeWrite(List items) { } /* (non-Javadoc) * @see org.springframework.batch.core.ItemWriteListener#onWriteError(java.lang.Exception, java.util.List) */ + @Override public void onWriteError(Exception exception, List items) { } /* (non-Javadoc) * @see org.springframework.batch.core.ItemProcessListener#afterProcess(java.lang.Object, java.lang.Object) */ + @Override public void afterProcess(T item, S result) { } /* (non-Javadoc) * @see org.springframework.batch.core.ItemProcessListener#beforeProcess(java.lang.Object) */ + @Override public void beforeProcess(T item) { } /* (non-Javadoc) * @see org.springframework.batch.core.ItemProcessListener#onProcessError(java.lang.Object, java.lang.Exception) */ + @Override public void onProcessError(T item, Exception e) { } /* (non-Javadoc) * @see org.springframework.batch.core.SkipListener#onSkipInProcess(java.lang.Object, java.lang.Throwable) */ + @Override public void onSkipInProcess(T item, Throwable t) { } /* (non-Javadoc) * @see org.springframework.batch.core.SkipListener#onSkipInRead(java.lang.Throwable) */ + @Override public void onSkipInRead(Throwable t) { } /* (non-Javadoc) * @see org.springframework.batch.core.SkipListener#onSkipInWrite(java.lang.Object, java.lang.Throwable) */ + @Override public void onSkipInWrite(S item, Throwable t) { } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/AbstractPartitionHandler.java b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/AbstractPartitionHandler.java index f745d6ea0..27cd42668 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/AbstractPartitionHandler.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/AbstractPartitionHandler.java @@ -53,6 +53,7 @@ public abstract class AbstractPartitionHandler implements PartitionHandler { /** * @see PartitionHandler#handle(StepExecutionSplitter, StepExecution) */ + @Override public Collection handle(final StepExecutionSplitter stepSplitter, final StepExecution masterStepExecution) throws Exception { final Set stepExecutions = stepSplitter.split(masterStepExecution, gridSize); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/DefaultStepExecutionAggregator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/DefaultStepExecutionAggregator.java index b03dcbc90..467545d9b 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/DefaultStepExecutionAggregator.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/DefaultStepExecutionAggregator.java @@ -43,6 +43,7 @@ public class DefaultStepExecutionAggregator implements StepExecutionAggregator { * * @see StepExecutionAggregator #aggregate(StepExecution, Collection) */ + @Override public void aggregate(StepExecution result, Collection executions) { Assert.notNull(result, "To aggregate into a result it must be non-null."); if (executions == null) { diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/MultiResourcePartitioner.java b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/MultiResourcePartitioner.java index 244ad16c8..91ee19a23 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/MultiResourcePartitioner.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/MultiResourcePartitioner.java @@ -68,6 +68,7 @@ public class MultiResourcePartitioner implements Partitioner { * * @see Partitioner#partition(int) */ + @Override public Map partition(int gridSize) { Map map = new HashMap(gridSize); int i = 0; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/PartitionStep.java b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/PartitionStep.java index 0e5105b3c..04ddf492f 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/PartitionStep.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/PartitionStep.java @@ -78,6 +78,7 @@ public class PartitionStep extends AbstractStep { * * @see AbstractStep#afterPropertiesSet() */ + @Override public void afterPropertiesSet() throws Exception { Assert.notNull(stepExecutionSplitter, "StepExecutionSplitter must be provided"); Assert.notNull(partitionHandler, "PartitionHandler must be provided"); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/RemoteStepExecutionAggregator.java b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/RemoteStepExecutionAggregator.java index 109a93acf..cff7d490d 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/RemoteStepExecutionAggregator.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/RemoteStepExecutionAggregator.java @@ -72,6 +72,7 @@ public class RemoteStepExecutionAggregator implements StepExecutionAggregator, I /** * @throws Exception if the job explorer is not provided */ + @Override public void afterPropertiesSet() throws Exception { Assert.state(jobExplorer != null, "A JobExplorer must be provided"); } @@ -83,6 +84,7 @@ public class RemoteStepExecutionAggregator implements StepExecutionAggregator, I * * @see StepExecutionAggregator #aggregate(StepExecution, Collection) */ + @Override public void aggregate(StepExecution result, Collection executions) { Assert.notNull(result, "To aggregate into a result it must be non-null."); if (executions == null) { diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/SimplePartitioner.java b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/SimplePartitioner.java index 4f383902a..dbcd46359 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/SimplePartitioner.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/SimplePartitioner.java @@ -34,6 +34,7 @@ public class SimplePartitioner implements Partitioner { private static final String PARTITION_KEY = "partition"; + @Override public Map partition(int gridSize) { Map map = new HashMap(gridSize); for (int i = 0; i < gridSize; i++) { diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/SimpleStepExecutionSplitter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/SimpleStepExecutionSplitter.java index e6848a28d..4967a2445 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/SimpleStepExecutionSplitter.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/SimpleStepExecutionSplitter.java @@ -108,6 +108,7 @@ public class SimpleStepExecutionSplitter implements StepExecutionSplitter, Initi * * @see InitializingBean#afterPropertiesSet() */ + @Override public void afterPropertiesSet() throws Exception { Assert.state(jobRepository != null, "A JobRepository is required"); Assert.state(stepName != null, "A step name is required"); @@ -160,6 +161,7 @@ public class SimpleStepExecutionSplitter implements StepExecutionSplitter, Initi /** * @see StepExecutionSplitter#getStepName() */ + @Override public String getStepName() { return this.stepName; } @@ -167,6 +169,7 @@ public class SimpleStepExecutionSplitter implements StepExecutionSplitter, Initi /** * @see StepExecutionSplitter#split(StepExecution, int) */ + @Override public Set split(StepExecution stepExecution, int gridSize) throws JobExecutionException { JobExecution jobExecution = stepExecution.getJobExecution(); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/TaskExecutorPartitionHandler.java b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/TaskExecutorPartitionHandler.java index be486025e..f382c3864 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/TaskExecutorPartitionHandler.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/partition/support/TaskExecutorPartitionHandler.java @@ -53,6 +53,7 @@ public class TaskExecutorPartitionHandler extends AbstractPartitionHandler imple private Step step; + @Override public void afterPropertiesSet() throws Exception { } @@ -84,6 +85,7 @@ public class TaskExecutorPartitionHandler extends AbstractPartitionHandler imple * @return the step instance that will be used * @see StepHolder#getStep() */ + @Override public Step getStep() { return this.step; } @@ -132,6 +134,7 @@ public class TaskExecutorPartitionHandler extends AbstractPartitionHandler imple protected FutureTask createTask(final Step step, final StepExecution stepExecution) { return new FutureTask(new Callable() { + @Override public StepExecution call() throws Exception { step.execute(stepExecution); return stepExecution; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/AbstractJdbcBatchMetadataDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/AbstractJdbcBatchMetadataDao.java index 1fb8cf3ef..1c648ba06 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/AbstractJdbcBatchMetadataDao.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/AbstractJdbcBatchMetadataDao.java @@ -79,6 +79,7 @@ public abstract class AbstractJdbcBatchMetadataDao implements InitializingBean { this.clobTypeToUse = clobTypeToUse; } + @Override public void afterPropertiesSet() throws Exception { Assert.notNull(jdbcTemplate); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/DefaultExecutionContextSerializer.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/DefaultExecutionContextSerializer.java index 52c2eb9a7..3533613e6 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/DefaultExecutionContextSerializer.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/DefaultExecutionContextSerializer.java @@ -34,6 +34,7 @@ public class DefaultExecutionContextSerializer implements ExecutionContextSerial * @param context * @param out */ + @Override @SuppressWarnings("unchecked") public void serialize(Object context, OutputStream out) throws IOException { Assert.notNull(context); @@ -48,6 +49,7 @@ public class DefaultExecutionContextSerializer implements ExecutionContextSerial * @param inputStream * @return the object serialized in the provided {@link InputStream} */ + @Override public Object deserialize(InputStream inputStream) throws IOException { return deserializer.deserialize(inputStream); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcExecutionContextDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcExecutionContextDao.java index 85856462d..0b09db54f 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcExecutionContextDao.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcExecutionContextDao.java @@ -100,6 +100,7 @@ public class JdbcExecutionContextDao extends AbstractJdbcBatchMetadataDao implem this.shortContextLength = shortContextLength; } + @Override public ExecutionContext getExecutionContext(JobExecution jobExecution) { Long executionId = jobExecution.getId(); Assert.notNull(executionId, "ExecutionId must not be null."); @@ -114,6 +115,7 @@ public class JdbcExecutionContextDao extends AbstractJdbcBatchMetadataDao implem } } + @Override public ExecutionContext getExecutionContext(StepExecution stepExecution) { Long executionId = stepExecution.getId(); Assert.notNull(executionId, "ExecutionId must not be null."); @@ -128,6 +130,7 @@ public class JdbcExecutionContextDao extends AbstractJdbcBatchMetadataDao implem } } + @Override public void updateExecutionContext(final JobExecution jobExecution) { Long executionId = jobExecution.getId(); ExecutionContext executionContext = jobExecution.getExecutionContext(); @@ -139,6 +142,7 @@ public class JdbcExecutionContextDao extends AbstractJdbcBatchMetadataDao implem persistSerializedContext(executionId, serializedContext, UPDATE_JOB_EXECUTION_CONTEXT); } + @Override public void updateExecutionContext(final StepExecution stepExecution) { Long executionId = stepExecution.getId(); @@ -151,6 +155,7 @@ public class JdbcExecutionContextDao extends AbstractJdbcBatchMetadataDao implem persistSerializedContext(executionId, serializedContext, UPDATE_STEP_EXECUTION_CONTEXT); } + @Override public void saveExecutionContext(JobExecution jobExecution) { Long executionId = jobExecution.getId(); @@ -163,6 +168,7 @@ public class JdbcExecutionContextDao extends AbstractJdbcBatchMetadataDao implem persistSerializedContext(executionId, serializedContext, INSERT_JOB_EXECUTION_CONTEXT); } + @Override public void saveExecutionContext(StepExecution stepExecution) { Long executionId = stepExecution.getId(); ExecutionContext executionContext = stepExecution.getExecutionContext(); @@ -204,6 +210,7 @@ public class JdbcExecutionContextDao extends AbstractJdbcBatchMetadataDao implem } getJdbcTemplate().update(getQuery(sql), new PreparedStatementSetter() { + @Override public void setValues(PreparedStatement ps) throws SQLException { ps.setString(1, shortContext); if (longContext != null) { @@ -240,6 +247,7 @@ public class JdbcExecutionContextDao extends AbstractJdbcBatchMetadataDao implem @SuppressWarnings("unchecked") private class ExecutionContextRowMapper implements ParameterizedRowMapper { + @Override public ExecutionContext mapRow(ResultSet rs, int i) throws SQLException { ExecutionContext executionContext = new ExecutionContext(); String serializedContext = rs.getString("SERIALIZED_CONTEXT"); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobExecutionDao.java index 31e7f68c2..cf9c7b21c 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobExecutionDao.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobExecutionDao.java @@ -102,11 +102,13 @@ public class JdbcJobExecutionDao extends AbstractJdbcBatchMetadataDao implements this.jobExecutionIncrementer = jobExecutionIncrementer; } + @Override public void afterPropertiesSet() throws Exception { super.afterPropertiesSet(); Assert.notNull(jobExecutionIncrementer, "The jobExecutionIncrementer must not be null."); } + @Override public List findJobExecutions(final JobInstance job) { Assert.notNull(job, "Job cannot be null."); @@ -125,6 +127,7 @@ public class JdbcJobExecutionDao extends AbstractJdbcBatchMetadataDao implements * @throws IllegalArgumentException if jobExecution is null, as well as any * of it's fields to be persisted. */ + @Override public void saveJobExecution(JobExecution jobExecution) { validateJobExecution(jobExecution); @@ -166,6 +169,7 @@ public class JdbcJobExecutionDao extends AbstractJdbcBatchMetadataDao implements * * @see JobExecutionDao#updateJobExecution(JobExecution) */ + @Override public void updateJobExecution(JobExecution jobExecution) { validateJobExecution(jobExecution); @@ -217,6 +221,7 @@ public class JdbcJobExecutionDao extends AbstractJdbcBatchMetadataDao implements } } + @Override public JobExecution getLastJobExecution(JobInstance jobInstance) { Long id = jobInstance.getId(); @@ -240,6 +245,7 @@ public class JdbcJobExecutionDao extends AbstractJdbcBatchMetadataDao implements * @seeorg.springframework.batch.core.repository.dao.JobExecutionDao# * getLastJobExecution(java.lang.String) */ + @Override public JobExecution getJobExecution(Long executionId) { try { JobExecution jobExecution = getJdbcTemplate().queryForObject(getQuery(GET_EXECUTION_BY_ID), @@ -257,10 +263,12 @@ public class JdbcJobExecutionDao extends AbstractJdbcBatchMetadataDao implements * @seeorg.springframework.batch.core.repository.dao.JobExecutionDao# * findRunningJobExecutions(java.lang.String) */ + @Override public Set findRunningJobExecutions(String jobName) { final Set result = new HashSet(); RowCallbackHandler handler = new RowCallbackHandler() { + @Override public void processRow(ResultSet rs) throws SQLException { JobExecutionRowMapper mapper = new JobExecutionRowMapper(); result.add(mapper.mapRow(rs, 0)); @@ -271,6 +279,7 @@ public class JdbcJobExecutionDao extends AbstractJdbcBatchMetadataDao implements return result; } + @Override public void synchronizeStatus(JobExecution jobExecution) { int currentVersion = getJdbcTemplate().queryForInt(getQuery(CURRENT_VERSION_JOB_EXECUTION), jobExecution.getId()); @@ -299,6 +308,7 @@ public class JdbcJobExecutionDao extends AbstractJdbcBatchMetadataDao implements this.jobInstance = jobInstance; } + @Override public JobExecution mapRow(ResultSet rs, int rowNum) throws SQLException { Long id = rs.getLong(1); JobExecution jobExecution; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobInstanceDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobInstanceDao.java index 089bbf053..f5c11f01c 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobInstanceDao.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcJobInstanceDao.java @@ -98,6 +98,7 @@ public class JdbcJobInstanceDao extends AbstractJdbcBatchMetadataDao implements * @throws IllegalArgumentException * if any {@link JobParameters} fields are null. */ + @Override public JobInstance createJobInstance(String jobName, JobParameters jobParameters) { @@ -206,6 +207,7 @@ public class JdbcJobInstanceDao extends AbstractJdbcBatchMetadataDao implements * @throws IllegalArgumentException * if any {@link JobParameters} fields are null. */ + @Override public JobInstance getJobInstance(final String jobName, final JobParameters jobParameters) { @@ -242,6 +244,7 @@ public class JdbcJobInstanceDao extends AbstractJdbcBatchMetadataDao implements * org.springframework.batch.core.repository.dao.JobInstanceDao#getJobInstance * (java.lang.Long) */ + @Override public JobInstance getJobInstance(Long instanceId) { try { @@ -260,6 +263,7 @@ public class JdbcJobInstanceDao extends AbstractJdbcBatchMetadataDao implements private JobParameters getJobParameters(Long instanceId) { final Map map = new HashMap(); RowCallbackHandler handler = new RowCallbackHandler() { + @Override public void processRow(ResultSet rs) throws SQLException { ParameterType type = ParameterType.valueOf(rs.getString(3)); JobParameter value = null; @@ -287,9 +291,11 @@ public class JdbcJobInstanceDao extends AbstractJdbcBatchMetadataDao implements * org.springframework.batch.core.repository.dao.JobInstanceDao#getJobNames * () */ + @Override public List getJobNames() { return getJdbcTemplate().query(getQuery(FIND_JOB_NAMES), new ParameterizedRowMapper() { + @Override public String mapRow(ResultSet rs, int rowNum) throws SQLException { return rs.getString(1); @@ -303,6 +309,7 @@ public class JdbcJobInstanceDao extends AbstractJdbcBatchMetadataDao implements * @seeorg.springframework.batch.core.repository.dao.JobInstanceDao# * getLastJobInstances(java.lang.String, int) */ + @Override public List getJobInstances(String jobName, final int start, final int count) { @@ -310,6 +317,7 @@ public class JdbcJobInstanceDao extends AbstractJdbcBatchMetadataDao implements private List list = new ArrayList(); + @Override public Object extractData(ResultSet rs) throws SQLException, DataAccessException { int rowNum = 0; @@ -340,6 +348,7 @@ public class JdbcJobInstanceDao extends AbstractJdbcBatchMetadataDao implements * org.springframework.batch.core.repository.dao.JobInstanceDao#getJobInstance * (org.springframework.batch.core.JobExecution) */ + @Override public JobInstance getJobInstance(JobExecution jobExecution) { try { @@ -362,6 +371,7 @@ public class JdbcJobInstanceDao extends AbstractJdbcBatchMetadataDao implements this.jobIncrementer = jobIncrementer; } + @Override public void afterPropertiesSet() throws Exception { super.afterPropertiesSet(); Assert.notNull(jobIncrementer); @@ -383,6 +393,7 @@ public class JdbcJobInstanceDao extends AbstractJdbcBatchMetadataDao implements this.jobParameters = jobParameters; } + @Override public JobInstance mapRow(ResultSet rs, int rowNum) throws SQLException { Long id = rs.getLong(1); if (jobParameters == null) { diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcStepExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcStepExecutionDao.java index 3f7275e4b..dc014a923 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcStepExecutionDao.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcStepExecutionDao.java @@ -91,6 +91,7 @@ public class JdbcStepExecutionDao extends AbstractJdbcBatchMetadataDao implement this.stepExecutionIncrementer = stepExecutionIncrementer; } + @Override public void afterPropertiesSet() throws Exception { super.afterPropertiesSet(); Assert.notNull(stepExecutionIncrementer, "StepExecutionIncrementer cannot be null."); @@ -103,6 +104,7 @@ public class JdbcStepExecutionDao extends AbstractJdbcBatchMetadataDao implement * * @see StepExecutionDao#saveStepExecution(StepExecution) */ + @Override public void saveStepExecution(StepExecution stepExecution) { Assert.isNull(stepExecution.getId(), @@ -145,6 +147,7 @@ public class JdbcStepExecutionDao extends AbstractJdbcBatchMetadataDao implement Assert.notNull(stepExecution.getStatus(), "StepExecution status cannot be null."); } + @Override public void updateStepExecution(StepExecution stepExecution) { validateStepExecution(stepExecution); @@ -206,6 +209,7 @@ public class JdbcStepExecutionDao extends AbstractJdbcBatchMetadataDao implement } } + @Override public StepExecution getStepExecution(JobExecution jobExecution, Long stepExecutionId) { List executions = getJdbcTemplate().query(getQuery(GET_STEP_EXECUTION), new StepExecutionRowMapper(jobExecution), jobExecution.getId(), stepExecutionId); @@ -220,6 +224,7 @@ public class JdbcStepExecutionDao extends AbstractJdbcBatchMetadataDao implement } } + @Override public void addStepExecutions(JobExecution jobExecution) { getJdbcTemplate().query(getQuery(GET_STEP_EXECUTIONS), new StepExecutionRowMapper(jobExecution), jobExecution.getId()); @@ -233,6 +238,7 @@ public class JdbcStepExecutionDao extends AbstractJdbcBatchMetadataDao implement this.jobExecution = jobExecution; } + @Override public StepExecution mapRow(ResultSet rs, int rowNum) throws SQLException { StepExecution stepExecution = new StepExecution(rs.getString(2), jobExecution, rs.getLong(1)); stepExecution.setStartTime(rs.getTimestamp(3)); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapExecutionContextDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapExecutionContextDao.java index 880dd21cc..8585cce2d 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapExecutionContextDao.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapExecutionContextDao.java @@ -49,6 +49,7 @@ public class MapExecutionContextDao implements ExecutionContextDao { this.id = id; } + @Override public int compareTo(ContextKey them) { if(them == null) return 1; final int idCompare = new Long(this.id).compareTo(new Long(them.id)); // JDK6 Make this Long.compare(x,y) @@ -93,10 +94,12 @@ public class MapExecutionContextDao implements ExecutionContextDao { return (ExecutionContext) SerializationUtils.deserialize(SerializationUtils.serialize(original)); } + @Override public ExecutionContext getExecutionContext(StepExecution stepExecution) { return copy(contexts.get(ContextKey.step(stepExecution.getId()))); } + @Override public void updateExecutionContext(StepExecution stepExecution) { ExecutionContext executionContext = stepExecution.getExecutionContext(); if (executionContext != null) { @@ -104,10 +107,12 @@ public class MapExecutionContextDao implements ExecutionContextDao { } } + @Override public ExecutionContext getExecutionContext(JobExecution jobExecution) { return copy(contexts.get(ContextKey.job(jobExecution.getId()))); } + @Override public void updateExecutionContext(JobExecution jobExecution) { ExecutionContext executionContext = jobExecution.getExecutionContext(); if (executionContext != null) { @@ -115,10 +120,12 @@ public class MapExecutionContextDao implements ExecutionContextDao { } } + @Override public void saveExecutionContext(JobExecution jobExecution) { updateExecutionContext(jobExecution); } + @Override public void saveExecutionContext(StepExecution stepExecution) { updateExecutionContext(stepExecution); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapJobExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapJobExecutionDao.java index ca8da5215..d50302061 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapJobExecutionDao.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapJobExecutionDao.java @@ -53,6 +53,7 @@ public class MapJobExecutionDao implements JobExecutionDao { return copy; } + @Override public void saveJobExecution(JobExecution jobExecution) { Assert.isTrue(jobExecution.getId() == null); Long newId = currentId.getAndIncrement(); @@ -61,6 +62,7 @@ public class MapJobExecutionDao implements JobExecutionDao { executionsById.put(newId, copy(jobExecution)); } + @Override public List findJobExecutions(JobInstance jobInstance) { List executions = new ArrayList(); for (JobExecution exec : executionsById.values()) { @@ -70,6 +72,7 @@ public class MapJobExecutionDao implements JobExecutionDao { } Collections.sort(executions, new Comparator() { + @Override public int compare(JobExecution e1, JobExecution e2) { long result = (e1.getId() - e2.getId()); if (result > 0) { @@ -86,6 +89,7 @@ public class MapJobExecutionDao implements JobExecutionDao { return executions; } + @Override public void updateJobExecution(JobExecution jobExecution) { Long id = jobExecution.getId(); Assert.notNull(id, "JobExecution is expected to have an id (should be saved already)"); @@ -103,6 +107,7 @@ public class MapJobExecutionDao implements JobExecutionDao { } } + @Override public JobExecution getLastJobExecution(JobInstance jobInstance) { JobExecution lastExec = null; for (JobExecution exec : executionsById.values()) { @@ -125,6 +130,7 @@ public class MapJobExecutionDao implements JobExecutionDao { * @seeorg.springframework.batch.core.repository.dao.JobExecutionDao# * findRunningJobExecutions(java.lang.String) */ + @Override public Set findRunningJobExecutions(String jobName) { Set result = new HashSet(); for (JobExecution exec : executionsById.values()) { @@ -143,10 +149,12 @@ public class MapJobExecutionDao implements JobExecutionDao { * org.springframework.batch.core.repository.dao.JobExecutionDao#getJobExecution * (java.lang.Long) */ + @Override public JobExecution getJobExecution(Long executionId) { return copy(executionsById.get(executionId)); } + @Override public void synchronizeStatus(JobExecution jobExecution) { JobExecution saved = getJobExecution(jobExecution.getId()); if (saved.getVersion().intValue() != jobExecution.getVersion().intValue()) { diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapJobInstanceDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapJobInstanceDao.java index 68ade2582..7c6b2da9c 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapJobInstanceDao.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapJobInstanceDao.java @@ -45,6 +45,7 @@ public class MapJobInstanceDao implements JobInstanceDao { jobInstances.clear(); } + @Override public JobInstance createJobInstance(String jobName, JobParameters jobParameters) { Assert.state(getJobInstance(jobName, jobParameters) == null, "JobInstance must not already exist"); @@ -56,6 +57,7 @@ public class MapJobInstanceDao implements JobInstanceDao { return jobInstance; } + @Override public JobInstance getJobInstance(String jobName, JobParameters jobParameters) { for (JobInstance instance : jobInstances) { @@ -67,6 +69,7 @@ public class MapJobInstanceDao implements JobInstanceDao { } + @Override public JobInstance getJobInstance(Long instanceId) { for (JobInstance instance : jobInstances) { if (instance.getId().equals(instanceId)) { @@ -76,6 +79,7 @@ public class MapJobInstanceDao implements JobInstanceDao { return null; } + @Override public List getJobNames() { List result = new ArrayList(); for (JobInstance instance : jobInstances) { @@ -85,6 +89,7 @@ public class MapJobInstanceDao implements JobInstanceDao { return result; } + @Override public List getJobInstances(String jobName, int start, int count) { List result = new ArrayList(); for (JobInstance instance : jobInstances) { @@ -94,6 +99,7 @@ public class MapJobInstanceDao implements JobInstanceDao { } Collections.sort(result, new Comparator() { // sort by ID descending + @Override public int compare(JobInstance o1, JobInstance o2) { return Long.signum(o2.getId() - o1.getId()); } @@ -104,6 +110,7 @@ public class MapJobInstanceDao implements JobInstanceDao { return result.subList(startIndex, endIndex); } + @Override public JobInstance getJobInstance(JobExecution jobExecution) { return jobExecution.getJobInstance(); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapStepExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapStepExecutionDao.java index 2752059d4..e7e8e4095 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapStepExecutionDao.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/MapStepExecutionDao.java @@ -56,6 +56,7 @@ public class MapStepExecutionDao implements StepExecutionDao { // Cheaper than full serialization is a reflective field copy, which is // fine for volatile storage ReflectionUtils.doWithFields(StepExecution.class, new ReflectionUtils.FieldCallback() { + @Override public void doWith(Field field) throws IllegalArgumentException, IllegalAccessException { field.setAccessible(true); field.set(targetExecution, field.get(sourceExecution)); @@ -63,6 +64,7 @@ public class MapStepExecutionDao implements StepExecutionDao { }); } + @Override public void saveStepExecution(StepExecution stepExecution) { Assert.isTrue(stepExecution.getId() == null); @@ -83,6 +85,7 @@ public class MapStepExecutionDao implements StepExecutionDao { } + @Override public void updateStepExecution(StepExecution stepExecution) { Assert.notNull(stepExecution.getJobExecutionId()); @@ -108,10 +111,12 @@ public class MapStepExecutionDao implements StepExecutionDao { } } + @Override public StepExecution getStepExecution(JobExecution jobExecution, Long stepExecutionId) { return executionsByStepExecutionId.get(stepExecutionId); } + @Override public void addStepExecutions(JobExecution jobExecution) { Map executions = executionsByJobExecutionId.get(jobExecution.getId()); if (executions == null || executions.isEmpty()) { @@ -120,6 +125,7 @@ public class MapStepExecutionDao implements StepExecutionDao { List result = new ArrayList(executions.values()); Collections.sort(result, new Comparator() { + @Override public int compare(Entity o1, Entity o2) { return Long.signum(o2.getId() - o1.getId()); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/XStreamExecutionContextStringSerializer.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/XStreamExecutionContextStringSerializer.java index b0be6a559..951b6f8c5 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/XStreamExecutionContextStringSerializer.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/XStreamExecutionContextStringSerializer.java @@ -57,6 +57,7 @@ public class XStreamExecutionContextStringSerializer implements ExecutionContext this.hierarchicalStreamDriver = hierarchicalStreamDriver; } + @Override public void afterPropertiesSet() throws Exception { init(); } @@ -80,6 +81,7 @@ public class XStreamExecutionContextStringSerializer implements ExecutionContext * @param out * @see Serializer#serialize(Object, OutputStream) */ + @Override public void serialize(Object context, OutputStream out) throws IOException { Assert.notNull(context); Assert.notNull(out); @@ -94,6 +96,7 @@ public class XStreamExecutionContextStringSerializer implements ExecutionContext * @return a reconstructed execution context * @see Deserializer#deserialize(InputStream) */ + @Override @SuppressWarnings("unchecked") public Object deserialize(InputStream in) throws IOException { BufferedReader br = new BufferedReader(new InputStreamReader(in)); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/AbstractJobRepositoryFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/AbstractJobRepositoryFactoryBean.java index db4f6ead0..dbfdcaf77 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/AbstractJobRepositoryFactoryBean.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/AbstractJobRepositoryFactoryBean.java @@ -87,10 +87,12 @@ public abstract class AbstractJobRepositoryFactoryBean implements FactoryBean, I * @return JobRepository.class * @see org.springframework.beans.factory.FactoryBean#getObjectType() */ + @Override public Class getObjectType() { return JobRepository.class; } + @Override public boolean isSingleton() { return true; } @@ -159,6 +161,7 @@ public abstract class AbstractJobRepositoryFactoryBean implements FactoryBean, I + isolationLevelForCreate + "\n*=PROPAGATION_REQUIRED")); if (validateTransactionState) { DefaultPointcutAdvisor advisor = new DefaultPointcutAdvisor(new MethodInterceptor() { + @Override public Object invoke(MethodInvocation invocation) throws Throwable { if (TransactionSynchronizationManager.isActualTransactionActive()) { throw new IllegalStateException( @@ -180,6 +183,7 @@ public abstract class AbstractJobRepositoryFactoryBean implements FactoryBean, I } } + @Override public void afterPropertiesSet() throws Exception { Assert.notNull(transactionManager, "TransactionManager must not be null."); @@ -191,6 +195,7 @@ public abstract class AbstractJobRepositoryFactoryBean implements FactoryBean, I createExecutionContextDao()); } + @Override public Object getObject() throws Exception { if (proxyFactory == null) { afterPropertiesSet(); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/SimpleJobRepository.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/SimpleJobRepository.java index 5aa9a9976..1b8ddfe91 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/SimpleJobRepository.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/SimpleJobRepository.java @@ -83,10 +83,12 @@ public class SimpleJobRepository implements JobRepository { this.ecDao = ecDao; } + @Override public boolean isJobInstanceExists(String jobName, JobParameters jobParameters) { return jobInstanceDao.getJobInstance(jobName, jobParameters) != null; } + @Override public JobExecution createJobExecution(String jobName, JobParameters jobParameters) throws JobExecutionAlreadyRunningException, JobRestartException, JobInstanceAlreadyCompleteException { @@ -145,6 +147,7 @@ public class SimpleJobRepository implements JobRepository { } + @Override public void update(JobExecution jobExecution) { Assert.notNull(jobExecution, "JobExecution cannot be null."); @@ -155,6 +158,7 @@ public class SimpleJobRepository implements JobRepository { jobExecutionDao.updateJobExecution(jobExecution); } + @Override public void add(StepExecution stepExecution) { validateStepExecution(stepExecution); @@ -163,6 +167,7 @@ public class SimpleJobRepository implements JobRepository { ecDao.saveExecutionContext(stepExecution); } + @Override public void update(StepExecution stepExecution) { validateStepExecution(stepExecution); Assert.notNull(stepExecution.getId(), "StepExecution must already be saved (have an id assigned)"); @@ -178,16 +183,19 @@ public class SimpleJobRepository implements JobRepository { Assert.notNull(stepExecution.getJobExecutionId(), "StepExecution must belong to persisted JobExecution"); } + @Override public void updateExecutionContext(StepExecution stepExecution) { validateStepExecution(stepExecution); Assert.notNull(stepExecution.getId(), "StepExecution must already be saved (have an id assigned)"); ecDao.updateExecutionContext(stepExecution); } + @Override public void updateExecutionContext(JobExecution jobExecution) { ecDao.updateExecutionContext(jobExecution); } + @Override public StepExecution getLastStepExecution(JobInstance jobInstance, String stepName) { List jobExecutions = jobExecutionDao.findJobExecutions(jobInstance); List stepExecutions = new ArrayList(jobExecutions.size()); @@ -218,6 +226,7 @@ public class SimpleJobRepository implements JobRepository { /** * @return number of executions of the step within given job instance */ + @Override public int getStepExecutionCount(JobInstance jobInstance, String stepName) { int count = 0; List jobExecutions = jobExecutionDao.findJobExecutions(jobInstance); @@ -249,6 +258,7 @@ public class SimpleJobRepository implements JobRepository { } } + @Override public JobExecution getLastJobExecution(String jobName, JobParameters jobParameters) { JobInstance jobInstance = jobInstanceDao.getJobInstance(jobName, jobParameters); if (jobInstance == null) { diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/resource/ListPreparedStatementSetter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/resource/ListPreparedStatementSetter.java index 342bc6c0c..e8be8af99 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/resource/ListPreparedStatementSetter.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/resource/ListPreparedStatementSetter.java @@ -43,6 +43,7 @@ public class ListPreparedStatementSetter implements private List parameters; + @Override public void setValues(PreparedStatement ps) throws SQLException { for (int i = 0; i < parameters.size(); i++) { StatementCreatorUtils.setParameterValue(ps, i + 1, SqlTypeValue.TYPE_UNKNOWN, parameters.get(i)); @@ -58,6 +59,7 @@ public class ListPreparedStatementSetter implements this.parameters = parameters; } + @Override public void afterPropertiesSet() throws Exception { Assert.notNull(parameters, "Parameters must be provided"); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/resource/StepExecutionSimpleCompletionPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/core/resource/StepExecutionSimpleCompletionPolicy.java index 3ed303631..391a335ec 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/resource/StepExecutionSimpleCompletionPolicy.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/resource/StepExecutionSimpleCompletionPolicy.java @@ -71,6 +71,7 @@ public class StepExecutionSimpleCompletionPolicy extends StepExecutionListenerSu * * @see org.springframework.batch.core.listener.StepExecutionListenerSupport#beforeStep(org.springframework.batch.core.StepExecution) */ + @Override public void beforeStep(StepExecution stepExecution) { JobParameters jobParameters = stepExecution.getJobParameters(); Assert.state(jobParameters.getParameters().containsKey(keyName), @@ -85,6 +86,7 @@ public class StepExecutionSimpleCompletionPolicy extends StepExecutionListenerSu * indicates completion * @see CompletionPolicy#isComplete(RepeatContext, RepeatStatus) */ + @Override public boolean isComplete(RepeatContext context, RepeatStatus result) { Assert.state(delegate != null, "The delegate resource has not been initialised. " + "Remember to register this object as a StepListener."); @@ -96,6 +98,7 @@ public class StepExecutionSimpleCompletionPolicy extends StepExecutionListenerSu * @return if the commit interval has been reached * @see org.springframework.batch.repeat.CompletionPolicy#isComplete(org.springframework.batch.repeat.RepeatContext) */ + @Override public boolean isComplete(RepeatContext context) { Assert.state(delegate != null, "The delegate resource has not been initialised. " + "Remember to register this object as a StepListener."); @@ -107,6 +110,7 @@ public class StepExecutionSimpleCompletionPolicy extends StepExecutionListenerSu * @return a new {@link RepeatContext} * @see org.springframework.batch.repeat.CompletionPolicy#start(org.springframework.batch.repeat.RepeatContext) */ + @Override public RepeatContext start(RepeatContext parent) { Assert.state(delegate != null, "The delegate resource has not been initialised. " + "Remember to register this object as a StepListener."); @@ -117,6 +121,7 @@ public class StepExecutionSimpleCompletionPolicy extends StepExecutionListenerSu * @param context * @see org.springframework.batch.repeat.CompletionPolicy#update(org.springframework.batch.repeat.RepeatContext) */ + @Override public void update(RepeatContext context) { Assert.state(delegate != null, "The delegate resource has not been initialised. " + "Remember to register this object as a StepListener."); @@ -127,6 +132,7 @@ public class StepExecutionSimpleCompletionPolicy extends StepExecutionListenerSu * Delegates to the wrapped {@link CompletionPolicy} if set, otherwise * returns the value of {@link #setKeyName(String)}. */ + @Override public String toString() { return (delegate == null) ? keyName : delegate.toString(); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/scope/StepScope.java b/spring-batch-core/src/main/java/org/springframework/batch/core/scope/StepScope.java index 0b4cf7c55..fb6ba5aeb 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/scope/StepScope.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/scope/StepScope.java @@ -91,6 +91,7 @@ public class StepScope implements Scope, BeanFactoryPostProcessor, Ordered { this.order = order; } + @Override public int getOrder() { return order; } @@ -124,6 +125,7 @@ public class StepScope implements Scope, BeanFactoryPostProcessor, Ordered { * step-scoped beans. This method is part of the Scope SPI in Spring 3.0, * but should just be ignored by earlier versions of Spring. */ + @Override public Object resolveContextualObject(String key) { StepContext context = getContext(); // TODO: support for attributes as well maybe (setters not exposed yet @@ -134,6 +136,7 @@ public class StepScope implements Scope, BeanFactoryPostProcessor, Ordered { /** * @see Scope#get(String, ObjectFactory) */ + @Override public Object get(String name, ObjectFactory objectFactory) { StepContext context = getContext(); @@ -161,6 +164,7 @@ public class StepScope implements Scope, BeanFactoryPostProcessor, Ordered { /** * @see Scope#getConversationId() */ + @Override public String getConversationId() { StepContext context = getContext(); return context.getId(); @@ -169,6 +173,7 @@ public class StepScope implements Scope, BeanFactoryPostProcessor, Ordered { /** * @see Scope#registerDestructionCallback(String, Runnable) */ + @Override public void registerDestructionCallback(String name, Runnable callback) { StepContext context = getContext(); logger.debug(String.format("Registered destruction callback in scope=%s, name=%s", this.name, name)); @@ -178,6 +183,7 @@ public class StepScope implements Scope, BeanFactoryPostProcessor, Ordered { /** * @see Scope#remove(String) */ + @Override public Object remove(String name) { StepContext context = getContext(); logger.debug(String.format("Removing from scope=%s, name=%s", this.name, name)); @@ -207,6 +213,7 @@ public class StepScope implements Scope, BeanFactoryPostProcessor, Ordered { * @param beanFactory the BeanFactory to register with * @throws BeansException if there is a problem. */ + @Override public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException { beanFactory.registerScope(name, this); @@ -307,6 +314,7 @@ public class StepScope implements Scope, BeanFactoryPostProcessor, Ordered { public Scopifier(BeanDefinitionRegistry registry, String scope, boolean proxyTargetClass, boolean scoped) { super(new StringValueResolver() { + @Override public String resolveStringValue(String value) { return value; } @@ -374,6 +382,7 @@ public class StepScope implements Scope, BeanFactoryPostProcessor, Ordered { private ExpressionHider(String scope, final boolean scoped) { super(new StringValueResolver() { + @Override public String resolveStringValue(String value) { if (scoped && value.contains(PLACEHOLDER_PREFIX) && value.contains(PLACEHOLDER_SUFFIX)) { value = value.replace(PLACEHOLDER_PREFIX, REPLACEMENT_PREFIX); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/StepContextRepeatCallback.java b/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/StepContextRepeatCallback.java index 558cc945e..69e7ea273 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/StepContextRepeatCallback.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/StepContextRepeatCallback.java @@ -59,6 +59,7 @@ public abstract class StepContextRepeatCallback implements RepeatCallback { * * @see RepeatCallback#doInIteration(RepeatContext) */ + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { // The StepContext has to be the same for all chunks, diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/scope/util/PlaceholderProxyFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/scope/util/PlaceholderProxyFactoryBean.java index c76821dd2..4b58e1b43 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/scope/util/PlaceholderProxyFactoryBean.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/scope/util/PlaceholderProxyFactoryBean.java @@ -74,6 +74,7 @@ public class PlaceholderProxyFactoryBean extends ProxyConfig implements FactoryB this.scopedTargetSource.setTargetBeanName(targetBeanName); } + @Override public void setBeanFactory(BeanFactory beanFactory) { if (!(beanFactory instanceof ConfigurableBeanFactory)) { throw new IllegalStateException("Not running in a ConfigurableBeanFactory: " + beanFactory); @@ -110,6 +111,7 @@ public class PlaceholderProxyFactoryBean extends ProxyConfig implements FactoryB this.proxy = pf.getProxy(cbf.getBeanClassLoader()); } + @Override public Object getObject() { if (this.proxy == null) { throw new FactoryBeanNotInitializedException(); @@ -117,6 +119,7 @@ public class PlaceholderProxyFactoryBean extends ProxyConfig implements FactoryB return this.proxy; } + @Override public Class getObjectType() { if (this.proxy != null) { return this.proxy.getClass(); @@ -127,6 +130,7 @@ public class PlaceholderProxyFactoryBean extends ProxyConfig implements FactoryB return null; } + @Override public boolean isSingleton() { return true; } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/scope/util/StepContextFactory.java b/spring-batch-core/src/main/java/org/springframework/batch/core/scope/util/StepContextFactory.java index 664a9c6f3..e388c0ac0 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/scope/util/StepContextFactory.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/scope/util/StepContextFactory.java @@ -28,10 +28,12 @@ import org.springframework.batch.core.scope.context.StepSynchronizationManager; */ public class StepContextFactory implements ContextFactory { + @Override public Object getContext() { return StepSynchronizationManager.getContext(); } + @Override public String getContextId() { StepContext context = StepSynchronizationManager.getContext(); return context!=null ? (String) context.getId() : "sysinit"; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStep.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStep.java index 79e78e189..bfe1a1d7f 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStep.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/AbstractStep.java @@ -67,11 +67,13 @@ public abstract class AbstractStep implements Step, InitializingBean, BeanNameAw super(); } + @Override public void afterPropertiesSet() throws Exception { Assert.state(name != null, "A Step must have a name"); Assert.state(jobRepository != null, "JobRepository is mandatory"); } + @Override public String getName() { return this.name; } @@ -92,12 +94,14 @@ public abstract class AbstractStep implements Step, InitializingBean, BeanNameAw * * @see org.springframework.beans.factory.BeanNameAware#setBeanName(java.lang.String) */ + @Override public void setBeanName(String name) { if (this.name == null) { this.name = name; } } + @Override public int getStartLimit() { return this.startLimit; } @@ -111,6 +115,7 @@ public abstract class AbstractStep implements Step, InitializingBean, BeanNameAw this.startLimit = startLimit; } + @Override public boolean isAllowStartIfComplete() { return this.allowStartIfComplete; } @@ -168,6 +173,7 @@ public abstract class AbstractStep implements Step, InitializingBean, BeanNameAw * {@link #open(ExecutionContext)}), execution logic ({@link #doExecute(StepExecution)}) and resource closing ( * {@link #close(ExecutionContext)}). */ + @Override public final void execute(StepExecution stepExecution) throws JobInterruptedException, UnexpectedJobExecutionException { @@ -320,6 +326,7 @@ public abstract class AbstractStep implements Step, InitializingBean, BeanNameAw return jobRepository; } + @Override public String toString() { return ClassUtils.getShortName(getClass()) + ": [name=" + name + "]"; } @@ -346,4 +353,4 @@ public abstract class AbstractStep implements Step, InitializingBean, BeanNameAw return exitStatus; } -} \ No newline at end of file +} diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/NoWorkFoundStepExecutionListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/NoWorkFoundStepExecutionListener.java index 9739b0884..63182b3d7 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/NoWorkFoundStepExecutionListener.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/NoWorkFoundStepExecutionListener.java @@ -27,6 +27,7 @@ import org.springframework.batch.core.listener.StepExecutionListenerSupport; */ public class NoWorkFoundStepExecutionListener extends StepExecutionListenerSupport { + @Override public ExitStatus afterStep(StepExecution stepExecution) { if (stepExecution.getReadCount() == 0) { return ExitStatus.FAILED; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepLocatorStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepLocatorStepFactoryBean.java index 6a45a323a..da0636330 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepLocatorStepFactoryBean.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/StepLocatorStepFactoryBean.java @@ -36,6 +36,7 @@ public class StepLocatorStepFactoryBean implements FactoryBean { * * @see FactoryBean#getObject() */ + @Override public Step getObject() throws Exception { return stepLocator.getStep(stepName); } @@ -45,6 +46,7 @@ public class StepLocatorStepFactoryBean implements FactoryBean { * * @see FactoryBean#getObjectType() */ + @Override public Class getObjectType() { return Step.class; } @@ -54,6 +56,7 @@ public class StepLocatorStepFactoryBean implements FactoryBean { * * @see FactoryBean#isSingleton() */ + @Override public boolean isSingleton() { return true; } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/ThreadStepInterruptionPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/ThreadStepInterruptionPolicy.java index d551350de..6bc2077d6 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/ThreadStepInterruptionPolicy.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/ThreadStepInterruptionPolicy.java @@ -36,6 +36,7 @@ public class ThreadStepInterruptionPolicy implements StepInterruptionPolicy { * Returns if the current job lifecycle has been interrupted by checking if * the current thread is interrupted. */ + @Override public void checkInterrupted(StepExecution stepExecution) throws JobInterruptedException { if (isInterrupted(stepExecution)) { diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/FaultTolerantStepBuilder.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/FaultTolerantStepBuilder.java index b7b3f3d11..dd43ce27e 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/FaultTolerantStepBuilder.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/FaultTolerantStepBuilder.java @@ -466,6 +466,7 @@ public class FaultTolerantStepBuilder extends SimpleStepBuilder { final Classifier panic = new BinaryExceptionClassifier(types, true); classifier = new Classifier() { + @Override public Boolean classify(Throwable classifiable) { // Rollback if either the user's list or our own applies return panic.classify(classifiable) || binary.classify(classifiable); @@ -645,6 +646,7 @@ public class FaultTolerantStepBuilder extends SimpleStepBuilder { this.chunkListener = chunkListener; } + @Override public void beforeChunk() { try { chunkListener.beforeChunk(); @@ -654,6 +656,7 @@ public class FaultTolerantStepBuilder extends SimpleStepBuilder { } } + @Override public void afterChunk() { try { chunkListener.afterChunk(); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/factory/FaultTolerantStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/factory/FaultTolerantStepFactoryBean.java index 8cee29a06..7a7ca8df9 100755 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/factory/FaultTolerantStepFactoryBean.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/factory/FaultTolerantStepFactoryBean.java @@ -217,6 +217,7 @@ public class FaultTolerantStepFactoryBean extends SimpleStepFactoryBean createBuilder(String name) { return new FaultTolerantStepBuilder(new StepBuilder(name)); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/factory/SimpleStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/factory/SimpleStepFactoryBean.java index a0a983799..4d59bbfa0 100755 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/factory/SimpleStepFactoryBean.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/factory/SimpleStepFactoryBean.java @@ -138,6 +138,7 @@ public class SimpleStepFactoryBean implements FactoryBean, BeanNameAware { * * @see org.springframework.beans.factory.BeanNameAware#setBeanName(java.lang.String) */ + @Override public void setBeanName(String name) { this.name = name; } @@ -314,6 +315,7 @@ public class SimpleStepFactoryBean implements FactoryBean, BeanNameAware { * * @see FactoryBean#getObject() */ + @Override public final Object getObject() throws Exception { SimpleStepBuilder builder = createBuilder(getName()); applyConfiguration(builder); @@ -325,6 +327,7 @@ public class SimpleStepFactoryBean implements FactoryBean, BeanNameAware { return new SimpleStepBuilder(new StepBuilder(name)); } + @Override public Class getObjectType() { return TaskletStep.class; } @@ -335,6 +338,7 @@ public class SimpleStepFactoryBean implements FactoryBean, BeanNameAware { * * @see org.springframework.beans.factory.FactoryBean#isSingleton() */ + @Override public boolean isSingleton() { return this.singleton; } @@ -487,4 +491,4 @@ public class SimpleStepFactoryBean implements FactoryBean, BeanNameAware { } } -} \ No newline at end of file +} diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/BatchRetryTemplate.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/BatchRetryTemplate.java index 8e995f956..a15092aa1 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/BatchRetryTemplate.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/BatchRetryTemplate.java @@ -210,20 +210,24 @@ public class BatchRetryTemplate implements RetryOperations { return delegate.execute(retryCallback, recoveryCallback, batchState); } + @Override public final T execute(RetryCallback retryCallback, RecoveryCallback recoveryCallback, RetryState retryState) throws Exception, ExhaustedRetryException { return regular.execute(retryCallback, recoveryCallback, retryState); } + @Override public final T execute(RetryCallback retryCallback, RecoveryCallback recoveryCallback) throws Exception { return regular.execute(retryCallback, recoveryCallback); } + @Override public final T execute(RetryCallback retryCallback, RetryState retryState) throws Exception, ExhaustedRetryException { return regular.execute(retryCallback, retryState); } + @Override public final T execute(RetryCallback retryCallback) throws Exception { return regular.execute(retryCallback); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/Chunk.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/Chunk.java index 936807fc1..28d06ebf2 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/Chunk.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/Chunk.java @@ -123,6 +123,7 @@ public class Chunk implements Iterable { * Get an unmodifiable iterator for the underlying items. * @see java.lang.Iterable#iterator() */ + @Override public ChunkIterator iterator() { return new ChunkIterator(items); } @@ -213,10 +214,12 @@ public class Chunk implements Iterable { iterator = items.iterator(); } + @Override public boolean hasNext() { return iterator.hasNext(); } + @Override public W next() { next = iterator.next(); return next; @@ -227,6 +230,7 @@ public class Chunk implements Iterable { skips.add(new SkipWrapper(next, e)); } + @Override public void remove() { if (next == null) { if (iterator.hasNext()) { diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ChunkMonitor.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ChunkMonitor.java index 684ab57b1..deaaa43be 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ChunkMonitor.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ChunkMonitor.java @@ -93,6 +93,7 @@ public class ChunkMonitor implements ItemStream { resetOffset(); } + @Override public void close() throws ItemStreamException { holder.set(null); if (streamsRegistered) { @@ -100,6 +101,7 @@ public class ChunkMonitor implements ItemStream { } } + @Override public void open(ExecutionContext executionContext) throws ItemStreamException { if (streamsRegistered) { stream.open(executionContext); @@ -120,6 +122,7 @@ public class ChunkMonitor implements ItemStream { } } + @Override public void update(ExecutionContext executionContext) throws ItemStreamException { if (streamsRegistered) { ChunkMonitorData data = getData(); @@ -146,4 +149,4 @@ public class ChunkMonitor implements ItemStream { return data; } -} \ No newline at end of file +} diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ChunkOrientedTasklet.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ChunkOrientedTasklet.java index bf0ebbe14..6f2b79a3a 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ChunkOrientedTasklet.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/ChunkOrientedTasklet.java @@ -60,6 +60,7 @@ public class ChunkOrientedTasklet implements Tasklet { this.buffering = buffering; } + @Override public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) throws Exception { @SuppressWarnings("unchecked") diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantChunkProcessor.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantChunkProcessor.java index 608364cf5..e3a86551f 100755 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantChunkProcessor.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/FaultTolerantChunkProcessor.java @@ -212,6 +212,7 @@ public class FaultTolerantChunkProcessor extends SimpleChunkProcessor retryCallback = new RetryCallback() { + @Override public O doWithRetry(RetryContext context) throws Exception { O output = null; try { @@ -263,6 +264,7 @@ public class FaultTolerantChunkProcessor extends SimpleChunkProcessor recoveryCallback = new RecoveryCallback() { + @Override public O recover(RetryContext context) throws Exception { Throwable e = context.getLastThrowable(); if (shouldSkip(itemProcessSkipPolicy, e, contribution.getStepSkipCount())) { @@ -316,6 +318,7 @@ public class FaultTolerantChunkProcessor extends SimpleChunkProcessor contextHolder = new AtomicReference(); RetryCallback retryCallback = new RetryCallback() { + @Override public Object doWithRetry(RetryContext context) throws Exception { contextHolder.set(context); @@ -352,6 +355,7 @@ public class FaultTolerantChunkProcessor extends SimpleChunkProcessor batchRecoveryCallback = new RecoveryCallback() { + @Override public Object recover(RetryContext context) throws Exception { Throwable e = context.getLastThrowable(); @@ -389,6 +393,7 @@ public class FaultTolerantChunkProcessor extends SimpleChunkProcessor recoveryCallback = new RecoveryCallback() { + @Override public Object recover(RetryContext context) throws Exception { /* diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleChunkProcessor.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleChunkProcessor.java index cc0985bca..061a6093b 100755 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleChunkProcessor.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleChunkProcessor.java @@ -74,6 +74,7 @@ public class SimpleChunkProcessor implements ChunkProcessor, Initializi * * @see InitializingBean#afterPropertiesSet() */ + @Override public void afterPropertiesSet() throws Exception { Assert.notNull(itemWriter, "ItemWriter must be set"); Assert.notNull(itemProcessor, "ItemProcessor must be set"); @@ -175,6 +176,7 @@ public class SimpleChunkProcessor implements ChunkProcessor, Initializi } } + @Override public final void process(StepContribution contribution, Chunk inputs) throws Exception { // Allow temporary state to be stored in the user data field diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleChunkProvider.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleChunkProvider.java index decbd9c5b..e71c10b1a 100755 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleChunkProvider.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleChunkProvider.java @@ -101,11 +101,13 @@ public class SimpleChunkProvider implements ChunkProvider { } } + @Override public Chunk provide(final StepContribution contribution) throws Exception { final Chunk inputs = new Chunk(); repeatOperations.iterate(new RepeatCallback() { + @Override public RepeatStatus doInIteration(final RepeatContext context) throws Exception { I item = null; try { @@ -131,6 +133,7 @@ public class SimpleChunkProvider implements ChunkProvider { } + @Override public void postProcess(StepContribution contribution, Chunk chunk) { // do nothing } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleRetryExceptionHandler.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleRetryExceptionHandler.java index 84cdd9b86..a520d60fb 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleRetryExceptionHandler.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/item/SimpleRetryExceptionHandler.java @@ -74,6 +74,7 @@ public class SimpleRetryExceptionHandler extends RetryListenerSupport implements * @see ExceptionHandler#handleException(org.springframework.batch.repeat.RepeatContext, * java.lang.Throwable) */ + @Override public void handleException(RepeatContext context, Throwable throwable) throws Throwable { // Only bother to check the delegate exception handler if we know that // retry is exhausted @@ -93,6 +94,7 @@ public class SimpleRetryExceptionHandler extends RetryListenerSupport implements * @see org.springframework.batch.retry.RetryListener#close(org.springframework.batch.retry.RetryContext, * org.springframework.batch.retry.RetryCallback, java.lang.Throwable) */ + @Override public void close(RetryContext context, RetryCallback callback, Throwable throwable) { if (!retryPolicy.canRetry(context)) { logger.debug("Marking retry as exhausted: "+context); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/job/DefaultJobParametersExtractor.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/job/DefaultJobParametersExtractor.java index 10ec4b4d4..94502206a 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/job/DefaultJobParametersExtractor.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/job/DefaultJobParametersExtractor.java @@ -62,6 +62,7 @@ public class DefaultJobParametersExtractor implements JobParametersExtractor { /** * @see JobParametersExtractor#getJobParameters(StepExecution) */ + @Override public JobParameters getJobParameters(Job job, StepExecution stepExecution) { JobParametersBuilder builder = new JobParametersBuilder(); Map jobParameters = stepExecution.getJobParameters().getParameters(); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/AlwaysSkipItemSkipPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/AlwaysSkipItemSkipPolicy.java index f6883fd61..d5e6d0ea2 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/AlwaysSkipItemSkipPolicy.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/AlwaysSkipItemSkipPolicy.java @@ -25,6 +25,7 @@ package org.springframework.batch.core.step.skip; */ public class AlwaysSkipItemSkipPolicy implements SkipPolicy { + @Override public boolean shouldSkip(Throwable t, int skipCount) { return true; } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/CompositeSkipPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/CompositeSkipPolicy.java index 2e5ad9396..8d6d40767 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/CompositeSkipPolicy.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/CompositeSkipPolicy.java @@ -35,6 +35,7 @@ public class CompositeSkipPolicy implements SkipPolicy { this.skipPolicies = skipPolicies; } + @Override public boolean shouldSkip(Throwable t, int skipCount) throws SkipLimitExceededException { for (SkipPolicy policy : skipPolicies) { if (policy.shouldSkip(t, skipCount)) { diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/ExceptionClassifierSkipPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/ExceptionClassifierSkipPolicy.java index 600324486..df8169f19 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/ExceptionClassifierSkipPolicy.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/ExceptionClassifierSkipPolicy.java @@ -65,6 +65,7 @@ public class ExceptionClassifierSkipPolicy implements SkipPolicy { * @return true if the exception can be skipped * @throws SkipLimitExceededException if a limit is exceeded */ + @Override public boolean shouldSkip(Throwable t, int skipCount) throws SkipLimitExceededException { return classifier.classify(t).shouldSkip(t, skipCount); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/LimitCheckingItemSkipPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/LimitCheckingItemSkipPolicy.java index ce1ab2d29..b2fd620eb 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/LimitCheckingItemSkipPolicy.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/LimitCheckingItemSkipPolicy.java @@ -123,6 +123,7 @@ public class LimitCheckingItemSkipPolicy implements SkipPolicy { * skipCount is greater than the skipLimit, then a * {@link SkipLimitExceededException} will be thrown. */ + @Override public boolean shouldSkip(Throwable t, int skipCount) { if (skippableExceptionClassifier.classify(t)) { if (skipCount < skipLimit) { diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/NeverSkipItemSkipPolicy.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/NeverSkipItemSkipPolicy.java index a10bf906c..f11bdace4 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/NeverSkipItemSkipPolicy.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/skip/NeverSkipItemSkipPolicy.java @@ -24,6 +24,7 @@ package org.springframework.batch.core.step.skip; */ public class NeverSkipItemSkipPolicy implements SkipPolicy{ + @Override public boolean shouldSkip(Throwable t, int skipCount) { return false; } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/CallableTaskletAdapter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/CallableTaskletAdapter.java index 5ee760332..050847ccb 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/CallableTaskletAdapter.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/CallableTaskletAdapter.java @@ -47,6 +47,7 @@ public class CallableTaskletAdapter implements Tasklet, InitializingBean { * * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() */ + @Override public void afterPropertiesSet() throws Exception { Assert.notNull(callable); } @@ -56,6 +57,7 @@ public class CallableTaskletAdapter implements Tasklet, InitializingBean { * the {@link StepContribution} and the attributes. * @see Tasklet#execute(StepContribution, ChunkContext) */ + @Override public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) throws Exception { return callable.call(); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/ConfigurableSystemProcessExitCodeMapper.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/ConfigurableSystemProcessExitCodeMapper.java index ee1e6ab0c..1c8030cfb 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/ConfigurableSystemProcessExitCodeMapper.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/ConfigurableSystemProcessExitCodeMapper.java @@ -35,6 +35,7 @@ public class ConfigurableSystemProcessExitCodeMapper implements SystemProcessExi private Map mappings; + @Override public ExitStatus getExitStatus(int exitCode) { ExitStatus exitStatus = mappings.get(exitCode); if (exitStatus != null) { diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/MethodInvokingTaskletAdapter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/MethodInvokingTaskletAdapter.java index 63f433908..bc9abc394 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/MethodInvokingTaskletAdapter.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/MethodInvokingTaskletAdapter.java @@ -42,6 +42,7 @@ public class MethodInvokingTaskletAdapter extends AbstractMethodInvokingDelegato * * @see Tasklet#execute(StepContribution, ChunkContext) */ + @Override public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) throws Exception { contribution.setExitStatus(mapResult(invokeDelegateMethod())); return RepeatStatus.FINISHED; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/SimpleSystemProcessExitCodeMapper.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/SimpleSystemProcessExitCodeMapper.java index bf78b73e7..439d388d8 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/SimpleSystemProcessExitCodeMapper.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/SimpleSystemProcessExitCodeMapper.java @@ -27,6 +27,7 @@ import org.springframework.batch.core.ExitStatus; * @author Robert Kasanicky */ public class SimpleSystemProcessExitCodeMapper implements SystemProcessExitCodeMapper { + @Override public ExitStatus getExitStatus(int exitCode) { if (exitCode == 0) { return ExitStatus.COMPLETED; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/SystemCommandTasklet.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/SystemCommandTasklet.java index 46bf9a4da..c2a886798 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/SystemCommandTasklet.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/SystemCommandTasklet.java @@ -81,10 +81,12 @@ public class SystemCommandTasklet extends StepExecutionListenerSupport implement * Execute system command and map its exit code to {@link ExitStatus} using * {@link SystemProcessExitCodeMapper}. */ + @Override public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) throws Exception { FutureTask systemCommandTask = new FutureTask(new Callable() { + @Override public Integer call() throws Exception { Process process = Runtime.getRuntime().exec(command, environmentParams, workingDirectory); return process.waitFor(); @@ -144,6 +146,7 @@ public class SystemCommandTasklet extends StepExecutionListenerSupport implement } + @Override public void afterPropertiesSet() throws Exception { Assert.hasLength(command, "'command' property value is required"); Assert.notNull(systemProcessExitCodeMapper, "SystemProcessExitCodeMapper must be set"); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/TaskletStep.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/TaskletStep.java index 7e7677fec..69f3cb964 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/TaskletStep.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/TaskletStep.java @@ -293,10 +293,12 @@ public class TaskletStep extends AbstractStep { return new Semaphore(1); } + @Override protected void close(ExecutionContext ctx) throws Exception { stream.close(); } + @Override protected void open(ExecutionContext ctx) throws Exception { stream.open(ctx); } @@ -364,6 +366,7 @@ public class TaskletStep extends AbstractStep { } } + @Override public Object doInTransaction(TransactionStatus status) { TransactionSynchronizationManager.registerSynchronization(this); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/JobExecutionExceptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/JobExecutionExceptionTests.java index c296ac501..8886c01cc 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/JobExecutionExceptionTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/JobExecutionExceptionTests.java @@ -25,6 +25,7 @@ public class JobExecutionExceptionTests extends AbstractExceptionTests { /* (non-Javadoc) * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String) */ + @Override public Exception getException(String msg) throws Exception { return new JobExecutionException(msg); } @@ -32,6 +33,7 @@ public class JobExecutionExceptionTests extends AbstractExceptionTests { /* (non-Javadoc) * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String, java.lang.Throwable) */ + @Override public Exception getException(String msg, Throwable t) throws Exception { return new JobExecutionException(msg, t); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/JobInterruptedExceptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/JobInterruptedExceptionTests.java index 98654693a..2536575e8 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/JobInterruptedExceptionTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/JobInterruptedExceptionTests.java @@ -25,6 +25,7 @@ public class JobInterruptedExceptionTests extends AbstractExceptionTests { /* (non-Javadoc) * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String) */ + @Override public Exception getException(String msg) throws Exception { return new JobInterruptedException(msg); } @@ -32,6 +33,7 @@ public class JobInterruptedExceptionTests extends AbstractExceptionTests { /* (non-Javadoc) * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String, java.lang.Throwable) */ + @Override public Exception getException(String msg, Throwable t) throws Exception { return new RuntimeException(msg, t); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/DuplicateJobExceptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/DuplicateJobExceptionTests.java index ead268026..c81703619 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/DuplicateJobExceptionTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/DuplicateJobExceptionTests.java @@ -28,6 +28,7 @@ public class DuplicateJobExceptionTests extends AbstractExceptionTests { * (non-Javadoc) * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String) */ + @Override public Exception getException(String msg) throws Exception { return new DuplicateJobException(msg); } @@ -37,6 +38,7 @@ public class DuplicateJobExceptionTests extends AbstractExceptionTests { * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String, * java.lang.Throwable) */ + @Override public Exception getException(String msg, Throwable t) throws Exception { return new DuplicateJobException(msg, t); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/ApplicationContextJobFactoryTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/ApplicationContextJobFactoryTests.java index e6e0e1f8a..72fbaeb51 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/ApplicationContextJobFactoryTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/ApplicationContextJobFactoryTests.java @@ -27,6 +27,7 @@ public class ApplicationContextJobFactoryTests { } private static class StubApplicationContextFactory implements ApplicationContextFactory { + @Override public ConfigurableApplicationContext createApplicationContext() { StaticApplicationContext context = new StaticApplicationContext(); context.registerSingleton("job", JobSupport.class); @@ -36,6 +37,7 @@ public class ApplicationContextJobFactoryTests { } private static class PostProcessingApplicationContextFactory implements ApplicationContextFactory { + @Override public ConfigurableApplicationContext createApplicationContext() { StaticApplicationContext context = new StaticApplicationContext(); context.registerSingleton("job", JobSupport.class); @@ -48,6 +50,7 @@ public class ApplicationContextJobFactoryTests { private static class TestBeanPostProcessor implements BeanPostProcessor { + @Override public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { if (bean instanceof JobSupport) { ((JobSupport) bean).setName("bar"); @@ -55,6 +58,7 @@ public class ApplicationContextJobFactoryTests { return bean; } + @Override public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException { return bean; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/JobFactoryRegistrationListenerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/JobFactoryRegistrationListenerTests.java index 4a21cdac1..340e7fed4 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/JobFactoryRegistrationListenerTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/JobFactoryRegistrationListenerTests.java @@ -40,10 +40,12 @@ public class JobFactoryRegistrationListenerTests { public void testBind() throws Exception { listener.setJobRegistry(registry); listener.bind(new JobFactory() { + @Override public Job createJob() { return null; } + @Override public String getJobName() { return "foo"; } @@ -60,10 +62,12 @@ public class JobFactoryRegistrationListenerTests { public void testUnbind() throws Exception { testBind(); listener.unbind(new JobFactory() { + @Override public Job createJob() { return null; } + @Override public String getJobName() { return "foo"; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DecisionJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DecisionJobParserTests.java index f1df01054..d9530d2ee 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DecisionJobParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DecisionJobParserTests.java @@ -58,6 +58,7 @@ public class DecisionJobParserTests { } public static class TestDecider implements JobExecutionDecider { + @Override public FlowExecutionStatus decide(JobExecution jobExecution, StepExecution stepExecution) { return new FlowExecutionStatus("FOO"); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyCompletionPolicy.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyCompletionPolicy.java index 299b18637..386aded90 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyCompletionPolicy.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyCompletionPolicy.java @@ -10,18 +10,22 @@ import org.springframework.batch.repeat.RepeatStatus; */ public class DummyCompletionPolicy implements CompletionPolicy { + @Override public boolean isComplete(RepeatContext context, RepeatStatus result) { return false; } + @Override public boolean isComplete(RepeatContext context) { return false; } + @Override public RepeatContext start(RepeatContext parent) { return null; } + @Override public void update(RepeatContext context) { } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyItemProcessor.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyItemProcessor.java index 74e7b6ebe..0fd6fa618 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyItemProcessor.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyItemProcessor.java @@ -8,6 +8,7 @@ import org.springframework.batch.item.ItemProcessor; */ public class DummyItemProcessor implements ItemProcessor { + @Override public Object process(Object item) throws Exception { return item; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyItemReader.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyItemReader.java index 655ace386..90fe87d6d 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyItemReader.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyItemReader.java @@ -10,6 +10,7 @@ import org.springframework.batch.item.UnexpectedInputException; */ public class DummyItemReader implements ItemReader { + @Override public Object read() throws Exception, UnexpectedInputException, ParseException { return null; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyItemWriter.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyItemWriter.java index 7e3cf012f..5f003480f 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyItemWriter.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyItemWriter.java @@ -10,6 +10,7 @@ import org.springframework.batch.item.ItemWriter; */ public class DummyItemWriter implements ItemWriter { + @Override public void write(List items) throws Exception { } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyJobRepository.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyJobRepository.java index 23b575be1..e17937e1f 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyJobRepository.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyJobRepository.java @@ -37,43 +37,54 @@ public class DummyJobRepository implements JobRepository, BeanNameAware { return name; } + @Override public void setBeanName(String name) { this.name = name; } + @Override public void add(StepExecution stepExecution) { } + @Override public JobExecution createJobExecution(String jobName, JobParameters jobParameters) throws JobExecutionAlreadyRunningException, JobRestartException, JobInstanceAlreadyCompleteException { return null; } + @Override public JobExecution getLastJobExecution(String jobName, JobParameters jobParameters) { return null; } + @Override public StepExecution getLastStepExecution(JobInstance jobInstance, String stepName) { return null; } + @Override public int getStepExecutionCount(JobInstance jobInstance, String stepName) { return 0; } + @Override public boolean isJobInstanceExists(String jobName, JobParameters jobParameters) { return false; } + @Override public void update(JobExecution jobExecution) { } + @Override public void update(StepExecution stepExecution) { } + @Override public void updateExecutionContext(StepExecution stepExecution) { } + @Override public void updateExecutionContext(JobExecution jobExecution) { } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyPlatformTransactionManager.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyPlatformTransactionManager.java index 9d8b33832..db0d89873 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyPlatformTransactionManager.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyPlatformTransactionManager.java @@ -33,16 +33,20 @@ public class DummyPlatformTransactionManager implements PlatformTransactionManag return name; } + @Override public void setBeanName(String name) { this.name = name; } + @Override public void commit(TransactionStatus status) throws TransactionException { } + @Override public void rollback(TransactionStatus status) throws TransactionException { } + @Override public TransactionStatus getTransaction(TransactionDefinition definition) throws TransactionException { return null; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyRetryListener.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyRetryListener.java index 90f092a27..a575e10ff 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyRetryListener.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyRetryListener.java @@ -10,14 +10,17 @@ import org.springframework.retry.RetryListener; */ public class DummyRetryListener implements RetryListener { + @Override public boolean open(RetryContext context, RetryCallback callback) { return false; } + @Override public void close(RetryContext context, RetryCallback callback, Throwable throwable) { } + @Override public void onError(RetryContext context, RetryCallback callback, Throwable throwable) { } -} \ No newline at end of file +} diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyStep.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyStep.java index b5c1f625b..b4b254903 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyStep.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyStep.java @@ -28,22 +28,27 @@ public class DummyStep implements Step, BeanNameAware { private String name; + @Override public String getName() { return name; } + @Override public void setBeanName(String name) { this.name = name; } + @Override public void execute(StepExecution stepExecution) throws JobInterruptedException { System.out.println("EXECUTING " + getName()); } + @Override public int getStartLimit() { return 100; } + @Override public boolean isAllowStartIfComplete() { return false; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyTasklet.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyTasklet.java index 996ed41b5..9d60c6704 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyTasklet.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DummyTasklet.java @@ -11,6 +11,7 @@ import org.springframework.batch.repeat.RepeatStatus; */ public class DummyTasklet implements Tasklet { + @Override public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) throws Exception { return null; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailingTasklet.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailingTasklet.java index 5d8fc00ec..0044d31ee 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailingTasklet.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FailingTasklet.java @@ -29,6 +29,7 @@ import org.springframework.batch.repeat.RepeatStatus; */ public class FailingTasklet extends NameStoringTasklet { + @Override public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) throws Exception { super.execute(contribution, chunkContext); throw new RuntimeException(); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FlowStepParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FlowStepParserTests.java index 74998f1a8..c9d0efe26 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FlowStepParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/FlowStepParserTests.java @@ -137,6 +137,7 @@ public class FlowStepParserTests { int count = 0; + @Override public FlowExecutionStatus decide(JobExecution jobExecution, StepExecution stepExecution) { if (count++ < 2) { return new FlowExecutionStatus("OK"); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/InterruptibleTasklet.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/InterruptibleTasklet.java index 65be1b903..c625680fe 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/InterruptibleTasklet.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/InterruptibleTasklet.java @@ -31,6 +31,7 @@ public class InterruptibleTasklet extends NameStoringTasklet { private volatile boolean started = false; + @Override public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) throws Exception { if (!started) { super.execute(contribution, chunkContext); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobRegistryJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobRegistryJobParserTests.java index 3df954178..761a77388 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobRegistryJobParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/JobRegistryJobParserTests.java @@ -42,6 +42,7 @@ public class JobRegistryJobParserTests implements ApplicationContextAware { private ApplicationContext applicationContext; + @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { this.applicationContext = applicationContext; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NameStoringTasklet.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NameStoringTasklet.java index fa4c52c13..2104f12c0 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NameStoringTasklet.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/NameStoringTasklet.java @@ -35,10 +35,12 @@ public class NameStoringTasklet extends StepExecutionListenerSupport implements private String stepName = null; private List stepNamesList = null; + @Override public void beforeStep(StepExecution stepExecution) { stepName = stepExecution.getStepName(); } + @Override public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) throws Exception { if (stepNamesList != null) { stepNamesList.add(stepName); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/PartitionStepParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/PartitionStepParserTests.java index 148ae8335..8784accfb 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/PartitionStepParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/PartitionStepParserTests.java @@ -88,6 +88,7 @@ public class PartitionStepParserTests implements ApplicationContextAware { private List savedStepNames = new ArrayList(); + @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { this.applicationContext = applicationContext; } @@ -229,6 +230,7 @@ public class PartitionStepParserTests implements ApplicationContextAware { public static class CustomPartitionHandler implements PartitionHandler { + @Override public Collection handle(StepExecutionSplitter stepSplitter, StepExecution stepExecution) throws Exception { return Arrays.asList(stepExecution); @@ -238,6 +240,7 @@ public class PartitionStepParserTests implements ApplicationContextAware { public static class CustomStepExecutionAggregator implements StepExecutionAggregator { + @Override public void aggregate(StepExecution result, Collection executions) { result.getJobExecution().getExecutionContext().put("foo", "bar"); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/PartitionStepWithFlowParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/PartitionStepWithFlowParserTests.java index 9a078ecfd..006ce04ff 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/PartitionStepWithFlowParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/PartitionStepWithFlowParserTests.java @@ -95,6 +95,7 @@ public class PartitionStepWithFlowParserTests { public static class Decider implements JobExecutionDecider { int count = 0; + @Override public FlowExecutionStatus decide(JobExecution jobExecution, StepExecution stepExecution) { if (count++<2) { return new FlowExecutionStatus("OK"); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitInterruptedJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitInterruptedJobParserTests.java index 3cad4b06e..f54a52e0d 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitInterruptedJobParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/SplitInterruptedJobParserTests.java @@ -40,6 +40,7 @@ public class SplitInterruptedJobParserTests extends AbstractJobParserTests { final JobExecution jobExecution = createJobExecution(); new Thread(new Runnable() { + @Override public void run() { job.execute(jobExecution); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopJobParserTests.java index bcbe30528..a8eacb552 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopJobParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StopJobParserTests.java @@ -74,6 +74,7 @@ public class StopJobParserTests extends AbstractJobParserTests { } public static class TestDecider implements JobExecutionDecider { + @Override public FlowExecutionStatus decide(JobExecution jobExecution, StepExecution stepExecution) { return new FlowExecutionStatus("FOO"); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestCustomStatusListener.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestCustomStatusListener.java index 0564cfd81..9766d6798 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestCustomStatusListener.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestCustomStatusListener.java @@ -6,10 +6,12 @@ import org.springframework.batch.core.StepExecutionListener; public class TestCustomStatusListener extends AbstractTestComponent implements StepExecutionListener { + @Override public ExitStatus afterStep(StepExecution stepExecution) { return new ExitStatus("FOO").and(stepExecution.getExitStatus()); } + @Override public void beforeStep(StepExecution stepExecution) { executed = true; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestIncrementer.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestIncrementer.java index 5363f60b4..80518aa85 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestIncrementer.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestIncrementer.java @@ -5,6 +5,7 @@ import org.springframework.batch.core.JobParametersIncrementer; public class TestIncrementer implements JobParametersIncrementer{ + @Override public JobParameters getNext(JobParameters parameters) { return null; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestListener.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestListener.java index 0b9277eac..360d6e24b 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestListener.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestListener.java @@ -7,6 +7,7 @@ import org.springframework.batch.core.annotation.AfterRead; public class TestListener extends AbstractTestComponent implements StepExecutionListener { + @Override public ExitStatus afterStep(StepExecution stepExecution) { return null; } @@ -16,6 +17,7 @@ public class TestListener extends AbstractTestComponent implements StepExecution return stepExecution.getExitStatus(); } + @Override public void beforeStep(StepExecution stepExecution) { executed = true; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestProcessor.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestProcessor.java index 61f6ba641..f7af92543 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestProcessor.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestProcessor.java @@ -4,6 +4,7 @@ import org.springframework.batch.item.ItemProcessor; public class TestProcessor extends AbstractTestComponent implements ItemProcessor{ + @Override public String process(String item) throws Exception { executed = true; return item; diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestReader.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestReader.java index 60c80744d..fb76f97da 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestReader.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestReader.java @@ -32,6 +32,7 @@ public class TestReader extends AbstractTestComponent implements ItemReader void close(RetryContext context, RetryCallback callback, Throwable throwable) { } + @Override public void onError(RetryContext context, RetryCallback callback, Throwable throwable) { } + @Override public boolean open(RetryContext context, RetryCallback callback) { executed = true; return true; diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestTasklet.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestTasklet.java index 72c23c65a..d2a65345f 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestTasklet.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestTasklet.java @@ -9,6 +9,7 @@ public class TestTasklet extends AbstractTestComponent implements Tasklet { private String name; + @Override public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) throws Exception { executed = true; diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestWriter.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestWriter.java index 7c13f96db..efa0b799c 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestWriter.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/TestWriter.java @@ -6,6 +6,7 @@ import org.springframework.batch.item.ItemWriter; public class TestWriter extends AbstractTestComponent implements ItemWriter { + @Override public void write(List items) throws Exception { executed = true; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/explore/support/MapJobExplorerIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/explore/support/MapJobExplorerIntegrationTests.java index f138edead..6ddb2fd17 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/explore/support/MapJobExplorerIntegrationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/explore/support/MapJobExplorerIntegrationTests.java @@ -57,6 +57,7 @@ public class MapJobExplorerIntegrationTests { SimpleJob job = new SimpleJob("job"); TaskletStep step = new TaskletStep("step"); step.setTasklet(new Tasklet() { + @Override public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) throws Exception { while (block) { Thread.sleep(100L); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/ExtendedAbstractJobTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/ExtendedAbstractJobTests.java index 9a568e042..160b7c6c9 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/ExtendedAbstractJobTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/ExtendedAbstractJobTests.java @@ -158,6 +158,7 @@ public class ExtendedAbstractJobTests { setName("StubStep"); } + @Override public void execute(StepExecution stepExecution) throws JobInterruptedException { stepExecution.getJobExecution().getExecutionContext().put(key, value); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/JobSupport.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/JobSupport.java index 9ece5b763..f54364671 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/JobSupport.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/JobSupport.java @@ -80,6 +80,7 @@ public class JobSupport implements BeanNameAware, Job, StepLocator { * * @see org.springframework.beans.factory.BeanNameAware#setBeanName(java.lang.String) */ + @Override public void setBeanName(String name) { if (this.name == null) { this.name = name; @@ -101,6 +102,7 @@ public class JobSupport implements BeanNameAware, Job, StepLocator { * * @see org.springframework.batch.core.domain.IJob#getName() */ + @Override public String getName() { return name; } @@ -145,6 +147,7 @@ public class JobSupport implements BeanNameAware, Job, StepLocator { * * @see org.springframework.batch.core.domain.IJob#isRestartable() */ + @Override public boolean isRestartable() { return restartable; } @@ -156,11 +159,13 @@ public class JobSupport implements BeanNameAware, Job, StepLocator { * org.springframework.batch.core.domain.Job#run(org.springframework.batch * .core.domain.JobExecution) */ + @Override public void execute(JobExecution execution) throws UnexpectedJobExecutionException { throw new UnsupportedOperationException( "JobSupport does not provide an implementation of execute(). Use a smarter subclass."); } + @Override public String toString() { return ClassUtils.getShortName(getClass()) + ": [name=" + name + "]"; } @@ -170,18 +175,22 @@ public class JobSupport implements BeanNameAware, Job, StepLocator { * * @see org.springframework.batch.core.Job#getJobParametersIncrementer() */ + @Override public JobParametersIncrementer getJobParametersIncrementer() { return null; } + @Override public JobParametersValidator getJobParametersValidator() { return jobParametersValidator; } + @Override public Collection getStepNames() { return steps.keySet(); } + @Override public Step getStep(String stepName) throws NoSuchStepException { final Step step = steps.get(stepName); if (step == null) { diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobTests.java index e745f1c01..573cd746e 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobTests.java @@ -110,12 +110,14 @@ public class SimpleJobTests { step1 = new StubStep("TestStep1", jobRepository); step1.setCallback(new Runnable() { + @Override public void run() { list.add("default"); } }); step2 = new StubStep("TestStep2", jobRepository); step2.setCallback(new Runnable() { + @Override public void run() { list.add("default"); } @@ -173,18 +175,22 @@ public class SimpleJobTests { Step testStep = new Step() { + @Override public void execute(StepExecution stepExecution) throws JobInterruptedException { stepExecution.setExitStatus(customStatus); } + @Override public String getName() { return "test"; } + @Override public int getStartLimit() { return 1; } + @Override public boolean isAllowStartIfComplete() { return false; } @@ -213,10 +219,12 @@ public class SimpleJobTests { @Test public void testRunNormallyWithListener() throws Exception { job.setJobExecutionListeners(new JobExecutionListenerSupport[] { new JobExecutionListenerSupport() { + @Override public void beforeJob(JobExecution jobExecution) { list.add("before"); } + @Override public void afterJob(JobExecution jobExecution) { list.add("after"); } @@ -291,6 +299,7 @@ public class SimpleJobTests { @Test public void testFailedWithListener() throws Exception { job.setJobExecutionListeners(new JobExecutionListenerSupport[] { new JobExecutionListenerSupport() { + @Override public void afterJob(JobExecution jobExecution) { list.add("afterJob"); } @@ -478,6 +487,7 @@ public class SimpleJobTests { step1 = new StubStep("interruptStep", jobRepository) { + @Override public void execute(StepExecution stepExecution) throws JobInterruptedException, UnexpectedJobExecutionException { stepExecution.getJobExecution().stop(); @@ -574,6 +584,7 @@ public class SimpleJobTests { * @seeorg.springframework.batch.core.step.StepSupport#execute(org. * springframework.batch.core.StepExecution) */ + @Override public void execute(StepExecution stepExecution) throws JobInterruptedException, UnexpectedJobExecutionException { diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleStepHandlerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleStepHandlerTests.java index f051544fe..c09a52d66 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleStepHandlerTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleStepHandlerTests.java @@ -77,6 +77,7 @@ public class SimpleStepHandlerTests { super(name); } + @Override public void execute(StepExecution stepExecution) throws JobInterruptedException { stepExecution.setStatus(BatchStatus.COMPLETED); stepExecution.setExitStatus(ExitStatus.COMPLETED); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/builder/FlowJobBuilderTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/builder/FlowJobBuilderTests.java index 7462d1095..0da463ff3 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/builder/FlowJobBuilderTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/builder/FlowJobBuilderTests.java @@ -143,6 +143,7 @@ public class FlowJobBuilderTests { public void testBuildDecision() throws Exception { JobExecutionDecider decider = new JobExecutionDecider() { private int count = 0; + @Override public FlowExecutionStatus decide(JobExecution jobExecution, StepExecution stepExecution) { count++; return count<2 ? new FlowExecutionStatus("ONGOING") : FlowExecutionStatus.COMPLETED; diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowJobTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowJobTests.java index 73d5aa402..fdbb3e7d8 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowJobTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowJobTests.java @@ -450,6 +450,7 @@ public class FlowJobTests { SimpleFlow flow = new SimpleFlow("job"); JobExecutionDecider decider = new JobExecutionDecider() { + @Override public FlowExecutionStatus decide(JobExecution jobExecution, StepExecution stepExecution) { assertNotNull(stepExecution); return new FlowExecutionStatus("SWITCH"); @@ -490,6 +491,7 @@ public class FlowJobTests { SimpleFlow flow = new SimpleFlow("job"); JobExecutionDecider decider = new JobExecutionDecider() { + @Override public FlowExecutionStatus decide(JobExecution jobExecution, StepExecution stepExecution) { assertNotNull(stepExecution); throw new RuntimeException("Foo"); @@ -675,6 +677,7 @@ public class FlowJobTests { super(name); } + @Override public void execute(StepExecution stepExecution) throws JobInterruptedException { stepExecution.setStatus(BatchStatus.COMPLETED); stepExecution.setExitStatus(ExitStatus.COMPLETED); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowStepTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowStepTests.java index e1f903947..51a8d3a88 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowStepTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowStepTests.java @@ -179,6 +179,7 @@ public class FlowStepTests { this.fail = fail; } + @Override public void execute(StepExecution stepExecution) throws JobInterruptedException { BatchStatus status = BatchStatus.COMPLETED; ExitStatus exitStatus = ExitStatus.COMPLETED; diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/StateSupport.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/StateSupport.java index 7727bed7b..26dcd1c3e 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/StateSupport.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/StateSupport.java @@ -46,6 +46,7 @@ public class StateSupport extends AbstractState { return this.status; } + @Override public boolean isEndState() { return false; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/JobFlowExecutorSupport.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/JobFlowExecutorSupport.java index 24658b2c7..88818e8a6 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/JobFlowExecutorSupport.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/JobFlowExecutorSupport.java @@ -32,32 +32,40 @@ import org.springframework.batch.core.repository.JobRestartException; */ public class JobFlowExecutorSupport implements FlowExecutor { + @Override public String executeStep(Step step) throws JobInterruptedException, JobRestartException, StartLimitExceededException { return ExitStatus.COMPLETED.getExitCode(); } + @Override public JobExecution getJobExecution() { return null; } + @Override public StepExecution getStepExecution() { return null; } + @Override public void close(FlowExecution result) { } + @Override public void abandonStepExecution() { } - public void updateJobExecutionStatus(FlowExecutionStatus status) { + @Override + public void updateJobExecutionStatus(FlowExecutionStatus status) { } + @Override public boolean isRestart() { return false; } + @Override public void addExitStatus(String code) { } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/EmptyItemWriter.java b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/EmptyItemWriter.java index 7767681b3..8f0806047 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/EmptyItemWriter.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/EmptyItemWriter.java @@ -39,6 +39,7 @@ public class EmptyItemWriter implements ItemWriter, InitializingBean { List list; + @Override public void afterPropertiesSet() throws Exception { list = TransactionAwareProxyFactory.createTransactionalList(); } @@ -47,6 +48,7 @@ public class EmptyItemWriter implements ItemWriter, InitializingBean { this.failurePoint = failurePoint; } + @Override public void write(List items) { for (T data : items) { if (!failed && list.size() == failurePoint) { diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/JobExecutionNotFailedExceptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/JobExecutionNotFailedExceptionTests.java index a10abca34..5330d9ad8 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/JobExecutionNotFailedExceptionTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/JobExecutionNotFailedExceptionTests.java @@ -26,6 +26,7 @@ public class JobExecutionNotFailedExceptionTests extends AbstractExceptionTests /* (non-Javadoc) * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String) */ + @Override public Exception getException(String msg) throws Exception { return new JobExecutionNotFailedException(msg); } @@ -33,6 +34,7 @@ public class JobExecutionNotFailedExceptionTests extends AbstractExceptionTests /* (non-Javadoc) * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String, java.lang.Throwable) */ + @Override public Exception getException(String msg, Throwable t) throws Exception { return new JobExecutionNotFailedException(msg, t); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/JobInstanceAlreadyExistsExceptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/JobInstanceAlreadyExistsExceptionTests.java index c41fb89e4..6a3d7963f 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/JobInstanceAlreadyExistsExceptionTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/JobInstanceAlreadyExistsExceptionTests.java @@ -27,6 +27,7 @@ public class JobInstanceAlreadyExistsExceptionTests extends AbstractExceptionTes /* (non-Javadoc) * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String) */ + @Override public Exception getException(String msg) throws Exception { return new JobInstanceAlreadyExistsException(msg); } @@ -34,6 +35,7 @@ public class JobInstanceAlreadyExistsExceptionTests extends AbstractExceptionTes /* (non-Javadoc) * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String, java.lang.Throwable) */ + @Override public Exception getException(String msg, Throwable t) throws Exception { return new JobInstanceAlreadyExistsException(msg, t); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/JobParametersNotFoundExceptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/JobParametersNotFoundExceptionTests.java index d6968f204..1c257e164 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/JobParametersNotFoundExceptionTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/JobParametersNotFoundExceptionTests.java @@ -26,6 +26,7 @@ public class JobParametersNotFoundExceptionTests extends AbstractExceptionTests /* (non-Javadoc) * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String) */ + @Override public Exception getException(String msg) throws Exception { return new JobParametersNotFoundException(msg); } @@ -33,6 +34,7 @@ public class JobParametersNotFoundExceptionTests extends AbstractExceptionTests /* (non-Javadoc) * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String, java.lang.Throwable) */ + @Override public Exception getException(String msg, Throwable t) throws Exception { return new JobParametersNotFoundException(msg, t); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/NoSuchJobExceptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/NoSuchJobExceptionTests.java index e0c0cb947..3ad7fec12 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/NoSuchJobExceptionTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/NoSuchJobExceptionTests.java @@ -28,6 +28,7 @@ public class NoSuchJobExceptionTests extends AbstractExceptionTests { * (non-Javadoc) * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String) */ + @Override public Exception getException(String msg) throws Exception { return new NoSuchJobException(msg); } @@ -37,6 +38,7 @@ public class NoSuchJobExceptionTests extends AbstractExceptionTests { * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String, * java.lang.Throwable) */ + @Override public Exception getException(String msg, Throwable t) throws Exception { return new NoSuchJobException(msg, t); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/NoSuchJobExecutionExceptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/NoSuchJobExecutionExceptionTests.java index 13d4632eb..934f8f705 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/NoSuchJobExecutionExceptionTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/NoSuchJobExecutionExceptionTests.java @@ -27,6 +27,7 @@ public class NoSuchJobExecutionExceptionTests extends AbstractExceptionTests { /* (non-Javadoc) * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String) */ + @Override public Exception getException(String msg) throws Exception { return new NoSuchJobExecutionException(msg); } @@ -34,6 +35,7 @@ public class NoSuchJobExecutionExceptionTests extends AbstractExceptionTests { /* (non-Javadoc) * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String, java.lang.Throwable) */ + @Override public Exception getException(String msg, Throwable t) throws Exception { return new NoSuchJobExecutionException(msg, t); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/NoSuchJobInstanceExceptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/NoSuchJobInstanceExceptionTests.java index 708fa313d..5bc2f5af9 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/NoSuchJobInstanceExceptionTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/NoSuchJobInstanceExceptionTests.java @@ -27,6 +27,7 @@ public class NoSuchJobInstanceExceptionTests extends AbstractExceptionTests { /* (non-Javadoc) * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String) */ + @Override public Exception getException(String msg) throws Exception { return new NoSuchJobInstanceException(msg); } @@ -34,6 +35,7 @@ public class NoSuchJobInstanceExceptionTests extends AbstractExceptionTests { /* (non-Javadoc) * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String, java.lang.Throwable) */ + @Override public Exception getException(String msg, Throwable t) throws Exception { return new NoSuchJobInstanceException(msg, t); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/SimpleJobLauncherTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/SimpleJobLauncherTests.java index 5e001042b..76bee6abe 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/SimpleJobLauncherTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/SimpleJobLauncherTests.java @@ -162,6 +162,7 @@ public class SimpleJobLauncherTests { public void testTaskExecutor() throws Exception { final List list = new ArrayList(); jobLauncher.setTaskExecutor(new TaskExecutor() { + @Override public void execute(Runnable task) { list.add("execute"); task.run(); @@ -176,6 +177,7 @@ public class SimpleJobLauncherTests { final List list = new ArrayList(); jobLauncher.setTaskExecutor(new TaskExecutor() { + @Override public void execute(Runnable task) { list.add("execute"); throw new TaskRejectedException("Planned failure"); @@ -207,6 +209,7 @@ public class SimpleJobLauncherTests { @Test public void testRunWithException() throws Exception { job = new JobSupport() { + @Override public void execute(JobExecution execution) { execution.setExitStatus(ExitStatus.FAILED); throw new RuntimeException("foo"); @@ -224,6 +227,7 @@ public class SimpleJobLauncherTests { @Test public void testRunWithError() throws Exception { job = new JobSupport() { + @Override public void execute(JobExecution execution) { execution.setExitStatus(ExitStatus.FAILED); throw new Error("foo"); @@ -278,4 +282,4 @@ public class SimpleJobLauncherTests { private boolean contains(String str, String searchStr) { return str.indexOf(searchStr) != -1; } -} \ No newline at end of file +} diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/CommandLineJobRunnerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/CommandLineJobRunnerTests.java index 88c6a451a..7b399e579 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/CommandLineJobRunnerTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/CommandLineJobRunnerTests.java @@ -75,6 +75,7 @@ public class CommandLineJobRunnerTests { StubJobLauncher.jobExecution = jobExecution; stdin = System.in; System.setIn(new InputStream() { + @Override public int read() { return -1; } @@ -140,10 +141,12 @@ public class CommandLineJobRunnerTests { @Test public void testWithInvalidStdin() throws Throwable { System.setIn(new InputStream() { + @Override public int available() throws IOException { throw new IOException("Planned"); } + @Override public int read() { return -1; } @@ -160,10 +163,12 @@ public class CommandLineJobRunnerTests { int index = 0; + @Override public int available() { return input.length - index; } + @Override public int read() { return index findRunningJobExecutions(String jobName) { throw new UnsupportedOperationException(); } + @Override public JobExecution getJobExecution(Long executionId) { if (jobExecution != null) { return jobExecution; @@ -418,6 +429,7 @@ public class CommandLineJobRunnerTests { throw new UnsupportedOperationException(); } + @Override public List getJobExecutions(JobInstance jobInstance) { if (jobInstance.getId() == 0) { return Arrays.asList(createJobExecution(jobInstance, BatchStatus.FAILED)); @@ -451,10 +463,12 @@ public class CommandLineJobRunnerTests { return jobExecution; } + @Override public JobInstance getJobInstance(Long instanceId) { throw new UnsupportedOperationException(); } + @Override public List getJobInstances(String jobName, int start, int count) { if (jobInstances == null) { return new ArrayList(); @@ -464,10 +478,12 @@ public class CommandLineJobRunnerTests { return result; } + @Override public StepExecution getStepExecution(Long jobExecutionId, Long stepExecutionId) { throw new UnsupportedOperationException(); } + @Override public List getJobNames() { throw new UnsupportedOperationException(); } @@ -480,11 +496,13 @@ public class CommandLineJobRunnerTests { static boolean called = false; + @Override public JobParameters getJobParameters(Properties properties) { called = true; return delegate.getJobParameters(properties); } + @Override public Properties getProperties(JobParameters params) { throw new UnsupportedOperationException(); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/ScheduledJobParametersFactoryTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/ScheduledJobParametersFactoryTests.java index 08a8b9015..2af2c947e 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/ScheduledJobParametersFactoryTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/ScheduledJobParametersFactoryTests.java @@ -37,6 +37,7 @@ public class ScheduledJobParametersFactoryTests extends TestCase { DateFormat dateFormat = new SimpleDateFormat("MM/dd/yyyy"); + @Override protected void setUp() throws Exception { super.setUp(); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/SimpleJobOperatorTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/SimpleJobOperatorTests.java index 03d7b0d8f..1e15d170b 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/SimpleJobOperatorTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/SimpleJobOperatorTests.java @@ -83,6 +83,7 @@ public class SimpleJobOperatorTests { @Override public JobParametersIncrementer getJobParametersIncrementer() { return new JobParametersIncrementer() { + @Override public JobParameters getNext(JobParameters parameters) { return jobParameters; } @@ -93,6 +94,7 @@ public class SimpleJobOperatorTests { jobOperator = new SimpleJobOperator(); jobOperator.setJobRegistry(new MapJobRegistry() { + @Override public Job getJob(String name) throws NoSuchJobException { if (name.equals("foo")) { return job; @@ -107,6 +109,7 @@ public class SimpleJobOperatorTests { }); jobOperator.setJobLauncher(new JobLauncher() { + @Override public JobExecution run(Job job, JobParameters jobParameters) throws JobExecutionAlreadyRunningException, JobRestartException, JobInstanceAlreadyCompleteException { return new JobExecution(new JobInstance(123L, jobParameters, job.getName()), 999L); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/SimpleJvmExitCodeMapperTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/SimpleJvmExitCodeMapperTests.java index e65da7884..f2ca2eabe 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/SimpleJvmExitCodeMapperTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/SimpleJvmExitCodeMapperTests.java @@ -30,6 +30,7 @@ public class SimpleJvmExitCodeMapperTests extends TestCase { private SimpleJvmExitCodeMapper ecm; private SimpleJvmExitCodeMapper ecm2; + @Override protected void setUp() throws Exception { ecm = new SimpleJvmExitCodeMapper(); Map ecmMap = new HashMap(); @@ -45,6 +46,7 @@ public class SimpleJvmExitCodeMapperTests extends TestCase { ecm2.setMapping(ecm2Map); } + @Override protected void tearDown() throws Exception { super.tearDown(); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/StubJobLauncher.java b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/StubJobLauncher.java index eb537ebbb..1b8c5d2cf 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/StubJobLauncher.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/StubJobLauncher.java @@ -30,6 +30,7 @@ public class StubJobLauncher implements JobLauncher { return isRunning; } + @Override public JobExecution run(Job job, JobParameters jobParameters) throws JobExecutionAlreadyRunningException { lastRunCalled = RUN_JOB_IDENTIFIER; diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/TestJobParametersIncrementer.java b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/TestJobParametersIncrementer.java index aadef74b6..cc97e9a98 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/TestJobParametersIncrementer.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/support/TestJobParametersIncrementer.java @@ -6,6 +6,7 @@ import org.springframework.batch.core.JobParametersIncrementer; public class TestJobParametersIncrementer implements JobParametersIncrementer { + @Override public JobParameters getNext(JobParameters parameters) { return new JobParametersBuilder().addString("foo", "spam").toJobParameters(); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeJobExecutionListenerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeJobExecutionListenerTests.java index 307ecca96..414b5e8ad 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeJobExecutionListenerTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeJobExecutionListenerTests.java @@ -40,10 +40,12 @@ public class CompositeJobExecutionListenerTests extends TestCase { */ public void testSetListeners() { listener.setListeners(Arrays.asList(new JobExecutionListenerSupport() { + @Override public void afterJob(JobExecution jobExecution) { list.add("fail"); } }, new JobExecutionListenerSupport() { + @Override public void afterJob(JobExecution jobExecution) { list.add("continue"); } @@ -59,6 +61,7 @@ public class CompositeJobExecutionListenerTests extends TestCase { */ public void testSetListener() { listener.register(new JobExecutionListenerSupport() { + @Override public void afterJob(JobExecution jobExecution) { list.add("fail"); } @@ -74,6 +77,7 @@ public class CompositeJobExecutionListenerTests extends TestCase { */ public void testOpen() { listener.register(new JobExecutionListenerSupport() { + @Override public void beforeJob(JobExecution stepExecution) { list.add("foo"); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeStepExecutionListenerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeStepExecutionListenerTests.java index a6308c6cb..1a9cb5278 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeStepExecutionListenerTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeStepExecutionListenerTests.java @@ -41,11 +41,13 @@ public class CompositeStepExecutionListenerTests extends TestCase { */ public void testSetListeners() { listener.setListeners(new StepExecutionListener[] { new StepExecutionListenerSupport() { + @Override public ExitStatus afterStep(StepExecution stepExecution) { list.add("fail"); return ExitStatus.FAILED; } }, new StepExecutionListenerSupport() { + @Override public ExitStatus afterStep(StepExecution stepExecution) { list.add("continue"); return ExitStatus.EXECUTING; @@ -62,6 +64,7 @@ public class CompositeStepExecutionListenerTests extends TestCase { */ public void testSetListener() { listener.register(new StepExecutionListenerSupport() { + @Override public ExitStatus afterStep(StepExecution stepExecution) { list.add("fail"); return ExitStatus.FAILED; @@ -78,6 +81,7 @@ public class CompositeStepExecutionListenerTests extends TestCase { */ public void testOpen() { listener.register(new StepExecutionListenerSupport() { + @Override public void beforeStep(StepExecution stepExecution) { list.add("foo"); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/JobListenerFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/JobListenerFactoryBeanTests.java index 6012e4426..0fda435c0 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/JobListenerFactoryBeanTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/JobListenerFactoryBeanTests.java @@ -125,6 +125,7 @@ public class JobListenerFactoryBeanTests { public void foo(JobExecution execution) { } + @Override public int getOrder() { return 3; } @@ -242,10 +243,12 @@ public class JobListenerFactoryBeanTests { boolean afterJobCalled = false; + @Override public void afterJob(JobExecution jobExecution) { afterJobCalled = true; } + @Override public void beforeJob(JobExecution jobExecution) { beforeJobCalled = true; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/OrderedCompositeTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/OrderedCompositeTests.java index 705a8cfe9..9d5440bd9 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/OrderedCompositeTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/OrderedCompositeTests.java @@ -62,6 +62,7 @@ public class OrderedCompositeTests { public void testAddOrdered() { list.setItems(Arrays.asList((Object) "1")); list.add(new Ordered() { + @Override public int getOrder() { return 0; } @@ -75,11 +76,13 @@ public class OrderedCompositeTests { public void testAddMultipleOrdered() { list.setItems(Arrays.asList((Object) "1")); list.add(new Ordered() { + @Override public int getOrder() { return 1; } }); list.add(new Ordered() { + @Override public int getOrder() { return 0; } @@ -94,11 +97,13 @@ public class OrderedCompositeTests { public void testAddDuplicateOrdered() { list.setItems(Arrays.asList((Object) "1")); list.add(new Ordered() { + @Override public int getOrder() { return 1; } }); list.add(new Ordered() { + @Override public int getOrder() { return 1; } @@ -112,6 +117,7 @@ public class OrderedCompositeTests { @Test public void testAddAnnotationOrdered() { list.add(new Ordered() { + @Override public int getOrder() { return 1; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/StepListenerFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/StepListenerFactoryBeanTests.java index a39e38df1..08abbe6c9 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/StepListenerFactoryBeanTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/StepListenerFactoryBeanTests.java @@ -191,6 +191,7 @@ public class StepListenerFactoryBeanTests { public void foo(StepExecution execution) { } + @Override public int getOrder() { return 3; } @@ -208,6 +209,7 @@ public class StepListenerFactoryBeanTests { public void foo(StepExecution execution) { } + @Override public void afterPropertiesSet() throws Exception { } }; @@ -236,6 +238,7 @@ public class StepListenerFactoryBeanTests { ProxyFactory factory = new ProxyFactory(); factory.addInterface(DataSource.class); factory.addAdvice(new MethodInterceptor() { + @Override public Object invoke(MethodInvocation invocation) throws Throwable { return null; } @@ -252,6 +255,7 @@ public class StepListenerFactoryBeanTests { public void foo(StepExecution execution) { } + @Override public void afterPropertiesSet() throws Exception { } }; @@ -377,6 +381,7 @@ public class StepListenerFactoryBeanTests { int callcount = 0; + @Override @AfterStep public ExitStatus afterStep(StepExecution stepExecution) { Assert.notNull(stepExecution); @@ -384,6 +389,7 @@ public class StepListenerFactoryBeanTests { return null; } + @Override public void beforeStep(StepExecution stepExecution) { callcount++; } @@ -395,12 +401,14 @@ public class StepListenerFactoryBeanTests { int callcount = 0; + @Override public ExitStatus afterStep(StepExecution stepExecution) { Assert.notNull(stepExecution); callcount++; return null; } + @Override public void beforeStep(StepExecution stepExecution) { callcount++; } @@ -515,14 +523,17 @@ public class StepListenerFactoryBeanTests { onWriteErrorCalled = true; } + @Override public void onSkipInProcess(String item, Throwable t) { onSkipInProcessCalled = true; } + @Override public void onSkipInRead(Throwable t) { onSkipInReadCalled = true; } + @Override public void onSkipInWrite(Integer item, Throwable t) { onSkipInWriteCalled = true; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/StepListenerMethodInterceptorTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/StepListenerMethodInterceptorTests.java index e706ab63d..6137138fc 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/StepListenerMethodInterceptorTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/StepListenerMethodInterceptorTests.java @@ -103,25 +103,30 @@ public class StepListenerMethodInterceptorTests { this.args = args; } + @Override public Method getMethod() { return method; } + @Override public Object[] getArguments() { return null; } + @Override public AccessibleObject getStaticPart() { return null; } + @Override public Object getThis() { return null; } + @Override public Object proceed() throws Throwable { return null; } } -} \ No newline at end of file +} diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/partition/ExampleItemReader.java b/spring-batch-core/src/test/java/org/springframework/batch/core/partition/ExampleItemReader.java index bf11cb9da..70481b054 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/partition/ExampleItemReader.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/partition/ExampleItemReader.java @@ -41,6 +41,7 @@ public class ExampleItemReader implements ItemReader, ItemStream { /** * Reads next record from input */ + @Override public String read() throws Exception { if (index >= input.length || index >= max) { return null; @@ -61,13 +62,16 @@ public class ExampleItemReader implements ItemReader, ItemStream { return input[index++]; } + @Override public void close() throws ItemStreamException { } + @Override public void open(ExecutionContext executionContext) throws ItemStreamException { index = (int) executionContext.getLong("POSITION", min); } + @Override public void update(ExecutionContext executionContext) throws ItemStreamException { executionContext.putLong("POSITION", index); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/partition/ExampleItemWriter.java b/spring-batch-core/src/test/java/org/springframework/batch/core/partition/ExampleItemWriter.java index 7b3e626e7..97c7beeea 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/partition/ExampleItemWriter.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/partition/ExampleItemWriter.java @@ -27,6 +27,7 @@ public class ExampleItemWriter implements ItemWriter { /** * @see ItemWriter#write(List) */ + @Override public void write(List data) throws Exception { log.info(data); items.addAll(data); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/partition/MinMaxPartitioner.java b/spring-batch-core/src/test/java/org/springframework/batch/core/partition/MinMaxPartitioner.java index a0d93de6b..db3522017 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/partition/MinMaxPartitioner.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/partition/MinMaxPartitioner.java @@ -27,6 +27,7 @@ import org.springframework.batch.item.ExecutionContext; */ public class MinMaxPartitioner extends SimplePartitioner { + @Override public Map partition(int gridSize) { Map partition = super.partition(gridSize); int total = 8; // The number of items in the ExampleItemReader diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/partition/support/PartitionStepTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/partition/support/PartitionStepTests.java index fe8250c9e..953a0dae4 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/partition/support/PartitionStepTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/partition/support/PartitionStepTests.java @@ -57,6 +57,7 @@ public class PartitionStepTests { public void testVanillaStepExecution() throws Exception { step.setStepExecutionSplitter(new SimpleStepExecutionSplitter(jobRepository, true, step.getName(), new SimplePartitioner())); step.setPartitionHandler(new PartitionHandler() { + @Override public Collection handle(StepExecutionSplitter stepSplitter, StepExecution stepExecution) throws Exception { Set executions = stepSplitter.split(stepExecution, 2); @@ -81,6 +82,7 @@ public class PartitionStepTests { public void testFailedStepExecution() throws Exception { step.setStepExecutionSplitter(new SimpleStepExecutionSplitter(jobRepository, true, step.getName(), new SimplePartitioner())); step.setPartitionHandler(new PartitionHandler() { + @Override public Collection handle(StepExecutionSplitter stepSplitter, StepExecution stepExecution) throws Exception { Set executions = stepSplitter.split(stepExecution, 2); @@ -106,6 +108,7 @@ public class PartitionStepTests { final AtomicBoolean started = new AtomicBoolean(false); step.setStepExecutionSplitter(new SimpleStepExecutionSplitter(jobRepository, true, step.getName(), new SimplePartitioner())); step.setPartitionHandler(new PartitionHandler() { + @Override public Collection handle(StepExecutionSplitter stepSplitter, StepExecution stepExecution) throws Exception { Set executions = stepSplitter.split(stepExecution, 2); @@ -152,6 +155,7 @@ public class PartitionStepTests { public void testStoppedStepExecution() throws Exception { step.setStepExecutionSplitter(new SimpleStepExecutionSplitter(jobRepository, true, step.getName(), new SimplePartitioner())); step.setPartitionHandler(new PartitionHandler() { + @Override public Collection handle(StepExecutionSplitter stepSplitter, StepExecution stepExecution) throws Exception { Set executions = stepSplitter.split(stepExecution, 2); @@ -183,6 +187,7 @@ public class PartitionStepTests { }); step.setStepExecutionSplitter(new SimpleStepExecutionSplitter(jobRepository, true, step.getName(), new SimplePartitioner())); step.setPartitionHandler(new PartitionHandler() { + @Override public Collection handle(StepExecutionSplitter stepSplitter, StepExecution stepExecution) throws Exception { return Arrays.asList(stepExecution); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/partition/support/SimpleStepExecutionSplitterTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/partition/support/SimpleStepExecutionSplitterTests.java index c306e3a56..84313c3dc 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/partition/support/SimpleStepExecutionSplitterTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/partition/support/SimpleStepExecutionSplitterTests.java @@ -59,6 +59,7 @@ public class SimpleStepExecutionSplitterTests { final Map map = Collections.singletonMap("foo", new ExecutionContext()); SimpleStepExecutionSplitter splitter = new SimpleStepExecutionSplitter(jobRepository, true, step.getName(), new Partitioner() { + @Override public Map partition(int gridSize) { return map; } @@ -79,10 +80,12 @@ public class SimpleStepExecutionSplitterTests { @Test public void testRememberPartitionNames() throws Exception { class CustomPartitioner implements Partitioner, PartitionNameProvider { + @Override public Map partition(int gridSize) { return Collections.singletonMap("foo", new ExecutionContext()); } + @Override public Collection getPartitionNames(int gridSize) { return Arrays.asList("foo"); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/partition/support/TaskExecutorPartitionHandlerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/partition/support/TaskExecutorPartitionHandlerTests.java index 859a50f2b..0b8d51cd1 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/partition/support/TaskExecutorPartitionHandlerTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/partition/support/TaskExecutorPartitionHandlerTests.java @@ -34,10 +34,12 @@ public class TaskExecutorPartitionHandlerTests { private StepExecutionSplitter stepExecutionSplitter = new StepExecutionSplitter() { + @Override public String getStepName() { return stepExecution.getStepName(); } + @Override public Set split(StepExecution stepExecution, int gridSize) throws JobExecutionException { HashSet result = new HashSet(); for (int i = gridSize; i-- > 0;) { @@ -92,6 +94,7 @@ public class TaskExecutorPartitionHandlerTests { public void testTaskExecutorFailure() throws Exception { handler.setGridSize(2); handler.setTaskExecutor(new TaskExecutor() { + @Override public void execute(Runnable task) { if (count > 0) { throw new TaskRejectedException("foo"); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/JobExecutionAlreadyRunningExceptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/JobExecutionAlreadyRunningExceptionTests.java index 3dfa323ce..5a448c420 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/JobExecutionAlreadyRunningExceptionTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/JobExecutionAlreadyRunningExceptionTests.java @@ -26,6 +26,7 @@ public class JobExecutionAlreadyRunningExceptionTests extends AbstractExceptionT /* (non-Javadoc) * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String) */ + @Override public Exception getException(String msg) throws Exception { return new JobExecutionAlreadyRunningException(msg); } @@ -33,6 +34,7 @@ public class JobExecutionAlreadyRunningExceptionTests extends AbstractExceptionT /* (non-Javadoc) * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String, java.lang.Throwable) */ + @Override public Exception getException(String msg, Throwable t) throws Exception { return new JobExecutionAlreadyRunningException(msg, t); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/JobInstanceAlreadyCompleteExceptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/JobInstanceAlreadyCompleteExceptionTests.java index 1d443372f..a3060309f 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/JobInstanceAlreadyCompleteExceptionTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/JobInstanceAlreadyCompleteExceptionTests.java @@ -26,6 +26,7 @@ public class JobInstanceAlreadyCompleteExceptionTests extends AbstractExceptionT /* (non-Javadoc) * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String) */ + @Override public Exception getException(String msg) throws Exception { return new JobInstanceAlreadyCompleteException(msg); } @@ -33,6 +34,7 @@ public class JobInstanceAlreadyCompleteExceptionTests extends AbstractExceptionT /* (non-Javadoc) * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String, java.lang.Throwable) */ + @Override public Exception getException(String msg, Throwable t) throws Exception { return new JobInstanceAlreadyCompleteException(msg, t); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/JobRestartExceptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/JobRestartExceptionTests.java index a07f0e719..9adb278bf 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/JobRestartExceptionTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/JobRestartExceptionTests.java @@ -27,6 +27,7 @@ public class JobRestartExceptionTests extends AbstractExceptionTests { * (non-Javadoc) * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String) */ + @Override public Exception getException(String msg) throws Exception { return new JobRestartException(msg); } @@ -36,6 +37,7 @@ public class JobRestartExceptionTests extends AbstractExceptionTests { * @see org.springframework.batch.io.exception.AbstractExceptionTests#getException(java.lang.String, * java.lang.Throwable) */ + @Override public Exception getException(String msg, Throwable t) throws Exception { return new JobRestartException(msg, t); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcJobDaoQueryTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcJobDaoQueryTests.java index 6bcf4f23c..76a74479f 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcJobDaoQueryTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcJobDaoQueryTests.java @@ -41,19 +41,23 @@ public class JdbcJobDaoQueryTests extends TestCase { * (non-Javadoc) * @see junit.framework.TestCase#setUp() */ + @Override protected void setUp() throws Exception { jobExecutionDao = new JdbcJobExecutionDao(); jobExecutionDao.setJobExecutionIncrementer(new DataFieldMaxValueIncrementer() { + @Override public int nextIntValue() throws DataAccessException { return 0; } + @Override public long nextLongValue() throws DataAccessException { return 0; } + @Override public String nextStringValue() throws DataAccessException { return "bar"; } @@ -64,6 +68,7 @@ public class JdbcJobDaoQueryTests extends TestCase { public void testTablePrefix() throws Exception { jobExecutionDao.setTablePrefix("FOO_"); jobExecutionDao.setJdbcTemplate(new JdbcTemplate() { + @Override public int update(String sql, Object[] args, int[] argTypes) throws DataAccessException { list.add(sql); return 1; diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcJobInstanceDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcJobInstanceDaoTests.java index 93076d53e..ff430c7c3 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcJobInstanceDaoTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcJobInstanceDaoTests.java @@ -37,6 +37,7 @@ public class JdbcJobInstanceDaoTests extends AbstractJobInstanceDaoTests { @Autowired private JobExecutionDao jobExecutionDao; + @Override protected JobInstanceDao getJobInstanceDao() { JdbcTestUtils.deleteFromTables(jdbcTemplate, "BATCH_JOB_EXECUTION_CONTEXT", "BATCH_STEP_EXECUTION_CONTEXT", "BATCH_STEP_EXECUTION", diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcStepExecutionDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcStepExecutionDaoTests.java index fa0d0f77b..0e981f557 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcStepExecutionDaoTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcStepExecutionDaoTests.java @@ -15,10 +15,12 @@ import org.springframework.transaction.annotation.Transactional; @ContextConfiguration(locations = "sql-dao-test.xml") public class JdbcStepExecutionDaoTests extends AbstractStepExecutionDaoTests { + @Override protected StepExecutionDao getStepExecutionDao() { return (StepExecutionDao) applicationContext.getBean("stepExecutionDao"); } + @Override protected JobRepository getJobRepository() { deleteFromTables("BATCH_JOB_EXECUTION_CONTEXT", "BATCH_STEP_EXECUTION_CONTEXT", "BATCH_STEP_EXECUTION", "BATCH_JOB_EXECUTION", "BATCH_JOB_PARAMS", "BATCH_JOB_INSTANCE"); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/MapJobExecutionDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/MapJobExecutionDaoTests.java index 7f9e127f0..616da0ea9 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/MapJobExecutionDaoTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/MapJobExecutionDaoTests.java @@ -69,6 +69,7 @@ public class MapJobExecutionDaoTests extends AbstractJobExecutionDaoTests { // Implementation of the high-concurrency code final Runnable codeUnderTest = new Runnable() { + @Override public void run() { try { JobExecution jobExecution = new JobExecution(new JobInstance((long) -1, new JobParameters(), "mapJob")); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/MapJobInstanceDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/MapJobInstanceDaoTests.java index 23f9101b1..462410b9c 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/MapJobInstanceDaoTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/MapJobInstanceDaoTests.java @@ -6,6 +6,7 @@ import org.junit.runners.JUnit4; @RunWith(JUnit4.class) public class MapJobInstanceDaoTests extends AbstractJobInstanceDaoTests { + @Override protected JobInstanceDao getJobInstanceDao() { return new MapJobInstanceDao(); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/MapStepExecutionDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/MapStepExecutionDaoTests.java index 204808d27..b4744ee92 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/MapStepExecutionDaoTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/MapStepExecutionDaoTests.java @@ -18,10 +18,12 @@ import org.springframework.batch.core.repository.support.SimpleJobRepository; @RunWith(JUnit4.class) public class MapStepExecutionDaoTests extends AbstractStepExecutionDaoTests { + @Override protected StepExecutionDao getStepExecutionDao() { return new MapStepExecutionDao(); } + @Override protected JobRepository getJobRepository() { return new SimpleJobRepository(new MapJobInstanceDao(), new MapJobExecutionDao(), new MapStepExecutionDao(), new MapExecutionContextDao()); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/TablePrefixTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/TablePrefixTests.java index 72f5b476e..63fba2e36 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/TablePrefixTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/TablePrefixTests.java @@ -62,6 +62,7 @@ public class TablePrefixTests { public static class TestTasklet implements Tasklet { + @Override public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) throws Exception { return RepeatStatus.FINISHED; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/JobRepositoryFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/JobRepositoryFactoryBeanTests.java index e83b459cc..63b075449 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/JobRepositoryFactoryBeanTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/JobRepositoryFactoryBeanTests.java @@ -332,14 +332,17 @@ public class JobRepositoryFactoryBeanTests { private static class StubIncrementer implements DataFieldMaxValueIncrementer { + @Override public int nextIntValue() throws DataAccessException { return 0; } + @Override public long nextLongValue() throws DataAccessException { return 0; } + @Override public String nextStringValue() throws DataAccessException { return null; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryProxyTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryProxyTests.java index ad0acb504..c566eb1a8 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryProxyTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryProxyTests.java @@ -58,10 +58,11 @@ public class SimpleJobRepositoryProxyTests { private boolean invoked; + @Override public Object invoke(MethodInvocation invocation) throws Throwable { invoked = true; return invocation.proceed(); } } -} \ No newline at end of file +} diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/resource/Foo.java b/spring-batch-core/src/test/java/org/springframework/batch/core/resource/Foo.java index 072530a86..ba32c20fe 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/resource/Foo.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/resource/Foo.java @@ -37,6 +37,7 @@ public class Foo { this.id = id; } + @Override public String toString() { return "Foo[id=" +id +",name=" + name + ",value=" + value + "]"; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/resource/FooRowMapper.java b/spring-batch-core/src/test/java/org/springframework/batch/core/resource/FooRowMapper.java index 117e376cf..e158466b6 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/resource/FooRowMapper.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/resource/FooRowMapper.java @@ -8,6 +8,7 @@ import org.springframework.jdbc.core.RowMapper; public class FooRowMapper implements RowMapper { + @Override public Object mapRow(ResultSet rs, int rowNum) throws SQLException { Foo foo = new Foo(); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/resource/ListPreparedStatementSetterTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/resource/ListPreparedStatementSetterTests.java index 53ee8cd58..02f1bee8f 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/resource/ListPreparedStatementSetterTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/resource/ListPreparedStatementSetterTests.java @@ -88,6 +88,7 @@ public class ListPreparedStatementSetterTests { final List results = new ArrayList(); jdbcTemplate.query("SELECT NAME from T_FOOS where ID > ? and ID < ?", pss, new RowCallbackHandler() { + @Override public void processRow(ResultSet rs) throws SQLException { results.add(rs.getString(1)); } @@ -133,6 +134,7 @@ public class ListPreparedStatementSetterTests { public static class FooStoringItemWriter implements ItemWriter { private List foos = new ArrayList(); + @Override public void write(List items) throws Exception { foos.addAll(items); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/resource/StepExecutionSimpleCompletionPolicyTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/resource/StepExecutionSimpleCompletionPolicyTests.java index 400ae22b8..f2dd3c9d4 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/resource/StepExecutionSimpleCompletionPolicyTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/resource/StepExecutionSimpleCompletionPolicyTests.java @@ -49,6 +49,7 @@ public class StepExecutionSimpleCompletionPolicyTests extends TestCase { * mock step context */ + @Override protected void setUp() throws Exception { JobParameters jobParameters = new JobParametersBuilder().addLong("commit.interval", 2L).toJobParameters(); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/AsyncStepScopeIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/AsyncStepScopeIntegrationTests.java index 3e4cc6abb..c0bab53ec 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/AsyncStepScopeIntegrationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/AsyncStepScopeIntegrationTests.java @@ -45,6 +45,7 @@ public class AsyncStepScopeIntegrationTests implements BeanFactoryAware { private int beanCount; + @Override public void setBeanFactory(BeanFactory beanFactory) throws BeansException { this.beanFactory = (ListableBeanFactory) beanFactory; } @@ -80,6 +81,7 @@ public class AsyncStepScopeIntegrationTests implements BeanFactoryAware { final String value = "foo" + i; final Long id = 123L + i; FutureTask task = new FutureTask(new Callable() { + @Override public String call() throws Exception { StepExecution stepExecution = new StepExecution(value, new JobExecution(0L), id); ExecutionContext executionContext = stepExecution.getExecutionContext(); @@ -119,6 +121,7 @@ public class AsyncStepScopeIntegrationTests implements BeanFactoryAware { for (int i = 0; i < 12; i++) { final String value = "foo" + i; FutureTask task = new FutureTask(new Callable() { + @Override public String call() throws Exception { ExecutionContext executionContext = stepExecution.getExecutionContext(); executionContext.put("foo", value); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/JobStartupRunner.java b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/JobStartupRunner.java index 4911c83d5..dc876e01c 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/JobStartupRunner.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/JobStartupRunner.java @@ -13,6 +13,7 @@ public class JobStartupRunner implements InitializingBean { this.step = step; } + @Override public void afterPropertiesSet() throws Exception { StepExecution stepExecution = new StepExecution("step", new JobExecution(1L), 0L); step.execute(stepExecution); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopeClassIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopeClassIntegrationTests.java index 4647953a9..e32a3b7dc 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopeClassIntegrationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopeClassIntegrationTests.java @@ -40,6 +40,7 @@ public class StepScopeClassIntegrationTests implements BeanFactoryAware { private int beanCount; + @Override public void setBeanFactory(BeanFactory beanFactory) throws BeansException { this.beanFactory = (ListableBeanFactory) beanFactory; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopePerformanceTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopePerformanceTests.java index 52baeb436..1ed71c1af 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopePerformanceTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopePerformanceTests.java @@ -26,6 +26,7 @@ public class StepScopePerformanceTests implements ApplicationContextAware { private ApplicationContext applicationContext; + @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { this.applicationContext = applicationContext; diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopePlaceholderIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopePlaceholderIntegrationTests.java index 21e216fbd..6a4e16927 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopePlaceholderIntegrationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopePlaceholderIntegrationTests.java @@ -61,6 +61,7 @@ public class StepScopePlaceholderIntegrationTests implements BeanFactoryAware { private int beanCount; + @Override public void setBeanFactory(BeanFactory beanFactory) throws BeansException { this.beanFactory = (ListableBeanFactory) beanFactory; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopeProxyTargetClassIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopeProxyTargetClassIntegrationTests.java index 8c1432819..67eae4195 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopeProxyTargetClassIntegrationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopeProxyTargetClassIntegrationTests.java @@ -33,6 +33,7 @@ public class StepScopeProxyTargetClassIntegrationTests implements BeanFactoryAwa private int beanCount; + @Override public void setBeanFactory(BeanFactory beanFactory) throws BeansException { this.beanFactory = (ListableBeanFactory) beanFactory; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopeTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopeTests.java index 59030d17c..43879b4fc 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopeTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/StepScopeTests.java @@ -64,6 +64,7 @@ public class StepScopeTests { StepSynchronizationManager.close(); try { scope.get("foo", new ObjectFactory() { + @Override public Object getObject() throws BeansException { return foo; } @@ -80,6 +81,7 @@ public class StepScopeTests { public void testGetWithNothingAlreadyThere() { final String foo = "bar"; Object value = scope.get("foo", new ObjectFactory() { + @Override public Object getObject() throws BeansException { return foo; } @@ -92,6 +94,7 @@ public class StepScopeTests { public void testGetWithSomethingAlreadyThere() { context.setAttribute("foo", "bar"); Object value = scope.get("foo", new ObjectFactory() { + @Override public Object getObject() throws BeansException { return null; } @@ -105,6 +108,7 @@ public class StepScopeTests { context.setAttribute("foo", "bar"); StepContext context = StepSynchronizationManager.register(new StepExecution("bar", new JobExecution(0L))); Object value = scope.get("foo", new ObjectFactory() { + @Override public Object getObject() throws BeansException { return "spam"; } @@ -133,6 +137,7 @@ public class StepScopeTests { final List list = new ArrayList(); context.setAttribute("foo", "bar"); scope.registerDestructionCallback("foo", new Runnable() { + @Override public void run() { list.add("foo"); } @@ -149,11 +154,13 @@ public class StepScopeTests { final List list = new ArrayList(); context.setAttribute("foo", "bar"); scope.registerDestructionCallback("foo", new Runnable() { + @Override public void run() { list.add("foo"); } }); scope.registerDestructionCallback("foo", new Runnable() { + @Override public void run() { list.add("bar"); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/TestCollaborator.java b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/TestCollaborator.java index bb21208cf..3de8861c1 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/TestCollaborator.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/TestCollaborator.java @@ -12,6 +12,7 @@ public class TestCollaborator implements Collaborator, Serializable { private List list; + @Override public List getList() { return list; } @@ -20,6 +21,7 @@ public class TestCollaborator implements Collaborator, Serializable { this.list = list; } + @Override public Collaborator getParent() { return parent; } @@ -28,6 +30,7 @@ public class TestCollaborator implements Collaborator, Serializable { this.parent = parent; } + @Override public String getName() { return name; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/TestDisposableCollaborator.java b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/TestDisposableCollaborator.java index 7277647da..e69f714f3 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/TestDisposableCollaborator.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/TestDisposableCollaborator.java @@ -6,6 +6,7 @@ public class TestDisposableCollaborator extends TestCollaborator implements Disp public static volatile String message = "none"; + @Override public void destroy() throws Exception { message = (message.equals("none") ? "" : message + ",") + getName() + ":destroyed"; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/TestStep.java b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/TestStep.java index a9bb84ebf..3b9768e36 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/TestStep.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/TestStep.java @@ -24,6 +24,7 @@ public class TestStep implements Step { context = null; } + @Override public void execute(StepExecution stepExecution) throws JobInterruptedException { context = StepSynchronizationManager.getContext(); setContextFromCollaborator(); @@ -42,14 +43,17 @@ public class TestStep implements Step { } } + @Override public String getName() { return "foo"; } + @Override public int getStartLimit() { return Integer.MAX_VALUE; } + @Override public boolean isAllowStartIfComplete() { return false; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/context/StepContextTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/context/StepContextTests.java index caf755340..feff5d554 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/context/StepContextTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/context/StepContextTests.java @@ -81,6 +81,7 @@ public class StepContextTests { public void testDestructionCallbackSunnyDay() throws Exception { context.setAttribute("foo", "FOO"); context.registerDestructionCallback("foo", new Runnable() { + @Override public void run() { list.add("bar"); } @@ -93,6 +94,7 @@ public class StepContextTests { @Test public void testDestructionCallbackMissingAttribute() throws Exception { context.registerDestructionCallback("foo", new Runnable() { + @Override public void run() { list.add("bar"); } @@ -108,12 +110,14 @@ public class StepContextTests { context.setAttribute("foo", "FOO"); context.setAttribute("bar", "BAR"); context.registerDestructionCallback("bar", new Runnable() { + @Override public void run() { list.add("spam"); throw new RuntimeException("fail!"); } }); context.registerDestructionCallback("foo", new Runnable() { + @Override public void run() { list.add("bar"); throw new RuntimeException("fail!"); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/context/StepSynchronizationManagerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/context/StepSynchronizationManagerTests.java index b1ee1f02b..1ab6d6d83 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/context/StepSynchronizationManagerTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/context/StepSynchronizationManagerTests.java @@ -45,6 +45,7 @@ public class StepSynchronizationManagerTests { final List list = new ArrayList(); StepContext context = StepSynchronizationManager.register(stepExecution); context.registerDestructionCallback("foo", new Runnable() { + @Override public void run() { list.add("foo"); } @@ -69,6 +70,7 @@ public class StepSynchronizationManagerTests { StepContext context = StepSynchronizationManager.register(stepExecution); ExecutorService executorService = Executors.newFixedThreadPool(2); FutureTask task = new FutureTask(new Callable() { + @Override public StepContext call() throws Exception { try { StepSynchronizationManager.register(stepExecution); @@ -93,6 +95,7 @@ public class StepSynchronizationManagerTests { StepContext context = StepSynchronizationManager.register(stepExecution); final List list = new ArrayList(); context.registerDestructionCallback("foo", new Runnable() { + @Override public void run() { list.add("foo"); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/util/AsyncPlaceholderTargetSourceTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/util/AsyncPlaceholderTargetSourceTests.java index 3d21c1a2d..874254fba 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/util/AsyncPlaceholderTargetSourceTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/util/AsyncPlaceholderTargetSourceTests.java @@ -47,6 +47,7 @@ public class AsyncPlaceholderTargetSourceTests implements BeanFactoryAware { private int beanCount; + @Override public void setBeanFactory(BeanFactory beanFactory) throws BeansException { this.beanFactory = (ListableBeanFactory) beanFactory; } @@ -79,6 +80,7 @@ public class AsyncPlaceholderTargetSourceTests implements BeanFactoryAware { for (int i = 0; i < 12; i++) { final String value = "foo" + i; FutureTask task = new FutureTask(new Callable() { + @Override public String call() throws Exception { attributes.set(Collections.singletonMap("foo", value)); try { @@ -105,6 +107,7 @@ public class AsyncPlaceholderTargetSourceTests implements BeanFactoryAware { private Object root; + @Override public Object getContext() { return root; } @@ -129,6 +132,7 @@ public class AsyncPlaceholderTargetSourceTests implements BeanFactoryAware { private Log logger = LogFactory.getLog(getClass()); + @Override public String getName() { return name; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/util/ContextFactorySupport.java b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/util/ContextFactorySupport.java index 24c428c01..b5ff6793c 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/util/ContextFactorySupport.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/util/ContextFactorySupport.java @@ -9,6 +9,7 @@ public class ContextFactorySupport implements ContextFactory { * * @see org.springframework.batch.core.scope.util.ContextFactory#getContext() */ + @Override public Object getContext() { return this; } @@ -18,6 +19,7 @@ public class ContextFactorySupport implements ContextFactory { * * @see org.springframework.batch.core.scope.util.ContextFactory#getContextId() */ + @Override public String getContextId() { return getContext()+"#"+(count ++); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/util/MultipleContextPlaceholderTargetSourceTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/util/MultipleContextPlaceholderTargetSourceTests.java index 0bc9d18ee..d1a81fadb 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/util/MultipleContextPlaceholderTargetSourceTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/util/MultipleContextPlaceholderTargetSourceTests.java @@ -210,6 +210,7 @@ public class MultipleContextPlaceholderTargetSourceTests { private Object root; + @Override public Object getContext() { return root; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/util/PlaceholderTargetSourceCustomEditorTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/util/PlaceholderTargetSourceCustomEditorTests.java index 65c350ca5..afd7f15eb 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/util/PlaceholderTargetSourceCustomEditorTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/util/PlaceholderTargetSourceCustomEditorTests.java @@ -22,6 +22,7 @@ public class PlaceholderTargetSourceCustomEditorTests extends ContextFactorySupp private Date date = new Date(1L); + @Override public Object getContext() { return this; } @@ -48,6 +49,7 @@ public class PlaceholderTargetSourceCustomEditorTests extends ContextFactorySupp public Foo() { } + @Override public String getName() { return name; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/util/PlaceholderTargetSourceErrorTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/util/PlaceholderTargetSourceErrorTests.java index b5864c963..102052aa6 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/util/PlaceholderTargetSourceErrorTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/util/PlaceholderTargetSourceErrorTests.java @@ -23,6 +23,7 @@ public class PlaceholderTargetSourceErrorTests extends ContextFactorySupport { private Date date = new Date(1L); + @Override public Object getContext() { return this; } @@ -159,6 +160,7 @@ public class PlaceholderTargetSourceErrorTests extends ContextFactorySupport { public Foo() { } + @Override public long getValue() { return value; } @@ -171,10 +173,12 @@ public class PlaceholderTargetSourceErrorTests extends ContextFactorySupport { this.name = name; } + @Override public String getName() { return name; } + @Override public Date getDate() { return date; } @@ -187,6 +191,7 @@ public class PlaceholderTargetSourceErrorTests extends ContextFactorySupport { this.name = name; } + @Override public Node getParent() { return parent; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/util/PlaceholderTargetSourceTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/util/PlaceholderTargetSourceTests.java index 1bf7ae3c7..3e5816f12 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/util/PlaceholderTargetSourceTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/util/PlaceholderTargetSourceTests.java @@ -80,6 +80,7 @@ public class PlaceholderTargetSourceTests extends ContextFactorySupport { private Date date = new Date(1L); + @Override public Object getContext() { return this; } @@ -247,10 +248,12 @@ public class PlaceholderTargetSourceTests extends ContextFactorySupport { this.name = name; } + @Override public String getName() { return name; } + @Override public Date getDate() { return date; } @@ -263,6 +266,7 @@ public class PlaceholderTargetSourceTests extends ContextFactorySupport { this.name = name; } + @Override public Node getParent() { return parent; } @@ -275,10 +279,12 @@ public class PlaceholderTargetSourceTests extends ContextFactorySupport { this.list = list; } + @Override public List getList() { return list; } + @Override public Map getMap() { return map; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/util/SimplePlaceholderTargetSourceTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/util/SimplePlaceholderTargetSourceTests.java index faa133a15..e9a9b218b 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/util/SimplePlaceholderTargetSourceTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/util/SimplePlaceholderTargetSourceTests.java @@ -31,6 +31,7 @@ public class SimplePlaceholderTargetSourceTests { private ThreadLocal fooHolder = new ThreadLocal(); + @Override public Object getContext() { return this; } @@ -57,6 +58,7 @@ public class SimplePlaceholderTargetSourceTests { private String name; + @Override public String getName() { return name; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/JobRepositorySupport.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/JobRepositorySupport.java index 5fccc9f81..09f177c38 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/JobRepositorySupport.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/JobRepositorySupport.java @@ -30,6 +30,7 @@ public class JobRepositorySupport implements JobRepository { /* (non-Javadoc) * @see org.springframework.batch.container.common.repository.JobRepository#findOrCreateJob(org.springframework.batch.container.common.domain.JobConfiguration) */ + @Override public JobExecution createJobExecution(String jobName, JobParameters jobParameters) { JobInstance jobInstance = new JobInstance(0L, jobParameters, jobName); return new JobExecution(jobInstance, 11L); @@ -38,6 +39,7 @@ public class JobRepositorySupport implements JobRepository { /* (non-Javadoc) * @see org.springframework.batch.container.common.repository.JobRepository#saveOrUpdate(org.springframework.batch.container.common.domain.JobExecution) */ + @Override public void update(JobExecution jobExecution) { } @@ -47,10 +49,12 @@ public class JobRepositorySupport implements JobRepository { public void update(JobInstance job) { } + @Override public StepExecution getLastStepExecution(JobInstance jobInstance, String stepName) { return null; } + @Override public int getStepExecutionCount(JobInstance jobInstance, String stepName) { return 0; } @@ -63,26 +67,32 @@ public class JobRepositorySupport implements JobRepository { return null; } + @Override public void add(StepExecution stepExecution) { } + @Override public void update(StepExecution stepExecution) { } + @Override public void updateExecutionContext(StepExecution stepExecution) { } /* (non-Javadoc) * @see org.springframework.batch.core.repository.JobRepository#isJobInstanceExists(java.lang.String, org.springframework.batch.core.JobParameters) */ + @Override public boolean isJobInstanceExists(String jobName, JobParameters jobParameters) { return false; } + @Override public JobExecution getLastJobExecution(String jobName, JobParameters jobParameters) { return null; } + @Override public void updateExecutionContext(JobExecution jobExecution) { } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/NonAbstractStepTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/NonAbstractStepTests.java index 9929618cc..8be90358f 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/NonAbstractStepTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/NonAbstractStepTests.java @@ -51,6 +51,7 @@ public class NonAbstractStepTests { setBeanName("eventTrackingStep"); } + @Override protected void open(ExecutionContext ctx) throws Exception { events.add("open"); } @@ -62,6 +63,7 @@ public class NonAbstractStepTests { context.setExitStatus(ExitStatus.COMPLETED); } + @Override protected void close(ExecutionContext ctx) throws Exception { events.add("close"); } @@ -82,6 +84,7 @@ public class NonAbstractStepTests { return name + "#" + event; } + @Override public ExitStatus afterStep(StepExecution stepExecution) { assertSame(execution, stepExecution); events.add(getEvent("afterStep(" + stepExecution.getExitStatus().getExitCode() + ")")); @@ -89,6 +92,7 @@ public class NonAbstractStepTests { return stepExecution.getExitStatus(); } + @Override public void beforeStep(StepExecution stepExecution) { assertSame(execution, stepExecution); events.add(getEvent("beforeStep")); @@ -106,6 +110,7 @@ public class NonAbstractStepTests { static long counter = 0; + @Override public void updateExecutionContext(StepExecution stepExecution) { Assert.state(stepExecution.getId() != null, "StepExecution must already be saved"); saved = stepExecution.getExecutionContext(); @@ -286,6 +291,7 @@ public class NonAbstractStepTests { } }; repository = new JobRepositoryStub() { + @Override public void updateExecutionContext(StepExecution stepExecution) { throw new RuntimeException("Bad context!"); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/StepLocatorStepFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/StepLocatorStepFactoryBeanTests.java index 8d61ec18f..82b617f70 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/StepLocatorStepFactoryBeanTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/StepLocatorStepFactoryBeanTests.java @@ -35,18 +35,22 @@ public class StepLocatorStepFactoryBeanTests { private Step buildTestStep(final String stepName) { return new Step() { + @Override public String getName() { return stepName; } + @Override public boolean isAllowStartIfComplete() { throw new UnsupportedOperationException("Not supported yet."); } + @Override public int getStartLimit() { throw new UnsupportedOperationException("Not supported yet."); } + @Override public void execute(StepExecution stepExecution) throws JobInterruptedException { throw new UnsupportedOperationException("Not supported yet."); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/StepSupport.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/StepSupport.java index 2838b6845..5d51a889e 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/StepSupport.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/StepSupport.java @@ -51,6 +51,7 @@ public class StepSupport implements Step, BeanNameAware { this.name = string; } + @Override public String getName() { return this.name; } @@ -62,6 +63,7 @@ public class StepSupport implements Step, BeanNameAware { * * @see org.springframework.beans.factory.BeanNameAware#setBeanName(java.lang.String) */ + @Override public void setBeanName(String name) { if (this.name == null) { this.name = name; @@ -77,6 +79,7 @@ public class StepSupport implements Step, BeanNameAware { this.name = name; } + @Override public int getStartLimit() { return this.startLimit; } @@ -90,6 +93,7 @@ public class StepSupport implements Step, BeanNameAware { this.startLimit = startLimit; } + @Override public boolean isAllowStartIfComplete() { return this.allowStartIfComplete; } @@ -110,6 +114,7 @@ public class StepSupport implements Step, BeanNameAware { * * @see org.springframework.batch.core.Step#execute(org.springframework.batch.core.StepExecution) */ + @Override public void execute(StepExecution stepExecution) throws JobInterruptedException, UnexpectedJobExecutionException { throw new UnsupportedOperationException( "Cannot process a StepExecution. Use a smarter subclass of StepSupport."); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/builder/StepBuilderTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/builder/StepBuilderTests.java index 4c8e5699f..c1830934e 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/builder/StepBuilderTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/builder/StepBuilderTests.java @@ -42,6 +42,7 @@ public class StepBuilderTests { PlatformTransactionManager transactionManager = new ResourcelessTransactionManager(); TaskletStepBuilder builder = new StepBuilder("step").repository(jobRepository) .transactionManager(transactionManager).tasklet(new Tasklet() { + @Override public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) throws Exception { return null; diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/BatchRetryTemplateTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/BatchRetryTemplateTests.java index 360b4e939..bbc364d4d 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/BatchRetryTemplateTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/BatchRetryTemplateTests.java @@ -38,6 +38,7 @@ public class BatchRetryTemplateTests { BatchRetryTemplate template = new BatchRetryTemplate(); String result = template.execute(new RetryCallback() { + @Override public String doWithRetry(RetryContext context) throws Exception { assertTrue("Wrong context type: " + context.getClass().getSimpleName(), context.getClass() .getSimpleName().contains("Batch")); @@ -55,6 +56,7 @@ public class BatchRetryTemplateTests { BatchRetryTemplate template = new BatchRetryTemplate(); RetryCallback retryCallback = new RetryCallback() { + @Override public String[] doWithRetry(RetryContext context) throws Exception { assertEquals(count, context.getRetryCount()); if (count++ == 0) { @@ -86,6 +88,7 @@ public class BatchRetryTemplateTests { ., Boolean> singletonMap(Exception.class, true))); RetryCallback retryCallback = new RetryCallback() { + @Override public String[] doWithRetry(RetryContext context) throws Exception { if (count++ < 2) { throw new RecoverableException("Recoverable"); @@ -115,6 +118,7 @@ public class BatchRetryTemplateTests { ., Boolean> singletonMap(Exception.class, true))); RetryCallback retryCallback = new RetryCallback() { + @Override public String[] doWithRetry(RetryContext context) throws Exception { if (count++ < 1) { throw new RecoverableException("Recoverable"); @@ -169,6 +173,7 @@ public class BatchRetryTemplateTests { ., Boolean> singletonMap(Exception.class, true))); RetryCallback retryCallback = new RetryCallback() { + @Override public String[] doWithRetry(RetryContext context) throws Exception { if (count++ < 2) { throw new RecoverableException("Recoverable"); @@ -178,6 +183,7 @@ public class BatchRetryTemplateTests { }; RecoveryCallback recoveryCallback = new RecoveryCallback() { + @Override public String[] recover(RetryContext context) throws Exception { List recovered = new ArrayList(); for (String item : outputs) { diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ChunkMonitorTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ChunkMonitorTests.java index 63c37e93d..bc1cb91c2 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ChunkMonitorTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ChunkMonitorTests.java @@ -47,6 +47,7 @@ public class ChunkMonitorTests { @Before public void setUp() { monitor.setItemReader(new ItemReader() { + @Override public String read() throws Exception, UnexpectedInputException, ParseException { return "" + (count++); } @@ -109,6 +110,7 @@ public class ChunkMonitorTests { @Test(expected = ItemStreamException.class) public void testOpenWithErrorInReader() { monitor.setItemReader(new ItemReader() { + @Override public String read() throws Exception, UnexpectedInputException, ParseException { throw new IllegalStateException("Expected"); } @@ -138,6 +140,7 @@ public class ChunkMonitorTests { public void testUpdateWithNoStream() throws Exception { monitor = new ChunkMonitor(); monitor.setItemReader(new ItemReader() { + @Override public String read() throws Exception, UnexpectedInputException, ParseException { return "" + (count++); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ChunkOrientedTaskletTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ChunkOrientedTaskletTests.java index 135067a2e..7162aef58 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ChunkOrientedTaskletTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ChunkOrientedTaskletTests.java @@ -38,14 +38,17 @@ public class ChunkOrientedTaskletTests { @Test public void testHandle() throws Exception { ChunkOrientedTasklet handler = new ChunkOrientedTasklet(new ChunkProvider() { + @Override public Chunk provide(StepContribution contribution) throws Exception { contribution.incrementReadCount(); Chunk chunk = new Chunk(); chunk.add("foo"); return chunk; } + @Override public void postProcess(StepContribution contribution, Chunk chunk) {}; }, new ChunkProcessor() { + @Override public void process(StepContribution contribution, Chunk chunk) { contribution.incrementWriteCount(1); } @@ -61,11 +64,14 @@ public class ChunkOrientedTaskletTests { @Test public void testFail() throws Exception { ChunkOrientedTasklet handler = new ChunkOrientedTasklet(new ChunkProvider() { + @Override public Chunk provide(StepContribution contribution) throws Exception { throw new RuntimeException("Foo!"); } + @Override public void postProcess(StepContribution contribution, Chunk chunk) {}; }, new ChunkProcessor() { + @Override public void process(StepContribution contribution, Chunk chunk) { fail("Not expecting to get this far"); } @@ -85,6 +91,7 @@ public class ChunkOrientedTaskletTests { @Test public void testExitCode() throws Exception { ChunkOrientedTasklet handler = new ChunkOrientedTasklet(new ChunkProvider() { + @Override public Chunk provide(StepContribution contribution) throws Exception { contribution.incrementReadCount(); Chunk chunk = new Chunk(); @@ -92,8 +99,10 @@ public class ChunkOrientedTaskletTests { chunk.setEnd(); return chunk; } + @Override public void postProcess(StepContribution contribution, Chunk chunk) {}; }, new ChunkProcessor() { + @Override public void process(StepContribution contribution, Chunk chunk) { contribution.incrementWriteCount(1); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ExceptionThrowingTaskletStub.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ExceptionThrowingTaskletStub.java index ed9df6d32..90426e278 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ExceptionThrowingTaskletStub.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/ExceptionThrowingTaskletStub.java @@ -56,6 +56,7 @@ public class ExceptionThrowingTaskletStub implements Tasklet { committed.clear(); } + @Override public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) throws Exception { committed.add(1); if (committed.size()>=maxTries) { diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantChunkProcessorTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantChunkProcessorTests.java index a08506083..39e40ff8c 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantChunkProcessorTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantChunkProcessorTests.java @@ -47,6 +47,7 @@ public class FaultTolerantChunkProcessorTests { processor = new FaultTolerantChunkProcessor( new PassThroughItemProcessor(), new ItemWriter() { + @Override public void write(List items) throws Exception { if (items.contains("fail")) { @@ -68,6 +69,7 @@ public class FaultTolerantChunkProcessorTests { @Test public void testTransform() throws Exception { processor.setItemProcessor(new ItemProcessor() { + @Override public String process(String item) throws Exception { return item.equals("1") ? null : item; } @@ -82,6 +84,7 @@ public class FaultTolerantChunkProcessorTests { public void testFilterCountOnSkip() throws Exception { processor.setProcessSkipPolicy(new AlwaysSkipItemSkipPolicy()); processor.setItemProcessor(new ItemProcessor() { + @Override public String process(String item) throws Exception { if (item.equals("1")) { throw new RuntimeException("Skippable"); @@ -114,6 +117,7 @@ public class FaultTolerantChunkProcessorTests { public void testWriteSkipOnError() throws Exception { processor.setWriteSkipPolicy(new AlwaysSkipItemSkipPolicy()); processor.setItemWriter(new ItemWriter() { + @Override public void write(List items) throws Exception { if (items.contains("fail")) { assertFalse("Expected Error!", true); @@ -135,6 +139,7 @@ public class FaultTolerantChunkProcessorTests { public void testWriteSkipOnException() throws Exception { processor.setWriteSkipPolicy(new AlwaysSkipItemSkipPolicy()); processor.setItemWriter(new ItemWriter() { + @Override public void write(List items) throws Exception { if (items.contains("fail")) { throw new RuntimeException("Expected Exception!"); @@ -165,6 +170,7 @@ public class FaultTolerantChunkProcessorTests { public void testWriteSkipOnExceptionWithTrivialChunk() throws Exception { processor.setWriteSkipPolicy(new AlwaysSkipItemSkipPolicy()); processor.setItemWriter(new ItemWriter() { + @Override public void write(List items) throws Exception { if (items.contains("fail")) { throw new RuntimeException("Expected Exception!"); @@ -195,6 +201,7 @@ public class FaultTolerantChunkProcessorTests { @Test public void testTransformWithExceptionAndNoRollback() throws Exception { processor.setItemProcessor(new ItemProcessor() { + @Override public String process(String item) throws Exception { if (item.equals("1")) throw new DataIntegrityViolationException("Planned"); @@ -245,6 +252,7 @@ public class FaultTolerantChunkProcessorTests { processor = new FaultTolerantChunkProcessor( new PassThroughItemProcessor(), new ItemWriter() { + @Override public void write(List items) throws Exception { // Fail if there is more than one item @@ -298,6 +306,7 @@ public class FaultTolerantChunkProcessorTests { processor = new FaultTolerantChunkProcessor( new PassThroughItemProcessor(), new ItemWriter() { + @Override public void write(List items) throws Exception { // Always fail in writer @@ -328,6 +337,7 @@ public class FaultTolerantChunkProcessorTests { batchRetryTemplate.setRetryPolicy(retryPolicy); processor.setWriteSkipPolicy(new AlwaysSkipItemSkipPolicy()); processor.setItemWriter(new ItemWriter() { + @Override public void write(List items) throws Exception { if (items.contains("fail")) { throw new IllegalArgumentException("Expected Exception!"); @@ -372,6 +382,7 @@ public class FaultTolerantChunkProcessorTests { batchRetryTemplate.setRetryPolicy(retryPolicy); processor.setWriteSkipPolicy(new AlwaysSkipItemSkipPolicy()); processor.setItemWriter(new ItemWriter() { + @Override public void write(List items) throws Exception { if (items.contains("fail")) { throw new IllegalArgumentException("Expected Exception!"); @@ -426,6 +437,7 @@ public class FaultTolerantChunkProcessorTests { Collections., Boolean> singletonMap( IllegalArgumentException.class, true))); processor.setItemWriter(new ItemWriter() { + @Override public void write(List items) throws Exception { if (items.contains("fail")) { throw new IllegalArgumentException("Expected Exception!"); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantChunkProviderTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantChunkProviderTests.java index 5c2f30e47..db4f78de9 100755 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantChunkProviderTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantChunkProviderTests.java @@ -38,6 +38,7 @@ public class FaultTolerantChunkProviderTests { @Test public void testProvideWithOverflow() throws Exception { provider = new FaultTolerantChunkProvider(new ItemReader() { + @Override public String read() throws Exception, UnexpectedInputException, ParseException { throw new RuntimeException("Planned"); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantExceptionClassesTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantExceptionClassesTests.java index 82495f47f..9b83c871f 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantExceptionClassesTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantExceptionClassesTests.java @@ -51,6 +51,7 @@ public class FaultTolerantExceptionClassesTests implements ApplicationContextAwa private ApplicationContext applicationContext; + @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { this.applicationContext = applicationContext; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanNonBufferingTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanNonBufferingTests.java index 6a6d327ca..d75dd7e13 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanNonBufferingTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanNonBufferingTests.java @@ -133,6 +133,7 @@ public class FaultTolerantStepFactoryBeanNonBufferingTests { this.failures = failures; } + @Override public void write(List items) throws Exception { logger.debug("Writing: " + items); for (String item : items) { diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanRetryTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanRetryTests.java index baa9498ec..3a4d7a93c 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanRetryTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanRetryTests.java @@ -90,6 +90,7 @@ public class FaultTolerantStepFactoryBeanRetryTests { JobExecution jobExecution; private ItemWriter writer = new ItemWriter() { + @Override public void write(List data) throws Exception { processed.addAll(data); } @@ -140,6 +141,7 @@ public class FaultTolerantStepFactoryBeanRetryTests { factory.setJobRepository(repository); factory.setTransactionManager(new ResourcelessTransactionManager()); ItemWriter failingWriter = new ItemWriter() { + @Override public void write(List data) throws Exception { int count = 0; for (Integer item : data) { @@ -152,6 +154,7 @@ public class FaultTolerantStepFactoryBeanRetryTests { }; ItemProcessor processor = new ItemProcessor() { + @Override public Integer process(String item) throws Exception { processed.add(item); return Integer.parseInt(item); @@ -192,6 +195,7 @@ public class FaultTolerantStepFactoryBeanRetryTests { final int RETRY_LIMIT = 3; final List ITEM_LIST = Arrays.asList("a", "b", "c"); ItemWriter failingWriter = new ItemWriter() { + @Override public void write(List data) throws Exception { int count = 0; for (String item : data) { @@ -204,6 +208,7 @@ public class FaultTolerantStepFactoryBeanRetryTests { }; ItemProcessor processor = new ItemProcessor() { + @Override public String process(String item) throws Exception { processed.add(item); return item; @@ -239,6 +244,7 @@ public class FaultTolerantStepFactoryBeanRetryTests { public void testNoItemsReprocessedWhenErrorInWriterAndProcessorNotTransactional() throws Exception { ItemWriter failingWriter = new ItemWriter() { + @Override public void write(List data) throws Exception { int count = 0; for (String item : data) { @@ -251,6 +257,7 @@ public class FaultTolerantStepFactoryBeanRetryTests { }; ItemProcessor processor = new ItemProcessor() { + @Override public String process(String item) throws Exception { processed.add(item); return item; @@ -291,6 +298,7 @@ public class FaultTolerantStepFactoryBeanRetryTests { public void testSuccessfulRetryWithReadFailure() throws Exception { ItemReader provider = new ListItemReader(Arrays.asList( "a", "b", "c")) { + @Override public String read() { String item = super.read(); provided.add(item); @@ -355,6 +363,7 @@ public class FaultTolerantStepFactoryBeanRetryTests { factory.setItemReader(reader); factory.setStreams(new ItemStream[] { reader }); factory.setItemWriter(new ItemWriter() { + @Override public void write(List items) throws Exception { if (fail && items.contains("e")) { throw new RuntimeException("Planned failure"); @@ -393,6 +402,7 @@ public class FaultTolerantStepFactoryBeanRetryTests { factory.setSkipLimit(2); ItemReader provider = new ListItemReader(Arrays.asList( "a", "b", "c", "d", "e", "f")) { + @Override public String read() { String item = super.read(); count++; @@ -423,6 +433,7 @@ public class FaultTolerantStepFactoryBeanRetryTests { public void testSkipAndRetryWithWriteFailure() throws Exception { factory.setListeners(new StepListener[] { new SkipListenerSupport() { + @Override public void onSkipInWrite(String item, Throwable t) { recovered.add(item); assertTrue(TransactionSynchronizationManager @@ -432,6 +443,7 @@ public class FaultTolerantStepFactoryBeanRetryTests { factory.setSkipLimit(2); ItemReader provider = new ListItemReader(Arrays.asList( "a", "b", "c", "d", "e", "f")) { + @Override public String read() { String item = super.read(); logger.debug("Read Called! Item: [" + item + "]"); @@ -442,6 +454,7 @@ public class FaultTolerantStepFactoryBeanRetryTests { }; ItemWriter itemWriter = new ItemWriter() { + @Override public void write(List item) throws Exception { logger.debug("Write Called! Item: [" + item + "]"); processed.addAll(item); @@ -484,6 +497,7 @@ public class FaultTolerantStepFactoryBeanRetryTests { factory.setCommitInterval(3); factory.setListeners(new StepListener[] { new SkipListenerSupport() { + @Override public void onSkipInWrite(String item, Throwable t) { recovered.add(item); assertTrue(TransactionSynchronizationManager @@ -493,6 +507,7 @@ public class FaultTolerantStepFactoryBeanRetryTests { factory.setSkipLimit(2); ItemReader provider = new ListItemReader(Arrays.asList( "a", "b", "c", "d", "e", "f")) { + @Override public String read() { String item = super.read(); logger.debug("Read Called! Item: [" + item + "]"); @@ -503,6 +518,7 @@ public class FaultTolerantStepFactoryBeanRetryTests { }; ItemWriter itemWriter = new ItemWriter() { + @Override public void write(List item) throws Exception { logger.debug("Write Called! Item: [" + item + "]"); processed.addAll(item); @@ -549,6 +565,7 @@ public class FaultTolerantStepFactoryBeanRetryTests { factory.setSkipLimit(0); ItemReader provider = new ListItemReader( Arrays.asList("b")) { + @Override public String read() { String item = super.read(); provided.add(item); @@ -557,6 +574,7 @@ public class FaultTolerantStepFactoryBeanRetryTests { } }; ItemWriter itemWriter = new ItemWriter() { + @Override public void write(List item) throws Exception { processed.addAll(item); written.addAll(item); @@ -602,6 +620,7 @@ public class FaultTolerantStepFactoryBeanRetryTests { factory.setSkipLimit(1); ItemReader provider = new ListItemReader( Arrays.asList("b")) { + @Override public String read() { String item = super.read(); provided.add(item); @@ -610,6 +629,7 @@ public class FaultTolerantStepFactoryBeanRetryTests { } }; ItemWriter itemWriter = new ItemWriter() { + @Override public void write(List item) throws Exception { processed.addAll(item); written.addAll(item); @@ -653,6 +673,7 @@ public class FaultTolerantStepFactoryBeanRetryTests { factory.setSkipLimit(0); ItemReader provider = new ListItemReader( Arrays.asList("b")) { + @Override public String read() { String item = super.read(); provided.add(item); @@ -661,6 +682,7 @@ public class FaultTolerantStepFactoryBeanRetryTests { } }; ItemWriter itemWriter = new ItemWriter() { + @Override public void write(List item) throws Exception { processed.addAll(item); written.addAll(item); @@ -701,6 +723,7 @@ public class FaultTolerantStepFactoryBeanRetryTests { // set the cache limit stupidly low factory.setRetryContextCache(new MapRetryContextCache(0)); ItemReader provider = new ItemReader() { + @Override public String read() { String item = "" + count; provided.add(item); @@ -713,6 +736,7 @@ public class FaultTolerantStepFactoryBeanRetryTests { } }; ItemWriter itemWriter = new ItemWriter() { + @Override public void write(List item) throws Exception { processed.addAll(item); logger.debug("Write Called! Item: [" + item + "]"); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanRollbackTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanRollbackTests.java index 2799fcea0..8c9351850 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanRollbackTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanRollbackTests.java @@ -596,12 +596,14 @@ public class FaultTolerantStepFactoryBeanRollbackTests { this.throwBefore = throwBefore; } + @Override public void beforeChunk() { if(throwBefore){ throw new IllegalArgumentException("Planned exception"); } } + @Override public void afterChunk() { throw new IllegalArgumentException("Planned exception"); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanTests.java index ee7ce37bd..dcfb795a5 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanTests.java @@ -214,6 +214,7 @@ public class FaultTolerantStepFactoryBeanTests { factory.setSkipLimit(0); factory.setSkipPolicy(new SkipPolicy() { + @Override public boolean shouldSkip(Throwable t, int skipCount) throws SkipLimitExceededException { throw new RuntimeException("Planned exception in SkipPolicy"); } @@ -241,6 +242,7 @@ public class FaultTolerantStepFactoryBeanTests { factory.setSkipLimit(0); factory.setSkipPolicy(new SkipPolicy() { + @Override public boolean shouldSkip(Throwable t, int skipCount) throws SkipLimitExceededException { throw new RuntimeException("Planned exception in SkipPolicy"); } @@ -420,6 +422,7 @@ public class FaultTolerantStepFactoryBeanTests { map.put(FatalRuntimeException.class, false); factory.setSkippableExceptionClasses(map); factory.setItemWriter(new ItemWriter() { + @Override public void write(List items) { throw new FatalRuntimeException("Ouch!"); } @@ -734,56 +737,71 @@ public class FaultTolerantStepFactoryBeanTests { class TestItemListenerWriter implements ItemWriter, ItemReadListener, ItemWriteListener, ItemProcessListener, SkipListener, ChunkListener { + @Override public void write(List items) throws Exception { if (items.contains("4")) { throw new SkippableException("skippable"); } } + @Override public void afterRead(String item) { listenerCalls.add(1); } + @Override public void beforeRead() { } + @Override public void onReadError(Exception ex) { } + @Override public void afterWrite(List items) { listenerCalls.add(2); } + @Override public void beforeWrite(List items) { } + @Override public void onWriteError(Exception exception, List items) { } + @Override public void afterProcess(String item, String result) { listenerCalls.add(3); } + @Override public void beforeProcess(String item) { } + @Override public void onProcessError(String item, Exception e) { } + @Override public void afterChunk() { listenerCalls.add(4); } + @Override public void beforeChunk() { } + @Override public void onSkipInProcess(String item, Throwable t) { } + @Override public void onSkipInRead(Throwable t) { listenerCalls.add(6); } + @Override public void onSkipInWrite(String item, Throwable t) { listenerCalls.add(5); } @@ -809,17 +827,21 @@ public class FaultTolerantStepFactoryBeanTests { writer.setFailures("4"); ItemStreamReader reader = new ItemStreamReader() { + @Override public void close() throws ItemStreamException { closed = true; } + @Override public void open(ExecutionContext executionContext) throws ItemStreamException { opened = true; } + @Override public void update(ExecutionContext executionContext) throws ItemStreamException { } + @Override public String read() throws Exception, UnexpectedInputException, ParseException { return null; } @@ -845,32 +867,40 @@ public class FaultTolerantStepFactoryBeanTests { writer.setFailures("4"); ItemStreamReader reader = new ItemStreamReader() { + @Override public void close() throws ItemStreamException { } + @Override public void open(ExecutionContext executionContext) throws ItemStreamException { } + @Override public void update(ExecutionContext executionContext) throws ItemStreamException { } + @Override public String read() throws Exception, UnexpectedInputException, ParseException { return null; } }; ItemStreamReader stream = new ItemStreamReader() { + @Override public void close() throws ItemStreamException { closed = true; } + @Override public void open(ExecutionContext executionContext) throws ItemStreamException { opened = true; } + @Override public void update(ExecutionContext executionContext) throws ItemStreamException { } + @Override public String read() throws Exception, UnexpectedInputException, ParseException { return null; } @@ -897,17 +927,21 @@ public class FaultTolerantStepFactoryBeanTests { writer.setFailures("4"); ItemStreamReader reader = new ItemStreamReader() { + @Override public void close() throws ItemStreamException { closed = true; } + @Override public void open(ExecutionContext executionContext) throws ItemStreamException { opened = true; } + @Override public void update(ExecutionContext executionContext) throws ItemStreamException { } + @Override public String read() throws Exception, UnexpectedInputException, ParseException { return null; } @@ -917,6 +951,7 @@ public class FaultTolerantStepFactoryBeanTests { proxy.setTarget(reader); proxy.setInterfaces(new Class[] { ItemReader.class, ItemStream.class }); proxy.addAdvice(new MethodInterceptor() { + @Override public Object invoke(MethodInvocation invocation) throws Throwable { return invocation.proceed(); } @@ -939,16 +974,19 @@ public class FaultTolerantStepFactoryBeanTests { private boolean filterEncountered = false; + @Override public void afterProcess(T item, S result) { if (result == null) { filterEncountered = true; } } + @Override public void beforeProcess(T item) { } + @Override public void onProcessError(T item, Exception e) { } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanUnexpectedRollbackTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanUnexpectedRollbackTests.java index 1bb17378d..3b7ef3a34 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanUnexpectedRollbackTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/FaultTolerantStepFactoryBeanUnexpectedRollbackTests.java @@ -49,6 +49,7 @@ public class FaultTolerantStepFactoryBeanUnexpectedRollbackTests { DataSourceTransactionManager transactionManager = new DataSourceTransactionManager(dataSource) { private boolean failed = false; + @Override protected void doCommit(DefaultTransactionStatus status) throws TransactionException { if (writer.getWritten().isEmpty() || failed || !isExistingTransaction(status.getTransaction())) { super.doCommit(status); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/RepeatOperationsStepFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/RepeatOperationsStepFactoryBeanTests.java index b65728232..3473c3ede 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/RepeatOperationsStepFactoryBeanTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/RepeatOperationsStepFactoryBeanTests.java @@ -46,6 +46,7 @@ public class RepeatOperationsStepFactoryBeanTests extends TestCase { private JobExecution jobExecution = new JobExecution(new JobInstance(0L, new JobParameters(), "job")); + @Override protected void setUp() throws Exception { factory.setBeanName("RepeatOperationsStep"); factory.setItemReader(new ListItemReader(new ArrayList())); @@ -71,6 +72,7 @@ public class RepeatOperationsStepFactoryBeanTests extends TestCase { factory.setStepOperations(new RepeatOperations() { + @Override public RepeatStatus iterate(RepeatCallback callback) { list = new ArrayList(); list.add("foo"); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleChunkProcessorTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleChunkProcessorTests.java index e9f68b294..0cb637fad 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleChunkProcessorTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleChunkProcessorTests.java @@ -20,6 +20,7 @@ public class SimpleChunkProcessorTests { private SimpleChunkProcessor processor = new SimpleChunkProcessor( new ItemProcessor() { + @Override public String process(String item) throws Exception { if (item.equals("err")) { return null; @@ -27,6 +28,7 @@ public class SimpleChunkProcessorTests { return item; } }, new ItemWriter() { + @Override public void write(List items) throws Exception { if (items.contains("fail")) { throw new RuntimeException("Planned failure!"); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleRetryExceptionHandlerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleRetryExceptionHandlerTests.java index 75991dfac..8a42b4b39 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleRetryExceptionHandlerTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleRetryExceptionHandlerTests.java @@ -42,6 +42,7 @@ public class SimpleRetryExceptionHandlerTests extends TestCase { * * @see junit.framework.TestCase#setUp() */ + @Override protected void setUp() throws Exception { RepeatSynchronizationManager.register(context); } @@ -51,6 +52,7 @@ public class SimpleRetryExceptionHandlerTests extends TestCase { * * @see junit.framework.TestCase#tearDown() */ + @Override protected void tearDown() throws Exception { RepeatSynchronizationManager.clear(); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleStepFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleStepFactoryBeanTests.java index 428b02853..745f69ceb 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleStepFactoryBeanTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SimpleStepFactoryBeanTests.java @@ -70,6 +70,7 @@ public class SimpleStepFactoryBeanTests { private List written = new ArrayList(); private ItemWriter writer = new ItemWriter() { + @Override public void write(List data) throws Exception { written.addAll(data); } @@ -134,6 +135,7 @@ public class SimpleStepFactoryBeanTests { SimpleStepFactoryBean factory = getStepFactory(new String[] { "foo", "bar", "spam" }); factory.setItemWriter(new ItemWriter() { + @Override public void write(List data) throws Exception { throw new RuntimeException("Error!"); } @@ -171,6 +173,7 @@ public class SimpleStepFactoryBeanTests { SimpleStepFactoryBean factory = getStepFactory(new String[] { "foo", "bar", "spam" }); factory.setBeanName("exceptionStep"); factory.setItemWriter(new ItemWriter() { + @Override public void write(List data) throws Exception { throw new RuntimeException("Foo"); } @@ -195,6 +198,7 @@ public class SimpleStepFactoryBeanTests { factory.setItemWriter(new ItemWriter() { int count = 0; + @Override public void write(List data) throws Exception { if (count++ == 0) { throw new RuntimeException("Foo"); @@ -244,11 +248,13 @@ public class SimpleStepFactoryBeanTests { this.writeListener = writeListener; } + @Override public void afterChunk() { writeListener.trail = writeListener.trail + "4"; afterCount++; } + @Override public void beforeChunk() { writeListener.trail = writeListener.trail + "1"; beforeCount++; @@ -329,47 +335,60 @@ public class SimpleStepFactoryBeanTests { class TestItemListenerWriter implements ItemWriter, ItemProcessor, ItemReadListener, ItemWriteListener, ItemProcessListener, ChunkListener { + @Override public void write(List items) throws Exception { } + @Override public String process(String item) throws Exception { return item; } + @Override public void afterRead(String item) { listenerCalls.add("read"); } + @Override public void beforeRead() { } + @Override public void onReadError(Exception ex) { } + @Override public void afterWrite(List items) { listenerCalls.add("write"); } + @Override public void beforeWrite(List items) { } + @Override public void onWriteError(Exception exception, List items) { } + @Override public void afterProcess(String item, String result) { listenerCalls.add("process"); } + @Override public void beforeProcess(String item) { } + @Override public void onProcessError(String item, Exception e) { } + @Override public void afterChunk() { listenerCalls.add("chunk"); } + @Override public void beforeChunk() { } @@ -401,16 +420,20 @@ public class SimpleStepFactoryBeanTests { final List listenerCalls = new ArrayList(); class TestItemListenerWriter implements ItemWriter, ItemWriteListener { + @Override public void write(List items) throws Exception { } + @Override public void afterWrite(List items) { listenerCalls.add("write"); } + @Override public void beforeWrite(List items) { } + @Override public void onWriteError(Exception exception, List items) { } @@ -439,6 +462,7 @@ public class SimpleStepFactoryBeanTests { SimpleStepFactoryBean factory = getStepFactory(new String[] { "foo", "bar", "spam" }); factory.setItemWriter(null); factory.setItemProcessor(new ItemProcessor() { + @Override public String process(String item) throws Exception { written.add(item); return null; diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SkipProcessorStub.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SkipProcessorStub.java index 613624de6..4cb401854 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SkipProcessorStub.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SkipProcessorStub.java @@ -55,6 +55,7 @@ public class SkipProcessorStub extends AbstractExceptionThrowingItemHandlerSt filter = false; } + @Override public T process(T item) throws Exception { processed.add(item); committed.add(item); @@ -71,4 +72,4 @@ public class SkipProcessorStub extends AbstractExceptionThrowingItemHandlerSt } return item; } -} \ No newline at end of file +} diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SkipReaderStub.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SkipReaderStub.java index 9c3bf9257..e7e7d0f54 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SkipReaderStub.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SkipReaderStub.java @@ -58,6 +58,7 @@ public class SkipReaderStub extends AbstractExceptionThrowingItemHandlerStub< read.clear(); } + @Override public T read() throws Exception, UnexpectedInputException, ParseException { counter++; if (counter >= items.length) { diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SkipWriterStub.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SkipWriterStub.java index 103eef785..d2e50f685 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SkipWriterStub.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/SkipWriterStub.java @@ -48,6 +48,7 @@ public class SkipWriterStub extends AbstractExceptionThrowingItemHandlerStub< committed.clear(); } + @Override public void write(List items) throws Exception { logger.debug("Writing: " + items); for (T item : items) { diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/TaskletStepExceptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/TaskletStepExceptionTests.java index e57f4c371..4442602ef 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/TaskletStepExceptionTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/item/TaskletStepExceptionTests.java @@ -90,6 +90,7 @@ public class TaskletStepExceptionTests { @Test public void testInterruptedWithCustomStatus() throws Exception { taskletStep.setTasklet(new Tasklet() { + @Override public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) throws Exception { contribution.setExitStatus(new ExitStatus("FUNNY")); throw new JobInterruptedException("Planned"); @@ -144,6 +145,7 @@ public class TaskletStepExceptionTests { } }); taskletStep.setTasklet(new Tasklet() { + @Override public RepeatStatus execute(StepContribution contribution, ChunkContext attributes) throws Exception { return RepeatStatus.FINISHED; } @@ -210,6 +212,7 @@ public class TaskletStepExceptionTests { taskletStep.setTasklet(new Tasklet() { + @Override public RepeatStatus execute(StepContribution contribution, ChunkContext attributes) throws Exception { attributes.getStepContext().getStepExecution().getExecutionContext().putString("foo", "bar"); return RepeatStatus.FINISHED; @@ -241,6 +244,7 @@ public class TaskletStepExceptionTests { taskletStep.setTasklet(new Tasklet() { + @Override public RepeatStatus execute(StepContribution contribution, ChunkContext attributes) throws Exception { attributes.getStepContext().getStepExecution().getExecutionContext().putString("foo", "bar"); return RepeatStatus.FINISHED; @@ -264,6 +268,7 @@ public class TaskletStepExceptionTests { taskletStep.setTasklet(new Tasklet() { + @Override public RepeatStatus execute(StepContribution contribution, ChunkContext attributes) throws Exception { return RepeatStatus.FINISHED; } @@ -283,6 +288,7 @@ public class TaskletStepExceptionTests { taskletStep.setTasklet(new Tasklet() { + @Override public RepeatStatus execute(StepContribution contribution, ChunkContext attributes) throws Exception { return RepeatStatus.FINISHED; } @@ -303,6 +309,7 @@ public class TaskletStepExceptionTests { taskletStep.setTasklet(new Tasklet() { + @Override public RepeatStatus execute(StepContribution contribution, ChunkContext attributes) throws Exception { return RepeatStatus.FINISHED; } @@ -322,6 +329,7 @@ public class TaskletStepExceptionTests { taskletStep.setTasklet(new Tasklet() { + @Override public RepeatStatus execute(StepContribution contribution, ChunkContext attributes) throws Exception { throw new RuntimeException("Tasklet exception"); } @@ -361,6 +369,7 @@ public class TaskletStepExceptionTests { private static class ExceptionTasklet implements Tasklet { + @Override public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) throws Exception { throw taskletException; } @@ -396,29 +405,36 @@ public class TaskletStepExceptionTests { this.failInTransaction = failInTransaction; } + @Override public void add(StepExecution stepExecution) { } + @Override public JobExecution createJobExecution(String jobName, JobParameters jobParameters) throws JobExecutionAlreadyRunningException, JobRestartException, JobInstanceAlreadyCompleteException { return null; } + @Override public StepExecution getLastStepExecution(JobInstance jobInstance, String stepName) { return null; } + @Override public int getStepExecutionCount(JobInstance jobInstance, String stepName) { return 0; } + @Override public boolean isJobInstanceExists(String jobName, JobParameters jobParameters) { return false; } + @Override public void update(JobExecution jobExecution) { } + @Override public void update(StepExecution stepExecution) { if (updateCount == failOnUpdateExecution) { throw new RuntimeException("Expected exception in step execution persistence"); @@ -426,6 +442,7 @@ public class TaskletStepExceptionTests { updateCount++; } + @Override public void updateExecutionContext(StepExecution stepExecution) { if (failOnUpdateContext) { if (!failInTransaction @@ -439,10 +456,12 @@ public class TaskletStepExceptionTests { return updateCount; } + @Override public JobExecution getLastJobExecution(String jobName, JobParameters jobParameters) { return null; } + @Override public void updateExecutionContext(JobExecution jobExecution) { } } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/AsyncChunkOrientedStepIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/AsyncChunkOrientedStepIntegrationTests.java index 517fb99b4..47ce49b33 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/AsyncChunkOrientedStepIntegrationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/AsyncChunkOrientedStepIntegrationTests.java @@ -121,6 +121,7 @@ public class AsyncChunkOrientedStepIntegrationTests { step.setTasklet(new TestingChunkOrientedTasklet(getReader(new String[] { "a", "b", "c", "a", "b", "c", "a", "b", "c", "a", "b", "c" }), new ItemWriter() { + @Override public void write(List data) throws Exception { written.addAll(data); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/AsyncTaskletStepTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/AsyncTaskletStepTests.java index 972a8b08a..fc2d8f1d9 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/AsyncTaskletStepTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/AsyncTaskletStepTests.java @@ -57,6 +57,7 @@ public class AsyncTaskletStepTests { private int throttleLimit = 20; ItemWriter itemWriter = new ItemWriter() { + @Override public void write(List data) throws Exception { // Thread.sleep(100L); logger.info("Items: " + data); @@ -171,6 +172,7 @@ public class AsyncTaskletStepTests { concurrencyLimit = 1; items = Arrays.asList("one", "barf", "three", "four"); itemProcessor = new ItemProcessor() { + @Override public String process(String item) throws Exception { logger.info("Item: "+item); processed.add(item); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/CallableTaskletAdapterTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/CallableTaskletAdapterTests.java index 070be37e1..b51793457 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/CallableTaskletAdapterTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/CallableTaskletAdapterTests.java @@ -30,6 +30,7 @@ public class CallableTaskletAdapterTests { @Test public void testHandle() throws Exception { adapter.setCallable(new Callable() { + @Override public RepeatStatus call() throws Exception { return RepeatStatus.FINISHED; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/ChunkOrientedStepIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/ChunkOrientedStepIntegrationTests.java index ee6eb8548..188f380a9 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/ChunkOrientedStepIntegrationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/ChunkOrientedStepIntegrationTests.java @@ -92,9 +92,11 @@ public class ChunkOrientedStepIntegrationTests { step.setTasklet(new TestingChunkOrientedTasklet(getReader(new String[] { "a", "b", "c" }), new ItemWriter() { + @Override public void write(List data) throws Exception { TransactionSynchronizationManager .registerSynchronization(new TransactionSynchronizationAdapter() { + @Override public void beforeCommit(boolean readOnly) { throw new RuntimeException("Simulate commit failure"); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/StepExecutorInterruptionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/StepExecutorInterruptionTests.java index 9254b449b..61628b0cf 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/StepExecutorInterruptionTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/StepExecutorInterruptionTests.java @@ -75,6 +75,7 @@ public class StepExecutorInterruptionTests { step.setJobRepository(jobRepository); step.setTransactionManager(new ResourcelessTransactionManager()); itemWriter = new ItemWriter() { + @Override public void write(List item) throws Exception { } }; @@ -92,6 +93,7 @@ public class StepExecutorInterruptionTests { // N.B, If we don't set the completion policy it might run forever template.setCompletionPolicy(new SimpleCompletionPolicy(2)); step.setTasklet(new TestingChunkOrientedTasklet(new ItemReader() { + @Override public Object read() throws Exception { // do something non-trivial (and not Thread.sleep()) double foo = 1; @@ -152,6 +154,7 @@ public class StepExecutorInterruptionTests { Thread processingThread = createThread(stepExecution); step.setTasklet(new TestingChunkOrientedTasklet(new ItemReader() { + @Override public Object read() throws Exception { return null; } @@ -195,6 +198,7 @@ public class StepExecutorInterruptionTests { }); step.setTasklet(new TestingChunkOrientedTasklet(new ItemReader() { + @Override public Object read() throws Exception { throw new RuntimeException("Planned!"); } @@ -212,6 +216,7 @@ public class StepExecutorInterruptionTests { */ private Thread createThread(final StepExecution stepExecution) { Thread processingThread = new Thread() { + @Override public void run() { try { jobRepository.add(stepExecution); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/SystemCommandTaskletIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/SystemCommandTaskletIntegrationTests.java index 37f36a512..ec8e45436 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/SystemCommandTaskletIntegrationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/SystemCommandTaskletIntegrationTests.java @@ -223,6 +223,7 @@ public class SystemCommandTaskletIntegrationTests { */ private static class TestExitCodeMapper implements SystemProcessExitCodeMapper { + @Override public ExitStatus getExitStatus(int exitCode) { if (exitCode == 0) { return ExitStatus.COMPLETED; diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/TaskletStepTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/TaskletStepTests.java index 04576898f..1474ce789 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/TaskletStepTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/tasklet/TaskletStepTests.java @@ -73,6 +73,7 @@ public class TaskletStepTests { private List list = new ArrayList(); ItemWriter itemWriter = new ItemWriter() { + @Override public void write(List data) throws Exception { processed.addAll(data); } @@ -240,6 +241,7 @@ public class TaskletStepTests { ItemReader itemReader = new ItemReader() { + @Override public String read() throws Exception { throw new RuntimeException(); } @@ -264,6 +266,7 @@ public class TaskletStepTests { ItemReader itemReader = new ItemReader() { + @Override public String read() throws Exception { throw new RuntimeException(); @@ -289,6 +292,7 @@ public class TaskletStepTests { ItemReader itemReader = new ItemReader() { + @Override public String read() throws Exception { throw new RuntimeException(); @@ -340,6 +344,7 @@ public class TaskletStepTests { final JobExecution jobExecution = new JobExecution(jobInstance); final StepExecution stepExecution = new StepExecution(step.getName(), jobExecution); step.setJobRepository(new JobRepositorySupport() { + @Override public void updateExecutionContext(StepExecution stepExecution) { list.add(stepExecution); } @@ -359,6 +364,7 @@ public class TaskletStepTests { private int counter = 0; // initial save before item processing succeeds, later calls fail + @Override public void updateExecutionContext(StepExecution stepExecution) { if (counter > 0) throw new RuntimeException("foo"); @@ -402,6 +408,7 @@ public class TaskletStepTests { @Test public void testRestartJobOnNonRestartableTasklet() throws Exception { step.setTasklet(new TestingChunkOrientedTasklet(new ItemReader() { + @Override public String read() throws Exception { return "foo"; } @@ -415,10 +422,12 @@ public class TaskletStepTests { @Test public void testStreamManager() throws Exception { MockRestartableItemReader reader = new MockRestartableItemReader() { + @Override public String read() throws Exception { return "foo"; } + @Override public void update(ExecutionContext executionContext) { executionContext.putString("foo", "bar"); } @@ -440,6 +449,7 @@ public class TaskletStepTests { @Test public void testDirectlyInjectedItemStream() throws Exception { step.setStreams(new ItemStream[] { new ItemStreamSupport() { + @Override public void update(ExecutionContext executionContext) { executionContext.putString("foo", "bar"); } @@ -457,10 +467,12 @@ public class TaskletStepTests { @Test public void testDirectlyInjectedListener() throws Exception { step.registerStepExecutionListener(new StepExecutionListenerSupport() { + @Override public void beforeStep(StepExecution stepExecution) { list.add("foo"); } + @Override public ExitStatus afterStep(StepExecution stepExecution) { list.add("bar"); return null; @@ -475,10 +487,12 @@ public class TaskletStepTests { @Test public void testListenerCalledBeforeStreamOpened() throws Exception { MockRestartableItemReader reader = new MockRestartableItemReader() { + @Override public void beforeStep(StepExecution stepExecution) { list.add("foo"); } + @Override public void open(ExecutionContext executionContext) throws ItemStreamException { assertEquals(1, list.size()); } @@ -496,6 +510,7 @@ public class TaskletStepTests { final ExitStatus customStatus = new ExitStatus("COMPLETED_CUSTOM"); step.setStepExecutionListeners(new StepExecutionListener[] { new StepExecutionListenerSupport() { + @Override public ExitStatus afterStep(StepExecution stepExecution) { list.add("afterStepCalled"); return customStatus; @@ -518,12 +533,14 @@ public class TaskletStepTests { @Test public void testDirectlyInjectedListenerOnError() throws Exception { step.registerStepExecutionListener(new StepExecutionListenerSupport() { + @Override public ExitStatus afterStep(StepExecution stepExecution) { list.add("exception"); return null; } }); step.setTasklet(new TestingChunkOrientedTasklet(new MockRestartableItemReader() { + @Override public String read() throws Exception { throw new RuntimeException("FOO"); } @@ -538,10 +555,12 @@ public class TaskletStepTests { @Test public void testDirectlyInjectedStreamWhichIsAlsoReader() throws Exception { MockRestartableItemReader reader = new MockRestartableItemReader() { + @Override public String read() throws Exception { return "foo"; } + @Override public void update(ExecutionContext executionContext) { executionContext.putString("foo", "bar"); } @@ -565,6 +584,7 @@ public class TaskletStepTests { StepInterruptionPolicy interruptionPolicy = new StepInterruptionPolicy() { + @Override public void checkInterrupted(StepExecution stepExecution) throws JobInterruptedException { throw new JobInterruptedException("interrupted"); } @@ -574,6 +594,7 @@ public class TaskletStepTests { ItemReader itemReader = new ItemReader() { + @Override public String read() throws Exception { throw new RuntimeException(); @@ -599,6 +620,7 @@ public class TaskletStepTests { public void testStatusForNormalFailure() throws Exception { ItemReader itemReader = new ItemReader() { + @Override public String read() throws Exception { // Trigger a rollback throw new RuntimeException("Foo"); @@ -622,6 +644,7 @@ public class TaskletStepTests { public void testStatusForErrorFailure() throws Exception { ItemReader itemReader = new ItemReader() { + @Override public String read() throws Exception { // Trigger a rollback throw new Error("Foo"); @@ -645,6 +668,7 @@ public class TaskletStepTests { public void testStatusForResetFailedException() throws Exception { ItemReader itemReader = new ItemReader() { + @Override public String read() throws Exception { // Trigger a rollback throw new RuntimeException("Foo"); @@ -652,6 +676,7 @@ public class TaskletStepTests { }; step.setTasklet(new TestingChunkOrientedTasklet(itemReader, itemWriter)); step.setTransactionManager(new ResourcelessTransactionManager() { + @Override protected void doRollback(DefaultTransactionStatus status) throws TransactionException { // Simulate failure on rollback when stream resets throw new RuntimeException("Bar"); @@ -676,6 +701,7 @@ public class TaskletStepTests { public void testStatusForCommitFailedException() throws Exception { step.setTransactionManager(new ResourcelessTransactionManager() { + @Override protected void doCommit(DefaultTransactionStatus status) throws TransactionException { // Simulate failure on commit throw new RuntimeException("Foo"); @@ -704,6 +730,7 @@ public class TaskletStepTests { step.setJobRepository(new JobRepositorySupport()); step.setStreams(new ItemStream[] { new ItemStreamSupport() { + @Override public void close() throws ItemStreamException { throw new RuntimeException("Bar"); } @@ -727,6 +754,7 @@ public class TaskletStepTests { public void testStatusForCloseFailedException() throws Exception { MockRestartableItemReader itemReader = new MockRestartableItemReader() { + @Override public void close() throws ItemStreamException { super.close(); // Simulate failure on rollback when stream resets @@ -760,6 +788,7 @@ public class TaskletStepTests { @Test public void testRestartAfterFailureInFirstChunk() throws Exception { MockRestartableItemReader reader = new MockRestartableItemReader() { + @Override public String read() throws Exception { // fail on the very first item throw new RuntimeException("CRASH!"); @@ -803,6 +832,7 @@ public class TaskletStepTests { @Test public void testStepFailureInAfterStepCallback() throws JobInterruptedException { StepExecutionListener listener = new StepExecutionListenerSupport() { + @Override public ExitStatus afterStep(StepExecution stepExecution) { throw new RuntimeException("exception thrown in afterStep to signal failure"); } @@ -819,6 +849,7 @@ public class TaskletStepTests { public void testNoRollbackFor() throws Exception { step.setTasklet(new Tasklet() { + @Override public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) throws Exception { throw new RuntimeException("Bar"); } @@ -842,6 +873,7 @@ public class TaskletStepTests { @Test public void testTaskletExecuteReturnNull() throws Exception { step.setTasklet(new Tasklet() { + @Override public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) throws Exception { return null; } @@ -870,6 +902,7 @@ public class TaskletStepTests { private int called = 0; + @Override public void update(StepExecution stepExecution) { called++; if (called == 3) { @@ -885,10 +918,12 @@ public class TaskletStepTests { private boolean restoreFromCalled = false; + @Override public String read() throws Exception { return "item"; } + @Override public void update(ExecutionContext executionContext) { getExecutionAttributesCalled = true; executionContext.putString("spam", "bucket"); @@ -902,10 +937,12 @@ public class TaskletStepTests { return restoreFromCalled; } + @Override public ExitStatus afterStep(StepExecution stepExecution) { return null; } + @Override public void beforeStep(StepExecution stepExecution) { } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/test/namespace/config/DummyNamespaceHandler.java b/spring-batch-core/src/test/java/org/springframework/batch/test/namespace/config/DummyNamespaceHandler.java index 8a605d5b7..062fb3ed9 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/test/namespace/config/DummyNamespaceHandler.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/test/namespace/config/DummyNamespaceHandler.java @@ -36,13 +36,16 @@ public class DummyNamespaceHandler implements NamespaceHandler { public static String LABEL = new Random().toString(); + @Override public BeanDefinitionHolder decorate(Node source, BeanDefinitionHolder definition, ParserContext parserContext) { return null; } + @Override public void init() { } + @Override public BeanDefinition parse(Element element, ParserContext parserContext) { BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(TestTasklet.class); builder.addPropertyValue("name", LABEL); diff --git a/spring-batch-core/src/test/java/test/jdbc/datasource/DataSourceInitializer.java b/spring-batch-core/src/test/java/test/jdbc/datasource/DataSourceInitializer.java index 2b9031f62..49e2f8dfc 100644 --- a/spring-batch-core/src/test/java/test/jdbc/datasource/DataSourceInitializer.java +++ b/spring-batch-core/src/test/java/test/jdbc/datasource/DataSourceInitializer.java @@ -73,6 +73,7 @@ public class DataSourceInitializer implements InitializingBean { DataSourceInitializer.class.getSimpleName() + "-context.xml")); } + @Override public void afterPropertiesSet() throws Exception { Assert.notNull(dataSource); initialize(); @@ -98,6 +99,7 @@ public class DataSourceInitializer implements InitializingBean { TransactionTemplate transactionTemplate = new TransactionTemplate(new DataSourceTransactionManager(dataSource)); transactionTemplate.execute(new TransactionCallback() { + @Override @SuppressWarnings("unchecked") public Object doInTransaction(TransactionStatus status) { JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource); diff --git a/spring-batch-infrastructure-tests/pom.xml b/spring-batch-infrastructure-tests/pom.xml index c2ebfadd3..8cc88bb3c 100644 --- a/spring-batch-infrastructure-tests/pom.xml +++ b/spring-batch-infrastructure-tests/pom.xml @@ -15,33 +15,6 @@ hsql - - tiger - - 1.5 - - - - javax.xml.bind - jaxb-api - provided - true - 2.1 - - - javax.xml.stream - stax-api - - - - - com.sun.xml.bind - jaxb-impl - 2.1.5 - provided - - - default diff --git a/spring-batch-infrastructure/pom.xml b/spring-batch-infrastructure/pom.xml index e429bcf43..62c1f348f 100644 --- a/spring-batch-infrastructure/pom.xml +++ b/spring-batch-infrastructure/pom.xml @@ -15,24 +15,6 @@ 2.2.0.BUILD-SNAPSHOT ../spring-batch-parent - - - tiger - - 1.5 - - - - stax - stax - - - javax.annotation - jsr250-api - - - - diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ExecutionContext.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ExecutionContext.java index 03723f869..877a2ccf4 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ExecutionContext.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ExecutionContext.java @@ -349,6 +349,7 @@ public class ExecutionContext implements Serializable { * * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object obj) { if (obj instanceof ExecutionContext == false) { return false; @@ -365,6 +366,7 @@ public class ExecutionContext implements Serializable { * * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { return map.hashCode(); } @@ -374,6 +376,7 @@ public class ExecutionContext implements Serializable { * * @see java.lang.Object#toString() */ + @Override public String toString() { return map.toString(); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemStreamSupport.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemStreamSupport.java index 623d6a44f..5130eda66 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemStreamSupport.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemStreamSupport.java @@ -28,6 +28,7 @@ public abstract class ItemStreamSupport implements ItemStream { * No-op. * @see org.springframework.batch.item.ItemStream#close() */ + @Override public void close() throws ItemStreamException { } @@ -35,6 +36,7 @@ public abstract class ItemStreamSupport implements ItemStream { * No-op. * @see org.springframework.batch.item.ItemStream#open(ExecutionContext) */ + @Override public void open(ExecutionContext executionContext) throws ItemStreamException { } @@ -42,6 +44,7 @@ public abstract class ItemStreamSupport implements ItemStream { * Return empty {@link ExecutionContext}. * @see org.springframework.batch.item.ItemStream#update(ExecutionContext) */ + @Override public void update(ExecutionContext executionContext) { } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/AbstractMethodInvokingDelegator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/AbstractMethodInvokingDelegator.java index 326df0daa..ac5b415e8 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/AbstractMethodInvokingDelegator.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/AbstractMethodInvokingDelegator.java @@ -129,6 +129,7 @@ public abstract class AbstractMethodInvokingDelegator implements Initializing } } + @Override public void afterPropertiesSet() throws Exception { Assert.notNull(targetObject); Assert.hasLength(targetMethod); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/ItemProcessorAdapter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/ItemProcessorAdapter.java index aa58f456e..a6b2b45d9 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/ItemProcessorAdapter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/ItemProcessorAdapter.java @@ -31,6 +31,7 @@ public class ItemProcessorAdapter extends AbstractMethodInvokingDelegator extends AbstractMethodInvokingDelegator imp /** * @return return value of the target method. */ + @Override public T read() throws Exception { return invokeDelegateMethod(); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/ItemWriterAdapter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/ItemWriterAdapter.java index 57b5d6b9c..76ba397a1 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/ItemWriterAdapter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/ItemWriterAdapter.java @@ -31,6 +31,7 @@ import org.springframework.batch.item.ItemWriter; */ public class ItemWriterAdapter extends AbstractMethodInvokingDelegator implements ItemWriter { + @Override public void write(List items) throws Exception { for (T item : items) { invokeDelegateMethodWithArgument(item); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemWriter.java index ce094a44b..881c78c1c 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemWriter.java @@ -42,6 +42,7 @@ public class PropertyExtractingDelegatingItemWriter extends AbstractMethodInv * fieldsUsedAsTargetMethodArguments and passes them as arguments to the * delegate method. */ + @Override public void write(List items) throws Exception { for (T item : items) { @@ -58,6 +59,7 @@ public class PropertyExtractingDelegatingItemWriter extends AbstractMethodInv } } + @Override public void afterPropertiesSet() throws Exception { super.afterPropertiesSet(); Assert.notEmpty(fieldsUsedAsTargetMethodArguments); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/amqp/AmqpItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/amqp/AmqpItemReader.java index 40b7c6a19..70fd1f343 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/amqp/AmqpItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/amqp/AmqpItemReader.java @@ -39,6 +39,7 @@ public class AmqpItemReader implements ItemReader { this.amqpTemplate = amqpTemplate; } + @Override @SuppressWarnings("unchecked") public T read() { if (itemType != null && itemType.isAssignableFrom(Message.class)) { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/amqp/AmqpItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/amqp/AmqpItemWriter.java index 49913d6ac..ecc42c813 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/amqp/AmqpItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/amqp/AmqpItemWriter.java @@ -43,6 +43,7 @@ public class AmqpItemWriter implements ItemWriter { this.amqpTemplate = amqpTemplate; } + @Override public void write(final List items) throws Exception { if (log.isDebugEnabled()) { log.debug("Writing to AMQP with " + items.size() + " items."); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/AbstractCursorItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/AbstractCursorItemReader.java index 3da1779b7..d3e75e35e 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/AbstractCursorItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/AbstractCursorItemReader.java @@ -145,6 +145,7 @@ public abstract class AbstractCursorItemReader extends AbstractItemCountingIt * @throws IllegalArgumentException if either data source or sql properties * not set. */ + @Override public void afterPropertiesSet() throws Exception { Assert.notNull(dataSource, "DataSource must be provided"); } @@ -370,6 +371,7 @@ public abstract class AbstractCursorItemReader extends AbstractItemCountingIt * Close the cursor and database connection. Make call to cleanupOnClose so sub classes can cleanup * any resources they have allocated. */ + @Override protected void doClose() throws Exception { initialized = false; JdbcUtils.closeResultSet(this.rs); @@ -432,6 +434,7 @@ public abstract class AbstractCursorItemReader extends AbstractItemCountingIt * Read next row and map it to item, verify cursor position if * {@link #setVerifyCursorPosition(boolean)} is true. */ + @Override protected T doRead() throws Exception { if (rs == null) { throw new ReaderNotOpenException("Reader must be open before it can be read."); @@ -466,6 +469,7 @@ public abstract class AbstractCursorItemReader extends AbstractItemCountingIt * Use {@link ResultSet#absolute(int)} if possible, otherwise scroll by * calling {@link ResultSet#next()}. */ + @Override protected void jumpToItem(int itemIndex) throws Exception { if (driverSupportsAbsolute) { try { @@ -485,4 +489,4 @@ public abstract class AbstractCursorItemReader extends AbstractItemCountingIt } } -} \ No newline at end of file +} diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/AbstractPagingItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/AbstractPagingItemReader.java index f21e9ab20..e878db202 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/AbstractPagingItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/AbstractPagingItemReader.java @@ -89,6 +89,7 @@ public abstract class AbstractPagingItemReader extends AbstractItemCountingIt * Check mandatory properties. * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() */ + @Override public void afterPropertiesSet() throws Exception { Assert.isTrue(pageSize > 0, "pageSize must be greater than zero"); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/BeanPropertyItemSqlParameterSourceProvider.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/BeanPropertyItemSqlParameterSourceProvider.java index 3710b4182..d777849bc 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/BeanPropertyItemSqlParameterSourceProvider.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/BeanPropertyItemSqlParameterSourceProvider.java @@ -32,6 +32,7 @@ public class BeanPropertyItemSqlParameterSourceProvider implements ItemSqlPar * the provided item. * @param item the item to use for parameter values */ + @Override public SqlParameterSource createSqlParameterSource(T item) { return new BeanPropertySqlParameterSource(item); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/ExtendedConnectionDataSourceProxy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/ExtendedConnectionDataSourceProxy.java index b6cabd21c..9af43810b 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/ExtendedConnectionDataSourceProxy.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/ExtendedConnectionDataSourceProxy.java @@ -121,6 +121,7 @@ public class ExtendedConnectionDataSourceProxy implements SmartDataSource, Initi /** * @see SmartDataSource */ + @Override public boolean shouldClose(Connection connection) { boolean shouldClose = !isCloseSuppressionActive(connection); if (borrowedConnection && closeSuppressedConnection.equals(connection)) { @@ -170,12 +171,14 @@ public class ExtendedConnectionDataSourceProxy implements SmartDataSource, Initi } } + @Override public Connection getConnection() throws SQLException { synchronized (this.connectionMonitor) { return initConnection(null, null); } } + @Override public Connection getConnection(String username, String password) throws SQLException { synchronized (this.connectionMonitor) { return initConnection(username, password); @@ -207,18 +210,22 @@ public class ExtendedConnectionDataSourceProxy implements SmartDataSource, Initi return connection; } + @Override public PrintWriter getLogWriter() throws SQLException { return dataSource.getLogWriter(); } + @Override public int getLoginTimeout() throws SQLException { return dataSource.getLoginTimeout(); } + @Override public void setLogWriter(PrintWriter out) throws SQLException { dataSource.setLogWriter(out); } + @Override public void setLoginTimeout(int seconds) throws SQLException { dataSource.setLoginTimeout(seconds); } @@ -250,6 +257,7 @@ public class ExtendedConnectionDataSourceProxy implements SmartDataSource, Initi this.target = target; } + @Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { // Invocation on ConnectionProxy interface coming in... @@ -292,6 +300,7 @@ public class ExtendedConnectionDataSourceProxy implements SmartDataSource, Initi * Performs only a 'shallow' non-recursive check of self's and delegate's * class to retain Java 5 compatibility. */ + @Override public boolean isWrapperFor(Class iface) throws SQLException { if (iface.isAssignableFrom(SmartDataSource.class) || iface.isAssignableFrom(dataSource.getClass())) { return true; @@ -304,6 +313,7 @@ public class ExtendedConnectionDataSourceProxy implements SmartDataSource, Initi * cast to supplied parameter class. Does *not* support recursive unwrapping * of the delegate to retain Java 5 compatibility. */ + @Override public T unwrap(Class iface) throws SQLException { if (iface.isAssignableFrom(SmartDataSource.class)) { @SuppressWarnings("unchecked") @@ -318,6 +328,7 @@ public class ExtendedConnectionDataSourceProxy implements SmartDataSource, Initi throw new SQLException("Unsupported class " + iface.getSimpleName()); } + @Override public void afterPropertiesSet() throws Exception { Assert.notNull(dataSource); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateCursorItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateCursorItemReader.java index d7bb24124..7cf67ad59 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateCursorItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateCursorItemReader.java @@ -72,6 +72,7 @@ public class HibernateCursorItemReader extends AbstractItemCountingItemStream private Map parameterValues; + @Override public void afterPropertiesSet() throws Exception { Assert.state(fetchSize >= 0, "fetchSize must not be negative"); helper.afterPropertiesSet(); @@ -150,6 +151,7 @@ public class HibernateCursorItemReader extends AbstractItemCountingItemStream helper.setUseStatelessSession(useStatelessSession); } + @Override protected T doRead() throws Exception { if (cursor.next()) { Object[] data = cursor.get(); @@ -178,6 +180,7 @@ public class HibernateCursorItemReader extends AbstractItemCountingItemStream /** * Open hibernate session and create a forward-only cursor for the query. */ + @Override protected void doOpen() throws Exception { Assert.state(!initialized, "Cannot open an already opened ItemReader, call close first"); cursor = helper.getForwardOnlyCursor(fetchSize, parameterValues); @@ -215,6 +218,7 @@ public class HibernateCursorItemReader extends AbstractItemCountingItemStream /** * Close the cursor and hibernate session. */ + @Override protected void doClose() throws Exception { initialized = false; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateItemReaderHelper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateItemReaderHelper.java index 71c6a924b..a1cb3ce50 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateItemReaderHelper.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateItemReaderHelper.java @@ -94,6 +94,7 @@ public class HibernateItemReaderHelper implements InitializingBean { this.sessionFactory = sessionFactory; } + @Override public void afterPropertiesSet() throws Exception { Assert.state(sessionFactory != null, "A SessionFactory must be provided"); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateItemWriter.java index fcf74d1f9..d1c764d0b 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateItemWriter.java @@ -84,6 +84,7 @@ public class HibernateItemWriter implements ItemWriter, InitializingBean { /** * Check mandatory properties - there must be a hibernateTemplate. */ + @Override public void afterPropertiesSet() { Assert.notNull(hibernateTemplate, "HibernateItemWriter requires a HibernateOperations"); @@ -95,6 +96,7 @@ public class HibernateItemWriter implements ItemWriter, InitializingBean { * * @see org.springframework.batch.item.ItemWriter#write(java.util.List) */ + @Override public final void write(List items) { doWrite(hibernateTemplate, items); hibernateTemplate.flush(); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernatePagingItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernatePagingItemReader.java index 4e23457d7..34d13d040 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernatePagingItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernatePagingItemReader.java @@ -143,6 +143,7 @@ public class HibernatePagingItemReader extends AbstractPagingItemReader im helper.setUseStatelessSession(useStatelessSession); } + @Override public void afterPropertiesSet() throws Exception { super.afterPropertiesSet(); Assert.state(fetchSize >= 0, "fetchSize must not be negative"); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/IbatisBatchItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/IbatisBatchItemWriter.java index 597494767..8c46ec5c1 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/IbatisBatchItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/IbatisBatchItemWriter.java @@ -102,6 +102,7 @@ public class IbatisBatchItemWriter implements ItemWriter, InitializingBean /** * Check mandatory properties - there must be an SqlMapClient and a statementId. */ + @Override public void afterPropertiesSet() { Assert.notNull(sqlMapClientTemplate, "A SqlMapClient or a SqlMapClientTemplate is required."); Assert.notNull(statementId, "A statementId is required."); @@ -110,6 +111,7 @@ public class IbatisBatchItemWriter implements ItemWriter, InitializingBean /* (non-Javadoc) * @see org.springframework.batch.item.ItemWriter#write(java.util.List) */ + @Override public void write(final List items) { if (!items.isEmpty()) { @@ -121,6 +123,7 @@ public class IbatisBatchItemWriter implements ItemWriter, InitializingBean @SuppressWarnings("unchecked") List results = (List) sqlMapClientTemplate.execute( new SqlMapClientCallback() { + @Override public Object doInSqlMapClient(SqlMapExecutor executor) throws SQLException { executor.startBatch(); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/IbatisPagingItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/IbatisPagingItemReader.java index bd25a122f..5d8ff8046 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/IbatisPagingItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/IbatisPagingItemReader.java @@ -107,6 +107,7 @@ public class IbatisPagingItemReader extends AbstractPagingItemReader { * Check mandatory properties. * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() */ + @Override public void afterPropertiesSet() throws Exception { super.afterPropertiesSet(); Assert.notNull(sqlMapClient); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcBatchItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcBatchItemWriter.java index 90d7205ef..da843354f 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcBatchItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcBatchItemWriter.java @@ -135,6 +135,7 @@ public class JdbcBatchItemWriter implements ItemWriter, InitializingBean { * Check mandatory properties - there must be a SimpleJdbcTemplate and an SQL statement plus a * parameter source. */ + @Override public void afterPropertiesSet() { Assert.notNull(namedParameterJdbcTemplate, "A DataSource or a NamedParameterJdbcTemplate is required."); Assert.notNull(sql, "An SQL statement is required."); @@ -157,6 +158,7 @@ public class JdbcBatchItemWriter implements ItemWriter, InitializingBean { /* (non-Javadoc) * @see org.springframework.batch.item.ItemWriter#write(java.util.List) */ + @Override public void write(final List items) throws Exception { if (!items.isEmpty()) { @@ -177,6 +179,7 @@ public class JdbcBatchItemWriter implements ItemWriter, InitializingBean { } else { updateCounts = (int[]) namedParameterJdbcTemplate.getJdbcOperations().execute(sql, new PreparedStatementCallback() { + @Override public Object doInPreparedStatement(PreparedStatement ps) throws SQLException, DataAccessException { for (T item : items) { itemPreparedStatementSetter.setValues(item, ps); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcCursorItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcCursorItemReader.java index 3236f2aee..977977ab5 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcCursorItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcCursorItemReader.java @@ -102,6 +102,7 @@ public class JdbcCursorItemReader extends AbstractCursorItemReader { * @throws IllegalArgumentException if either data source or sql properties * not set. */ + @Override public void afterPropertiesSet() throws Exception { super.afterPropertiesSet(); Assert.notNull(sql, "The SQL query must be provided"); @@ -109,7 +110,8 @@ public class JdbcCursorItemReader extends AbstractCursorItemReader { } - protected void openCursor(Connection con) { + @Override + protected void openCursor(Connection con) { try { if (isUseSharedExtendedConnection()) { preparedStatement = con.prepareStatement(sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, @@ -133,6 +135,7 @@ public class JdbcCursorItemReader extends AbstractCursorItemReader { } + @Override @SuppressWarnings("unchecked") protected T readCursor(ResultSet rs, int currentRow) throws SQLException { return (T) rowMapper.mapRow(rs, currentRow); @@ -141,6 +144,7 @@ public class JdbcCursorItemReader extends AbstractCursorItemReader { /** * Close the cursor and database connection. */ + @Override protected void cleanupOnClose() throws Exception { JdbcUtils.closeStatement(this.preparedStatement); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcPagingItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcPagingItemReader.java index 7f8c13775..126867192 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcPagingItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcPagingItemReader.java @@ -266,6 +266,7 @@ public class JdbcPagingItemReader extends AbstractPagingItemReader impleme } RowMapper startMapper = new RowMapper() { + @Override public Object mapRow(ResultSet rs, int i) throws SQLException { return rs.getObject(1); } @@ -324,6 +325,7 @@ public class JdbcPagingItemReader extends AbstractPagingItemReader impleme @SuppressWarnings("rawtypes") private class PagingRowMapper implements RowMapper { + @Override public Object mapRow(ResultSet rs, int rowNum) throws SQLException { startAfterValues = new LinkedHashMap(); for (Map.Entry sortKey : queryProvider.getSortKeys().entrySet()) { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JpaItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JpaItemWriter.java index e3e72afeb..34c158330 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JpaItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JpaItemWriter.java @@ -64,6 +64,7 @@ public class JpaItemWriter implements ItemWriter, InitializingBean { /** * Check mandatory properties - there must be an entityManagerFactory. */ + @Override public void afterPropertiesSet() throws Exception { Assert.notNull(entityManagerFactory, "An EntityManagerFactory is required"); } @@ -74,6 +75,7 @@ public class JpaItemWriter implements ItemWriter, InitializingBean { * * @see org.springframework.batch.item.ItemWriter#write(java.util.List) */ + @Override public final void write(List items) { EntityManager entityManager = EntityManagerFactoryUtils.getTransactionalEntityManager(entityManagerFactory); if (entityManager == null) { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JpaPagingItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JpaPagingItemReader.java index dc9940235..7f07b3b06 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JpaPagingItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JpaPagingItemReader.java @@ -126,6 +126,7 @@ public class JpaPagingItemReader extends AbstractPagingItemReader { this.parameterValues = parameterValues; } + @Override public void afterPropertiesSet() throws Exception { super.afterPropertiesSet(); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/StoredProcedureItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/StoredProcedureItemReader.java index 8488585dd..8ad6e4985 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/StoredProcedureItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/StoredProcedureItemReader.java @@ -142,13 +142,15 @@ public class StoredProcedureItemReader extends AbstractCursorItemReader { * @throws IllegalArgumentException if either data source or sql properties * not set. */ + @Override public void afterPropertiesSet() throws Exception { super.afterPropertiesSet(); Assert.notNull(procedureName, "The name of the stored procedure must be provided"); Assert.notNull(rowMapper, "RowMapper must be provided"); } - protected void openCursor(Connection con) { + @Override + protected void openCursor(Connection con) { Assert.state(procedureName != null, "Procedure Name must not be null."); Assert.state(refCursorPosition >= 0, @@ -223,6 +225,7 @@ public class StoredProcedureItemReader extends AbstractCursorItemReader { } + @Override @SuppressWarnings("unchecked") protected T readCursor(ResultSet rs, int currentRow) throws SQLException { return (T) rowMapper.mapRow(rs, currentRow); @@ -231,6 +234,7 @@ public class StoredProcedureItemReader extends AbstractCursorItemReader { /** * Close the cursor and database connection. */ + @Override protected void cleanupOnClose() throws Exception { JdbcUtils.closeStatement(this.callableStatement); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/orm/AbstractHibernateQueryProvider.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/orm/AbstractHibernateQueryProvider.java index 3fd0be922..872e5626a 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/orm/AbstractHibernateQueryProvider.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/orm/AbstractHibernateQueryProvider.java @@ -40,10 +40,12 @@ public abstract class AbstractHibernateQueryProvider implements HibernateQueryPr private StatelessSession statelessSession; private Session statefulSession; + @Override public void setStatelessSession(StatelessSession statelessSession) { this.statelessSession = statelessSession; } + @Override public void setSession(Session statefulSession) { this.statefulSession = statefulSession; } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/orm/AbstractJpaQueryProvider.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/orm/AbstractJpaQueryProvider.java index aef4e9a6a..3026ebfd9 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/orm/AbstractJpaQueryProvider.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/orm/AbstractJpaQueryProvider.java @@ -45,6 +45,7 @@ public abstract class AbstractJpaQueryProvider implements JpaQueryProvider, Init * * @param entityManager */ + @Override public void setEntityManager(EntityManager entityManager) { this.entityManager = entityManager; } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/orm/HibernateNativeQueryProvider.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/orm/HibernateNativeQueryProvider.java index 8ea2e4f39..ffacfdd32 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/orm/HibernateNativeQueryProvider.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/orm/HibernateNativeQueryProvider.java @@ -44,6 +44,7 @@ public class HibernateNativeQueryProvider extends AbstractHibernateQueryProvi * stateless if both are available). *

*/ + @Override public SQLQuery createQuery() { if (isStatelessSession()) { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/orm/JpaNativeQueryProvider.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/orm/JpaNativeQueryProvider.java index 80d69579b..6a9be866b 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/orm/JpaNativeQueryProvider.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/orm/JpaNativeQueryProvider.java @@ -38,6 +38,7 @@ public class JpaNativeQueryProvider extends AbstractJpaQueryProvider { private String sqlQuery; + @Override public Query createQuery() { return getEntityManager().createNativeQuery(sqlQuery, entityClass); } @@ -50,6 +51,7 @@ public class JpaNativeQueryProvider extends AbstractJpaQueryProvider { this.entityClass = entityClazz; } + @Override public void afterPropertiesSet() throws Exception { Assert.isTrue(StringUtils.hasText(sqlQuery), "Native SQL query cannot be empty"); Assert.notNull(entityClass, "Entity class cannot be NULL"); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/AbstractSqlPagingQueryProvider.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/AbstractSqlPagingQueryProvider.java index 5123bb34c..c1b89b1d2 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/AbstractSqlPagingQueryProvider.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/AbstractSqlPagingQueryProvider.java @@ -151,14 +151,17 @@ public abstract class AbstractSqlPagingQueryProvider implements PagingQueryProvi * * @return sortKey key to use to sort and limit page content */ + @Override public Map getSortKeys() { return sortKeys; } + @Override public int getParameterCount() { return parameterCount; } + @Override public boolean isUsingNamedParameters() { return usingNamedParameters; } @@ -169,6 +172,7 @@ public abstract class AbstractSqlPagingQueryProvider implements PagingQueryProvi * * @return place holder for sortKey. */ + @Override public String getSortKeyPlaceHolder(String keyName) { return usingNamedParameters ? ":_" + keyName : "?"; } @@ -177,6 +181,7 @@ public abstract class AbstractSqlPagingQueryProvider implements PagingQueryProvi * Check mandatory properties. * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() */ + @Override public void init(DataSource dataSource) throws Exception { Assert.notNull(dataSource); Assert.hasLength(selectClause, "selectClause must be specified"); @@ -209,6 +214,7 @@ public abstract class AbstractSqlPagingQueryProvider implements PagingQueryProvi * @param pageSize number of rows to read per page * @return query string */ + @Override public abstract String generateFirstPageQuery(int pageSize); /** @@ -218,6 +224,7 @@ public abstract class AbstractSqlPagingQueryProvider implements PagingQueryProvi * @param pageSize number of rows to read per page * @return query string */ + @Override public abstract String generateRemainingPagesQuery(int pageSize); /** @@ -228,6 +235,7 @@ public abstract class AbstractSqlPagingQueryProvider implements PagingQueryProvi * @param pageSize number of rows to read per page * @return query string */ + @Override public abstract String generateJumpToItemQuery(int itemIndex, int pageSize); private String removeKeyWord(String keyWord, String clause) { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/ColumnMapItemPreparedStatementSetter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/ColumnMapItemPreparedStatementSetter.java index b4e7148ee..6cb7d9815 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/ColumnMapItemPreparedStatementSetter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/ColumnMapItemPreparedStatementSetter.java @@ -39,6 +39,7 @@ import org.springframework.util.Assert; */ public class ColumnMapItemPreparedStatementSetter implements ItemPreparedStatementSetter> { + @Override public void setValues(Map item, PreparedStatement ps) throws SQLException { Assert.isInstanceOf(Map.class, item, "Input to map PreparedStatement parameters must be of type Map."); int counter = 1; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/DefaultDataFieldMaxValueIncrementerFactory.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/DefaultDataFieldMaxValueIncrementerFactory.java index 92d046a25..83ff2f506 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/DefaultDataFieldMaxValueIncrementerFactory.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/DefaultDataFieldMaxValueIncrementerFactory.java @@ -73,6 +73,7 @@ public class DefaultDataFieldMaxValueIncrementerFactory implements DataFieldMaxV this.dataSource = dataSource; } + @Override public DataFieldMaxValueIncrementer getIncrementer(String incrementerType, String incrementerName) { DatabaseType databaseType = DatabaseType.valueOf(incrementerType.toUpperCase()); @@ -110,6 +111,7 @@ public class DefaultDataFieldMaxValueIncrementerFactory implements DataFieldMaxV } + @Override public boolean isSupportedIncrementerType(String incrementerType) { for (DatabaseType type : DatabaseType.values()) { if (type.name().equals(incrementerType.toUpperCase())) { @@ -120,6 +122,7 @@ public class DefaultDataFieldMaxValueIncrementerFactory implements DataFieldMaxV return false; } + @Override public String[] getSupportedIncrementerTypes() { List types = new ArrayList(); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/DerbyPagingQueryProvider.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/DerbyPagingQueryProvider.java index b3e783dc5..97f6fe5a2 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/DerbyPagingQueryProvider.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/DerbyPagingQueryProvider.java @@ -57,10 +57,12 @@ public class DerbyPagingQueryProvider extends SqlWindowingPagingQueryProvider { return ""; } + @Override protected String getOverSubstituteClauseStart() { return " FROM (SELECT " + getSelectClause(); } + @Override protected String getOverSubstituteClauseEnd() { return " ) AS " + getOrderedQueryAlias(); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqlPagingQueryProviderFactoryBean.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqlPagingQueryProviderFactoryBean.java index 35f7743f0..592e96114 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqlPagingQueryProviderFactoryBean.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqlPagingQueryProviderFactoryBean.java @@ -145,6 +145,7 @@ public class SqlPagingQueryProviderFactoryBean implements FactoryBean { * * @see FactoryBean#getObject() */ + @Override public Object getObject() throws Exception { DatabaseType type; @@ -181,6 +182,7 @@ public class SqlPagingQueryProviderFactoryBean implements FactoryBean { * * @see FactoryBean#getObjectType() */ + @Override public Class getObjectType() { return PagingQueryProvider.class; } @@ -189,6 +191,7 @@ public class SqlPagingQueryProviderFactoryBean implements FactoryBean { * Always returns true. * @see FactoryBean#isSingleton() */ + @Override public boolean isSingleton() { return true; } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/DefaultBufferedReaderFactory.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/DefaultBufferedReaderFactory.java index 91d8f7fde..f32940121 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/DefaultBufferedReaderFactory.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/DefaultBufferedReaderFactory.java @@ -29,6 +29,7 @@ import org.springframework.core.io.Resource; */ public class DefaultBufferedReaderFactory implements BufferedReaderFactory { + @Override public BufferedReader create(Resource resource, String encoding) throws UnsupportedEncodingException, IOException { return new BufferedReader(new InputStreamReader(resource.getInputStream(), encoding)); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemReader.java index bee3d0d8b..cb3308cf5 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemReader.java @@ -145,6 +145,7 @@ public class FlatFileItemReader extends AbstractItemCountingItemStreamItemRea /** * Public setter for the input resource. */ + @Override public void setResource(Resource resource) { this.resource = resource; } @@ -272,6 +273,7 @@ public class FlatFileItemReader extends AbstractItemCountingItemStreamItemRea noInput = false; } + @Override public void afterPropertiesSet() throws Exception { Assert.notNull(lineMapper, "LineMapper is required"); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemWriter.java index e09ff0f22..13ad811d5 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemWriter.java @@ -105,6 +105,7 @@ public class FlatFileItemWriter extends ExecutionContextUserSupport implement * * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() */ + @Override public void afterPropertiesSet() throws Exception { Assert.notNull(lineAggregator, "A LineAggregator must be provided."); if (append) { @@ -149,6 +150,7 @@ public class FlatFileItemWriter extends ExecutionContextUserSupport implement * * @param resource */ + @Override public void setResource(Resource resource) { this.resource = resource; } @@ -246,6 +248,7 @@ public class FlatFileItemWriter extends ExecutionContextUserSupport implement * @throws Exception if the transformer or file output fail, * WriterNotOpenException if the writer has not been initialized. */ + @Override public void write(List items) throws Exception { if (!getOutputState().isInitialized()) { @@ -276,6 +279,7 @@ public class FlatFileItemWriter extends ExecutionContextUserSupport implement /** * @see ItemStream#close() */ + @Override public void close() { if (state != null) { try { @@ -308,6 +312,7 @@ public class FlatFileItemWriter extends ExecutionContextUserSupport implement * * @see ItemStream#open(ExecutionContext) */ + @Override public void open(ExecutionContext executionContext) throws ItemStreamException { Assert.notNull(resource, "The resource must be set"); @@ -344,6 +349,7 @@ public class FlatFileItemWriter extends ExecutionContextUserSupport implement /** * @see ItemStream#update(ExecutionContext) */ + @Override public void update(ExecutionContext executionContext) { if (state == null) { throw new ItemStreamException("ItemStream not open or already closed."); @@ -581,6 +587,7 @@ public class FlatFileItemWriter extends ExecutionContextUserSupport implement final FileChannel channel = fileChannel; if (transactional) { TransactionAwareBufferedWriter writer = new TransactionAwareBufferedWriter(channel, new Runnable() { + @Override public void run() { closeStream(); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/MultiResourceItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/MultiResourceItemReader.java index 4254a7566..5de23a0fe 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/MultiResourceItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/MultiResourceItemReader.java @@ -73,6 +73,7 @@ public class MultiResourceItemReader implements ItemReader, ItemStream { /** * Compares resource filenames. */ + @Override public int compare(Resource r1, Resource r2) { return r1.getFilename().compareTo(r2.getFilename()); } @@ -86,6 +87,7 @@ public class MultiResourceItemReader implements ItemReader, ItemStream { /** * Reads the next item, jumping to next resource if necessary. */ + @Override public T read() throws Exception, UnexpectedInputException, ParseException { if (noInput) { @@ -142,6 +144,7 @@ public class MultiResourceItemReader implements ItemReader, ItemStream { /** * Close the {@link #setDelegate(ResourceAwareItemReaderItemStream)} reader and reset instance variable values. */ + @Override public void close() throws ItemStreamException { delegate.close(); noInput = false; @@ -151,6 +154,7 @@ public class MultiResourceItemReader implements ItemReader, ItemStream { * Figure out which resource to start with in case of restart, open the delegate and restore delegate's position in * the resource. */ + @Override public void open(ExecutionContext executionContext) throws ItemStreamException { Assert.notNull(resources, "Resources must be set"); @@ -189,6 +193,7 @@ public class MultiResourceItemReader implements ItemReader, ItemStream { /** * Store the current resource index and position in the resource. */ + @Override public void update(ExecutionContext executionContext) throws ItemStreamException { if (saveState) { executionContext.putInt(executionContextUserSupport.getKey(RESOURCE_KEY), currentResource); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/MultiResourceItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/MultiResourceItemWriter.java index 018e831df..45b535cf0 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/MultiResourceItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/MultiResourceItemWriter.java @@ -70,6 +70,7 @@ public class MultiResourceItemWriter extends ExecutionContextUserSupport impl setName(ClassUtils.getShortName(MultiResourceItemWriter.class)); } + @Override public void write(List items) throws Exception { if (!opened) { File file = setResourceToDelegate(); @@ -127,6 +128,7 @@ public class MultiResourceItemWriter extends ExecutionContextUserSupport impl this.saveState = saveState; } + @Override public void close() throws ItemStreamException { resourceIndex = 1; currentResourceItemCount = 0; @@ -135,6 +137,7 @@ public class MultiResourceItemWriter extends ExecutionContextUserSupport impl } } + @Override public void open(ExecutionContext executionContext) throws ItemStreamException { resourceIndex = executionContext.getInt(getKey(RESOURCE_INDEX_KEY), 1); currentResourceItemCount = executionContext.getInt(getKey(CURRENT_RESOURCE_ITEM_COUNT), 0); @@ -155,6 +158,7 @@ public class MultiResourceItemWriter extends ExecutionContextUserSupport impl } } + @Override public void update(ExecutionContext executionContext) throws ItemStreamException { if (saveState) { if (opened) { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/ResourcesItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/ResourcesItemReader.java index 5d1140c2d..ee1402009 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/ResourcesItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/ResourcesItemReader.java @@ -56,6 +56,7 @@ public class ResourcesItemReader extends ExecutionContextUserSupport implements * Increments a counter and returns the next {@link Resource} instance from * the input, or null if none remain. */ + @Override public synchronized Resource read() throws Exception { int index = counter.incrementAndGet() - 1; if (index >= resources.length) { @@ -64,13 +65,16 @@ public class ResourcesItemReader extends ExecutionContextUserSupport implements return resources[index]; } + @Override public void close() throws ItemStreamException { } + @Override public void open(ExecutionContext executionContext) throws ItemStreamException { counter.set(executionContext.getInt(getKey("COUNT"), 0)); } + @Override public void update(ExecutionContext executionContext) throws ItemStreamException { executionContext.putInt(getKey("COUNT"), counter.get()); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/SimpleBinaryBufferedReaderFactory.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/SimpleBinaryBufferedReaderFactory.java index 87d2af66e..1f1b5b1dc 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/SimpleBinaryBufferedReaderFactory.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/SimpleBinaryBufferedReaderFactory.java @@ -50,6 +50,7 @@ public class SimpleBinaryBufferedReaderFactory implements BufferedReaderFactory this.lineEnding = lineEnding; } + @Override public BufferedReader create(Resource resource, String encoding) throws UnsupportedEncodingException, IOException { return new BinaryBufferedReader(new InputStreamReader(resource.getInputStream(), encoding), lineEnding); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/SimpleResourceSuffixCreator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/SimpleResourceSuffixCreator.java index aeb58d1d1..01fe937b1 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/SimpleResourceSuffixCreator.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/SimpleResourceSuffixCreator.java @@ -24,6 +24,7 @@ package org.springframework.batch.item.file; */ public class SimpleResourceSuffixCreator implements ResourceSuffixCreator { + @Override public String getSuffix(int index) { return "." + index; } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/ArrayFieldSetMapper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/ArrayFieldSetMapper.java index 2151b4779..b089b0c0f 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/ArrayFieldSetMapper.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/ArrayFieldSetMapper.java @@ -27,6 +27,7 @@ import org.springframework.validation.BindException; */ public class ArrayFieldSetMapper implements FieldSetMapper { + @Override public String[] mapFieldSet(FieldSet fieldSet) throws BindException { return fieldSet.getValues(); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapper.java index e33c405eb..0525cd392 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapper.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapper.java @@ -109,6 +109,7 @@ public class BeanWrapperFieldSetMapper extends DefaultPropertyEditorRegistrar * org.springframework.beans.factory.BeanFactoryAware#setBeanFactory(org * .springframework.beans.factory.BeanFactory) */ + @Override public void setBeanFactory(BeanFactory beanFactory) { this.beanFactory = beanFactory; } @@ -161,6 +162,7 @@ public class BeanWrapperFieldSetMapper extends DefaultPropertyEditorRegistrar * * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() */ + @Override public void afterPropertiesSet() throws Exception { Assert.state(name != null || type != null, "Either name or type must be provided."); Assert.state(name == null || type == null, "Both name and type cannot be specified together."); @@ -178,6 +180,7 @@ public class BeanWrapperFieldSetMapper extends DefaultPropertyEditorRegistrar * field that cannot be mapped to a bean property. * @see org.springframework.batch.item.file.mapping.FieldSetMapper#mapFieldSet(FieldSet) */ + @Override public T mapFieldSet(FieldSet fs) throws BindException { T copy = getBean(); DataBinder binder = createBinder(copy); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/DefaultLineMapper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/DefaultLineMapper.java index 4a21f1d86..27aac6d5b 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/DefaultLineMapper.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/DefaultLineMapper.java @@ -38,6 +38,7 @@ public class DefaultLineMapper implements LineMapper, InitializingBean { private FieldSetMapper fieldSetMapper; + @Override public T mapLine(String line, int lineNumber) throws Exception { return fieldSetMapper.mapFieldSet(tokenizer.tokenize(line)); } @@ -50,6 +51,7 @@ public class DefaultLineMapper implements LineMapper, InitializingBean { this.fieldSetMapper = fieldSetMapper; } + @Override public void afterPropertiesSet() { Assert.notNull(tokenizer, "The LineTokenizer must be set"); Assert.notNull(fieldSetMapper, "The FieldSetMapper must be set"); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/JsonLineMapper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/JsonLineMapper.java index 41b0f4d8f..05d427a01 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/JsonLineMapper.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/JsonLineMapper.java @@ -33,6 +33,7 @@ public class JsonLineMapper implements LineMapper> { * * @see LineMapper#mapLine(String, int) */ + @Override public Map mapLine(String line, int lineNumber) throws Exception { Map result; JsonParser parser = factory.createJsonParser(line); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PassThroughFieldSetMapper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PassThroughFieldSetMapper.java index b91dcfa97..e90d1b918 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PassThroughFieldSetMapper.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PassThroughFieldSetMapper.java @@ -33,6 +33,7 @@ public class PassThroughFieldSetMapper implements FieldSetMapper
{ * org.springframework.batch.item.file.FieldSetMapper#mapLine(org.springframework * .batch.io.file.FieldSet) */ + @Override public FieldSet mapFieldSet(FieldSet fs) { return fs; } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PassThroughLineMapper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PassThroughLineMapper.java index 494ae1c4b..be7f2e71e 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PassThroughLineMapper.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PassThroughLineMapper.java @@ -25,6 +25,7 @@ import org.springframework.batch.item.file.LineMapper; */ public class PassThroughLineMapper implements LineMapper{ + @Override public String mapLine(String line, int lineNumber) throws Exception { return line; } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PatternMatchingCompositeLineMapper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PatternMatchingCompositeLineMapper.java index cd49bcb07..428ba622d 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PatternMatchingCompositeLineMapper.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/PatternMatchingCompositeLineMapper.java @@ -57,6 +57,7 @@ public class PatternMatchingCompositeLineMapper implements LineMapper, Ini * org.springframework.batch.item.file.mapping.LineMapper#mapLine(java.lang * .String, int) */ + @Override public T mapLine(String line, int lineNumber) throws Exception { return patternMatcher.match(line).mapFieldSet(this.tokenizer.tokenize(line)); } @@ -67,6 +68,7 @@ public class PatternMatchingCompositeLineMapper implements LineMapper, Ini * @see * org.springframework.beans.factory.InitializingBean#afterPropertiesSet() */ + @Override public void afterPropertiesSet() throws Exception { this.tokenizer.afterPropertiesSet(); Assert.isTrue(this.patternMatcher != null, "The 'fieldSetMappers' property must be non-empty"); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/separator/DefaultRecordSeparatorPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/separator/DefaultRecordSeparatorPolicy.java index e535777d2..92d6b0745 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/separator/DefaultRecordSeparatorPolicy.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/separator/DefaultRecordSeparatorPolicy.java @@ -85,6 +85,7 @@ public class DefaultRecordSeparatorPolicy extends SimpleRecordSeparatorPolicy { * * @see org.springframework.batch.item.file.separator.RecordSeparatorPolicy#isEndOfRecord(java.lang.String) */ + @Override public boolean isEndOfRecord(String line) { return !isQuoteUnterminated(line) && !isContinued(line); } @@ -96,6 +97,7 @@ public class DefaultRecordSeparatorPolicy extends SimpleRecordSeparatorPolicy { * * @see org.springframework.batch.item.file.separator.SimpleRecordSeparatorPolicy#preProcess(java.lang.String) */ + @Override public String preProcess(String line) { if (isQuoteUnterminated(line)) { return line + "\n"; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/separator/JsonRecordSeparatorPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/separator/JsonRecordSeparatorPolicy.java index e64aa3064..def28d8ed 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/separator/JsonRecordSeparatorPolicy.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/separator/JsonRecordSeparatorPolicy.java @@ -41,6 +41,7 @@ public class JsonRecordSeparatorPolicy extends SimpleRecordSeparatorPolicy { * * @see RecordSeparatorPolicy#isEndOfRecord(String) */ + @Override public boolean isEndOfRecord(String line) { return StringUtils.countOccurrencesOf(line, "{") == StringUtils.countOccurrencesOf(line, "}") && line.trim().endsWith("}"); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/separator/SimpleRecordSeparatorPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/separator/SimpleRecordSeparatorPolicy.java index 4751dd8c2..d00674abd 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/separator/SimpleRecordSeparatorPolicy.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/separator/SimpleRecordSeparatorPolicy.java @@ -31,6 +31,7 @@ public class SimpleRecordSeparatorPolicy implements RecordSeparatorPolicy { * * @see org.springframework.batch.item.file.separator.RecordSeparatorPolicy#isEndOfRecord(java.lang.String) */ + @Override public boolean isEndOfRecord(String line) { return true; } @@ -39,6 +40,7 @@ public class SimpleRecordSeparatorPolicy implements RecordSeparatorPolicy { * Pass the record through. Do nothing. * @see org.springframework.batch.item.file.separator.RecordSeparatorPolicy#postProcess(java.lang.String) */ + @Override public String postProcess(String record) { return record; } @@ -47,6 +49,7 @@ public class SimpleRecordSeparatorPolicy implements RecordSeparatorPolicy { * Pass the line through. Do nothing. * @see org.springframework.batch.item.file.separator.RecordSeparatorPolicy#preProcess(java.lang.String) */ + @Override public String preProcess(String line) { return line; } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/separator/SuffixRecordSeparatorPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/separator/SuffixRecordSeparatorPolicy.java index b8147b4c4..b04b400c4 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/separator/SuffixRecordSeparatorPolicy.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/separator/SuffixRecordSeparatorPolicy.java @@ -61,6 +61,7 @@ public class SuffixRecordSeparatorPolicy extends DefaultRecordSeparatorPolicy { * * @see org.springframework.batch.item.file.separator.RecordSeparatorPolicy#isEndOfRecord(java.lang.String) */ + @Override public boolean isEndOfRecord(String line) { if (line == null) { return true; @@ -74,6 +75,7 @@ public class SuffixRecordSeparatorPolicy extends DefaultRecordSeparatorPolicy { * * @see org.springframework.batch.item.file.separator.SimpleRecordSeparatorPolicy#postProcess(java.lang.String) */ + @Override public String postProcess(String record) { if (record==null) { return null; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/AbstractLineTokenizer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/AbstractLineTokenizer.java index d7e1ca6e8..5f58642c7 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/AbstractLineTokenizer.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/AbstractLineTokenizer.java @@ -101,6 +101,7 @@ public abstract class AbstractLineTokenizer implements LineTokenizer { * * @return the resulting tokens */ + @Override public FieldSet tokenize(String line) { if (line == null) { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/BeanWrapperFieldExtractor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/BeanWrapperFieldExtractor.java index 66ece9e6d..9151a5b5b 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/BeanWrapperFieldExtractor.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/BeanWrapperFieldExtractor.java @@ -48,6 +48,7 @@ public class BeanWrapperFieldExtractor implements FieldExtractor, Initiali /** * @see org.springframework.batch.item.file.transform.FieldExtractor#extract(java.lang.Object) */ + @Override public Object[] extract(T item) { List values = new ArrayList(); @@ -58,6 +59,7 @@ public class BeanWrapperFieldExtractor implements FieldExtractor, Initiali return values.toArray(); } + @Override public void afterPropertiesSet() { Assert.notNull(names, "The 'names' property must be set."); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/DefaultFieldSet.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/DefaultFieldSet.java index 2bef134a8..d6d1af5ea 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/DefaultFieldSet.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/DefaultFieldSet.java @@ -118,6 +118,7 @@ public class DefaultFieldSet implements FieldSet { * * @see org.springframework.batch.item.file.mapping.IFieldSet#getNames() */ + @Override public String[] getNames() { if (names == null) { throw new IllegalStateException("Field names are not known"); @@ -130,6 +131,7 @@ public class DefaultFieldSet implements FieldSet { * * @see org.springframework.batch.item.file.mapping.FieldSet#hasNames() */ + @Override public boolean hasNames() { return names != null; } @@ -139,6 +141,7 @@ public class DefaultFieldSet implements FieldSet { * * @see org.springframework.batch.item.file.mapping.IFieldSet#getValues() */ + @Override public String[] getValues() { return tokens.clone(); } @@ -149,6 +152,7 @@ public class DefaultFieldSet implements FieldSet { * @see * org.springframework.batch.item.file.mapping.IFieldSet#readString(int) */ + @Override public String readString(int index) { return readAndTrim(index); } @@ -160,6 +164,7 @@ public class DefaultFieldSet implements FieldSet { * org.springframework.batch.item.file.mapping.IFieldSet#readString(java * .lang.String) */ + @Override public String readString(String name) { return readString(indexOf(name)); } @@ -170,6 +175,7 @@ public class DefaultFieldSet implements FieldSet { * @see * org.springframework.batch.item.file.mapping.IFieldSet#readRawString(int) */ + @Override public String readRawString(int index) { return tokens[index]; } @@ -181,6 +187,7 @@ public class DefaultFieldSet implements FieldSet { * org.springframework.batch.item.file.mapping.IFieldSet#readRawString(java * .lang.String) */ + @Override public String readRawString(String name) { return readRawString(indexOf(name)); } @@ -191,6 +198,7 @@ public class DefaultFieldSet implements FieldSet { * @see * org.springframework.batch.item.file.mapping.IFieldSet#readBoolean(int) */ + @Override public boolean readBoolean(int index) { return readBoolean(index, "true"); } @@ -202,6 +210,7 @@ public class DefaultFieldSet implements FieldSet { * org.springframework.batch.item.file.mapping.IFieldSet#readBoolean(java * .lang.String) */ + @Override public boolean readBoolean(String name) { return readBoolean(indexOf(name)); } @@ -213,6 +222,7 @@ public class DefaultFieldSet implements FieldSet { * org.springframework.batch.item.file.mapping.IFieldSet#readBoolean(int, * java.lang.String) */ + @Override public boolean readBoolean(int index, String trueValue) { Assert.notNull(trueValue, "'trueValue' cannot be null."); @@ -228,6 +238,7 @@ public class DefaultFieldSet implements FieldSet { * org.springframework.batch.item.file.mapping.IFieldSet#readBoolean(java * .lang.String, java.lang.String) */ + @Override public boolean readBoolean(String name, String trueValue) { return readBoolean(indexOf(name), trueValue); } @@ -237,6 +248,7 @@ public class DefaultFieldSet implements FieldSet { * * @see org.springframework.batch.item.file.mapping.IFieldSet#readChar(int) */ + @Override public char readChar(int index) { String value = readAndTrim(index); @@ -252,6 +264,7 @@ public class DefaultFieldSet implements FieldSet { * org.springframework.batch.item.file.mapping.IFieldSet#readChar(java.lang * .String) */ + @Override public char readChar(String name) { return readChar(indexOf(name)); } @@ -261,6 +274,7 @@ public class DefaultFieldSet implements FieldSet { * * @see org.springframework.batch.item.file.mapping.IFieldSet#readByte(int) */ + @Override public byte readByte(int index) { return Byte.parseByte(readAndTrim(index)); } @@ -272,6 +286,7 @@ public class DefaultFieldSet implements FieldSet { * org.springframework.batch.item.file.mapping.IFieldSet#readByte(java.lang * .String) */ + @Override public byte readByte(String name) { return readByte(indexOf(name)); } @@ -281,6 +296,7 @@ public class DefaultFieldSet implements FieldSet { * * @see org.springframework.batch.item.file.mapping.IFieldSet#readShort(int) */ + @Override public short readShort(int index) { return Short.parseShort(readAndTrim(index)); } @@ -292,6 +308,7 @@ public class DefaultFieldSet implements FieldSet { * org.springframework.batch.item.file.mapping.IFieldSet#readShort(java. * lang.String) */ + @Override public short readShort(String name) { return readShort(indexOf(name)); } @@ -301,6 +318,7 @@ public class DefaultFieldSet implements FieldSet { * * @see org.springframework.batch.item.file.mapping.IFieldSet#readInt(int) */ + @Override public int readInt(int index) { return parseNumber(readAndTrim(index)).intValue(); } @@ -312,6 +330,7 @@ public class DefaultFieldSet implements FieldSet { * org.springframework.batch.item.file.mapping.IFieldSet#readInt(java.lang * .String) */ + @Override public int readInt(String name) { return readInt(indexOf(name)); } @@ -322,6 +341,7 @@ public class DefaultFieldSet implements FieldSet { * @see org.springframework.batch.item.file.mapping.IFieldSet#readInt(int, * int) */ + @Override public int readInt(int index, int defaultValue) { String value = readAndTrim(index); @@ -335,6 +355,7 @@ public class DefaultFieldSet implements FieldSet { * org.springframework.batch.item.file.mapping.IFieldSet#readInt(java.lang * .String, int) */ + @Override public int readInt(String name, int defaultValue) { return readInt(indexOf(name), defaultValue); } @@ -344,6 +365,7 @@ public class DefaultFieldSet implements FieldSet { * * @see org.springframework.batch.item.file.mapping.IFieldSet#readLong(int) */ + @Override public long readLong(int index) { return parseNumber(readAndTrim(index)).longValue(); } @@ -355,6 +377,7 @@ public class DefaultFieldSet implements FieldSet { * org.springframework.batch.item.file.mapping.IFieldSet#readLong(java.lang * .String) */ + @Override public long readLong(String name) { return readLong(indexOf(name)); } @@ -365,6 +388,7 @@ public class DefaultFieldSet implements FieldSet { * @see org.springframework.batch.item.file.mapping.IFieldSet#readLong(int, * long) */ + @Override public long readLong(int index, long defaultValue) { String value = readAndTrim(index); @@ -378,6 +402,7 @@ public class DefaultFieldSet implements FieldSet { * org.springframework.batch.item.file.mapping.IFieldSet#readLong(java.lang * .String, long) */ + @Override public long readLong(String name, long defaultValue) { return readLong(indexOf(name), defaultValue); } @@ -387,6 +412,7 @@ public class DefaultFieldSet implements FieldSet { * * @see org.springframework.batch.item.file.mapping.IFieldSet#readFloat(int) */ + @Override public float readFloat(int index) { return parseNumber(readAndTrim(index)).floatValue(); } @@ -398,6 +424,7 @@ public class DefaultFieldSet implements FieldSet { * org.springframework.batch.item.file.mapping.IFieldSet#readFloat(java. * lang.String) */ + @Override public float readFloat(String name) { return readFloat(indexOf(name)); } @@ -408,6 +435,7 @@ public class DefaultFieldSet implements FieldSet { * @see * org.springframework.batch.item.file.mapping.IFieldSet#readDouble(int) */ + @Override public double readDouble(int index) { return (Double) parseNumber(readAndTrim(index)).doubleValue(); } @@ -419,6 +447,7 @@ public class DefaultFieldSet implements FieldSet { * org.springframework.batch.item.file.mapping.IFieldSet#readDouble(java * .lang.String) */ + @Override public double readDouble(String name) { return readDouble(indexOf(name)); } @@ -429,6 +458,7 @@ public class DefaultFieldSet implements FieldSet { * @see * org.springframework.batch.item.file.mapping.IFieldSet#readBigDecimal(int) */ + @Override public BigDecimal readBigDecimal(int index) { return readBigDecimal(index, null); } @@ -440,6 +470,7 @@ public class DefaultFieldSet implements FieldSet { * org.springframework.batch.item.file.mapping.IFieldSet#readBigDecimal( * java.lang.String) */ + @Override public BigDecimal readBigDecimal(String name) { return readBigDecimal(name, null); } @@ -451,6 +482,7 @@ public class DefaultFieldSet implements FieldSet { * org.springframework.batch.item.file.mapping.IFieldSet#readBigDecimal(int, * java.math.BigDecimal) */ + @Override public BigDecimal readBigDecimal(int index, BigDecimal defaultValue) { String candidate = readAndTrim(index); @@ -478,6 +510,7 @@ public class DefaultFieldSet implements FieldSet { * org.springframework.batch.item.file.mapping.IFieldSet#readBigDecimal( * java.lang.String, java.math.BigDecimal) */ + @Override public BigDecimal readBigDecimal(String name, BigDecimal defaultValue) { try { return readBigDecimal(indexOf(name), defaultValue); @@ -495,6 +528,7 @@ public class DefaultFieldSet implements FieldSet { * * @see org.springframework.batch.item.file.mapping.IFieldSet#readDate(int) */ + @Override public Date readDate(int index) { return parseDate(readAndTrim(index), dateFormat); } @@ -505,6 +539,7 @@ public class DefaultFieldSet implements FieldSet { * @see org.springframework.batch.item.file.transform.FieldSet#readDate(int, * java.util.Date) */ + @Override public Date readDate(int index, Date defaultValue) { try { return readDate(index); @@ -521,6 +556,7 @@ public class DefaultFieldSet implements FieldSet { * org.springframework.batch.item.file.mapping.IFieldSet#readDate(java.lang * .String) */ + @Override public Date readDate(String name) { try { return readDate(indexOf(name)); @@ -536,6 +572,7 @@ public class DefaultFieldSet implements FieldSet { * @see org.springframework.batch.item.file.transform.FieldSet#readDate(int, * java.util.Date) */ + @Override public Date readDate(String name, Date defaultValue) { try { return readDate(name); @@ -551,6 +588,7 @@ public class DefaultFieldSet implements FieldSet { * @see org.springframework.batch.item.file.mapping.IFieldSet#readDate(int, * java.lang.String) */ + @Override public Date readDate(int index, String pattern) { SimpleDateFormat sdf = new SimpleDateFormat(pattern); sdf.setLenient(false); @@ -563,6 +601,7 @@ public class DefaultFieldSet implements FieldSet { * @see org.springframework.batch.item.file.mapping.IFieldSet#readDate(int, * java.lang.String) */ + @Override public Date readDate(int index, String pattern, Date defaultValue) { try { return readDate(index, pattern); @@ -579,6 +618,7 @@ public class DefaultFieldSet implements FieldSet { * org.springframework.batch.item.file.mapping.IFieldSet#readDate(java.lang * .String, java.lang.String) */ + @Override public Date readDate(String name, String pattern) { try { return readDate(indexOf(name), pattern); @@ -594,6 +634,7 @@ public class DefaultFieldSet implements FieldSet { * @see org.springframework.batch.item.file.mapping.IFieldSet#readDate(int, * java.lang.String) */ + @Override public Date readDate(String name, String pattern, Date defaultValue) { try { return readDate(name, pattern); @@ -609,6 +650,7 @@ public class DefaultFieldSet implements FieldSet { * @see * org.springframework.batch.item.file.mapping.IFieldSet#getFieldCount() */ + @Override public int getFieldCount() { return tokens.length; } @@ -647,6 +689,7 @@ public class DefaultFieldSet implements FieldSet { throw new IllegalArgumentException("Cannot access column [" + name + "] from " + names); } + @Override public String toString() { if (names != null) { return getProperties().toString(); @@ -658,6 +701,7 @@ public class DefaultFieldSet implements FieldSet { /** * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object object) { if (object instanceof DefaultFieldSet) { DefaultFieldSet fs = (DefaultFieldSet) object; @@ -673,6 +717,7 @@ public class DefaultFieldSet implements FieldSet { return false; } + @Override public int hashCode() { // this algorithm was taken from java 1.5 jdk Arrays.hashCode(Object[]) if (tokens == null) { @@ -694,6 +739,7 @@ public class DefaultFieldSet implements FieldSet { * @see * org.springframework.batch.item.file.mapping.IFieldSet#getProperties() */ + @Override public Properties getProperties() { if (names == null) { throw new IllegalStateException("Cannot create properties without meta data"); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/DefaultFieldSetFactory.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/DefaultFieldSetFactory.java index 02b0c30ef..d1a01cea5 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/DefaultFieldSetFactory.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/DefaultFieldSetFactory.java @@ -38,6 +38,7 @@ public class DefaultFieldSetFactory implements FieldSetFactory { /** * {@inheritDoc} */ + @Override public FieldSet create(String[] values, String[] names) { DefaultFieldSet fieldSet = new DefaultFieldSet(values, names); return enhance(fieldSet); @@ -46,6 +47,7 @@ public class DefaultFieldSetFactory implements FieldSetFactory { /** * {@inheritDoc} */ + @Override public FieldSet create(String[] values) { DefaultFieldSet fieldSet = new DefaultFieldSet(values); return enhance(fieldSet); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/ExtractorLineAggregator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/ExtractorLineAggregator.java index a2277def7..48838e5bb 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/ExtractorLineAggregator.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/ExtractorLineAggregator.java @@ -48,6 +48,7 @@ public abstract class ExtractorLineAggregator implements LineAggregator { * * @see org.springframework.batch.item.file.transform.LineAggregator#aggregate(java.lang.Object) */ + @Override public String aggregate(T item) { Assert.notNull(item); Object[] fields = this.fieldExtractor.extract(item); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/FixedLengthTokenizer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/FixedLengthTokenizer.java index 8124d5e4f..4da782ee4 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/FixedLengthTokenizer.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/FixedLengthTokenizer.java @@ -96,6 +96,7 @@ public class FixedLengthTokenizer extends AbstractLineTokenizer { * @throws IncorrectLineLengthException if line length is greater than or * less than the max range set. */ + @Override protected List doTokenize(String line) { List tokens = new ArrayList(ranges.length); int lineLength; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/PassThroughFieldExtractor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/PassThroughFieldExtractor.java index 345fdc59b..1ce70368f 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/PassThroughFieldExtractor.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/PassThroughFieldExtractor.java @@ -46,6 +46,7 @@ public class PassThroughFieldExtractor implements FieldExtractor { * @param item the object to convert * @return an array of objects as close as possible to the original item */ + @Override public Object[] extract(T item) { if (item.getClass().isArray()) { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/PassThroughLineAggregator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/PassThroughLineAggregator.java index cd3bbbb60..df698a365 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/PassThroughLineAggregator.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/PassThroughLineAggregator.java @@ -28,6 +28,7 @@ public class PassThroughLineAggregator implements LineAggregator { * * @see org.springframework.batch.item.file.transform.LineAggregator#aggregate(java.lang.Object) */ + @Override public String aggregate(T item) { return item.toString(); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/PatternMatchingCompositeLineTokenizer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/PatternMatchingCompositeLineTokenizer.java index 63cd00d59..e12fac113 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/PatternMatchingCompositeLineTokenizer.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/PatternMatchingCompositeLineTokenizer.java @@ -45,6 +45,7 @@ public class PatternMatchingCompositeLineTokenizer implements LineTokenizer, Ini * org.springframework.batch.item.file.transform.LineTokenizer#tokenize( * java.lang.String) */ + @Override public FieldSet tokenize(String line) { return tokenizers.match(line).tokenize(line); } @@ -55,6 +56,7 @@ public class PatternMatchingCompositeLineTokenizer implements LineTokenizer, Ini * @see * org.springframework.beans.factory.InitializingBean#afterPropertiesSet() */ + @Override public void afterPropertiesSet() throws Exception { Assert.isTrue(this.tokenizers != null, "The 'tokenizers' property must be non-empty"); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/Range.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/Range.java index 3f53d47f4..94ac6a079 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/Range.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/Range.java @@ -55,6 +55,7 @@ public class Range { return max != UPPER_BORDER_NOT_DEFINED; } + @Override public String toString() { return hasMaxValue() ? min + "-" + max : String.valueOf(min); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/RangeArrayPropertyEditor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/RangeArrayPropertyEditor.java index 30a0b51ee..0398b47ab 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/RangeArrayPropertyEditor.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/RangeArrayPropertyEditor.java @@ -61,6 +61,7 @@ public class RangeArrayPropertyEditor extends PropertyEditorSupport { this.forceDisjointRanges = forceDisjointRanges; } + @Override public void setAsText(String text) throws IllegalArgumentException { //split text into ranges @@ -93,6 +94,7 @@ public class RangeArrayPropertyEditor extends PropertyEditorSupport { setValue(ranges); } + @Override public String getAsText() { Range[] ranges = (Range[])getValue(); @@ -117,6 +119,7 @@ public class RangeArrayPropertyEditor extends PropertyEditorSupport { //sort array of Ranges Arrays.sort(c, new Comparator() { + @Override public int compare(Integer r1, Integer r2) { return ranges[r1].getMin()-ranges[r2].getMin(); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/RecursiveCollectionLineAggregator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/RecursiveCollectionLineAggregator.java index 6a5e7760d..4b75752e9 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/RecursiveCollectionLineAggregator.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/RecursiveCollectionLineAggregator.java @@ -47,6 +47,7 @@ public class RecursiveCollectionLineAggregator implements LineAggregator items) { StringBuilder builder = new StringBuilder(); for (T value : items) { @@ -55,4 +56,4 @@ public class RecursiveCollectionLineAggregator implements LineAggregator implements ItemReader, InitializingBean { this.itemType = itemType; } + @Override @SuppressWarnings("unchecked") public T read() { if (itemType != null && itemType.isAssignableFrom(Message.class)) { @@ -89,6 +90,7 @@ public class JmsItemReader implements ItemReader, InitializingBean { return (T) result; } + @Override public void afterPropertiesSet() throws Exception { Assert.notNull(this.jmsTemplate, "The 'jmsTemplate' is required."); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/jms/JmsItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/jms/JmsItemWriter.java index 588186f62..db3308d60 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/jms/JmsItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/jms/JmsItemWriter.java @@ -65,6 +65,7 @@ public class JmsItemWriter implements ItemWriter { * * @see org.springframework.batch.item.ItemWriter#write(java.util.List) */ + @Override public void write(List items) throws Exception { if (logger.isDebugEnabled()) { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/jms/JmsMethodArgumentsKeyGenerator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/jms/JmsMethodArgumentsKeyGenerator.java index b7c099d55..28916c93c 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/jms/JmsMethodArgumentsKeyGenerator.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/jms/JmsMethodArgumentsKeyGenerator.java @@ -40,6 +40,7 @@ public class JmsMethodArgumentsKeyGenerator implements MethodArgumentsKeyGenerat * a JMS Message * @throws IllegalArgumentException if the arguments are empty */ + @Override public Object getKey(Object[] items) { for (Object item : items) { if (item instanceof Message) { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/jms/JmsMethodInvocationRecoverer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/jms/JmsMethodInvocationRecoverer.java index 03c087d0b..5b6be5418 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/jms/JmsMethodInvocationRecoverer.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/jms/JmsMethodInvocationRecoverer.java @@ -47,6 +47,7 @@ public class JmsMethodInvocationRecoverer implements MethodInvocationRecovere * @see org.springframework.retry.interceptor.MethodInvocationRecoverer#recover(Object[], * Throwable) */ + @Override public T recover(Object[] items, Throwable cause) { try { for (Object item : items) { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/jms/JmsNewMethodArgumentsIdentifier.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/jms/JmsNewMethodArgumentsIdentifier.java index 2cfb61a87..1600654b9 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/jms/JmsNewMethodArgumentsIdentifier.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/jms/JmsNewMethodArgumentsIdentifier.java @@ -37,6 +37,7 @@ public class JmsNewMethodArgumentsIdentifier implements NewMethodArgumentsIde * * @see org.springframework.retry.interceptor.NewMethodArgumentsIdentifier#isNew(java.lang.Object[]) */ + @Override public boolean isNew(Object[] args) { for (Object item : args) { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/mail/DefaultMailErrorHandler.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/mail/DefaultMailErrorHandler.java index d90d2ea7d..11a09063d 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/mail/DefaultMailErrorHandler.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/mail/DefaultMailErrorHandler.java @@ -53,6 +53,7 @@ public class DefaultMailErrorHandler implements MailErrorHandler { * @throws MailException a translation of the Exception * @see MailErrorHandler#handle(MailMessage, Exception) */ + @Override public void handle(MailMessage message, Exception exception) throws MailException { String msg = message.toString(); throw new MailSendException("Mail server send failed: " diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/mail/SimpleMailMessageItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/mail/SimpleMailMessageItemWriter.java index 0421d10e3..0aa0d08a8 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/mail/SimpleMailMessageItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/mail/SimpleMailMessageItemWriter.java @@ -86,6 +86,7 @@ public class SimpleMailMessageItemWriter implements ItemWriter items) throws MailException { try { mailSender.send(items.toArray(new SimpleMailMessage[items.size()])); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/mail/javamail/MimeMessageItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/mail/javamail/MimeMessageItemWriter.java index ec2019e48..6c8b72e72 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/mail/javamail/MimeMessageItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/mail/javamail/MimeMessageItemWriter.java @@ -99,6 +99,7 @@ public class MimeMessageItemWriter implements ItemWriter { * @param items the items to send * @see ItemWriter#write(List) */ + @Override public void write(List items) throws MailException { try { mailSender.send(items.toArray(new MimeMessage[items.size()])); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AbstractItemCountingItemStreamItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AbstractItemCountingItemStreamItemReader.java index 72a7bcddd..7fb019bf6 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AbstractItemCountingItemStreamItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AbstractItemCountingItemStreamItemReader.java @@ -77,6 +77,7 @@ public abstract class AbstractItemCountingItemStreamItemReader implements Ite } } + @Override public final T read() throws Exception, UnexpectedInputException, ParseException { if (currentItemCount >= maxItemCount) { return null; @@ -118,6 +119,7 @@ public abstract class AbstractItemCountingItemStreamItemReader implements Ite this.maxItemCount = count; } + @Override public void close() throws ItemStreamException { currentItemCount = 0; try { @@ -128,6 +130,7 @@ public abstract class AbstractItemCountingItemStreamItemReader implements Ite } } + @Override public void open(ExecutionContext executionContext) throws ItemStreamException { try { @@ -161,6 +164,7 @@ public abstract class AbstractItemCountingItemStreamItemReader implements Ite } + @Override public void update(ExecutionContext executionContext) throws ItemStreamException { if (saveState) { Assert.notNull(executionContext, "ExecutionContext must not be null"); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ClassifierCompositeItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ClassifierCompositeItemWriter.java index a3fa648c7..b8ab7e146 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ClassifierCompositeItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ClassifierCompositeItemWriter.java @@ -49,6 +49,7 @@ public class ClassifierCompositeItemWriter implements ItemWriter { * Delegates to injected {@link ItemWriter} instances according to their * classification by the {@link Classifier}. */ + @Override public void write(List items) throws Exception { Map, List> map = new HashMap, List>(); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemProcessor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemProcessor.java index 921bad3fc..29e552525 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemProcessor.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemProcessor.java @@ -37,6 +37,7 @@ public class CompositeItemProcessor implements ItemProcessor, Initia private List> delegates; + @Override @SuppressWarnings("unchecked") public O process(I item) throws Exception { Object result = item; @@ -50,6 +51,7 @@ public class CompositeItemProcessor implements ItemProcessor, Initia return (O) result; } + @Override public void afterPropertiesSet() throws Exception { Assert.notNull(delegates, "The 'delgates' may not be null"); Assert.notEmpty(delegates, "The 'delgates' may not be empty"); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemStream.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemStream.java index 3db7ce1db..e56dfbb97 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemStream.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemStream.java @@ -68,6 +68,7 @@ public class CompositeItemStream implements ItemStream { * * @see org.springframework.batch.item.ItemStream#update(ExecutionContext) */ + @Override public void update(ExecutionContext executionContext) { for (ItemStream itemStream : streams) { itemStream.update(executionContext); @@ -78,6 +79,7 @@ public class CompositeItemStream implements ItemStream { * Broadcast the call to close. * @throws ItemStreamException */ + @Override public void close() throws ItemStreamException { for (ItemStream itemStream : streams) { itemStream.close(); @@ -88,6 +90,7 @@ public class CompositeItemStream implements ItemStream { * Broadcast the call to open. * @throws ItemStreamException */ + @Override public void open(ExecutionContext executionContext) throws ItemStreamException { for (ItemStream itemStream : streams) { itemStream.open(executionContext); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemWriter.java index f511b63e7..1faa720ea 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemWriter.java @@ -45,12 +45,14 @@ public class CompositeItemWriter implements ItemStreamWriter, Initializing this.ignoreItemStream = ignoreItemStream; } + @Override public void write(List item) throws Exception { for (ItemWriter writer : delegates) { writer.write(item); } } + @Override public void afterPropertiesSet() throws Exception { Assert.notNull(delegates, "The 'delgates' may not be null"); Assert.notEmpty(delegates, "The 'delgates' may not be empty"); @@ -60,6 +62,7 @@ public class CompositeItemWriter implements ItemStreamWriter, Initializing this.delegates = delegates; } + @Override public void close() throws ItemStreamException { for (ItemWriter writer : delegates) { if (!ignoreItemStream && (writer instanceof ItemStream)) { @@ -68,6 +71,7 @@ public class CompositeItemWriter implements ItemStreamWriter, Initializing } } + @Override public void open(ExecutionContext executionContext) throws ItemStreamException { for (ItemWriter writer : delegates) { if (!ignoreItemStream && (writer instanceof ItemStream)) { @@ -76,6 +80,7 @@ public class CompositeItemWriter implements ItemStreamWriter, Initializing } } + @Override public void update(ExecutionContext executionContext) throws ItemStreamException { for (ItemWriter writer : delegates) { if (!ignoreItemStream && (writer instanceof ItemStream)) { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/IteratorItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/IteratorItemReader.java index 958bfbd44..9cbcbc159 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/IteratorItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/IteratorItemReader.java @@ -63,6 +63,7 @@ public class IteratorItemReader implements ItemReader { * Implementation of {@link ItemReader#read()} that just iterates over the * iterator provided. */ + @Override public T read() throws Exception, UnexpectedInputException, ParseException { if (iterator.hasNext()) return iterator.next(); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ListItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ListItemReader.java index 50361271b..108ff8ab8 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ListItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ListItemReader.java @@ -43,6 +43,7 @@ public class ListItemReader implements ItemReader { } } + @Override public T read() { if (!list.isEmpty()) { return list.remove(0); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/PassThroughItemProcessor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/PassThroughItemProcessor.java index d0ba048c0..e5825cbf1 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/PassThroughItemProcessor.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/PassThroughItemProcessor.java @@ -35,8 +35,9 @@ public class PassThroughItemProcessor implements ItemProcessor { * @return the item * @see ItemProcessor#process(Object) */ + @Override public T process(T item) throws Exception { return item; } -} \ No newline at end of file +} diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/SingleItemPeekableItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/SingleItemPeekableItemReader.java index 75cbc1477..c01e1933b 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/SingleItemPeekableItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/SingleItemPeekableItemReader.java @@ -66,6 +66,7 @@ public class SingleItemPeekableItemReader implements ItemStreamReader, Pee * * @see ItemReader#read() */ + @Override public T read() throws Exception, UnexpectedInputException, ParseException { if (next != null) { T item = next; @@ -85,6 +86,7 @@ public class SingleItemPeekableItemReader implements ItemStreamReader, Pee * * @see PeekableItemReader#peek() */ + @Override public T peek() throws Exception, UnexpectedInputException, ParseException { if (next == null) { updateDelegate(executionContext); @@ -100,6 +102,7 @@ public class SingleItemPeekableItemReader implements ItemStreamReader, Pee * @throws ItemStreamException if there is a problem * @see ItemStream#close() */ + @Override public void close() throws ItemStreamException { next = null; if (delegate instanceof ItemStream) { @@ -116,6 +119,7 @@ public class SingleItemPeekableItemReader implements ItemStreamReader, Pee * @throws ItemStreamException if there is a problem * @see ItemStream#open(ExecutionContext) */ + @Override public void open(ExecutionContext executionContext) throws ItemStreamException { next = null; if (delegate instanceof ItemStream) { @@ -133,6 +137,7 @@ public class SingleItemPeekableItemReader implements ItemStreamReader, Pee * @throws ItemStreamException if there is a problem * @see ItemStream#update(ExecutionContext) */ + @Override public void update(ExecutionContext executionContext) throws ItemStreamException { if (next != null) { // Get the last state from the delegate instead of using diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/SpringValidator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/SpringValidator.java index cdf4583eb..888098014 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/SpringValidator.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/SpringValidator.java @@ -38,6 +38,7 @@ public class SpringValidator implements Validator, InitializingBean { /** * @see Validator#validate(Object) */ + @Override public void validate(T item) throws ValidationException { if (!validator.supports(item.getClass())) { @@ -81,6 +82,7 @@ public class SpringValidator implements Validator, InitializingBean { this.validator = validator; } + @Override public void afterPropertiesSet() throws Exception { Assert.notNull(validator, "validator must be set"); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/ValidatingItemProcessor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/ValidatingItemProcessor.java index a54d6b8a0..f419295ac 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/ValidatingItemProcessor.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/validator/ValidatingItemProcessor.java @@ -72,6 +72,7 @@ public class ValidatingItemProcessor implements ItemProcessor, Initiali * @return the input item * @throws ValidationException if validation fails */ + @Override public T process(T item) throws ValidationException { try { validator.validate(item); @@ -87,6 +88,7 @@ public class ValidatingItemProcessor implements ItemProcessor, Initiali return item; } + @Override public void afterPropertiesSet() throws Exception { Assert.notNull(validator, "Validator must not be null."); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemReader.java index 94e9e8eb9..5a24cebe6 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemReader.java @@ -86,6 +86,7 @@ public class StaxEventItemReader extends AbstractItemCountingItemStreamItemRe this.strict = strict; } + @Override public void setResource(Resource resource) { this.resource = resource; } @@ -112,6 +113,7 @@ public class StaxEventItemReader extends AbstractItemCountingItemStreamItemRe * the root element is empty. * @throws IllegalStateException if the Resource does not exist. */ + @Override public void afterPropertiesSet() throws Exception { Assert.notNull(unmarshaller, "The Unmarshaller must not be null."); Assert.hasLength(fragmentRootElementName, "The FragmentRootElementName must not be null"); @@ -157,6 +159,7 @@ public class StaxEventItemReader extends AbstractItemCountingItemStreamItemRe } } + @Override protected void doClose() throws Exception { try { if (fragmentReader != null) { @@ -173,6 +176,7 @@ public class StaxEventItemReader extends AbstractItemCountingItemStreamItemRe } + @Override protected void doOpen() throws Exception { Assert.notNull(resource, "The Resource must not be null."); @@ -202,6 +206,7 @@ public class StaxEventItemReader extends AbstractItemCountingItemStreamItemRe /** * Move to next fragment and map it to item. */ + @Override protected T doRead() throws Exception { if (noInput) { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemWriter.java index e427c94c0..9ada94cb1 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemWriter.java @@ -151,6 +151,7 @@ public class StaxEventItemWriter extends ExecutionContextUserSupport implemen * * @param resource the output file */ + @Override public void setResource(Resource resource) { this.resource = resource; } @@ -322,6 +323,7 @@ public class StaxEventItemWriter extends ExecutionContextUserSupport implemen * @throws Exception * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() */ + @Override public void afterPropertiesSet() throws Exception { Assert.notNull(marshaller); if (rootTagName.contains("{")) { @@ -339,6 +341,7 @@ public class StaxEventItemWriter extends ExecutionContextUserSupport implemen * * @see org.springframework.batch.item.ItemStream#open(ExecutionContext) */ + @Override public void open(ExecutionContext executionContext) { Assert.notNull(resource, "The resource must be set"); @@ -411,6 +414,7 @@ public class StaxEventItemWriter extends ExecutionContextUserSupport implemen final FileChannel channel = fileChannel; if (transactional) { TransactionAwareBufferedWriter writer = new TransactionAwareBufferedWriter(channel, new Runnable() { + @Override public void run() { closeStream(); } @@ -570,6 +574,7 @@ public class StaxEventItemWriter extends ExecutionContextUserSupport implemen * * @see org.springframework.batch.item.ItemStream#close() */ + @Override public void close() { XMLEventFactory factory = createXmlEventFactory(); @@ -633,6 +638,7 @@ public class StaxEventItemWriter extends ExecutionContextUserSupport implemen * @throws IOException * @throws XmlMappingException */ + @Override public void write(List items) throws XmlMappingException, Exception { currentRecordCount += items.size(); @@ -657,6 +663,7 @@ public class StaxEventItemWriter extends ExecutionContextUserSupport implemen * * @see org.springframework.batch.item.ItemStream#update(ExecutionContext) */ + @Override public void update(ExecutionContext executionContext) { if (saveState) { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/AbstractEventReaderWrapper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/AbstractEventReaderWrapper.java index 12ff67fa2..066cdba5b 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/AbstractEventReaderWrapper.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/AbstractEventReaderWrapper.java @@ -34,39 +34,48 @@ abstract class AbstractEventReaderWrapper implements XMLEventReader { this.wrappedEventReader = wrappedEventReader; } + @Override public void close() throws XMLStreamException { wrappedEventReader.close(); } + @Override public String getElementText() throws XMLStreamException { return wrappedEventReader.getElementText(); } + @Override public Object getProperty(String name) throws IllegalArgumentException { return wrappedEventReader.getProperty(name); } + @Override public boolean hasNext() { return wrappedEventReader.hasNext(); } + @Override public XMLEvent nextEvent() throws XMLStreamException { return wrappedEventReader.nextEvent(); } + @Override public XMLEvent nextTag() throws XMLStreamException { return wrappedEventReader.nextTag(); } + @Override public XMLEvent peek() throws XMLStreamException { return wrappedEventReader.peek(); } + @Override public Object next() { return wrappedEventReader.next(); } + @Override public void remove() { wrappedEventReader.remove(); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/AbstractEventWriterWrapper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/AbstractEventWriterWrapper.java index 98d988c5b..4648b1c8a 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/AbstractEventWriterWrapper.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/AbstractEventWriterWrapper.java @@ -36,38 +36,47 @@ abstract class AbstractEventWriterWrapper implements XMLEventWriter { this.wrappedEventWriter = wrappedEventWriter; } + @Override public void add(XMLEvent event) throws XMLStreamException { wrappedEventWriter.add(event); } + @Override public void add(XMLEventReader reader) throws XMLStreamException { wrappedEventWriter.add(reader); } + @Override public void close() throws XMLStreamException { wrappedEventWriter.close(); } + @Override public void flush() throws XMLStreamException { wrappedEventWriter.flush(); } + @Override public NamespaceContext getNamespaceContext() { return wrappedEventWriter.getNamespaceContext(); } + @Override public String getPrefix(String uri) throws XMLStreamException { return wrappedEventWriter.getPrefix(uri); } + @Override public void setDefaultNamespace(String uri) throws XMLStreamException { wrappedEventWriter.setDefaultNamespace(uri); } + @Override public void setNamespaceContext(NamespaceContext context) throws XMLStreamException { wrappedEventWriter.setNamespaceContext(context); } + @Override public void setPrefix(String prefix, String uri) throws XMLStreamException { wrappedEventWriter.setPrefix(prefix, uri); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/DefaultFragmentEventReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/DefaultFragmentEventReader.java index 75fe512d9..ab9911ba6 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/DefaultFragmentEventReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/DefaultFragmentEventReader.java @@ -77,11 +77,13 @@ public class DefaultFragmentEventReader extends AbstractEventReaderWrapper imple endDocumentEvent = XMLEventFactory.newInstance().createEndDocument(); } + @Override public void markStartFragment() { startFragmentFollows = true; fragmentRootName = null; } + @Override public boolean hasNext() { try { if (peek() != null) { @@ -94,6 +96,7 @@ public class DefaultFragmentEventReader extends AbstractEventReaderWrapper imple return false; } + @Override public Object next() { try { return nextEvent(); @@ -103,6 +106,7 @@ public class DefaultFragmentEventReader extends AbstractEventReaderWrapper imple } } + @Override public XMLEvent nextEvent() throws XMLStreamException { if (fakeDocumentEnd) { throw new NoSuchElementException(); @@ -161,6 +165,7 @@ public class DefaultFragmentEventReader extends AbstractEventReaderWrapper imple return event; } + @Override public XMLEvent peek() throws XMLStreamException { if (fakeDocumentEnd) { return null; @@ -172,6 +177,7 @@ public class DefaultFragmentEventReader extends AbstractEventReaderWrapper imple * Finishes reading the fragment in case the fragment was processed without * being read until the end. */ + @Override public void markFragmentProcessed() { if (insideFragment|| startFragmentFollows) { try { @@ -186,6 +192,7 @@ public class DefaultFragmentEventReader extends AbstractEventReaderWrapper imple fakeDocumentEnd = false; } + @Override public void reset() { insideFragment = false; startFragmentFollows = false; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/NoStartEndDocumentStreamWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/NoStartEndDocumentStreamWriter.java index 049ac74d2..039b7b3de 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/NoStartEndDocumentStreamWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/stax/NoStartEndDocumentStreamWriter.java @@ -33,6 +33,7 @@ public class NoStartEndDocumentStreamWriter extends AbstractEventWriterWrapper { super(wrappedEventWriter); } + @Override public void add(XMLEvent event) throws XMLStreamException { if ((!event.isStartDocument()) && (!event.isEndDocument())) { wrappedEventWriter.add(event); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/poller/DirectPoller.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/poller/DirectPoller.java index 33bd077a6..ee945fd69 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/poller/DirectPoller.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/poller/DirectPoller.java @@ -46,6 +46,7 @@ public class DirectPoller implements Poller { * * @see Poller#poll(Callable) */ + @Override public Future poll(Callable callable) throws Exception { return new DirectPollingFuture(interval, callable); } @@ -67,11 +68,13 @@ public class DirectPoller implements Poller { this.callable = callable; } + @Override public boolean cancel(boolean mayInterruptIfRunning) { cancelled = true; return true; } + @Override public S get() throws InterruptedException, ExecutionException { try { return get(-1, TimeUnit.MILLISECONDS); @@ -81,6 +84,7 @@ public class DirectPoller implements Poller { } } + @Override public S get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException { try { @@ -121,10 +125,12 @@ public class DirectPoller implements Poller { } + @Override public boolean isCancelled() { return cancelled; } + @Override public boolean isDone() { return cancelled || result != null; } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/callback/NestedRepeatCallback.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/callback/NestedRepeatCallback.java index ee943e982..7c3d523a2 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/callback/NestedRepeatCallback.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/callback/NestedRepeatCallback.java @@ -55,6 +55,7 @@ public class NestedRepeatCallback implements RepeatCallback { * * @see org.springframework.batch.repeat.RepeatCallback#doInIteration(RepeatContext) */ + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { return template.iterate(callback); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/context/RepeatContextSupport.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/context/RepeatContextSupport.java index 37daf8a1e..5125a8c10 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/context/RepeatContextSupport.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/context/RepeatContextSupport.java @@ -53,6 +53,7 @@ public class RepeatContextSupport extends SynchronizedAttributeAccessor implemen * * @see org.springframework.batch.repeat.RepeatContext#isCompleteOnly() */ + @Override public boolean isCompleteOnly() { return completeOnly; } @@ -62,6 +63,7 @@ public class RepeatContextSupport extends SynchronizedAttributeAccessor implemen * * @see org.springframework.batch.repeat.RepeatContext#setCompleteOnly() */ + @Override public void setCompleteOnly() { completeOnly = true; } @@ -71,6 +73,7 @@ public class RepeatContextSupport extends SynchronizedAttributeAccessor implemen * * @see org.springframework.batch.repeat.RepeatContext#isTerminateOnly() */ + @Override public boolean isTerminateOnly() { return terminateOnly; } @@ -80,6 +83,7 @@ public class RepeatContextSupport extends SynchronizedAttributeAccessor implemen * * @see org.springframework.batch.repeat.RepeatContext#setTerminateOnly() */ + @Override public void setTerminateOnly() { terminateOnly = true; setCompleteOnly(); @@ -90,6 +94,7 @@ public class RepeatContextSupport extends SynchronizedAttributeAccessor implemen * * @see org.springframework.batch.repeat.RepeatContext#getParent() */ + @Override public RepeatContext getParent() { return parent; } @@ -106,6 +111,7 @@ public class RepeatContextSupport extends SynchronizedAttributeAccessor implemen * * @see org.springframework.batch.repeat.RepeatContext#getStartedCount() */ + @Override public synchronized int getStartedCount() { return count; } @@ -117,6 +123,7 @@ public class RepeatContextSupport extends SynchronizedAttributeAccessor implemen * org.springframework.batch.repeat.RepeatContext#registerDestructionCallback * (java.lang.String, java.lang.Runnable) */ + @Override public void registerDestructionCallback(String name, Runnable callback) { synchronized (callbacks) { Set set = callbacks.get(name); @@ -133,6 +140,7 @@ public class RepeatContextSupport extends SynchronizedAttributeAccessor implemen * * @see org.springframework.batch.repeat.RepeatContext#close() */ + @Override public void close() { List errors = new ArrayList(); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/context/SynchronizedAttributeAccessor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/context/SynchronizedAttributeAccessor.java index a65c1f43f..97e09abc3 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/context/SynchronizedAttributeAccessor.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/context/SynchronizedAttributeAccessor.java @@ -42,6 +42,7 @@ public class SynchronizedAttributeAccessor implements AttributeAccessor { * (non-Javadoc) * @see org.springframework.core.AttributeAccessor#attributeNames() */ + @Override public String[] attributeNames() { synchronized (support) { return support.attributeNames(); @@ -52,6 +53,7 @@ public class SynchronizedAttributeAccessor implements AttributeAccessor { * (non-Javadoc) * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object other) { if (this == other) { return true; @@ -75,6 +77,7 @@ public class SynchronizedAttributeAccessor implements AttributeAccessor { * (non-Javadoc) * @see org.springframework.core.AttributeAccessor#getAttribute(java.lang.String) */ + @Override public Object getAttribute(String name) { synchronized (support) { return support.getAttribute(name); @@ -85,6 +88,7 @@ public class SynchronizedAttributeAccessor implements AttributeAccessor { * (non-Javadoc) * @see org.springframework.core.AttributeAccessor#hasAttribute(java.lang.String) */ + @Override public boolean hasAttribute(String name) { synchronized (support) { return support.hasAttribute(name); @@ -95,6 +99,7 @@ public class SynchronizedAttributeAccessor implements AttributeAccessor { * (non-Javadoc) * @see java.lang.Object#hashCode() */ + @Override public int hashCode() { return support.hashCode(); } @@ -103,6 +108,7 @@ public class SynchronizedAttributeAccessor implements AttributeAccessor { * (non-Javadoc) * @see org.springframework.core.AttributeAccessor#removeAttribute(java.lang.String) */ + @Override public Object removeAttribute(String name) { synchronized (support) { return support.removeAttribute(name); @@ -114,6 +120,7 @@ public class SynchronizedAttributeAccessor implements AttributeAccessor { * @see org.springframework.core.AttributeAccessor#setAttribute(java.lang.String, * java.lang.Object) */ + @Override public void setAttribute(String name, Object value) { synchronized (support) { support.setAttribute(name, value); @@ -142,6 +149,7 @@ public class SynchronizedAttributeAccessor implements AttributeAccessor { * (non-Javadoc) * @see java.lang.Object#toString() */ + @Override public String toString() { StringBuffer buffer = new StringBuffer("SynchronizedAttributeAccessor: ["); synchronized (support) { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/CompositeExceptionHandler.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/CompositeExceptionHandler.java index 697f3c920..7f3748ce0 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/CompositeExceptionHandler.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/CompositeExceptionHandler.java @@ -40,6 +40,7 @@ public class CompositeExceptionHandler implements ExceptionHandler { * * @see ExceptionHandler#handleException(RepeatContext, Throwable) */ + @Override public void handleException(RepeatContext context, Throwable throwable) throws Throwable { for (int i = 0; i < handlers.length; i++) { ExceptionHandler handler = handlers[i]; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/DefaultExceptionHandler.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/DefaultExceptionHandler.java index 108b46a01..56806dfb3 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/DefaultExceptionHandler.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/DefaultExceptionHandler.java @@ -32,6 +32,7 @@ public class DefaultExceptionHandler implements ExceptionHandler { * @see org.springframework.batch.repeat.exception.ExceptionHandler#handleException(RepeatContext, * Throwable) */ + @Override public void handleException(RepeatContext context, Throwable throwable) throws Throwable { throw throwable; } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/LogOrRethrowExceptionHandler.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/LogOrRethrowExceptionHandler.java index f50997f4e..6fae383be 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/LogOrRethrowExceptionHandler.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/LogOrRethrowExceptionHandler.java @@ -90,6 +90,7 @@ public class LogOrRethrowExceptionHandler implements ExceptionHandler { * * @see ExceptionHandler#handleException(RepeatContext, Throwable) */ + @Override public void handleException(RepeatContext context, Throwable throwable) throws Throwable { Level key = exceptionClassifier.classify(throwable); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/RethrowOnThresholdExceptionHandler.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/RethrowOnThresholdExceptionHandler.java index 8ffe0e0b7..027baf6e0 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/RethrowOnThresholdExceptionHandler.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/RethrowOnThresholdExceptionHandler.java @@ -44,6 +44,7 @@ public class RethrowOnThresholdExceptionHandler implements ExceptionHandler { protected final Log logger = LogFactory.getLog(RethrowOnThresholdExceptionHandler.class); private Classifier exceptionClassifier = new Classifier() { + @Override public RethrowOnThresholdExceptionHandler.IntegerHolder classify(Throwable classifiable) { return ZERO; } @@ -92,6 +93,7 @@ public class RethrowOnThresholdExceptionHandler implements ExceptionHandler { * @throws Throwable * @see ExceptionHandler#handleException(RepeatContext, Throwable) */ + @Override public void handleException(RepeatContext context, Throwable throwable) throws Throwable { IntegerHolder key = exceptionClassifier.classify(throwable); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/SimpleLimitExceptionHandler.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/SimpleLimitExceptionHandler.java index 6390f8133..4c9be2324 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/SimpleLimitExceptionHandler.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/exception/SimpleLimitExceptionHandler.java @@ -52,6 +52,7 @@ public class SimpleLimitExceptionHandler implements ExceptionHandler, Initializi * * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet() */ + @Override public void afterPropertiesSet() throws Exception { if (limit <= 0) { return; @@ -108,6 +109,7 @@ public class SimpleLimitExceptionHandler implements ExceptionHandler, Initializi * @see org.springframework.batch.repeat.exception.ExceptionHandler#handleException(org.springframework.batch.repeat.RepeatContext, * Throwable) */ + @Override public void handleException(RepeatContext context, Throwable throwable) throws Throwable { delegate.handleException(context, throwable); } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/RepeatOperationsInterceptor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/RepeatOperationsInterceptor.java index e352fc10f..c6de1aead 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/RepeatOperationsInterceptor.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/RepeatOperationsInterceptor.java @@ -61,6 +61,7 @@ public class RepeatOperationsInterceptor implements MethodInterceptor { * * @see org.aopalliance.intercept.MethodInterceptor#invoke(org.aopalliance.intercept.MethodInvocation) */ + @Override public Object invoke(final MethodInvocation invocation) throws Throwable { final ResultHolder result = new ResultHolder(); @@ -75,6 +76,7 @@ public class RepeatOperationsInterceptor implements MethodInterceptor { try { repeatOperations.iterate(new RepeatCallback() { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { try { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/listener/CompositeRepeatListener.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/listener/CompositeRepeatListener.java index ed765f0e0..a0d999127 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/listener/CompositeRepeatListener.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/listener/CompositeRepeatListener.java @@ -54,6 +54,7 @@ public class CompositeRepeatListener implements RepeatListener { /* (non-Javadoc) * @see org.springframework.batch.repeat.RepeatListener#after(org.springframework.batch.repeat.RepeatContext, org.springframework.batch.repeat.ExitStatus) */ + @Override public void after(RepeatContext context, RepeatStatus result) { for (RepeatListener listener : listeners) { listener.after(context, result); @@ -63,6 +64,7 @@ public class CompositeRepeatListener implements RepeatListener { /* (non-Javadoc) * @see org.springframework.batch.repeat.RepeatListener#before(org.springframework.batch.repeat.RepeatContext) */ + @Override public void before(RepeatContext context) { for (RepeatListener listener : listeners) { listener.before(context); @@ -72,6 +74,7 @@ public class CompositeRepeatListener implements RepeatListener { /* (non-Javadoc) * @see org.springframework.batch.repeat.RepeatListener#close(org.springframework.batch.repeat.RepeatContext) */ + @Override public void close(RepeatContext context) { for (RepeatListener listener : listeners) { listener.close(context); @@ -81,6 +84,7 @@ public class CompositeRepeatListener implements RepeatListener { /* (non-Javadoc) * @see org.springframework.batch.repeat.RepeatListener#onError(org.springframework.batch.repeat.RepeatContext, java.lang.Throwable) */ + @Override public void onError(RepeatContext context, Throwable e) { for (RepeatListener listener : listeners) { listener.onError(context, e); @@ -90,6 +94,7 @@ public class CompositeRepeatListener implements RepeatListener { /* (non-Javadoc) * @see org.springframework.batch.repeat.RepeatListener#open(org.springframework.batch.repeat.RepeatContext) */ + @Override public void open(RepeatContext context) { for (RepeatListener listener : listeners) { listener.open(context); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/listener/RepeatListenerSupport.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/listener/RepeatListenerSupport.java index 97229169d..05a121293 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/listener/RepeatListenerSupport.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/listener/RepeatListenerSupport.java @@ -28,18 +28,23 @@ import org.springframework.batch.repeat.RepeatListener; */ public class RepeatListenerSupport implements RepeatListener { + @Override public void before(RepeatContext context) { } + @Override public void after(RepeatContext context, RepeatStatus result) { } + @Override public void close(RepeatContext context) { } + @Override public void onError(RepeatContext context, Throwable e) { } + @Override public void open(RepeatContext context) { } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/CompletionPolicySupport.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/CompletionPolicySupport.java index d13a06168..016b9dbb6 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/CompletionPolicySupport.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/CompletionPolicySupport.java @@ -36,6 +36,7 @@ public class CompletionPolicySupport implements CompletionPolicy { * @see org.springframework.batch.repeat.CompletionPolicy#isComplete(org.springframework.batch.repeat.RepeatContext, * RepeatStatus) */ + @Override public boolean isComplete(RepeatContext context, RepeatStatus result) { if (result != null && !result.isContinuable()) { return true; @@ -50,6 +51,7 @@ public class CompletionPolicySupport implements CompletionPolicy { * * @see org.springframework.batch.repeat.CompletionPolicy#isComplete(org.springframework.batch.repeat.RepeatContext) */ + @Override public boolean isComplete(RepeatContext context) { return true; } @@ -59,6 +61,7 @@ public class CompletionPolicySupport implements CompletionPolicy { * * @see org.springframework.batch.repeat.CompletionPolicy#start(RepeatContext) */ + @Override public RepeatContext start(RepeatContext context) { return new RepeatContextSupport(context); } @@ -68,6 +71,7 @@ public class CompletionPolicySupport implements CompletionPolicy { * * @see org.springframework.batch.repeat.CompletionPolicy#update(org.springframework.batch.repeat.RepeatContext) */ + @Override public void update(RepeatContext context) { if (context instanceof RepeatContextSupport) { ((RepeatContextSupport) context).increment(); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/CompositeCompletionPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/CompositeCompletionPolicy.java index 87763a7a2..4ce9b680d 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/CompositeCompletionPolicy.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/CompositeCompletionPolicy.java @@ -51,6 +51,7 @@ public class CompositeCompletionPolicy implements CompletionPolicy { * @see org.springframework.batch.repeat.CompletionPolicy#isComplete(org.springframework.batch.repeat.RepeatContext, * RepeatStatus) */ + @Override public boolean isComplete(RepeatContext context, RepeatStatus result) { RepeatContext[] contexts = ((CompositeBatchContext) context).contexts; CompletionPolicy[] policies = ((CompositeBatchContext) context).policies; @@ -67,6 +68,7 @@ public class CompositeCompletionPolicy implements CompletionPolicy { * * @see org.springframework.batch.repeat.CompletionPolicy#isComplete(org.springframework.batch.repeat.RepeatContext) */ + @Override public boolean isComplete(RepeatContext context) { RepeatContext[] contexts = ((CompositeBatchContext) context).contexts; CompletionPolicy[] policies = ((CompositeBatchContext) context).policies; @@ -83,6 +85,7 @@ public class CompositeCompletionPolicy implements CompletionPolicy { * * @see org.springframework.batch.repeat.CompletionPolicy#start(RepeatContext) */ + @Override public RepeatContext start(RepeatContext context) { List list = new ArrayList(); for (int i = 0; i < policies.length; i++) { @@ -97,6 +100,7 @@ public class CompositeCompletionPolicy implements CompletionPolicy { * * @see org.springframework.batch.repeat.CompletionPolicy#update(org.springframework.batch.repeat.RepeatContext) */ + @Override public void update(RepeatContext context) { RepeatContext[] contexts = ((CompositeBatchContext) context).contexts; CompletionPolicy[] policies = ((CompositeBatchContext) context).policies; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/CountingCompletionPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/CountingCompletionPolicy.java index 1550118e1..485099cb9 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/CountingCompletionPolicy.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/CountingCompletionPolicy.java @@ -92,6 +92,7 @@ public abstract class CountingCompletionPolicy extends DefaultResultCompletionPo * (non-Javadoc) * @see org.springframework.batch.repeat.policy.CompletionPolicySupport#isComplete(org.springframework.batch.repeat.BatchContext) */ + @Override final public boolean isComplete(RepeatContext context) { int count = ((CountingBatchContext) context).getCounter().getCount(); return count >= maxCount; @@ -101,6 +102,7 @@ public abstract class CountingCompletionPolicy extends DefaultResultCompletionPo * (non-Javadoc) * @see org.springframework.batch.repeat.policy.CompletionPolicySupport#start(org.springframework.batch.repeat.BatchContext) */ + @Override public RepeatContext start(RepeatContext parent) { return new CountingBatchContext(parent); } @@ -109,6 +111,7 @@ public abstract class CountingCompletionPolicy extends DefaultResultCompletionPo * (non-Javadoc) * @see org.springframework.batch.repeat.policy.CompletionPolicySupport#update(org.springframework.batch.repeat.BatchContext) */ + @Override final public void update(RepeatContext context) { super.update(context); int delta = doUpdate(context); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/DefaultResultCompletionPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/DefaultResultCompletionPolicy.java index d0a1ad8f7..dec9ce70d 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/DefaultResultCompletionPolicy.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/DefaultResultCompletionPolicy.java @@ -37,6 +37,7 @@ public class DefaultResultCompletionPolicy extends CompletionPolicySupport { * @see org.springframework.batch.repeat.CompletionPolicy#isComplete(org.springframework.batch.repeat.RepeatContext, * RepeatStatus) */ + @Override public boolean isComplete(RepeatContext context, RepeatStatus result) { return (result == null || !result.isContinuable()); } @@ -46,6 +47,7 @@ public class DefaultResultCompletionPolicy extends CompletionPolicySupport { * * @see org.springframework.batch.repeat.CompletionPolicy#isComplete(org.springframework.batch.repeat.RepeatContext) */ + @Override public boolean isComplete(RepeatContext context) { return false; } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/SimpleCompletionPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/SimpleCompletionPolicy.java index 22bb1b12e..c7fdb8cba 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/SimpleCompletionPolicy.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/policy/SimpleCompletionPolicy.java @@ -56,6 +56,7 @@ public class SimpleCompletionPolicy extends DefaultResultCompletionPolicy { * * @see org.springframework.batch.repeat.CompletionPolicy#start(RepeatContext) */ + @Override public RepeatContext start(RepeatContext context) { return new SimpleTerminationContext(context); } @@ -68,6 +69,7 @@ public class SimpleCompletionPolicy extends DefaultResultCompletionPolicy { * @throws RuntimeException (normally terminating the batch) if the result is * itself an exception. */ + @Override public boolean isComplete(RepeatContext context, RepeatStatus result) { return super.isComplete(context, result) || ((SimpleTerminationContext) context).isComplete(); } @@ -77,6 +79,7 @@ public class SimpleCompletionPolicy extends DefaultResultCompletionPolicy { * * @see org.springframework.batch.repeat.CompletionPolicy#isComplete(RepeatContext) */ + @Override public boolean isComplete(RepeatContext context) { return ((SimpleTerminationContext) context).isComplete(); } @@ -86,6 +89,7 @@ public class SimpleCompletionPolicy extends DefaultResultCompletionPolicy { * * @see org.springframework.batch.repeat.CompletionPolicy#update(RepeatContext) */ + @Override public void update(RepeatContext context) { ((SimpleTerminationContext) context).update(); } @@ -108,6 +112,7 @@ public class SimpleCompletionPolicy extends DefaultResultCompletionPolicy { /* (non-Javadoc) * @see java.lang.Object#toString() */ + @Override public String toString() { return ClassUtils.getShortName(SimpleCompletionPolicy.class)+": chunkSize="+chunkSize; } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatInternalStateSupport.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatInternalStateSupport.java index 16c844e04..cde8c00cf 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatInternalStateSupport.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatInternalStateSupport.java @@ -28,6 +28,7 @@ public class RepeatInternalStateSupport implements RepeatInternalState { /* (non-Javadoc) * @see org.springframework.batch.repeat.support.BatchInternalState#getThrowables() */ + @Override public Collection getThrowables() { return throwables; } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatTemplate.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatTemplate.java index b4f4e38b7..5412304a9 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatTemplate.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/RepeatTemplate.java @@ -132,6 +132,7 @@ public class RepeatTemplate implements RepeatOperations { * * @see org.springframework.batch.repeat.RepeatOperations#iterate(org.springframework.batch.repeat.RepeatCallback) */ + @Override public RepeatStatus iterate(RepeatCallback callback) { RepeatContext outer = RepeatSynchronizationManager.getContext(); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/ResultHolderResultQueue.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/ResultHolderResultQueue.java index 5456e9912..1aecf4f31 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/ResultHolderResultQueue.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/ResultHolderResultQueue.java @@ -51,6 +51,7 @@ public class ResultHolderResultQueue implements ResultQueue { waits = new Semaphore(throttleLimit); } + @Override public boolean isEmpty() { return results.isEmpty(); } @@ -60,6 +61,7 @@ public class ResultHolderResultQueue implements ResultQueue { * * @see org.springframework.batch.repeat.support.ResultQueue#isExpecting() */ + @Override public boolean isExpecting() { // Base the decision about whether we expect more results on a // counter of the number of expected results actually collected. @@ -74,6 +76,7 @@ public class ResultHolderResultQueue implements ResultQueue { * * @see ResultQueue#expect() */ + @Override public void expect() throws InterruptedException { waits.acquire(); // Don't acquire the lock in a synchronized block - might deadlock @@ -82,6 +85,7 @@ public class ResultHolderResultQueue implements ResultQueue { } } + @Override public void put(ResultHolder holder) throws IllegalArgumentException { if (!isExpecting()) { throw new IllegalArgumentException("Not expecting a result. Call expect() before put()."); @@ -115,6 +119,7 @@ public class ResultHolderResultQueue implements ResultQueue { * * @see ResultQueue#take() */ + @Override public ResultHolder take() throws NoSuchElementException, InterruptedException { if (!isExpecting()) { throw new NoSuchElementException("Not expecting a result. Call expect() before take()."); @@ -150,6 +155,7 @@ public class ResultHolderResultQueue implements ResultQueue { * */ private static class ResultHolderComparator implements Comparator { + @Override public int compare(ResultHolder h1, ResultHolder h2) { RepeatStatus result1 = h1.getResult(); RepeatStatus result2 = h2.getResult(); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplate.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplate.java index 521841325..927eceb61 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplate.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplate.java @@ -95,6 +95,7 @@ public class TaskExecutorRepeatTemplate extends RepeatTemplate { * method so there is no need to synchronize access. * */ + @Override protected RepeatStatus getNextResult(RepeatContext context, RepeatCallback callback, RepeatInternalState state) throws Throwable { @@ -153,6 +154,7 @@ public class TaskExecutorRepeatTemplate extends RepeatTemplate { * * @see org.springframework.batch.repeat.support.RepeatTemplate#waitForResults(org.springframework.batch.repeat.support.RepeatInternalState) */ + @Override protected boolean waitForResults(RepeatInternalState state) { ResultQueue queue = ((ResultQueueInternalState) state).getResultQueue(); @@ -191,6 +193,7 @@ public class TaskExecutorRepeatTemplate extends RepeatTemplate { return result; } + @Override protected RepeatInternalState createInternalState(RepeatContext context) { // Queue of pending results: return new ResultQueueInternalState(throttleLimit); @@ -243,6 +246,7 @@ public class TaskExecutorRepeatTemplate extends RepeatTemplate { * * @see java.lang.Runnable#run() */ + @Override public void run() { boolean clearContext = false; try { @@ -276,6 +280,7 @@ public class TaskExecutorRepeatTemplate extends RepeatTemplate { * Get the result - never blocks because the queue manages waiting for * the task to finish. */ + @Override public RepeatStatus getResult() { return result; } @@ -284,6 +289,7 @@ public class TaskExecutorRepeatTemplate extends RepeatTemplate { * Get the error - never blocks because the queue manages waiting for * the task to finish. */ + @Override public Throwable getError() { return error; } @@ -291,6 +297,7 @@ public class TaskExecutorRepeatTemplate extends RepeatTemplate { /** * Getter for the context. */ + @Override public RepeatContext getContext() { return this.context; } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/ThrottleLimitResultQueue.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/ThrottleLimitResultQueue.java index b391e456e..b469d111f 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/ThrottleLimitResultQueue.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/ThrottleLimitResultQueue.java @@ -48,6 +48,7 @@ public class ThrottleLimitResultQueue implements ResultQueue { waits = new Semaphore(throttleLimit); } + @Override public boolean isEmpty() { return results.isEmpty(); } @@ -57,6 +58,7 @@ public class ThrottleLimitResultQueue implements ResultQueue { * * @see org.springframework.batch.repeat.support.ResultQueue#isExpecting() */ + @Override public boolean isExpecting() { // Base the decision about whether we expect more results on a // counter of the number of expected results actually collected. @@ -71,6 +73,7 @@ public class ThrottleLimitResultQueue implements ResultQueue { * * @see ResultQueue#expect() */ + @Override public void expect() throws InterruptedException { synchronized (lock) { waits.acquire(); @@ -78,6 +81,7 @@ public class ThrottleLimitResultQueue implements ResultQueue { } } + @Override public void put(T holder) throws IllegalArgumentException { if (!isExpecting()) { throw new IllegalArgumentException("Not expecting a result. Call expect() before put()."); @@ -89,6 +93,7 @@ public class ThrottleLimitResultQueue implements ResultQueue { waits.release(); } + @Override public T take() throws NoSuchElementException, InterruptedException { if (!isExpecting()) { throw new NoSuchElementException("Not expecting a result. Call expect() before take()."); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/AnnotationMethodResolver.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/AnnotationMethodResolver.java index ea5ace787..eb8ad37e7 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/AnnotationMethodResolver.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/AnnotationMethodResolver.java @@ -64,6 +64,7 @@ public class AnnotationMethodResolver implements MethodResolver { * @throws IllegalArgumentException if more than one Method has the * specified annotation */ + @Override public Method findMethod(Object candidate) { Assert.notNull(candidate, "candidate object must not be null"); Class targetClass = AopUtils.getTargetClass(candidate); @@ -85,10 +86,12 @@ public class AnnotationMethodResolver implements MethodResolver { * @throws IllegalArgumentException if more than one Method has the * specified annotation */ + @Override public Method findMethod(final Class clazz) { Assert.notNull(clazz, "class must not be null"); final AtomicReference annotatedMethod = new AtomicReference(); ReflectionUtils.doWithMethods(clazz, new ReflectionUtils.MethodCallback() { + @Override public void doWith(Method method) throws IllegalArgumentException, IllegalAccessException { Annotation annotation = AnnotationUtils.findAnnotation(method, annotationType); if (annotation != null) { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DefaultPropertyEditorRegistrar.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DefaultPropertyEditorRegistrar.java index 319cea4ca..8ec345cf4 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DefaultPropertyEditorRegistrar.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DefaultPropertyEditorRegistrar.java @@ -45,6 +45,7 @@ public class DefaultPropertyEditorRegistrar implements PropertyEditorRegistrar { * * @see org.springframework.beans.PropertyEditorRegistrar#registerCustomEditors(org.springframework.beans.PropertyEditorRegistry) */ + @Override public void registerCustomEditors(PropertyEditorRegistry registry) { if (this.customEditors != null) { for (Entry, PropertyEditor> entry : customEditors.entrySet()) { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/IntArrayPropertyEditor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/IntArrayPropertyEditor.java index 63a2c2420..1f268d3af 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/IntArrayPropertyEditor.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/IntArrayPropertyEditor.java @@ -22,6 +22,7 @@ import org.springframework.util.StringUtils; public class IntArrayPropertyEditor extends PropertyEditorSupport { + @Override public void setAsText(String text) throws IllegalArgumentException { String[] strs = StringUtils.commaDelimitedListToStringArray(text); int[] value = new int[strs.length]; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/LastModifiedResourceComparator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/LastModifiedResourceComparator.java index e523a4961..593f199ca 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/LastModifiedResourceComparator.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/LastModifiedResourceComparator.java @@ -38,6 +38,7 @@ public class LastModifiedResourceComparator implements Comparator { * * @see Comparator#compare(Object, Object) */ + @Override public int compare(Resource r1, Resource r2) { Assert.isTrue(r1.exists(), "Resource does not exist: " + r1); Assert.isTrue(r2.exists(), "Resource does not exist: " + r2); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/MethodInvokerUtils.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/MethodInvokerUtils.java index e4ecc91cd..fac868f40 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/MethodInvokerUtils.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/MethodInvokerUtils.java @@ -117,6 +117,7 @@ public class MethodInvokerUtils { .getTargetClass() : target.getClass(); if (mi != null) { ReflectionUtils.doWithMethods(targetClass, new ReflectionUtils.MethodCallback() { + @Override public void doWith(Method method) throws IllegalArgumentException, IllegalAccessException { Annotation annotation = AnnotationUtils.findAnnotation(method, annotationType); if (annotation != null) { @@ -163,6 +164,7 @@ public class MethodInvokerUtils { } final AtomicReference annotatedMethod = new AtomicReference(); ReflectionUtils.doWithMethods(targetClass, new ReflectionUtils.MethodCallback() { + @Override public void doWith(Method method) throws IllegalArgumentException, IllegalAccessException { Annotation annotation = AnnotationUtils.findAnnotation(method, annotationType); if (annotation != null) { @@ -192,6 +194,7 @@ public class MethodInvokerUtils { public static MethodInvoker getMethodInvokerForSingleArgument(Object target) { final AtomicReference methodHolder = new AtomicReference(); ReflectionUtils.doWithMethods(target.getClass(), new ReflectionUtils.MethodCallback() { + @Override public void doWith(Method method) throws IllegalArgumentException, IllegalAccessException { if (method.getParameterTypes() == null || method.getParameterTypes().length != 1) { return; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/PatternMatcher.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/PatternMatcher.java index 074983435..3fbfefbd7 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/PatternMatcher.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/PatternMatcher.java @@ -43,6 +43,7 @@ public class PatternMatcher { // Sort keys to start with the most specific sorted = new ArrayList(map.keySet()); Collections.sort(sorted, new Comparator() { + @Override public int compare(String o1, String o2) { String s1 = o1; // .replace('?', '{'); String s2 = o2; // .replace('*', '}'); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/SimpleMethodInvoker.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/SimpleMethodInvoker.java index 83432d3ed..0ad66fda2 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/SimpleMethodInvoker.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/SimpleMethodInvoker.java @@ -81,6 +81,7 @@ public class SimpleMethodInvoker implements MethodInvoker { * org.springframework.batch.core.configuration.util.MethodInvoker#invokeMethod * (java.lang.Object[]) */ + @Override public Object invokeMethod(Object... args) { Class[] parameterTypes = method.getParameterTypes(); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/SystemPropertyInitializer.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/SystemPropertyInitializer.java index 9c3c92ec1..5f9d1070a 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/SystemPropertyInitializer.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/SystemPropertyInitializer.java @@ -61,6 +61,7 @@ public class SystemPropertyInitializer implements InitializingBean { * * @see InitializingBean#afterPropertiesSet() */ + @Override public void afterPropertiesSet() throws Exception { Assert.state(defaultValue != null || System.getProperty(keyName) != null, "Either a default value must be specified or the value should already be set for System property: " diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/transaction/ResourcelessTransactionManager.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/transaction/ResourcelessTransactionManager.java index f130eebbb..9c7278442 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/transaction/ResourcelessTransactionManager.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/transaction/ResourcelessTransactionManager.java @@ -26,14 +26,17 @@ import org.springframework.transaction.support.TransactionSynchronizationManager public class ResourcelessTransactionManager extends AbstractPlatformTransactionManager { + @Override protected void doBegin(Object transaction, TransactionDefinition definition) throws TransactionException { ((ResourcelessTransaction) transaction).begin(); } + @Override protected void doCommit(DefaultTransactionStatus status) throws TransactionException { logger.debug("Committing resourceless transaction on [" + status.getTransaction() + "]"); } + @Override protected Object doGetTransaction() throws TransactionException { Object transaction = new ResourcelessTransaction(); Stack resources; @@ -50,10 +53,12 @@ public class ResourcelessTransactionManager extends AbstractPlatformTransactionM return transaction; } + @Override protected void doRollback(DefaultTransactionStatus status) throws TransactionException { logger.debug("Rolling back resourceless transaction on [" + status.getTransaction() + "]"); } + @Override protected boolean isExistingTransaction(Object transaction) throws TransactionException { if (TransactionSynchronizationManager.hasResource(this)) { @SuppressWarnings("unchecked") @@ -63,9 +68,11 @@ public class ResourcelessTransactionManager extends AbstractPlatformTransactionM return ((ResourcelessTransaction) transaction).isActive(); } + @Override protected void doSetRollbackOnly(DefaultTransactionStatus status) throws TransactionException { } + @Override protected void doCleanupAfterCompletion(Object transaction) { @SuppressWarnings("unchecked") Stack list = (Stack) TransactionSynchronizationManager.getResource(this); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/transaction/TransactionAwareProxyFactory.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/transaction/TransactionAwareProxyFactory.java index c54ac474e..7b18d6ad5 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/transaction/TransactionAwareProxyFactory.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/transaction/TransactionAwareProxyFactory.java @@ -206,6 +206,7 @@ public class TransactionAwareProxyFactory { this.key = key; } + @Override public void afterCompletion(int status) { super.afterCompletion(status); if (status == TransactionSynchronization.STATUS_COMMITTED) { @@ -219,6 +220,7 @@ public class TransactionAwareProxyFactory { private class TransactionAwareInterceptor implements MethodInterceptor { + @Override public Object invoke(MethodInvocation invocation) throws Throwable { if (!TransactionSynchronizationManager.isActualTransactionActive()) { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/AbstractItemStreamItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/AbstractItemStreamItemReaderTests.java index 6fb69b7cd..dac63a0da 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/AbstractItemStreamItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/AbstractItemStreamItemReaderTests.java @@ -23,6 +23,7 @@ public abstract class AbstractItemStreamItemReaderTests extends AbstractItemRead return (ItemStream) tested; } + @Override @Before public void setUp() throws Exception { super.setUp(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ItemReaderTests.java index 4912d56c1..1c5faf4c7 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ItemReaderTests.java @@ -24,6 +24,7 @@ import org.junit.Test; public class ItemReaderTests { ItemReader provider = new ItemReader() { + @Override public String read() { return "foo"; } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ItemRecoveryHandlerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ItemRecoveryHandlerTests.java index ead9b024b..706a197dd 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ItemRecoveryHandlerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ItemRecoveryHandlerTests.java @@ -23,6 +23,7 @@ import junit.framework.TestCase; public class ItemRecoveryHandlerTests extends TestCase { MethodInvocationRecoverer recoverer = new MethodInvocationRecoverer() { + @Override public String recover(Object[] data, Throwable cause) { return null; } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ItemStreamExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ItemStreamExceptionTests.java index d530508df..4c019e0a4 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ItemStreamExceptionTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ItemStreamExceptionTests.java @@ -20,6 +20,7 @@ import org.springframework.batch.support.AbstractExceptionTests; public class ItemStreamExceptionTests extends AbstractExceptionTests { + @Override public Exception getException(String msg) throws Exception { return new ItemStreamException(msg); } @@ -28,6 +29,7 @@ public class ItemStreamExceptionTests extends AbstractExceptionTests { return new ItemStreamException(t); } + @Override public Exception getException(String msg, Throwable t) throws Exception { return new ItemStreamException(msg, t); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/UnexpectedInputExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/UnexpectedInputExceptionTests.java index 5a41ddc84..981ea38df 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/UnexpectedInputExceptionTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/UnexpectedInputExceptionTests.java @@ -20,10 +20,12 @@ import org.springframework.batch.repeat.AbstractExceptionTests; public class UnexpectedInputExceptionTests extends AbstractExceptionTests { + @Override public Exception getException(String msg) throws Exception { return new UnexpectedInputException(msg, null); } + @Override public Exception getException(String msg, Throwable t) throws Exception { return new UnexpectedInputException(msg, t); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/HippyMethodInvokerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/HippyMethodInvokerTests.java index 69d08856e..ccdadd2f6 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/HippyMethodInvokerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/HippyMethodInvokerTests.java @@ -114,6 +114,7 @@ public class HippyMethodInvokerTests { public static class TestMethodAdapter extends AbstractMethodInvokingDelegator implements Service { + @Override public String getMessage(double value, String input) { try { return invokeDelegateMethodWithArguments(new Object[] { value, input }); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/AbstractDatabaseItemStreamItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/AbstractDatabaseItemStreamItemReaderTests.java index 3510bceed..95fa9e37a 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/AbstractDatabaseItemStreamItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/AbstractDatabaseItemStreamItemReaderTests.java @@ -18,12 +18,14 @@ public abstract class AbstractDatabaseItemStreamItemReaderTests extends Abstract protected ClassPathXmlApplicationContext ctx; + @Override @Before public void setUp() throws Exception { initializeContext(); super.setUp(); } + @Override @After public void tearDown() throws Exception { super.tearDown(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/AbstractHibernateCursorItemReaderIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/AbstractHibernateCursorItemReaderIntegrationTests.java index ca3718340..96fed400b 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/AbstractHibernateCursorItemReaderIntegrationTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/AbstractHibernateCursorItemReaderIntegrationTests.java @@ -17,6 +17,7 @@ import org.springframework.orm.hibernate3.LocalSessionFactoryBean; public abstract class AbstractHibernateCursorItemReaderIntegrationTests extends AbstractGenericDataSourceItemReaderIntegrationTests { + @Override protected ItemReader createItemReader() throws Exception { LocalSessionFactoryBean factoryBean = new LocalSessionFactoryBean(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/CompositeKeyFooDao.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/CompositeKeyFooDao.java index 0c9beccfd..cf119f63a 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/CompositeKeyFooDao.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/CompositeKeyFooDao.java @@ -38,12 +38,14 @@ public class CompositeKeyFooDao extends JdbcDaoSupport implements FooDao { /* (non-Javadoc) * @see org.springframework.batch.io.sql.scratch.FooDao#getFoo(java.lang.Object) */ + @Override public Foo getFoo(Object key) { Map keys = (Map)key; Object[] args = keys.values().toArray(); RowMapper fooMapper = new RowMapper(){ + @Override public Object mapRow(ResultSet rs, int rowNum) throws SQLException { Foo foo = new Foo(); foo.setId(rs.getInt(1)); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/ExtendedConnectionDataSourceProxyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/ExtendedConnectionDataSourceProxyTests.java index 0114e5ee2..24c0dfe14 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/ExtendedConnectionDataSourceProxyTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/ExtendedConnectionDataSourceProxyTests.java @@ -198,6 +198,7 @@ public class ExtendedConnectionDataSourceProxyTests { Connection connection = DataSourceUtils.getConnection(csds); csds.startCloseSuppression(connection); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { template.queryForList("select baz from bar"); template.queryForList("select foo from bar"); @@ -205,9 +206,11 @@ public class ExtendedConnectionDataSourceProxyTests { } }); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { template.queryForList("select ham from foo"); tt2.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { template.queryForList("select 1 from eggs"); return null; @@ -218,6 +221,7 @@ public class ExtendedConnectionDataSourceProxyTests { } }); tt.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { template.queryForList("select spam from ham"); return null; @@ -301,30 +305,37 @@ public class ExtendedConnectionDataSourceProxyTests { private static final String UNWRAP_ERROR_MESSAGE = "supplied type is not implemented by this class"; + @Override public Connection getConnection() throws SQLException { throw new UnsupportedOperationException(); } + @Override public Connection getConnection(String username, String password) throws SQLException { throw new UnsupportedOperationException(); } + @Override public PrintWriter getLogWriter() throws SQLException { throw new UnsupportedOperationException(); } + @Override public int getLoginTimeout() throws SQLException { throw new UnsupportedOperationException(); } + @Override public void setLogWriter(PrintWriter out) throws SQLException { throw new UnsupportedOperationException(); } + @Override public void setLoginTimeout(int seconds) throws SQLException { throw new UnsupportedOperationException(); } + @Override public boolean isWrapperFor(Class iface) throws SQLException { if (iface.equals(Supported.class) || (iface.equals(DataSource.class))) { return true; @@ -332,6 +343,7 @@ public class ExtendedConnectionDataSourceProxyTests { return false; } + @Override @SuppressWarnings("unchecked") public T unwrap(Class iface) throws SQLException { if (iface.equals(Supported.class) || iface.equals(DataSource.class)) { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/FooRowMapper.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/FooRowMapper.java index f985ce468..503055661 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/FooRowMapper.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/FooRowMapper.java @@ -9,6 +9,7 @@ import org.springframework.jdbc.core.RowMapper; public class FooRowMapper implements RowMapper { + @Override public Object mapRow(ResultSet rs, int rowNum) throws SQLException { Foo foo = new Foo(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateCursorItemReaderCommonTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateCursorItemReaderCommonTests.java index 04c76a499..027b0fc1e 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateCursorItemReaderCommonTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateCursorItemReaderCommonTests.java @@ -13,6 +13,7 @@ import org.junit.runners.JUnit4; @RunWith(JUnit4.class) public class HibernateCursorItemReaderCommonTests extends AbstractDatabaseItemStreamItemReaderTests { + @Override protected ItemReader getItemReader() throws Exception { SessionFactory sessionFactory = createSessionFactory(); @@ -40,6 +41,7 @@ public class HibernateCursorItemReaderCommonTests extends AbstractDatabaseItemSt } + @Override protected void pointToEmptyInput(ItemReader tested) throws Exception { HibernateCursorItemReader reader = (HibernateCursorItemReader) tested; reader.close(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateCursorItemReaderParametersIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateCursorItemReaderParametersIntegrationTests.java index c23cebde3..ae8c6284b 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateCursorItemReaderParametersIntegrationTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateCursorItemReaderParametersIntegrationTests.java @@ -13,6 +13,7 @@ import org.hibernate.StatelessSession; public class HibernateCursorItemReaderParametersIntegrationTests extends AbstractHibernateCursorItemReaderIntegrationTests { + @Override protected void setQuery(HibernateCursorItemReader reader) { reader.setQueryString("from Foo where name like :name"); reader.setParameterValues(Collections.singletonMap("name", (Object) "bar%")); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateCursorItemReaderStatefulIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateCursorItemReaderStatefulIntegrationTests.java index cf6e5d88b..84c6e404a 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateCursorItemReaderStatefulIntegrationTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateCursorItemReaderStatefulIntegrationTests.java @@ -20,6 +20,7 @@ import org.springframework.batch.item.sample.Foo; */ public class HibernateCursorItemReaderStatefulIntegrationTests extends AbstractHibernateCursorItemReaderIntegrationTests { + @Override protected boolean isUseStatelessSession() { return false; } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernatePagingItemReaderIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernatePagingItemReaderIntegrationTests.java index 69bcb2d94..b3f0adad3 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernatePagingItemReaderIntegrationTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernatePagingItemReaderIntegrationTests.java @@ -17,6 +17,7 @@ import org.springframework.orm.hibernate3.LocalSessionFactoryBean; public class HibernatePagingItemReaderIntegrationTests extends AbstractGenericDataSourceItemReaderIntegrationTests { + @Override protected ItemReader createItemReader() throws Exception { LocalSessionFactoryBean factoryBean = new LocalSessionFactoryBean(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisPagingItemReaderAsyncTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisPagingItemReaderAsyncTests.java index 3edd5d80f..4ef11aa8a 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisPagingItemReaderAsyncTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisPagingItemReaderAsyncTests.java @@ -98,6 +98,7 @@ public class IbatisPagingItemReaderAsyncTests { .newFixedThreadPool(THREAD_COUNT)); for (int i = 0; i < THREAD_COUNT; i++) { completionService.submit(new Callable>() { + @Override public List call() throws Exception { List list = new ArrayList(); Foo next = null; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisPagingItemReaderCommonTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisPagingItemReaderCommonTests.java index d4c34b0c1..8bda98f18 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisPagingItemReaderCommonTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisPagingItemReaderCommonTests.java @@ -13,6 +13,7 @@ import com.ibatis.sqlmap.client.SqlMapClient; @RunWith(JUnit4.class) public class IbatisPagingItemReaderCommonTests extends AbstractDatabaseItemStreamItemReaderTests { + @Override protected ItemReader getItemReader() throws Exception { SqlMapClientFactoryBean factory = new SqlMapClientFactoryBean(); factory.setConfigLocation(new ClassPathResource("ibatis-config.xml", getClass())); @@ -39,6 +40,7 @@ public class IbatisPagingItemReaderCommonTests extends AbstractDatabaseItemStrea return (SqlMapClient) factory.getObject(); } + @Override protected void pointToEmptyInput(ItemReader tested) throws Exception { IbatisPagingItemReader reader = (IbatisPagingItemReader) tested; reader.close(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisPagingItemReaderParameterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisPagingItemReaderParameterTests.java index 0cd545446..265760102 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisPagingItemReaderParameterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/IbatisPagingItemReaderParameterTests.java @@ -15,6 +15,7 @@ import com.ibatis.sqlmap.client.SqlMapClient; @ContextConfiguration(locations = "/org/springframework/batch/item/database/data-source-context.xml") public class IbatisPagingItemReaderParameterTests extends AbstractPagingItemReaderParameterTests { + @Override protected AbstractPagingItemReader getItemReader() throws Exception { SqlMapClientFactoryBean factory = new SqlMapClientFactoryBean(); factory.setConfigLocation(new ClassPathResource("ibatis-config.xml", getClass())); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcBatchItemWriterClassicTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcBatchItemWriterClassicTests.java index 508f69814..3fb807c38 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcBatchItemWriterClassicTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcBatchItemWriterClassicTests.java @@ -51,6 +51,7 @@ public class JdbcBatchItemWriterClassicTests { public void setUp() throws Exception { ps = createMock(PreparedStatement.class); jdbcTemplate = new JdbcTemplate() { + @Override public Object execute(String sql, PreparedStatementCallback action) throws DataAccessException { list.add(sql); try { @@ -64,6 +65,7 @@ public class JdbcBatchItemWriterClassicTests { writer.setSql("SQL"); writer.setJdbcTemplate(new NamedParameterJdbcTemplate(jdbcTemplate)); writer.setItemPreparedStatementSetter(new ItemPreparedStatementSetter() { + @Override public void setValues(String item, PreparedStatement ps) throws SQLException { list.add(item); } @@ -111,6 +113,7 @@ public class JdbcBatchItemWriterClassicTests { } writer.setItemPreparedStatementSetter( new ItemPreparedStatementSetter() { + @Override public void setValues(String item, PreparedStatement ps) throws SQLException { } @@ -153,6 +156,7 @@ public class JdbcBatchItemWriterClassicTests { public void testWriteAndFlushWithFailure() throws Exception { final RuntimeException ex = new RuntimeException("bar"); writer.setItemPreparedStatementSetter(new ItemPreparedStatementSetter() { + @Override public void setValues(String item, PreparedStatement ps) throws SQLException { list.add(item); throw ex; @@ -171,6 +175,7 @@ public class JdbcBatchItemWriterClassicTests { } assertEquals(2, list.size()); writer.setItemPreparedStatementSetter(new ItemPreparedStatementSetter() { + @Override public void setValues(String item, PreparedStatement ps) throws SQLException { list.add(item); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcBatchItemWriterNamedParameterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcBatchItemWriterNamedParameterTests.java index f3f2f758d..a195d0d8e 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcBatchItemWriterNamedParameterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcBatchItemWriterNamedParameterTests.java @@ -178,6 +178,7 @@ public class JdbcBatchItemWriterNamedParameterTests { this.expected = expected; } + @Override public boolean matches(Object actual) { if (!(actual instanceof SqlParameterSource[])) { return false; @@ -194,6 +195,7 @@ public class JdbcBatchItemWriterNamedParameterTests { return true; } + @Override public void appendTo(StringBuffer buffer) { buffer.append("eqSqlParameterSourceArray("); buffer.append(expected.getClass().getName()); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderCommonTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderCommonTests.java index c33443f3c..beff99fb9 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderCommonTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderCommonTests.java @@ -11,6 +11,7 @@ import org.springframework.batch.item.sample.Foo; @RunWith(JUnit4.class) public class JdbcCursorItemReaderCommonTests extends AbstractDatabaseItemStreamItemReaderTests { + @Override protected ItemReader getItemReader() throws Exception { JdbcCursorItemReader result = new JdbcCursorItemReader(); @@ -38,6 +39,7 @@ public class JdbcCursorItemReaderCommonTests extends AbstractDatabaseItemStreamI testRestart(); } + @Override protected void pointToEmptyInput(ItemReader tested) throws Exception { JdbcCursorItemReader reader = (JdbcCursorItemReader) tested; reader.close(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderConfigTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderConfigTests.java index d5e898710..5d6346aa0 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderConfigTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderConfigTests.java @@ -49,6 +49,7 @@ public class JdbcCursorItemReaderConfigTests { final ExecutionContext ec = new ExecutionContext(); tt.execute( new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { reader.open(ec); reader.close(); @@ -81,6 +82,7 @@ public class JdbcCursorItemReaderConfigTests { final ExecutionContext ec = new ExecutionContext(); tt.execute( new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { reader.open(ec); reader.close(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderIntegrationTests.java index f2d4df3e4..7db814b48 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderIntegrationTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderIntegrationTests.java @@ -13,6 +13,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) public class JdbcCursorItemReaderIntegrationTests extends AbstractGenericDataSourceItemReaderIntegrationTests { + @Override protected ItemReader createItemReader() throws Exception { JdbcCursorItemReader result = new JdbcCursorItemReader(); result.setDataSource(dataSource); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderAsyncTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderAsyncTests.java index e50e5c648..c85c64559 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderAsyncTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderAsyncTests.java @@ -106,6 +106,7 @@ public class JdbcPagingItemReaderAsyncTests { .newFixedThreadPool(THREAD_COUNT)); for (int i = 0; i < THREAD_COUNT; i++) { completionService.submit(new Callable>() { + @Override public List call() throws Exception { List list = new ArrayList(); Foo next = null; @@ -147,6 +148,7 @@ public class JdbcPagingItemReaderAsyncTests { queryProvider.setSortKeys(sortKeys); reader.setQueryProvider(queryProvider); reader.setRowMapper(new ParameterizedRowMapper() { + @Override public Foo mapRow(ResultSet rs, int i) throws SQLException { Foo foo = new Foo(); foo.setId(rs.getInt(1)); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderClassicParameterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderClassicParameterTests.java index 24f133fd8..8f6bcbcd6 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderClassicParameterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderClassicParameterTests.java @@ -38,6 +38,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @ContextConfiguration(locations = "/org/springframework/batch/item/database/JdbcPagingItemReaderParameterTests-context.xml") public class JdbcPagingItemReaderClassicParameterTests extends AbstractPagingItemReaderParameterTests { + @Override protected AbstractPagingItemReader getItemReader() throws Exception { JdbcPagingItemReader reader = new JdbcPagingItemReader(); @@ -53,6 +54,7 @@ public class JdbcPagingItemReaderClassicParameterTests extends AbstractPagingIte reader.setQueryProvider(queryProvider); reader.setRowMapper( new ParameterizedRowMapper() { + @Override public Foo mapRow(ResultSet rs, int i) throws SQLException { Foo foo = new Foo(); foo.setId(rs.getInt(1)); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderCommonTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderCommonTests.java index f13e8545f..8950badab 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderCommonTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderCommonTests.java @@ -45,6 +45,7 @@ public class JdbcPagingItemReaderCommonTests extends AbstractItemStreamItemReade @Autowired private DataSource dataSource; + @Override protected ItemReader getItemReader() throws Exception { JdbcPagingItemReader reader = new JdbcPagingItemReader(); @@ -58,6 +59,7 @@ public class JdbcPagingItemReaderCommonTests extends AbstractItemStreamItemReade reader.setQueryProvider(queryProvider); reader.setRowMapper( new ParameterizedRowMapper() { + @Override public Foo mapRow(ResultSet rs, int i) throws SQLException { Foo foo = new Foo(); foo.setId(rs.getInt(1)); @@ -74,6 +76,7 @@ public class JdbcPagingItemReaderCommonTests extends AbstractItemStreamItemReade return reader; } + @Override protected void pointToEmptyInput(ItemReader tested) throws Exception { JdbcPagingItemReader reader = (JdbcPagingItemReader) tested; reader.close(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderIntegrationTests.java index 011023716..02e23040d 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderIntegrationTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderIntegrationTests.java @@ -33,6 +33,7 @@ import org.springframework.jdbc.core.simple.ParameterizedRowMapper; */ public class JdbcPagingItemReaderIntegrationTests extends AbstractGenericDataSourceItemReaderIntegrationTests { + @Override protected ItemReader createItemReader() throws Exception { JdbcPagingItemReader inputSource = new JdbcPagingItemReader(); @@ -46,6 +47,7 @@ public class JdbcPagingItemReaderIntegrationTests extends AbstractGenericDataSou inputSource.setQueryProvider(queryProvider); inputSource.setRowMapper( new ParameterizedRowMapper() { + @Override public Foo mapRow(ResultSet rs, int i) throws SQLException { Foo foo = new Foo(); foo.setId(rs.getInt(1)); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderNamedParameterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderNamedParameterTests.java index f0a0cc297..a78fa9956 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderNamedParameterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderNamedParameterTests.java @@ -37,6 +37,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @ContextConfiguration(locations = "/org/springframework/batch/item/database/JdbcPagingItemReaderParameterTests-context.xml") public class JdbcPagingItemReaderNamedParameterTests extends AbstractPagingItemReaderParameterTests { + @Override protected AbstractPagingItemReader getItemReader() throws Exception { JdbcPagingItemReader reader = new JdbcPagingItemReader(); @@ -52,6 +53,7 @@ public class JdbcPagingItemReaderNamedParameterTests extends AbstractPagingItemR reader.setQueryProvider(queryProvider); reader.setRowMapper( new ParameterizedRowMapper() { + @Override public Foo mapRow(ResultSet rs, int i) throws SQLException { Foo foo = new Foo(); foo.setId(rs.getInt(1)); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderOrderIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderOrderIntegrationTests.java index 0cfeb996d..0839197dd 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderOrderIntegrationTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderOrderIntegrationTests.java @@ -33,6 +33,7 @@ import org.springframework.jdbc.core.simple.ParameterizedRowMapper; */ public class JdbcPagingItemReaderOrderIntegrationTests extends AbstractGenericDataSourceItemReaderIntegrationTests { + @Override protected ItemReader createItemReader() throws Exception { JdbcPagingItemReader inputSource = new JdbcPagingItemReader(); @@ -47,6 +48,7 @@ public class JdbcPagingItemReaderOrderIntegrationTests extends AbstractGenericDa inputSource.setQueryProvider(queryProvider); inputSource.setRowMapper( new ParameterizedRowMapper() { + @Override public Foo mapRow(ResultSet rs, int i) throws SQLException { Foo foo = new Foo(); foo.setId(rs.getInt(1)); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderAsyncTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderAsyncTests.java index ca09e3893..3e1ce4ba1 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderAsyncTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderAsyncTests.java @@ -99,6 +99,7 @@ public class JpaPagingItemReaderAsyncTests { .newFixedThreadPool(THREAD_COUNT)); for (int i = 0; i < THREAD_COUNT; i++) { completionService.submit(new Callable>() { + @Override public List call() throws Exception { List list = new ArrayList(); Foo next = null; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderCommonTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderCommonTests.java index af7e757fc..547aaaa5c 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderCommonTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderCommonTests.java @@ -18,6 +18,7 @@ public class JpaPagingItemReaderCommonTests extends AbstractItemStreamItemReader @Autowired private EntityManagerFactory entityManagerFactory; + @Override protected ItemReader getItemReader() throws Exception { String jpqlQuery = "select f from Foo f"; @@ -32,6 +33,7 @@ public class JpaPagingItemReaderCommonTests extends AbstractItemStreamItemReader return reader; } + @Override protected void pointToEmptyInput(ItemReader tested) throws Exception { JpaPagingItemReader reader = (JpaPagingItemReader) tested; reader.close(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderIntegrationTests.java index 2a3ba3139..eb7ade626 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderIntegrationTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderIntegrationTests.java @@ -16,6 +16,7 @@ import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; */ public class JpaPagingItemReaderIntegrationTests extends AbstractGenericDataSourceItemReaderIntegrationTests { + @Override protected ItemReader createItemReader() throws Exception { LocalContainerEntityManagerFactoryBean factoryBean = new LocalContainerEntityManagerFactoryBean(); factoryBean.setDataSource(dataSource); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderNativeQueryIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderNativeQueryIntegrationTests.java index 292117208..cf01a2b96 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderNativeQueryIntegrationTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderNativeQueryIntegrationTests.java @@ -22,6 +22,7 @@ public class JpaPagingItemReaderNativeQueryIntegrationTests extends AbstractPagi @Autowired private EntityManagerFactory entityManagerFactory; + @Override protected AbstractPagingItemReader getItemReader() throws Exception { String sqlQuery = "select * from T_FOOS where value >= :limit"; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderParameterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderParameterTests.java index 32814b8be..ab407cbaa 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderParameterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderParameterTests.java @@ -17,6 +17,7 @@ public class JpaPagingItemReaderParameterTests extends AbstractPagingItemReaderP @Autowired private EntityManagerFactory entityManagerFactory; + @Override protected AbstractPagingItemReader getItemReader() throws Exception { String jpqlQuery = "select f from Foo f where f.value >= :limit"; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/SingleKeyFooDao.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/SingleKeyFooDao.java index 2cc2f2ec9..0004a8a67 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/SingleKeyFooDao.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/SingleKeyFooDao.java @@ -9,9 +9,11 @@ import org.springframework.jdbc.core.support.JdbcDaoSupport; public class SingleKeyFooDao extends JdbcDaoSupport implements FooDao { + @Override public Foo getFoo(Object key){ RowMapper fooMapper = new RowMapper(){ + @Override public Object mapRow(ResultSet rs, int rowNum) throws SQLException { Foo foo = new Foo(); foo.setId(rs.getInt(1)); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/StoredProcedureItemReaderCommonTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/StoredProcedureItemReaderCommonTests.java index f23009730..2fc9b45e6 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/StoredProcedureItemReaderCommonTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/StoredProcedureItemReaderCommonTests.java @@ -18,6 +18,7 @@ import org.springframework.jdbc.core.SqlParameter; @RunWith(JUnit4.class) public class StoredProcedureItemReaderCommonTests extends AbstractDatabaseItemStreamItemReaderTests { + @Override protected ItemReader getItemReader() throws Exception { StoredProcedureItemReader result = new StoredProcedureItemReader(); result.setDataSource(getDataSource()); @@ -28,6 +29,7 @@ public class StoredProcedureItemReaderCommonTests extends AbstractDatabaseItemSt return result; } + @Override protected void initializeContext() throws Exception { ctx = new ClassPathXmlApplicationContext("org/springframework/batch/item/database/stored-procedure-context.xml"); } @@ -43,6 +45,7 @@ public class StoredProcedureItemReaderCommonTests extends AbstractDatabaseItemSt testRestart(); } + @Override protected void pointToEmptyInput(ItemReader tested) throws Exception { StoredProcedureItemReader reader = (StoredProcedureItemReader) tested; reader.close(); @@ -55,6 +58,7 @@ public class StoredProcedureItemReaderCommonTests extends AbstractDatabaseItemSt }); reader.setPreparedStatementSetter( new PreparedStatementSetter() { + @Override public void setValues(PreparedStatement ps) throws SQLException { ps.setInt(1, 1000); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/StoredprocedureItemReaderConfigTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/StoredprocedureItemReaderConfigTests.java index da4b89fc5..26c2bedfd 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/StoredprocedureItemReaderConfigTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/StoredprocedureItemReaderConfigTests.java @@ -59,6 +59,7 @@ public class StoredprocedureItemReaderConfigTests { final ExecutionContext ec = new ExecutionContext(); tt.execute( new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { reader.open(ec); reader.close(); @@ -95,6 +96,7 @@ public class StoredprocedureItemReaderConfigTests { final ExecutionContext ec = new ExecutionContext(); tt.execute( new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { reader.open(ec); reader.close(); @@ -133,6 +135,7 @@ public class StoredprocedureItemReaderConfigTests { new SqlParameter("bar", Types.OTHER)}); reader.setPreparedStatementSetter( new PreparedStatementSetter() { + @Override public void setValues(PreparedStatement ps) throws SQLException { } @@ -141,6 +144,7 @@ public class StoredprocedureItemReaderConfigTests { final ExecutionContext ec = new ExecutionContext(); tt.execute( new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { reader.open(ec); reader.close(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/ColumnMapExecutionContextRowMapperTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/ColumnMapExecutionContextRowMapperTests.java index 75de07fcc..1df7f1020 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/ColumnMapExecutionContextRowMapperTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/ColumnMapExecutionContextRowMapperTests.java @@ -23,6 +23,7 @@ public class ColumnMapExecutionContextRowMapperTests extends TestCase { private PreparedStatement ps; + @Override protected void setUp() throws Exception { super.setUp(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/DefaultDataFieldMaxValueIncrementerFactoryTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/DefaultDataFieldMaxValueIncrementerFactoryTests.java index 3eb51f1bf..9e4782545 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/DefaultDataFieldMaxValueIncrementerFactoryTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/DefaultDataFieldMaxValueIncrementerFactoryTests.java @@ -41,6 +41,7 @@ public class DefaultDataFieldMaxValueIncrementerFactoryTests extends TestCase { /* (non-Javadoc) * @see junit.framework.TestCase#setUp() */ + @Override protected void setUp() throws Exception { super.setUp(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/SqlPagingQueryUtilsTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/SqlPagingQueryUtilsTests.java index 736b17807..0acb9db46 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/SqlPagingQueryUtilsTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/support/SqlPagingQueryUtilsTests.java @@ -183,14 +183,17 @@ public class SqlPagingQueryUtilsTests { setSortKeys(sortKeys); } + @Override public String generateFirstPageQuery(int pageSize) { return null; } + @Override public String generateRemainingPagesQuery(int pageSize) { return null; } + @Override public String generateJumpToItemQuery(int itemIndex, int pageSize) { return null; } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderCommonTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderCommonTests.java index 19412e98a..00afeb397 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderCommonTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderCommonTests.java @@ -20,6 +20,7 @@ public class FlatFileItemReaderCommonTests extends AbstractItemStreamItemReaderT Resource resource = new ByteArrayResource(FOOS.getBytes()); tested.setResource(resource); tested.setLineMapper(new LineMapper() { + @Override public Foo mapLine(String line, int lineNumber) { Foo foo = new Foo(); foo.setValue(Integer.valueOf(line.trim())); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderTests.java index 62ea8e522..4a78d67f1 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemReaderTests.java @@ -48,15 +48,18 @@ public class FlatFileItemReaderTests { // 1 record = 2 lines boolean pair = true; + @Override public boolean isEndOfRecord(String line) { pair = !pair; return pair; } + @Override public String postProcess(String record) { return record; } + @Override public String preProcess(String record) { return record; } @@ -83,15 +86,18 @@ public class FlatFileItemReaderTests { // 1 record = 2 lines boolean pair = true; + @Override public boolean isEndOfRecord(String line) { pair = !pair; return pair; } + @Override public String postProcess(String record) { return record; } + @Override public String preProcess(String record) { return record; } @@ -119,14 +125,17 @@ public class FlatFileItemReaderTests { reader.setRecordSeparatorPolicy(new RecordSeparatorPolicy() { + @Override public boolean isEndOfRecord(String line) { return StringUtils.hasText(line); } + @Override public String postProcess(String record) { return StringUtils.hasText(record) ? record : null; } + @Override public String preProcess(String record) { return record; } @@ -150,6 +159,7 @@ public class FlatFileItemReaderTests { // 1 record = 2 lines boolean pair = true; + @Override public boolean isEndOfRecord(String line) { if (StringUtils.hasText(line)) { pair = !pair; @@ -157,10 +167,12 @@ public class FlatFileItemReaderTests { return pair; } + @Override public String postProcess(String record) { return StringUtils.hasText(record) ? record : null; } + @Override public String preProcess(String record) { return record; } @@ -305,14 +317,17 @@ public class FlatFileItemReaderTests { public void testOpenBadIOInput() throws Exception { reader.setResource(new AbstractResource() { + @Override public String getDescription() { return null; } + @Override public InputStream getInputStream() throws IOException { throw new IOException(); } + @Override public boolean exists() { return true; } @@ -387,6 +402,7 @@ public class FlatFileItemReaderTests { @Test public void testMappingExceptionWrapping() throws Exception { LineMapper exceptionLineMapper = new LineMapper() { + @Override public String mapLine(String line, int lineNumber) throws Exception { if (lineNumber == 2) { throw new Exception("Couldn't map line 2"); @@ -421,14 +437,17 @@ public class FlatFileItemReaderTests { public NonExistentResource() { } + @Override public boolean exists() { return false; } + @Override public String getDescription() { return "NonExistentResource"; } + @Override public InputStream getInputStream() throws IOException { return null; } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemWriterTests.java index 057294878..875587cba 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemWriterTests.java @@ -231,6 +231,7 @@ public class FlatFileItemWriterTests { @Test public void testWriteWithConverter() throws Exception { writer.setLineAggregator(new LineAggregator() { + @Override public String aggregate(String item) { return "FOO:" + item; } @@ -251,6 +252,7 @@ public class FlatFileItemWriterTests { @Test public void testWriteWithConverterAndString() throws Exception { writer.setLineAggregator(new LineAggregator() { + @Override public String aggregate(String item) { return "FOO:" + item; } @@ -288,6 +290,7 @@ public class FlatFileItemWriterTests { writer.setFooterCallback(new FlatFileFooterCallback() { + @Override public void writeFooter(Writer writer) throws IOException { writer.write("footer"); } @@ -342,6 +345,7 @@ public class FlatFileItemWriterTests { writer.open(executionContext); new TransactionTemplate(transactionManager).execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { try { writer.write(Collections.singletonList(TEST_STRING)); @@ -362,6 +366,7 @@ public class FlatFileItemWriterTests { writer.setFooterCallback(new FlatFileFooterCallback() { + @Override public void writeFooter(Writer writer) throws IOException { writer.write("footer"); } @@ -373,6 +378,7 @@ public class FlatFileItemWriterTests { PlatformTransactionManager transactionManager = new ResourcelessTransactionManager(); new TransactionTemplate(transactionManager).execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { try { // write some lines @@ -395,6 +401,7 @@ public class FlatFileItemWriterTests { writer.open(executionContext); new TransactionTemplate(transactionManager).execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { try { // write more lines @@ -507,6 +514,7 @@ public class FlatFileItemWriterTests { public void testWriteFooter() throws Exception { writer.setFooterCallback(new FlatFileFooterCallback() { + @Override public void writeFooter(Writer writer) throws IOException { writer.write("a\nb"); } @@ -524,6 +532,7 @@ public class FlatFileItemWriterTests { public void testWriteHeader() throws Exception { writer.setHeaderCallback(new FlatFileHeaderCallback() { + @Override public void writeHeader(Writer writer) throws IOException { writer.write("a\nb"); } @@ -543,6 +552,7 @@ public class FlatFileItemWriterTests { @Test public void testWriteWithAppendAfterHeaders() throws Exception { writer.setHeaderCallback(new FlatFileHeaderCallback() { + @Override public void writeHeader(Writer writer) throws IOException { writer.write("a\nb"); } @@ -568,6 +578,7 @@ public class FlatFileItemWriterTests { public void testWriteHeaderAndDeleteOnExit() throws Exception { writer.setHeaderCallback(new FlatFileHeaderCallback() { + @Override public void writeHeader(Writer writer) throws IOException { writer.write("a\nb"); } @@ -596,6 +607,7 @@ public class FlatFileItemWriterTests { public void testWriteHeaderAfterRestartOnFirstChunk() throws Exception { writer.setHeaderCallback(new FlatFileHeaderCallback() { + @Override public void writeHeader(Writer writer) throws IOException { writer.write("a\nb"); } @@ -621,6 +633,7 @@ public class FlatFileItemWriterTests { public void testWriteHeaderAfterRestartOnSecondChunk() throws Exception { writer.setHeaderCallback(new FlatFileHeaderCallback() { + @Override public void writeHeader(Writer writer) throws IOException { writer.write("a\nb"); } @@ -659,6 +672,7 @@ public class FlatFileItemWriterTests { writer.setLineAggregator(new LineAggregator() { + @Override public String aggregate(String item) { if (item.equals("2")) { throw new RuntimeException("aggregation failed on " + item); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileParseExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileParseExceptionTests.java index 40f31e679..fe21a4f47 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileParseExceptionTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileParseExceptionTests.java @@ -21,10 +21,12 @@ import org.springframework.batch.support.AbstractExceptionTests; public class FlatFileParseExceptionTests extends AbstractExceptionTests { + @Override public Exception getException(String msg) throws Exception { return new FlatFileParseException(msg, "bar"); } + @Override public Exception getException(String msg, Throwable t) throws Exception { return new FlatFileParseException(msg, t, "bar", 100); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderFlatFileTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderFlatFileTests.java index d9179e59e..46769d2b0 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderFlatFileTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderFlatFileTests.java @@ -15,6 +15,7 @@ import org.springframework.core.io.Resource; public class MultiResourceItemReaderFlatFileTests extends AbstractItemStreamItemReaderTests { + @Override protected ItemReader getItemReader() throws Exception { MultiResourceItemReader multiReader = new MultiResourceItemReader(); @@ -22,6 +23,7 @@ public class MultiResourceItemReaderFlatFileTests extends fileReader.setLineMapper(new LineMapper() { + @Override public Foo mapLine(String line, int lineNumber) throws Exception { Foo foo = new Foo(); foo.setValue(Integer.valueOf(line)); @@ -41,6 +43,7 @@ public class MultiResourceItemReaderFlatFileTests extends multiReader.setResources(new Resource[] { r1, r2, r3, r4 }); multiReader.setSaveState(true); multiReader.setComparator(new Comparator() { + @Override public int compare(Resource arg0, Resource arg1) { return 0; // preserve original ordering } @@ -50,6 +53,7 @@ public class MultiResourceItemReaderFlatFileTests extends return multiReader; } + @Override protected void pointToEmptyInput(ItemReader tested) throws Exception { MultiResourceItemReader multiReader = (MultiResourceItemReader) tested; multiReader.close(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderIntegrationTests.java index 369c11441..05f98fb29 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderIntegrationTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderIntegrationTests.java @@ -53,6 +53,7 @@ public class MultiResourceItemReaderIntegrationTests { tested.setDelegate(itemReader); tested.setComparator(new Comparator() { + @Override public int compare(Resource o1, Resource o2) { return 0; // do not change ordering } @@ -226,6 +227,7 @@ public class MultiResourceItemReaderIntegrationTests { /** * Reversed ordering by filename. */ + @Override public int compare(Resource o1, Resource o2) { Resource r1 = (Resource) o1; Resource r2 = (Resource) o2; @@ -294,10 +296,12 @@ public class MultiResourceItemReaderIntegrationTests { Resource badResource = new AbstractResource() { + @Override public InputStream getInputStream() throws IOException { throw new RuntimeException(); } + @Override public String getDescription() { return null; } @@ -325,10 +329,12 @@ public class MultiResourceItemReaderIntegrationTests { Resource badResource = new AbstractResource() { + @Override public InputStream getInputStream() throws IOException { throw new RuntimeException(); } + @Override public String getDescription() { return null; } @@ -353,16 +359,19 @@ public class MultiResourceItemReaderIntegrationTests { Resource badResource = new AbstractResource() { + @Override public boolean exists() { // Looks good ... return true; } + @Override public InputStream getInputStream() throws IOException { // ... but fails during read throw new RuntimeException(); } + @Override public String getDescription() { return null; } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderResourceAwareTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderResourceAwareTests.java index 8d6e9a6c1..4e85bc437 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderResourceAwareTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderResourceAwareTests.java @@ -52,6 +52,7 @@ public class MultiResourceItemReaderResourceAwareTests { tested.setDelegate(itemReader); tested.setComparator(new Comparator() { + @Override public int compare(Resource o1, Resource o2) { return 0; // do not change ordering } @@ -87,6 +88,7 @@ public class MultiResourceItemReaderResourceAwareTests { } static final class FooLineMapper implements LineMapper { + @Override public Foo mapLine(String line, int lineNumber) throws Exception { return new Foo(line); } @@ -101,6 +103,7 @@ public class MultiResourceItemReaderResourceAwareTests { this.value = value; } + @Override public void setResource(Resource resource) { this.resource = resource; } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderXmlTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderXmlTests.java index 38d76ac40..0aa09ba1e 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderXmlTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemReaderXmlTests.java @@ -26,6 +26,7 @@ import org.springframework.oxm.XmlMappingException; @RunWith(JUnit4.class) public class MultiResourceItemReaderXmlTests extends AbstractItemStreamItemReaderTests { + @Override protected ItemReader getItemReader() throws Exception { MultiResourceItemReader multiReader = new MultiResourceItemReader(); @@ -33,6 +34,7 @@ public class MultiResourceItemReaderXmlTests extends AbstractItemStreamItemReade reader.setFragmentRootElementName("foo"); reader.setUnmarshaller(new Unmarshaller() { + @Override public Object unmarshal(Source source) throws XmlMappingException, IOException { @@ -51,6 +53,7 @@ public class MultiResourceItemReaderXmlTests extends AbstractItemStreamItemReade return foo; } + @Override @SuppressWarnings("rawtypes") public boolean supports(Class clazz) { return true; @@ -69,6 +72,7 @@ public class MultiResourceItemReaderXmlTests extends AbstractItemStreamItemReade multiReader.setResources(new Resource[] { r1, r2, r3, r4 }); multiReader.setSaveState(true); multiReader.setComparator(new Comparator() { + @Override public int compare(Resource arg0, Resource arg1) { return 0; // preserve original ordering } @@ -77,6 +81,7 @@ public class MultiResourceItemReaderXmlTests extends AbstractItemStreamItemReade return multiReader; } + @Override protected void pointToEmptyInput(ItemReader tested) throws Exception { MultiResourceItemReader multiReader = (MultiResourceItemReader) tested; multiReader.close(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemWriterFlatFileTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemWriterFlatFileTests.java index a53f31db2..20a93ea33 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemWriterFlatFileTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemWriterFlatFileTests.java @@ -35,6 +35,7 @@ public class MultiResourceItemWriterFlatFileTests extends AbstractMultiResourceI this.list = list; } + @Override public Object doInTransaction(TransactionStatus status) { try { tested.write(list); @@ -98,6 +99,7 @@ public class MultiResourceItemWriterFlatFileTests extends AbstractMultiResourceI public void testMultiResourceWriteScenarioWithFooter() throws Exception { delegate.setFooterCallback(new FlatFileFooterCallback() { + @Override public void writeFooter(Writer writer) throws IOException { writer.write("f"); } @@ -124,6 +126,7 @@ public class MultiResourceItemWriterFlatFileTests extends AbstractMultiResourceI public void testTransactionalMultiResourceWriteScenarioWithFooter() throws Exception { delegate.setFooterCallback(new FlatFileFooterCallback() { + @Override public void writeFooter(Writer writer) throws IOException { writer.write("f"); } @@ -181,6 +184,7 @@ public class MultiResourceItemWriterFlatFileTests extends AbstractMultiResourceI public void testRestartWithFooter() throws Exception { delegate.setFooterCallback(new FlatFileFooterCallback() { + @Override public void writeFooter(Writer writer) throws IOException { writer.write("f"); } @@ -215,6 +219,7 @@ public class MultiResourceItemWriterFlatFileTests extends AbstractMultiResourceI public void testTransactionalRestartWithFooter() throws Exception { delegate.setFooterCallback(new FlatFileFooterCallback() { + @Override public void writeFooter(Writer writer) throws IOException { writer.write("f"); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemWriterXmlTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemWriterXmlTests.java index 2f06d8d16..af2ed8cfc 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemWriterXmlTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/MultiResourceItemWriterXmlTests.java @@ -41,6 +41,7 @@ public class MultiResourceItemWriterXmlTests extends AbstractMultiResourceItemWr */ private static class SimpleMarshaller implements Marshaller { + @Override public void marshal(Object graph, Result result) throws XmlMappingException, IOException { Assert.isInstanceOf(Result.class, result); @@ -57,6 +58,7 @@ public class MultiResourceItemWriterXmlTests extends AbstractMultiResourceItemWr } } + @Override @SuppressWarnings("rawtypes") public boolean supports(Class clazz) { return true; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapperConcurrentTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapperConcurrentTests.java index c47265547..d8b10d434 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapperConcurrentTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapperConcurrentTests.java @@ -45,6 +45,7 @@ public class BeanWrapperFieldSetMapperConcurrentTests { Collection> results = new ArrayList>(); for (int i = 0; i < 10; i++) { Future result = executorService.submit(new Callable() { + @Override public Boolean call() throws Exception { for (int i = 0; i < 10; i++) { GreenBean bean = mapper.mapFieldSet(lineTokenizer.tokenize("blue,green")); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/PatternMatchingCompositeLineMapperTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/PatternMatchingCompositeLineMapperTests.java index b3dafd3dd..7aa2e5ee3 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/PatternMatchingCompositeLineMapperTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/PatternMatchingCompositeLineMapperTests.java @@ -50,11 +50,13 @@ public class PatternMatchingCompositeLineMapperTests { public void testKeyFound() throws Exception { Map tokenizers = new HashMap(); tokenizers.put("foo*", new LineTokenizer() { + @Override public FieldSet tokenize(String line) { return new DefaultFieldSet(new String[] { "a", "b" }); } }); tokenizers.put("bar*", new LineTokenizer() { + @Override public FieldSet tokenize(String line) { return new DefaultFieldSet(new String[] { "c", "d" }); } @@ -63,11 +65,13 @@ public class PatternMatchingCompositeLineMapperTests { Map> fieldSetMappers = new HashMap>(); fieldSetMappers.put("foo*", new FieldSetMapper() { + @Override public Name mapFieldSet(FieldSet fs) { return new Name(fs.readString(0), fs.readString(1), 0); } }); fieldSetMappers.put("bar*", new FieldSetMapper() { + @Override public Name mapFieldSet(FieldSet fs) { return new Name(fs.readString(1), fs.readString(0), 0); } @@ -82,11 +86,13 @@ public class PatternMatchingCompositeLineMapperTests { public void testMapperKeyNotFound() throws Exception { Map tokenizers = new HashMap(); tokenizers.put("foo*", new LineTokenizer() { + @Override public FieldSet tokenize(String line) { return new DefaultFieldSet(new String[] { "a", "b" }); } }); tokenizers.put("bar*", new LineTokenizer() { + @Override public FieldSet tokenize(String line) { return new DefaultFieldSet(new String[] { "c", "d" }); } @@ -95,6 +101,7 @@ public class PatternMatchingCompositeLineMapperTests { Map> fieldSetMappers = new HashMap>(); fieldSetMappers.put("foo*", new FieldSetMapper() { + @Override public Name mapFieldSet(FieldSet fs) { return new Name(fs.readString(0), fs.readString(1), 0); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/CommonLineTokenizerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/CommonLineTokenizerTests.java index 4ad3e525f..5528a0c56 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/CommonLineTokenizerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/CommonLineTokenizerTests.java @@ -17,6 +17,7 @@ public class CommonLineTokenizerTests extends TestCase { */ public void testHasNames() { AbstractLineTokenizer tokenizer = new AbstractLineTokenizer() { + @Override protected List doTokenize(String line) { return null; } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/DelimitedLineAggregatorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/DelimitedLineAggregatorTests.java index c390e6c7c..47b975196 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/DelimitedLineAggregatorTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/DelimitedLineAggregatorTests.java @@ -29,6 +29,7 @@ public class DelimitedLineAggregatorTests { private static DelimitedLineAggregator aggregator; private FieldExtractor defaultFieldExtractor = new FieldExtractor() { + @Override public Object[] extract(String[] item) { return item; } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/FormatterLineAggregatorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/FormatterLineAggregatorTests.java index f284ae4c9..b7bc5dc7d 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/FormatterLineAggregatorTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/FormatterLineAggregatorTests.java @@ -33,6 +33,7 @@ public class FormatterLineAggregatorTests { private FormatterLineAggregator aggregator; private FieldExtractor defaultFieldExtractor = new FieldExtractor() { + @Override public Object[] extract(String[] item) { return item; } @@ -125,6 +126,7 @@ public class FormatterLineAggregatorTests { aggregator.setFieldExtractor(new FieldExtractor() { private int[] widths = new int[] { 13, 12 }; + @Override public Object[] extract(String[] item) { String[] strings = new String[item.length]; for (int i = 0; i < strings.length; i++) { @@ -159,6 +161,7 @@ public class FormatterLineAggregatorTests { aggregator.setFieldExtractor(new FieldExtractor() { private int[] widths = new int[] { 13, 11 }; + @Override public Object[] extract(String[] item) { String[] strings = new String[item.length]; for (int i = 0; i < strings.length; i++) { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/PatternMatchingCompositeLineTokenizerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/PatternMatchingCompositeLineTokenizerTests.java index eba968f09..7f9e717b4 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/PatternMatchingCompositeLineTokenizerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/PatternMatchingCompositeLineTokenizerTests.java @@ -45,6 +45,7 @@ public class PatternMatchingCompositeLineTokenizerTests { Map map = new HashMap(); map.put("*", new DelimitedLineTokenizer()); map.put("foo", new LineTokenizer() { + @Override public FieldSet tokenize(String line) { return null; } @@ -60,6 +61,7 @@ public class PatternMatchingCompositeLineTokenizerTests { Map map = new LinkedHashMap(); map.put("*", new LineTokenizer() { + @Override public FieldSet tokenize(String line) { return null; } @@ -81,6 +83,7 @@ public class PatternMatchingCompositeLineTokenizerTests { @Test public void testMatchWithPrefix() throws Exception { tokenizer.setTokenizers(Collections.singletonMap("foo*", (LineTokenizer) new LineTokenizer() { + @Override public FieldSet tokenize(String line) { return new DefaultFieldSet(new String[] { line }); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/RangeArrayPropertyEditorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/RangeArrayPropertyEditorTests.java index a45ade8b1..cd7f88097 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/RangeArrayPropertyEditorTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/RangeArrayPropertyEditorTests.java @@ -7,15 +7,18 @@ public class RangeArrayPropertyEditorTests extends TestCase { private Range[] ranges; private RangeArrayPropertyEditor pe; + @Override public void setUp() { ranges = null; pe = new RangeArrayPropertyEditor() { + @Override public void setValue(Object value) { ranges = (Range[]) value; } + @Override public Object getValue() { return ranges; } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/RecursiveCollectionItemTransformerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/RecursiveCollectionItemTransformerTests.java index 0b933b82f..dd8a4a088 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/RecursiveCollectionItemTransformerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/RecursiveCollectionItemTransformerTests.java @@ -34,6 +34,7 @@ public class RecursiveCollectionItemTransformerTests extends TestCase { public void testSetDelegateAndPassInString() throws Exception { aggregator.setDelegate(new LineAggregator() { + @Override public String aggregate(String item) { return "bar"; } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/SimpleMailMessageItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/SimpleMailMessageItemWriterTests.java index b509f90a1..2732ffbae 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/SimpleMailMessageItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/SimpleMailMessageItemWriterTests.java @@ -89,6 +89,7 @@ public class SimpleMailMessageItemWriterTests { final AtomicReference content = new AtomicReference(); writer.setMailErrorHandler(new MailErrorHandler() { + @Override public void handle(MailMessage message, Exception exception) throws MailException { content.set(exception.getMessage()); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/javamail/MimeMessageItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/javamail/MimeMessageItemWriterTests.java index c0bb8ae04..ea0fe8cdc 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/javamail/MimeMessageItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/javamail/MimeMessageItemWriterTests.java @@ -94,6 +94,7 @@ public class MimeMessageItemWriterTests { final AtomicReference content = new AtomicReference(); writer.setMailErrorHandler(new MailErrorHandler() { + @Override public void handle(MailMessage message, Exception exception) throws MailException { content.set(exception.getMessage()); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/Foo.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/Foo.java index 9688f920a..9cc25fe58 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/Foo.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/Foo.java @@ -47,6 +47,7 @@ public class Foo { this.id = id; } + @Override public String toString() { return "Foo[id=" +id +",name=" + name + ",value=" + value + "]"; } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/ClassifierCompositeItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/ClassifierCompositeItemWriterTests.java index fb98e624e..de1cf6395 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/ClassifierCompositeItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/ClassifierCompositeItemWriterTests.java @@ -41,11 +41,13 @@ public class ClassifierCompositeItemWriterTests { public void testWrite() throws Exception { Map> map = new HashMap>(); ItemWriter fooWriter = new ItemWriter() { + @Override public void write(List items) throws Exception { foos.addAll(items); } }; ItemWriter defaultWriter = new ItemWriter() { + @Override public void write(List items) throws Exception { defaults.addAll(items); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemStreamTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemStreamTests.java index 7d0652d82..02d8958b4 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemStreamTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/CompositeItemStreamTests.java @@ -38,6 +38,7 @@ public class CompositeItemStreamTests extends TestCase { public void testRegisterAndOpen() { ItemStreamSupport stream = new ItemStreamSupport() { + @Override public void open(ExecutionContext executionContext) throws ItemStreamException { list.add("bar"); } @@ -49,6 +50,7 @@ public class CompositeItemStreamTests extends TestCase { public void testRegisterTwice() { ItemStreamSupport stream = new ItemStreamSupport() { + @Override public void open(ExecutionContext executionContext) throws ItemStreamException { list.add("bar"); } @@ -61,6 +63,7 @@ public class CompositeItemStreamTests extends TestCase { public void testMark() { manager.register(new ItemStreamSupport() { + @Override public void update(ExecutionContext executionContext) { list.add("bar"); } @@ -71,6 +74,7 @@ public class CompositeItemStreamTests extends TestCase { public void testClose() { manager.register(new ItemStreamSupport() { + @Override public void close() throws ItemStreamException { list.add("bar"); } @@ -81,6 +85,7 @@ public class CompositeItemStreamTests extends TestCase { public void testCloseDoesNotUnregister() { manager.setStreams(new ItemStream[] { new ItemStreamSupport() { + @Override public void open(ExecutionContext executionContext) throws ItemStreamException { list.add("bar"); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/TransactionAwareListItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/TransactionAwareListItemReaderTests.java index 6552bd6df..24a299cb0 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/TransactionAwareListItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/TransactionAwareListItemReaderTests.java @@ -34,6 +34,7 @@ public class TransactionAwareListItemReaderTests extends TestCase { private ListItemReader reader; + @Override protected void setUp() throws Exception { super.setUp(); reader = new ListItemReader(TransactionAwareProxyFactory.createTransactionalList(Arrays.asList("a", "b", "c"))); @@ -51,6 +52,7 @@ public class TransactionAwareListItemReaderTests extends TestCase { final List taken = new ArrayList(); try { new TransactionTemplate(transactionManager).execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { taken.add(reader.read()); return null; @@ -77,6 +79,7 @@ public class TransactionAwareListItemReaderTests extends TestCase { PlatformTransactionManager transactionManager = new ResourcelessTransactionManager(); final List taken = new ArrayList(); new TransactionTemplate(transactionManager).execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { Object next = reader.read(); while (next != null) { @@ -95,6 +98,7 @@ public class TransactionAwareListItemReaderTests extends TestCase { final List taken = new ArrayList(); try { new TransactionTemplate(transactionManager).execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { taken.add(reader.read()); throw new RuntimeException("Rollback!"); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/util/FileUtilsTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/util/FileUtilsTests.java index 8d10599e2..d0adae092 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/util/FileUtilsTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/util/FileUtilsTests.java @@ -114,6 +114,7 @@ public class FileUtilsTests { public void testBadFile(){ File file = new File("new file"){ + @Override public boolean createNewFile() throws IOException { throw new IOException(); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/SpringValidatorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/SpringValidatorTests.java index d8b56bcd8..bc09b5440 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/SpringValidatorTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/SpringValidatorTests.java @@ -111,11 +111,13 @@ public class SpringValidatorTests { public static final TestBean REJECT_MULTI_VALUE = new TestBean("foo", "bar"); + @Override @SuppressWarnings({ "rawtypes", "unchecked" }) public boolean supports(Class clazz) { return clazz.isAssignableFrom(TestBean.class); } + @Override public void validate(Object value, Errors errors) { if (value.equals(ACCEPT_VALUE)) { return; // return without adding errors @@ -157,6 +159,7 @@ public class SpringValidatorTests { this.bar = bar; } + @Override public String toString() { return "TestBeanToString"; } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/ValidationExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/ValidationExceptionTests.java index 06edcc78e..676f10cde 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/ValidationExceptionTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/validator/ValidationExceptionTests.java @@ -20,10 +20,12 @@ import org.springframework.batch.repeat.AbstractExceptionTests; public class ValidationExceptionTests extends AbstractExceptionTests { + @Override public Exception getException(String msg) throws Exception { return new ValidationException(msg); } + @Override public Exception getException(String msg, Throwable t) throws Exception { return new ValidationException(msg, t); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderCommonTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderCommonTests.java index c4e828f9a..dbd49d35e 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderCommonTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderCommonTests.java @@ -24,11 +24,13 @@ public class StaxEventItemReaderCommonTests extends AbstractItemStreamItemReader private final static String FOOS = " "; + @Override protected ItemReader getItemReader() throws Exception { StaxEventItemReader reader = new StaxEventItemReader(); reader.setResource(new ByteArrayResource(FOOS.getBytes())); reader.setFragmentRootElementName("foo"); reader.setUnmarshaller(new Unmarshaller() { + @Override public Object unmarshal(Source source) throws XmlMappingException, IOException { Attribute attr = null ; try { @@ -45,6 +47,7 @@ public class StaxEventItemReaderCommonTests extends AbstractItemStreamItemReader return foo; } + @Override @SuppressWarnings("rawtypes") public boolean supports(Class clazz) { return true; @@ -57,6 +60,7 @@ public class StaxEventItemReaderCommonTests extends AbstractItemStreamItemReader return reader; } + @Override protected void pointToEmptyInput(ItemReader tested) throws Exception { StaxEventItemReader reader = (StaxEventItemReader) tested; reader.close(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java index eb7f4a12d..456ba9c6f 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java @@ -291,14 +291,17 @@ public class StaxEventItemReaderTests { public void testOpenBadIOInput() throws Exception { source.setResource(new AbstractResource() { + @Override public String getDescription() { return null; } + @Override public InputStream getInputStream() throws IOException { throw new IOException(); } + @Override public boolean exists() { return true; } @@ -403,10 +406,12 @@ public class StaxEventItemReaderTests { public static final String MESSAGE = "Unmarshallers on strike."; + @Override public Object unmarshal(Source source) throws XmlMappingException, IOException { throw new UnmarshallingFailureException(MESSAGE); } + @Override @SuppressWarnings("rawtypes") public boolean supports(Class clazz) { return true; @@ -451,6 +456,7 @@ public class StaxEventItemReaderTests { return events; } + @Override @SuppressWarnings("rawtypes") public boolean supports(Class clazz) { return true; @@ -462,6 +468,7 @@ public class StaxEventItemReaderTests { * @param source * @return list of the events from fragment body */ + @Override public Object unmarshal(Source source) throws XmlMappingException, IOException { List fragmentContent; @@ -502,6 +509,7 @@ public class StaxEventItemReaderTests { private boolean openCalled = false; + @Override public void open(ExecutionContext executionContext) { super.open(executionContext); openCalled = true; @@ -521,14 +529,17 @@ public class StaxEventItemReaderTests { public NonExistentResource() { } + @Override public boolean exists() { return false; } + @Override public String getDescription() { return "NonExistantResource"; } + @Override public InputStream getInputStream() throws IOException { return null; } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemWriterTests.java index 703a2783d..10da4a8e9 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemWriterTests.java @@ -51,6 +51,7 @@ public class StaxEventItemWriterTests { // test item for writing to output private Object item = new Object() { + @Override public String toString() { return ClassUtils.getShortName(StaxEventItemWriter.class) + "-testString"; } @@ -132,6 +133,7 @@ public class StaxEventItemWriterTests { PlatformTransactionManager transactionManager = new ResourcelessTransactionManager(); new TransactionTemplate(transactionManager).execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { try { // write item @@ -151,6 +153,7 @@ public class StaxEventItemWriterTests { writer = createItemWriter(); writer.open(executionContext); new TransactionTemplate(transactionManager).execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { try { writer.write(items); @@ -180,6 +183,7 @@ public class StaxEventItemWriterTests { writer.open(executionContext); try { new TransactionTemplate(transactionManager).execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { try { writer.write(items); @@ -202,6 +206,7 @@ public class StaxEventItemWriterTests { // create new writer from saved restart data and continue writing writer = createItemWriter(); new TransactionTemplate(transactionManager).execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { writer.open(executionContext); try { @@ -234,6 +239,7 @@ public class StaxEventItemWriterTests { writer.setHeaderCallback(new StaxWriterCallback() { + @Override public void write(XMLEventWriter writer) throws IOException { XMLEventFactory factory = XMLEventFactory.newInstance(); try { @@ -279,6 +285,7 @@ public class StaxEventItemWriterTests { public void testOpenAndClose() throws Exception { writer.setHeaderCallback(new StaxWriterCallback() { + @Override public void write(XMLEventWriter writer) throws IOException { XMLEventFactory factory = XMLEventFactory.newInstance(); try { @@ -294,6 +301,7 @@ public class StaxEventItemWriterTests { }); writer.setFooterCallback(new StaxWriterCallback() { + @Override public void write(XMLEventWriter writer) throws IOException { XMLEventFactory factory = XMLEventFactory.newInstance(); try { @@ -413,6 +421,7 @@ public class StaxEventItemWriterTests { this.namespacePrefix = namespacePrefix; } + @Override public void marshal(Object graph, Result result) throws XmlMappingException, IOException { Assert.isInstanceOf( Result.class, result); try { @@ -424,6 +433,7 @@ public class StaxEventItemWriterTests { } } + @Override @SuppressWarnings("rawtypes") public boolean supports(Class clazz) { return true; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/TransactionalStaxEventItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/TransactionalStaxEventItemWriterTests.java index 766e27477..abc632f0b 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/TransactionalStaxEventItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/TransactionalStaxEventItemWriterTests.java @@ -47,6 +47,7 @@ public class TransactionalStaxEventItemWriterTests { // test item for writing to output private Object item = new Object() { + @Override public String toString() { return ClassUtils.getShortName(StaxEventItemWriter.class) + "-testString"; } @@ -71,6 +72,7 @@ public class TransactionalStaxEventItemWriterTests { public void testWriteAndFlush() throws Exception { writer.open(executionContext); new TransactionTemplate(transactionManager).execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { try { writer.write(items); @@ -93,6 +95,7 @@ public class TransactionalStaxEventItemWriterTests { public void testWriteWithHeaderAfterRollback() throws Exception { writer.setHeaderCallback(new StaxWriterCallback(){ + @Override public void write(XMLEventWriter writer) throws IOException { XMLEventFactory factory = XMLEventFactory.newInstance(); try { @@ -109,6 +112,7 @@ public class TransactionalStaxEventItemWriterTests { writer.open(executionContext); try { new TransactionTemplate(transactionManager).execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { try { writer.write(items); @@ -127,6 +131,7 @@ public class TransactionalStaxEventItemWriterTests { writer.close(); writer.open(executionContext); new TransactionTemplate(transactionManager).execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { try { writer.write(items); @@ -150,6 +155,7 @@ public class TransactionalStaxEventItemWriterTests { public void testWriteWithHeaderAfterFlushAndRollback() throws Exception { writer.setHeaderCallback(new StaxWriterCallback(){ + @Override public void write(XMLEventWriter writer) throws IOException { XMLEventFactory factory = XMLEventFactory.newInstance(); try { @@ -165,6 +171,7 @@ public class TransactionalStaxEventItemWriterTests { }); writer.open(executionContext); new TransactionTemplate(transactionManager).execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { try { writer.write(items); @@ -180,6 +187,7 @@ public class TransactionalStaxEventItemWriterTests { writer.open(executionContext); try { new TransactionTemplate(transactionManager).execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { try { writer.write(items); @@ -212,6 +220,7 @@ public class TransactionalStaxEventItemWriterTests { * Writes object's toString representation as XML comment. */ private static class SimpleMarshaller implements Marshaller { + @Override public void marshal(Object graph, Result result) throws XmlMappingException, IOException { try { StaxUtils.getXmlEventWriter(result).add(XMLEventFactory.newInstance().createComment(graph.toString())); @@ -221,6 +230,7 @@ public class TransactionalStaxEventItemWriterTests { } } + @Override @SuppressWarnings("rawtypes") public boolean supports(Class clazz) { return true; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/stax/AbstractEventReaderWrapperTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/stax/AbstractEventReaderWrapperTests.java index 7dae34670..bb12b2c95 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/stax/AbstractEventReaderWrapperTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/stax/AbstractEventReaderWrapperTests.java @@ -36,6 +36,7 @@ public class AbstractEventReaderWrapperTests extends TestCase { AbstractEventReaderWrapper eventReaderWrapper; XMLEventReader xmlEventReader; + @Override protected void setUp() throws Exception { super.setUp(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/stax/AbstractEventWriterWrapperTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/stax/AbstractEventWriterWrapperTests.java index a69ed12b7..55a449f9b 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/stax/AbstractEventWriterWrapperTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/stax/AbstractEventWriterWrapperTests.java @@ -42,6 +42,7 @@ public class AbstractEventWriterWrapperTests extends TestCase { XMLEventWriter xmlEventWriter; + @Override protected void setUp() throws Exception { super.setUp(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/stax/DefaultFragmentEventReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/stax/DefaultFragmentEventReaderTests.java index b7664836c..39193e9a8 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/stax/DefaultFragmentEventReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/stax/DefaultFragmentEventReaderTests.java @@ -32,6 +32,7 @@ public class DefaultFragmentEventReaderTests extends TestCase { /** * Setup the fragmentReader to read the test input. */ + @Override protected void setUp() throws Exception { Resource input = new ByteArrayResource(xml.getBytes()); eventReader = XMLInputFactory.newInstance().createXMLEventReader( diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/stax/NoStartEndDocumentWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/stax/NoStartEndDocumentWriterTests.java index 1a67550bf..51907d232 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/stax/NoStartEndDocumentWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/stax/NoStartEndDocumentWriterTests.java @@ -22,6 +22,7 @@ public class NoStartEndDocumentWriterTests extends TestCase { private XMLEventFactory eventFactory = XMLEventFactory.newInstance(); + @Override protected void setUp() throws Exception { wrappedWriter = createStrictMock(XMLEventWriter.class); writer = new NoStartEndDocumentStreamWriter(wrappedWriter); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/poller/DirectPollerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/poller/DirectPollerTests.java index 2d9de3b6c..27f451d8f 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/poller/DirectPollerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/poller/DirectPollerTests.java @@ -40,6 +40,7 @@ public class DirectPollerTests { Callable callback = new Callable() { + @Override public String call() throws Exception { Set executions = new HashSet(repository); if (executions.isEmpty()) { @@ -64,6 +65,7 @@ public class DirectPollerTests { Callable callback = new Callable() { + @Override public String call() throws Exception { Set executions = new HashSet(repository); if (executions.isEmpty()) { @@ -88,6 +90,7 @@ public class DirectPollerTests { Callable callback = new Callable() { + @Override public String call() throws Exception { Set executions = new HashSet(repository); if (executions.isEmpty()) { @@ -115,6 +118,7 @@ public class DirectPollerTests { private void sleepAndCreateStringInBackground(final long duration) { new Thread(new Runnable() { + @Override public void run() { try { Thread.sleep(duration); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/RepeatExceptionTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/RepeatExceptionTests.java index 57c7c6858..36841c902 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/RepeatExceptionTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/RepeatExceptionTests.java @@ -20,10 +20,12 @@ import org.springframework.batch.repeat.RepeatException; public class RepeatExceptionTests extends AbstractExceptionTests { + @Override public Exception getException(String msg) throws Exception { return new RepeatException(msg); } + @Override public Exception getException(String msg, Throwable t) throws Exception { return new RepeatException(msg, t); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/callback/NestedRepeatCallbackTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/callback/NestedRepeatCallbackTests.java index 790c57b44..f2adb24b6 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/callback/NestedRepeatCallbackTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/callback/NestedRepeatCallbackTests.java @@ -29,6 +29,7 @@ public class NestedRepeatCallbackTests extends TestCase { public void testExecute() throws Exception { NestedRepeatCallback callback = new NestedRepeatCallback(new RepeatTemplate(), new RepeatCallback() { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { count++; return RepeatStatus.continueIf(count <= 1); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/context/RepeatContextSupportTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/context/RepeatContextSupportTests.java index eafe4e089..e5db94291 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/context/RepeatContextSupportTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/context/RepeatContextSupportTests.java @@ -35,6 +35,7 @@ public class RepeatContextSupportTests extends TestCase { RepeatContextSupport context = new RepeatContextSupport(null); context.setAttribute("foo", "FOO"); context.registerDestructionCallback("foo", new Runnable() { + @Override public void run() { list.add("bar"); } @@ -50,6 +51,7 @@ public class RepeatContextSupportTests extends TestCase { public void testDestructionCallbackMissingAttribute() throws Exception { RepeatContextSupport context = new RepeatContextSupport(null); context.registerDestructionCallback("foo", new Runnable() { + @Override public void run() { list.add("bar"); } @@ -67,12 +69,14 @@ public class RepeatContextSupportTests extends TestCase { context.setAttribute("foo", "FOO"); context.setAttribute("bar", "BAR"); context.registerDestructionCallback("bar", new Runnable() { + @Override public void run() { list.add("spam"); throw new RuntimeException("fail!"); } }); context.registerDestructionCallback("foo", new Runnable() { + @Override public void run() { list.add("bar"); throw new RuntimeException("fail!"); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/CompositeExceptionHandlerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/CompositeExceptionHandlerTests.java index 1c77901b7..7a1946989 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/CompositeExceptionHandlerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/CompositeExceptionHandlerTests.java @@ -28,7 +28,7 @@ import org.springframework.batch.repeat.exception.ExceptionHandler; public class CompositeExceptionHandlerTests extends TestCase { private CompositeExceptionHandler handler = new CompositeExceptionHandler(); - + public void testNewHandler() throws Throwable { try { handler.handleException(null, new RuntimeException()); @@ -37,16 +37,18 @@ public class CompositeExceptionHandlerTests extends TestCase { fail("Unexpected RuntimeException"); } } - + public void testDelegation() throws Throwable { final List list = new ArrayList(); handler.setHandlers(new ExceptionHandler[] { new ExceptionHandler() { + @Override public void handleException(RepeatContext context, Throwable throwable) throws RuntimeException { list.add("1"); } }, new ExceptionHandler() { + @Override public void handleException(RepeatContext context, Throwable throwable) throws RuntimeException { list.add("2"); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/LogOrRethrowExceptionHandlerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/LogOrRethrowExceptionHandlerTests.java index 9d82bbdf7..6f668a318 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/LogOrRethrowExceptionHandlerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/LogOrRethrowExceptionHandlerTests.java @@ -35,6 +35,7 @@ public class LogOrRethrowExceptionHandlerTests extends TestCase { private RepeatContext context = null; + @Override protected void setUp() throws Exception { super.setUp(); Logger logger = Logger.getLogger(LogOrRethrowExceptionHandler.class); @@ -67,6 +68,7 @@ public class LogOrRethrowExceptionHandlerTests extends TestCase { public void testNotRethrownErrorLevel() throws Throwable { handler.setExceptionClassifier(new ClassifierSupport(Level.RETHROW) { + @Override public Level classify(Throwable throwable) { return Level.ERROR; } @@ -78,6 +80,7 @@ public class LogOrRethrowExceptionHandlerTests extends TestCase { public void testNotRethrownWarnLevel() throws Throwable { handler.setExceptionClassifier(new ClassifierSupport(Level.RETHROW) { + @Override public Level classify(Throwable throwable) { return Level.WARN; } @@ -89,6 +92,7 @@ public class LogOrRethrowExceptionHandlerTests extends TestCase { public void testNotRethrownDebugLevel() throws Throwable { handler.setExceptionClassifier(new ClassifierSupport(Level.RETHROW) { + @Override public Level classify(Throwable throwable) { return Level.DEBUG; } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/interceptor/RepeatOperationsInterceptorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/interceptor/RepeatOperationsInterceptorTests.java index 5f0649df6..c2cea59d1 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/interceptor/RepeatOperationsInterceptorTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/interceptor/RepeatOperationsInterceptorTests.java @@ -42,6 +42,7 @@ public class RepeatOperationsInterceptorTests extends TestCase { private ServiceImpl target; + @Override protected void setUp() throws Exception { super.setUp(); interceptor = new RepeatOperationsInterceptor(); @@ -68,6 +69,7 @@ public class RepeatOperationsInterceptorTests extends TestCase { public void testSetTemplate() throws Exception { final List calls = new ArrayList(); interceptor.setRepeatOperations(new RepeatOperations() { + @Override public RepeatStatus iterate(RepeatCallback callback) { try { Object result = callback.doInIteration(null); @@ -87,6 +89,7 @@ public class RepeatOperationsInterceptorTests extends TestCase { public void testCallbackNotExecuted() throws Exception { final List calls = new ArrayList(); interceptor.setRepeatOperations(new RepeatOperations() { + @Override public RepeatStatus iterate(RepeatCallback callback) { calls.add(null); return RepeatStatus.FINISHED; @@ -159,6 +162,7 @@ public class RepeatOperationsInterceptorTests extends TestCase { ((Advised) service).addAdvice(interceptor); final List list = new ArrayList(); ((Advised) service).addAdvice(new MethodInterceptor() { + @Override public Object invoke(MethodInvocation invocation) throws Throwable { list.add("chain"); return invocation.proceed(); @@ -175,6 +179,7 @@ public class RepeatOperationsInterceptorTests extends TestCase { public void testIllegalMethodInvocationType() throws Throwable { try { interceptor.invoke(new MethodInvocation() { + @Override public Method getMethod() { try { return Object.class.getMethod("toString", new Class[0]); @@ -184,18 +189,22 @@ public class RepeatOperationsInterceptorTests extends TestCase { } } + @Override public Object[] getArguments() { return null; } + @Override public AccessibleObject getStaticPart() { return null; } + @Override public Object getThis() { return null; } + @Override public Object proceed() throws Throwable { return null; } @@ -235,6 +244,7 @@ public class RepeatOperationsInterceptorTests extends TestCase { this.maxService = maxService; } + @Override public Object service() throws Exception { count++; if (count <= maxService) { @@ -249,18 +259,22 @@ public class RepeatOperationsInterceptorTests extends TestCase { this.complete = complete; } + @Override public void alternate() throws Exception { count++; } + @Override public Object exception() throws Exception { throw new RuntimeException("Duh! Stupid."); } + @Override public Object error() throws Exception { throw new Error("Duh! Stupid error."); } + @Override public boolean isContinuable() throws Exception { count++; return !complete; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/listener/CompositeRepeatListenerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/listener/CompositeRepeatListenerTests.java index bb990a163..a2f1fce13 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/listener/CompositeRepeatListenerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/listener/CompositeRepeatListenerTests.java @@ -40,10 +40,12 @@ public class CompositeRepeatListenerTests extends TestCase { */ public void testSetListeners() { listener.setListeners(new RepeatListener[] { new RepeatListenerSupport() { + @Override public void open(RepeatContext context) { list.add("fail"); } }, new RepeatListenerSupport() { + @Override public void open(RepeatContext context) { list.add("continue"); } @@ -58,6 +60,7 @@ public class CompositeRepeatListenerTests extends TestCase { */ public void testSetListener() { listener.register(new RepeatListenerSupport() { + @Override public void before(RepeatContext context) { list.add("fail"); } @@ -68,6 +71,7 @@ public class CompositeRepeatListenerTests extends TestCase { public void testClose() { listener.register(new RepeatListenerSupport() { + @Override public void close(RepeatContext context) { list.add("foo"); } @@ -78,6 +82,7 @@ public class CompositeRepeatListenerTests extends TestCase { public void testOnError() { listener.register(new RepeatListenerSupport() { + @Override public void onError(RepeatContext context, Throwable e) { list.add(e); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/listener/RepeatListenerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/listener/RepeatListenerTests.java index 659d07f51..7b5275a77 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/listener/RepeatListenerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/listener/RepeatListenerTests.java @@ -37,15 +37,18 @@ public class RepeatListenerTests extends TestCase { RepeatTemplate template = new RepeatTemplate(); final List calls = new ArrayList(); template.setListeners(new RepeatListener[] { new RepeatListenerSupport() { + @Override public void before(RepeatContext context) { calls.add("1"); } }, new RepeatListenerSupport() { + @Override public void before(RepeatContext context) { calls.add("2"); } } }); template.iterate(new RepeatCallback() { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { count++; return RepeatStatus.continueIf(count <= 1); @@ -63,12 +66,14 @@ public class RepeatListenerTests extends TestCase { RepeatTemplate template = new RepeatTemplate(); final List calls = new ArrayList(); template.registerListener(new RepeatListenerSupport() { + @Override public void before(RepeatContext context) { calls.add("1"); context.setCompleteOnly(); } }); template.iterate(new RepeatCallback() { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { count++; return RepeatStatus.FINISHED; @@ -83,15 +88,18 @@ public class RepeatListenerTests extends TestCase { RepeatTemplate template = new RepeatTemplate(); final List calls = new ArrayList(); template.setListeners(new RepeatListener[] { new RepeatListenerSupport() { + @Override public void after(RepeatContext context, RepeatStatus result) { calls.add("1"); } }, new RepeatListenerSupport() { + @Override public void after(RepeatContext context, RepeatStatus result) { calls.add("2"); } } }); template.iterate(new RepeatCallback() { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { count++; return RepeatStatus.continueIf(count <= 1); @@ -107,16 +115,19 @@ public class RepeatListenerTests extends TestCase { RepeatTemplate template = new RepeatTemplate(); final List calls = new ArrayList(); template.setListeners(new RepeatListener[] { new RepeatListenerSupport() { + @Override public void open(RepeatContext context) { calls.add("1"); } }, new RepeatListenerSupport() { + @Override public void open(RepeatContext context) { calls.add("2"); context.setCompleteOnly(); } } }); template.iterate(new RepeatCallback() { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { count++; return RepeatStatus.CONTINUABLE; @@ -130,11 +141,13 @@ public class RepeatListenerTests extends TestCase { RepeatTemplate template = new RepeatTemplate(); final List calls = new ArrayList(); template.registerListener(new RepeatListenerSupport() { + @Override public void open(RepeatContext context) { calls.add("1"); } }); template.iterate(new RepeatCallback() { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { count++; context.setCompleteOnly(); @@ -149,15 +162,18 @@ public class RepeatListenerTests extends TestCase { RepeatTemplate template = new RepeatTemplate(); final List calls = new ArrayList(); template.setListeners(new RepeatListener[] { new RepeatListenerSupport() { + @Override public void close(RepeatContext context) { calls.add("1"); } }, new RepeatListenerSupport() { + @Override public void close(RepeatContext context) { calls.add("2"); } } }); template.iterate(new RepeatCallback() { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { count++; return RepeatStatus.continueIf(count < 2); @@ -174,16 +190,19 @@ public class RepeatListenerTests extends TestCase { RepeatTemplate template = new RepeatTemplate(); final List calls = new ArrayList(); template.setListeners(new RepeatListener[] { new RepeatListenerSupport() { + @Override public void onError(RepeatContext context, Throwable t) { calls.add("1"); } }, new RepeatListenerSupport() { + @Override public void onError(RepeatContext context, Throwable t) { calls.add("2"); } } }); try { template.iterate(new RepeatCallback() { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { throw new IllegalStateException("Bogus"); } @@ -201,16 +220,19 @@ public class RepeatListenerTests extends TestCase { RepeatTemplate template = new RepeatTemplate(); final List calls = new ArrayList(); template.setListeners(new RepeatListener[] { new RepeatListenerSupport() { + @Override public void after(RepeatContext context, RepeatStatus result) { calls.add("1"); } }, new RepeatListenerSupport() { + @Override public void onError(RepeatContext context, Throwable t) { calls.add("2"); } } }); try { template.iterate(new RepeatCallback() { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { throw new IllegalStateException("Bogus"); } @@ -231,10 +253,12 @@ public class RepeatListenerTests extends TestCase { final List calls = new ArrayList(); final List fails = new ArrayList(); template.setListeners(new RepeatListener[] { new RepeatListenerSupport() { + @Override public void after(RepeatContext context, RepeatStatus result) { calls.add("1"); } }, new RepeatListenerSupport() { + @Override public void onError(RepeatContext context, Throwable t) { calls.add("2"); fails.add("2"); @@ -242,6 +266,7 @@ public class RepeatListenerTests extends TestCase { } }); try { template.iterate(new RepeatCallback() { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { throw new IllegalStateException("Bogus"); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/policy/CompositeCompletionPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/policy/CompositeCompletionPolicyTests.java index 1805d584b..7959f4177 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/policy/CompositeCompletionPolicyTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/policy/CompositeCompletionPolicyTests.java @@ -47,6 +47,7 @@ public class CompositeCompletionPolicyTests extends TestCase { CompositeCompletionPolicy policy = new CompositeCompletionPolicy(); policy.setPolicies(new CompletionPolicy[] { new MockCompletionPolicySupport(), new MockCompletionPolicySupport() { + @Override public boolean isComplete(RepeatContext context) { return true; } @@ -59,6 +60,7 @@ public class CompositeCompletionPolicyTests extends TestCase { CompositeCompletionPolicy policy = new CompositeCompletionPolicy(); policy.setPolicies(new CompletionPolicy[] { new MockCompletionPolicySupport(), new MockCompletionPolicySupport() { + @Override public boolean isComplete(RepeatContext context, RepeatStatus result) { return true; } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/policy/CountingCompletionPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/policy/CountingCompletionPolicyTests.java index e4ef2623b..44a9699ee 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/policy/CountingCompletionPolicyTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/policy/CountingCompletionPolicyTests.java @@ -26,6 +26,7 @@ public class CountingCompletionPolicyTests extends TestCase { public void testDefaultBehaviour() throws Exception { CountingCompletionPolicy policy = new CountingCompletionPolicy() { + @Override protected int getCount(RepeatContext context) { return 1; }; @@ -36,6 +37,7 @@ public class CountingCompletionPolicyTests extends TestCase { public void testNullResult() throws Exception { CountingCompletionPolicy policy = new CountingCompletionPolicy() { + @Override protected int getCount(RepeatContext context) { return 1; }; @@ -47,6 +49,7 @@ public class CountingCompletionPolicyTests extends TestCase { public void testFinishedResult() throws Exception { CountingCompletionPolicy policy = new CountingCompletionPolicy() { + @Override protected int getCount(RepeatContext context) { return 1; }; @@ -60,10 +63,12 @@ public class CountingCompletionPolicyTests extends TestCase { CountingCompletionPolicy policy = new CountingCompletionPolicy() { int count = 0; + @Override protected int getCount(RepeatContext context) { return count; }; + @Override protected int doUpdate(RepeatContext context) { count++; return 1; @@ -81,16 +86,19 @@ public class CountingCompletionPolicyTests extends TestCase { CountingCompletionPolicy policy = new CountingCompletionPolicy() { int count = 0; + @Override protected int getCount(RepeatContext context) { return count; }; + @Override protected int doUpdate(RepeatContext context) { super.doUpdate(context); count++; return 1; } + @Override public RepeatContext start(RepeatContext context) { count = 0; return super.start(context); @@ -110,16 +118,19 @@ public class CountingCompletionPolicyTests extends TestCase { CountingCompletionPolicy policy = new CountingCompletionPolicy() { int count = 0; + @Override protected int getCount(RepeatContext context) { return count; }; + @Override protected int doUpdate(RepeatContext context) { super.doUpdate(context); count++; return 1; } + @Override public RepeatContext start(RepeatContext context) { count = 0; return super.start(context); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/policy/MockCompletionPolicySupport.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/policy/MockCompletionPolicySupport.java index 6f1231567..5459f4fd6 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/policy/MockCompletionPolicySupport.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/policy/MockCompletionPolicySupport.java @@ -20,6 +20,7 @@ import org.springframework.batch.repeat.RepeatContext; public class MockCompletionPolicySupport extends CompletionPolicySupport { + @Override public boolean isComplete(RepeatContext context) { return false; } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/policy/SimpleCompletionPolicyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/policy/SimpleCompletionPolicyTests.java index 8890aa886..f92232175 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/policy/SimpleCompletionPolicyTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/policy/SimpleCompletionPolicyTests.java @@ -29,6 +29,7 @@ public class SimpleCompletionPolicyTests extends TestCase { RepeatStatus dummy = RepeatStatus.CONTINUABLE; + @Override protected void setUp() throws Exception { super.setUp(); context = policy.start(null); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AbstractTradeBatchTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AbstractTradeBatchTests.java index da53e30ce..13e28883c 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AbstractTradeBatchTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/AbstractTradeBatchTests.java @@ -66,6 +66,7 @@ public abstract class AbstractTradeBatchTests { } protected static class TradeMapper implements FieldSetMapper { + @Override public Trade mapFieldSet(FieldSet fs) { return new Trade(fs); } @@ -76,6 +77,7 @@ public abstract class AbstractTradeBatchTests { // This has to be synchronized because we are going to test the state // (count) at the end of a concurrent batch run. + @Override public synchronized void write(List data) { count++; System.out.println("Executing trade '" + data + "'"); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ChunkedRepeatTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ChunkedRepeatTests.java index a5cbdf920..a014e5091 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ChunkedRepeatTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ChunkedRepeatTests.java @@ -59,6 +59,7 @@ public class ChunkedRepeatTests extends AbstractTradeBatchTests { RepeatStatus result = repeatTemplate.iterate(new NestedRepeatCallback(chunkTemplate, callback) { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { count++; // for test assertion return super.doInIteration(context); @@ -95,6 +96,7 @@ public class ChunkedRepeatTests extends AbstractTradeBatchTests { RepeatStatus result = repeatTemplate.iterate(new NestedRepeatCallback(chunkTemplate, callback) { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { count++; // for test assertion return super.doInIteration(context); @@ -157,6 +159,7 @@ public class ChunkedRepeatTests extends AbstractTradeBatchTests { ItemReader truncated = new ItemReader() { int count = 0; + @Override public Trade read() throws Exception { if (count++ < 2) return provider.read(); @@ -166,6 +169,7 @@ public class ChunkedRepeatTests extends AbstractTradeBatchTests { chunker.reset(); template.iterate(new ItemReaderRepeatCallback(truncated, processor) { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { RepeatStatus result = super.doInIteration(context); if (!result.isContinuable() && chunker.first()) { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ItemReaderRepeatCallback.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ItemReaderRepeatCallback.java index f194e5999..e53a0d444 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ItemReaderRepeatCallback.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ItemReaderRepeatCallback.java @@ -44,6 +44,7 @@ public class ItemReaderRepeatCallback implements RepeatCallback { /* (non-Javadoc) * @see org.springframework.batch.repeat.RepeatCallback#doInIteration(org.springframework.batch.repeat.RepeatContext) */ + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { T item = reader.read(); if (item==null) { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/RepeatSynchronizationManagerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/RepeatSynchronizationManagerTests.java index 9fbdd380c..eaa702cc1 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/RepeatSynchronizationManagerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/RepeatSynchronizationManagerTests.java @@ -25,10 +25,12 @@ public class RepeatSynchronizationManagerTests extends TestCase { private RepeatContext context = new RepeatContextSupport(null); + @Override protected void setUp() throws Exception { RepeatSynchronizationManager.clear(); } + @Override protected void tearDown() throws Exception { RepeatSynchronizationManager.clear(); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ResultHolderResultQueueTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ResultHolderResultQueueTests.java index f2f17710d..921e2b151 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ResultHolderResultQueueTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ResultHolderResultQueueTests.java @@ -45,14 +45,17 @@ public class ResultHolderResultQueueTests { this.result = result; } + @Override public RepeatContext getContext() { return null; } + @Override public Throwable getError() { return error; } + @Override public RepeatStatus getResult() { return result; } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/SimpleRepeatTemplateTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/SimpleRepeatTemplateTests.java index 2f4797b7e..6d0e04fe5 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/SimpleRepeatTemplateTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/SimpleRepeatTemplateTests.java @@ -88,6 +88,7 @@ public class SimpleRepeatTemplateTests extends AbstractTradeBatchTests { try { template.iterate(new RepeatCallback() { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { count++; throw new IllegalStateException("foo!"); @@ -115,17 +116,20 @@ public class SimpleRepeatTemplateTests extends AbstractTradeBatchTests { final List list = new ArrayList(); final RepeatContext context = new RepeatContextSupport(null) { + @Override public void close() { super.close(); list.add("close"); } }; template.setCompletionPolicy(new CompletionPolicySupport() { + @Override public RepeatContext start(RepeatContext c) { return context; } }); template.iterate(new RepeatCallback() { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { count++; return RepeatStatus.continueIf(count < 1); @@ -148,12 +152,14 @@ public class SimpleRepeatTemplateTests extends AbstractTradeBatchTests { final List list = new ArrayList(); final RepeatContext context = new RepeatContextSupport(null) { + @Override public void close() { super.close(); list.add("close"); } }; template.setCompletionPolicy(new CompletionPolicySupport() { + @Override public RepeatContext start(RepeatContext c) { return context; } @@ -161,6 +167,7 @@ public class SimpleRepeatTemplateTests extends AbstractTradeBatchTests { try { template.iterate(new RepeatCallback() { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { count++; throw new RuntimeException("foo"); @@ -187,6 +194,7 @@ public class SimpleRepeatTemplateTests extends AbstractTradeBatchTests { final List list = new ArrayList(); template.setExceptionHandler(new ExceptionHandler() { + @Override public void handleException(RepeatContext context, Throwable throwable) throws RuntimeException { list.add(throwable); throw (RuntimeException) throwable; @@ -195,6 +203,7 @@ public class SimpleRepeatTemplateTests extends AbstractTradeBatchTests { try { template.iterate(new RepeatCallback() { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { count++; throw new RuntimeException("foo"); @@ -220,6 +229,7 @@ public class SimpleRepeatTemplateTests extends AbstractTradeBatchTests { RepeatStatus result = template.iterate(new ItemReaderRepeatCallback(provider, processor) { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { RepeatStatus result = super.doInIteration(context); if (processor.count >= 2) { @@ -249,6 +259,7 @@ public class SimpleRepeatTemplateTests extends AbstractTradeBatchTests { RepeatStatus result = template.iterate(new ItemReaderRepeatCallback(provider, processor) { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { RepeatStatus result = super.doInIteration(context); if (processor.count >= 2) { @@ -273,6 +284,7 @@ public class SimpleRepeatTemplateTests extends AbstractTradeBatchTests { RepeatTemplate outer = getRepeatTemplate(); RepeatTemplate inner = getRepeatTemplate(); outer.iterate(new NestedRepeatCallback(inner, new RepeatCallback() { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { count++; assertNotNull(context); @@ -281,6 +293,7 @@ public class SimpleRepeatTemplateTests extends AbstractTradeBatchTests { return RepeatStatus.FINISHED; } }) { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { count++; assertSame(context, RepeatSynchronizationManager.getContext()); @@ -295,6 +308,7 @@ public class SimpleRepeatTemplateTests extends AbstractTradeBatchTests { RepeatTemplate outer = getRepeatTemplate(); RepeatTemplate inner = getRepeatTemplate(); outer.iterate(new NestedRepeatCallback(inner, new RepeatCallback() { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { count++; assertEquals(2, count); @@ -302,6 +316,7 @@ public class SimpleRepeatTemplateTests extends AbstractTradeBatchTests { return RepeatStatus.FINISHED; } }) { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { count++; context.setCompleteOnly(); @@ -317,6 +332,7 @@ public class SimpleRepeatTemplateTests extends AbstractTradeBatchTests { outer.setCompletionPolicy(new SimpleCompletionPolicy(2)); RepeatTemplate inner = getRepeatTemplate(); outer.iterate(new NestedRepeatCallback(inner, new RepeatCallback() { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { count++; assertNotNull(context); @@ -325,6 +341,7 @@ public class SimpleRepeatTemplateTests extends AbstractTradeBatchTests { return RepeatStatus.FINISHED; } }) { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { count++; assertSame(context, RepeatSynchronizationManager.getContext()); @@ -352,6 +369,7 @@ public class SimpleRepeatTemplateTests extends AbstractTradeBatchTests { template.setCompletionPolicy(new SimpleCompletionPolicy(2)); try { template.iterate(new RepeatCallback() { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { count++; if (count < 2) { @@ -384,6 +402,7 @@ public class SimpleRepeatTemplateTests extends AbstractTradeBatchTests { try { result = template.iterate(new ItemReaderRepeatCallback(provider, processor) { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { RepeatStatus result = super.doInIteration(context); if (processor.count >= 2) { @@ -428,6 +447,7 @@ public class SimpleRepeatTemplateTests extends AbstractTradeBatchTests { class ExceptionHandlerStub implements ExceptionHandler { boolean called = false; + @Override public void handleException(RepeatContext context, Throwable throwable) throws Throwable { called = true; assertSame(exception, throwable); @@ -440,6 +460,7 @@ public class SimpleRepeatTemplateTests extends AbstractTradeBatchTests { class RepeatListenerStub extends RepeatListenerSupport { boolean called = false; + @Override public void onError(RepeatContext context, Throwable throwable) { called = true; assertSame(exception, throwable); @@ -452,6 +473,7 @@ public class SimpleRepeatTemplateTests extends AbstractTradeBatchTests { try { template.iterate(new RepeatCallback() { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { throw new RepeatException("typically thrown by nested repeat template", exception); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplateAsynchronousTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplateAsynchronousTests.java index b195c4dd2..1547e2ca1 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplateAsynchronousTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplateAsynchronousTests.java @@ -64,6 +64,7 @@ public class TaskExecutorRepeatTemplateAsynchronousTests extends AbstractTradeBa template.setTaskExecutor(taskExecutor); try { template.iterate(new RepeatCallback() { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { count++; throw new IllegalStateException("foo!"); @@ -90,11 +91,13 @@ public class TaskExecutorRepeatTemplateAsynchronousTests extends AbstractTradeBa template.setTaskExecutor(taskExecutor); template.setExceptionHandler(new ExceptionHandler() { + @Override public void handleException(RepeatContext context, Throwable throwable) throws Throwable { count++; } }); template.iterate(new RepeatCallback() { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { throw new IllegalStateException("foo!"); } @@ -112,6 +115,7 @@ public class TaskExecutorRepeatTemplateAsynchronousTests extends AbstractTradeBa RepeatTemplate inner = new RepeatTemplate(); outer.iterate(new NestedRepeatCallback(inner, new RepeatCallback() { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { count++; assertNotNull(context); @@ -120,6 +124,7 @@ public class TaskExecutorRepeatTemplateAsynchronousTests extends AbstractTradeBa return RepeatStatus.FINISHED; } }) { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { count++; assertNotNull(context); @@ -147,6 +152,7 @@ public class TaskExecutorRepeatTemplateAsynchronousTests extends AbstractTradeBa final Set threadNames = new HashSet(); final RepeatCallback callback = new RepeatCallback() { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { assertNotSame(threadName, Thread.currentThread().getName()); threadNames.add(Thread.currentThread().getName()); @@ -182,6 +188,7 @@ public class TaskExecutorRepeatTemplateAsynchronousTests extends AbstractTradeBa final List items = new ArrayList(); final RepeatCallback callback = new RepeatCallback() { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { assertNotSame(threadName, Thread.currentThread().getName()); Trade item = provider.read(); @@ -230,6 +237,7 @@ public class TaskExecutorRepeatTemplateAsynchronousTests extends AbstractTradeBa final Set threadNames = new HashSet(); final RepeatCallback stepCallback = new ItemReaderRepeatCallback(provider, processor) { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { assertNotSame(threadName, Thread.currentThread().getName()); threadNames.add(Thread.currentThread().getName()); @@ -242,6 +250,7 @@ public class TaskExecutorRepeatTemplateAsynchronousTests extends AbstractTradeBa } }; RepeatCallback jobCallback = new RepeatCallback() { + @Override public RepeatStatus doInIteration(RepeatContext context) throws Exception { stepTemplate.iterate(stepCallback); return RepeatStatus.FINISHED; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplateTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplateTests.java index 74d14b18f..a0b58f723 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplateTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/TaskExecutorRepeatTemplateTests.java @@ -26,6 +26,7 @@ import org.junit.Test; */ public class TaskExecutorRepeatTemplateTests extends SimpleRepeatTemplateTests { + @Override public RepeatTemplate getRepeatTemplate() { return new TaskExecutorRepeatTemplate(); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ThrottleLimitResultQueueTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ThrottleLimitResultQueueTests.java index e4e4391e4..527063a12 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ThrottleLimitResultQueueTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ThrottleLimitResultQueueTests.java @@ -70,6 +70,7 @@ public class ThrottleLimitResultQueueTests { public void testThrottleLimit() throws Exception { queue.expect(); new Thread(new Runnable() { + @Override public void run() { try { Thread.sleep(100L); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/Trade.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/Trade.java index 91100a690..e749868e7 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/Trade.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/Trade.java @@ -49,6 +49,7 @@ public class Trade { return quantity; } + @Override public String toString() { return "Trade: [isin=" + isin + ",quantity=" + quantity + ",price=" + price + "]"; } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/ConcurrentTransactionAwareProxyTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/ConcurrentTransactionAwareProxyTests.java index 968bb4980..485b271f7 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/ConcurrentTransactionAwareProxyTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/ConcurrentTransactionAwareProxyTests.java @@ -126,6 +126,7 @@ public class ConcurrentTransactionAwareProxyTests { public void testTransactionalContains() throws Exception { final Map> map = TransactionAwareProxyFactory.createAppendOnlyTransactionalMap(); boolean result = (Boolean) new TransactionTemplate(transactionManager).execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { return map.containsKey("foo"); } @@ -139,6 +140,7 @@ public class ConcurrentTransactionAwareProxyTests { final int count = i; completionService.submit(new Callable>() { + @Override public List call() throws Exception { List list = new ArrayList(); for (int i = 0; i < innerMax; i++) { @@ -166,6 +168,7 @@ public class ConcurrentTransactionAwareProxyTests { for (int i = 0; i < outerMax; i++) { completionService.submit(new Callable>() { + @Override public List call() throws Exception { List result = new ArrayList(); for (int i = 0; i < innerMax; i++) { @@ -205,6 +208,7 @@ public class ConcurrentTransactionAwareProxyTests { final long id = j * 1000 + 123L + i; completionService.submit(new Callable>() { + @Override public List call() throws Exception { List list = new ArrayList(); for (int i = 0; i < innerMax; i++) { @@ -227,6 +231,7 @@ public class ConcurrentTransactionAwareProxyTests { private String saveInSetAndAssert(final Set set, final String value) { new TransactionTemplate(transactionManager).execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { set.add(value); return null; @@ -242,6 +247,7 @@ public class ConcurrentTransactionAwareProxyTests { private String saveInListAndAssert(final List list, final String value) { new TransactionTemplate(transactionManager).execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { list.add(value); return null; @@ -258,6 +264,7 @@ public class ConcurrentTransactionAwareProxyTests { final String value) { new TransactionTemplate(transactionManager).execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { if (!map.containsKey(id)) { map.put(id, new HashMap()); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/ResourcelessTransactionManagerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/ResourcelessTransactionManagerTests.java index be5878d24..d9ebdbb55 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/ResourcelessTransactionManagerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/ResourcelessTransactionManagerTests.java @@ -38,8 +38,10 @@ public class ResourcelessTransactionManagerTests { @Test public void testCommit() throws Exception { new TransactionTemplate(transactionManager).execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() { + @Override public void afterCompletion(int status) { super.afterCompletion(status); txStatus = status; @@ -56,8 +58,10 @@ public class ResourcelessTransactionManagerTests { testCommit(); txStatus = -1; new TransactionTemplate(transactionManager).execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() { + @Override public void afterCompletion(int status) { super.afterCompletion(status); txStatus = status; @@ -73,8 +77,10 @@ public class ResourcelessTransactionManagerTests { public void testCommitNested() throws Exception { final TransactionTemplate transactionTemplate = new TransactionTemplate(transactionManager); transactionTemplate.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() { + @Override public void afterCompletion(int status) { super.afterCompletion(status); txStatus = status; @@ -82,6 +88,7 @@ public class ResourcelessTransactionManagerTests { } }); transactionTemplate.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertEquals(0, count); count++; @@ -103,8 +110,10 @@ public class ResourcelessTransactionManagerTests { txStatus = -1; final TransactionTemplate transactionTemplate = new TransactionTemplate(transactionManager); transactionTemplate.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() { + @Override public void afterCompletion(int status) { super.afterCompletion(status); txStatus = status; @@ -112,6 +121,7 @@ public class ResourcelessTransactionManagerTests { } }); transactionTemplate.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertEquals(0, count); count++; @@ -130,8 +140,10 @@ public class ResourcelessTransactionManagerTests { public void testRollback() throws Exception { try { new TransactionTemplate(transactionManager).execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() { + @Override public void afterCompletion(int status) { super.afterCompletion(status); txStatus = status; @@ -153,8 +165,10 @@ public class ResourcelessTransactionManagerTests { final TransactionTemplate transactionTemplate = new TransactionTemplate(transactionManager); try { transactionTemplate.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() { + @Override public void afterCompletion(int status) { super.afterCompletion(status); txStatus = status; @@ -162,6 +176,7 @@ public class ResourcelessTransactionManagerTests { } }); transactionTemplate.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertEquals(0, count); count++; @@ -186,8 +201,10 @@ public class ResourcelessTransactionManagerTests { final TransactionTemplate transactionTemplate = new TransactionTemplate(transactionManager); try { transactionTemplate.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() { + @Override public void afterCompletion(int status) { super.afterCompletion(status); txStatus = status; @@ -195,6 +212,7 @@ public class ResourcelessTransactionManagerTests { } }); transactionTemplate.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { assertEquals(0, count); count++; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareBufferedWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareBufferedWriterTests.java index e9db8e161..f8a2f3847 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareBufferedWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareBufferedWriterTests.java @@ -52,6 +52,7 @@ public class TransactionAwareBufferedWriterTests { fileChannel = createMock(FileChannel.class); writer = new TransactionAwareBufferedWriter(fileChannel, new Runnable() { + @Override public void run() { try { ByteBuffer bb = ByteBuffer.wrap("c".getBytes()); @@ -125,6 +126,7 @@ public class TransactionAwareBufferedWriterTests { replay(fileChannel); new TransactionTemplate(transactionManager).execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { try { writer.write("foo"); @@ -149,6 +151,7 @@ public class TransactionAwareBufferedWriterTests { replay(fileChannel); new TransactionTemplate(transactionManager).execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { try { writer.write("foo"); @@ -173,6 +176,7 @@ public class TransactionAwareBufferedWriterTests { replay(fileChannel); new TransactionTemplate(transactionManager).execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { try { writer.write("foo"); @@ -194,6 +198,7 @@ public class TransactionAwareBufferedWriterTests { public void testWriteWithRollback() throws Exception { try { new TransactionTemplate(transactionManager).execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { try { writer.write("foo"); @@ -224,12 +229,14 @@ public class TransactionAwareBufferedWriterTests { @SuppressWarnings({"unchecked", "rawtypes"}) public void testExceptionOnFlush() throws Exception { writer = new TransactionAwareBufferedWriter(fileChannel, new Runnable() { + @Override public void run() { } }); try { new TransactionTemplate(transactionManager).execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { try { writer.write("foo"); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareListFactoryTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareListFactoryTests.java index 0e76d1e78..f65562b6a 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareListFactoryTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareListFactoryTests.java @@ -66,6 +66,7 @@ public class TransactionAwareListFactoryTests { @Test public void testTransactionalAdd() throws Exception { transactionTemplate.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { testAdd(); return null; @@ -77,6 +78,7 @@ public class TransactionAwareListFactoryTests { @Test public void testTransactionalRemove() throws Exception { transactionTemplate.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { testRemove(); return null; @@ -88,6 +90,7 @@ public class TransactionAwareListFactoryTests { @Test public void testTransactionalClear() throws Exception { transactionTemplate.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { testClear(); return null; @@ -100,6 +103,7 @@ public class TransactionAwareListFactoryTests { public void testTransactionalAddWithRollback() throws Exception { try { transactionTemplate.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { testAdd(); throw new RuntimeException("Rollback!"); @@ -117,6 +121,7 @@ public class TransactionAwareListFactoryTests { public void testTransactionalRemoveWithRollback() throws Exception { try { transactionTemplate.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { testRemove(); throw new RuntimeException("Rollback!"); @@ -134,6 +139,7 @@ public class TransactionAwareListFactoryTests { public void testTransactionalClearWithRollback() throws Exception { try { transactionTemplate.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { testClear(); throw new RuntimeException("Rollback!"); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareMapFactoryTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareMapFactoryTests.java index d5f73d953..789953de4 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareMapFactoryTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareMapFactoryTests.java @@ -31,6 +31,7 @@ public class TransactionAwareMapFactoryTests extends TestCase { Map map; + @Override protected void setUp() throws Exception { Map seed = new HashMap(); seed.put("foo", "oof"); @@ -72,6 +73,7 @@ public class TransactionAwareMapFactoryTests extends TestCase { public void testTransactionalAdd() throws Exception { transactionTemplate.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { testAdd(); return null; @@ -82,6 +84,7 @@ public class TransactionAwareMapFactoryTests extends TestCase { public void testTransactionalEmpty() throws Exception { transactionTemplate.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { testEmpty(); return null; @@ -92,6 +95,7 @@ public class TransactionAwareMapFactoryTests extends TestCase { public void testTransactionalValues() throws Exception { transactionTemplate.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { testValues(); return null; @@ -102,6 +106,7 @@ public class TransactionAwareMapFactoryTests extends TestCase { public void testTransactionalRemove() throws Exception { transactionTemplate.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { testRemove(); return null; @@ -112,6 +117,7 @@ public class TransactionAwareMapFactoryTests extends TestCase { public void testTransactionalClear() throws Exception { transactionTemplate.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { testClear(); return null; @@ -123,6 +129,7 @@ public class TransactionAwareMapFactoryTests extends TestCase { public void testTransactionalAddWithRollback() throws Exception { try { transactionTemplate.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { testAdd(); throw new RuntimeException("Rollback!"); @@ -139,6 +146,7 @@ public class TransactionAwareMapFactoryTests extends TestCase { public void testTransactionalRemoveWithRollback() throws Exception { try { transactionTemplate.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { testRemove(); throw new RuntimeException("Rollback!"); @@ -155,6 +163,7 @@ public class TransactionAwareMapFactoryTests extends TestCase { public void testTransactionalClearWithRollback() throws Exception { try { transactionTemplate.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { testClear(); throw new RuntimeException("Rollback!"); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareSetFactoryTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareSetFactoryTests.java index 0ce9f9658..515a332fd 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareSetFactoryTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareSetFactoryTests.java @@ -67,6 +67,7 @@ public class TransactionAwareSetFactoryTests { @Test public void testTransactionalAdd() throws Exception { transactionTemplate.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { testAdd(); return null; @@ -78,6 +79,7 @@ public class TransactionAwareSetFactoryTests { @Test public void testTransactionalRemove() throws Exception { transactionTemplate.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { testRemove(); return null; @@ -89,6 +91,7 @@ public class TransactionAwareSetFactoryTests { @Test public void testTransactionalClear() throws Exception { transactionTemplate.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { testClear(); return null; @@ -101,6 +104,7 @@ public class TransactionAwareSetFactoryTests { public void testTransactionalAddWithRollback() throws Exception { try { transactionTemplate.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { testAdd(); throw new RuntimeException("Rollback!"); @@ -118,6 +122,7 @@ public class TransactionAwareSetFactoryTests { public void testTransactionalRemoveWithRollback() throws Exception { try { transactionTemplate.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { testRemove(); throw new RuntimeException("Rollback!"); @@ -135,6 +140,7 @@ public class TransactionAwareSetFactoryTests { public void testTransactionalClearWithRollback() throws Exception { try { transactionTemplate.execute(new TransactionCallback() { + @Override public Object doInTransaction(TransactionStatus status) { testClear(); throw new RuntimeException("Rollback!"); diff --git a/spring-batch-infrastructure/src/test/java/test/jdbc/datasource/DataSourceInitializer.java b/spring-batch-infrastructure/src/test/java/test/jdbc/datasource/DataSourceInitializer.java index 0f34deaaa..a13153ba6 100644 --- a/spring-batch-infrastructure/src/test/java/test/jdbc/datasource/DataSourceInitializer.java +++ b/spring-batch-infrastructure/src/test/java/test/jdbc/datasource/DataSourceInitializer.java @@ -80,12 +80,14 @@ public class DataSourceInitializer implements InitializingBean, DisposableBean { * @throws Throwable * @see java.lang.Object#finalize() */ + @Override protected void finalize() throws Throwable { logger.debug("finalize called for " + dataSource); super.finalize(); initialized = false; } + @Override public void destroy() { logger.info("destroy called for " + dataSource); doDestroy(); @@ -109,6 +111,7 @@ public class DataSourceInitializer implements InitializingBean, DisposableBean { } } + @Override public void afterPropertiesSet() throws Exception { Assert.notNull(dataSource); initialize(); @@ -135,6 +138,7 @@ public class DataSourceInitializer implements InitializingBean, DisposableBean { TransactionTemplate transactionTemplate = new TransactionTemplate(new DataSourceTransactionManager(dataSource)); transactionTemplate.execute(new TransactionCallback() { + @Override @SuppressWarnings("unchecked") public Object doInTransaction(TransactionStatus status) { String[] scripts; diff --git a/spring-batch-infrastructure/src/test/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java b/spring-batch-infrastructure/src/test/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java index c9b6e0ab4..b9cfd1a3e 100644 --- a/spring-batch-infrastructure/src/test/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java +++ b/spring-batch-infrastructure/src/test/java/test/jdbc/datasource/DerbyDataSourceFactoryBean.java @@ -19,6 +19,7 @@ public class DerbyDataSourceFactoryBean extends AbstractFactoryBean { this.dataDirectory = dataDirectory; } + @Override protected Object createInstance() throws Exception { File directory = new File(dataDirectory); System.setProperty("derby.system.home", directory.getCanonicalPath()); @@ -34,6 +35,7 @@ public class DerbyDataSourceFactoryBean extends AbstractFactoryBean { return ds; } + @Override public Class getObjectType() { return DataSource.class; } diff --git a/spring-batch-infrastructure/src/test/java/test/jdbc/datasource/DerbyShutdownBean.java b/spring-batch-infrastructure/src/test/java/test/jdbc/datasource/DerbyShutdownBean.java index eb5955074..0c551f820 100644 --- a/spring-batch-infrastructure/src/test/java/test/jdbc/datasource/DerbyShutdownBean.java +++ b/spring-batch-infrastructure/src/test/java/test/jdbc/datasource/DerbyShutdownBean.java @@ -22,6 +22,7 @@ public class DerbyShutdownBean implements DisposableBean { this.dataSource = dataSource; } + @Override public void destroy() throws Exception { logger.info("Attempting Derby database shut down on: " + dataSource); if (!isShutdown && dataSource != null diff --git a/spring-batch-test/pom.xml b/spring-batch-test/pom.xml index 025dc172a..0a4f06922 100755 --- a/spring-batch-test/pom.xml +++ b/spring-batch-test/pom.xml @@ -11,20 +11,6 @@ 2.2.0.BUILD-SNAPSHOT ../spring-batch-parent - - - tiger - - 1.5 - - - - stax - stax - - - - org.springframework.batch diff --git a/spring-batch-test/src/main/java/org/springframework/batch/test/AbstractJobTests.java b/spring-batch-test/src/main/java/org/springframework/batch/test/AbstractJobTests.java index 35b2d5a26..00dbb07a8 100644 --- a/spring-batch-test/src/main/java/org/springframework/batch/test/AbstractJobTests.java +++ b/spring-batch-test/src/main/java/org/springframework/batch/test/AbstractJobTests.java @@ -88,6 +88,7 @@ public abstract class AbstractJobTests implements ApplicationContextAware { /** * {@inheritDoc} */ + @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { this.applicationContext = applicationContext; } diff --git a/spring-batch-test/src/main/java/org/springframework/batch/test/DataSourceInitializer.java b/spring-batch-test/src/main/java/org/springframework/batch/test/DataSourceInitializer.java index 27138b43c..0f4ddfd3c 100755 --- a/spring-batch-test/src/main/java/org/springframework/batch/test/DataSourceInitializer.java +++ b/spring-batch-test/src/main/java/org/springframework/batch/test/DataSourceInitializer.java @@ -76,6 +76,7 @@ public class DataSourceInitializer implements InitializingBean, DisposableBean { DataSourceInitializer.class.getSimpleName() + "-context.xml")); } + @Override public void destroy() { if (destroyScripts==null) return; for (int i = 0; i < destroyScripts.length; i++) { @@ -94,6 +95,7 @@ public class DataSourceInitializer implements InitializingBean, DisposableBean { } } + @Override public void afterPropertiesSet() throws Exception { Assert.notNull(dataSource); initialize(); @@ -118,6 +120,7 @@ public class DataSourceInitializer implements InitializingBean, DisposableBean { TransactionTemplate transactionTemplate = new TransactionTemplate(new DataSourceTransactionManager(dataSource)); transactionTemplate.execute(new TransactionCallback() { + @Override @SuppressWarnings("unchecked") public Object doInTransaction(TransactionStatus status) { JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource); diff --git a/spring-batch-test/src/main/java/org/springframework/batch/test/JobRepositoryTestUtils.java b/spring-batch-test/src/main/java/org/springframework/batch/test/JobRepositoryTestUtils.java index 0a50af87b..49d3dd0b5 100644 --- a/spring-batch-test/src/main/java/org/springframework/batch/test/JobRepositoryTestUtils.java +++ b/spring-batch-test/src/main/java/org/springframework/batch/test/JobRepositoryTestUtils.java @@ -58,6 +58,7 @@ public class JobRepositoryTestUtils extends AbstractJdbcBatchMetadataDao impleme Long count = 0L; + @Override public JobParameters getNext(JobParameters parameters) { return new JobParameters(Collections.singletonMap("count", new JobParameter(count++))); } @@ -69,6 +70,7 @@ public class JobRepositoryTestUtils extends AbstractJdbcBatchMetadataDao impleme /** * @see InitializingBean#afterPropertiesSet() */ + @Override public void afterPropertiesSet() throws Exception { Assert.notNull(jobRepository, "JobRepository must be set"); Assert.notNull(jdbcTemplate, "DataSource must be set"); @@ -165,6 +167,7 @@ public class JobRepositoryTestUtils extends AbstractJdbcBatchMetadataDao impleme List stepExecutionIds = jdbcTemplate.query( getQuery("select STEP_EXECUTION_ID from %PREFIX%STEP_EXECUTION where JOB_EXECUTION_ID=?"), new ParameterizedRowMapper() { + @Override public Long mapRow(ResultSet rs, int rowNum) throws SQLException { return rs.getLong(1); } diff --git a/spring-batch-test/src/main/java/org/springframework/batch/test/StepRunner.java b/spring-batch-test/src/main/java/org/springframework/batch/test/StepRunner.java index b8a5cbca8..c5b87685b 100755 --- a/spring-batch-test/src/main/java/org/springframework/batch/test/StepRunner.java +++ b/spring-batch-test/src/main/java/org/springframework/batch/test/StepRunner.java @@ -143,6 +143,7 @@ public class StepRunner { // if (jobExecutionContext != null && !jobExecutionContext.isEmpty()) { job.setJobExecutionListeners(new JobExecutionListener[] { new JobExecutionListenerSupport() { + @Override public void beforeJob(JobExecution jobExecution) { ExecutionContext jobContext = jobExecution.getExecutionContext(); for (Map.Entry entry : jobExecutionContext.entrySet()) { diff --git a/spring-batch-test/src/main/java/org/springframework/batch/test/StepScopeTestExecutionListener.java b/spring-batch-test/src/main/java/org/springframework/batch/test/StepScopeTestExecutionListener.java index ec82fb980..c0783f49a 100644 --- a/spring-batch-test/src/main/java/org/springframework/batch/test/StepScopeTestExecutionListener.java +++ b/spring-batch-test/src/main/java/org/springframework/batch/test/StepScopeTestExecutionListener.java @@ -74,6 +74,7 @@ public class StepScopeTestExecutionListener implements TestExecutionListener { * @throws Exception if there is a problem * @see TestExecutionListener#prepareTestInstance(TestContext) */ + @Override public void prepareTestInstance(TestContext testContext) throws Exception { StepExecution stepExecution = getStepExecution(testContext); if (stepExecution != null) { @@ -86,6 +87,7 @@ public class StepScopeTestExecutionListener implements TestExecutionListener { * @throws Exception if there is a problem * @see TestExecutionListener#beforeTestMethod(TestContext) */ + @Override public void beforeTestMethod(org.springframework.test.context.TestContext testContext) throws Exception { if (testContext.hasAttribute(STEP_EXECUTION)) { StepExecution stepExecution = (StepExecution) testContext.getAttribute(STEP_EXECUTION); @@ -99,6 +101,7 @@ public class StepScopeTestExecutionListener implements TestExecutionListener { * @throws Exception if there is a problem * @see TestExecutionListener#afterTestMethod(TestContext) */ + @Override public void afterTestMethod(TestContext testContext) throws Exception { if (testContext.hasAttribute(STEP_EXECUTION)) { StepSynchronizationManager.close(); @@ -108,12 +111,14 @@ public class StepScopeTestExecutionListener implements TestExecutionListener { /* * Support for Spring 3.0 (empty). */ + @Override public void afterTestClass(TestContext testContext) throws Exception { } /* * Support for Spring 3.0 (empty). */ + @Override public void beforeTestClass(TestContext testContext) throws Exception { } @@ -168,6 +173,7 @@ public class StepScopeTestExecutionListener implements TestExecutionListener { return result == null ? null : result.getName(); } + @Override public void doWith(Method method) throws IllegalArgumentException, IllegalAccessException { Class type = method.getReturnType(); if (preferredType.isAssignableFrom(type)) { diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/JobRepositoryTestUtilsTests.java b/spring-batch-test/src/test/java/org/springframework/batch/test/JobRepositoryTestUtilsTests.java index 42b403373..0da88c6ad 100644 --- a/spring-batch-test/src/test/java/org/springframework/batch/test/JobRepositoryTestUtilsTests.java +++ b/spring-batch-test/src/test/java/org/springframework/batch/test/JobRepositoryTestUtilsTests.java @@ -134,6 +134,7 @@ public class JobRepositoryTestUtilsTests { public void testCreateJobExecutionsWithIncrementer() throws Exception { utils = new JobRepositoryTestUtils(jobRepository, dataSource); utils.setJobParametersIncrementer(new JobParametersIncrementer() { + @Override public JobParameters getNext(JobParameters parameters) { return new JobParametersBuilder().addString("foo","bar").toJobParameters(); } diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/SampleStepTests.java b/spring-batch-test/src/test/java/org/springframework/batch/test/SampleStepTests.java index 171788e85..daca86a87 100755 --- a/spring-batch-test/src/test/java/org/springframework/batch/test/SampleStepTests.java +++ b/spring-batch-test/src/test/java/org/springframework/batch/test/SampleStepTests.java @@ -53,6 +53,7 @@ public class SampleStepTests implements ApplicationContextAware { assertEquals(2, jdbcTemplate.queryForInt("SELECT ID from TESTS where NAME = 'SampleTasklet2'")); } + @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { this.context = applicationContext; } diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/jmx/JobExecutionNotificationPublisher.java b/spring-batch-test/src/test/java/org/springframework/batch/test/jmx/JobExecutionNotificationPublisher.java index 1fe1d04b5..be5386702 100755 --- a/spring-batch-test/src/test/java/org/springframework/batch/test/jmx/JobExecutionNotificationPublisher.java +++ b/spring-batch-test/src/test/java/org/springframework/batch/test/jmx/JobExecutionNotificationPublisher.java @@ -44,6 +44,7 @@ public class JobExecutionNotificationPublisher implements ApplicationListener, N * * @see org.springframework.jmx.export.notification.NotificationPublisherAware#setNotificationPublisher(org.springframework.jmx.export.notification.NotificationPublisher) */ + @Override public void setNotificationPublisher(NotificationPublisher notificationPublisher) { this.notificationPublisher = notificationPublisher; } @@ -55,6 +56,7 @@ public class JobExecutionNotificationPublisher implements ApplicationListener, N * * @see ApplicationListener#onApplicationEvent(ApplicationEvent) */ + @Override public void onApplicationEvent(ApplicationEvent applicationEvent) { if (applicationEvent instanceof SimpleMessageApplicationEvent) { String message = applicationEvent.toString(); diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/jmx/SimpleMessageApplicationEvent.java b/spring-batch-test/src/test/java/org/springframework/batch/test/jmx/SimpleMessageApplicationEvent.java index a5a239368..e62f2f35e 100755 --- a/spring-batch-test/src/test/java/org/springframework/batch/test/jmx/SimpleMessageApplicationEvent.java +++ b/spring-batch-test/src/test/java/org/springframework/batch/test/jmx/SimpleMessageApplicationEvent.java @@ -19,8 +19,9 @@ public class SimpleMessageApplicationEvent extends ApplicationEvent { /* (non-Javadoc) * @see java.util.EventObject#toString() */ + @Override public String toString() { return "message=["+message+"], " + super.toString(); } -} \ No newline at end of file +} diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/jmx/StepExecutionApplicationEventAdvice.java b/spring-batch-test/src/test/java/org/springframework/batch/test/jmx/StepExecutionApplicationEventAdvice.java index 815552b00..727491f6e 100755 --- a/spring-batch-test/src/test/java/org/springframework/batch/test/jmx/StepExecutionApplicationEventAdvice.java +++ b/spring-batch-test/src/test/java/org/springframework/batch/test/jmx/StepExecutionApplicationEventAdvice.java @@ -36,6 +36,7 @@ public class StepExecutionApplicationEventAdvice implements ApplicationEventPubl * (non-Javadoc) * @see org.springframework.context.ApplicationEventPublisherAware#setApplicationEventPublisher(org.springframework.context.ApplicationEventPublisher) */ + @Override public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) { this.applicationEventPublisher = applicationEventPublisher; } diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/sample/LoggingTasklet.java b/spring-batch-test/src/test/java/org/springframework/batch/test/sample/LoggingTasklet.java index 1a94fcc26..07f9256b8 100644 --- a/spring-batch-test/src/test/java/org/springframework/batch/test/sample/LoggingTasklet.java +++ b/spring-batch-test/src/test/java/org/springframework/batch/test/sample/LoggingTasklet.java @@ -17,6 +17,7 @@ public class LoggingTasklet implements Tasklet { this.id = id; } + @Override public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) throws Exception { logger.info("tasklet executing: id=" + id); return RepeatStatus.FINISHED; diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/sample/SampleTasklet.java b/spring-batch-test/src/test/java/org/springframework/batch/test/sample/SampleTasklet.java index 9acd41268..e9a75575a 100755 --- a/spring-batch-test/src/test/java/org/springframework/batch/test/sample/SampleTasklet.java +++ b/spring-batch-test/src/test/java/org/springframework/batch/test/sample/SampleTasklet.java @@ -26,6 +26,7 @@ public class SampleTasklet implements Tasklet { this.id = id; } + @Override public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) throws Exception { this.jdbcTemplate.update("insert into TESTS(ID, NAME) values (?, 'SampleTasklet" + id + "')", id);