diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/BatchStatus.java b/spring-batch-core/src/main/java/org/springframework/batch/core/BatchStatus.java index ff158edc3..7dc64a18f 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/BatchStatus.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/BatchStatus.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2007 the original author or authors. + * Copyright 2006-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,11 +17,12 @@ package org.springframework.batch.core; /** - * Enumeration representing the status of a an Execution. + * Enumeration representing the status of an Execution. * * @author Lucas Ward * @author Dave Syer * @author Michael Minella + * @author Mahmoud Ben Hassine */ public enum BatchStatus { diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/ChunkListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/ChunkListener.java index 8596bd4d3..3a661cd85 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/ChunkListener.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/ChunkListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2013 the original author or authors. + * Copyright 2006-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,11 +19,12 @@ import org.springframework.batch.core.scope.context.ChunkContext; /** * Listener interface for the lifecycle of a chunk. A chunk - * can be through of as a collection of items that will be + * can be thought of as a collection of items that will be * committed together. * * @author Lucas Ward * @author Michael Minella + * @author Mahmoud Ben Hassine * */ public interface ChunkListener extends StepListener { @@ -49,7 +50,7 @@ public interface ChunkListener extends StepListener { * after transaction rollback. While the rollback will have occurred, * transactional resources might still be active and accessible. Due to * this, data access code within this callback will still "participate" in - * the original transaction unless it declares that it run in its own + * the original transaction unless it declares that it runs in its own * transaction. Hence: Use PROPAGATION_REQUIRES_NEW for any * transactional operation that is called from here. * 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 e0dfecd19..feeae9a3b 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 @@ -1,5 +1,5 @@ /* - * Copyright 2006-2013 the original author or authors. + * Copyright 2006-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ import org.springframework.util.Assert; * JobInstance can be restarted multiple times in case of execution failure and * it's lifecycle ends with first successful execution. * - * Trying to execute an existing JobIntance that has already completed + * Trying to execute an existing JobInstance that has already completed * successfully will result in error. Error will be raised also for an attempt * to restart a failed JobInstance if the Job is not restartable. * @@ -36,6 +36,7 @@ import org.springframework.util.Assert; * @author Dave Syer * @author Robert Kasanicky * @author Michael Minella + * @author Mahmoud Ben Hassine * */ @SuppressWarnings("serial") diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/JobParametersBuilder.java b/spring-batch-core/src/main/java/org/springframework/batch/core/JobParametersBuilder.java index f56a755ad..a0728c5fb 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/JobParametersBuilder.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/JobParametersBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2013 the original author or authors. + * Copyright 2006-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,6 +40,7 @@ import org.springframework.util.Assert; * @author Lucas Ward * @author Michael Minella * @author Glenn Renfro + * @author Mahmoud Ben Hassine * @since 1.0 * @see JobParameters * @see JobParameter @@ -201,7 +202,7 @@ public class JobParametersBuilder { /** * Conversion method that takes the current state of this builder and - * returns it as a JobruntimeParameters object. + * returns it as a JobParameters object. * * @return a valid {@link JobParameters} object. */ diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/BatchConfigurationException.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/BatchConfigurationException.java index a0e1641f6..c2ea4be41 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/BatchConfigurationException.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/BatchConfigurationException.java @@ -1,5 +1,5 @@ /* - * Copyright 2014 the original author or authors. + * Copyright 2014-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,12 @@ package org.springframework.batch.core.configuration; /** - * Represents an error has occured in the configuration of base batch + * Represents an error has occurred in the configuration of base batch * infrastructure (creation of a {@link org.springframework.batch.core.repository.JobRepository} * for example. * * @author Michael Minella + * @author Mahmoud Ben Hassine * @since 2.2.6 */ public class BatchConfigurationException extends RuntimeException { 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 dce0e4d68..01461f6ab 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 @@ -70,7 +70,7 @@ public class DefaultJobParametersValidator implements JobParametersValidator, In @Override public void afterPropertiesSet() throws IllegalStateException { for (String key : requiredKeys) { - Assert.state(!optionalKeys.contains(key), "Optional keys canot be required: " + key); + Assert.state(!optionalKeys.contains(key), "Optional keys cannot be required: " + key); } } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/ItemProcessListenerAdapter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/ItemProcessListenerAdapter.java index 6f51fda78..2ba2c882e 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/ItemProcessListenerAdapter.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/ItemProcessListenerAdapter.java @@ -39,7 +39,7 @@ public class ItemProcessListenerAdapter implements ItemProcessListener * * @author Chris Schaefer + * @author Mahmoud Ben Hassine * @since 3.0 */ public class JsrBeanDefinitionDocumentReader extends DefaultBeanDefinitionDocumentReader { @@ -64,7 +65,7 @@ public class JsrBeanDefinitionDocumentReader extends DefaultBeanDefinitionDocume private static final String JOB_PARAMETERS_KEY_NAME = "jobParameters"; private static final String JOB_PARAMETERS_BEAN_DEFINITION_NAME = "jsr_jobParameters"; private static final Log LOG = LogFactory.getLog(JsrBeanDefinitionDocumentReader.class); - private static final Pattern PROPERTY_KEY_SEPERATOR = Pattern.compile("'([^']*?)'"); + private static final Pattern PROPERTY_KEY_SEPARATOR = Pattern.compile("'([^']*?)'"); private static final Pattern OPERATOR_PATTERN = Pattern.compile("(#\\{(job(Properties|Parameters))[^}]+\\})"); private BeanDefinitionRegistry beanDefinitionRegistry; @@ -114,9 +115,9 @@ public class JsrBeanDefinitionDocumentReader extends DefaultBeanDefinitionDocume Properties jobParameters = new Properties(); if (getBeanDefinitionRegistry().containsBeanDefinition(JOB_PARAMETERS_BEAN_DEFINITION_NAME)) { - BeanDefinition beanDefintion = getBeanDefinitionRegistry().getBeanDefinition(JOB_PARAMETERS_BEAN_DEFINITION_NAME); + BeanDefinition beanDefinition = getBeanDefinitionRegistry().getBeanDefinition(JOB_PARAMETERS_BEAN_DEFINITION_NAME); - Properties properties = (Properties) beanDefintion.getConstructorArgumentValues() + Properties properties = (Properties) beanDefinition.getConstructorArgumentValues() .getGenericArgumentValue(Properties.class) .getValue(); @@ -185,7 +186,7 @@ public class JsrBeanDefinitionDocumentReader extends DefaultBeanDefinitionDocume Matcher jobParameterMatcher = OPERATOR_PATTERN.matcher(value); while (jobParameterMatcher.find()) { - Matcher jobParameterKeyMatcher = PROPERTY_KEY_SEPERATOR.matcher(jobParameterMatcher.group(1)); + Matcher jobParameterKeyMatcher = PROPERTY_KEY_SEPARATOR.matcher(jobParameterMatcher.group(1)); if (jobParameterKeyMatcher.find()) { String propertyType = jobParameterMatcher.group(2); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/PartitionParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/PartitionParser.java index 8fabc01f5..42866992c 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/PartitionParser.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/PartitionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2014 the original author or authors. + * Copyright 2013-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,6 +35,7 @@ import org.w3c.dom.Element; * Parser for the <partition> element as defined by JSR-352. * * @author Michael Minella + * @author Mahmoud Ben Hassine * @since 3.0 */ public class PartitionParser { @@ -63,7 +64,7 @@ public class PartitionParser { /** * @param stepName the name of the step that is being partitioned - * @param allowStartIfComplete boolean to establish the allowStartIfComplete property for parition properties. + * @param allowStartIfComplete boolean to establish the allowStartIfComplete property for partition properties. */ public PartitionParser(String stepName, boolean allowStartIfComplete) { this.name = stepName; @@ -82,7 +83,7 @@ public class PartitionParser { properties.addPropertyValue("jobRepository", new RuntimeBeanReference("jobRepository")); properties.addPropertyValue("allowStartIfComplete", allowStartIfComplete); - paserMapperElement(element, parserContext, properties); + parseMapperElement(element, parserContext, properties); parsePartitionPlan(element, parserContext, stepName, properties); parseAnalyzerElement(element, parserContext, properties); parseReducerElement(element, parserContext, factoryBeanProperties); @@ -136,7 +137,7 @@ public class PartitionParser { } } - private void paserMapperElement(Element element, + private void parseMapperElement(Element element, ParserContext parserContext, MutablePropertyValues properties) { Element mapperElement = DomUtils.getChildElementByTagName(element, MAPPER_ELEMENT); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/StepParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/StepParser.java index 3b9cc4235..784a5d59f 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/StepParser.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/configuration/xml/StepParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2014 the original author or authors. + * Copyright 2013-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,6 +37,7 @@ import java.util.Collection; * @author Michael Minella * @author Glenn Renfro * @author Chris Schaefer + * @author Mahmoud Ben Hassine * @since 3.0 */ public class StepParser extends AbstractSingleBeanDefinitionParser { @@ -67,11 +68,11 @@ public class StepParser extends AbstractSingleBeanDefinitionParser { } String allowStartIfComplete = element.getAttribute(ALLOW_START_IF_COMPLETE_ATTRIBUTE); - boolean allowStartIfCompletValue = false; + boolean allowStartIfCompleteValue = false; if(StringUtils.hasText(allowStartIfComplete)) { bd.getPropertyValues().addPropertyValue("allowStartIfComplete", allowStartIfComplete); - allowStartIfCompletValue = Boolean.valueOf(allowStartIfComplete); + allowStartIfCompleteValue = Boolean.valueOf(allowStartIfComplete); } new ListenerParser(JsrStepListenerFactoryBean.class, "listeners").parseListeners(element, parserContext, bd, stepName); @@ -92,7 +93,7 @@ public class StepParser extends AbstractSingleBeanDefinitionParser { } else if(name.equals(CHUNK_ELEMENT)) { new ChunkParser().parse(nestedElement, bd, parserContext, stepName); } else if(name.equals(PARTITION_ELEMENT)) { - new PartitionParser(stepName, allowStartIfCompletValue).parse(nestedElement, bd, parserContext, stepName); + new PartitionParser(stepName, allowStartIfCompleteValue).parse(nestedElement, bd, parserContext, stepName); } } } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/partition/PartitionCollectorAdapter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/partition/PartitionCollectorAdapter.java index 9beee363e..25807ee70 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/partition/PartitionCollectorAdapter.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/partition/PartitionCollectorAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2014 the original author or authors. + * Copyright 2013-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,6 +33,7 @@ import org.springframework.util.Assert; * the PartitionCollector will be placed. * * @author Michael Minella + * @author Mahmoud Ben Hassine * @since 3.0 */ public class PartitionCollectorAdapter implements ChunkListener { @@ -69,7 +70,7 @@ public class PartitionCollectorAdapter implements ChunkListener { } } } catch (Throwable e) { - throw new BatchRuntimeException("An error occured while collecting data from the PartionCollector", e); + throw new BatchRuntimeException("An error occurred while collecting data from the PartitionCollector", e); } finally { if(lock.isHeldByCurrentThread()) { lock.unlock(); @@ -89,7 +90,7 @@ public class PartitionCollectorAdapter implements ChunkListener { } } } catch (Throwable e) { - throw new BatchRuntimeException("An error occured while collecting data from the PartionCollector", e); + throw new BatchRuntimeException("An error occurred while collecting data from the PartitionCollector", e); } finally { if(lock.isHeldByCurrentThread()) { lock.unlock(); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/step/builder/JsrBatchletStepBuilder.java b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/step/builder/JsrBatchletStepBuilder.java index 059ef89a6..f5d73c1cb 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/step/builder/JsrBatchletStepBuilder.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/jsr/step/builder/JsrBatchletStepBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 the original author or authors. + * Copyright 2013-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,6 +32,7 @@ import org.springframework.batch.repeat.support.TaskExecutorRepeatTemplate; * of a {@link TaskletStep}. * * @author Michael Minella + * @author Mahmoud Ben Hassine * @since 3.0 */ public class JsrBatchletStepBuilder extends TaskletStepBuilder { @@ -39,7 +40,7 @@ public class JsrBatchletStepBuilder extends TaskletStepBuilder { private BatchPropertyContext batchPropertyContext; /** - * @param context used to resolve lazy binded properties + * @param context used to resolve lazy bound properties */ public void setBatchPropertyContext(BatchPropertyContext context) { this.batchPropertyContext = context; 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 b65687372..4274ad1f1 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 @@ -1,5 +1,5 @@ /* - * Copyright 2006-2014 the original author or authors. + * Copyright 2006-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -56,6 +56,7 @@ import org.springframework.util.Assert; * @author Dave Syer * @author Will Schipp * @author Michael Minella + * @author Mahmoud Ben Hassine * * @since 1.0 * @@ -78,7 +79,9 @@ public class SimpleJobLauncher implements JobLauncher, InitializingBean { * @param job the job to be run. * @param jobParameters the {@link JobParameters} for this particular * execution. - * @return JobExecutionAlreadyRunningException if the JobInstance already + * @return the {@link JobExecution} if it returns synchronously. If the + * implementation is asynchronous, the status might well be unknown. + * @throws JobExecutionAlreadyRunningException if the JobInstance already * exists and has an execution already running. * @throws JobRestartException if the execution would be a re-start, but a * re-start is either not allowed or not needed. 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 91e22b1ea..7b87b98e3 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 @@ -231,11 +231,11 @@ public class JdbcJobExecutionDao extends AbstractJdbcBatchMetadataDao implements // Avoid concurrent modifications... if (count == 0) { - int curentVersion = getJdbcTemplate().queryForObject(getQuery(CURRENT_VERSION_JOB_EXECUTION), Integer.class, + int currentVersion = getJdbcTemplate().queryForObject(getQuery(CURRENT_VERSION_JOB_EXECUTION), Integer.class, new Object[] { jobExecution.getId() }); throw new OptimisticLockingFailureException("Attempt to update job execution id=" + jobExecution.getId() + " with wrong version (" + jobExecution.getVersion() - + "), where current version is " + curentVersion); + + "), where current version is " + currentVersion); } jobExecution.incrementVersion(); 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 2d88f6f35..6ac9a325f 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 @@ -156,7 +156,7 @@ JobInstanceDao, InitializingBean { if (instances.isEmpty()) { return null; } else { - Assert.state(instances.size() == 1, "instance counte must be 1 but was " + instances.size()); + Assert.state(instances.size() == 1, "instance count must be 1 but was " + instances.size()); return instances.get(0); } } 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 3c591534a..7e9da5605 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 @@ -110,7 +110,7 @@ public class JdbcStepExecutionDao extends AbstractJdbcBatchMetadataDao implement /** * Save a StepExecution. A unique id will be generated by the - * stepExecutionIncrementor, and then set in the StepExecution. All values + * stepExecutionIncrementer, and then set in the StepExecution. All values * will then be stored via an INSERT statement. * * @see StepExecutionDao#saveStepExecution(StepExecution) 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 4668dcb6b..72e3511de 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 @@ -1,5 +1,5 @@ /* - * Copyright 2006-2014 the original author or authors. + * Copyright 2006-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,6 +33,7 @@ import org.springframework.util.SerializationUtils; * @author Robert Kasanicky * @author Dave Syer * @author David Turanski + * @author Mahmoud Ben Hassine */ @SuppressWarnings("serial") public class MapExecutionContextDao implements ExecutionContextDao { @@ -151,7 +152,7 @@ public class MapExecutionContextDao implements ExecutionContextDao { @Override public void saveExecutionContexts(Collection stepExecutions) { - Assert.notNull(stepExecutions,"Attempt to save a nulk collection of step executions"); + Assert.notNull(stepExecutions,"Attempt to save a null collection of step executions"); for (StepExecution stepExecution: stepExecutions) { saveExecutionContext(stepExecution); saveExecutionContext(stepExecution.getJobExecution()); 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 b819f5183..b92498ea9 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 @@ -97,7 +97,7 @@ public class MapJobExecutionDao implements JobExecutionDao { synchronized (jobExecution) { if (!persistedExecution.getVersion().equals(jobExecution.getVersion())) { - throw new OptimisticLockingFailureException("Attempt to update step execution id=" + id + throw new OptimisticLockingFailureException("Attempt to update job execution id=" + id + " with wrong version (" + jobExecution.getVersion() + "), where current version is " + persistedExecution.getVersion()); } 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 e753e5ef7..3f480de9a 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 @@ -1,5 +1,5 @@ /* - * Copyright 2006-2017 the original author or authors. + * Copyright 2006-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,9 +39,10 @@ import org.springframework.util.Assert; * * @author Thomas Risberg * @author Michael Minella + * @author Mahmoud Ben Hassine * @since 2.0 * @see ExecutionContextSerializer - * @deprecated Due to the incompattabilities between current Jettison versions and XStream + * @deprecated Due to the incompatibilities between current Jettison versions and XStream * versions, this serializer is deprecated in favor of * {@link Jackson2ExecutionContextStringSerializer} */ diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/AbstractTaskletStepBuilder.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/AbstractTaskletStepBuilder.java index 606486926..055fa637f 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/AbstractTaskletStepBuilder.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/AbstractTaskletStepBuilder.java @@ -79,7 +79,7 @@ StepBuilderHelper> { * Build the step from the components collected by the fluent setters. Delegates first to {@link #enhance(Step)} and * then to {@link #createTasklet()} in subclasses to create the actual tasklet. * - * @return a tasklet step fully configured and read to execute + * @return a tasklet step fully configured and ready to execute */ public TaskletStep build() { diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/PartitionStepBuilder.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/PartitionStepBuilder.java index 4ed72102f..94e7045c1 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/PartitionStepBuilder.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/PartitionStepBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2011 the original author or authors. + * Copyright 2006-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,6 +31,7 @@ import org.springframework.core.task.TaskExecutor; * multiple times with different input parameters (in the form of execution context). Useful for parallelization. * * @author Dave Syer + * @author Mahmoud Ben Hassine * * @since 2.2 */ @@ -133,7 +134,7 @@ public class PartitionStepBuilder extends StepBuilderHelper extends AbstractTaskletStepBuilder diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/ExitStatusTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/ExitStatusTests.java index 979329099..dc98a8061 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/ExitStatusTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/ExitStatusTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2014 the original author or authors. + * Copyright 2006-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,6 +24,7 @@ import org.springframework.util.SerializationUtils; /** * @author Dave Syer + * @author Mahmoud Ben Hassine * */ public class ExitStatusTests { @@ -223,7 +224,7 @@ public class ExitStatusTests { } @Test - public void testUnkownIsRunning() throws Exception { + public void testUnknownIsRunning() throws Exception { assertTrue(ExitStatus.UNKNOWN.isRunning()); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/JobParametersBuilderTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/JobParametersBuilderTests.java index c8e9dac17..9197d0a48 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/JobParametersBuilderTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/JobParametersBuilderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2008-2013 the original author or authors. + * Copyright 2008-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,6 +39,7 @@ import static org.mockito.Mockito.when; * @author Lucas Ward * @author Michael Minella * @author Glenn Renfro + * @author Mahmoud Ben Hassine * */ public class JobParametersBuilderTests { @@ -171,7 +172,7 @@ public class JobParametersBuilderTests { } @Test - public void testPropreties() { + public void testProperties() { Properties props = new Properties(); props.setProperty("SCHEDULE_DATE", "A DATE"); props.setProperty("LONG", "1"); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/JobBuilderConfigurationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/JobBuilderConfigurationTests.java index 8e5a1bb53..1371bc8d6 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/JobBuilderConfigurationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/JobBuilderConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2011 the original author or authors. + * Copyright 2006-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -42,6 +42,7 @@ import org.springframework.context.annotation.Configuration; /** * @author Dave Syer + * @author Mahmoud Ben Hassine * */ public class JobBuilderConfigurationTests { @@ -176,7 +177,7 @@ public class JobBuilderConfigurationTests { private SimpleBatchConfiguration jobs; @Bean - public Job testConfigererJob() throws Exception { + public Job testConfigurerJob() throws Exception { SimpleJobBuilder builder = jobs.jobBuilders().get("configurer").start(step1()); return builder.build(); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/JobScopeConfigurationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/JobScopeConfigurationTests.java index 1fed5213b..8082d019c 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/JobScopeConfigurationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/JobScopeConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2013 the original author or authors. + * Copyright 2006-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -47,6 +47,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; /** * @author Dave Syer * @author Michael Minella + * @author Mahmoud Ben Hassine * */ public class JobScopeConfigurationTests { @@ -78,9 +79,9 @@ public class JobScopeConfigurationTests { } @Test - public void testXmlJobScopeWithInheritence() throws Exception { + public void testXmlJobScopeWithInheritance() throws Exception { context = new ClassPathXmlApplicationContext( - "org/springframework/batch/core/configuration/annotation/JobScopeConfigurationTestsInheritence-context.xml"); + "org/springframework/batch/core/configuration/annotation/JobScopeConfigurationTestsInheritance-context.xml"); JobSynchronizationManager.register(jobExecution); SimpleHolder value = (SimpleHolder) context.getBean("child"); assertEquals("JOB", value.call()); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/StepScopeConfigurationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/StepScopeConfigurationTests.java index 5ccb32567..5eb902ceb 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/StepScopeConfigurationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/StepScopeConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2013 the original author or authors. + * Copyright 2006-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -45,6 +45,7 @@ import static org.junit.Assert.assertEquals; /** * @author Dave Syer * @author Michael Minella + * @author Mahmoud Ben Hassine * */ public class StepScopeConfigurationTests { @@ -76,9 +77,9 @@ public class StepScopeConfigurationTests { } @Test - public void testXmlStepScopeWithInheritence() throws Exception { + public void testXmlStepScopeWithInheritance() throws Exception { context = new ClassPathXmlApplicationContext( - "org/springframework/batch/core/configuration/annotation/StepScopeConfigurationTestsInheritence-context.xml"); + "org/springframework/batch/core/configuration/annotation/StepScopeConfigurationTestsInheritance-context.xml"); StepSynchronizationManager.register(stepExecution); SimpleHolder value = (SimpleHolder) context.getBean("child"); assertEquals("STEP", value.call()); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/GenericApplicationContextFactoryTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/GenericApplicationContextFactoryTests.java index 4a882feb7..973cce6f2 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/GenericApplicationContextFactoryTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/GenericApplicationContextFactoryTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2014 the original author or authors. + * Copyright 2006-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,6 +43,7 @@ import org.springframework.util.ClassUtils; /** * @author Dave Syer + * @author Mahmoud Ben Hassine * */ public class GenericApplicationContextFactoryTests { @@ -147,7 +148,7 @@ public class GenericApplicationContextFactoryTests { } @Test - public void testEqualsMultileConfigs() throws Exception { + public void testEqualsMultipleConfigs() throws Exception { Resource resource1 = new ClassPathResource(ClassUtils.addResourcePathToPackagePath(getClass(), "abstract-context.xml")); Resource resource2 = new ClassPathResource(ClassUtils.addResourcePathToPackagePath(getClass(), 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 797b976b2..363d36abb 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 @@ -1,5 +1,5 @@ /* - * Copyright 2006-2013 the original author or authors. + * Copyright 2006-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -53,6 +53,7 @@ import org.springframework.util.ReflectionUtils; /** * @author Dave Syer * @author Josh Long + * @author Mahmoud Ben Hassine */ @ContextConfiguration @RunWith(SpringJUnit4ClassRunner.class) @@ -205,7 +206,7 @@ public class PartitionStepParserTests implements ApplicationContextAware { } } assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus()); - // Step names not saved by this one (it geosn't have that tasklet) + // Step names not saved by this one (it doesn't have that tasklet) assertEquals("[]", savedStepNames.toString()); List stepNames = getStepNames(jobExecution); assertEquals(7, stepNames.size()); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/JsrJobContextFactoryBeanTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/JsrJobContextFactoryBeanTests.java index 799a28582..d675403c8 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/JsrJobContextFactoryBeanTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/JsrJobContextFactoryBeanTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 the original author or authors. + * Copyright 2013-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -58,7 +58,7 @@ public class JsrJobContextFactoryBeanTests { } @Test - public void testIntialCreationSingleThread() throws Exception { + public void testInitialCreationSingleThread() throws Exception { factoryBean.setJobExecution(new JobExecution(5L)); factoryBean.setBatchPropertyContext(propertyContext); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/configuration/xml/ThreadLocalClassloaderBeanPostProcessorTestsBatchlet.java b/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/configuration/xml/ThreadLocalClassloaderBeanPostProcessorTestsBatchlet.java index b0424c4d7..bf179452e 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/configuration/xml/ThreadLocalClassloaderBeanPostProcessorTestsBatchlet.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/jsr/configuration/xml/ThreadLocalClassloaderBeanPostProcessorTestsBatchlet.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 the original author or authors. + * Copyright 2013-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,7 +36,7 @@ public class ThreadLocalClassloaderBeanPostProcessorTestsBatchlet implements Bat @Override public String process() throws Exception { - Assert.isTrue("someParameter".equals(jobParam1), jobParam1 + " does not equal someParamter"); + Assert.isTrue("someParameter".equals(jobParam1), jobParam1 + " does not equal someParameter"); Assert.isTrue("threadLocalClassloaderBeanPostProcessorTestsJob".equals(jobContext.getJobName()), "jobName does not equal threadLocalClassloaderBeanPostProcessorTestsJob"); Assert.isTrue("step1".equals(stepContext.getStepName()), "stepName does not equal step1"); 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 0546cbd98..3d99f1952 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 @@ -1,5 +1,5 @@ /* - * Copyright 2006-2013 the original author or authors. + * Copyright 2006-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,7 +49,7 @@ public class SimpleJvmExitCodeMapperTests extends TestCase { super.tearDown(); } - public void testGetExitCodeWithpPredefinedCodes() { + public void testGetExitCodeWithPredefinedCodes() { assertEquals( ecm.intValue(ExitStatus.COMPLETED.getExitCode()), ExitCodeMapper.JVM_EXITCODE_COMPLETED); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/context/InteralBeanStepScopeIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/context/InternalBeanStepScopeIntegrationTests.java similarity index 95% rename from spring-batch-core/src/test/java/org/springframework/batch/core/scope/context/InteralBeanStepScopeIntegrationTests.java rename to spring-batch-core/src/test/java/org/springframework/batch/core/scope/context/InternalBeanStepScopeIntegrationTests.java index c9b2ee437..bec365536 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/context/InteralBeanStepScopeIntegrationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/context/InternalBeanStepScopeIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014 the original author or authors. + * Copyright 2014-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,7 +29,7 @@ import static org.junit.Assert.assertEquals; /** * @author mminella */ -public class InteralBeanStepScopeIntegrationTests { +public class InternalBeanStepScopeIntegrationTests { @Test public void testCommitIntervalJobParameter() throws Exception { diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/annotation/JobScopeConfigurationTestsInheritence-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/annotation/JobScopeConfigurationTestsInheritance-context.xml similarity index 100% rename from spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/annotation/JobScopeConfigurationTestsInheritence-context.xml rename to spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/annotation/JobScopeConfigurationTestsInheritance-context.xml diff --git a/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/annotation/StepScopeConfigurationTestsInheritence-context.xml b/spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/annotation/StepScopeConfigurationTestsInheritance-context.xml similarity index 100% rename from spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/annotation/StepScopeConfigurationTestsInheritence-context.xml rename to spring-batch-core/src/test/resources/org/springframework/batch/core/configuration/annotation/StepScopeConfigurationTestsInheritance-context.xml diff --git a/spring-batch-docs/asciidoc/readersAndWriters.adoc b/spring-batch-docs/asciidoc/readersAndWriters.adoc index a415acb35..b5d34d48e 100644 --- a/spring-batch-docs/asciidoc/readersAndWriters.adoc +++ b/spring-batch-docs/asciidoc/readersAndWriters.adoc @@ -546,7 +546,7 @@ interpreted, as described in the following table: |=============== |Property|Type|Description |comments|String[]|Specifies line prefixes that indicate comment rows. -|encoding|String|Specifies what text encoding to use. The default is "ISO-8859-1". +|encoding|String|Specifies what text encoding to use. The default is the value of `Charset.defaultCharset()`. |lineMapper|`LineMapper`|Converts a `String` to an `Object` representing the item. |linesToSkip|int|Number of lines to ignore at the top of the file. |recordSeparatorPolicy|RecordSeparatorPolicy|Used to determine where the line endings are diff --git a/spring-batch-docs/asciidoc/step.adoc b/spring-batch-docs/asciidoc/step.adoc index 5bc65c8a7..034af860b 100644 --- a/spring-batch-docs/asciidoc/step.adoc +++ b/spring-batch-docs/asciidoc/step.adoc @@ -1866,7 +1866,7 @@ Java based configuration lets you configure splits through the provided builders following example shows, the 'split' element contains one or more 'flow' elements, where entire separate flows can be defined. A 'split' element may also contain any of the previously discussed transition elements, such as the 'next' attribute or the 'next', -'end', 'fail', or 'pause' elements. +'end' or 'fail' elements. [source, java, role="javaContent"] ---- 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 113bb2725..6d80a06d5 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2013 the original author or authors. + * Copyright 2012-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,6 +28,7 @@ import org.springframework.util.Assert; *

* * @author Chris Schaefer + * @author Mahmoud Ben Hassine */ public class AmqpItemReader implements ItemReader { private final AmqpTemplate amqpTemplate; @@ -39,7 +40,7 @@ public class AmqpItemReader implements ItemReader { * @param amqpTemplate the template to be used. Must not be null. */ public AmqpItemReader(final AmqpTemplate amqpTemplate) { - Assert.notNull(amqpTemplate, "AmpqTemplate must not be null"); + Assert.notNull(amqpTemplate, "AmqpTemplate must not be null"); this.amqpTemplate = amqpTemplate; } 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 ecc42c813..bb9916829 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012 the original author or authors. + * Copyright 2012-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,13 +32,14 @@ import java.util.List; *

* * @author Chris Schaefer + * @author Mahmoud Ben Hassine */ public class AmqpItemWriter implements ItemWriter { private final AmqpTemplate amqpTemplate; private final Log log = LogFactory.getLog(getClass()); public AmqpItemWriter(final AmqpTemplate amqpTemplate) { - Assert.notNull(amqpTemplate, "AmpqTemplate must not be null"); + Assert.notNull(amqpTemplate, "AmqpTemplate must not be null"); this.amqpTemplate = amqpTemplate; } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/Neo4jItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/Neo4jItemWriter.java index b628f8349..fb07a458e 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/Neo4jItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/Neo4jItemWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 the original author or authors. + * Copyright 2012-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,6 +40,7 @@ import org.springframework.util.CollectionUtils; * * @author Michael Minella * @author Glenn Renfro + * @author Mahmoud Ben Hassine * */ public class Neo4jItemWriter implements ItemWriter, InitializingBean { @@ -94,7 +95,7 @@ public class Neo4jItemWriter implements ItemWriter, InitializingBean { } /** - * Performs the actual write using the template. This can be overriden by + * Performs the actual write using the template. This can be overridden by * a subclass if necessary. * * @param items the list of items to be persisted. diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/RepositoryItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/RepositoryItemWriter.java index dde5c4d23..8f7147c3c 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/RepositoryItemWriter.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/RepositoryItemWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 the original author or authors. + * Copyright 2012-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -52,6 +52,7 @@ import org.springframework.util.MethodInvoker; *

* * @author Michael Minella + * @author Mahmoud Ben Hassine * @since 2.2 */ public class RepositoryItemWriter implements ItemWriter, InitializingBean { @@ -95,7 +96,7 @@ public class RepositoryItemWriter implements ItemWriter, InitializingBean } /** - * Performs the actual write to the repository. This can be overriden by + * Performs the actual write to the repository. This can be overridden by * a subclass if necessary. * * @param items the list of items to be persisted. diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/builder/MongoItemReaderBuilder.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/builder/MongoItemReaderBuilder.java index 906b646a9..aa5494075 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/builder/MongoItemReaderBuilder.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/builder/MongoItemReaderBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 the original author or authors. + * Copyright 2017-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,6 +30,7 @@ import org.springframework.util.StringUtils; * A builder implementation for the {@link MongoItemReader} * * @author Glenn Renfro + * @author Mahmoud Ben Hassine * @since 4.0 * @see MongoItemReader */ @@ -242,7 +243,7 @@ public class MongoItemReaderBuilder { } /** - * Provide a Spring Data Mongo {@link Query}. This will take precidence over a JSON + * Provide a Spring Data Mongo {@link Query}. This will take precedence over a JSON * configured query. * * @param query Query to execute diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/builder/RepositoryItemReaderBuilder.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/builder/RepositoryItemReaderBuilder.java index 0aa754c63..17ac8b892 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/builder/RepositoryItemReaderBuilder.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/builder/RepositoryItemReaderBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 the original author or authors. + * Copyright 2017-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,6 +36,7 @@ import org.springframework.util.StringUtils; * A builder implementation for the {@link RepositoryItemReader}. * * @author Glenn Renfro + * @author Mahmoud Ben Hassine * @since 4.0 * @see RepositoryItemReader */ @@ -249,13 +250,13 @@ public class RepositoryItemReaderBuilder { * not be final. */ public static class RepositoryMethodReference { - private RepositoryMethodIterceptor repositoryInvocationHandler; + private RepositoryMethodInterceptor repositoryInvocationHandler; private PagingAndSortingRepository repository; public RepositoryMethodReference(PagingAndSortingRepository repository) { this.repository = repository; - this.repositoryInvocationHandler = new RepositoryMethodIterceptor(); + this.repositoryInvocationHandler = new RepositoryMethodInterceptor(); } /** @@ -283,7 +284,7 @@ public class RepositoryItemReaderBuilder { } } - private static class RepositoryMethodIterceptor implements MethodInterceptor { + private static class RepositoryMethodInterceptor implements MethodInterceptor { private String methodName; private List arguments; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/builder/StoredProcedureItemReaderBuilder.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/builder/StoredProcedureItemReaderBuilder.java index 936041fc9..6b49d3a9c 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/builder/StoredProcedureItemReaderBuilder.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/builder/StoredProcedureItemReaderBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 the original author or authors. + * Copyright 2017-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,6 +30,7 @@ import org.springframework.util.StringUtils; * A fluent builder API for the configuration of a {@link StoredProcedureItemReader}. * * @author Michael Minella + * @author Mahmoud Ben Hassine * @since 4.0.0 * @see StoredProcedureItemReader */ @@ -318,7 +319,7 @@ public class StoredProcedureItemReaderBuilder { /** * Validates configuration and builds a new reader instance * - * @return a fully constructerd {@link StoredProcedureItemReader} + * @return a fully constructed {@link StoredProcedureItemReader} */ public StoredProcedureItemReader build() { if(this.saveState) { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileHeaderCallback.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileHeaderCallback.java index 4b5da3ef0..8a559304e 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileHeaderCallback.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileHeaderCallback.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2007 the original author or authors. + * Copyright 2006-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,9 +20,10 @@ import java.io.Writer; import java.io.IOException; /** - * Callback interface for writing to a header to a file. + * Callback interface for writing a header to a file. * * @author Robert Kasanicky + * @author Mahmoud Ben Hassine */ public interface FlatFileHeaderCallback { 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 cb3308cf5..ca0ade9b3 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 @@ -122,7 +122,7 @@ public class FlatFileItemReader extends AbstractItemCountingItemStreamItemRea /** * Factory for the {@link BufferedReader} that will be used to extract lines from the file. The default is fine for - * plain text files, but this is a useful strategy for binary files where the standard BufferedReaader from java.io + * plain text files, but this is a useful strategy for binary files where the standard BufferedReader from java.io * is limiting. * * @param bufferedReaderFactory the bufferedReaderFactory to set diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/builder/FlatFileItemReaderBuilder.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/builder/FlatFileItemReaderBuilder.java index b00b363bb..82d4f0e96 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/builder/FlatFileItemReaderBuilder.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/builder/FlatFileItemReaderBuilder.java @@ -657,7 +657,7 @@ public class FlatFileItemReaderBuilder { tokenizer.afterPropertiesSet(); } catch (Exception e) { - throw new IllegalStateException("Unable to intialize DelimitedLineTokenizer", e); + throw new IllegalStateException("Unable to initialize DelimitedLineTokenizer", e); } return tokenizer; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/FieldExtractor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/FieldExtractor.java index 5b738336d..008921dbb 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/FieldExtractor.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/FieldExtractor.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2007 the original author or authors. + * Copyright 2006-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,12 +19,13 @@ package org.springframework.batch.item.file.transform; * This class will convert an object to an array of its parts. * * @author Dave Syer + * @author Mahmoud Ben Hassine * */ public interface FieldExtractor { /** - * @param item the object that contains the the information to be extracted. + * @param item the object that contains the information to be extracted. * @return an array containing item's parts */ Object[] extract(T item); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/poller/Poller.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/poller/Poller.java index 187af6728..3c93f0dfa 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/poller/Poller.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/poller/Poller.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2010 the original author or authors. + * Copyright 2006-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,10 +35,11 @@ import java.util.concurrent.Future; * } * }); * - * Result result = future.get(1000L, TimeUnit.MILLSECONDS); + * Result result = future.get(1000L, TimeUnit.MILLISECONDS); * * * @author Dave Syer + * @author Mahmoud Ben Hassine * */ public interface Poller { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ExecutionContextTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ExecutionContextTests.java index 6b83d4bcc..3b7a3c799 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ExecutionContextTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/ExecutionContextTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2014 the original author or authors. + * Copyright 2006-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,6 +29,7 @@ import org.springframework.util.SerializationUtils; /** * @author Lucas Ward + * @author Mahmoud Ben Hassine * */ public class ExecutionContextTests { @@ -169,7 +170,7 @@ public class ExecutionContextTests { } @Test - public void testCopyConstructorNullnNput() throws Exception { + public void testCopyConstructorNullInput() throws Exception { ExecutionContext context = new ExecutionContext((ExecutionContext) null); assertTrue(context.isEmpty()); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemProccessorIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemProcessorIntegrationTests.java similarity index 93% rename from spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemProccessorIntegrationTests.java rename to spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemProcessorIntegrationTests.java index 83e8696a7..fd07b96a6 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemProccessorIntegrationTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemProcessorIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2008 the original author or authors. + * Copyright 2008-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,10 +32,11 @@ import org.springframework.beans.factory.annotation.Autowired; * Tests for {@link PropertyExtractingDelegatingItemWriter} * * @author Robert Kasanicky + * @author Mahmoud Ben Hassine */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = "pe-delegating-item-writer.xml") -public class PropertyExtractingDelegatingItemProccessorIntegrationTests { +public class PropertyExtractingDelegatingItemProcessorIntegrationTests { @Autowired private PropertyExtractingDelegatingItemWriter processor; 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 3ecbb97d1..dd718d97c 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 @@ -1,5 +1,5 @@ /* - * Copyright 2009-2014 the original author or authors. + * Copyright 2009-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -128,7 +128,7 @@ public class ExtendedConnectionDataSourceProxyTests { } @Test - public void testSupressOfCloseWithJdbcTemplate() throws Exception { + public void testSuppressOfCloseWithJdbcTemplate() throws Exception { Connection con = mock(Connection.class); DataSource ds = mock(DataSource.class); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderConfigTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderConfigTests.java index 368db8fdf..ddd8ca1e8 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderConfigTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderConfigTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2008-2012 the original author or authors. + * Copyright 2008-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,13 +33,13 @@ import org.springframework.test.util.ReflectionTestUtils; public class JdbcPagingItemReaderConfigTests { @Autowired - private JdbcPagingItemReader jdbcPagingItemReder; + private JdbcPagingItemReader jdbcPagingItemReader; @Test public void testConfig() { - assertNotNull(jdbcPagingItemReder); + assertNotNull(jdbcPagingItemReader); NamedParameterJdbcTemplate namedParameterJdbcTemplate = (NamedParameterJdbcTemplate) - ReflectionTestUtils.getField(jdbcPagingItemReder, "namedParameterJdbcTemplate"); + ReflectionTestUtils.getField(jdbcPagingItemReader, "namedParameterJdbcTemplate"); JdbcTemplate jdbcTemplate = (JdbcTemplate) namedParameterJdbcTemplate.getJdbcOperations(); assertEquals(1000, jdbcTemplate.getMaxRows()); assertEquals(100, jdbcTemplate.getFetchSize()); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/jsr/item/ItemReaderAdapterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/jsr/item/ItemReaderAdapterTests.java index 9ac168ce0..30ce4e22d 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/jsr/item/ItemReaderAdapterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/jsr/item/ItemReaderAdapterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2014 the original author or authors. + * Copyright 2013-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -180,7 +180,7 @@ public class ItemReaderAdapterTests { @Override public String toString() { - return "CheckpointContinaer has a count of " + count; + return "CheckpointContainer has a count of " + count; } } } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/jsr/item/ItemWriterAdapterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/jsr/item/ItemWriterAdapterTests.java index 53090d3d4..7e70ce139 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/jsr/item/ItemWriterAdapterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/jsr/item/ItemWriterAdapterTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013-2014 the original author or authors. + * Copyright 2013-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -177,7 +177,7 @@ public class ItemWriterAdapterTests { @Override public String toString() { - return "CheckpointContinaer has a count of " + count; + return "CheckpointContainer has a count of " + count; } } } diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/async/AsyncItemWriter.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/async/AsyncItemWriter.java index 2065db34b..72e652af7 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/async/AsyncItemWriter.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/async/AsyncItemWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2015 the original author or authors. + * Copyright 2006-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -55,7 +55,7 @@ public class AsyncItemWriter implements ItemStreamWriter>, Initiali * of the {@link Future} results in an {@link ExecutionException}, that will be * unwrapped and the cause will be thrown. * - * @param items {@link java.util.concurrent.Future}s to be upwrapped and passed to the delegate + * @param items {@link java.util.concurrent.Future}s to be unwrapped and passed to the delegate * @throws Exception The exception returned by the Future if one was thrown */ public void write(List> items) throws Exception { diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkHandlerFactoryBean.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkHandlerFactoryBean.java index 7592dc422..98a721c87 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkHandlerFactoryBean.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkHandlerFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2010 the original author or authors. + * Copyright 2006-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,6 +44,7 @@ import org.springframework.util.ReflectionUtils; * and the slave listeners in the Remote Chunking pattern for the Step in question. * * @author Dave Syer + * @author Mahmoud Ben Hassine * */ public class RemoteChunkHandlerFactoryBean implements FactoryBean> { @@ -94,7 +95,7 @@ public class RemoteChunkHandlerFactoryBean implements FactoryBean
  • request channel capable of accepting {@link StepExecutionRequest} payloads
  • reply - * channel that returns a list of {@link StepExecution} results
    • The timeout for the repoy should be set + * channel that returns a list of {@link StepExecution} results The timeout for the reply should be set * sufficiently long that the remote steps have time to complete. * * @param messagingGateway the {@link org.springframework.integration.core.MessagingTemplate} to set diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/item/MessagingGatewayIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/item/MessagingGatewayIntegrationTests.java index 4e1a99097..907ee9a37 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/item/MessagingGatewayIntegrationTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/item/MessagingGatewayIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2007 the original author or authors. + * Copyright 2006-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,10 +34,11 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** * Test case showing the use of a MessagingGateway to provide an ItemWriter or - * ItemProcessor to Spring Batch that is hooked directly into a Sprng + * ItemProcessor to Spring Batch that is hooked directly into a Spring * Integration MessageChannel. * * @author Dave Syer + * @author Mahmoud Ben Hassine * */ @ContextConfiguration diff --git a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJdbcIntegrationTests-context.xml b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJdbcIntegrationTests-context.xml index 664aad6c1..259fa62e2 100644 --- a/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJdbcIntegrationTests-context.xml +++ b/spring-batch-integration/src/test/resources/org/springframework/batch/integration/chunk/RemoteChunkFaultTolerantStepJdbcIntegrationTests-context.xml @@ -76,7 +76,7 @@ @@ -132,4 +132,4 @@ - \ No newline at end of file + diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/JobScopeTestExecutionListenerIntegrationTests.java b/spring-batch-test/src/test/java/org/springframework/batch/test/JobScopeTestExecutionListenerIntegrationTests.java index 342df9b61..709374d24 100644 --- a/spring-batch-test/src/test/java/org/springframework/batch/test/JobScopeTestExecutionListenerIntegrationTests.java +++ b/spring-batch-test/src/test/java/org/springframework/batch/test/JobScopeTestExecutionListenerIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2013 the original author or authors. + * Copyright 2013-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,6 +32,7 @@ import org.springframework.test.context.support.DependencyInjectionTestExecution /** * @author Dave Syer + * @author Mahmoud Ben Hassine * @since 2.1 */ @ContextConfiguration @@ -45,7 +46,7 @@ public class JobScopeTestExecutionListenerIntegrationTests { @Autowired private ItemStream stream; - public JobExecution getJobExection() { + public JobExecution getJobExecution() { // Assert that dependencies are already injected... assertNotNull(reader); // Then create the execution for the job scope... diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/StepScopeTestExecutionListenerIntegrationTests.java b/spring-batch-test/src/test/java/org/springframework/batch/test/StepScopeTestExecutionListenerIntegrationTests.java index cf8a7efa0..7235421f8 100644 --- a/spring-batch-test/src/test/java/org/springframework/batch/test/StepScopeTestExecutionListenerIntegrationTests.java +++ b/spring-batch-test/src/test/java/org/springframework/batch/test/StepScopeTestExecutionListenerIntegrationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2010 the original author or authors. + * Copyright 2010-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,6 +32,7 @@ import org.springframework.test.context.support.DependencyInjectionTestExecution /** * @author Dave Syer + * @author Mahmoud Ben Hassine * @since 2.1 */ @ContextConfiguration @@ -45,7 +46,7 @@ public class StepScopeTestExecutionListenerIntegrationTests { @Autowired private ItemStream stream; - public StepExecution getStepExection() { + public StepExecution getStepExecution() { // Assert that dependencies are already injected... assertNotNull(reader); // Then create the execution for the step scope...