diff --git a/pom.xml b/pom.xml index 261a85ea7..76e379f51 100644 --- a/pom.xml +++ b/pom.xml @@ -152,7 +152,7 @@ 3.12.1 3.4.3 3.3.0 - 0.0.34 + 0.0.39 diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/aot/CoreRuntimeHints.java b/spring-batch-core/src/main/java/org/springframework/batch/core/aot/CoreRuntimeHints.java index 51b474250..84a3c6e88 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/aot/CoreRuntimeHints.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/aot/CoreRuntimeHints.java @@ -98,15 +98,15 @@ public class CoreRuntimeHints implements RuntimeHintsRegistrar { // proxy hints hints.proxies() - .registerJdkProxy(builder -> builder - .proxiedInterfaces(TypeReference.of("org.springframework.batch.core.repository.JobRepository")) - .proxiedInterfaces(SpringProxy.class, Advised.class, DecoratingProxy.class)) - .registerJdkProxy(builder -> builder - .proxiedInterfaces(TypeReference.of("org.springframework.batch.core.explore.JobExplorer")) - .proxiedInterfaces(SpringProxy.class, Advised.class, DecoratingProxy.class)) - .registerJdkProxy(builder -> builder - .proxiedInterfaces(TypeReference.of("org.springframework.batch.core.launch.JobOperator")) - .proxiedInterfaces(SpringProxy.class, Advised.class, DecoratingProxy.class)); + .registerJdkProxy(builder -> builder + .proxiedInterfaces(TypeReference.of("org.springframework.batch.core.repository.JobRepository")) + .proxiedInterfaces(SpringProxy.class, Advised.class, DecoratingProxy.class)) + .registerJdkProxy(builder -> builder + .proxiedInterfaces(TypeReference.of("org.springframework.batch.core.explore.JobExplorer")) + .proxiedInterfaces(SpringProxy.class, Advised.class, DecoratingProxy.class)) + .registerJdkProxy(builder -> builder + .proxiedInterfaces(TypeReference.of("org.springframework.batch.core.launch.JobOperator")) + .proxiedInterfaces(SpringProxy.class, Advised.class, DecoratingProxy.class)); // reflection hints hints.reflection().registerType(Types.class, MemberCategory.DECLARED_FIELDS); @@ -122,8 +122,9 @@ public class CoreRuntimeHints implements RuntimeHintsRegistrar { hints.reflection().registerType(Entity.class, MemberCategory.values()); hints.reflection().registerType(ExecutionContext.class, MemberCategory.values()); hints.reflection().registerType(Chunk.class, MemberCategory.values()); - jdkTypes.stream().map(TypeReference::of) - .forEach(type -> hints.reflection().registerType(type, MemberCategory.values())); + jdkTypes.stream() + .map(TypeReference::of) + .forEach(type -> hints.reflection().registerType(type, MemberCategory.values())); // serialization hints SerializationHints serializationHints = hints.serialization(); @@ -135,7 +136,7 @@ public class CoreRuntimeHints implements RuntimeHintsRegistrar { Period.class, HashMap.class, Hashtable.class, ArrayList.class, JobParameter.class, JobParameters.class, ExitStatus.class, JobInstance.class, JobExecution.class, StepExecution.class, StepContribution.class, Entity.class, ExecutionContext.class, Chunk.class, Properties.class, Exception.class, UUID.class) - .forEach(serializationHints::registerType); + .forEach(serializationHints::registerType); jdkTypes.stream().map(TypeReference::of).forEach(serializationHints::registerType); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/AutomaticJobRegistrarBeanPostProcessor.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/AutomaticJobRegistrarBeanPostProcessor.java index efc02e722..ba8cfbad7 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/AutomaticJobRegistrarBeanPostProcessor.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/AutomaticJobRegistrarBeanPostProcessor.java @@ -46,7 +46,7 @@ class AutomaticJobRegistrarBeanPostProcessor implements BeanFactoryPostProcessor AutomaticJobRegistrar automaticJobRegistrar = (AutomaticJobRegistrar) bean; automaticJobRegistrar.setJobLoader(new DefaultJobLoader(this.beanFactory.getBean(JobRegistry.class))); for (ApplicationContextFactory factory : this.beanFactory.getBeansOfType(ApplicationContextFactory.class) - .values()) { + .values()) { automaticJobRegistrar.addApplicationContextFactory(factory); } return automaticJobRegistrar; diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/BatchRegistrar.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/BatchRegistrar.java index 9d0ee7fcd..b775d1af7 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/BatchRegistrar.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/BatchRegistrar.java @@ -54,8 +54,9 @@ class BatchRegistrar implements ImportBeanDefinitionRegistrar { StopWatch watch = new StopWatch(); watch.start(); validateState(importingClassMetadata); - EnableBatchProcessing batchAnnotation = importingClassMetadata.getAnnotations().get(EnableBatchProcessing.class) - .synthesize(); + EnableBatchProcessing batchAnnotation = importingClassMetadata.getAnnotations() + .get(EnableBatchProcessing.class) + .synthesize(); registerJobRepository(registry, batchAnnotation); registerJobExplorer(registry, batchAnnotation); registerJobLauncher(registry, batchAnnotation); @@ -82,7 +83,7 @@ class BatchRegistrar implements ImportBeanDefinitionRegistrar { return; } BeanDefinitionBuilder beanDefinitionBuilder = BeanDefinitionBuilder - .genericBeanDefinition(JobRepositoryFactoryBean.class); + .genericBeanDefinition(JobRepositoryFactoryBean.class); // set mandatory properties String dataSourceRef = batchAnnotation.dataSourceRef(); @@ -139,7 +140,7 @@ class BatchRegistrar implements ImportBeanDefinitionRegistrar { return; } BeanDefinitionBuilder beanDefinitionBuilder = BeanDefinitionBuilder - .genericBeanDefinition(JobExplorerFactoryBean.class); + .genericBeanDefinition(JobExplorerFactoryBean.class); // set mandatory properties String dataSourceRef = batchAnnotation.dataSourceRef(); @@ -183,7 +184,7 @@ class BatchRegistrar implements ImportBeanDefinitionRegistrar { return; } BeanDefinitionBuilder beanDefinitionBuilder = BeanDefinitionBuilder - .genericBeanDefinition(TaskExecutorJobLauncher.class); + .genericBeanDefinition(TaskExecutorJobLauncher.class); // set mandatory properties beanDefinitionBuilder.addPropertyReference("jobRepository", "jobRepository"); @@ -202,7 +203,7 @@ class BatchRegistrar implements ImportBeanDefinitionRegistrar { return; } BeanDefinition beanDefinition = BeanDefinitionBuilder.genericBeanDefinition(MapJobRegistry.class) - .getBeanDefinition(); + .getBeanDefinition(); registry.registerBeanDefinition("jobRegistry", beanDefinition); } @@ -213,7 +214,7 @@ class BatchRegistrar implements ImportBeanDefinitionRegistrar { return; } BeanDefinitionBuilder beanDefinitionBuilder = BeanDefinitionBuilder - .genericBeanDefinition(JobOperatorFactoryBean.class); + .genericBeanDefinition(JobOperatorFactoryBean.class); // set mandatory properties String transactionManagerRef = batchAnnotation.transactionManagerRef(); beanDefinitionBuilder.addPropertyReference("transactionManager", transactionManagerRef); @@ -236,11 +237,13 @@ class BatchRegistrar implements ImportBeanDefinitionRegistrar { return; } BeanDefinition jobLoaderBeanDefinition = BeanDefinitionBuilder.genericBeanDefinition(DefaultJobLoader.class) - .addPropertyReference("jobRegistry", "jobRegistry").getBeanDefinition(); + .addPropertyReference("jobRegistry", "jobRegistry") + .getBeanDefinition(); registry.registerBeanDefinition("jobLoader", jobLoaderBeanDefinition); BeanDefinition jobRegistrarBeanDefinition = BeanDefinitionBuilder - .genericBeanDefinition(AutomaticJobRegistrar.class).addPropertyReference("jobLoader", "jobLoader") - .getBeanDefinition(); + .genericBeanDefinition(AutomaticJobRegistrar.class) + .addPropertyReference("jobLoader", "jobLoader") + .getBeanDefinition(); registry.registerBeanDefinition("jobRegistrar", jobRegistrarBeanDefinition); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/JobScope.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/JobScope.java index 8434ddbf6..91b70fc0d 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/JobScope.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/JobScope.java @@ -47,7 +47,6 @@ import java.lang.annotation.RetentionPolicy; * * @author Michael Minella * @author Taeik Lim - * * @since 3.0.1 * */ diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/StepScope.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/StepScope.java index 6424bd1ad..712f97e9b 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/StepScope.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/StepScope.java @@ -47,7 +47,6 @@ import java.lang.annotation.RetentionPolicy; * * @author Dave Syer * @author Taeik Lim - * * @since 2.2 * */ diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractFlowParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractFlowParser.java index e434da270..2e3e36e5d 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractFlowParser.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractFlowParser.java @@ -203,7 +203,7 @@ public abstract class AbstractFlowParser extends AbstractSingleBeanDefinitionPar String flowName = (String) builder.getRawBeanDefinition().getAttribute("flowName"); if (!stepExists && !StringUtils.hasText(element.getAttribute("parent"))) { parserContext.getReaderContext() - .error("The flow [" + flowName + "] must contain at least one step, flow or split", element); + .error("The flow [" + flowName + "] must contain at least one step, flow or split", element); } // Ensure that all elements are reachable @@ -326,8 +326,9 @@ public abstract class AbstractFlowParser extends AbstractSingleBeanDefinitionPar } } else if (hasNextAttribute) { - parserContext.getReaderContext().error("The <" + element.getNodeName() + "/> may not contain a '" - + NEXT_ATTR + "' attribute and a transition element", element); + parserContext.getReaderContext() + .error("The <" + element.getNodeName() + "/> may not contain a '" + NEXT_ATTR + + "' attribute and a transition element", element); } return list; @@ -345,8 +346,8 @@ public abstract class AbstractFlowParser extends AbstractSingleBeanDefinitionPar ParserContext parserContext) { String onAttribute = transitionElement.getAttribute(ON_ATTR); if (patterns.contains(onAttribute)) { - parserContext.getReaderContext().error("Duplicate transition pattern found for '" + onAttribute + "'", - element); + parserContext.getReaderContext() + .error("Duplicate transition pattern found for '" + onAttribute + "'", element); } patterns.add(onAttribute); } @@ -398,7 +399,7 @@ public abstract class AbstractFlowParser extends AbstractSingleBeanDefinitionPar if (status.isEnd()) { BeanDefinitionBuilder endBuilder = BeanDefinitionBuilder - .genericBeanDefinition("org.springframework.batch.core.job.flow.support.state.EndState"); + .genericBeanDefinition("org.springframework.batch.core.job.flow.support.state.EndState"); boolean exitCodeExists = StringUtils.hasText(exitCode); @@ -477,7 +478,7 @@ public abstract class AbstractFlowParser extends AbstractSingleBeanDefinitionPar BeanDefinition stateDefinition, String on, String next) { BeanDefinitionBuilder nextBuilder = BeanDefinitionBuilder - .genericBeanDefinition("org.springframework.batch.core.job.flow.support.StateTransition"); + .genericBeanDefinition("org.springframework.batch.core.job.flow.support.StateTransition"); nextBuilder.addConstructorArgValue(stateDefinition); if (StringUtils.hasText(on)) { diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractListenerParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractListenerParser.java index 0d4bdbafb..5b59b2ab0 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractListenerParser.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractListenerParser.java @@ -82,7 +82,7 @@ public abstract class AbstractListenerParser { else if (beanElements.size() == 1) { Element beanElement = beanElements.get(0); BeanDefinitionHolder beanDefinitionHolder = parserContext.getDelegate() - .parseBeanDefinitionElement(beanElement, enclosing); + .parseBeanDefinitionElement(beanElement, enclosing); parserContext.getDelegate().decorateBeanDefinitionIfRequired(beanElement, beanDefinitionHolder); return beanDefinitionHolder; } @@ -120,9 +120,9 @@ public abstract class AbstractListenerParser { String id = element.getAttribute(ID_ATTR); parserContext.getReaderContext() - .error("The <" + element.getTagName() + (StringUtils.hasText(id) ? " id=\"" + id + "\"" : "") - + "/> element must have exactly one of: '" + REF_ATTR + "' attribute, <" + BEAN_ELE - + "/> attribute, or <" + REF_ELE + "/> element. Found: " + found + ".", element); + .error("The <" + element.getTagName() + (StringUtils.hasText(id) ? " id=\"" + id + "\"" : "") + + "/> element must have exactly one of: '" + REF_ATTR + "' attribute, <" + BEAN_ELE + + "/> attribute, or <" + REF_ELE + "/> element. Found: " + found + ".", element); } } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractStepParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractStepParser.java index d8972ad37..c00c43a09 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractStepParser.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/AbstractStepParser.java @@ -143,7 +143,7 @@ public abstract class AbstractStepParser { if ((ns == null && name.equals(BeanDefinitionParserDelegate.BEAN_ELEMENT)) || ns.equals(BeanDefinitionParserDelegate.BEANS_NAMESPACE_URI)) { BeanDefinitionHolder holder = parserContext.getDelegate() - .parseBeanDefinitionElement(nestedElement); + .parseBeanDefinitionElement(nestedElement); value = parserContext.getDelegate().decorateBeanDefinitionIfRequired(nestedElement, holder); } // Spring Batch transitions diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/ChunkElementParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/ChunkElementParser.java index 7e9ab5ef4..9eca08f0e 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/ChunkElementParser.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/ChunkElementParser.java @@ -94,7 +94,7 @@ public class ChunkElementParser { if (commitInterval.startsWith("#")) { // It's a late binding expression, so we need step scope... BeanDefinitionBuilder completionPolicy = BeanDefinitionBuilder - .genericBeanDefinition(SimpleCompletionPolicy.class); + .genericBeanDefinition(SimpleCompletionPolicy.class); completionPolicy.addConstructorArgValue(commitInterval); completionPolicy.setScope("step"); propertyValues.addPropertyValue("chunkCompletionPolicy", completionPolicy.getBeanDefinition()); @@ -114,16 +114,13 @@ public class ChunkElementParser { && propertyValues.contains("commitInterval") == propertyValues.contains("chunkCompletionPolicy")) { if (propertyValues.contains("commitInterval")) { parserContext.getReaderContext() - .error("The <" + element.getNodeName() + "/> element must contain either '" - + COMMIT_INTERVAL_ATTR + "' " + "or '" + CHUNK_COMPLETION_POLICY_ATTR - + "', but not both.", element); + .error("The <" + element.getNodeName() + "/> element must contain either '" + COMMIT_INTERVAL_ATTR + + "' " + "or '" + CHUNK_COMPLETION_POLICY_ATTR + "', but not both.", element); } else { - parserContext - .getReaderContext().error( - "The <" + element.getNodeName() + "/> element must contain either '" - + COMMIT_INTERVAL_ATTR + "' " + "or '" + CHUNK_COMPLETION_POLICY_ATTR + "'.", - element); + parserContext.getReaderContext() + .error("The <" + element.getNodeName() + "/> element must contain either '" + COMMIT_INTERVAL_ATTR + + "' " + "or '" + CHUNK_COMPLETION_POLICY_ATTR + "'.", element); } } @@ -214,23 +211,24 @@ public class ChunkElementParser { if (children.size() == 1) { if (StringUtils.hasText(refName)) { parserContext.getReaderContext() - .error("The <" + element.getNodeName() + "/> element may not have both a '" + handlerName - + "' attribute and a <" + handlerName + "/> element.", element); + .error("The <" + element.getNodeName() + "/> element may not have both a '" + handlerName + + "' attribute and a <" + handlerName + "/> element.", element); } handleItemHandlerElement(enclosing, propertyName, adapterClassName, propertyValues, children.get(0), parserContext); } else if (children.size() > 1) { - parserContext.getReaderContext().error("The <" + handlerName - + "/> element may not appear more than once in a single <" + element.getNodeName() + "/>.", - element); + parserContext.getReaderContext() + .error("The <" + handlerName + "/> element may not appear more than once in a single <" + + element.getNodeName() + "/>.", element); } else if (StringUtils.hasText(refName)) { propertyValues.addPropertyValue(propertyName, new RuntimeBeanReference(refName)); } else if (required && !underspecified) { - parserContext.getReaderContext().error("The <" + element.getNodeName() + "/> element has neither a '" - + handlerName + "' attribute nor a <" + handlerName + "/> element.", element); + parserContext.getReaderContext() + .error("The <" + element.getNodeName() + "/> element has neither a '" + handlerName + + "' attribute nor a <" + handlerName + "/> element.", element); } } @@ -245,13 +243,13 @@ public class ChunkElementParser { List refElements = DomUtils.getChildElementsByTagName(element, REF_ELE); if (beanElements.size() + refElements.size() != 1) { parserContext.getReaderContext() - .error("The <" + element.getNodeName() + "/> must have exactly one of either a <" + BEAN_ELE - + "/> element or a <" + REF_ELE + "/> element.", element); + .error("The <" + element.getNodeName() + "/> must have exactly one of either a <" + BEAN_ELE + + "/> element or a <" + REF_ELE + "/> element.", element); } else if (beanElements.size() == 1) { Element beanElement = beanElements.get(0); BeanDefinitionHolder beanDefinitionHolder = parserContext.getDelegate() - .parseBeanDefinitionElement(beanElement, enclosing); + .parseBeanDefinitionElement(beanElement, enclosing); parserContext.getDelegate().decorateBeanDefinitionIfRequired(beanElement, beanDefinitionHolder); propertyValues.addPropertyValue(propertyName, beanDefinitionHolder); @@ -330,8 +328,9 @@ public class ChunkElementParser { streamBeans.add(new RuntimeBeanReference(streamRef)); } else { - parserContext.getReaderContext().error( - REF_ATTR + " not specified for <" + streamElement.getTagName() + "> element", element); + parserContext.getReaderContext() + .error(REF_ATTR + " not specified for <" + streamElement.getTagName() + "> element", + element); } } } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/CoreNamespaceUtils.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/CoreNamespaceUtils.java index 1e309127c..2f1dcea65 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/CoreNamespaceUtils.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/CoreNamespaceUtils.java @@ -108,7 +108,8 @@ public class CoreNamespaceUtils { BeanDefinitionRegistry registry = parserContext.getRegistry(); if (!stateTransitionComparatorAlreadyDefined(registry)) { AbstractBeanDefinition defaultStateTransitionComparator = BeanDefinitionBuilder - .genericBeanDefinition(DefaultStateTransitionComparator.class).getBeanDefinition(); + .genericBeanDefinition(DefaultStateTransitionComparator.class) + .getBeanDefinition(); registry.registerBeanDefinition(DefaultStateTransitionComparator.STATE_TRANSITION_COMPARATOR, defaultStateTransitionComparator); } @@ -126,7 +127,8 @@ public class CoreNamespaceUtils { BeanDefinitionRegistry registry = parserContext.getRegistry(); if (!rangeArrayEditorAlreadyDefined(registry)) { AbstractBeanDefinition customEditorConfigurer = BeanDefinitionBuilder - .genericBeanDefinition(CUSTOM_EDITOR_CONFIGURER_CLASS_NAME).getBeanDefinition(); + .genericBeanDefinition(CUSTOM_EDITOR_CONFIGURER_CLASS_NAME) + .getBeanDefinition(); customEditorConfigurer.setRole(BeanDefinition.ROLE_INFRASTRUCTURE); ManagedMap editors = new ManagedMap<>(); editors.put(RANGE_ARRAY_CLASS_NAME, RANGE_ARRAY_EDITOR_CLASS_NAME); @@ -167,7 +169,8 @@ public class CoreNamespaceUtils { BeanDefinitionRegistry registry = parserContext.getRegistry(); if (!coreNamespaceBeanPostProcessorAlreadyDefined(registry)) { AbstractBeanDefinition postProcessorBeanDef = BeanDefinitionBuilder - .genericBeanDefinition(CORE_NAMESPACE_POST_PROCESSOR_CLASS_NAME).getBeanDefinition(); + .genericBeanDefinition(CORE_NAMESPACE_POST_PROCESSOR_CLASS_NAME) + .getBeanDefinition(); postProcessorBeanDef.setRole(BeanDefinition.ROLE_INFRASTRUCTURE); registry.registerBeanDefinition(CORE_NAMESPACE_POST_PROCESSOR_CLASS_NAME, postProcessorBeanDef); } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/DecisionParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/DecisionParser.java index 64a989b2d..872ff1e07 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/DecisionParser.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/DecisionParser.java @@ -50,7 +50,7 @@ public class DecisionParser { String idAttribute = element.getAttribute("id"); BeanDefinitionBuilder stateBuilder = BeanDefinitionBuilder - .genericBeanDefinition("org.springframework.batch.core.job.flow.support.state.DecisionState"); + .genericBeanDefinition("org.springframework.batch.core.job.flow.support.state.DecisionState"); stateBuilder.addConstructorArgValue(new RuntimeBeanReference(refAttribute)); stateBuilder.addConstructorArgValue(idAttribute); return InlineFlowParser.getNextElements(parserContext, stateBuilder.getBeanDefinition(), element); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/ExceptionElementParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/ExceptionElementParser.java index 0d2c02407..382a7b6d9 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/ExceptionElementParser.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/ExceptionElementParser.java @@ -38,9 +38,9 @@ public class ExceptionElementParser { return map; } else if (children.size() > 1) { - parserContext.getReaderContext().error("The <" + exceptionListName - + "/> element may not appear more than once in a single <" + element.getNodeName() + "/>.", - element); + parserContext.getReaderContext() + .error("The <" + exceptionListName + "/> element may not appear more than once in a single <" + + element.getNodeName() + "/>.", element); } return null; } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/FlowElementParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/FlowElementParser.java index 4742e4ea4..d9e170523 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/FlowElementParser.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/FlowElementParser.java @@ -52,7 +52,7 @@ public class FlowElementParser { String idAttribute = element.getAttribute(ID_ATTR); BeanDefinitionBuilder stateBuilder = BeanDefinitionBuilder - .genericBeanDefinition("org.springframework.batch.core.job.flow.support.state.FlowState"); + .genericBeanDefinition("org.springframework.batch.core.job.flow.support.state.FlowState"); AbstractBeanDefinition flowDefinition = new GenericBeanDefinition(); flowDefinition.setParentName(refAttribute); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/JobParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/JobParser.java index d7ff6d8d7..fe946883a 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/JobParser.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/JobParser.java @@ -67,11 +67,10 @@ public class JobParser extends AbstractSingleBeanDefinitionParser { protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { if (!CoreNamespaceUtils.namespaceMatchesVersion(element)) { - parserContext.getReaderContext().error( - "You are using a version of the spring-batch XSD that is not compatible with Spring Batch 3.0." - + " Please upgrade your schema declarations (or use the spring-batch.xsd alias if you are " - + "feeling lucky).", - element); + parserContext.getReaderContext() + .error("You are using a version of the spring-batch XSD that is not compatible with Spring Batch 3.0." + + " Please upgrade your schema declarations (or use the spring-batch.xsd alias if you are " + + "feeling lucky).", element); return; } @@ -111,9 +110,9 @@ public class JobParser extends AbstractSingleBeanDefinitionParser { if (isAbstract) { for (String tagName : Arrays.asList("step", "decision", "split")) { if (!DomUtils.getChildElementsByTagName(element, tagName).isEmpty()) { - parserContext.getReaderContext().error("The <" + tagName - + "/> element may not appear on a with abstract=\"true\" [" + jobName + "]", - element); + parserContext.getReaderContext() + .error("The <" + tagName + "/> element may not appear on a with abstract=\"true\" [" + + jobName + "]", element); } } } @@ -146,7 +145,7 @@ public class JobParser extends AbstractSingleBeanDefinitionParser { } else if (listenersElements.size() > 1) { parserContext.getReaderContext() - .error("The '' element may not appear more than once in a single .", element); + .error("The '' element may not appear more than once in a single .", element); } } @@ -167,7 +166,7 @@ public class JobParser extends AbstractSingleBeanDefinitionParser { } else if (beanElement != null) { BeanDefinitionHolder beanDefinitionHolder = parserContext.getDelegate() - .parseBeanDefinitionElement(beanElement); + .parseBeanDefinitionElement(beanElement); parserContext.getDelegate().decorateBeanDefinitionIfRequired(beanElement, beanDefinitionHolder); return beanDefinitionHolder; } @@ -176,7 +175,7 @@ public class JobParser extends AbstractSingleBeanDefinitionParser { } parserContext.getReaderContext() - .error("One of ref attribute or a nested bean definition or ref element must be specified", element); + .error("One of ref attribute or a nested bean definition or ref element must be specified", element); return null; } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/SplitParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/SplitParser.java index 0f00024e5..a3bc976ed 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/SplitParser.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/SplitParser.java @@ -70,7 +70,7 @@ public class SplitParser { String idAttribute = element.getAttribute("id"); BeanDefinitionBuilder stateBuilder = BeanDefinitionBuilder - .genericBeanDefinition("org.springframework.batch.core.job.flow.support.state.SplitState"); + .genericBeanDefinition("org.springframework.batch.core.job.flow.support.state.SplitState"); String taskExecutorBeanId = element.getAttribute("task-executor"); if (StringUtils.hasText(taskExecutorBeanId)) { @@ -91,8 +91,8 @@ public class SplitParser { String ref = nextElement.getAttribute(PARENT_ATTR); if (StringUtils.hasText(ref)) { if (nextElement.getElementsByTagName("*").getLength() > 0) { - parserContext.getReaderContext().error( - "A in a must have ref= or nested , but not both.", nextElement); + parserContext.getReaderContext() + .error("A in a must have ref= or nested , but not both.", nextElement); } AbstractBeanDefinition flowDefinition = new GenericBeanDefinition(); flowDefinition.setParentName(ref); 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 5a81c41ca..a41fad9dc 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 @@ -290,7 +290,8 @@ public class StepParserStepFactoryBean implements FactoryBean, BeanN PartitionStepBuilder builder; if (partitioner != null) { builder = new StepBuilder(name, jobRepository) - .partitioner(step != null ? step.getName() : name, partitioner).step(step); + .partitioner(step != null ? step.getName() : name, partitioner) + .step(step); } else { builder = new StepBuilder(name, jobRepository).partitioner(step); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/TaskletParser.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/TaskletParser.java index d9b555aa7..f67799e1f 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/TaskletParser.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/TaskletParser.java @@ -90,13 +90,13 @@ public class TaskletParser { else if (beanElements.size() == 1) { Element beanElement = beanElements.get(0); BeanDefinitionHolder beanDefinitionHolder = parserContext.getDelegate() - .parseBeanDefinitionElement(beanElement, bd); + .parseBeanDefinitionElement(beanElement, bd); parserContext.getDelegate().decorateBeanDefinitionIfRequired(beanElement, beanDefinitionHolder); bme = beanDefinitionHolder; } else if (refElements.size() == 1) { - bme = (BeanMetadataElement) parserContext.getDelegate().parsePropertySubElement(refElements.get(0), - null); + bme = (BeanMetadataElement) parserContext.getDelegate() + .parsePropertySubElement(refElements.get(0), null); } if (StringUtils.hasText(taskletMethod)) { @@ -168,9 +168,9 @@ public class TaskletParser { if (error != null) { parserContext.getReaderContext() - .error("The <" + taskletElement.getTagName() + "/> element " + error + " one of: '" - + TASKLET_REF_ATTR + "' attribute, <" + CHUNK_ELE + "/> element, <" + BEAN_ELE - + "/> attribute, or <" + REF_ELE + "/> element. Found: " + found + ".", taskletElement); + .error("The <" + taskletElement.getTagName() + "/> element " + error + " one of: '" + TASKLET_REF_ATTR + + "' attribute, <" + CHUNK_ELE + "/> element, <" + BEAN_ELE + "/> attribute, or <" + REF_ELE + + "/> element. Found: " + found + ".", taskletElement); } } @@ -216,9 +216,9 @@ public class TaskletParser { propertyValues.addPropertyValue(propertyName, list); } else if (children.size() > 1) { - parserContext.getReaderContext().error("The <" + exceptionListName - + "/> element may not appear more than once in a single <" + element.getNodeName() + "/>.", - element); + parserContext.getReaderContext() + .error("The <" + exceptionListName + "/> element may not appear more than once in a single <" + + element.getNodeName() + "/>.", element); } } 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 80222f660..1c0e0492b 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 @@ -125,7 +125,7 @@ public abstract class AbstractJobExplorerFactoryBean implements FactoryBean VALID_OPTS = Arrays - .asList(new String[] { "-restart", "-next", "-stop", "-abandon" }); + .asList(new String[] { "-restart", "-next", "-stop", "-abandon" }); /** * Injection setter for the {@link JobLauncher}. @@ -297,8 +297,8 @@ public class CommandLineJobRunner { context = new ClassPathXmlApplicationContext(jobPath); } - context.getAutowireCapableBeanFactory().autowireBeanProperties(this, - AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE, false); + context.getAutowireCapableBeanFactory() + .autowireBeanProperties(this, AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE, false); Assert.state(launcher != null, "A JobLauncher must be provided. Please add one to the configuration."); if (opts.contains("-restart") || opts.contains("-next")) { @@ -309,7 +309,7 @@ public class CommandLineJobRunner { String jobName = jobIdentifier; JobParameters jobParameters = jobParametersConverter - .getJobParameters(StringUtils.splitArrayElementsIntoProperties(parameters, "=")); + .getJobParameters(StringUtils.splitArrayElementsIntoProperties(parameters, "=")); Assert.isTrue(parameters == null || parameters.length == 0 || !jobParameters.isEmpty(), "Invalid JobParameters " + Arrays.asList(parameters) + ". If parameters are provided they should be in the form name=value (no whitespace)."); @@ -362,7 +362,7 @@ public class CommandLineJobRunner { if (opts.contains("-next")) { jobParameters = new JobParametersBuilder(jobParameters, jobExplorer).getNextJobParameters(job) - .toJobParameters(); + .toJobParameters(); } JobExecution jobExecution = launcher.run(job, jobParameters); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/DataFieldMaxValueJobParametersIncrementer.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/DataFieldMaxValueJobParametersIncrementer.java index 19f222487..c01e511c1 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/DataFieldMaxValueJobParametersIncrementer.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/DataFieldMaxValueJobParametersIncrementer.java @@ -52,7 +52,8 @@ public class DataFieldMaxValueJobParametersIncrementer implements JobParametersI @Override public JobParameters getNext(JobParameters jobParameters) { return new JobParametersBuilder(jobParameters == null ? new JobParameters() : jobParameters) - .addLong(this.key, this.dataFieldMaxValueIncrementer.nextLongValue()).toJobParameters(); + .addLong(this.key, this.dataFieldMaxValueIncrementer.nextLongValue()) + .toJobParameters(); } /** 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 8189794f5..55eb28a16 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 @@ -262,8 +262,8 @@ public class JobRegistryBackgroundJobRunner { private void run() { final ApplicationContext parent = new ClassPathXmlApplicationContext(parentContextPath); - parent.getAutowireCapableBeanFactory().autowireBeanProperties(this, AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE, - false); + parent.getAutowireCapableBeanFactory() + .autowireBeanProperties(this, AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE, false); parent.getAutowireCapableBeanFactory().initializeBean(this, getClass().getSimpleName()); this.parentContext = parent; } 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 810568f52..633c7d1df 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 @@ -339,8 +339,8 @@ public class SimpleJobOperator implements JobOperator, InitializingBean { Job job = jobRegistry.getJob(jobName); if (logger.isInfoEnabled()) { - logger.info( - String.format("Attempting to launch job with name=%s and parameters={%s}", jobName, parameters)); + logger + .info(String.format("Attempting to launch job with name=%s and parameters={%s}", jobName, parameters)); } try { return jobLauncher.run(job, jobParameters).getId(); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchMetrics.java b/spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchMetrics.java index 49c59005c..117b13d5b 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchMetrics.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/observability/BatchMetrics.java @@ -68,8 +68,10 @@ public final class BatchMetrics { * @return a new timer instance */ public static Timer createTimer(MeterRegistry meterRegistry, String name, String description, Tag... tags) { - return Timer.builder(METRICS_PREFIX + name).description(description).tags(Arrays.asList(tags)) - .register(meterRegistry); + return Timer.builder(METRICS_PREFIX + name) + .description(description) + .tags(Arrays.asList(tags)) + .register(meterRegistry); } /** @@ -82,8 +84,10 @@ public final class BatchMetrics { * @return a new timer instance */ public static Counter createCounter(MeterRegistry meterRegistry, String name, String description, Tag... tags) { - return Counter.builder(METRICS_PREFIX + name).description(description).tags(Arrays.asList(tags)) - .register(meterRegistry); + return Counter.builder(METRICS_PREFIX + name) + .description(description) + .tags(Arrays.asList(tags)) + .register(meterRegistry); } /** @@ -140,8 +144,10 @@ public final class BatchMetrics { */ public static LongTaskTimer createLongTaskTimer(MeterRegistry meterRegistry, String name, String description, Tag... tags) { - return LongTaskTimer.builder(METRICS_PREFIX + name).description(description).tags(Arrays.asList(tags)) - .register(meterRegistry); + return LongTaskTimer.builder(METRICS_PREFIX + name) + .description(description) + .tags(Arrays.asList(tags)) + .register(meterRegistry); } /** diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/observability/DefaultBatchJobObservationConvention.java b/spring-batch-core/src/main/java/org/springframework/batch/core/observability/DefaultBatchJobObservationConvention.java index 0bd4cc5fd..84712acf6 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/observability/DefaultBatchJobObservationConvention.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/observability/DefaultBatchJobObservationConvention.java @@ -34,7 +34,7 @@ public class DefaultBatchJobObservationConvention implements BatchJobObservation return KeyValues.of( BatchJobObservation.JobLowCardinalityTags.JOB_NAME.withValue(execution.getJobInstance().getJobName()), BatchJobObservation.JobLowCardinalityTags.JOB_STATUS - .withValue(execution.getExitStatus().getExitCode())); + .withValue(execution.getExitStatus().getExitCode())); } @Override @@ -42,9 +42,9 @@ public class DefaultBatchJobObservationConvention implements BatchJobObservation JobExecution execution = context.getJobExecution(); return KeyValues.of( BatchJobObservation.JobHighCardinalityTags.JOB_INSTANCE_ID - .withValue(String.valueOf(execution.getJobInstance().getInstanceId())), + .withValue(String.valueOf(execution.getJobInstance().getInstanceId())), BatchJobObservation.JobHighCardinalityTags.JOB_EXECUTION_ID - .withValue(String.valueOf(execution.getId()))); + .withValue(String.valueOf(execution.getId()))); } } diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/observability/DefaultBatchStepObservationConvention.java b/spring-batch-core/src/main/java/org/springframework/batch/core/observability/DefaultBatchStepObservationConvention.java index 3f9d52d2b..6fcf6b050 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/observability/DefaultBatchStepObservationConvention.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/observability/DefaultBatchStepObservationConvention.java @@ -33,16 +33,16 @@ public class DefaultBatchStepObservationConvention implements BatchStepObservati StepExecution execution = context.getStepExecution(); return KeyValues.of(BatchStepObservation.StepLowCardinalityTags.STEP_NAME.withValue(execution.getStepName()), BatchStepObservation.StepLowCardinalityTags.JOB_NAME - .withValue(execution.getJobExecution().getJobInstance().getJobName()), + .withValue(execution.getJobExecution().getJobInstance().getJobName()), BatchStepObservation.StepLowCardinalityTags.STEP_STATUS - .withValue(execution.getExitStatus().getExitCode())); + .withValue(execution.getExitStatus().getExitCode())); } @Override public KeyValues getHighCardinalityKeyValues(BatchStepContext context) { StepExecution execution = context.getStepExecution(); return KeyValues.of(BatchStepObservation.StepHighCardinalityTags.STEP_EXECUTION_ID - .withValue(String.valueOf(execution.getId()))); + .withValue(String.valueOf(execution.getId()))); } } 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 49610dddb..8f3b5f4f5 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 @@ -99,8 +99,10 @@ public class RemoteStepExecutionAggregator implements StepExecutionAggregator, I JobExecution jobExecution = jobExplorer.getJobExecution(result.getJobExecutionId()); Assert.state(jobExecution != null, "Could not load JobExecution from JobRepository for id " + result.getJobExecutionId()); - List updates = jobExecution.getStepExecutions().stream() - .filter(stepExecution -> stepExecutionIds.contains(stepExecution.getId())).collect(Collectors.toList()); + List updates = jobExecution.getStepExecutions() + .stream() + .filter(stepExecution -> stepExecutionIds.contains(stepExecution.getId())) + .collect(Collectors.toList()); delegate.aggregate(result, updates); } 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 6606f25c9..de5207ccf 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 @@ -103,7 +103,7 @@ public class TaskExecutorPartitionHandler extends AbstractPartitionHandler imple catch (TaskRejectedException e) { // couldn't execute one of the tasks ExitStatus exitStatus = ExitStatus.FAILED - .addExitDescription("TaskExecutor rejected the task for this step."); + .addExitDescription("TaskExecutor rejected the task for this step."); /* * Set the status in case the caller is tracking it through the * JobExecution. diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/Jackson2ExecutionContextStringSerializer.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/Jackson2ExecutionContextStringSerializer.java index ffed45d70..e0488f59a 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/Jackson2ExecutionContextStringSerializer.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/Jackson2ExecutionContextStringSerializer.java @@ -125,11 +125,13 @@ public class Jackson2ExecutionContextStringSerializer implements ExecutionContex * of trusted classes. */ public Jackson2ExecutionContextStringSerializer(String... trustedClassNames) { - this.objectMapper = JsonMapper.builder().configure(MapperFeature.DEFAULT_VIEW_INCLUSION, false) - .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, true) - .configure(MapperFeature.BLOCK_UNSAFE_POLYMORPHIC_BASE_TYPES, true) - .setDefaultTyping(createTrustedDefaultTyping(trustedClassNames)).addModule(new JobParametersModule()) - .build(); + this.objectMapper = JsonMapper.builder() + .configure(MapperFeature.DEFAULT_VIEW_INCLUSION, false) + .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, true) + .configure(MapperFeature.BLOCK_UNSAFE_POLYMORPHIC_BASE_TYPES, true) + .setDefaultTyping(createTrustedDefaultTyping(trustedClassNames)) + .addModule(new JobParametersModule()) + .build(); } public void setObjectMapper(ObjectMapper objectMapper) { @@ -282,21 +284,22 @@ public class Jackson2ExecutionContextStringSerializer implements ExecutionContex */ static class TrustedTypeIdResolver implements TypeIdResolver { - private static final Set TRUSTED_CLASS_NAMES = Collections.unmodifiableSet(new HashSet<>(Arrays.asList( - "javax.xml.namespace.QName", "java.util.UUID", "java.util.ArrayList", "java.util.Arrays$ArrayList", - "java.util.LinkedList", "java.util.Collections$EmptyList", "java.util.Collections$EmptyMap", - "java.util.Collections$EmptySet", "java.util.Collections$UnmodifiableRandomAccessList", - "java.util.Collections$UnmodifiableList", "java.util.Collections$UnmodifiableMap", - "java.util.Collections$UnmodifiableSet", "java.util.Collections$SingletonList", - "java.util.Collections$SingletonMap", "java.util.Collections$SingletonSet", "java.util.Date", - "java.time.Instant", "java.time.Duration", "java.time.LocalDate", "java.time.LocalTime", - "java.time.LocalDateTime", "java.sql.Timestamp", "java.net.URL", "java.util.TreeMap", - "java.util.HashMap", "java.util.LinkedHashMap", "java.util.TreeSet", "java.util.HashSet", - "java.util.LinkedHashSet", "java.lang.Boolean", "java.lang.Byte", "java.lang.Short", - "java.lang.Integer", "java.lang.Long", "java.lang.Double", "java.lang.Float", "java.math.BigDecimal", - "java.math.BigInteger", "java.lang.String", "java.lang.Character", "java.lang.CharSequence", - "java.util.Properties", "[Ljava.util.Properties;", "org.springframework.batch.core.JobParameter", - "org.springframework.batch.core.JobParameters"))); + private static final Set TRUSTED_CLASS_NAMES = Collections + .unmodifiableSet(new HashSet<>(Arrays.asList("javax.xml.namespace.QName", "java.util.UUID", + "java.util.ArrayList", "java.util.Arrays$ArrayList", "java.util.LinkedList", + "java.util.Collections$EmptyList", "java.util.Collections$EmptyMap", + "java.util.Collections$EmptySet", "java.util.Collections$UnmodifiableRandomAccessList", + "java.util.Collections$UnmodifiableList", "java.util.Collections$UnmodifiableMap", + "java.util.Collections$UnmodifiableSet", "java.util.Collections$SingletonList", + "java.util.Collections$SingletonMap", "java.util.Collections$SingletonSet", "java.util.Date", + "java.time.Instant", "java.time.Duration", "java.time.LocalDate", "java.time.LocalTime", + "java.time.LocalDateTime", "java.sql.Timestamp", "java.net.URL", "java.util.TreeMap", + "java.util.HashMap", "java.util.LinkedHashMap", "java.util.TreeSet", "java.util.HashSet", + "java.util.LinkedHashSet", "java.lang.Boolean", "java.lang.Byte", "java.lang.Short", + "java.lang.Integer", "java.lang.Long", "java.lang.Double", "java.lang.Float", + "java.math.BigDecimal", "java.math.BigInteger", "java.lang.String", "java.lang.Character", + "java.lang.CharSequence", "java.util.Properties", "[Ljava.util.Properties;", + "org.springframework.batch.core.JobParameter", "org.springframework.batch.core.JobParameters"))); private final Set trustedClassNames = new LinkedHashSet<>(TRUSTED_CLASS_NAMES); 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 84e97d0ae..88ab504f3 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 @@ -188,7 +188,7 @@ public abstract class AbstractJobRepositoryFactoryBean implements FactoryBean> allJobParameters = execution.getJobParameters().getParameters().values(); - long identifyingJobParametersCount = allJobParameters.stream().filter(JobParameter::isIdentifying) - .count(); + long identifyingJobParametersCount = allJobParameters.stream() + .filter(JobParameter::isIdentifying) + .count(); if (identifyingJobParametersCount > 0 && (status == BatchStatus.COMPLETED || status == BatchStatus.ABANDONED)) { throw new JobInstanceAlreadyCompleteException( 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 162c1978b..c14f7e670 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 @@ -209,9 +209,11 @@ public abstract class AbstractStep implements Step, InitializingBean, BeanNameAw stepExecution.setStartTime(LocalDateTime.now()); stepExecution.setStatus(BatchStatus.STARTED); Observation observation = BatchMetrics - .createObservation(BatchStepObservation.BATCH_STEP_OBSERVATION.getName(), - new BatchStepContext(stepExecution), this.observationRegistry) - .contextualName(stepExecution.getStepName()).observationConvention(this.observationConvention).start(); + .createObservation(BatchStepObservation.BATCH_STEP_OBSERVATION.getName(), + new BatchStepContext(stepExecution), this.observationRegistry) + .contextualName(stepExecution.getStepName()) + .observationConvention(this.observationConvention) + .start(); getJobRepository().update(stepExecution); // Start with a default value that will be trumped by anything 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 144dc7c5b..cb25af7c2 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 @@ -475,7 +475,7 @@ public class SimpleStepFactoryBean implements FactoryBean, BeanNameA builder.listener(listener); } for (ItemProcessListener listener : BatchListenerFactoryHelper - .>getListeners(listeners, ItemProcessListener.class)) { + .>getListeners(listeners, ItemProcessListener.class)) { builder.listener(listener); } builder.transactionManager(transactionManager); 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 9dedb00f3..3cbaaa913 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 @@ -119,7 +119,7 @@ public class SystemCommandTasklet implements StepExecutionListener, StoppableTas if (stoppable) { JobExecution jobExecution = jobExplorer - .getJobExecution(chunkContext.getStepContext().getStepExecution().getJobExecutionId()); + .getJobExecution(chunkContext.getStepContext().getStepExecution().getJobExecutionId()); if (jobExecution.isStopping()) { stopped = true; 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 b36b03097..5c0c5f6ce 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 @@ -253,7 +253,7 @@ public class TaskletStep extends AbstractStep { RepeatStatus result; try { result = new TransactionTemplate(transactionManager, transactionAttribute) - .execute(new ChunkTransactionCallback(chunkContext, semaphore)); + .execute(new ChunkTransactionCallback(chunkContext, semaphore)); } catch (UncheckedTransactionException e) { // Allow checked exceptions to be thrown inside callback diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/DefaultJobKeyGeneratorTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/DefaultJobKeyGeneratorTests.java index 53ee6cbde..74e280f1e 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/DefaultJobKeyGeneratorTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/DefaultJobKeyGeneratorTests.java @@ -31,10 +31,13 @@ class DefaultJobKeyGeneratorTests { @Test void testMixedParameters() { - JobParameters jobParameters1 = new JobParametersBuilder().addString("foo", "bar").addString("bar", "foo") - .toJobParameters(); + JobParameters jobParameters1 = new JobParametersBuilder().addString("foo", "bar") + .addString("bar", "foo") + .toJobParameters(); JobParameters jobParameters2 = new JobParametersBuilder().addString("foo", "bar", true) - .addString("bar", "foo", true).addString("ignoreMe", "irrelevant", false).toJobParameters(); + .addString("bar", "foo", true) + .addString("ignoreMe", "irrelevant", false) + .toJobParameters(); String key1 = jobKeyGenerator.generateKey(jobParameters1); String key2 = jobKeyGenerator.generateKey(jobParameters2); assertEquals(key1, key2); @@ -42,19 +45,22 @@ class DefaultJobKeyGeneratorTests { @Test void testCreateJobKey() { - JobParameters jobParameters = new JobParametersBuilder().addString("foo", "bar").addString("bar", "foo") - .toJobParameters(); + JobParameters jobParameters = new JobParametersBuilder().addString("foo", "bar") + .addString("bar", "foo") + .toJobParameters(); String key = jobKeyGenerator.generateKey(jobParameters); assertEquals(32, key.length()); } @Test void testCreateJobKeyOrdering() { - JobParameters jobParameters1 = new JobParametersBuilder().addString("foo", "bar").addString("bar", "foo") - .toJobParameters(); + JobParameters jobParameters1 = new JobParametersBuilder().addString("foo", "bar") + .addString("bar", "foo") + .toJobParameters(); String key1 = jobKeyGenerator.generateKey(jobParameters1); - JobParameters jobParameters2 = new JobParametersBuilder().addString("bar", "foo").addString("foo", "bar") - .toJobParameters(); + JobParameters jobParameters2 = new JobParametersBuilder().addString("bar", "foo") + .addString("foo", "bar") + .toJobParameters(); String key2 = jobKeyGenerator.generateKey(jobParameters2); assertEquals(key1, key2); } 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 53974931f..43374fcd0 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 @@ -69,13 +69,16 @@ class JobParametersBuilderTests { @Test void testAddingExistingJobParameters() { - JobParameters params1 = new JobParametersBuilder().addString("foo", "bar").addString("bar", "baz") - .toJobParameters(); + JobParameters params1 = new JobParametersBuilder().addString("foo", "bar") + .addString("bar", "baz") + .toJobParameters(); JobParameters params2 = new JobParametersBuilder().addString("foo", "baz").toJobParameters(); - JobParameters finalParams = new JobParametersBuilder().addString("baz", "quix").addJobParameters(params1) - .addJobParameters(params2).toJobParameters(); + JobParameters finalParams = new JobParametersBuilder().addString("baz", "quix") + .addJobParameters(params1) + .addJobParameters(params2) + .toJobParameters(); assertEquals(finalParams.getString("foo"), "baz"); assertEquals(finalParams.getString("bar"), "baz"); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/SpringBatchVersionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/SpringBatchVersionTests.java index 101e431fd..c4fe2dcbf 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/SpringBatchVersionTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/SpringBatchVersionTests.java @@ -64,8 +64,11 @@ public class SpringBatchVersionTests { assertNotNull(jobExecution); assertEquals(ExitStatus.COMPLETED, jobExecution.getExitStatus()); assertTrue(jobExecution.getExecutionContext().containsKey(SpringBatchVersion.BATCH_VERSION_KEY)); - assertTrue(jobExecution.getStepExecutions().iterator().next().getExecutionContext() - .containsKey(SpringBatchVersion.BATCH_VERSION_KEY)); + assertTrue(jobExecution.getStepExecutions() + .iterator() + .next() + .getExecutionContext() + .containsKey(SpringBatchVersion.BATCH_VERSION_KEY)); } @Configuration @@ -75,7 +78,9 @@ public class SpringBatchVersionTests { @Bean public DataSource dataSource() { return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL) - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").generateUniqueName(true).build(); + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .generateUniqueName(true) + .build(); } @Bean @@ -86,9 +91,10 @@ public class SpringBatchVersionTests { @Bean public Job job(JobRepository jobRepository, PlatformTransactionManager transactionManager) { return new JobBuilder("job", jobRepository) - .start(new StepBuilder("step", jobRepository) - .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager).build()) - .build(); + .start(new StepBuilder("step", jobRepository) + .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager) + .build()) + .build(); } } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/BatchRegistrarTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/BatchRegistrarTests.java index 18b04e03c..8d97b4abf 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/BatchRegistrarTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/BatchRegistrarTests.java @@ -112,7 +112,7 @@ class BatchRegistrarTests { Assertions.assertEquals(context.getBean(DataSource.class), dataSource); JdbcExecutionContextDao executionContextDao = (JdbcExecutionContextDao) ReflectionTestUtils - .getField(jobRepository, "ecDao"); + .getField(jobRepository, "ecDao"); jdbcTemplate = (JdbcTemplate) ReflectionTestUtils.getField(executionContextDao, "jdbcTemplate"); dataSource = (DataSource) ReflectionTestUtils.getField(jdbcTemplate, "dataSource"); Assertions.assertEquals(context.getBean(DataSource.class), dataSource); @@ -147,7 +147,7 @@ class BatchRegistrarTests { Assertions.assertEquals(context.getBean(DataSource.class), dataSource); JdbcExecutionContextDao executionContextDao = (JdbcExecutionContextDao) ReflectionTestUtils - .getField(jobRepository, "ecDao"); + .getField(jobRepository, "ecDao"); jdbcTemplate = (JdbcTemplate) ReflectionTestUtils.getField(executionContextDao, "jdbcTemplate"); dataSource = (DataSource) ReflectionTestUtils.getField(jdbcTemplate, "dataSource"); Assertions.assertEquals(context.getBean(DataSource.class), dataSource); @@ -231,7 +231,9 @@ class BatchRegistrarTests { @Bean public DataSource dataSource() { return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL) - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").generateUniqueName(true).build(); + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .generateUniqueName(true) + .build(); } @Bean @@ -248,7 +250,9 @@ class BatchRegistrarTests { @Bean public DataSource batchDataSource() { return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL) - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").generateUniqueName(true).build(); + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .generateUniqueName(true) + .build(); } @Bean diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/DataSourceConfiguration.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/DataSourceConfiguration.java index bff13187f..bdfa21bf5 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/DataSourceConfiguration.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/DataSourceConfiguration.java @@ -29,8 +29,10 @@ public class DataSourceConfiguration { @Bean public DataSource dataSource() { return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL) - .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").generateUniqueName(true).build(); + .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .generateUniqueName(true) + .build(); } @Bean diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/InlineDataSourceDefinitionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/InlineDataSourceDefinitionTests.java index b579ddc81..bc36a2635 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/InlineDataSourceDefinitionTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/InlineDataSourceDefinitionTests.java @@ -61,17 +61,20 @@ class InlineDataSourceDefinitionTests { @Bean public Job job(JobRepository jobRepository, PlatformTransactionManager transactionManager) { return new JobBuilder("job", jobRepository) - .start(new StepBuilder("step", jobRepository).tasklet((contribution, chunkContext) -> { - System.out.println("hello world"); - return RepeatStatus.FINISHED; - }, transactionManager).build()).build(); + .start(new StepBuilder("step", jobRepository).tasklet((contribution, chunkContext) -> { + System.out.println("hello world"); + return RepeatStatus.FINISHED; + }, transactionManager).build()) + .build(); } @Bean public DataSource dataSource() { return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.H2) - .addScript("/org/springframework/batch/core/schema-drop-h2.sql") - .addScript("/org/springframework/batch/core/schema-h2.sql").generateUniqueName(true).build(); + .addScript("/org/springframework/batch/core/schema-drop-h2.sql") + .addScript("/org/springframework/batch/core/schema-h2.sql") + .generateUniqueName(true) + .build(); } @Bean 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 6615cfab7..15abea0a8 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 @@ -87,8 +87,9 @@ public class JobBuilderConfigurationTests { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(configs); Job job = jobName == null ? context.getBean(Job.class) : context.getBean(jobName, Job.class); JobLauncher jobLauncher = context.getBean(JobLauncher.class); - JobExecution execution = jobLauncher.run(job, new JobParametersBuilder() - .addLong("run.id", (long) (Math.random() * Long.MAX_VALUE)).toJobParameters()); + JobExecution execution = jobLauncher.run(job, + new JobParametersBuilder().addLong("run.id", (long) (Math.random() * Long.MAX_VALUE)) + .toJobParameters()); assertEquals(status, execution.getStatus()); assertEquals(stepExecutionCount, execution.getStepExecutions().size()); context.close(); @@ -196,7 +197,9 @@ public class JobBuilderConfigurationTests { @Bean public DataSource dataSource() { return new EmbeddedDatabaseBuilder().addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").generateUniqueName(true).build(); + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .generateUniqueName(true) + .build(); } @Bean diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/JobLoaderConfigurationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/JobLoaderConfigurationTests.java index b38475300..d80ff5676 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/JobLoaderConfigurationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/JobLoaderConfigurationTests.java @@ -74,8 +74,9 @@ class JobLoaderConfigurationTests { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(configs); Job job = jobName == null ? context.getBean(Job.class) : context.getBean(JobLocator.class).getJob(jobName); JobLauncher jobLauncher = context.getBean(JobLauncher.class); - JobExecution execution = jobLauncher.run(job, new JobParametersBuilder() - .addLong("run.id", (long) (Math.random() * Long.MAX_VALUE)).toJobParameters()); + JobExecution execution = jobLauncher.run(job, + new JobParametersBuilder().addLong("run.id", (long) (Math.random() * Long.MAX_VALUE)) + .toJobParameters()); assertEquals(status, execution.getStatus()); assertEquals(stepExecutionCount, execution.getStepExecutions().size()); JobExplorer jobExplorer = context.getBean(JobExplorer.class); @@ -128,20 +129,20 @@ class JobLoaderConfigurationTests { @Bean public Job testJob(JobRepository jobRepository) throws Exception { SimpleJobBuilder builder = new JobBuilder("test", jobRepository).start(step1(jobRepository)) - .next(step2(jobRepository)); + .next(step2(jobRepository)); return builder.build(); } @Bean protected Step step1(JobRepository jobRepository) throws Exception { return new StepBuilder("step1", jobRepository).tasklet(tasklet(), new ResourcelessTransactionManager()) - .build(); + .build(); } @Bean protected Step step2(JobRepository jobRepository) throws Exception { return new StepBuilder("step2", jobRepository).tasklet(tasklet(), new ResourcelessTransactionManager()) - .build(); + .build(); } @Bean diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/TransactionManagerConfigurationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/TransactionManagerConfigurationTests.java index 9e45dcac0..333490ddc 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/TransactionManagerConfigurationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/annotation/TransactionManagerConfigurationTests.java @@ -61,8 +61,9 @@ abstract class TransactionManagerConfigurationTests { static DataSource createDataSource() { return new EmbeddedDatabaseBuilder().generateUniqueName(true) - .addScript("classpath:org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("classpath:org/springframework/batch/core/schema-hsqldb.sql").build(); + .addScript("classpath:org/springframework/batch/core/schema-drop-hsqldb.sql") + .addScript("classpath:org/springframework/batch/core/schema-hsqldb.sql") + .build(); } } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/DefaultBatchConfigurationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/DefaultBatchConfigurationTests.java index 7815891e1..9f0a641d2 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/DefaultBatchConfigurationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/support/DefaultBatchConfigurationTests.java @@ -146,7 +146,9 @@ class DefaultBatchConfigurationTests { @Bean public DataSource dataSource() { return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL) - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").generateUniqueName(true).build(); + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .generateUniqueName(true) + .build(); } @Bean 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 69f5fc20d..afc3b6dd7 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 @@ -172,7 +172,7 @@ class GenericApplicationContextFactoryTests { assertNotNull(context.getBean("concrete-job", JobSupport.class).getStep("step32")); boolean autowiredFound = false; for (BeanPostProcessor postProcessor : ((AbstractBeanFactory) context.getBeanFactory()) - .getBeanPostProcessors()) { + .getBeanPostProcessors()) { if (postProcessor instanceof AutowiredAnnotationBeanPostProcessor) { autowiredFound = true; } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DuplicateTransitionJobParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DuplicateTransitionJobParserTests.java index 710666ceb..421d593b0 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DuplicateTransitionJobParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/DuplicateTransitionJobParserTests.java @@ -32,7 +32,7 @@ class DuplicateTransitionJobParserTests { @Test void testNextAttributeWithNestedElement() { assertThrows(BeanDefinitionStoreException.class, () -> new ClassPathXmlApplicationContext(ClassUtils - .addResourcePathToPackagePath(getClass(), "NextAttributeMultipleFinalJobParserTests-context.xml"))); + .addResourcePathToPackagePath(getClass(), "NextAttributeMultipleFinalJobParserTests-context.xml"))); } @Test diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepListenerInStepParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepListenerInStepParserTests.java index 1505c491b..caf6f2f99 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepListenerInStepParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepListenerInStepParserTests.java @@ -104,7 +104,7 @@ class StepListenerInStepParserTests { try { compositeListener = ReflectionTestUtils.getField( ReflectionTestUtils.getField(ReflectionTestUtils - .getField(ReflectionTestUtils.getField(step, "tasklet"), "chunkProvider"), "listener"), + .getField(ReflectionTestUtils.getField(step, "tasklet"), "chunkProvider"), "listener"), "itemReadListener"); composite = ReflectionTestUtils.getField(compositeListener, "listeners"); proxiedListeners = (List) ReflectionTestUtils.getField(composite, "list"); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepListenerMethodAttributeParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepListenerMethodAttributeParserTests.java index 0c82748b0..95306b992 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepListenerMethodAttributeParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepListenerMethodAttributeParserTests.java @@ -55,7 +55,7 @@ class StepListenerMethodAttributeParserTests { Object compositeListener = ReflectionTestUtils.getField(step, "stepExecutionListener"); Object composite = ReflectionTestUtils.getField(compositeListener, "list"); List proxiedListeners = (List) ReflectionTestUtils - .getField(composite, "list"); + .getField(composite, "list"); List r = new ArrayList<>(); for (Object listener : proxiedListeners) { while (listener instanceof Advised) { diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepListenerParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepListenerParserTests.java index fbb4cf065..0a257e01d 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepListenerParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepListenerParserTests.java @@ -144,7 +144,7 @@ class StepListenerParserTests { try { compositeListener = ReflectionTestUtils.getField( ReflectionTestUtils.getField(ReflectionTestUtils - .getField(ReflectionTestUtils.getField(step, "tasklet"), "chunkProvider"), "listener"), + .getField(ReflectionTestUtils.getField(step, "tasklet"), "chunkProvider"), "listener"), "itemReadListener"); composite = ReflectionTestUtils.getField(compositeListener, "listeners"); proxiedListeners = (List) ReflectionTestUtils.getField(composite, "list"); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserTests.java index 560057090..cd962d9d6 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/configuration/xml/StepParserTests.java @@ -499,7 +499,7 @@ public class StepParserTests { ApplicationContext ctx = stepParserParentAttributeTestsCtx; StepParserStepFactoryBean fb = (StepParserStepFactoryBean) ctx - .getBean("&stepWithListsOverrideWithEmpty"); + .getBean("&stepWithListsOverrideWithEmpty"); assertEquals(1, getExceptionMap(fb, "skippableExceptionClasses").size()); assertEquals(1, getExceptionMap(fb, "retryableExceptionClasses").size()); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/converter/DefaultJobParametersConverterTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/converter/DefaultJobParametersConverterTests.java index 1b7d96db9..e413162a4 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/converter/DefaultJobParametersConverterTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/converter/DefaultJobParametersConverterTests.java @@ -191,8 +191,11 @@ class DefaultJobParametersConverterTests { void testGetProperties() throws Exception { LocalDate date = LocalDate.of(2008, 1, 23); JobParameters parameters = new JobParametersBuilder() - .addJobParameter("schedule.date", date, LocalDate.class, true).addString("job.key", "myKey") - .addLong("vendor.id", 33243243L).addDouble("double.key", 1.23).toJobParameters(); + .addJobParameter("schedule.date", date, LocalDate.class, true) + .addString("job.key", "myKey") + .addLong("vendor.id", 33243243L) + .addDouble("double.key", 1.23) + .toJobParameters(); Properties props = factory.getProperties(parameters); assertNotNull(props); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/explore/support/SimpleJobExplorerIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/explore/support/SimpleJobExplorerIntegrationTests.java index 28c15f9b1..867805214 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/explore/support/SimpleJobExplorerIntegrationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/explore/support/SimpleJobExplorerIntegrationTests.java @@ -115,7 +115,7 @@ class SimpleJobExplorerIntegrationTests { List transitions = new ArrayList<>(); transitions.add(StateTransition.createStateTransition(new StepState(dummyStep()), "end0")); transitions - .add(StateTransition.createEndStateTransition(new EndState(FlowExecutionStatus.COMPLETED, "end0"))); + .add(StateTransition.createEndStateTransition(new EndState(FlowExecutionStatus.COMPLETED, "end0"))); simpleFlow.setStateTransitions(transitions); return simpleFlow; } @@ -219,7 +219,9 @@ class SimpleJobExplorerIntegrationTests { @Bean public DataSource dataSource() { return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.H2) - .addScript("/org/springframework/batch/core/schema-h2.sql").generateUniqueName(true).build(); + .addScript("/org/springframework/batch/core/schema-h2.sql") + .generateUniqueName(true) + .build(); } @Bean @@ -237,10 +239,12 @@ class SimpleJobExplorerIntegrationTests { JobExplorer jobExplorer = context.getBean(JobExplorer.class); Job job = context.getBean(Job.class); long id = 1L; - JobParameters jobParameters1 = new JobParametersBuilder().addLong("id", id).addString("name", "foo", false) - .toJobParameters(); - JobParameters jobParameters2 = new JobParametersBuilder().addLong("id", id).addString("name", "bar", false) - .toJobParameters(); + JobParameters jobParameters1 = new JobParametersBuilder().addLong("id", id) + .addString("name", "foo", false) + .toJobParameters(); + JobParameters jobParameters2 = new JobParametersBuilder().addLong("id", id) + .addString("name", "bar", false) + .toJobParameters(); // when JobExecution jobExecution1 = jobLauncher.run(job, jobParameters1); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/DefaultJobParametersValidatorTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/DefaultJobParametersValidatorTests.java index e4c6f18b6..03bd8a7c9 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/DefaultJobParametersValidatorTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/DefaultJobParametersValidatorTests.java @@ -40,7 +40,7 @@ class DefaultJobParametersValidatorTests { void testValidateRequiredValues() throws Exception { validator.setRequiredKeys(new String[] { "name", "value" }); validator - .validate(new JobParametersBuilder().addString("name", "foo").addLong("value", 111L).toJobParameters()); + .validate(new JobParametersBuilder().addString("name", "foo").addLong("value", 111L).toJobParameters()); } @Test 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 163a6545c..0b2aa8781 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 @@ -57,8 +57,9 @@ class ExtendedAbstractJobTests { @BeforeEach void setUp() throws Exception { EmbeddedDatabase embeddedDatabase = new EmbeddedDatabaseBuilder() - .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").build(); + .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .build(); JobRepositoryFactoryBean factory = new JobRepositoryFactoryBean(); factory.setDataSource(embeddedDatabase); factory.setTransactionManager(new JdbcTransactionManager(embeddedDatabase)); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobFailureTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobFailureTests.java index 9ff4f5209..ae96ea018 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobFailureTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/SimpleJobFailureTests.java @@ -52,8 +52,9 @@ class SimpleJobFailureTests { @BeforeEach void init() throws Exception { EmbeddedDatabase embeddedDatabase = new EmbeddedDatabaseBuilder() - .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").build(); + .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .build(); JobRepositoryFactoryBean factory = new JobRepositoryFactoryBean(); factory.setDataSource(embeddedDatabase); factory.setTransactionManager(new JdbcTransactionManager(embeddedDatabase)); 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 45bf26ab6..500ec8a33 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 @@ -98,8 +98,10 @@ class SimpleJobTests { @BeforeEach void setUp() throws Exception { EmbeddedDatabase embeddedDatabase = new EmbeddedDatabaseBuilder() - .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").generateUniqueName(true).build(); + .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .generateUniqueName(true) + .build(); JdbcTransactionManager transactionManager = new JdbcTransactionManager(embeddedDatabase); JobRepositoryFactoryBean repositoryFactoryBean = new JobRepositoryFactoryBean(); repositoryFactoryBean.setDataSource(embeddedDatabase); @@ -116,7 +118,7 @@ class SimpleJobTests { ObservationRegistry observationRegistry = ObservationRegistry.create(); observationRegistry.observationConfig() - .observationHandler(new DefaultMeterObservationHandler(Metrics.globalRegistry)); + .observationHandler(new DefaultMeterObservationHandler(Metrics.globalRegistry)); job.setObservationRegistry(observationRegistry); step1 = new StubStep("TestStep1", jobRepository); @@ -226,9 +228,10 @@ class SimpleJobTests { assertFalse(step2.passedInJobContext.isEmpty()); // Observability - MeterRegistryAssert.assertThat(Metrics.globalRegistry).hasTimerWithNameAndTags( - BatchJobObservation.BATCH_JOB_OBSERVATION.getName(), Tags.of(Tag.of("error", "none"), - Tag.of("spring.batch.job.name", "testJob"), Tag.of("spring.batch.job.status", "COMPLETED"))); + MeterRegistryAssert.assertThat(Metrics.globalRegistry) + .hasTimerWithNameAndTags(BatchJobObservation.BATCH_JOB_OBSERVATION.getName(), + Tags.of(Tag.of("error", "none"), Tag.of("spring.batch.job.name", "testJob"), + Tag.of("spring.batch.job.status", "COMPLETED"))); } @AfterEach @@ -500,7 +503,7 @@ class SimpleJobTests { job.setSteps(Arrays.asList(new Step[] { failStep })); JobParameters firstJobParameters = new JobParametersBuilder().addString("JobExecutionParameter", "first", false) - .toJobParameters(); + .toJobParameters(); JobExecution jobexecution = jobRepository.createJobExecution(job.getName(), firstJobParameters); job.execute(jobexecution); @@ -510,7 +513,8 @@ class SimpleJobTests { assertEquals(jobExecutionList.get(0).getJobParameters().getString("JobExecutionParameter"), "first"); JobParameters secondJobParameters = new JobParametersBuilder() - .addString("JobExecutionParameter", "second", false).toJobParameters(); + .addString("JobExecutionParameter", "second", false) + .toJobParameters(); jobexecution = jobRepository.createJobExecution(job.getName(), secondJobParameters); job.execute(jobexecution); 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 5daaac322..3653b305c 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 @@ -50,8 +50,9 @@ class SimpleStepHandlerTests { @BeforeEach void setUp() throws Exception { EmbeddedDatabase embeddedDatabase = new EmbeddedDatabaseBuilder() - .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").build(); + .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .build(); JobRepositoryFactoryBean factory = new JobRepositoryFactoryBean(); factory.setDataSource(embeddedDatabase); factory.setTransactionManager(new JdbcTransactionManager(embeddedDatabase)); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/builder/FlowBuilderTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/builder/FlowBuilderTests.java index cf92a3cc1..cfe457aae 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/builder/FlowBuilderTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/builder/FlowBuilderTests.java @@ -84,8 +84,14 @@ class FlowBuilderTests { } }; - FlowExecution flowExecution = builder.start(stepA).on("*").to(stepB).from(stepA).on("FAILED").to(stepC).end() - .start(new JobFlowExecutor(jobRepository, new SimpleStepHandler(jobRepository), execution)); + FlowExecution flowExecution = builder.start(stepA) + .on("*") + .to(stepB) + .from(stepA) + .on("FAILED") + .to(stepC) + .end() + .start(new JobFlowExecutor(jobRepository, new SimpleStepHandler(jobRepository), execution)); Iterator stepExecutions = execution.getStepExecutions().iterator(); StepExecution stepExecutionA = stepExecutions.next(); 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 a372b632f..3b1068d22 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 @@ -110,8 +110,9 @@ class FlowJobBuilderTests { @BeforeEach void init() throws Exception { EmbeddedDatabase embeddedDatabase = new EmbeddedDatabaseBuilder() - .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").build(); + .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .build(); JobRepositoryFactoryBean factory = new JobRepositoryFactoryBean(); factory.setDataSource(embeddedDatabase); factory.setTransactionManager(new JdbcTransactionManager(embeddedDatabase)); @@ -122,8 +123,11 @@ class FlowJobBuilderTests { @Test void testBuildOnOneLine() { - FlowJobBuilder builder = new JobBuilder("flow", jobRepository).start(step1).on("COMPLETED").to(step2).end() - .preventRestart(); + FlowJobBuilder builder = new JobBuilder("flow", jobRepository).start(step1) + .on("COMPLETED") + .to(step2) + .end() + .preventRestart(); builder.build().execute(execution); assertEquals(BatchStatus.COMPLETED, execution.getStatus()); assertEquals(2, execution.getStepExecutions().size()); @@ -171,8 +175,10 @@ class FlowJobBuilderTests { void testBuildSplitUsingStartAndAdd_BATCH_2346() { Flow subflow1 = new FlowBuilder("subflow1").from(step2).end(); Flow subflow2 = new FlowBuilder("subflow2").from(step3).end(); - Flow splitflow = new FlowBuilder("splitflow").start(subflow1).split(new SimpleAsyncTaskExecutor()) - .add(subflow2).build(); + Flow splitflow = new FlowBuilder("splitflow").start(subflow1) + .split(new SimpleAsyncTaskExecutor()) + .add(subflow2) + .build(); FlowJobBuilder builder = new JobBuilder("flow", jobRepository).start(splitflow).end(); builder.preventRestart().build().execute(execution); @@ -184,8 +190,9 @@ class FlowJobBuilderTests { void testBuildSplit_BATCH_2282() { Flow flow1 = new FlowBuilder("subflow1").from(step1).end(); Flow flow2 = new FlowBuilder("subflow2").from(step2).end(); - Flow splitFlow = new FlowBuilder("splitflow").split(new SimpleAsyncTaskExecutor()).add(flow1, flow2) - .build(); + Flow splitFlow = new FlowBuilder("splitflow").split(new SimpleAsyncTaskExecutor()) + .add(flow1, flow2) + .build(); FlowJobBuilder builder = new JobBuilder("flow", jobRepository).start(splitFlow).end(); builder.preventRestart().build().execute(execution); assertEquals(BatchStatus.COMPLETED, execution.getStatus()); @@ -291,8 +298,10 @@ class FlowJobBuilderTests { public Step step(JobRepository jobRepository, PlatformTransactionManager transactionManager, @Value("#{jobParameters['chunkSize']}") Integer chunkSize) { return new StepBuilder("step", jobRepository).chunk(chunkSize, transactionManager) - .reader(new ListItemReader<>(Arrays.asList(1, 2, 3, 4))).writer(items -> { - }).build(); + .reader(new ListItemReader<>(Arrays.asList(1, 2, 3, 4))) + .writer(items -> { + }) + .build(); } @Bean @@ -304,7 +313,9 @@ class FlowJobBuilderTests { @Bean public DataSource dataSource() { return new EmbeddedDatabaseBuilder().addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").generateUniqueName(true).build(); + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .generateUniqueName(true) + .build(); } @Bean diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/builder/JobBuilderTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/builder/JobBuilderTests.java index 8f6618432..9678a8e4c 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/builder/JobBuilderTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/builder/JobBuilderTests.java @@ -72,16 +72,19 @@ class JobBuilderTests { @Bean public Job job(JobRepository jobRepository, PlatformTransactionManager transactionManager) { return new JobBuilder("job", jobRepository).listener(new InterfaceBasedJobExecutionListener()) - .listener(new AnnotationBasedJobExecutionListener()) - .start(new StepBuilder("step", jobRepository) - .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager).build()) - .build(); + .listener(new AnnotationBasedJobExecutionListener()) + .start(new StepBuilder("step", jobRepository) + .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager) + .build()) + .build(); } @Bean public DataSource dataSource() { return new EmbeddedDatabaseBuilder().addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").generateUniqueName(true).build(); + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .generateUniqueName(true) + .build(); } @Bean diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowJobFailureTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowJobFailureTests.java index 6f52aba25..41fc07741 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowJobFailureTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/FlowJobFailureTests.java @@ -57,8 +57,9 @@ class FlowJobFailureTests { @BeforeEach void init() throws Exception { EmbeddedDatabase embeddedDatabase = new EmbeddedDatabaseBuilder() - .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").build(); + .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .build(); JobRepositoryFactoryBean factory = new JobRepositoryFactoryBean(); factory.setDataSource(embeddedDatabase); factory.setTransactionManager(new JdbcTransactionManager(embeddedDatabase)); 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 748ed0510..4e1284408 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 @@ -74,8 +74,9 @@ public class FlowJobTests { @BeforeEach void setUp() throws Exception { EmbeddedDatabase embeddedDatabase = new EmbeddedDatabaseBuilder() - .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").build(); + .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .build(); JdbcTransactionManager transactionManager = new JdbcTransactionManager(embeddedDatabase); JobRepositoryFactoryBean factory = new JobRepositoryFactoryBean(); factory.setDataSource(embeddedDatabase); @@ -129,8 +130,8 @@ public class FlowJobTests { void testFailedStep() throws Exception { SimpleFlow flow = new SimpleFlow("job"); List transitions = new ArrayList<>(); - transitions.add( - StateTransition.createStateTransition(new StateSupport("step1", FlowExecutionStatus.FAILED), "step2")); + transitions + .add(StateTransition.createStateTransition(new StateSupport("step1", FlowExecutionStatus.FAILED), "step2")); StepState step2 = new StepState(new StubStep("step2")); transitions.add(StateTransition.createStateTransition(step2, ExitStatus.FAILED.getExitCode(), "end0")); transitions.add(StateTransition.createStateTransition(step2, ExitStatus.COMPLETED.getExitCode(), "end1")); @@ -192,7 +193,7 @@ public class FlowJobTests { transitions.add(StateTransition.createStateTransition(state2, ExitStatus.FAILED.getExitCode(), "end0")); transitions.add(StateTransition.createStateTransition(state2, ExitStatus.COMPLETED.getExitCode(), "end1")); transitions - .add(StateTransition.createStateTransition(new EndState(FlowExecutionStatus.STOPPED, "end0"), "step3")); + .add(StateTransition.createStateTransition(new EndState(FlowExecutionStatus.STOPPED, "end0"), "step3")); transitions.add(StateTransition.createEndStateTransition(new EndState(FlowExecutionStatus.COMPLETED, "end1"))); transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step3")), "end2")); transitions.add(StateTransition.createEndStateTransition(new EndState(FlowExecutionStatus.COMPLETED, "end2"))); @@ -280,7 +281,7 @@ public class FlowJobTests { transitions = new ArrayList<>(); transitions.add(StateTransition - .createStateTransition(new SplitState(Arrays.asList(flow1, flow2), "split"), "end0")); + .createStateTransition(new SplitState(Arrays.asList(flow1, flow2), "split"), "end0")); transitions.add(StateTransition.createEndStateTransition(new EndState(FlowExecutionStatus.COMPLETED, "end0"))); flow.setStateTransitions(transitions); flow.afterPropertiesSet(); @@ -341,7 +342,7 @@ public class FlowJobTests { transitions = new ArrayList<>(); transitions.add(StateTransition - .createStateTransition(new SplitState(Arrays.asList(flow1, flow2), "split"), "end0")); + .createStateTransition(new SplitState(Arrays.asList(flow1, flow2), "split"), "end0")); transitions.add(StateTransition.createEndStateTransition(new EndState(FlowExecutionStatus.COMPLETED, "end0"))); flow.setStateTransitions(transitions); flow.afterPropertiesSet(); @@ -361,7 +362,7 @@ public class FlowJobTests { List transitions = new ArrayList<>(); transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step1")), "end")); transitions - .add(StateTransition.createStateTransition(new EndState(FlowExecutionStatus.STOPPED, "end"), "step2")); + .add(StateTransition.createStateTransition(new EndState(FlowExecutionStatus.STOPPED, "end"), "step2")); StepState step2 = new StepState(new StubStep("step2")); transitions.add(StateTransition.createStateTransition(step2, ExitStatus.FAILED.getExitCode(), "end0")); transitions.add(StateTransition.createStateTransition(step2, ExitStatus.COMPLETED.getExitCode(), "end1")); @@ -380,7 +381,7 @@ public class FlowJobTests { List transitions = new ArrayList<>(); transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step1")), "end")); transitions - .add(StateTransition.createStateTransition(new EndState(FlowExecutionStatus.FAILED, "end"), "step2")); + .add(StateTransition.createStateTransition(new EndState(FlowExecutionStatus.FAILED, "end"), "step2")); transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step2")), ExitStatus.FAILED.getExitCode(), "end0")); transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step2")), @@ -401,7 +402,7 @@ public class FlowJobTests { List transitions = new ArrayList<>(); transitions.add(StateTransition.createStateTransition(new StepState(new StubStep("step1")), "end")); transitions - .add(StateTransition.createStateTransition(new EndState(FlowExecutionStatus.STOPPED, "end"), "step2")); + .add(StateTransition.createStateTransition(new EndState(FlowExecutionStatus.STOPPED, "end"), "step2")); StepState step2 = new StepState(new StubStep("step2")); transitions.add(StateTransition.createStateTransition(step2, ExitStatus.COMPLETED.getExitCode(), "end0")); transitions.add(StateTransition.createStateTransition(step2, ExitStatus.FAILED.getExitCode(), "end1")); @@ -675,7 +676,7 @@ public class FlowJobTests { transitions = new ArrayList<>(); transitions.add(StateTransition - .createStateTransition(new SplitState(Arrays.asList(flow1, flow2), "split"), "end2")); + .createStateTransition(new SplitState(Arrays.asList(flow1, flow2), "split"), "end2")); transitions.add(StateTransition.createEndStateTransition(new EndState(FlowExecutionStatus.COMPLETED, "end2"))); flow.setStateTransitions(transitions); flow.afterPropertiesSet(); 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 9fcc7d19c..005349f98 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 @@ -55,8 +55,9 @@ class FlowStepTests { @BeforeEach void setUp() throws Exception { EmbeddedDatabase embeddedDatabase = new EmbeddedDatabaseBuilder() - .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").build(); + .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .build(); JobRepositoryFactoryBean jobRepositoryFactoryBean = new JobRepositoryFactoryBean(); jobRepositoryFactoryBean.setDataSource(embeddedDatabase); jobRepositoryFactoryBean.setTransactionManager(new JdbcTransactionManager(embeddedDatabase)); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/TaskExecutorJobLauncherTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/TaskExecutorJobLauncherTests.java index 08c1812b2..6f9daf23d 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/launch/TaskExecutorJobLauncherTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/launch/TaskExecutorJobLauncherTests.java @@ -112,9 +112,9 @@ class TaskExecutorJobLauncherTests { testRun(); when(jobRepository.getLastJobExecution(job.getName(), jobParameters)) - .thenReturn(new JobExecution(new JobInstance(1L, job.getName()), jobParameters)); + .thenReturn(new JobExecution(new JobInstance(1L, job.getName()), jobParameters)); when(jobRepository.createJobExecution(job.getName(), jobParameters)) - .thenReturn(new JobExecution(new JobInstance(1L, job.getName()), jobParameters)); + .thenReturn(new JobExecution(new JobInstance(1L, job.getName()), jobParameters)); jobLauncher.run(job, jobParameters); } @@ -139,7 +139,7 @@ class TaskExecutorJobLauncherTests { testRun(); when(jobRepository.getLastJobExecution(job.getName(), jobParameters)) - .thenReturn(new JobExecution(new JobInstance(1L, job.getName()), jobParameters)); + .thenReturn(new JobExecution(new JobInstance(1L, job.getName()), jobParameters)); assertThrows(JobRestartException.class, () -> jobLauncher.run(job, jobParameters)); } @@ -275,7 +275,7 @@ class TaskExecutorJobLauncherTests { String jobName = "test_job"; JobRepository jobRepository = mock(JobRepository.class); JobParameters parameters = new JobParametersBuilder().addLong("runtime", System.currentTimeMillis()) - .toJobParameters(); + .toJobParameters(); JobExecution jobExecution = mock(JobExecution.class); Job job = mock(Job.class); JobParametersValidator validator = mock(JobParametersValidator.class); 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 6afb5cae0..91430257e 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 @@ -350,8 +350,9 @@ class CommandLineJobRunnerTests { @Test void testNext() throws Throwable { String[] args = new String[] { jobPath, "-next", jobName, "bar=foo" }; - JobParameters jobParameters = new JobParametersBuilder().addString("foo", "bar").addString("bar", "foo") - .toJobParameters(); + JobParameters jobParameters = new JobParametersBuilder().addString("foo", "bar") + .addString("bar", "foo") + .toJobParameters(); StubJobExplorer.jobInstances = Arrays.asList(new JobInstance(2L, jobName)); CommandLineJobRunner.main(args); assertEquals(0, StubSystemExiter.status); 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 d6f7481f7..32f01dae7 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 @@ -161,7 +161,7 @@ class SimpleJobOperatorTests { JobInstance jobInstance = new JobInstance(321L, "foo"); when(jobExplorer.getJobInstances("foo", 0, 1)).thenReturn(Collections.singletonList(jobInstance)); when(jobExplorer.getJobExecutions(jobInstance)) - .thenReturn(Collections.singletonList(new JobExecution(jobInstance, new JobParameters()))); + .thenReturn(Collections.singletonList(new JobExecution(jobInstance, new JobParameters()))); Long value = jobOperator.startNextInstance("foo"); assertEquals(999, value.longValue()); } @@ -191,7 +191,7 @@ class SimpleJobOperatorTests { void testResumeSunnyDay() throws Exception { jobParameters = new JobParameters(); when(jobExplorer.getJobExecution(111L)) - .thenReturn(new JobExecution(new JobInstance(123L, job.getName()), 111L, jobParameters)); + .thenReturn(new JobExecution(new JobInstance(123L, job.getName()), 111L, jobParameters)); jobExplorer.getJobExecution(111L); Long value = jobOperator.restart(111L); assertEquals(999, value.longValue()); @@ -255,7 +255,7 @@ class SimpleJobOperatorTests { void testGetJobParametersSunnyDay() throws Exception { final JobParameters jobParameters = new JobParameters(); when(jobExplorer.getJobExecution(111L)) - .thenReturn(new JobExecution(new JobInstance(123L, job.getName()), 111L, jobParameters)); + .thenReturn(new JobExecution(new JobInstance(123L, job.getName()), 111L, jobParameters)); String value = jobOperator.getParameters(111L); assertEquals("a=b", value); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemProcessListenerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemProcessListenerTests.java index 513e51cdd..ed00b162a 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemProcessListenerTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/CompositeItemProcessListenerTests.java @@ -68,7 +68,7 @@ class CompositeItemProcessListenerTests { @Test void testSetListeners() { compositeListener - .setListeners(Collections.>singletonList(listener)); + .setListeners(Collections.>singletonList(listener)); listener.beforeProcess(null); compositeListener.beforeProcess(null); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/ItemListenerErrorTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/ItemListenerErrorTests.java index e060a34d8..b75c36111 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/ItemListenerErrorTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/ItemListenerErrorTests.java @@ -142,14 +142,22 @@ class ItemListenerErrorTests { ItemWriter fakeItemWriter, ItemProcessListener itemProcessListener) { return new StepBuilder("testStep", jobRepository).chunk(10, transactionManager) - .reader(fakeItemReader).processor(fakeProcessor).writer(fakeItemWriter) - .listener(itemProcessListener).faultTolerant().skipLimit(50).skip(RuntimeException.class).build(); + .reader(fakeItemReader) + .processor(fakeProcessor) + .writer(fakeItemWriter) + .listener(itemProcessListener) + .faultTolerant() + .skipLimit(50) + .skip(RuntimeException.class) + .build(); } @Bean public DataSource dataSource() { return new EmbeddedDatabaseBuilder().addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").generateUniqueName(true).build(); + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .generateUniqueName(true) + .build(); } @Bean diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/observability/BatchMetricsTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/observability/BatchMetricsTests.java index cef41c8d7..dc1a10f15 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/observability/BatchMetricsTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/observability/BatchMetricsTests.java @@ -64,8 +64,10 @@ class BatchMetricsTests { @Test void testCalculateDuration() { LocalDateTime startTime = LocalDateTime.now(); - LocalDateTime endTime = startTime.plus(2, ChronoUnit.HOURS).plus(31, ChronoUnit.MINUTES) - .plus(12, ChronoUnit.SECONDS).plus(42, ChronoUnit.MILLIS); + LocalDateTime endTime = startTime.plus(2, ChronoUnit.HOURS) + .plus(31, ChronoUnit.MINUTES) + .plus(12, ChronoUnit.SECONDS) + .plus(42, ChronoUnit.MILLIS); Duration duration = BatchMetrics.calculateDuration(startTime, endTime); Duration expectedDuration = Duration.ofMillis(42).plusSeconds(12).plusMinutes(31).plusHours(2); @@ -152,67 +154,95 @@ class BatchMetricsTests { "There should be a meter of type COUNTER named spring.batch.job.launch.count registered in the global registry"); assertDoesNotThrow( - () -> Metrics.globalRegistry.get("spring.batch.job").tag("spring.batch.job.name", "job") - .tag("spring.batch.job.status", "COMPLETED").timer(), + () -> Metrics.globalRegistry.get("spring.batch.job") + .tag("spring.batch.job.name", "job") + .tag("spring.batch.job.status", "COMPLETED") + .timer(), "There should be a meter of type TIMER named spring.batch.job registered in the global registry"); assertDoesNotThrow( - () -> Metrics.globalRegistry.get("spring.batch.job.active").tag("spring.batch.job.active.name", "job") - .longTaskTimer(), + () -> Metrics.globalRegistry.get("spring.batch.job.active") + .tag("spring.batch.job.active.name", "job") + .longTaskTimer(), "There should be a meter of type LONG_TASK_TIMER named spring.batch.job.active" + " registered in the global registry"); // Step 1 (tasklet) metrics assertDoesNotThrow( - () -> Metrics.globalRegistry.get("spring.batch.step").tag("spring.batch.step.name", "step1") - .tag("spring.batch.step.job.name", "job").tag("spring.batch.step.status", "COMPLETED").timer(), + () -> Metrics.globalRegistry.get("spring.batch.step") + .tag("spring.batch.step.name", "step1") + .tag("spring.batch.step.job.name", "job") + .tag("spring.batch.step.status", "COMPLETED") + .timer(), "There should be a meter of type TIMER named spring.batch.step registered in the global registry"); // Step 2 (simple chunk-oriented) metrics assertDoesNotThrow( - () -> Metrics.globalRegistry.get("spring.batch.step").tag("spring.batch.step.name", "step2") - .tag("spring.batch.step.job.name", "job").tag("spring.batch.step.status", "COMPLETED").timer(), + () -> Metrics.globalRegistry.get("spring.batch.step") + .tag("spring.batch.step.name", "step2") + .tag("spring.batch.step.job.name", "job") + .tag("spring.batch.step.status", "COMPLETED") + .timer(), "There should be a meter of type TIMER named spring.batch.step registered in the global registry"); assertDoesNotThrow( - () -> Metrics.globalRegistry.get("spring.batch.item.read").tag("spring.batch.item.read.job.name", "job") - .tag("spring.batch.item.read.step.name", "step2") - .tag("spring.batch.item.read.status", "SUCCESS").timer(), + () -> Metrics.globalRegistry.get("spring.batch.item.read") + .tag("spring.batch.item.read.job.name", "job") + .tag("spring.batch.item.read.step.name", "step2") + .tag("spring.batch.item.read.status", "SUCCESS") + .timer(), "There should be a meter of type TIMER named spring.batch.item.read registered in the global registry"); - assertDoesNotThrow(() -> Metrics.globalRegistry.get("spring.batch.item.process") - .tag("spring.batch.item.process.job.name", "job").tag("spring.batch.item.process.step.name", "step2") - .tag("spring.batch.item.process.status", "SUCCESS").timer(), + assertDoesNotThrow( + () -> Metrics.globalRegistry.get("spring.batch.item.process") + .tag("spring.batch.item.process.job.name", "job") + .tag("spring.batch.item.process.step.name", "step2") + .tag("spring.batch.item.process.status", "SUCCESS") + .timer(), "There should be a meter of type TIMER named spring.batch.item.process registered in the global registry"); - assertDoesNotThrow(() -> Metrics.globalRegistry.get("spring.batch.chunk.write") - .tag("spring.batch.chunk.write.job.name", "job").tag("spring.batch.chunk.write.step.name", "step2") - .tag("spring.batch.chunk.write.status", "SUCCESS").timer(), + assertDoesNotThrow( + () -> Metrics.globalRegistry.get("spring.batch.chunk.write") + .tag("spring.batch.chunk.write.job.name", "job") + .tag("spring.batch.chunk.write.step.name", "step2") + .tag("spring.batch.chunk.write.status", "SUCCESS") + .timer(), "There should be a meter of type TIMER named spring.batch.chunk.write registered in the global registry"); // Step 3 (fault-tolerant chunk-oriented) metrics assertDoesNotThrow( - () -> Metrics.globalRegistry.get("spring.batch.step").tag("spring.batch.step.name", "step3") - .tag("spring.batch.step.job.name", "job").tag("spring.batch.step.status", "COMPLETED").timer(), + () -> Metrics.globalRegistry.get("spring.batch.step") + .tag("spring.batch.step.name", "step3") + .tag("spring.batch.step.job.name", "job") + .tag("spring.batch.step.status", "COMPLETED") + .timer(), "There should be a meter of type TIMER named spring.batch.step registered in the global registry"); assertDoesNotThrow( - () -> Metrics.globalRegistry.get("spring.batch.item.read").tag("spring.batch.item.read.job.name", "job") - .tag("spring.batch.item.read.step.name", "step3") - .tag("spring.batch.item.read.status", "SUCCESS").timer(), + () -> Metrics.globalRegistry.get("spring.batch.item.read") + .tag("spring.batch.item.read.job.name", "job") + .tag("spring.batch.item.read.step.name", "step3") + .tag("spring.batch.item.read.status", "SUCCESS") + .timer(), "There should be a meter of type TIMER named spring.batch.item.read registered in the global registry"); - assertDoesNotThrow(() -> Metrics.globalRegistry.get("spring.batch.item.process") - .tag("spring.batch.item.process.job.name", "job").tag("spring.batch.item.process.step.name", "step3") - .tag("spring.batch.item.process.status", "SUCCESS").timer(), + assertDoesNotThrow( + () -> Metrics.globalRegistry.get("spring.batch.item.process") + .tag("spring.batch.item.process.job.name", "job") + .tag("spring.batch.item.process.step.name", "step3") + .tag("spring.batch.item.process.status", "SUCCESS") + .timer(), "There should be a meter of type TIMER named spring.batch.item.process registered in the global registry"); - assertDoesNotThrow(() -> Metrics.globalRegistry.get("spring.batch.chunk.write") - .tag("spring.batch.chunk.write.job.name", "job").tag("spring.batch.chunk.write.step.name", "step3") - .tag("spring.batch.chunk.write.status", "SUCCESS").timer(), + assertDoesNotThrow( + () -> Metrics.globalRegistry.get("spring.batch.chunk.write") + .tag("spring.batch.chunk.write.job.name", "job") + .tag("spring.batch.chunk.write.step.name", "step3") + .tag("spring.batch.chunk.write.status", "SUCCESS") + .timer(), "There should be a meter of type TIMER named spring.batch.chunk.write registered in the global registry"); } @@ -223,43 +253,51 @@ class BatchMetricsTests { @Bean public Step step1(JobRepository jobRepository, PlatformTransactionManager transactionManager) { return new StepBuilder("step1", jobRepository) - .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager).build(); + .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager) + .build(); } @Bean public Step step2(JobRepository jobRepository, PlatformTransactionManager transactionManager) { return new StepBuilder("step2", jobRepository).chunk(2, transactionManager) - .reader(new ListItemReader<>(Arrays.asList(1, 2, 3, 4, 5))) - .writer(items -> items.forEach(System.out::println)).build(); + .reader(new ListItemReader<>(Arrays.asList(1, 2, 3, 4, 5))) + .writer(items -> items.forEach(System.out::println)) + .build(); } @Bean public Step step3(JobRepository jobRepository, PlatformTransactionManager transactionManager) { return new StepBuilder("step3", jobRepository).chunk(2, transactionManager) - .reader(new ListItemReader<>(Arrays.asList(6, 7, 8, 9, 10))) - .writer(items -> items.forEach(System.out::println)).faultTolerant().skip(Exception.class) - .skipLimit(3).build(); + .reader(new ListItemReader<>(Arrays.asList(6, 7, 8, 9, 10))) + .writer(items -> items.forEach(System.out::println)) + .faultTolerant() + .skip(Exception.class) + .skipLimit(3) + .build(); } @Bean public Job job(JobRepository jobRepository, PlatformTransactionManager transactionManager) { return new JobBuilder("job", jobRepository).start(step1(jobRepository, transactionManager)) - .next(step2(jobRepository, transactionManager)).next(step3(jobRepository, transactionManager)) - .build(); + .next(step2(jobRepository, transactionManager)) + .next(step3(jobRepository, transactionManager)) + .build(); } @Bean public ObservationRegistry observationRegistry() { ObservationRegistry observationRegistry = ObservationRegistry.create(); observationRegistry.observationConfig() - .observationHandler(new DefaultMeterObservationHandler(Metrics.globalRegistry)); + .observationHandler(new DefaultMeterObservationHandler(Metrics.globalRegistry)); return observationRegistry; } @Bean public DataSource dataSource() { return new EmbeddedDatabaseBuilder().addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").generateUniqueName(true).build(); + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .generateUniqueName(true) + .build(); } @Bean 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 3a931d1d2..ae720c248 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 @@ -53,8 +53,9 @@ class PartitionStepTests { @BeforeEach void setUp() throws Exception { EmbeddedDatabase embeddedDatabase = new EmbeddedDatabaseBuilder() - .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").build(); + .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .build(); JobRepositoryFactoryBean factory = new JobRepositoryFactoryBean(); factory.setDataSource(embeddedDatabase); factory.setTransactionManager(new JdbcTransactionManager(embeddedDatabase)); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/partition/support/RemoteStepExecutionAggregatorTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/partition/support/RemoteStepExecutionAggregatorTests.java index 98eaa9262..808cbe78d 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/partition/support/RemoteStepExecutionAggregatorTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/partition/support/RemoteStepExecutionAggregatorTests.java @@ -51,8 +51,9 @@ class RemoteStepExecutionAggregatorTests { @BeforeEach void init() throws Exception { EmbeddedDatabase embeddedDatabase = new EmbeddedDatabaseBuilder() - .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").build(); + .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .build(); JdbcTransactionManager transactionManager = new JdbcTransactionManager(embeddedDatabase); JobRepositoryFactoryBean factory = new JobRepositoryFactoryBean(); factory.setDataSource(embeddedDatabase); 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 30d2bc6d9..78e574c49 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 @@ -56,8 +56,9 @@ class SimpleStepExecutionSplitterTests { void setUp() throws Exception { step = new TaskletStep("step"); EmbeddedDatabase embeddedDatabase = new EmbeddedDatabaseBuilder() - .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").build(); + .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .build(); JobRepositoryFactoryBean factory = new JobRepositoryFactoryBean(); factory.setDataSource(embeddedDatabase); factory.setTransactionManager(new JdbcTransactionManager(embeddedDatabase)); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractJobDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractJobDaoTests.java index 2a781eab6..d4381fb94 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractJobDaoTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractJobDaoTests.java @@ -52,7 +52,9 @@ public abstract class AbstractJobDaoTests { protected JobExecutionDao jobExecutionDao; protected JobParameters jobParameters = new JobParametersBuilder().addString("job.key", "jobKey") - .addLong("long", (long) 1).addDouble("double", 7.7).toJobParameters(); + .addLong("long", (long) 1) + .addDouble("double", 7.7) + .toJobParameters(); protected JobInstance jobInstance; @@ -211,7 +213,7 @@ public abstract class AbstractJobDaoTests { jobInstance = jobInstanceDao.createJobInstance(testJob, jobParameters); List> jobs = jdbcTemplate - .queryForList("SELECT * FROM BATCH_JOB_INSTANCE where JOB_INSTANCE_ID=?", jobInstance.getId()); + .queryForList("SELECT * FROM BATCH_JOB_INSTANCE where JOB_INSTANCE_ID=?", jobInstance.getId()); assertEquals(1, jobs.size()); assertEquals("test", jobs.get(0).get("JOB_NAME")); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractJobExecutionDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractJobExecutionDaoTests.java index 563158fc0..1c494ed32 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractJobExecutionDaoTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractJobExecutionDaoTests.java @@ -242,8 +242,10 @@ public abstract class AbstractJobExecutionDaoTests { assertEquals(3, values.size()); Long jobExecutionId = exec.getId(); - JobExecution value = values.stream().filter(jobExecution -> jobExecutionId.equals(jobExecution.getId())) - .findFirst().orElseThrow(); + JobExecution value = values.stream() + .filter(jobExecution -> jobExecutionId.equals(jobExecution.getId())) + .findFirst() + .orElseThrow(); assertEquals(now.plus(3, ChronoUnit.SECONDS), value.getLastUpdated()); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractJobInstanceDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractJobInstanceDaoTests.java index e54479b9d..56d0de868 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractJobInstanceDaoTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/AbstractJobInstanceDaoTests.java @@ -41,8 +41,10 @@ public abstract class AbstractJobInstanceDaoTests { private final String fooJob = "foo"; private final JobParameters fooParams = new JobParametersBuilder().addString("stringKey", "stringValue") - .addLong("longKey", Long.MAX_VALUE).addDouble("doubleKey", Double.MAX_VALUE) - .addDate("dateKey", new Date(DATE)).toJobParameters(); + .addLong("longKey", Long.MAX_VALUE) + .addDouble("doubleKey", Double.MAX_VALUE) + .addDate("dateKey", new Date(DATE)) + .toJobParameters(); protected abstract JobInstanceDao getJobInstanceDao(); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcJobDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcJobDaoTests.java index 0cf0ed4df..f7ad628d3 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcJobDaoTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcJobDaoTests.java @@ -48,7 +48,7 @@ public class JdbcJobDaoTests extends AbstractJobDaoTests { jobExecutionDao.updateJobExecution(jobExecution); List> executions = jdbcTemplate - .queryForList("SELECT * FROM BATCH_JOB_EXECUTION where JOB_INSTANCE_ID=?", jobInstance.getId()); + .queryForList("SELECT * FROM BATCH_JOB_EXECUTION where JOB_INSTANCE_ID=?", jobInstance.getId()); assertEquals(1, executions.size()); assertEquals(LONG_STRING.substring(0, 250), executions.get(0).get("EXIT_MESSAGE")); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcJobExecutionDaoTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcJobExecutionDaoTests.java index d7d49c036..510fcfada 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcJobExecutionDaoTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/dao/JdbcJobExecutionDaoTests.java @@ -119,9 +119,13 @@ public class JdbcJobExecutionDaoTests extends AbstractJobExecutionDaoTests { long longParameter = 1L; double doubleParameter = 2D; JobParameters jobParameters = new JobParametersBuilder().addString("string", stringParameter) - .addLong("long", longParameter).addDouble("double", doubleParameter).addDate("date", dateParameter) - .addLocalDate("localDate", localDateParameter).addLocalTime("localTime", localTimeParameter) - .addLocalDateTime("localDateTime", localDateTimeParameter).toJobParameters(); + .addLong("long", longParameter) + .addDouble("double", doubleParameter) + .addDate("date", dateParameter) + .addLocalDate("localDate", localDateParameter) + .addLocalTime("localTime", localTimeParameter) + .addLocalDateTime("localDateTime", localDateTimeParameter) + .toJobParameters(); JobExecution execution = new JobExecution(jobInstance, jobParameters); // when 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 36123929e..d4eb57efb 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 @@ -64,14 +64,16 @@ class JdbcStepExecutionDaoTests extends AbstractStepExecutionDaoTests { StepExecution retrievedAfterSave = dao.getStepExecution(jobExecution, stepExecution.getId()); assertTrue(retrievedAfterSave.getExitStatus().getExitDescription().length() < stepExecution.getExitStatus() - .getExitDescription().length(), "Exit description should be truncated"); + .getExitDescription() + .length(), "Exit description should be truncated"); dao.updateStepExecution(stepExecution); StepExecution retrievedAfterUpdate = dao.getStepExecution(jobExecution, stepExecution.getId()); assertTrue(retrievedAfterUpdate.getExitStatus().getExitDescription().length() < stepExecution.getExitStatus() - .getExitDescription().length(), "Exit description should be truncated"); + .getExitDescription() + .length(), "Exit description should be truncated"); } @Transactional 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 d9bffdcfd..d28daf95a 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 @@ -101,9 +101,9 @@ class JobRepositoryFactoryBeanTests { when(incrementerFactory.getSupportedIncrementerTypes()).thenReturn(new String[0]); when(incrementerFactory.getIncrementer("ORACLE", tablePrefix + "JOB_SEQ")).thenReturn(new StubIncrementer()); when(incrementerFactory.getIncrementer("ORACLE", tablePrefix + "JOB_EXECUTION_SEQ")) - .thenReturn(new StubIncrementer()); + .thenReturn(new StubIncrementer()); when(incrementerFactory.getIncrementer("ORACLE", tablePrefix + "STEP_EXECUTION_SEQ")) - .thenReturn(new StubIncrementer()); + .thenReturn(new StubIncrementer()); factory.afterPropertiesSet(); factory.getObject(); @@ -119,9 +119,9 @@ class JobRepositoryFactoryBeanTests { when(incrementerFactory.isSupportedIncrementerType("ORACLE")).thenReturn(true); when(incrementerFactory.getIncrementer("ORACLE", tablePrefix + "JOB_SEQ")).thenReturn(new StubIncrementer()); when(incrementerFactory.getIncrementer("ORACLE", tablePrefix + "JOB_EXECUTION_SEQ")) - .thenReturn(new StubIncrementer()); + .thenReturn(new StubIncrementer()); when(incrementerFactory.getIncrementer("ORACLE", tablePrefix + "STEP_EXECUTION_SEQ")) - .thenReturn(new StubIncrementer()); + .thenReturn(new StubIncrementer()); factory.setIncrementerFactory(incrementerFactory); factory.afterPropertiesSet(); @@ -139,9 +139,9 @@ class JobRepositoryFactoryBeanTests { when(incrementerFactory.isSupportedIncrementerType("ORACLE")).thenReturn(true); when(incrementerFactory.getIncrementer("ORACLE", tablePrefix + "JOB_SEQ")).thenReturn(new StubIncrementer()); when(incrementerFactory.getIncrementer("ORACLE", tablePrefix + "JOB_EXECUTION_SEQ")) - .thenReturn(new StubIncrementer()); + .thenReturn(new StubIncrementer()); when(incrementerFactory.getIncrementer("ORACLE", tablePrefix + "STEP_EXECUTION_SEQ")) - .thenReturn(new StubIncrementer()); + .thenReturn(new StubIncrementer()); factory.setIncrementerFactory(incrementerFactory); LobHandler lobHandler = new DefaultLobHandler(); @@ -162,14 +162,14 @@ class JobRepositoryFactoryBeanTests { when(incrementerFactory.isSupportedIncrementerType("ORACLE")).thenReturn(true); when(incrementerFactory.getIncrementer("ORACLE", tablePrefix + "JOB_SEQ")).thenReturn(new StubIncrementer()); when(incrementerFactory.getIncrementer("ORACLE", tablePrefix + "JOB_EXECUTION_SEQ")) - .thenReturn(new StubIncrementer()); + .thenReturn(new StubIncrementer()); when(incrementerFactory.getIncrementer("ORACLE", tablePrefix + "STEP_EXECUTION_SEQ")) - .thenReturn(new StubIncrementer()); + .thenReturn(new StubIncrementer()); factory.setIncrementerFactory(incrementerFactory); factory.afterPropertiesSet(); Serializer> serializer = (Serializer>) ReflectionTestUtils - .getField(factory, "serializer"); + .getField(factory, "serializer"); assertTrue(serializer instanceof DefaultExecutionContextSerializer); } @@ -182,9 +182,9 @@ class JobRepositoryFactoryBeanTests { when(incrementerFactory.isSupportedIncrementerType("ORACLE")).thenReturn(true); when(incrementerFactory.getIncrementer("ORACLE", tablePrefix + "JOB_SEQ")).thenReturn(new StubIncrementer()); when(incrementerFactory.getIncrementer("ORACLE", tablePrefix + "JOB_EXECUTION_SEQ")) - .thenReturn(new StubIncrementer()); + .thenReturn(new StubIncrementer()); when(incrementerFactory.getIncrementer("ORACLE", tablePrefix + "STEP_EXECUTION_SEQ")) - .thenReturn(new StubIncrementer()); + .thenReturn(new StubIncrementer()); factory.setIncrementerFactory(incrementerFactory); ExecutionContextSerializer customSerializer = new DefaultExecutionContextSerializer(); @@ -203,9 +203,9 @@ class JobRepositoryFactoryBeanTests { when(incrementerFactory.isSupportedIncrementerType("ORACLE")).thenReturn(true); when(incrementerFactory.getIncrementer("ORACLE", tablePrefix + "JOB_SEQ")).thenReturn(new StubIncrementer()); when(incrementerFactory.getIncrementer("ORACLE", tablePrefix + "JOB_EXECUTION_SEQ")) - .thenReturn(new StubIncrementer()); + .thenReturn(new StubIncrementer()); when(incrementerFactory.getIncrementer("ORACLE", tablePrefix + "STEP_EXECUTION_SEQ")) - .thenReturn(new StubIncrementer()); + .thenReturn(new StubIncrementer()); factory.setIncrementerFactory(incrementerFactory); factory.afterPropertiesSet(); @@ -223,9 +223,9 @@ class JobRepositoryFactoryBeanTests { when(incrementerFactory.isSupportedIncrementerType("ORACLE")).thenReturn(true); when(incrementerFactory.getIncrementer("ORACLE", tablePrefix + "JOB_SEQ")).thenReturn(new StubIncrementer()); when(incrementerFactory.getIncrementer("ORACLE", tablePrefix + "JOB_EXECUTION_SEQ")) - .thenReturn(new StubIncrementer()); + .thenReturn(new StubIncrementer()); when(incrementerFactory.getIncrementer("ORACLE", tablePrefix + "STEP_EXECUTION_SEQ")) - .thenReturn(new StubIncrementer()); + .thenReturn(new StubIncrementer()); factory.setIncrementerFactory(incrementerFactory); JdbcOperations customJdbcOperations = mock(JdbcOperations.class); @@ -281,11 +281,11 @@ class JobRepositoryFactoryBeanTests { when(incrementerFactory.isSupportedIncrementerType("HSQL")).thenReturn(true); when(incrementerFactory.getSupportedIncrementerTypes()).thenReturn(new String[0]); when(incrementerFactory.getIncrementer(databaseType, tablePrefix + "JOB_SEQ")) - .thenReturn(new StubIncrementer()); + .thenReturn(new StubIncrementer()); when(incrementerFactory.getIncrementer(databaseType, tablePrefix + "JOB_EXECUTION_SEQ")) - .thenReturn(new StubIncrementer()); + .thenReturn(new StubIncrementer()); when(incrementerFactory.getIncrementer(databaseType, tablePrefix + "STEP_EXECUTION_SEQ")) - .thenReturn(new StubIncrementer()); + .thenReturn(new StubIncrementer()); factory.afterPropertiesSet(); factory.getObject(); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryIntegrationTests.java index 98e996f46..53c33b178 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryIntegrationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryIntegrationTests.java @@ -235,7 +235,7 @@ class SimpleJobRepositoryIntegrationTests { @Test public void testReExecuteWithSameJobParametersWhenRunning() throws Exception { JobParameters jobParameters = new JobParametersBuilder().addString("stringKey", "stringValue") - .toJobParameters(); + .toJobParameters(); // jobExecution with status STARTING JobExecution jobExecution = jobRepository.createJobExecution(job.getName(), jobParameters); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryTests.java index 826e5a295..99d0429e4 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/repository/support/SimpleJobRepositoryTests.java @@ -373,7 +373,7 @@ class SimpleJobRepositoryTests { JobExecution jobExecution2 = mock(JobExecution.class); JobInstance jobInstance = mock(JobInstance.class); when(this.jobExecutionDao.findJobExecutions(jobInstance)) - .thenReturn(Arrays.asList(jobExecution1, jobExecution2)); + .thenReturn(Arrays.asList(jobExecution1, jobExecution2)); // when this.jobRepository.deleteJobInstance(jobInstance); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/context/ChunkContextTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/context/ChunkContextTests.java index 727a982bc..b5e91763a 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/scope/context/ChunkContextTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/scope/context/ChunkContextTests.java @@ -37,7 +37,7 @@ class ChunkContextTests { private final ChunkContext context = new ChunkContext(new StepContext(new JobExecution(new JobInstance(0L, "job"), 1L, new JobParameters(Collections.singletonMap("foo", new JobParameter("bar", String.class)))) - .createStepExecution("foo"))); + .createStepExecution("foo"))); @Test void testGetStepContext() { 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 f8303b23e..d458544fc 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 @@ -195,7 +195,7 @@ class NonAbstractStepTests { ObservationRegistry observationRegistry = ObservationRegistry.create(); observationRegistry.observationConfig() - .observationHandler(new DefaultMeterObservationHandler(Metrics.globalRegistry)); + .observationHandler(new DefaultMeterObservationHandler(Metrics.globalRegistry)); tested.setObservationRegistry(observationRegistry); tested.execute(execution); @@ -218,11 +218,11 @@ class NonAbstractStepTests { "Execution context modifications made by listener should be persisted"); // Observability - MeterRegistryAssert.assertThat(Metrics.globalRegistry).hasTimerWithNameAndTags( - BatchStepObservation.BATCH_STEP_OBSERVATION.getName(), - Tags.of(Tag.of("error", "none"), Tag.of("spring.batch.step.job.name", "jobName"), - Tag.of("spring.batch.step.name", "eventTrackingStep"), - Tag.of("spring.batch.step.status", "COMPLETED"))); + MeterRegistryAssert.assertThat(Metrics.globalRegistry) + .hasTimerWithNameAndTags(BatchStepObservation.BATCH_STEP_OBSERVATION.getName(), + Tags.of(Tag.of("error", "none"), Tag.of("spring.batch.step.job.name", "jobName"), + Tag.of("spring.batch.step.name", "eventTrackingStep"), + Tag.of("spring.batch.step.status", "COMPLETED"))); } @AfterEach diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/builder/FaultTolerantStepBuilderTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/builder/FaultTolerantStepBuilderTests.java index 5131ca83d..1fadefc97 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/builder/FaultTolerantStepBuilderTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/builder/FaultTolerantStepBuilderTests.java @@ -39,9 +39,12 @@ class FaultTolerantStepBuilderTests { void testAnnotationBasedStepExecutionListenerRegistration() { // given FaultTolerantStepBuilder faultTolerantStepBuilder = new StepBuilder("myStep", - new DummyJobRepository()).chunk(5, new ResourcelessTransactionManager()) - .reader(new DummyItemReader()).writer(new DummyItemWriter()).faultTolerant() - .listener(new StepBuilderTests.AnnotationBasedStepExecutionListener()); + new DummyJobRepository()) + .chunk(5, new ResourcelessTransactionManager()) + .reader(new DummyItemReader()) + .writer(new DummyItemWriter()) + .faultTolerant() + .listener(new StepBuilderTests.AnnotationBasedStepExecutionListener()); // when Step step = faultTolerantStepBuilder.build(); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/builder/RegisterMultiListenerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/builder/RegisterMultiListenerTests.java index 2c84e36b2..af4d23e1b 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/builder/RegisterMultiListenerTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/builder/RegisterMultiListenerTests.java @@ -121,8 +121,8 @@ class RegisterMultiListenerTests { private void bootstrap(Class configurationClass) { context = new AnnotationConfigApplicationContext(configurationClass); - context.getAutowireCapableBeanFactory().autowireBeanProperties(this, - AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE, false); + context.getAutowireCapableBeanFactory() + .autowireBeanProperties(this, AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE, false); } public static abstract class MultiListenerTestConfigurationSupport { @@ -190,9 +190,11 @@ class RegisterMultiListenerTests { @Bean public DataSource dataSource() { return new PooledEmbeddedDataSource(new EmbeddedDatabaseBuilder() - .addScript("classpath:org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("classpath:org/springframework/batch/core/schema-hsqldb.sql") - .setType(EmbeddedDatabaseType.HSQL).generateUniqueName(true).build()); + .addScript("classpath:org/springframework/batch/core/schema-drop-hsqldb.sql") + .addScript("classpath:org/springframework/batch/core/schema-hsqldb.sql") + .setType(EmbeddedDatabaseType.HSQL) + .generateUniqueName(true) + .build()); } @Bean @@ -204,10 +206,15 @@ class RegisterMultiListenerTests { @Bean public Step step(JobRepository jobRepository) { return new StepBuilder("step", jobRepository).listener(listener()) - .chunk(2, transactionManager(dataSource())).reader(reader()).writer(writer()) - .faultTolerant().skipLimit(1).skip(MySkippableException.class) - // ChunkListener registered twice for checking BATCH-2149 - .listener((ChunkListener) listener()).build(); + .chunk(2, transactionManager(dataSource())) + .reader(reader()) + .writer(writer()) + .faultTolerant() + .skipLimit(1) + .skip(MySkippableException.class) + // ChunkListener registered twice for checking BATCH-2149 + .listener((ChunkListener) listener()) + .build(); } } @@ -219,9 +226,11 @@ class RegisterMultiListenerTests { @Bean public DataSource dataSource() { return new PooledEmbeddedDataSource(new EmbeddedDatabaseBuilder() - .addScript("classpath:org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("classpath:org/springframework/batch/core/schema-hsqldb.sql") - .setType(EmbeddedDatabaseType.HSQL).generateUniqueName(true).build()); + .addScript("classpath:org/springframework/batch/core/schema-drop-hsqldb.sql") + .addScript("classpath:org/springframework/batch/core/schema-hsqldb.sql") + .setType(EmbeddedDatabaseType.HSQL) + .generateUniqueName(true) + .build()); } @Bean @@ -233,8 +242,10 @@ class RegisterMultiListenerTests { @Bean public Step step(JobRepository jobRepository) { return new StepBuilder("step", jobRepository).listener(listener()) - .chunk(2, transactionManager(dataSource())).reader(reader()).writer(writer()) - .build(); + .chunk(2, transactionManager(dataSource())) + .reader(reader()) + .writer(writer()) + .build(); } } 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 c561f2b56..3ae6e0a44 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 @@ -79,8 +79,9 @@ class StepBuilderTests { @BeforeEach void setUp() throws Exception { EmbeddedDatabase embeddedDatabase = new EmbeddedDatabaseBuilder() - .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").build(); + .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .build(); JdbcTransactionManager transactionManager = new JdbcTransactionManager(embeddedDatabase); JobRepositoryFactoryBean factory = new JobRepositoryFactoryBean(); factory.setDataSource(embeddedDatabase); @@ -95,7 +96,7 @@ class StepBuilderTests { @Test void test() throws Exception { TaskletStepBuilder builder = new StepBuilder("step", jobRepository) - .tasklet((contribution, chunkContext) -> null, transactionManager); + .tasklet((contribution, chunkContext) -> null, transactionManager); builder.build().execute(execution); assertEquals(BatchStatus.COMPLETED, execution.getStatus()); } @@ -103,9 +104,9 @@ class StepBuilderTests { @Test void testListeners() throws Exception { TaskletStepBuilder builder = new StepBuilder("step", jobRepository) - .listener(new InterfaceBasedStepExecutionListener()) - .listener(new AnnotationBasedStepExecutionListener()) - .tasklet((contribution, chunkContext) -> null, transactionManager); + .listener(new InterfaceBasedStepExecutionListener()) + .listener(new AnnotationBasedStepExecutionListener()) + .tasklet((contribution, chunkContext) -> null, transactionManager); builder.build().execute(execution); assertEquals(BatchStatus.COMPLETED, execution.getStatus()); assertEquals(1, InterfaceBasedStepExecutionListener.beforeStepCount); @@ -119,8 +120,8 @@ class StepBuilderTests { @Test void testAnnotationBasedChunkListenerForTaskletStep() throws Exception { TaskletStepBuilder builder = new StepBuilder("step", jobRepository) - .tasklet((contribution, chunkContext) -> null, transactionManager) - .listener(new AnnotationBasedChunkListener()); + .tasklet((contribution, chunkContext) -> null, transactionManager) + .listener(new AnnotationBasedChunkListener()); builder.build().execute(execution); assertEquals(BatchStatus.COMPLETED, execution.getStatus()); assertEquals(1, AnnotationBasedChunkListener.beforeChunkCount); @@ -130,8 +131,9 @@ class StepBuilderTests { @Test void testAnnotationBasedChunkListenerForSimpleTaskletStep() throws Exception { SimpleStepBuilder builder = new StepBuilder("step", jobRepository).chunk(5, transactionManager) - .reader(new DummyItemReader()).writer(new DummyItemWriter()) - .listener(new AnnotationBasedChunkListener()); + .reader(new DummyItemReader()) + .writer(new DummyItemWriter()) + .listener(new AnnotationBasedChunkListener()); builder.build().execute(execution); assertEquals(BatchStatus.COMPLETED, execution.getStatus()); assertEquals(1, AnnotationBasedChunkListener.beforeChunkCount); @@ -141,12 +143,14 @@ class StepBuilderTests { @Test void testAnnotationBasedChunkListenerForFaultTolerantTaskletStep() throws Exception { SimpleStepBuilder builder = new StepBuilder("step", jobRepository).chunk(5, transactionManager) - .reader(new DummyItemReader()).writer(new DummyItemWriter()).faultTolerant() - .listener(new AnnotationBasedChunkListener()); // TODO// - // should - // this - // return - // FaultTolerantStepBuilder? + .reader(new DummyItemReader()) + .writer(new DummyItemWriter()) + .faultTolerant() + .listener(new AnnotationBasedChunkListener()); // TODO// + // should + // this + // return + // FaultTolerantStepBuilder? builder.build().execute(execution); assertEquals(BatchStatus.COMPLETED, execution.getStatus()); assertEquals(1, AnnotationBasedChunkListener.beforeChunkCount); @@ -158,7 +162,7 @@ class StepBuilderTests { SimpleJob job = new SimpleJob("job"); job.setJobRepository(jobRepository); JobStepBuilder builder = new StepBuilder("step", jobRepository).job(job) - .listener(new AnnotationBasedChunkListener()); + .listener(new AnnotationBasedChunkListener()); builder.build().execute(execution); assertEquals(BatchStatus.COMPLETED, execution.getStatus()); @@ -175,8 +179,11 @@ class StepBuilderTests { ItemReader reader = new ListItemReader<>(items); SimpleStepBuilder builder = new StepBuilder("step", jobRepository) - .chunk(3, transactionManager).reader(reader).processor(new PassThroughItemProcessor<>()) - .writer(new DummyItemWriter()).listener(new AnnotationBasedStepExecutionListener()); + .chunk(3, transactionManager) + .reader(reader) + .processor(new PassThroughItemProcessor<>()) + .writer(new DummyItemWriter()) + .listener(new AnnotationBasedStepExecutionListener()); builder.build().execute(execution); assertEquals(BatchStatus.COMPLETED, execution.getStatus()); @@ -209,8 +216,11 @@ class StepBuilderTests { ListItemWriter itemWriter = new ListItemWriter<>(); SimpleStepBuilder builder = new StepBuilder("step", jobRepository) - .chunk(3, transactionManager).reader(reader).processor(Object::toString) - .writer(itemWriter).listener(new AnnotationBasedStepExecutionListener()); + .chunk(3, transactionManager) + .reader(reader) + .processor(Object::toString) + .writer(itemWriter) + .listener(new AnnotationBasedStepExecutionListener()); if (faultTolerantStep) { builder = builder.faultTolerant(); @@ -291,7 +301,9 @@ class StepBuilderTests { ItemReader reader = new ListItemReader<>(items); SimpleStepBuilder builder = new StepBuilder("step", jobRepository) - .chunk(3, transactionManager).reader(reader).writer(new DummyItemWriter()); + .chunk(3, transactionManager) + .reader(reader) + .writer(new DummyItemWriter()); configurer.apply(builder).listener(new InterfaceBasedItemReadListenerListener()).build().execute(execution); assertEquals(BatchStatus.COMPLETED, execution.getStatus()); 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 07e9b631c..2dc0b42a0 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 @@ -61,7 +61,8 @@ class FaultTolerantChunkProcessorTests { private FaultTolerantChunkProcessor processor; private final StepContribution contribution = new StepExecution("foo", - new JobExecution(new JobInstance(0L, "job"), new JobParameters())).createStepContribution(); + new JobExecution(new JobInstance(0L, "job"), new JobParameters())) + .createStepContribution(); @BeforeEach void setUp() { @@ -266,8 +267,8 @@ class FaultTolerantChunkProcessorTests { } }); processor.setProcessSkipPolicy(new AlwaysSkipItemSkipPolicy()); - processor.setRollbackClassifier( - new BinaryExceptionClassifier(Set.of(DataIntegrityViolationException.class), false)); + processor + .setRollbackClassifier(new BinaryExceptionClassifier(Set.of(DataIntegrityViolationException.class), false)); Chunk inputs = new Chunk<>(Arrays.asList("1", "2")); processor.process(contribution, inputs); assertEquals(1, list.size()); 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 eb23d16c7..b135a8a3a 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 @@ -102,8 +102,10 @@ class FaultTolerantStepFactoryBeanRetryTests { void setUp() throws Exception { EmbeddedDatabase embeddedDatabase = new EmbeddedDatabaseBuilder() - .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").generateUniqueName(true).build(); + .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .generateUniqueName(true) + .build(); JdbcTransactionManager transactionManager = new JdbcTransactionManager(embeddedDatabase); JobRepositoryFactoryBean repositoryFactoryBean = new JobRepositoryFactoryBean(); repositoryFactoryBean.setDataSource(embeddedDatabase); @@ -124,7 +126,7 @@ class FaultTolerantStepFactoryBeanRetryTests { factory.setSkippableExceptionClasses(getExceptionMap(Exception.class)); JobParameters jobParameters = new JobParametersBuilder().addString("statefulTest", "make_this_unique") - .toJobParameters(); + .toJobParameters(); jobExecution = repository.createJobExecution("job", jobParameters); jobExecution.setEndTime(LocalDateTime.now()); @@ -145,7 +147,7 @@ class FaultTolerantStepFactoryBeanRetryTests { void testProcessAllItemsWhenErrorInWriterTransformationWhenReaderTransactional() throws Exception { final int RETRY_LIMIT = 3; final List ITEM_LIST = TransactionAwareProxyFactory - .createTransactionalList(Arrays.asList("1", "2", "3")); + .createTransactionalList(Arrays.asList("1", "2", "3")); FaultTolerantStepFactoryBean factory = new FaultTolerantStepFactoryBean<>(); factory.setBeanName("step"); 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 de0eb23fb..979f24a5b 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 @@ -110,8 +110,9 @@ class FaultTolerantStepFactoryBeanRollbackTests { factory.setSkippableExceptionClasses(getExceptionMap(Exception.class)); EmbeddedDatabase embeddedDatabase = new EmbeddedDatabaseBuilder() - .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").build(); + .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .build(); JobRepositoryFactoryBean repositoryFactory = new JobRepositoryFactoryBean(); repositoryFactory.setDataSource(embeddedDatabase); repositoryFactory.setTransactionManager(new JdbcTransactionManager(embeddedDatabase)); 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 1bbfd40d8..050700e4b 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 @@ -111,8 +111,9 @@ public class FaultTolerantStepFactoryBeanTests { @BeforeEach void setUp() throws Exception { EmbeddedDatabase embeddedDatabase = new EmbeddedDatabaseBuilder().generateUniqueName(true) - .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb-extended.sql").build(); + .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") + .addScript("/org/springframework/batch/core/schema-hsqldb-extended.sql") + .build(); JdbcTransactionManager transactionManager = new JdbcTransactionManager(embeddedDatabase); factory = new FaultTolerantStepFactoryBean<>(); @@ -131,8 +132,8 @@ public class FaultTolerantStepFactoryBeanTests { factory.setSkipLimit(2); - factory.setSkippableExceptionClasses( - getExceptionMap(SkippableException.class, SkippableRuntimeException.class)); + factory + .setSkippableExceptionClasses(getExceptionMap(SkippableException.class, SkippableRuntimeException.class)); JobRepositoryFactoryBean repositoryFactoryBean = new JobRepositoryFactoryBean(); repositoryFactoryBean.setDataSource(embeddedDatabase); 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 a85f0c043..310bca445 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 @@ -85,8 +85,10 @@ class SimpleStepFactoryBeanTests { @BeforeEach void setUp() throws Exception { EmbeddedDatabase embeddedDatabase = new EmbeddedDatabaseBuilder() - .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").generateUniqueName(true).build(); + .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .generateUniqueName(true) + .build(); JdbcTransactionManager transactionManager = new JdbcTransactionManager(embeddedDatabase); JobRepositoryFactoryBean repositoryFactoryBean = new JobRepositoryFactoryBean(); repositoryFactoryBean.setDataSource(embeddedDatabase); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/job/JobStepTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/job/JobStepTests.java index ddf20b469..1201625bf 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/job/JobStepTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/job/JobStepTests.java @@ -56,8 +56,9 @@ class JobStepTests { void setUp() throws Exception { step.setName("step"); EmbeddedDatabase embeddedDatabase = new EmbeddedDatabaseBuilder() - .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").build(); + .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .build(); JobRepositoryFactoryBean factory = new JobRepositoryFactoryBean(); factory.setDataSource(embeddedDatabase); factory.setTransactionManager(new JdbcTransactionManager(embeddedDatabase)); 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 ae26b1ae0..537a02dd6 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 @@ -142,12 +142,12 @@ class AsyncChunkOrientedStepIntegrationTests { // Need a transaction so one connection is enough to get job execution and its // parameters StepExecution lastStepExecution = new TransactionTemplate(transactionManager) - .execute(new TransactionCallback() { - @Override - public StepExecution doInTransaction(TransactionStatus status) { - return jobRepository.getLastStepExecution(jobExecution.getJobInstance(), step.getName()); - } - }); + .execute(new TransactionCallback() { + @Override + public StepExecution doInTransaction(TransactionStatus status) { + return jobRepository.getLastStepExecution(jobExecution.getJobInstance(), step.getName()); + } + }); assertEquals(lastStepExecution, stepExecution); assertNotSame(lastStepExecution, stepExecution); } 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 949701941..c3dc0984a 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 @@ -119,7 +119,7 @@ class AsyncTaskletStepTests { void testStepExecutionUpdates() throws Exception { items = new ArrayList<>(Arrays.asList(StringUtils - .commaDelimitedListToStringArray("1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25"))); + .commaDelimitedListToStringArray("1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25"))); setUp(); 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 d9fc1a17c..e8af3330d 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 @@ -67,8 +67,10 @@ class StepExecutorInterruptionTests { @BeforeEach void setUp() throws Exception { EmbeddedDatabase embeddedDatabase = new EmbeddedDatabaseBuilder() - .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").generateUniqueName(true).build(); + .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .generateUniqueName(true) + .build(); this.transactionManager = new JdbcTransactionManager(embeddedDatabase); JobRepositoryFactoryBean repositoryFactoryBean = new JobRepositoryFactoryBean(); repositoryFactoryBean.setDataSource(embeddedDatabase); 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 ca57da591..a2b379ac7 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 @@ -226,8 +226,9 @@ class TaskletStepTests { @Test void testRepository() throws Exception { EmbeddedDatabase embeddedDatabase = new EmbeddedDatabaseBuilder() - .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").build(); + .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .build(); JdbcTransactionManager transactionManager = new JdbcTransactionManager(embeddedDatabase); JobRepositoryFactoryBean repositoryFactoryBean = new JobRepositoryFactoryBean(); repositoryFactoryBean.setDataSource(embeddedDatabase); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/test/concurrent/ConcurrentTransactionTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/test/concurrent/ConcurrentTransactionTests.java index e6e2fce64..09dfe7fb1 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/test/concurrent/ConcurrentTransactionTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/test/concurrent/ConcurrentTransactionTests.java @@ -100,22 +100,23 @@ class ConcurrentTransactionTests { @Bean public Flow flow(JobRepository jobRepository, PlatformTransactionManager transactionManager) { return new FlowBuilder("flow") - .start(new StepBuilder("flow.step1", jobRepository).tasklet(new Tasklet() { - @Nullable - @Override - public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) - throws Exception { - return RepeatStatus.FINISHED; - } - }, transactionManager).build()) - .next(new StepBuilder("flow.step2", jobRepository).tasklet(new Tasklet() { - @Nullable - @Override - public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) - throws Exception { - return RepeatStatus.FINISHED; - } - }, transactionManager).build()).build(); + .start(new StepBuilder("flow.step1", jobRepository).tasklet(new Tasklet() { + @Nullable + @Override + public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) + throws Exception { + return RepeatStatus.FINISHED; + } + }, transactionManager).build()) + .next(new StepBuilder("flow.step2", jobRepository).tasklet(new Tasklet() { + @Nullable + @Override + public RepeatStatus execute(StepContribution contribution, ChunkContext chunkContext) + throws Exception { + return RepeatStatus.FINISHED; + } + }, transactionManager).build()) + .build(); } @Bean @@ -146,15 +147,16 @@ class ConcurrentTransactionTests { public Job concurrentJob(JobRepository jobRepository, PlatformTransactionManager transactionManager, TaskExecutor taskExecutor) { Flow splitFlow = new FlowBuilder("splitflow").split(taskExecutor) - .add(flow(jobRepository, transactionManager), flow(jobRepository, transactionManager), - flow(jobRepository, transactionManager), flow(jobRepository, transactionManager), - flow(jobRepository, transactionManager), flow(jobRepository, transactionManager), - flow(jobRepository, transactionManager)) - .build(); + .add(flow(jobRepository, transactionManager), flow(jobRepository, transactionManager), + flow(jobRepository, transactionManager), flow(jobRepository, transactionManager), + flow(jobRepository, transactionManager), flow(jobRepository, transactionManager), + flow(jobRepository, transactionManager)) + .build(); return new JobBuilder("concurrentJob", jobRepository).start(firstStep(jobRepository, transactionManager)) - .next(new StepBuilder("splitFlowStep", jobRepository).flow(splitFlow).build()) - .next(lastStep(jobRepository, transactionManager)).build(); + .next(new StepBuilder("splitFlowStep", jobRepository).flow(splitFlow).build()) + .next(lastStep(jobRepository, transactionManager)) + .build(); } @Bean @@ -219,7 +221,7 @@ class ConcurrentTransactionTests { ResourceDatabasePopulator databasePopulator = new ResourceDatabasePopulator(); databasePopulator.addScript(defaultResourceLoader - .getResource("classpath:org/springframework/batch/core/schema-drop-hsqldb.sql")); + .getResource("classpath:org/springframework/batch/core/schema-drop-hsqldb.sql")); databasePopulator.addScript( defaultResourceLoader.getResource("classpath:org/springframework/batch/core/schema-hsqldb.sql")); embeddedDatabaseFactory.setDatabasePopulator(databasePopulator); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/test/football/FootballJobSkipIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/test/football/FootballJobSkipIntegrationTests.java index 8c2e1751b..9b4736ba4 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/test/football/FootballJobSkipIntegrationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/test/football/FootballJobSkipIntegrationTests.java @@ -84,8 +84,10 @@ public class FootballJobSkipIntegrationTests extends AbstractIntegrationTests { // They all skip on the second execution because of a primary key // violation long retryLimit = 2L; - execution = jobLauncher.run(job, new JobParametersBuilder().addLong("skip.limit", 100000L) - .addLong("retry.limit", retryLimit).toJobParameters()); + execution = jobLauncher.run(job, + new JobParametersBuilder().addLong("skip.limit", 100000L) + .addLong("retry.limit", retryLimit) + .toJobParameters()); assertEquals(BatchStatus.COMPLETED, execution.getStatus()); for (StepExecution stepExecution : execution.getStepExecutions()) { logger.info("Processed: " + stepExecution); diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/test/football/internal/JdbcGameDao.java b/spring-batch-core/src/test/java/org/springframework/batch/core/test/football/internal/JdbcGameDao.java index e35dcc98b..c5d459903 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/test/football/internal/JdbcGameDao.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/test/football/internal/JdbcGameDao.java @@ -31,9 +31,10 @@ public class JdbcGameDao extends JdbcDaoSupport implements ItemWriter { @Override protected void initDao() throws Exception { super.initDao(); - insertGame = new SimpleJdbcInsert(getDataSource()).withTableName("GAMES").usingColumns("player_id", "year_no", - "team", "week", "opponent", " completes", "attempts", "passing_yards", "passing_td", "interceptions", - "rushes", "rush_yards", "receptions", "receptions_yards", "total_td"); + insertGame = new SimpleJdbcInsert(getDataSource()).withTableName("GAMES") + .usingColumns("player_id", "year_no", "team", "week", "opponent", " completes", "attempts", "passing_yards", + "passing_td", "interceptions", "rushes", "rush_yards", "receptions", "receptions_yards", + "total_td"); } @Override @@ -42,13 +43,20 @@ public class JdbcGameDao extends JdbcDaoSupport implements ItemWriter { for (Game game : games) { SqlParameterSource values = new MapSqlParameterSource().addValue("player_id", game.getId()) - .addValue("year_no", game.getYear()).addValue("team", game.getTeam()) - .addValue("week", game.getWeek()).addValue("opponent", game.getOpponent()) - .addValue("completes", game.getCompletes()).addValue("attempts", game.getAttempts()) - .addValue("passing_yards", game.getPassingYards()).addValue("passing_td", game.getPassingTd()) - .addValue("interceptions", game.getInterceptions()).addValue("rushes", game.getRushes()) - .addValue("rush_yards", game.getRushYards()).addValue("receptions", game.getReceptions()) - .addValue("receptions_yards", game.getReceptionYards()).addValue("total_td", game.getTotalTd()); + .addValue("year_no", game.getYear()) + .addValue("team", game.getTeam()) + .addValue("week", game.getWeek()) + .addValue("opponent", game.getOpponent()) + .addValue("completes", game.getCompletes()) + .addValue("attempts", game.getAttempts()) + .addValue("passing_yards", game.getPassingYards()) + .addValue("passing_td", game.getPassingTd()) + .addValue("interceptions", game.getInterceptions()) + .addValue("rushes", game.getRushes()) + .addValue("rush_yards", game.getRushYards()) + .addValue("receptions", game.getReceptions()) + .addValue("receptions_yards", game.getReceptionYards()) + .addValue("total_td", game.getTotalTd()); this.insertGame.execute(values); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/test/football/internal/JdbcPlayerSummaryDao.java b/spring-batch-core/src/test/java/org/springframework/batch/core/test/football/internal/JdbcPlayerSummaryDao.java index 4d8da7668..7ab21ab2d 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/test/football/internal/JdbcPlayerSummaryDao.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/test/football/internal/JdbcPlayerSummaryDao.java @@ -39,12 +39,17 @@ public class JdbcPlayerSummaryDao implements ItemWriter { for (PlayerSummary summary : summaries) { MapSqlParameterSource args = new MapSqlParameterSource().addValue("id", summary.getId()) - .addValue("year", summary.getYear()).addValue("completes", summary.getCompletes()) - .addValue("attempts", summary.getAttempts()).addValue("passingYards", summary.getPassingYards()) - .addValue("passingTd", summary.getPassingTd()).addValue("interceptions", summary.getInterceptions()) - .addValue("rushes", summary.getRushes()).addValue("rushYards", summary.getRushYards()) - .addValue("receptions", summary.getReceptions()) - .addValue("receptionYards", summary.getReceptionYards()).addValue("totalTd", summary.getTotalTd()); + .addValue("year", summary.getYear()) + .addValue("completes", summary.getCompletes()) + .addValue("attempts", summary.getAttempts()) + .addValue("passingYards", summary.getPassingYards()) + .addValue("passingTd", summary.getPassingTd()) + .addValue("interceptions", summary.getInterceptions()) + .addValue("rushes", summary.getRushes()) + .addValue("rushYards", summary.getRushYards()) + .addValue("receptions", summary.getReceptions()) + .addValue("receptionYards", summary.getReceptionYards()) + .addValue("totalTd", summary.getTotalTd()); namedParameterJdbcTemplate.update(INSERT_SUMMARY, args); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/test/ldif/builder/LdifReaderBuilderTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/test/ldif/builder/LdifReaderBuilderTests.java index cda032492..11eee20ea 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/test/ldif/builder/LdifReaderBuilderTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/test/ldif/builder/LdifReaderBuilderTests.java @@ -58,8 +58,10 @@ class LdifReaderBuilderTests { @Test void testSkipRecord() throws Exception { - this.ldifReader = new LdifReaderBuilder().recordsToSkip(1).resource(context.getResource("classpath:/test.ldif")) - .name("foo").build(); + this.ldifReader = new LdifReaderBuilder().recordsToSkip(1) + .resource(context.getResource("classpath:/test.ldif")) + .name("foo") + .build(); LdapAttributes ldapAttributes = firstRead(); assertEquals("cn=Bjorn Jensen, ou=Accounting, dc=airius, dc=com", ldapAttributes.getName().toString(), "The attribute name for the second record did not match expected result"); @@ -67,8 +69,9 @@ class LdifReaderBuilderTests { @Test void testBasicRead() throws Exception { - this.ldifReader = new LdifReaderBuilder().resource(context.getResource("classpath:/test.ldif")).name("foo") - .build(); + this.ldifReader = new LdifReaderBuilder().resource(context.getResource("classpath:/test.ldif")) + .name("foo") + .build(); LdapAttributes ldapAttributes = firstRead(); assertEquals("cn=Barbara Jensen, ou=Product Development, dc=airius, dc=com", ldapAttributes.getName().toString(), @@ -78,7 +81,9 @@ class LdifReaderBuilderTests { @Test void testCurrentItemCount() throws Exception { this.ldifReader = new LdifReaderBuilder().currentItemCount(3) - .resource(context.getResource("classpath:/test.ldif")).name("foo").build(); + .resource(context.getResource("classpath:/test.ldif")) + .name("foo") + .build(); LdapAttributes ldapAttributes = firstRead(); assertEquals("cn=Gern Jensen, ou=Product Testing, dc=airius, dc=com", ldapAttributes.getName().toString(), "The attribute name for the third record did not match expected result"); @@ -86,8 +91,10 @@ class LdifReaderBuilderTests { @Test void testMaxItemCount() throws Exception { - this.ldifReader = new LdifReaderBuilder().maxItemCount(1).resource(context.getResource("classpath:/test.ldif")) - .name("foo").build(); + this.ldifReader = new LdifReaderBuilder().maxItemCount(1) + .resource(context.getResource("classpath:/test.ldif")) + .name("foo") + .build(); LdapAttributes ldapAttributes = firstRead(); assertEquals("cn=Barbara Jensen, ou=Product Development, dc=airius, dc=com", ldapAttributes.getName().toString(), @@ -98,8 +105,11 @@ class LdifReaderBuilderTests { @Test void testSkipRecordCallback() throws Exception { - this.ldifReader = new LdifReaderBuilder().recordsToSkip(1).skippedRecordsCallback(new TestCallBackHandler()) - .resource(context.getResource("classpath:/test.ldif")).name("foo").build(); + this.ldifReader = new LdifReaderBuilder().recordsToSkip(1) + .skippedRecordsCallback(new TestCallBackHandler()) + .resource(context.getResource("classpath:/test.ldif")) + .name("foo") + .build(); firstRead(); assertEquals("cn=Barbara Jensen, ou=Product Development, dc=airius, dc=com", this.callbackAttributeName, "The attribute name from the callback handler did not match the expected result"); @@ -107,8 +117,9 @@ class LdifReaderBuilderTests { @Test void testSaveState() throws Exception { - this.ldifReader = new LdifReaderBuilder().resource(context.getResource("classpath:/test.ldif")).name("foo") - .build(); + this.ldifReader = new LdifReaderBuilder().resource(context.getResource("classpath:/test.ldif")) + .name("foo") + .build(); ExecutionContext executionContext = new ExecutionContext(); firstRead(executionContext); this.ldifReader.update(executionContext); @@ -117,8 +128,9 @@ class LdifReaderBuilderTests { @Test void testSaveStateDisabled() throws Exception { - this.ldifReader = new LdifReaderBuilder().saveState(false).resource(context.getResource("classpath:/test.ldif")) - .build(); + this.ldifReader = new LdifReaderBuilder().saveState(false) + .resource(context.getResource("classpath:/test.ldif")) + .build(); ExecutionContext executionContext = new ExecutionContext(); firstRead(executionContext); this.ldifReader.update(executionContext); @@ -128,15 +140,18 @@ class LdifReaderBuilderTests { @Test void testStrict() { // Test that strict when enabled will throw an exception. - this.ldifReader = new LdifReaderBuilder().resource(context.getResource("classpath:/teadsfst.ldif")).name("foo") - .build(); + this.ldifReader = new LdifReaderBuilder().resource(context.getResource("classpath:/teadsfst.ldif")) + .name("foo") + .build(); Exception exception = assertThrows(ItemStreamException.class, () -> this.ldifReader.open(new ExecutionContext())); assertEquals("Failed to initialize the reader", exception.getMessage(), "IllegalStateException message did not match the expected result."); // Test that strict when disabled will still allow the ldap resource to be opened. this.ldifReader = new LdifReaderBuilder().strict(false) - .resource(context.getResource("classpath:/teadsfst.ldif")).name("foo").build(); + .resource(context.getResource("classpath:/teadsfst.ldif")) + .name("foo") + .build(); this.ldifReader.open(new ExecutionContext()); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/test/ldif/builder/MappingLdifReaderBuilderTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/test/ldif/builder/MappingLdifReaderBuilderTests.java index 6e738cf34..7dadc3c00 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/test/ldif/builder/MappingLdifReaderBuilderTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/test/ldif/builder/MappingLdifReaderBuilderTests.java @@ -61,8 +61,10 @@ class MappingLdifReaderBuilderTests { @Test void testSkipRecord() throws Exception { this.mappingLdifReader = new MappingLdifReaderBuilder().recordsToSkip(1) - .recordMapper(new TestMapper()).resource(context.getResource("classpath:/test.ldif")).name("foo") - .build(); + .recordMapper(new TestMapper()) + .resource(context.getResource("classpath:/test.ldif")) + .name("foo") + .build(); LdapAttributes ldapAttributes = firstRead(); assertEquals("cn=Bjorn Jensen, ou=Accounting, dc=airius, dc=com", ldapAttributes.getName().toString(), "The attribute name for the second record did not match expected result"); @@ -71,7 +73,9 @@ class MappingLdifReaderBuilderTests { @Test void testBasicRead() throws Exception { this.mappingLdifReader = new MappingLdifReaderBuilder().recordMapper(new TestMapper()) - .resource(context.getResource("classpath:/test.ldif")).name("foo").build(); + .resource(context.getResource("classpath:/test.ldif")) + .name("foo") + .build(); LdapAttributes ldapAttributes = firstRead(); assertEquals("cn=Barbara Jensen, ou=Product Development, dc=airius, dc=com", ldapAttributes.getName().toString(), @@ -81,8 +85,10 @@ class MappingLdifReaderBuilderTests { @Test void testCurrentItemCount() throws Exception { this.mappingLdifReader = new MappingLdifReaderBuilder().currentItemCount(3) - .recordMapper(new TestMapper()).resource(context.getResource("classpath:/test.ldif")).name("foo") - .build(); + .recordMapper(new TestMapper()) + .resource(context.getResource("classpath:/test.ldif")) + .name("foo") + .build(); LdapAttributes ldapAttributes = firstRead(); assertEquals("cn=Gern Jensen, ou=Product Testing, dc=airius, dc=com", ldapAttributes.getName().toString(), "The attribute name for the third record did not match expected result"); @@ -91,8 +97,10 @@ class MappingLdifReaderBuilderTests { @Test void testMaxItemCount() throws Exception { this.mappingLdifReader = new MappingLdifReaderBuilder().maxItemCount(1) - .recordMapper(new TestMapper()).resource(context.getResource("classpath:/test.ldif")).name("foo") - .build(); + .recordMapper(new TestMapper()) + .resource(context.getResource("classpath:/test.ldif")) + .name("foo") + .build(); LdapAttributes ldapAttributes = firstRead(); assertEquals("cn=Barbara Jensen, ou=Product Development, dc=airius, dc=com", ldapAttributes.getName().toString(), @@ -104,8 +112,11 @@ class MappingLdifReaderBuilderTests { @Test void testSkipRecordCallback() throws Exception { this.mappingLdifReader = new MappingLdifReaderBuilder().recordsToSkip(1) - .recordMapper(new TestMapper()).skippedRecordsCallback(new TestCallBackHandler()) - .resource(context.getResource("classpath:/test.ldif")).name("foo").build(); + .recordMapper(new TestMapper()) + .skippedRecordsCallback(new TestCallBackHandler()) + .resource(context.getResource("classpath:/test.ldif")) + .name("foo") + .build(); firstRead(); assertEquals("cn=Barbara Jensen, ou=Product Development, dc=airius, dc=com", this.callbackAttributeName, "The attribute name from the callback handler did not match the expected result"); @@ -114,7 +125,9 @@ class MappingLdifReaderBuilderTests { @Test void testSaveState() throws Exception { this.mappingLdifReader = new MappingLdifReaderBuilder().recordMapper(new TestMapper()) - .resource(context.getResource("classpath:/test.ldif")).name("foo").build(); + .resource(context.getResource("classpath:/test.ldif")) + .name("foo") + .build(); ExecutionContext executionContext = new ExecutionContext(); firstRead(executionContext); this.mappingLdifReader.update(executionContext); @@ -124,7 +137,9 @@ class MappingLdifReaderBuilderTests { @Test void testSaveStateDisabled() throws Exception { this.mappingLdifReader = new MappingLdifReaderBuilder().saveState(false) - .recordMapper(new TestMapper()).resource(context.getResource("classpath:/test.ldif")).build(); + .recordMapper(new TestMapper()) + .resource(context.getResource("classpath:/test.ldif")) + .build(); ExecutionContext executionContext = new ExecutionContext(); firstRead(executionContext); this.mappingLdifReader.update(executionContext); @@ -135,14 +150,19 @@ class MappingLdifReaderBuilderTests { void testStrict() { // Test that strict when enabled will throw an exception. this.mappingLdifReader = new MappingLdifReaderBuilder().recordMapper(new TestMapper()) - .resource(context.getResource("classpath:/teadsfst.ldif")).name("foo").build(); + .resource(context.getResource("classpath:/teadsfst.ldif")) + .name("foo") + .build(); Exception exception = assertThrows(ItemStreamException.class, () -> this.mappingLdifReader.open(new ExecutionContext())); assertEquals("Failed to initialize the reader", exception.getMessage(), "IllegalStateException message did not match the expected result."); // Test that strict when disabled will still allow the ldap resource to be opened. - this.mappingLdifReader = new MappingLdifReaderBuilder().strict(false).name("foo") - .recordMapper(new TestMapper()).resource(context.getResource("classpath:/teadsfst.ldif")).build(); + this.mappingLdifReader = new MappingLdifReaderBuilder().strict(false) + .name("foo") + .recordMapper(new TestMapper()) + .resource(context.getResource("classpath:/teadsfst.ldif")) + .build(); this.mappingLdifReader.open(new ExecutionContext()); } @@ -150,7 +170,8 @@ class MappingLdifReaderBuilderTests { void testNullRecordMapper() { Exception exception = assertThrows(IllegalArgumentException.class, () -> new MappingLdifReaderBuilder() - .resource(context.getResource("classpath:/teadsfst.ldif")).build()); + .resource(context.getResource("classpath:/teadsfst.ldif")) + .build()); assertEquals("RecordMapper is required.", exception.getMessage(), "IllegalArgumentException message did not match the expected result."); } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/Db2JobRepositoryIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/Db2JobRepositoryIntegrationTests.java index f23a295ca..22b6d109b 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/Db2JobRepositoryIntegrationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/Db2JobRepositoryIntegrationTests.java @@ -116,9 +116,10 @@ class Db2JobRepositoryIntegrationTests { @Bean public Job job(JobRepository jobRepository, PlatformTransactionManager transactionManager) { return new JobBuilder("job", jobRepository) - .start(new StepBuilder("step", jobRepository) - .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager).build()) - .build(); + .start(new StepBuilder("step", jobRepository) + .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager) + .build()) + .build(); } } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/DerbyJobRepositoryIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/DerbyJobRepositoryIntegrationTests.java index ff8ff6605..fdd8cde55 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/DerbyJobRepositoryIntegrationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/DerbyJobRepositoryIntegrationTests.java @@ -74,7 +74,9 @@ class DerbyJobRepositoryIntegrationTests { @Bean public DataSource dataSource() { return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.DERBY) - .addScript("/org/springframework/batch/core/schema-derby.sql").generateUniqueName(true).build(); + .addScript("/org/springframework/batch/core/schema-derby.sql") + .generateUniqueName(true) + .build(); } @Bean @@ -85,9 +87,10 @@ class DerbyJobRepositoryIntegrationTests { @Bean public Job job(JobRepository jobRepository, PlatformTransactionManager transactionManager) { return new JobBuilder("job", jobRepository) - .start(new StepBuilder("step", jobRepository) - .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager).build()) - .build(); + .start(new StepBuilder("step", jobRepository) + .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager) + .build()) + .build(); } } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/H2CompatibilityModeJobRepositoryIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/H2CompatibilityModeJobRepositoryIntegrationTests.java index e0268fb12..759488e89 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/H2CompatibilityModeJobRepositoryIntegrationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/H2CompatibilityModeJobRepositoryIntegrationTests.java @@ -94,9 +94,10 @@ class H2CompatibilityModeJobRepositoryIntegrationTests { @Bean Job job(JobRepository jobRepository, PlatformTransactionManager transactionManager) { return new JobBuilder("job", jobRepository) - .start(new StepBuilder("step", jobRepository) - .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager).build()) - .build(); + .start(new StepBuilder("step", jobRepository) + .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager) + .build()) + .build(); } } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/H2JobRepositoryIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/H2JobRepositoryIntegrationTests.java index b4cf66583..33c02601b 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/H2JobRepositoryIntegrationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/H2JobRepositoryIntegrationTests.java @@ -74,7 +74,9 @@ class H2JobRepositoryIntegrationTests { @Bean public DataSource dataSource() { return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.H2) - .addScript("/org/springframework/batch/core/schema-h2.sql").generateUniqueName(true).build(); + .addScript("/org/springframework/batch/core/schema-h2.sql") + .generateUniqueName(true) + .build(); } @Bean @@ -85,9 +87,10 @@ class H2JobRepositoryIntegrationTests { @Bean public Job job(JobRepository jobRepository, PlatformTransactionManager transactionManager) { return new JobBuilder("job", jobRepository) - .start(new StepBuilder("step", jobRepository) - .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager).build()) - .build(); + .start(new StepBuilder("step", jobRepository) + .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager) + .build()) + .build(); } } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/HANAJobRepositoryIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/HANAJobRepositoryIntegrationTests.java index a74966ffb..cb6260b67 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/HANAJobRepositoryIntegrationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/HANAJobRepositoryIntegrationTests.java @@ -76,7 +76,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; class HANAJobRepositoryIntegrationTests { private static final DockerImageName HANA_IMAGE = DockerImageName - .parse("store/saplabs/hanaexpress:2.00.057.00.20211207.1"); + .parse("store/saplabs/hanaexpress:2.00.057.00.20211207.1"); @Container public static HANAContainer hana = new HANAContainer<>(HANA_IMAGE).acceptLicense(); @@ -131,9 +131,10 @@ class HANAJobRepositoryIntegrationTests { @Bean public Job job(JobRepository jobRepository, PlatformTransactionManager transactionManager) { return new JobBuilder("job", jobRepository) - .start(new StepBuilder("step", jobRepository) - .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager).build()) - .build(); + .start(new StepBuilder("step", jobRepository) + .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager) + .build()) + .build(); } } @@ -171,8 +172,9 @@ class HANAJobRepositoryIntegrationTests { this.withCommand("--master-password " + SYSTEM_USER_PASSWORD + " --agree-to-sap-license"); // Determine if container is ready. - this.waitStrategy = new LogMessageWaitStrategy().withRegEx(".*Startup finished!*\\s").withTimes(1) - .withStartupTimeout(Duration.of(600, ChronoUnit.SECONDS)); + this.waitStrategy = new LogMessageWaitStrategy().withRegEx(".*Startup finished!*\\s") + .withTimes(1) + .withStartupTimeout(Duration.of(600, ChronoUnit.SECONDS)); } @Override diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/HSQLDBJobRepositoryIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/HSQLDBJobRepositoryIntegrationTests.java index 46e660683..d71b6550e 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/HSQLDBJobRepositoryIntegrationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/HSQLDBJobRepositoryIntegrationTests.java @@ -74,7 +74,9 @@ class HSQLDBJobRepositoryIntegrationTests { @Bean public DataSource dataSource() { return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL) - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").generateUniqueName(true).build(); + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .generateUniqueName(true) + .build(); } @Bean @@ -85,9 +87,10 @@ class HSQLDBJobRepositoryIntegrationTests { @Bean public Job job(JobRepository jobRepository, PlatformTransactionManager transactionManager) { return new JobBuilder("job", jobRepository) - .start(new StepBuilder("step", jobRepository) - .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager).build()) - .build(); + .start(new StepBuilder("step", jobRepository) + .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager) + .build()) + .build(); } } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/MariaDBJobRepositoryIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/MariaDBJobRepositoryIntegrationTests.java index ed537a145..3ca4527da 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/MariaDBJobRepositoryIntegrationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/MariaDBJobRepositoryIntegrationTests.java @@ -112,9 +112,10 @@ class MariaDBJobRepositoryIntegrationTests { @Bean public Job job(JobRepository jobRepository, PlatformTransactionManager transactionManager) { return new JobBuilder("job", jobRepository) - .start(new StepBuilder("step", jobRepository) - .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager).build()) - .build(); + .start(new StepBuilder("step", jobRepository) + .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager) + .build()) + .build(); } } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/MySQLJdbcJobRepositoryIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/MySQLJdbcJobRepositoryIntegrationTests.java index 24ca8b861..5b1df2047 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/MySQLJdbcJobRepositoryIntegrationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/MySQLJdbcJobRepositoryIntegrationTests.java @@ -146,9 +146,10 @@ class MySQLJdbcJobRepositoryIntegrationTests { @Bean public Job job(JobRepository jobRepository, PlatformTransactionManager transactionManager) { return new JobBuilder("job", jobRepository) - .start(new StepBuilder("step", jobRepository).tasklet((contribution, chunkContext) -> { - throw new Exception("expected failure"); - }, transactionManager).build()).build(); + .start(new StepBuilder("step", jobRepository).tasklet((contribution, chunkContext) -> { + throw new Exception("expected failure"); + }, transactionManager).build()) + .build(); } @Bean diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/MySQLJobRepositoryIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/MySQLJobRepositoryIntegrationTests.java index 7144f75c3..24bd70d9d 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/MySQLJobRepositoryIntegrationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/MySQLJobRepositoryIntegrationTests.java @@ -113,9 +113,10 @@ class MySQLJobRepositoryIntegrationTests { @Bean public Job job(JobRepository jobRepository, PlatformTransactionManager transactionManager) { return new JobBuilder("job", jobRepository) - .start(new StepBuilder("step", jobRepository) - .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager).build()) - .build(); + .start(new StepBuilder("step", jobRepository) + .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager) + .build()) + .build(); } } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/OracleJobRepositoryIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/OracleJobRepositoryIntegrationTests.java index e6e24645b..c13067382 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/OracleJobRepositoryIntegrationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/OracleJobRepositoryIntegrationTests.java @@ -121,9 +121,10 @@ class OracleJobRepositoryIntegrationTests { @Bean public Job job(JobRepository jobRepository, PlatformTransactionManager transactionManager) { return new JobBuilder("job", jobRepository) - .start(new StepBuilder("step", jobRepository) - .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager).build()) - .build(); + .start(new StepBuilder("step", jobRepository) + .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager) + .build()) + .build(); } } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/PostgreSQLJobRepositoryIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/PostgreSQLJobRepositoryIntegrationTests.java index 623f48f65..ec555014d 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/PostgreSQLJobRepositoryIntegrationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/PostgreSQLJobRepositoryIntegrationTests.java @@ -112,9 +112,10 @@ class PostgreSQLJobRepositoryIntegrationTests { @Bean public Job job(JobRepository jobRepository, PlatformTransactionManager transactionManager) { return new JobBuilder("job", jobRepository) - .start(new StepBuilder("step", jobRepository) - .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager).build()) - .build(); + .start(new StepBuilder("step", jobRepository) + .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager) + .build()) + .build(); } } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/SQLServerJobRepositoryIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/SQLServerJobRepositoryIntegrationTests.java index 99c44e93f..304c7abc6 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/SQLServerJobRepositoryIntegrationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/SQLServerJobRepositoryIntegrationTests.java @@ -58,7 +58,7 @@ class SQLServerJobRepositoryIntegrationTests { // TODO find the best way to externalize and manage image versions private static final DockerImageName SQLSERVER_IMAGE = DockerImageName - .parse("mcr.microsoft.com/mssql/server:2019-CU11-ubuntu-20.04"); + .parse("mcr.microsoft.com/mssql/server:2019-CU11-ubuntu-20.04"); @Container public static MSSQLServerContainer sqlserver = new MSSQLServerContainer<>(SQLSERVER_IMAGE).acceptLicense(); @@ -113,9 +113,10 @@ class SQLServerJobRepositoryIntegrationTests { @Bean public Job job(JobRepository jobRepository, PlatformTransactionManager transactionManager) { return new JobBuilder("job", jobRepository) - .start(new StepBuilder("step", jobRepository) - .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager).build()) - .build(); + .start(new StepBuilder("step", jobRepository) + .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager) + .build()) + .build(); } } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/SQLiteJobRepositoryIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/SQLiteJobRepositoryIntegrationTests.java index 48b8295ad..5c7a9676f 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/SQLiteJobRepositoryIntegrationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/SQLiteJobRepositoryIntegrationTests.java @@ -78,7 +78,7 @@ class SQLiteJobRepositoryIntegrationTests { dataSource.setUrl("jdbc:sqlite:target/spring-batch.sqlite"); ResourceDatabasePopulator databasePopulator = new ResourceDatabasePopulator(); databasePopulator - .addScript(new ClassPathResource("/org/springframework/batch/core/schema-drop-sqlite.sql")); + .addScript(new ClassPathResource("/org/springframework/batch/core/schema-drop-sqlite.sql")); databasePopulator.addScript(new ClassPathResource("/org/springframework/batch/core/schema-sqlite.sql")); databasePopulator.execute(dataSource); return dataSource; @@ -92,9 +92,10 @@ class SQLiteJobRepositoryIntegrationTests { @Bean public Job job(JobRepository jobRepository, PlatformTransactionManager transactionManager) { return new JobBuilder("job", jobRepository) - .start(new StepBuilder("step", jobRepository) - .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager).build()) - .build(); + .start(new StepBuilder("step", jobRepository) + .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager) + .build()) + .build(); } } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/SybaseJobRepositoryIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/SybaseJobRepositoryIntegrationTests.java index 7f58dcb80..e8c4076d6 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/SybaseJobRepositoryIntegrationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/test/repository/SybaseJobRepositoryIntegrationTests.java @@ -114,9 +114,10 @@ class SybaseJobRepositoryIntegrationTests { @Bean public Job job(JobRepository jobRepository, PlatformTransactionManager transactionManager) { return new JobBuilder("job", jobRepository) - .start(new StepBuilder("step", jobRepository) - .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager).build()) - .build(); + .start(new StepBuilder("step", jobRepository) + .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager) + .build()) + .build(); } } diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/test/step/FaultTolerantStepIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/test/step/FaultTolerantStepIntegrationTests.java index 80365a864..e31f6c76d 100644 --- a/spring-batch-core/src/test/java/org/springframework/batch/core/test/step/FaultTolerantStepIntegrationTests.java +++ b/spring-batch-core/src/test/java/org/springframework/batch/core/test/step/FaultTolerantStepIntegrationTests.java @@ -78,7 +78,10 @@ class FaultTolerantStepIntegrationTests { }; skipPolicy = new SkipIllegalArgumentExceptionSkipPolicy(); stepBuilder = new StepBuilder("step", jobRepository).chunk(CHUNK_SIZE, transactionManager) - .reader(itemReader).processor(item -> item > 20 ? null : item).writer(itemWriter).faultTolerant(); + .reader(itemReader) + .processor(item -> item > 20 ? null : item) + .writer(itemWriter) + .faultTolerant(); } @Test @@ -130,8 +133,11 @@ class FaultTolerantStepIntegrationTests { @Test void testFilterCountOnRetryWithNonTransactionalProcessorWhenSkipInWrite() throws Exception { // Given - Step step = stepBuilder.retry(IllegalArgumentException.class).retryLimit(2).skipPolicy(skipPolicy) - .processorNonTransactional().build(); + Step step = stepBuilder.retry(IllegalArgumentException.class) + .retryLimit(2) + .skipPolicy(skipPolicy) + .processorNonTransactional() + .build(); // When StepExecution stepExecution = execute(step); @@ -178,8 +184,13 @@ class FaultTolerantStepIntegrationTests { }; Step step = new StepBuilder("step", jobRepository).chunk(5, transactionManager) - .reader(itemReader).processor(itemProcessor).writer(itemWriter).faultTolerant().skip(Exception.class) - .skipLimit(3).build(); + .reader(itemReader) + .processor(itemProcessor) + .writer(itemWriter) + .faultTolerant() + .skip(Exception.class) + .skipLimit(3) + .build(); // When StepExecution stepExecution = execute(step); @@ -218,8 +229,12 @@ class FaultTolerantStepIntegrationTests { }; Step step = new StepBuilder("step", jobRepository).chunk(5, transactionManager) - .reader(itemReader).processor(itemProcessor).writer(itemWriter).faultTolerant() - .skipPolicy(new AlwaysSkipItemSkipPolicy()).build(); + .reader(itemReader) + .processor(itemProcessor) + .writer(itemWriter) + .faultTolerant() + .skipPolicy(new AlwaysSkipItemSkipPolicy()) + .build(); // When StepExecution stepExecution = execute(step); 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 8f1a8ad1a..75b35c7da 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 @@ -78,7 +78,7 @@ public class PropertyExtractingDelegatingItemWriter extends AbstractMethodInv */ public void setFieldsUsedAsTargetMethodArguments(String[] fieldsUsedAsMethodArguments) { this.fieldsUsedAsTargetMethodArguments = Arrays.asList(fieldsUsedAsMethodArguments) - .toArray(new String[fieldsUsedAsMethodArguments.length]); + .toArray(new String[fieldsUsedAsMethodArguments.length]); } } 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 290ee6ef8..467072dc4 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 @@ -191,18 +191,18 @@ public class JdbcBatchItemWriter implements ItemWriter, InitializingBean { } } else { - updateCounts = namedParameterJdbcTemplate.getJdbcOperations().execute(sql, - new PreparedStatementCallback() { - @Override - public int[] doInPreparedStatement(PreparedStatement ps) - throws SQLException, DataAccessException { - for (T item : chunk) { - itemPreparedStatementSetter.setValues(item, ps); - ps.addBatch(); - } - return ps.executeBatch(); + updateCounts = namedParameterJdbcTemplate.getJdbcOperations() + .execute(sql, new PreparedStatementCallback() { + @Override + public int[] doInPreparedStatement(PreparedStatement ps) + throws SQLException, DataAccessException { + for (T item : chunk) { + itemPreparedStatementSetter.setValues(item, ps); + ps.addBatch(); } - }); + return ps.executeBatch(); + } + }); } if (assertUpdates) { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/builder/JdbcBatchItemWriterBuilder.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/builder/JdbcBatchItemWriterBuilder.java index e2808566f..69fd69ae3 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/builder/JdbcBatchItemWriterBuilder.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/builder/JdbcBatchItemWriterBuilder.java @@ -177,7 +177,7 @@ public class JdbcBatchItemWriterBuilder { if (mappedValue == 1) { ((JdbcBatchItemWriter>) writer) - .setItemPreparedStatementSetter(new ColumnMapItemPreparedStatementSetter()); + .setItemPreparedStatementSetter(new ColumnMapItemPreparedStatementSetter()); } else if (mappedValue == 2) { writer.setItemSqlParameterSourceProvider(new BeanPropertyItemSqlParameterSourceProvider<>()); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqlWindowingPagingQueryProvider.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqlWindowingPagingQueryProvider.java index 323bcf666..a3710d892 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqlWindowingPagingQueryProvider.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/SqlWindowingPagingQueryProvider.java @@ -34,16 +34,21 @@ public class SqlWindowingPagingQueryProvider extends AbstractSqlPagingQueryProvi StringBuilder sql = new StringBuilder(); sql.append("SELECT * FROM ( "); sql.append("SELECT ") - .append(StringUtils.hasText(getOrderedQueryAlias()) ? getOrderedQueryAlias() + ".*, " : "*, "); + .append(StringUtils.hasText(getOrderedQueryAlias()) ? getOrderedQueryAlias() + ".*, " : "*, "); sql.append("ROW_NUMBER() OVER (").append(getOverClause()); sql.append(") AS ROW_NUMBER"); sql.append(getOverSubstituteClauseStart()); - sql.append(" FROM ").append(getFromClause()) - .append(getWhereClause() == null ? "" : " WHERE " + getWhereClause()); + sql.append(" FROM ") + .append(getFromClause()) + .append(getWhereClause() == null ? "" : " WHERE " + getWhereClause()); sql.append(getGroupClause() == null ? "" : " GROUP BY " + getGroupClause()); sql.append(getOverSubstituteClauseEnd()); - sql.append(") ").append(getSubQueryAlias()).append("WHERE ").append(extractTableAlias()) - .append("ROW_NUMBER <= ").append(pageSize); + sql.append(") ") + .append(getSubQueryAlias()) + .append("WHERE ") + .append(extractTableAlias()) + .append("ROW_NUMBER <= ") + .append(pageSize); sql.append(" ORDER BY ").append(SqlPagingQueryUtils.buildSortClause(this)); return sql.toString(); @@ -70,7 +75,7 @@ public class SqlWindowingPagingQueryProvider extends AbstractSqlPagingQueryProvi StringBuilder sql = new StringBuilder(); sql.append("SELECT * FROM ( "); sql.append("SELECT ") - .append(StringUtils.hasText(getOrderedQueryAlias()) ? getOrderedQueryAlias() + ".*, " : "*, "); + .append(StringUtils.hasText(getOrderedQueryAlias()) ? getOrderedQueryAlias() + ".*, " : "*, "); sql.append("ROW_NUMBER() OVER (").append(getOverClause()); sql.append(") AS ROW_NUMBER"); sql.append(getOverSubstituteClauseStart()); @@ -82,8 +87,12 @@ public class SqlWindowingPagingQueryProvider extends AbstractSqlPagingQueryProvi sql.append(getGroupClause() == null ? "" : " GROUP BY " + getGroupClause()); sql.append(getOverSubstituteClauseEnd()); - sql.append(") ").append(getSubQueryAlias()).append("WHERE ").append(extractTableAlias()) - .append("ROW_NUMBER <= ").append(pageSize); + sql.append(") ") + .append(getSubQueryAlias()) + .append("WHERE ") + .append(extractTableAlias()) + .append("ROW_NUMBER <= ") + .append(pageSize); sql.append(" AND "); SqlPagingQueryUtils.buildSortConditions(this, sql); sql.append(" ORDER BY ").append(SqlPagingQueryUtils.buildSortClause(this)); diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/FormatterLineAggregator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/FormatterLineAggregator.java index 99c7997ff..aa37bcfda 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/FormatterLineAggregator.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/FormatterLineAggregator.java @@ -82,8 +82,8 @@ public class FormatterLineAggregator extends ExtractorLineAggregator { String value = String.format(locale, format, fields); if (maximumLength > 0) { - Assert.state(value.length() <= maximumLength, String.format( - "String overflowed in formatter -" + " longer than %d characters: [%s", maximumLength, value)); + Assert.state(value.length() <= maximumLength, String + .format("String overflowed in formatter -" + " longer than %d characters: [%s", maximumLength, value)); } if (minimumLength > 0) { diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/RecordFieldExtractor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/RecordFieldExtractor.java index fb5b15a06..e26bae041 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/RecordFieldExtractor.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/RecordFieldExtractor.java @@ -94,8 +94,10 @@ public class RecordFieldExtractor implements FieldExtractor { @Nullable private RecordComponent getRecordComponentByName(String name) { - return Arrays.stream(this.recordComponents).filter(recordComponent -> recordComponent.getName().equals(name)) - .findFirst().orElse(null); + return Arrays.stream(this.recordComponents) + .filter(recordComponent -> recordComponent.getName().equals(name)) + .findFirst() + .orElse(null); } } diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/kafka/KafkaItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/kafka/KafkaItemReader.java index 8a60d00e2..4d3bf8b2a 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/kafka/KafkaItemReader.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/kafka/KafkaItemReader.java @@ -174,7 +174,7 @@ public class KafkaItemReader extends AbstractItemStreamItemReader { } if (this.saveState && executionContext.containsKey(TOPIC_PARTITION_OFFSETS)) { Map offsets = (Map) executionContext - .get(TOPIC_PARTITION_OFFSETS); + .get(TOPIC_PARTITION_OFFSETS); for (Map.Entry entry : offsets.entrySet()) { this.partitionOffsets.put(entry.getKey(), entry.getValue() == 0 ? 0 : entry.getValue() + 1); } 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 fd7283f1f..0519ec2b0 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 @@ -400,7 +400,7 @@ public class StaxEventItemWriter extends AbstractItemStreamItemWriter currentRecordCount = executionContext.getLong(getExecutionContextKey(WRITE_STATISTICS_NAME)); if (executionContext.containsKey(getExecutionContextKey(UNCLOSED_HEADER_CALLBACK_ELEMENTS_NAME))) { unclosedHeaderCallbackElements = (List) executionContext - .get(getExecutionContextKey(UNCLOSED_HEADER_CALLBACK_ELEMENTS_NAME)); + .get(getExecutionContextKey(UNCLOSED_HEADER_CALLBACK_ELEMENTS_NAME)); } restarted = true; 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 5709eb34b..68a9a7e18 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 @@ -40,10 +40,10 @@ public class SimpleLimitExceptionHandler implements ExceptionHandler, Initializi private RethrowOnThresholdExceptionHandler delegate = new RethrowOnThresholdExceptionHandler(); private Collection> exceptionClasses = Collections - .>singleton(Exception.class); + .>singleton(Exception.class); private Collection> fatalExceptionClasses = Collections - .>singleton(Error.class); + .>singleton(Error.class); private int limit = 0; diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DatabaseType.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DatabaseType.java index 4a98f0b11..c43338df0 100644 --- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DatabaseType.java +++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DatabaseType.java @@ -94,9 +94,9 @@ public enum DatabaseType { else if (databaseProductVersion.startsWith("DSN")) { databaseProductName = "DB2ZOS"; } - else if (databaseProductName.contains("AS") - && (databaseProductVersion.startsWith("QSQ") || databaseProductVersion - .substring(databaseProductVersion.indexOf('V')).matches("V\\dR\\d[mM]\\d"))) { + else if (databaseProductName.contains("AS") && (databaseProductVersion.startsWith("QSQ") + || databaseProductVersion.substring(databaseProductVersion.indexOf('V')) + .matches("V\\dR\\d[mM]\\d"))) { databaseProductName = "DB2AS400"; } else { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/amqp/builder/AmqpItemReaderBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/amqp/builder/AmqpItemReaderBuilderTests.java index 6ed4a6728..40efe3f76 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/amqp/builder/AmqpItemReaderBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/amqp/builder/AmqpItemReaderBuilderTests.java @@ -64,7 +64,9 @@ class AmqpItemReaderBuilderTests { when(this.amqpTemplate.receive()).thenReturn(message); final AmqpItemReader amqpItemReader = new AmqpItemReaderBuilder() - .amqpTemplate(this.amqpTemplate).itemType(Message.class).build(); + .amqpTemplate(this.amqpTemplate) + .itemType(Message.class) + .build(); assertEquals(message, amqpItemReader.read()); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/avro/builder/AvroItemReaderBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/avro/builder/AvroItemReaderBuilderTests.java index 3ba936a5d..1019a39d8 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/avro/builder/AvroItemReaderBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/avro/builder/AvroItemReaderBuilderTests.java @@ -34,7 +34,9 @@ class AvroItemReaderBuilderTests extends AvroItemReaderTestSupport { void itemReaderWithSchemaResource() throws Exception { AvroItemReader avroItemReader = new AvroItemReaderBuilder().resource(dataResource) - .embeddedSchema(false).schema(schemaResource).build(); + .embeddedSchema(false) + .schema(schemaResource) + .build(); verify(avroItemReader, genericAvroGeneratedUsers()); } @@ -42,14 +44,18 @@ class AvroItemReaderBuilderTests extends AvroItemReaderTestSupport { @Test void itemReaderWithGeneratedData() throws Exception { AvroItemReader avroItemReader = new AvroItemReaderBuilder() - .resource(dataResourceWithSchema).schema(schemaResource).build(); + .resource(dataResourceWithSchema) + .schema(schemaResource) + .build(); verify(avroItemReader, genericAvroGeneratedUsers()); } @Test void itemReaderWithSchemaString() throws Exception { AvroItemReader avroItemReader = new AvroItemReaderBuilder() - .schema(schemaString(schemaResource)).resource(dataResourceWithSchema).build(); + .schema(schemaString(schemaResource)) + .resource(dataResourceWithSchema) + .build(); verify(avroItemReader, genericAvroGeneratedUsers()); } @@ -57,14 +63,16 @@ class AvroItemReaderBuilderTests extends AvroItemReaderTestSupport { @Test void itemReaderWithEmbeddedHeader() throws Exception { AvroItemReader avroItemReader = new AvroItemReaderBuilder().resource(dataResourceWithSchema) - .type(User.class).build(); + .type(User.class) + .build(); verify(avroItemReader, avroGeneratedUsers()); } @Test void itemReaderForSpecificType() throws Exception { AvroItemReader avroItemReader = new AvroItemReaderBuilder().type(User.class) - .resource(dataResourceWithSchema).build(); + .resource(dataResourceWithSchema) + .build(); verify(avroItemReader, avroGeneratedUsers()); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/avro/builder/AvroItemWriterBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/avro/builder/AvroItemWriterBuilderTests.java index 43964102d..446b5b164 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/avro/builder/AvroItemWriterBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/avro/builder/AvroItemWriterBuilderTests.java @@ -41,8 +41,10 @@ class AvroItemWriterBuilderTests extends AvroItemWriterTestSupport { @Test void itemWriterForAvroGeneratedClass() throws Exception { - AvroItemWriter avroItemWriter = new AvroItemWriterBuilder().resource(output).schema(schemaResource) - .type(User.class).build(); + AvroItemWriter avroItemWriter = new AvroItemWriterBuilder().resource(output) + .schema(schemaResource) + .type(User.class) + .build(); avroItemWriter.open(new ExecutionContext()); avroItemWriter.write(this.avroGeneratedUsers()); @@ -55,7 +57,10 @@ class AvroItemWriterBuilderTests extends AvroItemWriterTestSupport { void itemWriterForGenericRecords() throws Exception { AvroItemWriter avroItemWriter = new AvroItemWriterBuilder() - .type(GenericRecord.class).schema(plainOldUserSchemaResource).resource(output).build(); + .type(GenericRecord.class) + .schema(plainOldUserSchemaResource) + .resource(output) + .build(); avroItemWriter.open(new ExecutionContext()); avroItemWriter.write(this.genericPlainOldUsers()); @@ -69,7 +74,9 @@ class AvroItemWriterBuilderTests extends AvroItemWriterTestSupport { void itemWriterForPojos() throws Exception { AvroItemWriter avroItemWriter = new AvroItemWriterBuilder().resource(output) - .schema(plainOldUserSchemaResource).type(PlainOldUser.class).build(); + .schema(plainOldUserSchemaResource) + .type(PlainOldUser.class) + .build(); avroItemWriter.open(new ExecutionContext()); avroItemWriter.write(this.plainOldUsers()); @@ -83,7 +90,8 @@ class AvroItemWriterBuilderTests extends AvroItemWriterTestSupport { void itemWriterWithNoEmbeddedSchema() throws Exception { AvroItemWriter avroItemWriter = new AvroItemWriterBuilder().resource(output) - .type(PlainOldUser.class).build(); + .type(PlainOldUser.class) + .build(); avroItemWriter.open(new ExecutionContext()); avroItemWriter.write(this.plainOldUsers()); avroItemWriter.close(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/avro/example/User.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/avro/example/User.java index 74f3acac2..1e75dafac 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/avro/example/User.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/avro/example/User.java @@ -427,7 +427,7 @@ public class User extends org.apache.avro.specific.SpecificRecordBase @SuppressWarnings("unchecked") private static final org.apache.avro.io.DatumWriter WRITER$ = (org.apache.avro.io.DatumWriter) MODEL$ - .createDatumWriter(SCHEMA$); + .createDatumWriter(SCHEMA$); @Override public void writeExternal(java.io.ObjectOutput out) throws java.io.IOException { @@ -436,7 +436,7 @@ public class User extends org.apache.avro.specific.SpecificRecordBase @SuppressWarnings("unchecked") private static final org.apache.avro.io.DatumReader READER$ = (org.apache.avro.io.DatumReader) MODEL$ - .createDatumReader(SCHEMA$); + .createDatumReader(SCHEMA$); @Override public void readExternal(java.io.ObjectInput in) throws java.io.IOException { @@ -492,7 +492,7 @@ public class User extends org.apache.avro.specific.SpecificRecordBase } else { this.favorite_color = in - .readString(this.favorite_color instanceof Utf8 ? (Utf8) this.favorite_color : null); + .readString(this.favorite_color instanceof Utf8 ? (Utf8) this.favorite_color : null); } } @@ -515,8 +515,8 @@ public class User extends org.apache.avro.specific.SpecificRecordBase this.favorite_color = null; } else { - this.favorite_color = in.readString( - this.favorite_color instanceof Utf8 ? (Utf8) this.favorite_color : null); + this.favorite_color = in + .readString(this.favorite_color instanceof Utf8 ? (Utf8) this.favorite_color : null); } } default -> throw new java.io.IOException("Corrupt ResolvingDecoder."); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/avro/support/AvroItemWriterTestSupport.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/avro/support/AvroItemWriterTestSupport.java index eb1275f31..fbce9fad4 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/avro/support/AvroItemWriterTestSupport.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/avro/support/AvroItemWriterTestSupport.java @@ -55,7 +55,9 @@ public abstract class AvroItemWriterTestSupport extends AvroTestFixtures { private void doVerify(byte[] bytes, Class clazz, Chunk actual, boolean embeddedSchema) throws Exception { AvroItemReader avroItemReader = new AvroItemReaderBuilder().type(clazz) - .resource(new ByteArrayResource(bytes)).embeddedSchema(embeddedSchema).build(); + .resource(new ByteArrayResource(bytes)) + .embeddedSchema(embeddedSchema) + .build(); avroItemReader.open(new ExecutionContext()); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/MongoItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/MongoItemReaderTests.java index 89ea8c066..51a98a05e 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/MongoItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/MongoItemReaderTests.java @@ -343,7 +343,7 @@ class MongoItemReaderTests { // when + then assertThatIllegalArgumentException().isThrownBy(() -> reader.setSort(null)) - .withMessage("Sorts must not be null"); + .withMessage("Sorts must not be null"); } } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/Neo4jItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/Neo4jItemReaderTests.java index 63a1de781..34d279181 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/Neo4jItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/Neo4jItemReaderTests.java @@ -142,7 +142,7 @@ class Neo4jItemReaderTests { when(this.sessionFactory.openSession()).thenReturn(this.session); when(this.session.query(String.class, "START n=node(*) MATCH n -- m WHERE has(n.name) RETURN m ORDER BY n.age SKIP 0 LIMIT 50", null)) - .thenReturn(result); + .thenReturn(result); when(result.iterator()).thenReturn(Arrays.asList("foo", "bar", "baz").iterator()); assertTrue(itemReader.doPageRead().hasNext()); @@ -162,7 +162,7 @@ class Neo4jItemReaderTests { when(this.sessionFactory.openSession()).thenReturn(this.session); when(this.session.query(String.class, "START n=node(*) MATCH n -- m WHERE has(n.name) RETURN m ORDER BY n.age SKIP 0 LIMIT 50", params)) - .thenReturn(result); + .thenReturn(result); when(result.iterator()).thenReturn(Arrays.asList("foo", "bar", "baz").iterator()); assertTrue(itemReader.doPageRead().hasNext()); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/RepositoryItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/RepositoryItemReaderTests.java index a11b513d5..70b49f668 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/RepositoryItemReaderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/RepositoryItemReaderTests.java @@ -139,7 +139,7 @@ class RepositoryItemReaderTests { ArgumentCaptor pageRequestContainer = ArgumentCaptor.forClass(PageRequest.class); final Object result = new Object(); when(repository.findAll(pageRequestContainer.capture())).thenReturn(new PageImpl<>(singletonList(new Object()))) - .thenReturn(new PageImpl<>(singletonList(result))); + .thenReturn(new PageImpl<>(singletonList(result))); assertNotSame(result, reader.doRead()); assertEquals(result, reader.doRead()); @@ -156,7 +156,8 @@ class RepositoryItemReaderTests { ArgumentCaptor pageRequestContainer = ArgumentCaptor.forClass(PageRequest.class); final Object result = new Object(); when(repository.findAll(pageRequestContainer.capture())).thenReturn(new PageImpl<>(singletonList(new Object()))) - .thenReturn(new PageImpl<>(singletonList(result))).thenReturn(new PageImpl<>(new ArrayList<>())); + .thenReturn(new PageImpl<>(singletonList(result))) + .thenReturn(new PageImpl<>(new ArrayList<>())); assertNotSame(result, reader.doRead()); assertEquals(result, reader.doRead()); @@ -237,7 +238,7 @@ class RepositoryItemReaderTests { ArgumentCaptor pageRequestContainer = ArgumentCaptor.forClass(PageRequest.class); when(differentRepository.findFirstNames(pageRequestContainer.capture())) - .thenReturn(new SliceImpl<>(singletonList("result"))); + .thenReturn(new SliceImpl<>(singletonList("result"))); assertEquals("result", reader.doRead()); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/builder/MongoItemReaderBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/builder/MongoItemReaderBuilderTests.java index dee868634..ddb1330b6 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/builder/MongoItemReaderBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/builder/MongoItemReaderBuilderTests.java @@ -110,7 +110,9 @@ class MongoItemReaderBuilderTests { @Test void testCollection() throws Exception { MongoItemReader reader = getBasicBuilder().parameterValues(Collections.singletonList("foo")) - .jsonQuery("{ name : ?0 }").collection("collection").build(); + .jsonQuery("{ name : ?0 }") + .collection("collection") + .build(); when(this.template.find(any(), any(), anyString())).thenReturn(new ArrayList<>()); @@ -124,8 +126,10 @@ class MongoItemReaderBuilderTests { @Test void testVarargs() throws Exception { - MongoItemReader reader = getBasicBuilder().parameterValues("foo").jsonQuery("{ name : ?0 }") - .collection("collection").build(); + MongoItemReader reader = getBasicBuilder().parameterValues("foo") + .jsonQuery("{ name : ?0 }") + .collection("collection") + .build(); when(this.template.find(any(), any(), anyString())).thenReturn(new ArrayList<>()); @@ -140,8 +144,12 @@ class MongoItemReaderBuilderTests { @Test void testWithoutQueryLimit() throws Exception { MongoItemReader reader = new MongoItemReaderBuilder().template(this.template) - .targetType(String.class).query(new Query()).sorts(this.sortOptions).name("mongoReaderTest") - .pageSize(50).build(); + .targetType(String.class) + .query(new Query()) + .sorts(this.sortOptions) + .name("mongoReaderTest") + .pageSize(50) + .build(); when(template.find(any(), any())).thenReturn(new ArrayList<>()); @@ -153,7 +161,11 @@ class MongoItemReaderBuilderTests { @Test void testWithoutQueryLimitAndPageSize() throws Exception { MongoItemReader reader = new MongoItemReaderBuilder().template(this.template) - .targetType(String.class).query(new Query()).sorts(this.sortOptions).name("mongoReaderTest").build(); + .targetType(String.class) + .query(new Query()) + .sorts(this.sortOptions) + .name("mongoReaderTest") + .build(); when(template.find(any(), any())).thenReturn(new ArrayList<>()); @@ -164,41 +176,56 @@ class MongoItemReaderBuilderTests { @Test void testNullTemplate() { - validateExceptionMessage(new MongoItemReaderBuilder().targetType(String.class).jsonQuery("{ }") - .sorts(this.sortOptions).name("mongoReaderTest").pageSize(50), "template is required."); + validateExceptionMessage(new MongoItemReaderBuilder().targetType(String.class) + .jsonQuery("{ }") + .sorts(this.sortOptions) + .name("mongoReaderTest") + .pageSize(50), "template is required."); } @Test void testNullTargetType() { - validateExceptionMessage(new MongoItemReaderBuilder().template(this.template).jsonQuery("{ }") - .sorts(this.sortOptions).name("mongoReaderTest").pageSize(50), "targetType is required."); + validateExceptionMessage(new MongoItemReaderBuilder().template(this.template) + .jsonQuery("{ }") + .sorts(this.sortOptions) + .name("mongoReaderTest") + .pageSize(50), "targetType is required."); } @Test void testNullQuery() { - validateExceptionMessage(new MongoItemReaderBuilder().template(this.template).targetType(String.class) - .sorts(this.sortOptions).name("mongoReaderTest").pageSize(50), "A query is required"); + validateExceptionMessage(new MongoItemReaderBuilder().template(this.template) + .targetType(String.class) + .sorts(this.sortOptions) + .name("mongoReaderTest") + .pageSize(50), "A query is required"); } @Test void testNullSortsWithQueryString() { - validateExceptionMessage(new MongoItemReaderBuilder().template(this.template).targetType(String.class) - .jsonQuery("{ }").name("mongoReaderTest").pageSize(50), "sorts map is required."); + validateExceptionMessage(new MongoItemReaderBuilder().template(this.template) + .targetType(String.class) + .jsonQuery("{ }") + .name("mongoReaderTest") + .pageSize(50), "sorts map is required."); } @Test void testNullSortsWithQuery() { - validateExceptionMessage( - new MongoItemReaderBuilder().template(this.template).targetType(String.class) - .query(query(where("_id").is("10"))).name("mongoReaderTest").pageSize(50), - "sorts map is required."); + validateExceptionMessage(new MongoItemReaderBuilder().template(this.template) + .targetType(String.class) + .query(query(where("_id").is("10"))) + .name("mongoReaderTest") + .pageSize(50), "sorts map is required."); } @Test void testNullName() { - validateExceptionMessage(new MongoItemReaderBuilder().template(this.template).targetType(String.class) - .jsonQuery("{ }").sorts(this.sortOptions).pageSize(50), - "A name is required when saveState is set to true"); + validateExceptionMessage(new MongoItemReaderBuilder().template(this.template) + .targetType(String.class) + .jsonQuery("{ }") + .sorts(this.sortOptions) + .pageSize(50), "A name is required when saveState is set to true"); } private void validateExceptionMessage(MongoItemReaderBuilder builder, String message) { @@ -208,8 +235,12 @@ class MongoItemReaderBuilderTests { } private MongoItemReaderBuilder getBasicBuilder() { - return new MongoItemReaderBuilder().template(this.template).targetType(String.class).jsonQuery("{ }") - .sorts(this.sortOptions).name("mongoReaderTest").pageSize(50); + return new MongoItemReaderBuilder().template(this.template) + .targetType(String.class) + .jsonQuery("{ }") + .sorts(this.sortOptions) + .name("mongoReaderTest") + .pageSize(50); } } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/builder/MongoItemWriterBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/builder/MongoItemWriterBuilderTests.java index fe3f0c738..699dd40f5 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/builder/MongoItemWriterBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/builder/MongoItemWriterBuilderTests.java @@ -98,7 +98,8 @@ class MongoItemWriterBuilderTests { @Test void testWriteToCollection() throws Exception { MongoItemWriter writer = new MongoItemWriterBuilder().collection("collection") - .template(this.template).build(); + .template(this.template) + .build(); writer.write(this.saveItems); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/builder/Neo4jItemReaderBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/builder/Neo4jItemReaderBuilderTests.java index 7cb742036..08d7dacc5 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/builder/Neo4jItemReaderBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/builder/Neo4jItemReaderBuilderTests.java @@ -53,13 +53,20 @@ class Neo4jItemReaderBuilderTests { @Test void testFullyQualifiedItemReader() throws Exception { Neo4jItemReader itemReader = new Neo4jItemReaderBuilder().sessionFactory(this.sessionFactory) - .targetType(String.class).startStatement("n=node(*)").orderByStatement("n.age").pageSize(50).name("bar") - .matchStatement("n -- m").whereStatement("has(n.name)").returnStatement("m").build(); + .targetType(String.class) + .startStatement("n=node(*)") + .orderByStatement("n.age") + .pageSize(50) + .name("bar") + .matchStatement("n -- m") + .whereStatement("has(n.name)") + .returnStatement("m") + .build(); when(this.sessionFactory.openSession()).thenReturn(this.session); when(this.session.query(String.class, "START n=node(*) MATCH n -- m WHERE has(n.name) RETURN m ORDER BY n.age SKIP 0 LIMIT 50", null)) - .thenReturn(result); + .thenReturn(result); when(result.iterator()).thenReturn(Arrays.asList("foo", "bar", "baz").iterator()); assertEquals("foo", itemReader.read(), "The expected value was not returned by reader."); @@ -70,12 +77,19 @@ class Neo4jItemReaderBuilderTests { @Test void testCurrentSize() throws Exception { Neo4jItemReader itemReader = new Neo4jItemReaderBuilder().sessionFactory(this.sessionFactory) - .targetType(String.class).startStatement("n=node(*)").orderByStatement("n.age").pageSize(50).name("bar") - .returnStatement("m").currentItemCount(0).maxItemCount(1).build(); + .targetType(String.class) + .startStatement("n=node(*)") + .orderByStatement("n.age") + .pageSize(50) + .name("bar") + .returnStatement("m") + .currentItemCount(0) + .maxItemCount(1) + .build(); when(this.sessionFactory.openSession()).thenReturn(this.session); when(this.session.query(String.class, "START n=node(*) RETURN m ORDER BY n.age SKIP 0 LIMIT 50", null)) - .thenReturn(result); + .thenReturn(result); when(result.iterator()).thenReturn(Arrays.asList("foo", "bar", "baz").iterator()); assertEquals("foo", itemReader.read(), "The expected value was not returned by reader."); @@ -87,14 +101,22 @@ class Neo4jItemReaderBuilderTests { Map params = new HashMap<>(); params.put("foo", "bar"); Neo4jItemReader itemReader = new Neo4jItemReaderBuilder().sessionFactory(this.sessionFactory) - .targetType(String.class).startStatement("n=node(*)").returnStatement("*").orderByStatement("n.age") - .pageSize(50).name("foo").parameterValues(params).matchStatement("n -- m").whereStatement("has(n.name)") - .returnStatement("m").build(); + .targetType(String.class) + .startStatement("n=node(*)") + .returnStatement("*") + .orderByStatement("n.age") + .pageSize(50) + .name("foo") + .parameterValues(params) + .matchStatement("n -- m") + .whereStatement("has(n.name)") + .returnStatement("m") + .build(); when(this.sessionFactory.openSession()).thenReturn(this.session); when(this.session.query(String.class, "START n=node(*) MATCH n -- m WHERE has(n.name) RETURN m ORDER BY n.age SKIP 0 LIMIT 50", params)) - .thenReturn(result); + .thenReturn(result); when(result.iterator()).thenReturn(Arrays.asList("foo", "bar", "baz").iterator()); assertEquals("foo", itemReader.read(), "The expected value was not returned by reader."); @@ -102,84 +124,130 @@ class Neo4jItemReaderBuilderTests { @Test void testNoSessionFactory() { - var builder = new Neo4jItemReaderBuilder().targetType(String.class).startStatement("n=node(*)") - .returnStatement("*").orderByStatement("n.age").pageSize(50).name("bar"); + var builder = new Neo4jItemReaderBuilder().targetType(String.class) + .startStatement("n=node(*)") + .returnStatement("*") + .orderByStatement("n.age") + .pageSize(50) + .name("bar"); Exception exception = assertThrows(IllegalArgumentException.class, builder::build); assertEquals("sessionFactory is required.", exception.getMessage()); } @Test void testZeroPageSize() { - validateExceptionMessage( - new Neo4jItemReaderBuilder().sessionFactory(this.sessionFactory).targetType(String.class) - .startStatement("n=node(*)").returnStatement("*").orderByStatement("n.age").pageSize(0) - .name("foo").matchStatement("n -- m").whereStatement("has(n.name)").returnStatement("m"), - "pageSize must be greater than zero"); + validateExceptionMessage(new Neo4jItemReaderBuilder().sessionFactory(this.sessionFactory) + .targetType(String.class) + .startStatement("n=node(*)") + .returnStatement("*") + .orderByStatement("n.age") + .pageSize(0) + .name("foo") + .matchStatement("n -- m") + .whereStatement("has(n.name)") + .returnStatement("m"), "pageSize must be greater than zero"); } @Test void testZeroMaxItemCount() { validateExceptionMessage(new Neo4jItemReaderBuilder().sessionFactory(this.sessionFactory) - .targetType(String.class).startStatement("n=node(*)").returnStatement("*").orderByStatement("n.age") - .pageSize(5).maxItemCount(0).name("foo").matchStatement("n -- m").whereStatement("has(n.name)") - .returnStatement("m"), "maxItemCount must be greater than zero"); + .targetType(String.class) + .startStatement("n=node(*)") + .returnStatement("*") + .orderByStatement("n.age") + .pageSize(5) + .maxItemCount(0) + .name("foo") + .matchStatement("n -- m") + .whereStatement("has(n.name)") + .returnStatement("m"), "maxItemCount must be greater than zero"); } @Test void testCurrentItemCountGreaterThanMaxItemCount() { - validateExceptionMessage( - new Neo4jItemReaderBuilder().sessionFactory(this.sessionFactory).targetType(String.class) - .startStatement("n=node(*)").returnStatement("*").orderByStatement("n.age").pageSize(5) - .maxItemCount(5).currentItemCount(6).name("foo").matchStatement("n -- m") - .whereStatement("has(n.name)").returnStatement("m"), - "maxItemCount must be greater than currentItemCount"); + validateExceptionMessage(new Neo4jItemReaderBuilder().sessionFactory(this.sessionFactory) + .targetType(String.class) + .startStatement("n=node(*)") + .returnStatement("*") + .orderByStatement("n.age") + .pageSize(5) + .maxItemCount(5) + .currentItemCount(6) + .name("foo") + .matchStatement("n -- m") + .whereStatement("has(n.name)") + .returnStatement("m"), "maxItemCount must be greater than currentItemCount"); } @Test void testNullName() { - validateExceptionMessage( - new Neo4jItemReaderBuilder().sessionFactory(this.sessionFactory).targetType(String.class) - .startStatement("n=node(*)").returnStatement("*").orderByStatement("n.age").pageSize(50), - "A name is required when saveState is set to true"); + validateExceptionMessage(new Neo4jItemReaderBuilder().sessionFactory(this.sessionFactory) + .targetType(String.class) + .startStatement("n=node(*)") + .returnStatement("*") + .orderByStatement("n.age") + .pageSize(50), "A name is required when saveState is set to true"); // tests that name is not required if saveState is set to false. - new Neo4jItemReaderBuilder().sessionFactory(this.sessionFactory).targetType(String.class) - .startStatement("n=node(*)").returnStatement("*").orderByStatement("n.age").saveState(false) - .pageSize(50).build(); + new Neo4jItemReaderBuilder().sessionFactory(this.sessionFactory) + .targetType(String.class) + .startStatement("n=node(*)") + .returnStatement("*") + .orderByStatement("n.age") + .saveState(false) + .pageSize(50) + .build(); } @Test void testNullTargetType() { - validateExceptionMessage( - new Neo4jItemReaderBuilder().sessionFactory(this.sessionFactory).startStatement("n=node(*)") - .returnStatement("*").orderByStatement("n.age").pageSize(50).name("bar") - .matchStatement("n -- m").whereStatement("has(n.name)").returnStatement("m"), - "targetType is required."); + validateExceptionMessage(new Neo4jItemReaderBuilder().sessionFactory(this.sessionFactory) + .startStatement("n=node(*)") + .returnStatement("*") + .orderByStatement("n.age") + .pageSize(50) + .name("bar") + .matchStatement("n -- m") + .whereStatement("has(n.name)") + .returnStatement("m"), "targetType is required."); } @Test void testNullStartStatement() { - validateExceptionMessage( - new Neo4jItemReaderBuilder().sessionFactory(this.sessionFactory).targetType(String.class) - .returnStatement("*").orderByStatement("n.age").pageSize(50).name("bar") - .matchStatement("n -- m").whereStatement("has(n.name)").returnStatement("m"), - "startStatement is required."); + validateExceptionMessage(new Neo4jItemReaderBuilder().sessionFactory(this.sessionFactory) + .targetType(String.class) + .returnStatement("*") + .orderByStatement("n.age") + .pageSize(50) + .name("bar") + .matchStatement("n -- m") + .whereStatement("has(n.name)") + .returnStatement("m"), "startStatement is required."); } @Test void testNullReturnStatement() { validateExceptionMessage(new Neo4jItemReaderBuilder().sessionFactory(this.sessionFactory) - .targetType(String.class).startStatement("n=node(*)").orderByStatement("n.age").pageSize(50).name("bar") - .matchStatement("n -- m").whereStatement("has(n.name)"), "returnStatement is required."); + .targetType(String.class) + .startStatement("n=node(*)") + .orderByStatement("n.age") + .pageSize(50) + .name("bar") + .matchStatement("n -- m") + .whereStatement("has(n.name)"), "returnStatement is required."); } @Test void testNullOrderByStatement() { - validateExceptionMessage( - new Neo4jItemReaderBuilder().sessionFactory(this.sessionFactory).targetType(String.class) - .startStatement("n=node(*)").returnStatement("*").pageSize(50).name("bar") - .matchStatement("n -- m").whereStatement("has(n.name)").returnStatement("m"), - "orderByStatement is required."); + validateExceptionMessage(new Neo4jItemReaderBuilder().sessionFactory(this.sessionFactory) + .targetType(String.class) + .startStatement("n=node(*)") + .returnStatement("*") + .pageSize(50) + .name("bar") + .matchStatement("n -- m") + .whereStatement("has(n.name)") + .returnStatement("m"), "orderByStatement is required."); } private void validateExceptionMessage(Neo4jItemReaderBuilder builder, String message) { diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/builder/Neo4jItemWriterBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/builder/Neo4jItemWriterBuilderTests.java index a6cc8a048..3f6629483 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/builder/Neo4jItemWriterBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/builder/Neo4jItemWriterBuilderTests.java @@ -49,7 +49,7 @@ class Neo4jItemWriterBuilderTests { @Test void testBasicWriter() throws Exception { Neo4jItemWriter writer = new Neo4jItemWriterBuilder().sessionFactory(this.sessionFactory) - .build(); + .build(); Chunk items = new Chunk<>(); items.add("foo"); items.add("bar"); @@ -66,7 +66,8 @@ class Neo4jItemWriterBuilderTests { @Test void testBasicDelete() throws Exception { Neo4jItemWriter writer = new Neo4jItemWriterBuilder().delete(true) - .sessionFactory(this.sessionFactory).build(); + .sessionFactory(this.sessionFactory) + .build(); Chunk items = new Chunk<>(); items.add("foo"); items.add("bar"); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/builder/RepositoryItemReaderBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/builder/RepositoryItemReaderBuilderTests.java index 05a56d86c..3b8abb791 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/builder/RepositoryItemReaderBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/builder/RepositoryItemReaderBuilderTests.java @@ -80,7 +80,11 @@ class RepositoryItemReaderBuilderTests { @Test void testBasicRead() throws Exception { RepositoryItemReader reader = new RepositoryItemReaderBuilder<>().repository(this.repository) - .sorts(this.sorts).maxItemCount(5).methodName("foo").name("bar").build(); + .sorts(this.sorts) + .maxItemCount(5) + .methodName("foo") + .name("bar") + .build(); String result = (String) reader.read(); assertEquals(TEST_CONTENT, result, "Result returned from reader was not expected value."); assertEquals(10, this.pageRequestContainer.getValue().getPageSize(), "page size was not expected value."); @@ -89,42 +93,61 @@ class RepositoryItemReaderBuilderTests { @Test void testCurrentItemCount() throws Exception { RepositoryItemReader reader = new RepositoryItemReaderBuilder<>().repository(this.repository) - .sorts(this.sorts).currentItemCount(6).maxItemCount(5).methodName("foo").name("bar").build(); + .sorts(this.sorts) + .currentItemCount(6) + .maxItemCount(5) + .methodName("foo") + .name("bar") + .build(); assertNull(reader.read(), "Result returned from reader was not null."); } @Test void testPageSize() throws Exception { RepositoryItemReader reader = new RepositoryItemReaderBuilder<>().repository(this.repository) - .sorts(this.sorts).maxItemCount(5).methodName("foo").name("bar").pageSize(2).build(); + .sorts(this.sorts) + .maxItemCount(5) + .methodName("foo") + .name("bar") + .pageSize(2) + .build(); reader.read(); assertEquals(2, this.pageRequestContainer.getValue().getPageSize(), "page size was not expected value."); } @Test void testNoMethodName() { - var builder = new RepositoryItemReaderBuilder<>().repository(this.repository).sorts(this.sorts) - .maxItemCount(10); + var builder = new RepositoryItemReaderBuilder<>().repository(this.repository) + .sorts(this.sorts) + .maxItemCount(10); Exception exception = assertThrows(IllegalArgumentException.class, builder::build); assertEquals("methodName is required.", exception.getMessage()); - builder = new RepositoryItemReaderBuilder<>().repository(this.repository).sorts(this.sorts).methodName("") - .maxItemCount(5); + builder = new RepositoryItemReaderBuilder<>().repository(this.repository) + .sorts(this.sorts) + .methodName("") + .maxItemCount(5); exception = assertThrows(IllegalArgumentException.class, builder::build); assertEquals("methodName is required.", exception.getMessage()); } @Test void testSaveState() { - var builder = new RepositoryItemReaderBuilder<>().repository(repository).methodName("foo").sorts(sorts) - .maxItemCount(5); + var builder = new RepositoryItemReaderBuilder<>().repository(repository) + .methodName("foo") + .sorts(sorts) + .maxItemCount(5); Exception exception = assertThrows(IllegalStateException.class, builder::build); assertEquals("A name is required when saveState is set to true.", exception.getMessage()); // No IllegalStateException for a name that is not set, should not be thrown since // saveState was false. - new RepositoryItemReaderBuilder<>().repository(repository).saveState(false).methodName("foo").sorts(sorts) - .maxItemCount(5).build(); + new RepositoryItemReaderBuilder<>().repository(repository) + .saveState(false) + .methodName("foo") + .sorts(sorts) + .maxItemCount(5) + .build(); } @Test @@ -158,10 +181,16 @@ class RepositoryItemReaderBuilderTests { ArgumentCaptor arg2Captor = ArgumentCaptor.forClass(String.class); ArgumentCaptor arg3Captor = ArgumentCaptor.forClass(String.class); when(this.repository.foo(arg1Captor.capture(), arg2Captor.capture(), arg3Captor.capture(), - this.pageRequestContainer.capture())).thenReturn(this.slice); + this.pageRequestContainer.capture())) + .thenReturn(this.slice); RepositoryItemReader reader = new RepositoryItemReaderBuilder<>().repository(this.repository) - .sorts(this.sorts).maxItemCount(5).methodName("foo").name("bar").arguments(args).build(); + .sorts(this.sorts) + .maxItemCount(5) + .methodName("foo") + .name("bar") + .arguments(args) + .build(); String result = (String) reader.read(); verifyMultiArgRead(arg1Captor, arg2Captor, arg3Captor, result); @@ -173,10 +202,16 @@ class RepositoryItemReaderBuilderTests { ArgumentCaptor arg2Captor = ArgumentCaptor.forClass(String.class); ArgumentCaptor arg3Captor = ArgumentCaptor.forClass(String.class); when(this.repository.foo(arg1Captor.capture(), arg2Captor.capture(), arg3Captor.capture(), - this.pageRequestContainer.capture())).thenReturn(this.slice); + this.pageRequestContainer.capture())) + .thenReturn(this.slice); RepositoryItemReader reader = new RepositoryItemReaderBuilder<>().repository(this.repository) - .sorts(this.sorts).maxItemCount(5).methodName("foo").name("bar").arguments(ARG1, ARG2, ARG3).build(); + .sorts(this.sorts) + .maxItemCount(5) + .methodName("foo") + .name("bar") + .arguments(ARG1, ARG2, ARG3) + .build(); String result = (String) reader.read(); verifyMultiArgRead(arg1Captor, arg2Captor, arg3Captor, result); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/builder/RepositoryItemWriterBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/builder/RepositoryItemWriterBuilderTests.java index ca6c2bf57..904ef5886 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/builder/RepositoryItemWriterBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/data/builder/RepositoryItemWriterBuilderTests.java @@ -58,7 +58,8 @@ class RepositoryItemWriterBuilderTests { @Test void testWriteItems() throws Exception { RepositoryItemWriter writer = new RepositoryItemWriterBuilder().methodName("save") - .repository(this.repository).build(); + .repository(this.repository) + .build(); Chunk items = Chunk.of("foo"); @@ -70,7 +71,8 @@ class RepositoryItemWriterBuilderTests { @Test void testWriteItemsTestRepository() throws Exception { RepositoryItemWriter writer = new RepositoryItemWriterBuilder().methodName("foo") - .repository(this.repository).build(); + .repository(this.repository) + .build(); Chunk items = Chunk.of("foo"); @@ -86,7 +88,8 @@ class RepositoryItemWriterBuilderTests { repositoryMethodReference.methodIs().foo(null); RepositoryItemWriter writer = new RepositoryItemWriterBuilder().methodName("foo") - .repository(repositoryMethodReference).build(); + .repository(repositoryMethodReference) + .build(); Chunk items = Chunk.of("foo"); 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 135e3ba78..0a86c97c0 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 @@ -59,7 +59,7 @@ public class CompositeKeyFooDao extends JdbcDaoSupport implements FooDao { }; return getJdbcTemplate().query("SELECT ID, NAME, VALUE from T_FOOS where ID = ? and VALUE = ?", fooMapper, args) - .get(0); + .get(0); } } 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 761cfc172..8f5c11d35 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 @@ -184,7 +184,7 @@ public class JdbcBatchItemWriterNamedParameterTests { when(namedParameterJdbcOperations.batchUpdate(eq(sql), eqSqlParameterSourceArray( new SqlParameterSource[] { new BeanPropertySqlParameterSource(new Foo("bar")) }))) - .thenThrow(ex); + .thenThrow(ex); Exception exception = assertThrows(RuntimeException.class, () -> writer.write(Chunk.of(new Foo("bar")))); assertEquals("ERROR", exception.getMessage()); } 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 30bf64fa3..12e4ee9b2 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 @@ -47,7 +47,8 @@ class JdbcCursorItemReaderConfigTests { when(con.getAutoCommit()).thenReturn(false); PreparedStatement ps = mock(PreparedStatement.class); when(con.prepareStatement("select foo from bar", ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, - ResultSet.HOLD_CURSORS_OVER_COMMIT)).thenReturn(ps); + ResultSet.HOLD_CURSORS_OVER_COMMIT)) + .thenReturn(ps); when(ds.getConnection()).thenReturn(con); when(ds.getConnection()).thenReturn(con); con.commit(); @@ -79,7 +80,7 @@ class JdbcCursorItemReaderConfigTests { when(con.getAutoCommit()).thenReturn(false); PreparedStatement ps = mock(PreparedStatement.class); when(con.prepareStatement("select foo from bar", ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY)) - .thenReturn(ps); + .thenReturn(ps); when(ds.getConnection()).thenReturn(con); when(ds.getConnection()).thenReturn(con); con.commit(); @@ -109,7 +110,7 @@ class JdbcCursorItemReaderConfigTests { when(con.getAutoCommit()).thenReturn(initialAutoCommit); PreparedStatement ps = mock(PreparedStatement.class); when(con.prepareStatement("select foo from bar", ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY)) - .thenReturn(ps); + .thenReturn(ps); when(ds.getConnection()).thenReturn(con); final JdbcCursorItemReader reader = new JdbcCursorItemReader<>(); 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 c1b57a3ce..a51057819 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 @@ -36,7 +36,7 @@ class JdbcPagingItemReaderConfigTests { void testConfig() { assertNotNull(jdbcPagingItemReader); NamedParameterJdbcTemplate namedParameterJdbcTemplate = (NamedParameterJdbcTemplate) ReflectionTestUtils - .getField(jdbcPagingItemReader, "namedParameterJdbcTemplate"); + .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/item/database/JdbcParameterUtilsTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcParameterUtilsTests.java index c058a6d65..ad3657f42 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcParameterUtilsTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcParameterUtilsTests.java @@ -42,23 +42,23 @@ class JdbcParameterUtilsTests { assertEquals(2, JdbcParameterUtils.countParameterPlaceholders("The big :parameter :newpar :parameter bad wolf", null)); assertEquals(2, JdbcParameterUtils - .countParameterPlaceholders("The big :parameter, :newpar, :parameter bad wolf", null)); + .countParameterPlaceholders("The big :parameter, :newpar, :parameter bad wolf", null)); assertEquals(1, JdbcParameterUtils.countParameterPlaceholders("The \"big:\" 'ba''ad:p' :parameter wolf", null)); assertEquals(1, JdbcParameterUtils.countParameterPlaceholders("¶meter", null)); assertEquals(1, JdbcParameterUtils.countParameterPlaceholders("The \"big\" ¶meter 'bad wolf'", null)); assertEquals(1, JdbcParameterUtils.countParameterPlaceholders("The big ¶meter ¶meter bad wolf", null)); assertEquals(2, JdbcParameterUtils - .countParameterPlaceholders("The big ¶meter &newparameter ¶meter bad wolf", null)); + .countParameterPlaceholders("The big ¶meter &newparameter ¶meter bad wolf", null)); assertEquals(2, JdbcParameterUtils - .countParameterPlaceholders("The big ¶meter, &newparameter, ¶meter bad wolf", null)); + .countParameterPlaceholders("The big ¶meter, &newparameter, ¶meter bad wolf", null)); assertEquals(1, JdbcParameterUtils.countParameterPlaceholders("The \"big &x \" 'ba''ad&p' ¶meter wolf", null)); assertEquals(2, JdbcParameterUtils - .countParameterPlaceholders("The big :parameter, &newparameter, ¶meter bad wolf", null)); + .countParameterPlaceholders("The big :parameter, &newparameter, ¶meter bad wolf", null)); assertEquals(2, JdbcParameterUtils - .countParameterPlaceholders("The big :parameter, &sameparameter, &sameparameter bad wolf", null)); + .countParameterPlaceholders("The big :parameter, &sameparameter, &sameparameter bad wolf", null)); assertEquals(2, JdbcParameterUtils - .countParameterPlaceholders("The big :parameter, :sameparameter, :sameparameter bad wolf", null)); + .countParameterPlaceholders("The big :parameter, :sameparameter, :sameparameter bad wolf", null)); assertEquals(0, JdbcParameterUtils.countParameterPlaceholders("xxx & yyy", null)); List l = new ArrayList<>(); assertEquals(3, JdbcParameterUtils.countParameterPlaceholders("select :par1, :par2 :par3", l)); 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 c05f9c63a..841bb3c68 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 @@ -75,8 +75,9 @@ public class JpaPagingItemReaderNativeQueryIntegrationTests extends AbstractPagi @Bean public DataSource dataSource() { return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL) - .addScript("org/springframework/batch/item/database/init-foo-schema-hsqldb.sql") - .generateUniqueName(true).build(); + .addScript("org/springframework/batch/item/database/init-foo-schema-hsqldb.sql") + .generateUniqueName(true) + .build(); } @Bean 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 99b130ab9..defcc7c5a 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 @@ -54,7 +54,8 @@ class StoredprocedureItemReaderConfigTests { when(con.getAutoCommit()).thenReturn(false); CallableStatement cs = mock(CallableStatement.class); when(con.prepareCall("{call foo_bar()}", ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY, - ResultSet.HOLD_CURSORS_OVER_COMMIT)).thenReturn(cs); + ResultSet.HOLD_CURSORS_OVER_COMMIT)) + .thenReturn(cs); when(ds.getConnection()).thenReturn(con); when(ds.getConnection()).thenReturn(con); con.commit(); @@ -90,7 +91,7 @@ class StoredprocedureItemReaderConfigTests { when(con.getAutoCommit()).thenReturn(false); CallableStatement cs = mock(CallableStatement.class); when(con.prepareCall("{call foo_bar()}", ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY)) - .thenReturn(cs); + .thenReturn(cs); when(ds.getConnection()).thenReturn(con); when(ds.getConnection()).thenReturn(con); con.commit(); @@ -125,7 +126,7 @@ class StoredprocedureItemReaderConfigTests { when(con.getAutoCommit()).thenReturn(false); CallableStatement cs = mock(CallableStatement.class); when(con.prepareCall("{call foo_bar(?, ?)}", ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY)) - .thenReturn(cs); + .thenReturn(cs); when(ds.getConnection()).thenReturn(con); when(ds.getConnection()).thenReturn(con); con.commit(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/HibernateCursorItemReaderBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/HibernateCursorItemReaderBuilderTests.java index b4a625220..1c8422c8a 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/HibernateCursorItemReaderBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/HibernateCursorItemReaderBuilderTests.java @@ -68,8 +68,13 @@ class HibernateCursorItemReaderBuilderTests { @Test void testConfiguration() throws Exception { HibernateCursorItemReader reader = new HibernateCursorItemReaderBuilder().name("fooReader") - .sessionFactory(this.sessionFactory).fetchSize(2).currentItemCount(2).maxItemCount(4) - .queryName("allFoos").useStatelessSession(true).build(); + .sessionFactory(this.sessionFactory) + .fetchSize(2) + .currentItemCount(2) + .maxItemCount(4) + .queryName("allFoos") + .useStatelessSession(true) + .build(); reader.afterPropertiesSet(); @@ -98,8 +103,11 @@ class HibernateCursorItemReaderBuilderTests { parameters.put("value", 2); HibernateCursorItemReader reader = new HibernateCursorItemReaderBuilder().name("fooReader") - .sessionFactory(this.sessionFactory).queryString("from Foo foo where foo.id > :value") - .parameterValues(parameters).saveState(false).build(); + .sessionFactory(this.sessionFactory) + .queryString("from Foo foo where foo.id > :value") + .parameterValues(parameters) + .saveState(false) + .build(); reader.afterPropertiesSet(); @@ -128,7 +136,9 @@ class HibernateCursorItemReaderBuilderTests { provider.afterPropertiesSet(); HibernateCursorItemReader reader = new HibernateCursorItemReaderBuilder().name("fooReader") - .sessionFactory(this.sessionFactory).queryProvider(provider).build(); + .sessionFactory(this.sessionFactory) + .queryProvider(provider) + .build(); reader.afterPropertiesSet(); @@ -150,7 +160,10 @@ class HibernateCursorItemReaderBuilderTests { @Test void testConfigurationNativeQuery() throws Exception { HibernateCursorItemReader reader = new HibernateCursorItemReaderBuilder().name("fooReader") - .sessionFactory(this.sessionFactory).nativeQuery("select * from T_FOOS").entityClass(Foo.class).build(); + .sessionFactory(this.sessionFactory) + .nativeQuery("select * from T_FOOS") + .entityClass(Foo.class) + .build(); reader.afterPropertiesSet(); @@ -179,12 +192,16 @@ class HibernateCursorItemReaderBuilderTests { () -> new HibernateCursorItemReaderBuilder().build()); assertEquals("A SessionFactory must be provided", exception.getMessage()); - exception = assertThrows(IllegalStateException.class, () -> new HibernateCursorItemReaderBuilder() - .sessionFactory(this.sessionFactory).saveState(true).build()); + exception = assertThrows(IllegalStateException.class, + () -> new HibernateCursorItemReaderBuilder().sessionFactory(this.sessionFactory) + .saveState(true) + .build()); assertEquals("A name is required when saveState is set to true.", exception.getMessage()); - exception = assertThrows(IllegalStateException.class, () -> new HibernateCursorItemReaderBuilder() - .sessionFactory(this.sessionFactory).saveState(false).build()); + exception = assertThrows(IllegalStateException.class, + () -> new HibernateCursorItemReaderBuilder().sessionFactory(this.sessionFactory) + .saveState(false) + .build()); assertEquals("A HibernateQueryProvider, queryName, queryString, " + "or both the nativeQuery and entityClass must be configured", exception.getMessage()); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/HibernateItemWriterBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/HibernateItemWriterBuilderTests.java index 6fdb9252e..455496e1a 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/HibernateItemWriterBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/HibernateItemWriterBuilderTests.java @@ -54,7 +54,7 @@ class HibernateItemWriterBuilderTests { @Test void testConfiguration() { HibernateItemWriter itemWriter = new HibernateItemWriterBuilder().sessionFactory(this.sessionFactory) - .build(); + .build(); itemWriter.afterPropertiesSet(); @@ -70,7 +70,8 @@ class HibernateItemWriterBuilderTests { @Test void testConfigurationClearSession() { HibernateItemWriter itemWriter = new HibernateItemWriterBuilder().sessionFactory(this.sessionFactory) - .clearSession(false).build(); + .clearSession(false) + .build(); itemWriter.afterPropertiesSet(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/HibernatePagingItemReaderBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/HibernatePagingItemReaderBuilderTests.java index 321cd9fcc..869ac644a 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/HibernatePagingItemReaderBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/HibernatePagingItemReaderBuilderTests.java @@ -73,8 +73,14 @@ class HibernatePagingItemReaderBuilderTests { @SuppressWarnings("unchecked") void testConfiguration() throws Exception { HibernatePagingItemReader reader = new HibernatePagingItemReaderBuilder().name("fooReader") - .sessionFactory(this.sessionFactory).fetchSize(2).currentItemCount(2).maxItemCount(4).pageSize(5) - .queryName("allFoos").useStatelessSession(false).build(); + .sessionFactory(this.sessionFactory) + .fetchSize(2) + .currentItemCount(2) + .maxItemCount(4) + .pageSize(5) + .queryName("allFoos") + .useStatelessSession(false) + .build(); reader.afterPropertiesSet(); @@ -108,8 +114,11 @@ class HibernatePagingItemReaderBuilderTests { parameters.put("value", 2); HibernatePagingItemReader reader = new HibernatePagingItemReaderBuilder().name("fooReader") - .sessionFactory(this.sessionFactory).queryString("from Foo foo where foo.id > :value") - .parameterValues(parameters).saveState(false).build(); + .sessionFactory(this.sessionFactory) + .queryString("from Foo foo where foo.id > :value") + .parameterValues(parameters) + .saveState(false) + .build(); reader.afterPropertiesSet(); @@ -138,7 +147,9 @@ class HibernatePagingItemReaderBuilderTests { provider.afterPropertiesSet(); HibernatePagingItemReader reader = new HibernatePagingItemReaderBuilder().name("fooReader") - .sessionFactory(this.sessionFactory).queryProvider(provider).build(); + .sessionFactory(this.sessionFactory) + .queryProvider(provider) + .build(); reader.afterPropertiesSet(); @@ -160,20 +171,25 @@ class HibernatePagingItemReaderBuilderTests { @Test void testValidation() { Exception exception = assertThrows(IllegalStateException.class, - () -> new HibernatePagingItemReaderBuilder().sessionFactory(this.sessionFactory).fetchSize(-2) - .build()); + () -> new HibernatePagingItemReaderBuilder().sessionFactory(this.sessionFactory) + .fetchSize(-2) + .build()); assertEquals("fetchSize must not be negative", exception.getMessage()); exception = assertThrows(IllegalArgumentException.class, () -> new HibernatePagingItemReaderBuilder().build()); assertEquals("A SessionFactory must be provided", exception.getMessage()); - exception = assertThrows(IllegalArgumentException.class, () -> new HibernatePagingItemReaderBuilder() - .sessionFactory(this.sessionFactory).saveState(true).build()); + exception = assertThrows(IllegalArgumentException.class, + () -> new HibernatePagingItemReaderBuilder().sessionFactory(this.sessionFactory) + .saveState(true) + .build()); assertEquals("A name is required when saveState is set to true", exception.getMessage()); - exception = assertThrows(IllegalStateException.class, () -> new HibernatePagingItemReaderBuilder() - .sessionFactory(this.sessionFactory).saveState(false).build()); + exception = assertThrows(IllegalStateException.class, + () -> new HibernatePagingItemReaderBuilder().sessionFactory(this.sessionFactory) + .saveState(false) + .build()); assertEquals("queryString or queryName must be set", exception.getMessage()); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JdbcBatchItemWriterBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JdbcBatchItemWriterBuilderTests.java index 54480d67f..bfe65ff78 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JdbcBatchItemWriterBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JdbcBatchItemWriterBuilderTests.java @@ -73,8 +73,10 @@ class JdbcBatchItemWriterBuilderTests { @Test void testBasicMap() throws Exception { JdbcBatchItemWriter> writer = new JdbcBatchItemWriterBuilder>() - .columnMapped().dataSource(this.dataSource) - .sql("INSERT INTO FOO (first, second, third) VALUES (:first, :second, :third)").build(); + .columnMapped() + .dataSource(this.dataSource) + .sql("INSERT INTO FOO (first, second, third) VALUES (:first, :second, :third)") + .build(); writer.afterPropertiesSet(); @@ -89,8 +91,10 @@ class JdbcBatchItemWriterBuilderTests { NamedParameterJdbcOperations template = new NamedParameterJdbcTemplate(this.dataSource); JdbcBatchItemWriter> writer = new JdbcBatchItemWriterBuilder>() - .columnMapped().namedParametersJdbcTemplate(template) - .sql("INSERT INTO FOO (first, second, third) VALUES (:first, :second, :third)").build(); + .columnMapped() + .namedParametersJdbcTemplate(template) + .sql("INSERT INTO FOO (first, second, third) VALUES (:first, :second, :third)") + .build(); writer.afterPropertiesSet(); @@ -105,8 +109,10 @@ class JdbcBatchItemWriterBuilderTests { @Test void testBasicPojo() throws Exception { - JdbcBatchItemWriter writer = new JdbcBatchItemWriterBuilder().beanMapped().dataSource(this.dataSource) - .sql("INSERT INTO FOO (first, second, third) VALUES (:first, :second, :third)").build(); + JdbcBatchItemWriter writer = new JdbcBatchItemWriterBuilder().beanMapped() + .dataSource(this.dataSource) + .sql("INSERT INTO FOO (first, second, third) VALUES (:first, :second, :third)") + .build(); writer.afterPropertiesSet(); @@ -123,9 +129,11 @@ class JdbcBatchItemWriterBuilderTests { @Test void testAssertUpdates() { - JdbcBatchItemWriter writer = new JdbcBatchItemWriterBuilder().beanMapped().dataSource(this.dataSource) - .sql("UPDATE FOO SET second = :second, third = :third WHERE first = :first").assertUpdates(true) - .build(); + JdbcBatchItemWriter writer = new JdbcBatchItemWriterBuilder().beanMapped() + .dataSource(this.dataSource) + .sql("UPDATE FOO SET second = :second, third = :third WHERE first = :first") + .assertUpdates(true) + .build(); writer.afterPropertiesSet(); @@ -139,12 +147,14 @@ class JdbcBatchItemWriterBuilderTests { @Test void testCustomPreparedStatementSetter() throws Exception { JdbcBatchItemWriter> writer = new JdbcBatchItemWriterBuilder>() - .itemPreparedStatementSetter((item, ps) -> { - ps.setInt(0, (int) item.get("first")); - ps.setString(1, (String) item.get("second")); - ps.setString(2, (String) item.get("third")); - }).dataSource(this.dataSource) - .sql("INSERT INTO FOO (first, second, third) VALUES (:first, :second, :third)").build(); + .itemPreparedStatementSetter((item, ps) -> { + ps.setInt(0, (int) item.get("first")); + ps.setString(1, (String) item.get("second")); + ps.setString(2, (String) item.get("third")); + }) + .dataSource(this.dataSource) + .sql("INSERT INTO FOO (first, second, third) VALUES (:first, :second, :third)") + .build(); writer.afterPropertiesSet(); @@ -157,8 +167,10 @@ class JdbcBatchItemWriterBuilderTests { @Test void testCustomPSqlParameterSourceProvider() throws Exception { JdbcBatchItemWriter> writer = new JdbcBatchItemWriterBuilder>() - .itemSqlParameterSourceProvider(MapSqlParameterSource::new).dataSource(this.dataSource) - .sql("INSERT INTO FOO (first, second, third) VALUES (:first, :second, :third)").build(); + .itemSqlParameterSourceProvider(MapSqlParameterSource::new) + .dataSource(this.dataSource) + .sql("INSERT INTO FOO (first, second, third) VALUES (:first, :second, :third)") + .build(); writer.afterPropertiesSet(); @@ -171,17 +183,20 @@ class JdbcBatchItemWriterBuilderTests { @Test void testBuildAssertions() { var builder = new JdbcBatchItemWriterBuilder>() - .itemSqlParameterSourceProvider(MapSqlParameterSource::new); + .itemSqlParameterSourceProvider(MapSqlParameterSource::new); Exception exception = assertThrows(IllegalStateException.class, builder::build); assertEquals("Either a DataSource or a NamedParameterJdbcTemplate is required", exception.getMessage()); builder = new JdbcBatchItemWriterBuilder>() - .itemSqlParameterSourceProvider(MapSqlParameterSource::new).dataSource(this.dataSource); + .itemSqlParameterSourceProvider(MapSqlParameterSource::new) + .dataSource(this.dataSource); exception = assertThrows(IllegalArgumentException.class, builder::build); assertEquals("A SQL statement is required", exception.getMessage()); builder = new JdbcBatchItemWriterBuilder>().dataSource(this.dataSource) - .sql("INSERT INTO FOO VALUES (?, ?, ?)").columnMapped().beanMapped(); + .sql("INSERT INTO FOO VALUES (?, ?, ?)") + .columnMapped() + .beanMapped(); exception = assertThrows(IllegalStateException.class, builder::build); assertEquals("Either an item can be mapped via db column or via bean spec, can't be both", exception.getMessage()); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JdbcCursorItemReaderBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JdbcCursorItemReaderBuilderTests.java index 1079d6cba..09d8a0002 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JdbcCursorItemReaderBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JdbcCursorItemReaderBuilderTests.java @@ -72,15 +72,18 @@ class JdbcCursorItemReaderBuilderTests { @Test void testSimpleScenario() throws Exception { JdbcCursorItemReader reader = new JdbcCursorItemReaderBuilder().dataSource(this.dataSource) - .name("fooReader").sql("SELECT * FROM FOO ORDER BY FIRST").rowMapper((rs, rowNum) -> { - Foo foo = new Foo(); + .name("fooReader") + .sql("SELECT * FROM FOO ORDER BY FIRST") + .rowMapper((rs, rowNum) -> { + Foo foo = new Foo(); - foo.setFirst(rs.getInt("FIRST")); - foo.setSecond(rs.getString("SECOND")); - foo.setThird(rs.getString("THIRD")); + foo.setFirst(rs.getInt("FIRST")); + foo.setSecond(rs.getString("SECOND")); + foo.setThird(rs.getString("THIRD")); - return foo; - }).build(); + return foo; + }) + .build(); ExecutionContext executionContext = new ExecutionContext(); reader.open(executionContext); @@ -95,16 +98,20 @@ class JdbcCursorItemReaderBuilderTests { @Test void testMaxRows() throws Exception { JdbcCursorItemReader reader = new JdbcCursorItemReaderBuilder().dataSource(this.dataSource) - .name("fooReader").sql("SELECT * FROM FOO ORDER BY FIRST").maxRows(2).saveState(false) - .rowMapper((rs, rowNum) -> { - Foo foo = new Foo(); + .name("fooReader") + .sql("SELECT * FROM FOO ORDER BY FIRST") + .maxRows(2) + .saveState(false) + .rowMapper((rs, rowNum) -> { + Foo foo = new Foo(); - foo.setFirst(rs.getInt("FIRST")); - foo.setSecond(rs.getString("SECOND")); - foo.setThird(rs.getString("THIRD")); + foo.setFirst(rs.getInt("FIRST")); + foo.setSecond(rs.getString("SECOND")); + foo.setThird(rs.getString("THIRD")); - return foo; - }).build(); + return foo; + }) + .build(); ExecutionContext executionContext = new ExecutionContext(); reader.open(executionContext); @@ -120,16 +127,19 @@ class JdbcCursorItemReaderBuilderTests { @Test void testQueryArgumentsList() throws Exception { JdbcCursorItemReader reader = new JdbcCursorItemReaderBuilder().dataSource(this.dataSource) - .name("fooReader").sql("SELECT * FROM FOO WHERE FIRST > ? ORDER BY FIRST") - .queryArguments(Arrays.asList(3)).rowMapper((rs, rowNum) -> { - Foo foo = new Foo(); + .name("fooReader") + .sql("SELECT * FROM FOO WHERE FIRST > ? ORDER BY FIRST") + .queryArguments(Arrays.asList(3)) + .rowMapper((rs, rowNum) -> { + Foo foo = new Foo(); - foo.setFirst(rs.getInt("FIRST")); - foo.setSecond(rs.getString("SECOND")); - foo.setThird(rs.getString("THIRD")); + foo.setFirst(rs.getInt("FIRST")); + foo.setSecond(rs.getString("SECOND")); + foo.setThird(rs.getString("THIRD")); - return foo; - }).build(); + return foo; + }) + .build(); ExecutionContext executionContext = new ExecutionContext(); reader.open(executionContext); @@ -143,16 +153,19 @@ class JdbcCursorItemReaderBuilderTests { @Test void testQueryArgumentsArray() throws Exception { JdbcCursorItemReader reader = new JdbcCursorItemReaderBuilder().dataSource(this.dataSource) - .name("fooReader").sql("SELECT * FROM FOO WHERE FIRST > ? ORDER BY FIRST").queryArguments(3) - .rowMapper((rs, rowNum) -> { - Foo foo = new Foo(); + .name("fooReader") + .sql("SELECT * FROM FOO WHERE FIRST > ? ORDER BY FIRST") + .queryArguments(3) + .rowMapper((rs, rowNum) -> { + Foo foo = new Foo(); - foo.setFirst(rs.getInt("FIRST")); - foo.setSecond(rs.getString("SECOND")); - foo.setThird(rs.getString("THIRD")); + foo.setFirst(rs.getInt("FIRST")); + foo.setSecond(rs.getString("SECOND")); + foo.setThird(rs.getString("THIRD")); - return foo; - }).build(); + return foo; + }) + .build(); ExecutionContext executionContext = new ExecutionContext(); reader.open(executionContext); @@ -166,16 +179,19 @@ class JdbcCursorItemReaderBuilderTests { @Test void testQueryArgumentsTypedArray() throws Exception { JdbcCursorItemReader reader = new JdbcCursorItemReaderBuilder().dataSource(this.dataSource) - .name("fooReader").sql("SELECT * FROM FOO WHERE FIRST > ? ORDER BY FIRST") - .queryArguments(new Integer[] { 3 }, new int[] { Types.BIGINT }).rowMapper((rs, rowNum) -> { - Foo foo = new Foo(); + .name("fooReader") + .sql("SELECT * FROM FOO WHERE FIRST > ? ORDER BY FIRST") + .queryArguments(new Integer[] { 3 }, new int[] { Types.BIGINT }) + .rowMapper((rs, rowNum) -> { + Foo foo = new Foo(); - foo.setFirst(rs.getInt("FIRST")); - foo.setSecond(rs.getString("SECOND")); - foo.setThird(rs.getString("THIRD")); + foo.setFirst(rs.getInt("FIRST")); + foo.setSecond(rs.getString("SECOND")); + foo.setThird(rs.getString("THIRD")); - return foo; - }).build(); + return foo; + }) + .build(); ExecutionContext executionContext = new ExecutionContext(); reader.open(executionContext); @@ -189,21 +205,24 @@ class JdbcCursorItemReaderBuilderTests { @Test void testPreparedStatementSetter() throws Exception { JdbcCursorItemReader reader = new JdbcCursorItemReaderBuilder().dataSource(this.dataSource) - .name("fooReader").sql("SELECT * FROM FOO WHERE FIRST > ? ORDER BY FIRST") - .preparedStatementSetter(new PreparedStatementSetter() { - @Override - public void setValues(PreparedStatement ps) throws SQLException { - ps.setInt(1, 3); - } - }).rowMapper((rs, rowNum) -> { - Foo foo = new Foo(); + .name("fooReader") + .sql("SELECT * FROM FOO WHERE FIRST > ? ORDER BY FIRST") + .preparedStatementSetter(new PreparedStatementSetter() { + @Override + public void setValues(PreparedStatement ps) throws SQLException { + ps.setInt(1, 3); + } + }) + .rowMapper((rs, rowNum) -> { + Foo foo = new Foo(); - foo.setFirst(rs.getInt("FIRST")); - foo.setSecond(rs.getString("SECOND")); - foo.setThird(rs.getString("THIRD")); + foo.setFirst(rs.getInt("FIRST")); + foo.setSecond(rs.getString("SECOND")); + foo.setThird(rs.getString("THIRD")); - return foo; - }).build(); + return foo; + }) + .build(); ExecutionContext executionContext = new ExecutionContext(); reader.open(executionContext); @@ -217,15 +236,19 @@ class JdbcCursorItemReaderBuilderTests { @Test void testMaxItemCount() throws Exception { JdbcCursorItemReader reader = new JdbcCursorItemReaderBuilder().dataSource(this.dataSource) - .name("fooReader").sql("SELECT * FROM FOO ORDER BY FIRST").maxItemCount(2).rowMapper((rs, rowNum) -> { - Foo foo = new Foo(); + .name("fooReader") + .sql("SELECT * FROM FOO ORDER BY FIRST") + .maxItemCount(2) + .rowMapper((rs, rowNum) -> { + Foo foo = new Foo(); - foo.setFirst(rs.getInt("FIRST")); - foo.setSecond(rs.getString("SECOND")); - foo.setThird(rs.getString("THIRD")); + foo.setFirst(rs.getInt("FIRST")); + foo.setSecond(rs.getString("SECOND")); + foo.setThird(rs.getString("THIRD")); - return foo; - }).build(); + return foo; + }) + .build(); ExecutionContext executionContext = new ExecutionContext(); reader.open(executionContext); @@ -239,16 +262,19 @@ class JdbcCursorItemReaderBuilderTests { @Test void testCurrentItemCount() throws Exception { JdbcCursorItemReader reader = new JdbcCursorItemReaderBuilder().dataSource(this.dataSource) - .name("fooReader").sql("SELECT * FROM FOO ORDER BY FIRST").currentItemCount(1) - .rowMapper((rs, rowNum) -> { - Foo foo = new Foo(); + .name("fooReader") + .sql("SELECT * FROM FOO ORDER BY FIRST") + .currentItemCount(1) + .rowMapper((rs, rowNum) -> { + Foo foo = new Foo(); - foo.setFirst(rs.getInt("FIRST")); - foo.setSecond(rs.getString("SECOND")); - foo.setThird(rs.getString("THIRD")); + foo.setFirst(rs.getInt("FIRST")); + foo.setSecond(rs.getString("SECOND")); + foo.setThird(rs.getString("THIRD")); - return foo; - }).build(); + return foo; + }) + .build(); ExecutionContext executionContext = new ExecutionContext(); reader.open(executionContext); @@ -262,9 +288,16 @@ class JdbcCursorItemReaderBuilderTests { @Test void testOtherProperties() { JdbcCursorItemReader reader = new JdbcCursorItemReaderBuilder().dataSource(this.dataSource) - .name("fooReader").sql("SELECT * FROM FOO ORDER BY FIRST").fetchSize(1).queryTimeout(2) - .ignoreWarnings(true).driverSupportsAbsolute(true).useSharedExtendedConnection(true) - .connectionAutoCommit(true).beanRowMapper(Foo.class).build(); + .name("fooReader") + .sql("SELECT * FROM FOO ORDER BY FIRST") + .fetchSize(1) + .queryTimeout(2) + .ignoreWarnings(true) + .driverSupportsAbsolute(true) + .useSharedExtendedConnection(true) + .connectionAutoCommit(true) + .beanRowMapper(Foo.class) + .build(); assertEquals(1, ReflectionTestUtils.getField(reader, "fetchSize")); assertEquals(2, ReflectionTestUtils.getField(reader, "queryTimeout")); @@ -276,7 +309,10 @@ class JdbcCursorItemReaderBuilderTests { @Test void testVerifyCursorPositionDefaultToTrue() { JdbcCursorItemReader reader = new JdbcCursorItemReaderBuilder().dataSource(this.dataSource) - .name("fooReader").sql("SELECT * FROM FOO ORDER BY FIRST").beanRowMapper(Foo.class).build(); + .name("fooReader") + .sql("SELECT * FROM FOO ORDER BY FIRST") + .beanRowMapper(Foo.class) + .build(); assertTrue((boolean) ReflectionTestUtils.getField(reader, "verifyCursorPosition")); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JdbcPagingItemReaderBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JdbcPagingItemReaderBuilderTests.java index 034173e7e..78208d68e 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JdbcPagingItemReaderBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JdbcPagingItemReaderBuilderTests.java @@ -76,10 +76,14 @@ class JdbcPagingItemReaderBuilderTests { provider.setFromClause("FOO"); provider.setSortKeys(sortKeys); - JdbcPagingItemReader reader = new JdbcPagingItemReaderBuilder().name("fooReader").currentItemCount(1) - .dataSource(this.dataSource).queryProvider(provider).fetchSize(2).maxItemCount(2) - .rowMapper((rs, rowNum) -> new Foo(rs.getInt(1), rs.getInt(2), rs.getString(3), rs.getString(4))) - .build(); + JdbcPagingItemReader reader = new JdbcPagingItemReaderBuilder().name("fooReader") + .currentItemCount(1) + .dataSource(this.dataSource) + .queryProvider(provider) + .fetchSize(2) + .maxItemCount(2) + .rowMapper((rs, rowNum) -> new Foo(rs.getInt(1), rs.getInt(2), rs.getString(3), rs.getString(4))) + .build(); reader.afterPropertiesSet(); @@ -104,11 +108,15 @@ class JdbcPagingItemReaderBuilderTests { Map sortKeys = new HashMap<>(1); sortKeys.put("ID", Order.DESCENDING); - JdbcPagingItemReader reader = new JdbcPagingItemReaderBuilder().name("fooReader").currentItemCount(1) - .dataSource(this.dataSource).maxItemCount(2).selectClause("SELECT ID, FIRST, SECOND, THIRD") - .fromClause("FOO").sortKeys(sortKeys) - .rowMapper((rs, rowNum) -> new Foo(rs.getInt(1), rs.getInt(2), rs.getString(3), rs.getString(4))) - .build(); + JdbcPagingItemReader reader = new JdbcPagingItemReaderBuilder().name("fooReader") + .currentItemCount(1) + .dataSource(this.dataSource) + .maxItemCount(2) + .selectClause("SELECT ID, FIRST, SECOND, THIRD") + .fromClause("FOO") + .sortKeys(sortKeys) + .rowMapper((rs, rowNum) -> new Foo(rs.getInt(1), rs.getInt(2), rs.getString(3), rs.getString(4))) + .build(); reader.afterPropertiesSet(); @@ -128,10 +136,14 @@ class JdbcPagingItemReaderBuilderTests { sortKeys.put("ID", Order.DESCENDING); JdbcPagingItemReader reader = new JdbcPagingItemReaderBuilder().name("fooReader") - .dataSource(this.dataSource).pageSize(1).maxItemCount(2).selectClause("SELECT ID, FIRST, SECOND, THIRD") - .fromClause("FOO").sortKeys(sortKeys) - .rowMapper((rs, rowNum) -> new Foo(rs.getInt(1), rs.getInt(2), rs.getString(3), rs.getString(4))) - .build(); + .dataSource(this.dataSource) + .pageSize(1) + .maxItemCount(2) + .selectClause("SELECT ID, FIRST, SECOND, THIRD") + .fromClause("FOO") + .sortKeys(sortKeys) + .rowMapper((rs, rowNum) -> new Foo(rs.getInt(1), rs.getInt(2), rs.getString(3), rs.getString(4))) + .build(); reader.afterPropertiesSet(); @@ -157,10 +169,14 @@ class JdbcPagingItemReaderBuilderTests { sortKeys.put("ID", Order.DESCENDING); JdbcPagingItemReader reader = new JdbcPagingItemReaderBuilder().dataSource(this.dataSource) - .pageSize(1).maxItemCount(2).selectClause("SELECT ID, FIRST, SECOND, THIRD").fromClause("FOO") - .sortKeys(sortKeys).saveState(false) - .rowMapper((rs, rowNum) -> new Foo(rs.getInt(1), rs.getInt(2), rs.getString(3), rs.getString(4))) - .build(); + .pageSize(1) + .maxItemCount(2) + .selectClause("SELECT ID, FIRST, SECOND, THIRD") + .fromClause("FOO") + .sortKeys(sortKeys) + .saveState(false) + .rowMapper((rs, rowNum) -> new Foo(rs.getInt(1), rs.getInt(2), rs.getString(3), rs.getString(4))) + .build(); reader.afterPropertiesSet(); @@ -195,11 +211,16 @@ class JdbcPagingItemReaderBuilderTests { parameterValues.put("max", 10); JdbcPagingItemReader reader = new JdbcPagingItemReaderBuilder().name("fooReader") - .dataSource(this.dataSource).pageSize(1).maxItemCount(1).selectClause("SELECT ID, FIRST, SECOND, THIRD") - .fromClause("FOO").whereClause("FIRST > :min AND FIRST < :max").sortKeys(sortKeys) - .parameterValues(parameterValues) - .rowMapper((rs, rowNum) -> new Foo(rs.getInt(1), rs.getInt(2), rs.getString(3), rs.getString(4))) - .build(); + .dataSource(this.dataSource) + .pageSize(1) + .maxItemCount(1) + .selectClause("SELECT ID, FIRST, SECOND, THIRD") + .fromClause("FOO") + .whereClause("FIRST > :min AND FIRST < :max") + .sortKeys(sortKeys) + .parameterValues(parameterValues) + .rowMapper((rs, rowNum) -> new Foo(rs.getInt(1), rs.getInt(2), rs.getString(3), rs.getString(4))) + .build(); reader.afterPropertiesSet(); @@ -218,9 +239,15 @@ class JdbcPagingItemReaderBuilderTests { Map sortKeys = new HashMap<>(1); sortKeys.put("ID", Order.DESCENDING); - JdbcPagingItemReader reader = new JdbcPagingItemReaderBuilder().name("fooReader").currentItemCount(1) - .dataSource(this.dataSource).maxItemCount(2).selectClause("SELECT ID, FIRST, SECOND, THIRD") - .fromClause("FOO").sortKeys(sortKeys).beanRowMapper(Foo.class).build(); + JdbcPagingItemReader reader = new JdbcPagingItemReaderBuilder().name("fooReader") + .currentItemCount(1) + .dataSource(this.dataSource) + .maxItemCount(2) + .selectClause("SELECT ID, FIRST, SECOND, THIRD") + .fromClause("FOO") + .sortKeys(sortKeys) + .beanRowMapper(Foo.class) + .build(); reader.afterPropertiesSet(); @@ -256,13 +283,18 @@ class JdbcPagingItemReaderBuilderTests { exception = assertThrows(IllegalArgumentException.class, builder::build); assertEquals("selectClause is required when not providing a PagingQueryProvider", exception.getMessage()); - builder = new JdbcPagingItemReaderBuilder().name("fooReader").pageSize(2).dataSource(this.dataSource) - .selectClause("SELECT *"); + builder = new JdbcPagingItemReaderBuilder().name("fooReader") + .pageSize(2) + .dataSource(this.dataSource) + .selectClause("SELECT *"); exception = assertThrows(IllegalArgumentException.class, builder::build); assertEquals("fromClause is required when not providing a PagingQueryProvider", exception.getMessage()); - builder = new JdbcPagingItemReaderBuilder().saveState(false).pageSize(2).dataSource(this.dataSource) - .selectClause("SELECT *").fromClause("FOO"); + builder = new JdbcPagingItemReaderBuilder().saveState(false) + .pageSize(2) + .dataSource(this.dataSource) + .selectClause("SELECT *") + .fromClause("FOO"); exception = assertThrows(IllegalArgumentException.class, builder::build); assertEquals("sortKeys are required when not providing a PagingQueryProvider", exception.getMessage()); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JpaCursorItemReaderBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JpaCursorItemReaderBuilderTests.java index 5a8f9aea1..4316085c2 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JpaCursorItemReaderBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JpaCursorItemReaderBuilderTests.java @@ -74,8 +74,11 @@ class JpaCursorItemReaderBuilderTests { @Test void testConfiguration() throws Exception { JpaCursorItemReader reader = new JpaCursorItemReaderBuilder().name("fooReader") - .entityManagerFactory(this.entityManagerFactory).currentItemCount(2).maxItemCount(4) - .queryString("select f from Foo f ").build(); + .entityManagerFactory(this.entityManagerFactory) + .currentItemCount(2) + .maxItemCount(4) + .queryString("select f from Foo f ") + .build(); reader.afterPropertiesSet(); @@ -104,8 +107,11 @@ class JpaCursorItemReaderBuilderTests { parameters.put("value", 2); JpaCursorItemReader reader = new JpaCursorItemReaderBuilder().name("fooReader") - .entityManagerFactory(this.entityManagerFactory).queryString("select f from Foo f where f.id > :value") - .parameterValues(parameters).saveState(false).build(); + .entityManagerFactory(this.entityManagerFactory) + .queryString("select f from Foo f where f.id > :value") + .parameterValues(parameters) + .saveState(false) + .build(); reader.afterPropertiesSet(); @@ -133,7 +139,9 @@ class JpaCursorItemReaderBuilderTests { namedQueryProvider.afterPropertiesSet(); JpaCursorItemReader reader = new JpaCursorItemReaderBuilder().name("fooReader") - .entityManagerFactory(this.entityManagerFactory).queryProvider(namedQueryProvider).build(); + .entityManagerFactory(this.entityManagerFactory) + .queryProvider(namedQueryProvider) + .build(); reader.afterPropertiesSet(); @@ -165,7 +173,9 @@ class JpaCursorItemReaderBuilderTests { provider.afterPropertiesSet(); JpaCursorItemReader reader = new JpaCursorItemReaderBuilder().name("fooReader") - .entityManagerFactory(this.entityManagerFactory).queryProvider(provider).build(); + .entityManagerFactory(this.entityManagerFactory) + .queryProvider(provider) + .build(); reader.afterPropertiesSet(); @@ -195,7 +205,7 @@ class JpaCursorItemReaderBuilderTests { assertEquals("A name is required when saveState is set to true", exception.getMessage()); builder = new JpaCursorItemReaderBuilder().entityManagerFactory(this.entityManagerFactory) - .saveState(false); + .saveState(false); exception = assertThrows(IllegalArgumentException.class, builder::build); assertEquals("Query string is required when queryProvider is null", exception.getMessage()); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JpaItemWriterBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JpaItemWriterBuilderTests.java index 6cd7d4d92..cde0a34ff 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JpaItemWriterBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JpaItemWriterBuilderTests.java @@ -60,7 +60,8 @@ class JpaItemWriterBuilderTests { @Test void testConfiguration() throws Exception { JpaItemWriter itemWriter = new JpaItemWriterBuilder() - .entityManagerFactory(this.entityManagerFactory).build(); + .entityManagerFactory(this.entityManagerFactory) + .build(); itemWriter.afterPropertiesSet(); @@ -82,7 +83,9 @@ class JpaItemWriterBuilderTests { @Test void testPersist() throws Exception { JpaItemWriter itemWriter = new JpaItemWriterBuilder() - .entityManagerFactory(this.entityManagerFactory).usePersist(true).build(); + .entityManagerFactory(this.entityManagerFactory) + .usePersist(true) + .build(); itemWriter.afterPropertiesSet(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JpaPagingItemReaderBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JpaPagingItemReaderBuilderTests.java index da6923b86..35c891d6d 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JpaPagingItemReaderBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/JpaPagingItemReaderBuilderTests.java @@ -77,8 +77,13 @@ class JpaPagingItemReaderBuilderTests { @Test void testConfiguration() throws Exception { JpaPagingItemReader reader = new JpaPagingItemReaderBuilder().name("fooReader") - .entityManagerFactory(this.entityManagerFactory).currentItemCount(2).maxItemCount(4).pageSize(5) - .transacted(false).queryString("select f from Foo f ").build(); + .entityManagerFactory(this.entityManagerFactory) + .currentItemCount(2) + .maxItemCount(4) + .pageSize(5) + .transacted(false) + .queryString("select f from Foo f ") + .build(); reader.afterPropertiesSet(); @@ -109,8 +114,11 @@ class JpaPagingItemReaderBuilderTests { parameters.put("value", 2); JpaPagingItemReader reader = new JpaPagingItemReaderBuilder().name("fooReader") - .entityManagerFactory(this.entityManagerFactory).queryString("select f from Foo f where f.id > :value") - .parameterValues(parameters).saveState(false).build(); + .entityManagerFactory(this.entityManagerFactory) + .queryString("select f from Foo f where f.id > :value") + .parameterValues(parameters) + .saveState(false) + .build(); reader.afterPropertiesSet(); @@ -138,7 +146,9 @@ class JpaPagingItemReaderBuilderTests { namedQueryProvider.afterPropertiesSet(); JpaPagingItemReader reader = new JpaPagingItemReaderBuilder().name("fooReader") - .entityManagerFactory(this.entityManagerFactory).queryProvider(namedQueryProvider).build(); + .entityManagerFactory(this.entityManagerFactory) + .queryProvider(namedQueryProvider) + .build(); reader.afterPropertiesSet(); @@ -170,7 +180,9 @@ class JpaPagingItemReaderBuilderTests { provider.afterPropertiesSet(); JpaPagingItemReader reader = new JpaPagingItemReaderBuilder().name("fooReader") - .entityManagerFactory(this.entityManagerFactory).queryProvider(provider).build(); + .entityManagerFactory(this.entityManagerFactory) + .queryProvider(provider) + .build(); reader.afterPropertiesSet(); @@ -192,7 +204,7 @@ class JpaPagingItemReaderBuilderTests { @Test void testValidation() { var builder = new JpaPagingItemReaderBuilder().entityManagerFactory(this.entityManagerFactory) - .pageSize(-2); + .pageSize(-2); Exception exception = assertThrows(IllegalArgumentException.class, builder::build); assertEquals("pageSize must be greater than zero", exception.getMessage()); @@ -205,7 +217,7 @@ class JpaPagingItemReaderBuilderTests { assertEquals("A name is required when saveState is set to true", exception.getMessage()); builder = new JpaPagingItemReaderBuilder().entityManagerFactory(this.entityManagerFactory) - .saveState(false); + .saveState(false); exception = assertThrows(IllegalArgumentException.class, builder::build); assertEquals("Query string is required when queryProvider is null", exception.getMessage()); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/StoredProcedureItemReaderBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/StoredProcedureItemReaderBuilderTests.java index 860527682..5d0be260d 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/StoredProcedureItemReaderBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/builder/StoredProcedureItemReaderBuilderTests.java @@ -68,8 +68,11 @@ class StoredProcedureItemReaderBuilderTests { @Test void testSunnyScenario() throws Exception { StoredProcedureItemReader reader = new StoredProcedureItemReaderBuilder().name("foo_reader") - .dataSource(this.dataSource).procedureName("read_foos").rowMapper(new FooRowMapper()) - .verifyCursorPosition(false).build(); + .dataSource(this.dataSource) + .procedureName("read_foos") + .rowMapper(new FooRowMapper()) + .verifyCursorPosition(false) + .build(); reader.open(new ExecutionContext()); @@ -88,11 +91,23 @@ class StoredProcedureItemReaderBuilderTests { SqlParameter[] parameters = new SqlParameter[0]; StoredProcedureItemReader reader = new StoredProcedureItemReaderBuilder().name("foo_reader") - .dataSource(this.dataSource).procedureName("read_foos").rowMapper(new FooRowMapper()) - .verifyCursorPosition(false).refCursorPosition(3).useSharedExtendedConnection(true) - .preparedStatementSetter(preparedStatementSetter).parameters(parameters).function().fetchSize(5) - .driverSupportsAbsolute(true).currentItemCount(6).ignoreWarnings(false).maxItemCount(7).queryTimeout(8) - .maxRows(9).build(); + .dataSource(this.dataSource) + .procedureName("read_foos") + .rowMapper(new FooRowMapper()) + .verifyCursorPosition(false) + .refCursorPosition(3) + .useSharedExtendedConnection(true) + .preparedStatementSetter(preparedStatementSetter) + .parameters(parameters) + .function() + .fetchSize(5) + .driverSupportsAbsolute(true) + .currentItemCount(6) + .ignoreWarnings(false) + .maxItemCount(7) + .queryTimeout(8) + .maxRows(9) + .build(); assertEquals(3, ReflectionTestUtils.getField(reader, "refCursorPosition")); assertEquals(preparedStatementSetter, ReflectionTestUtils.getField(reader, "preparedStatementSetter")); @@ -111,8 +126,11 @@ class StoredProcedureItemReaderBuilderTests { @Test void testNoSaveState() throws Exception { StoredProcedureItemReader reader = new StoredProcedureItemReaderBuilder().dataSource(this.dataSource) - .procedureName("read_foos").rowMapper(new FooRowMapper()).verifyCursorPosition(false).saveState(false) - .build(); + .procedureName("read_foos") + .rowMapper(new FooRowMapper()) + .verifyCursorPosition(false) + .saveState(false) + .build(); ExecutionContext executionContext = new ExecutionContext(); reader.open(executionContext); @@ -141,8 +159,9 @@ class StoredProcedureItemReaderBuilderTests { exception = assertThrows(IllegalArgumentException.class, builder::build); assertEquals("A datasource is required", exception.getMessage()); - builder = new StoredProcedureItemReaderBuilder().saveState(false).procedureName("read_foos") - .dataSource(this.dataSource); + builder = new StoredProcedureItemReaderBuilder().saveState(false) + .procedureName("read_foos") + .dataSource(this.dataSource); exception = assertThrows(IllegalArgumentException.class, builder::build); assertEquals("A rowmapper is required", exception.getMessage()); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/FlatFileItemReaderBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/FlatFileItemReaderBuilderTests.java index f608d3787..ab970fea0 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/FlatFileItemReaderBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/FlatFileItemReaderBuilderTests.java @@ -60,8 +60,12 @@ class FlatFileItemReaderBuilderTests { @Test void testSimpleFixedLength() throws Exception { FlatFileItemReader reader = new FlatFileItemReaderBuilder().name("fooReader") - .resource(getResource("1 2 3")).fixedLength().columns(new Range(1, 3), new Range(4, 6), new Range(7)) - .names("first", "second", "third").targetType(Foo.class).build(); + .resource(getResource("1 2 3")) + .fixedLength() + .columns(new Range(1, 3), new Range(4, 6), new Range(7)) + .names("first", "second", "third") + .targetType(Foo.class) + .build(); reader.open(new ExecutionContext()); Foo item = reader.read(); @@ -74,8 +78,11 @@ class FlatFileItemReaderBuilderTests { @Test void testSimpleDelimited() throws Exception { FlatFileItemReader reader = new FlatFileItemReaderBuilder().name("fooReader") - .resource(getResource("1,2,3")).delimited().names("first", "second", "third").targetType(Foo.class) - .build(); + .resource(getResource("1,2,3")) + .delimited() + .names("first", "second", "third") + .targetType(Foo.class) + .build(); reader.open(new ExecutionContext()); Foo item = reader.read(); @@ -88,8 +95,12 @@ class FlatFileItemReaderBuilderTests { @Test void testSimpleDelimitedWithWhitespaceCharacter() throws Exception { FlatFileItemReader reader = new FlatFileItemReaderBuilder().name("fooReader") - .resource(getResource("1 2 3")).delimited().delimiter(" ").names("first", "second", "third") - .targetType(Foo.class).build(); + .resource(getResource("1 2 3")) + .delimited() + .delimiter(" ") + .names("first", "second", "third") + .targetType(Foo.class) + .build(); reader.open(new ExecutionContext()); Foo item = reader.read(); @@ -102,8 +113,12 @@ class FlatFileItemReaderBuilderTests { @Test void testSimpleDelimitedWithTabCharacter() throws Exception { FlatFileItemReader reader = new FlatFileItemReaderBuilder().name("fooReader") - .resource(getResource("1\t2\t3")).delimited().delimiter(DelimitedLineTokenizer.DELIMITER_TAB) - .names("first", "second", "third").targetType(Foo.class).build(); + .resource(getResource("1\t2\t3")) + .delimited() + .delimiter(DelimitedLineTokenizer.DELIMITER_TAB) + .names("first", "second", "third") + .targetType(Foo.class) + .build(); reader.open(new ExecutionContext()); Foo item = reader.read(); @@ -118,9 +133,15 @@ class FlatFileItemReaderBuilderTests { final List skippedLines = new ArrayList<>(); FlatFileItemReader reader = new FlatFileItemReaderBuilder().name("fooReader") - .resource(getResource("1,2,3\n4,5,$1,2,3$\n@this is a comment\n6,7, 8")).delimited().quoteCharacter('$') - .names("first", "second", "third").targetType(Foo.class).linesToSkip(1) - .skippedLinesCallback(skippedLines::add).addComment("@").build(); + .resource(getResource("1,2,3\n4,5,$1,2,3$\n@this is a comment\n6,7, 8")) + .delimited() + .quoteCharacter('$') + .names("first", "second", "third") + .targetType(Foo.class) + .linesToSkip(1) + .skippedLinesCallback(skippedLines::add) + .addComment("@") + .build(); ExecutionContext executionContext = new ExecutionContext(); reader.open(executionContext); @@ -148,12 +169,17 @@ class FlatFileItemReaderBuilderTests { @Test void testAdvancedFixedLength() throws Exception { FlatFileItemReader reader = new FlatFileItemReaderBuilder().name("fooReader") - .resource(getResource("1 2%\n 3\n4 5%\n 6\n@this is a comment\n7 8%\n 9\n")).fixedLength() - .columns(new Range(1, 2), new Range(3, 5), new Range(6)).names("first", "second", "third") - .targetType(Foo.class).recordSeparatorPolicy(new DefaultRecordSeparatorPolicy("\"", "%")) - .bufferedReaderFactory((resource, - encoding) -> new LineNumberReader(new InputStreamReader(resource.getInputStream(), encoding))) - .maxItemCount(2).saveState(false).build(); + .resource(getResource("1 2%\n 3\n4 5%\n 6\n@this is a comment\n7 8%\n 9\n")) + .fixedLength() + .columns(new Range(1, 2), new Range(3, 5), new Range(6)) + .names("first", "second", "third") + .targetType(Foo.class) + .recordSeparatorPolicy(new DefaultRecordSeparatorPolicy("\"", "%")) + .bufferedReaderFactory((resource, + encoding) -> new LineNumberReader(new InputStreamReader(resource.getInputStream(), encoding))) + .maxItemCount(2) + .saveState(false) + .build(); ExecutionContext executionContext = new ExecutionContext(); @@ -177,8 +203,12 @@ class FlatFileItemReaderBuilderTests { @Test void testStrict() throws Exception { FlatFileItemReader reader = new FlatFileItemReaderBuilder().name("fooReader") - .resource(new FileSystemResource("this/file/does/not/exist")).delimited() - .names("first", "second", "third").targetType(Foo.class).strict(false).build(); + .resource(new FileSystemResource("this/file/does/not/exist")) + .delimited() + .names("first", "second", "third") + .targetType(Foo.class) + .strict(false) + .build(); reader.open(new ExecutionContext()); @@ -188,16 +218,18 @@ class FlatFileItemReaderBuilderTests { @Test void testCustomLineTokenizerFieldSetMapper() throws Exception { FlatFileItemReader reader = new FlatFileItemReaderBuilder().name("fooReader") - .resource(getResource("|1|&|2|&| 3|\n|4|&|5|&|foo|")) - .lineTokenizer(line -> new DefaultFieldSet(line.split("&"))).fieldSetMapper(fieldSet -> { - Foo item = new Foo(); + .resource(getResource("|1|&|2|&| 3|\n|4|&|5|&|foo|")) + .lineTokenizer(line -> new DefaultFieldSet(line.split("&"))) + .fieldSetMapper(fieldSet -> { + Foo item = new Foo(); - item.setFirst(Integer.valueOf(fieldSet.readString(0).replaceAll("\\|", ""))); - item.setSecond(Integer.valueOf(fieldSet.readString(1).replaceAll("\\|", ""))); - item.setThird(fieldSet.readString(2).replaceAll("\\|", "")); + item.setFirst(Integer.valueOf(fieldSet.readString(0).replaceAll("\\|", ""))); + item.setSecond(Integer.valueOf(fieldSet.readString(1).replaceAll("\\|", ""))); + item.setThird(fieldSet.readString(2).replaceAll("\\|", "")); - return item; - }).build(); + return item; + }) + .build(); reader.open(new ExecutionContext()); Foo item = reader.read(); @@ -218,8 +250,12 @@ class FlatFileItemReaderBuilderTests { @Test void testComments() throws Exception { FlatFileItemReader reader = new FlatFileItemReaderBuilder().name("fooReader") - .resource(getResource("1,2,3\n@this is a comment\n+so is this\n4,5,6")).comments("@", "+").delimited() - .names("first", "second", "third").targetType(Foo.class).build(); + .resource(getResource("1,2,3\n@this is a comment\n+so is this\n4,5,6")) + .comments("@", "+") + .delimited() + .names("first", "second", "third") + .targetType(Foo.class) + .build(); reader.open(new ExecutionContext()); Foo item = reader.read(); @@ -236,8 +272,12 @@ class FlatFileItemReaderBuilderTests { @Test void testEmptyComments() throws Exception { FlatFileItemReader reader = new FlatFileItemReaderBuilder().name("fooReader") - .resource(getResource("1,2,3\n4,5,6")).comments(new String[] {}).delimited() - .names("first", "second", "third").targetType(Foo.class).build(); + .resource(getResource("1,2,3\n4,5,6")) + .comments(new String[] {}) + .delimited() + .names("first", "second", "third") + .targetType(Foo.class) + .build(); reader.open(new ExecutionContext()); Foo item = reader.read(); @@ -254,8 +294,11 @@ class FlatFileItemReaderBuilderTests { @Test void testDefaultComments() throws Exception { FlatFileItemReader reader = new FlatFileItemReaderBuilder().name("fooReader") - .resource(getResource("1,2,3\n4,5,6\n#this is a default comment")).delimited() - .names("first", "second", "third").targetType(Foo.class).build(); + .resource(getResource("1,2,3\n4,5,6\n#this is a default comment")) + .delimited() + .names("first", "second", "third") + .targetType(Foo.class) + .build(); reader.open(new ExecutionContext()); Foo item = reader.read(); @@ -274,8 +317,12 @@ class FlatFileItemReaderBuilderTests { BeanFactory factory = new AnnotationConfigApplicationContext(Beans.class); FlatFileItemReader reader = new FlatFileItemReaderBuilder().name("fooReader") - .resource(getResource("1,2,3")).delimited().names("first", "second", "third").prototypeBeanName("foo") - .beanFactory(factory).build(); + .resource(getResource("1,2,3")) + .delimited() + .names("first", "second", "third") + .prototypeBeanName("foo") + .beanFactory(factory) + .build(); reader.open(new ExecutionContext()); Foo item = reader.read(); @@ -288,8 +335,12 @@ class FlatFileItemReaderBuilderTests { @Test void testBeanWrapperFieldSetMapperStrict() throws Exception { FlatFileItemReader reader = new FlatFileItemReaderBuilder().name("fooReader") - .resource(getResource("1,2,3")).delimited().names("setFirst", "setSecond", "setThird") - .targetType(Foo.class).beanMapperStrict(true).build(); + .resource(getResource("1,2,3")) + .delimited() + .names("setFirst", "setSecond", "setThird") + .targetType(Foo.class) + .beanMapperStrict(true) + .build(); reader.open(new ExecutionContext()); Foo item = reader.read(); @@ -302,8 +353,13 @@ class FlatFileItemReaderBuilderTests { @Test void testDelimitedIncludedFields() throws Exception { FlatFileItemReader reader = new FlatFileItemReaderBuilder().name("fooReader") - .resource(getResource("1,2,3")).delimited().includedFields(0, 2).addIncludedField(1) - .names("first", "second", "third").targetType(Foo.class).build(); + .resource(getResource("1,2,3")) + .delimited() + .includedFields(0, 2) + .addIncludedField(1) + .names("first", "second", "third") + .targetType(Foo.class) + .build(); reader.open(new ExecutionContext()); Foo item = reader.read(); @@ -318,19 +374,24 @@ class FlatFileItemReaderBuilderTests { String[] names = { "first", "second", "third" }; FlatFileItemReader reader = new FlatFileItemReaderBuilder().name("fooReader") - .resource(getResource("1,2,3")).delimited().fieldSetFactory(new FieldSetFactory() { - private FieldSet fieldSet = new DefaultFieldSet(new String[] { "1", "3", "foo" }, names); + .resource(getResource("1,2,3")) + .delimited() + .fieldSetFactory(new FieldSetFactory() { + private FieldSet fieldSet = new DefaultFieldSet(new String[] { "1", "3", "foo" }, names); - @Override - public FieldSet create(String[] values, String[] names) { - return fieldSet; - } + @Override + public FieldSet create(String[] values, String[] names) { + return fieldSet; + } - @Override - public FieldSet create(String[] values) { - return fieldSet; - } - }).names(names).targetType(Foo.class).build(); + @Override + public FieldSet create(String[] values) { + return fieldSet; + } + }) + .names(names) + .targetType(Foo.class) + .build(); reader.open(new ExecutionContext()); Foo item = reader.read(); @@ -345,20 +406,25 @@ class FlatFileItemReaderBuilderTests { String[] names = { "first", "second", "third" }; FlatFileItemReader reader = new FlatFileItemReaderBuilder().name("fooReader") - .resource(getResource("1 2 3")).fixedLength().fieldSetFactory(new FieldSetFactory() { - private FieldSet fieldSet = new DefaultFieldSet(new String[] { "1", "3", "foo" }, names); + .resource(getResource("1 2 3")) + .fixedLength() + .fieldSetFactory(new FieldSetFactory() { + private FieldSet fieldSet = new DefaultFieldSet(new String[] { "1", "3", "foo" }, names); - @Override - public FieldSet create(String[] values, String[] names) { - return fieldSet; - } + @Override + public FieldSet create(String[] values, String[] names) { + return fieldSet; + } - @Override - public FieldSet create(String[] values) { - return fieldSet; - } - }).columns(new Range(1, 3), new Range(4, 6), new Range(7)).names("first", "second", "third") - .targetType(Foo.class).build(); + @Override + public FieldSet create(String[] values) { + return fieldSet; + } + }) + .columns(new Range(1, 3), new Range(4, 6), new Range(7)) + .names("first", "second", "third") + .targetType(Foo.class) + .build(); reader.open(new ExecutionContext()); Foo item = reader.read(); @@ -370,29 +436,38 @@ class FlatFileItemReaderBuilderTests { @Test void testName() { - var builder = new FlatFileItemReaderBuilder().resource(getResource("1 2 3")).fixedLength() - .columns(new Range(1, 3), new Range(4, 6), new Range(7)).names("first", "second", "third") - .targetType(Foo.class); + var builder = new FlatFileItemReaderBuilder().resource(getResource("1 2 3")) + .fixedLength() + .columns(new Range(1, 3), new Range(4, 6), new Range(7)) + .names("first", "second", "third") + .targetType(Foo.class); Exception exception = assertThrows(IllegalStateException.class, builder::build); assertEquals("A name is required when saveState is set to true.", exception.getMessage()); - builder = new FlatFileItemReaderBuilder().resource(getResource("1 2 3")).fixedLength() - .columns(new Range(1, 3), new Range(4, 6), new Range(7)).names("first", "second", "third") - .targetType(Foo.class).name(null); + builder = new FlatFileItemReaderBuilder().resource(getResource("1 2 3")) + .fixedLength() + .columns(new Range(1, 3), new Range(4, 6), new Range(7)) + .names("first", "second", "third") + .targetType(Foo.class) + .name(null); exception = assertThrows(IllegalStateException.class, builder::build); assertEquals("A name is required when saveState is set to true.", exception.getMessage()); - assertNotNull( - new FlatFileItemReaderBuilder().resource(getResource("1 2 3")).fixedLength() - .columns(new Range(1, 3), new Range(4, 6), new Range(7)).names("first", "second", "third") - .targetType(Foo.class).saveState(false).build(), - "builder should return new instance of FlatFileItemReader"); + assertNotNull(new FlatFileItemReaderBuilder().resource(getResource("1 2 3")) + .fixedLength() + .columns(new Range(1, 3), new Range(4, 6), new Range(7)) + .names("first", "second", "third") + .targetType(Foo.class) + .saveState(false) + .build(), "builder should return new instance of FlatFileItemReader"); - assertNotNull( - new FlatFileItemReaderBuilder().resource(getResource("1 2 3")).fixedLength() - .columns(new Range(1, 3), new Range(4, 6), new Range(7)).names("first", "second", "third") - .targetType(Foo.class).name("foobar").build(), - "builder should return new instance of FlatFileItemReader"); + assertNotNull(new FlatFileItemReaderBuilder().resource(getResource("1 2 3")) + .fixedLength() + .columns(new Range(1, 3), new Range(4, 6), new Range(7)) + .names("first", "second", "third") + .targetType(Foo.class) + .name("foobar") + .build(), "builder should return new instance of FlatFileItemReader"); } @@ -400,8 +475,11 @@ class FlatFileItemReaderBuilderTests { void testDefaultEncoding() { String encoding = FlatFileItemReader.DEFAULT_CHARSET; FlatFileItemReader reader = new FlatFileItemReaderBuilder().name("fooReader") - .resource(getResource("1,2,3")).delimited().names("first", "second", "third").targetType(Foo.class) - .build(); + .resource(getResource("1,2,3")) + .delimited() + .names("first", "second", "third") + .targetType(Foo.class) + .build(); assertEquals(encoding, ReflectionTestUtils.getField(reader, "encoding")); } @@ -410,17 +488,22 @@ class FlatFileItemReaderBuilderTests { void testCustomEncoding() { String encoding = "UTF-8"; FlatFileItemReader reader = new FlatFileItemReaderBuilder().name("fooReader") - .resource(getResource("1 2 3")).encoding(encoding).fixedLength() - .columns(new Range(1, 3), new Range(4, 6), new Range(7)).names("first", "second", "third") - .targetType(Foo.class).build(); + .resource(getResource("1 2 3")) + .encoding(encoding) + .fixedLength() + .columns(new Range(1, 3), new Range(4, 6), new Range(7)) + .names("first", "second", "third") + .targetType(Foo.class) + .build(); assertEquals(encoding, ReflectionTestUtils.getField(reader, "encoding")); } @Test void testErrorMessageWhenNoFieldSetMapperIsProvided() { - var builder = new FlatFileItemReaderBuilder().name("fooReader").resource(getResource("1;2;3")) - .lineTokenizer(line -> new DefaultFieldSet(line.split(";"))); + var builder = new FlatFileItemReaderBuilder().name("fooReader") + .resource(getResource("1;2;3")) + .lineTokenizer(line -> new DefaultFieldSet(line.split(";"))); Exception exception = assertThrows(IllegalStateException.class, builder::build); String message = exception.getMessage(); if (message.equals("No LineTokenizer implementation was provided.")) { @@ -449,7 +532,11 @@ class FlatFileItemReaderBuilderTests { // when FlatFileItemReader reader = new FlatFileItemReaderBuilder().name("personReader") - .resource(getResource("1,foo")).targetType(Person.class).delimited().names("id", "name").build(); + .resource(getResource("1,foo")) + .targetType(Person.class) + .delimited() + .names("id", "name") + .build(); // then Object lineMapper = ReflectionTestUtils.getField(reader, "lineMapper"); @@ -473,7 +560,11 @@ class FlatFileItemReaderBuilderTests { // when FlatFileItemReader reader = new FlatFileItemReaderBuilder().name("personReader") - .resource(getResource("1,foo")).targetType(Person.class).delimited().names("id", "name").build(); + .resource(getResource("1,foo")) + .targetType(Person.class) + .delimited() + .names("id", "name") + .build(); // then Object lineMapper = ReflectionTestUtils.getField(reader, "lineMapper"); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/FlatFileItemWriterBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/FlatFileItemWriterBuilderTests.java index c29c18ba4..1f94531a7 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/FlatFileItemWriterBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/FlatFileItemWriterBuilderTests.java @@ -64,8 +64,13 @@ class FlatFileItemWriterBuilderTests { WritableResource output = new FileSystemResource(File.createTempFile("foo", "txt")); FlatFileItemWriterBuilder builder = new FlatFileItemWriterBuilder().name("itemWriter") - .resource(output).delimited().delimiter(";").names("foo", "bar").formatted().format("%2s%2s") - .names("foo", "bar"); + .resource(output) + .delimited() + .delimiter(";") + .names("foo", "bar") + .formatted() + .format("%2s%2s") + .names("foo", "bar"); assertThrows(IllegalStateException.class, builder::build); } @@ -74,10 +79,14 @@ class FlatFileItemWriterBuilderTests { WritableResource output = new FileSystemResource(File.createTempFile("foo", "txt")); - FlatFileItemWriter writer = new FlatFileItemWriterBuilder().name("foo").resource(output) - .lineSeparator("$").lineAggregator(new PassThroughLineAggregator<>()).encoding("UTF-16LE") - .headerCallback(writer1 -> writer1.append("HEADER")) - .footerCallback(writer12 -> writer12.append("FOOTER")).build(); + FlatFileItemWriter writer = new FlatFileItemWriterBuilder().name("foo") + .resource(output) + .lineSeparator("$") + .lineAggregator(new PassThroughLineAggregator<>()) + .encoding("UTF-16LE") + .headerCallback(writer1 -> writer1.append("HEADER")) + .footerCallback(writer12 -> writer12.append("FOOTER")) + .build(); ExecutionContext executionContext = new ExecutionContext(); @@ -96,10 +105,15 @@ class FlatFileItemWriterBuilderTests { WritableResource output = new FileSystemResource(File.createTempFile("foo", "txt")); - FlatFileItemWriter writer = new FlatFileItemWriterBuilder().name("foo").resource(output) - .lineSeparator("$").delimited().names("first", "second", "third").encoding("UTF-16LE") - .headerCallback(writer1 -> writer1.append("HEADER")) - .footerCallback(writer12 -> writer12.append("FOOTER")).build(); + FlatFileItemWriter writer = new FlatFileItemWriterBuilder().name("foo") + .resource(output) + .lineSeparator("$") + .delimited() + .names("first", "second", "third") + .encoding("UTF-16LE") + .headerCallback(writer1 -> writer1.append("HEADER")) + .footerCallback(writer12 -> writer12.append("FOOTER")) + .build(); ExecutionContext executionContext = new ExecutionContext(); @@ -117,10 +131,16 @@ class FlatFileItemWriterBuilderTests { WritableResource output = new FileSystemResource(File.createTempFile("foo", "txt")); - FlatFileItemWriter writer = new FlatFileItemWriterBuilder().name("foo").resource(output) - .lineSeparator("$").delimited().delimiter("").names("first", "second", "third").encoding("UTF-16LE") - .headerCallback(writer1 -> writer1.append("HEADER")) - .footerCallback(writer12 -> writer12.append("FOOTER")).build(); + FlatFileItemWriter writer = new FlatFileItemWriterBuilder().name("foo") + .resource(output) + .lineSeparator("$") + .delimited() + .delimiter("") + .names("first", "second", "third") + .encoding("UTF-16LE") + .headerCallback(writer1 -> writer1.append("HEADER")) + .footerCallback(writer12 -> writer12.append("FOOTER")) + .build(); ExecutionContext executionContext = new ExecutionContext(); @@ -138,10 +158,16 @@ class FlatFileItemWriterBuilderTests { WritableResource output = new FileSystemResource(File.createTempFile("foo", "txt")); - FlatFileItemWriter writer = new FlatFileItemWriterBuilder().name("foo").resource(output) - .lineSeparator("$").delimited().delimiter(";").names("first", "second", "third").encoding("UTF-16LE") - .headerCallback(writer1 -> writer1.append("HEADER")) - .footerCallback(writer12 -> writer12.append("FOOTER")).build(); + FlatFileItemWriter writer = new FlatFileItemWriterBuilder().name("foo") + .resource(output) + .lineSeparator("$") + .delimited() + .delimiter(";") + .names("first", "second", "third") + .encoding("UTF-16LE") + .headerCallback(writer1 -> writer1.append("HEADER")) + .footerCallback(writer12 -> writer12.append("FOOTER")) + .build(); ExecutionContext executionContext = new ExecutionContext(); @@ -159,11 +185,16 @@ class FlatFileItemWriterBuilderTests { WritableResource output = new FileSystemResource(File.createTempFile("foo", "txt")); - FlatFileItemWriter writer = new FlatFileItemWriterBuilder().name("foo").resource(output) - .lineSeparator("$").delimited().delimiter(" ") - .fieldExtractor(item -> new Object[] { item.getFirst(), item.getThird() }).encoding("UTF-16LE") - .headerCallback(writer1 -> writer1.append("HEADER")) - .footerCallback(writer12 -> writer12.append("FOOTER")).build(); + FlatFileItemWriter writer = new FlatFileItemWriterBuilder().name("foo") + .resource(output) + .lineSeparator("$") + .delimited() + .delimiter(" ") + .fieldExtractor(item -> new Object[] { item.getFirst(), item.getThird() }) + .encoding("UTF-16LE") + .headerCallback(writer1 -> writer1.append("HEADER")) + .footerCallback(writer12 -> writer12.append("FOOTER")) + .build(); ExecutionContext executionContext = new ExecutionContext(); @@ -181,10 +212,16 @@ class FlatFileItemWriterBuilderTests { WritableResource output = new FileSystemResource(File.createTempFile("foo", "txt")); - FlatFileItemWriter writer = new FlatFileItemWriterBuilder().name("foo").resource(output) - .lineSeparator("$").formatted().format("%2s%2s%2s").names("first", "second", "third") - .encoding("UTF-16LE").headerCallback(writer1 -> writer1.append("HEADER")) - .footerCallback(writer12 -> writer12.append("FOOTER")).build(); + FlatFileItemWriter writer = new FlatFileItemWriterBuilder().name("foo") + .resource(output) + .lineSeparator("$") + .formatted() + .format("%2s%2s%2s") + .names("first", "second", "third") + .encoding("UTF-16LE") + .headerCallback(writer1 -> writer1.append("HEADER")) + .footerCallback(writer12 -> writer12.append("FOOTER")) + .build(); ExecutionContext executionContext = new ExecutionContext(); @@ -202,11 +239,16 @@ class FlatFileItemWriterBuilderTests { WritableResource output = new FileSystemResource(File.createTempFile("foo", "txt")); - FlatFileItemWriter writer = new FlatFileItemWriterBuilder().name("foo").resource(output) - .lineSeparator("$").formatted().format("%3s%3s") - .fieldExtractor(item -> new Object[] { item.getFirst(), item.getThird() }).encoding("UTF-16LE") - .headerCallback(writer1 -> writer1.append("HEADER")) - .footerCallback(writer12 -> writer12.append("FOOTER")).build(); + FlatFileItemWriter writer = new FlatFileItemWriterBuilder().name("foo") + .resource(output) + .lineSeparator("$") + .formatted() + .format("%3s%3s") + .fieldExtractor(item -> new Object[] { item.getFirst(), item.getThird() }) + .encoding("UTF-16LE") + .headerCallback(writer1 -> writer1.append("HEADER")) + .footerCallback(writer12 -> writer12.append("FOOTER")) + .build(); ExecutionContext executionContext = new ExecutionContext(); @@ -226,9 +268,16 @@ class FlatFileItemWriterBuilderTests { String encoding = Charset.defaultCharset().name(); - FlatFileItemWriter writer = new FlatFileItemWriterBuilder().name("foo").resource(output) - .shouldDeleteIfEmpty(true).shouldDeleteIfExists(false).saveState(false).forceSync(true).append(true) - .transactional(false).lineAggregator(new PassThroughLineAggregator<>()).build(); + FlatFileItemWriter writer = new FlatFileItemWriterBuilder().name("foo") + .resource(output) + .shouldDeleteIfEmpty(true) + .shouldDeleteIfExists(false) + .saveState(false) + .forceSync(true) + .append(true) + .transactional(false) + .lineAggregator(new PassThroughLineAggregator<>()) + .build(); validateBuilderFlags(writer, encoding); } @@ -238,9 +287,17 @@ class FlatFileItemWriterBuilderTests { WritableResource output = new FileSystemResource(File.createTempFile("foo", "txt")); String encoding = "UTF-8"; - FlatFileItemWriter writer = new FlatFileItemWriterBuilder().name("foo").encoding(encoding) - .resource(output).shouldDeleteIfEmpty(true).shouldDeleteIfExists(false).saveState(false).forceSync(true) - .append(true).transactional(false).lineAggregator(new PassThroughLineAggregator<>()).build(); + FlatFileItemWriter writer = new FlatFileItemWriterBuilder().name("foo") + .encoding(encoding) + .resource(output) + .shouldDeleteIfEmpty(true) + .shouldDeleteIfExists(false) + .saveState(false) + .forceSync(true) + .append(true) + .transactional(false) + .lineAggregator(new PassThroughLineAggregator<>()) + .build(); validateBuilderFlags(writer, encoding); } @@ -253,7 +310,11 @@ class FlatFileItemWriterBuilderTests { // when FlatFileItemWriter writer = new FlatFileItemWriterBuilder().name("personWriter") - .resource(output).delimited().sourceType(Person.class).names("id", "name").build(); + .resource(output) + .delimited() + .sourceType(Person.class) + .names("id", "name") + .build(); // then Object lineAggregator = ReflectionTestUtils.getField(writer, "lineAggregator"); @@ -278,7 +339,11 @@ class FlatFileItemWriterBuilderTests { // when FlatFileItemWriter writer = new FlatFileItemWriterBuilder().name("personWriter") - .resource(output).delimited().sourceType(Person.class).names("id", "name").build(); + .resource(output) + .delimited() + .sourceType(Person.class) + .names("id", "name") + .build(); // then Object lineAggregator = ReflectionTestUtils.getField(writer, "lineAggregator"); @@ -295,8 +360,11 @@ class FlatFileItemWriterBuilderTests { WritableResource output = new FileSystemResource(File.createTempFile("foo", "txt")); // when - FlatFileItemWriter writer = new FlatFileItemWriterBuilder<>().name("personWriter").resource(output).delimited() - .names("id", "name").build(); + FlatFileItemWriter writer = new FlatFileItemWriterBuilder<>().name("personWriter") + .resource(output) + .delimited() + .names("id", "name") + .build(); // then Object lineAggregator = ReflectionTestUtils.getField(writer, "lineAggregator"); @@ -316,7 +384,12 @@ class FlatFileItemWriterBuilderTests { // when FlatFileItemWriter writer = new FlatFileItemWriterBuilder().name("personWriter") - .resource(output).formatted().format("%2s%2s").sourceType(Person.class).names("id", "name").build(); + .resource(output) + .formatted() + .format("%2s%2s") + .sourceType(Person.class) + .names("id", "name") + .build(); // then Object lineAggregator = ReflectionTestUtils.getField(writer, "lineAggregator"); @@ -341,7 +414,12 @@ class FlatFileItemWriterBuilderTests { // when FlatFileItemWriter writer = new FlatFileItemWriterBuilder().name("personWriter") - .resource(output).formatted().format("%2s%2s").sourceType(Person.class).names("id", "name").build(); + .resource(output) + .formatted() + .format("%2s%2s") + .sourceType(Person.class) + .names("id", "name") + .build(); // then Object lineAggregator = ReflectionTestUtils.getField(writer, "lineAggregator"); @@ -358,8 +436,12 @@ class FlatFileItemWriterBuilderTests { WritableResource output = new FileSystemResource(File.createTempFile("foo", "txt")); // when - FlatFileItemWriter writer = new FlatFileItemWriterBuilder<>().name("personWriter").resource(output).formatted() - .format("%2s%2s").names("id", "name").build(); + FlatFileItemWriter writer = new FlatFileItemWriterBuilder<>().name("personWriter") + .resource(output) + .formatted() + .format("%2s%2s") + .names("id", "name") + .build(); // then Object lineAggregator = ReflectionTestUtils.getField(writer, "lineAggregator"); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/MultiResourceItemReaderBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/MultiResourceItemReaderBuilderTests.java index e27f6a101..c6fdca043 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/MultiResourceItemReaderBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/MultiResourceItemReaderBuilderTests.java @@ -59,8 +59,11 @@ class MultiResourceItemReaderBuilderTests extends AbstractItemStreamItemReaderTe return 0; // preserve original ordering }; return new MultiResourceItemReaderBuilder().delegate(fileReader) - .resources(new Resource[] { r1, r2, r3, r4 }).saveState(true).comparator(comparator).name("FOO") - .build(); + .resources(new Resource[] { r1, r2, r3, r4 }) + .saveState(true) + .comparator(comparator) + .name("FOO") + .build(); } @Test diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/MultiResourceItemWriterBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/MultiResourceItemWriterBuilderTests.java index beaf168e4..882013557 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/MultiResourceItemWriterBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/MultiResourceItemWriterBuilderTests.java @@ -78,8 +78,12 @@ class MultiResourceItemWriterBuilderTests { void testBasicMultiResourceWriteScenario() throws Exception { this.writer = new MultiResourceItemWriterBuilder().delegate(this.delegate) - .resource(new FileSystemResource(this.file)).resourceSuffixCreator(this.suffixCreator) - .itemCountLimitPerResource(2).saveState(true).name("foo").build(); + .resource(new FileSystemResource(this.file)) + .resourceSuffixCreator(this.suffixCreator) + .itemCountLimitPerResource(2) + .saveState(true) + .name("foo") + .build(); this.writer.open(this.executionContext); @@ -108,8 +112,11 @@ class MultiResourceItemWriterBuilderTests { SimpleResourceSuffixCreator simpleResourceSuffixCreator = new SimpleResourceSuffixCreator(); this.writer = new MultiResourceItemWriterBuilder().delegate(this.delegate) - .resource(new FileSystemResource(this.file)).itemCountLimitPerResource(2).saveState(true).name("foo") - .build(); + .resource(new FileSystemResource(this.file)) + .itemCountLimitPerResource(2) + .saveState(true) + .name("foo") + .build(); this.writer.open(this.executionContext); @@ -129,8 +136,12 @@ class MultiResourceItemWriterBuilderTests { void testUpdateAfterDelegateClose() throws Exception { this.writer = new MultiResourceItemWriterBuilder().delegate(this.delegate) - .resource(new FileSystemResource(this.file)).resourceSuffixCreator(this.suffixCreator) - .itemCountLimitPerResource(2).saveState(true).name("foo").build(); + .resource(new FileSystemResource(this.file)) + .resourceSuffixCreator(this.suffixCreator) + .itemCountLimitPerResource(2) + .saveState(true) + .name("foo") + .build(); this.writer.update(this.executionContext); assertEquals(0, this.executionContext.getInt(this.writer.getExecutionContextKey("resource.item.count"))); @@ -145,8 +156,12 @@ class MultiResourceItemWriterBuilderTests { void testRestart() throws Exception { this.writer = new MultiResourceItemWriterBuilder().delegate(this.delegate) - .resource(new FileSystemResource(this.file)).resourceSuffixCreator(this.suffixCreator) - .itemCountLimitPerResource(2).saveState(true).name("foo").build(); + .resource(new FileSystemResource(this.file)) + .resourceSuffixCreator(this.suffixCreator) + .itemCountLimitPerResource(2) + .saveState(true) + .name("foo") + .build(); this.writer.write(Chunk.of("1", "2", "3")); @@ -176,8 +191,12 @@ class MultiResourceItemWriterBuilderTests { void testRestartNoSaveState() throws Exception { this.writer = new MultiResourceItemWriterBuilder().delegate(this.delegate) - .resource(new FileSystemResource(this.file)).resourceSuffixCreator(this.suffixCreator) - .itemCountLimitPerResource(2).saveState(false).name("foo").build(); + .resource(new FileSystemResource(this.file)) + .resourceSuffixCreator(this.suffixCreator) + .itemCountLimitPerResource(2) + .saveState(false) + .name("foo") + .build(); this.writer.write(Chunk.of("1", "2", "3")); @@ -206,8 +225,10 @@ class MultiResourceItemWriterBuilderTests { @Test void testSaveStateNoName() { var builder = new MultiResourceItemWriterBuilder().delegate(this.delegate) - .resource(new FileSystemResource(this.file)).resourceSuffixCreator(this.suffixCreator) - .itemCountLimitPerResource(2).saveState(true); + .resource(new FileSystemResource(this.file)) + .resourceSuffixCreator(this.suffixCreator) + .itemCountLimitPerResource(2) + .saveState(true); Exception exception = assertThrows(IllegalArgumentException.class, builder::build); assertEquals("A name is required when saveState is true.", exception.getMessage()); } @@ -215,7 +236,8 @@ class MultiResourceItemWriterBuilderTests { @Test void testNoResource() { var builder = new MultiResourceItemWriterBuilder().delegate(this.delegate) - .resourceSuffixCreator(this.suffixCreator).itemCountLimitPerResource(2); + .resourceSuffixCreator(this.suffixCreator) + .itemCountLimitPerResource(2); Exception exception = assertThrows(IllegalArgumentException.class, builder::build); assertEquals("resource is required.", exception.getMessage()); } @@ -223,7 +245,9 @@ class MultiResourceItemWriterBuilderTests { @Test void testNoDelegateNoName() { var builder = new MultiResourceItemWriterBuilder().resource(new FileSystemResource(this.file)) - .resourceSuffixCreator(this.suffixCreator).itemCountLimitPerResource(2).saveState(false); + .resourceSuffixCreator(this.suffixCreator) + .itemCountLimitPerResource(2) + .saveState(false); Exception exception = assertThrows(IllegalArgumentException.class, builder::build); assertEquals("delegate is required.", exception.getMessage()); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapperTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapperTests.java index d61d235ec..f9445abda 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapperTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapperTests.java @@ -152,7 +152,7 @@ class BeanWrapperFieldSetMapperTests { ApplicationContext context = new ClassPathXmlApplicationContext("bean-wrapper.xml", getClass()); BeanWrapperFieldSetMapper mapper = (BeanWrapperFieldSetMapper) context - .getBean("fieldSetMapper"); + .getBean("fieldSetMapper"); FieldSet fieldSet = new DefaultFieldSet(new String[] { "This is some dummy string", "true", "C" }, new String[] { "varString", "varBoolean", "varChar" }); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/DefaultFieldSetTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/DefaultFieldSetTests.java index 89d57550c..e4b9b8277 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/DefaultFieldSetTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/DefaultFieldSetTests.java @@ -461,8 +461,9 @@ class DefaultFieldSetTests { @Test void testProperties() { - assertEquals("foo", new DefaultFieldSet(new String[] { "foo", "bar" }, new String[] { "Foo", "Bar" }) - .getProperties().getProperty("Foo")); + assertEquals("foo", + new DefaultFieldSet(new String[] { "foo", "bar" }, new String[] { "Foo", "Bar" }).getProperties() + .getProperty("Foo")); } @Test @@ -474,8 +475,9 @@ class DefaultFieldSetTests { @Test void testPropertiesWithWhiteSpace() { - assertEquals("bar", new DefaultFieldSet(new String[] { "foo", "bar " }, new String[] { "Foo", "Bar" }) - .getProperties().getProperty("Bar")); + assertEquals("bar", + new DefaultFieldSet(new String[] { "foo", "bar " }, new String[] { "Foo", "Bar" }).getProperties() + .getProperty("Bar")); } @Test diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/RegexLineTokenizerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/RegexLineTokenizerTests.java index 9387e7ce8..e4510a05d 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/RegexLineTokenizerTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/transform/RegexLineTokenizerTests.java @@ -28,8 +28,8 @@ class RegexLineTokenizerTests { @Test void testCapturingGroups() { String line = "Liverpool, England: 53d 25m 0s N 3d 0m 0s"; - tokenizer.setRegex( - "([a-zA-Z]+), ([a-zA-Z]+): ([0-9]+). ([0-9]+). ([0-9]+). ([A-Z]) ([0-9]+). ([0-9]+). ([0-9]+)."); + tokenizer + .setRegex("([a-zA-Z]+), ([a-zA-Z]+): ([0-9]+). ([0-9]+). ([0-9]+). ([A-Z]) ([0-9]+). ([0-9]+). ([0-9]+)."); List tokens = tokenizer.doTokenize(line); assertEquals(9, tokens.size()); assertEquals("England", tokens.get(1)); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/jms/builder/JmsItemReaderBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/jms/builder/JmsItemReaderBuilderTests.java index 0f16ecdec..45d9692ec 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/jms/builder/JmsItemReaderBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/jms/builder/JmsItemReaderBuilderTests.java @@ -49,7 +49,7 @@ class JmsItemReaderBuilderTests { @Test void testBasicRead() { JmsItemReader itemReader = new JmsItemReaderBuilder().jmsTemplate(this.defaultJmsTemplate) - .build(); + .build(); assertEquals("foo", itemReader.read()); } @@ -60,15 +60,17 @@ class JmsItemReaderBuilderTests { Date date = new java.sql.Date(0L); when(jmsTemplate.receiveAndConvert()).thenReturn(date); - JmsItemReader itemReader = new JmsItemReaderBuilder().jmsTemplate(jmsTemplate).itemType(Date.class) - .build(); + JmsItemReader itemReader = new JmsItemReaderBuilder().jmsTemplate(jmsTemplate) + .itemType(Date.class) + .build(); assertEquals(date, itemReader.read()); } @Test void testSetItemTypeMismatch() { JmsItemReader itemReader = new JmsItemReaderBuilder().jmsTemplate(this.defaultJmsTemplate) - .itemType(Date.class).build(); + .itemType(Date.class) + .build(); Exception exception = assertThrows(IllegalStateException.class, itemReader::read); assertTrue(exception.getMessage().contains("wrong type")); } @@ -80,7 +82,8 @@ class JmsItemReaderBuilderTests { when(jmsTemplate.receive()).thenReturn(message); JmsItemReader itemReader = new JmsItemReaderBuilder().jmsTemplate(jmsTemplate) - .itemType(Message.class).build(); + .itemType(Message.class) + .build(); assertEquals(message, itemReader.read()); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/json/JsonFileItemWriterFunctionalTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/json/JsonFileItemWriterFunctionalTests.java index e53431c76..6df7e7a50 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/json/JsonFileItemWriterFunctionalTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/json/JsonFileItemWriterFunctionalTests.java @@ -70,7 +70,9 @@ abstract class JsonFileItemWriterFunctionalTests { Path outputFilePath = Paths.get("target", "trades-" + getMarshallerName() + ".json"); FileSystemResource resource = new FileSystemResource(outputFilePath); JsonFileItemWriter writer = new JsonFileItemWriterBuilder().name("tradesItemWriter") - .resource(resource).jsonObjectMarshaller(getJsonObjectMarshaller()).build(); + .resource(resource) + .jsonObjectMarshaller(getJsonObjectMarshaller()) + .build(); // when writer.open(new ExecutionContext()); @@ -87,7 +89,9 @@ abstract class JsonFileItemWriterFunctionalTests { Path outputFilePath = Paths.get("target", "testJsonWritingWithMultipleWrite-" + getMarshallerName() + ".json"); FileSystemResource resource = new FileSystemResource(outputFilePath); JsonFileItemWriter writer = new JsonFileItemWriterBuilder().name("tradesItemWriter") - .resource(resource).jsonObjectMarshaller(getJsonObjectMarshaller()).build(); + .resource(resource) + .jsonObjectMarshaller(getJsonObjectMarshaller()) + .build(); // when writer.open(new ExecutionContext()); @@ -106,7 +110,9 @@ abstract class JsonFileItemWriterFunctionalTests { Path outputFilePath = Paths.get("target", "testJsonWritingWithPrettyPrinting-" + getMarshallerName() + ".json"); FileSystemResource resource = new FileSystemResource(outputFilePath); JsonFileItemWriter writer = new JsonFileItemWriterBuilder().name("tradesItemWriter") - .resource(resource).jsonObjectMarshaller(getJsonObjectMarshallerWithPrettyPrint()).build(); + .resource(resource) + .jsonObjectMarshaller(getJsonObjectMarshallerWithPrettyPrint()) + .build(); // when writer.open(new ExecutionContext()); @@ -124,10 +130,11 @@ abstract class JsonFileItemWriterFunctionalTests { "testJsonWritingWithEnclosingObject-" + getMarshallerName() + ".json"); FileSystemResource resource = new FileSystemResource(outputFilePath); JsonFileItemWriter writer = new JsonFileItemWriterBuilder().name("tradesItemWriter") - .resource(resource).jsonObjectMarshaller(getJsonObjectMarshaller()) - .headerCallback(headerWriter -> headerWriter.write("{\"trades\":[")) - .footerCallback(footerWriter -> footerWriter.write(JsonFileItemWriter.DEFAULT_LINE_SEPARATOR + "]}")) - .build(); + .resource(resource) + .jsonObjectMarshaller(getJsonObjectMarshaller()) + .headerCallback(headerWriter -> headerWriter.write("{\"trades\":[")) + .footerCallback(footerWriter -> footerWriter.write(JsonFileItemWriter.DEFAULT_LINE_SEPARATOR + "]}")) + .build(); // when writer.open(new ExecutionContext()); @@ -145,7 +152,10 @@ abstract class JsonFileItemWriterFunctionalTests { Path outputFilePath = Paths.get("target", "testForcedWrite-" + getMarshallerName() + ".json"); FileSystemResource resource = new FileSystemResource(outputFilePath); JsonFileItemWriter writer = new JsonFileItemWriterBuilder().name("tradesItemWriter") - .resource(resource).jsonObjectMarshaller(getJsonObjectMarshaller()).forceSync(true).build(); + .resource(resource) + .jsonObjectMarshaller(getJsonObjectMarshaller()) + .forceSync(true) + .build(); // when writer.open(new ExecutionContext()); @@ -163,7 +173,10 @@ abstract class JsonFileItemWriterFunctionalTests { Path outputFilePath = Paths.get("target", "testWriteWithDelete-" + getMarshallerName() + ".json"); FileSystemResource resource = new FileSystemResource(outputFilePath); JsonFileItemWriter writer = new JsonFileItemWriterBuilder().name("tradesItemWriter") - .resource(resource).jsonObjectMarshaller(getJsonObjectMarshaller()).shouldDeleteIfExists(true).build(); + .resource(resource) + .jsonObjectMarshaller(getJsonObjectMarshaller()) + .shouldDeleteIfExists(true) + .build(); // when writer.open(executionContext); @@ -184,7 +197,9 @@ abstract class JsonFileItemWriterFunctionalTests { Path outputFilePath = Paths.get("target", "testRestart-" + getMarshallerName() + ".json"); FileSystemResource resource = new FileSystemResource(outputFilePath); JsonFileItemWriter writer = new JsonFileItemWriterBuilder().name("tradesItemWriter") - .resource(resource).jsonObjectMarshaller(getJsonObjectMarshaller()).build(); + .resource(resource) + .jsonObjectMarshaller(getJsonObjectMarshaller()) + .build(); // when writer.open(executionContext); @@ -219,7 +234,9 @@ abstract class JsonFileItemWriterFunctionalTests { Path outputFilePath = Paths.get("target", "testTransactionalRestart-" + getMarshallerName() + ".json"); FileSystemResource resource = new FileSystemResource(outputFilePath); JsonFileItemWriter writer = new JsonFileItemWriterBuilder().name("tradesItemWriter") - .resource(resource).jsonObjectMarshaller(getJsonObjectMarshaller()).build(); + .resource(resource) + .jsonObjectMarshaller(getJsonObjectMarshaller()) + .build(); // when writer.open(executionContext); @@ -271,9 +288,11 @@ abstract class JsonFileItemWriterFunctionalTests { Path outputFilePath = Paths.get("target", "testItemMarshallingFailure-" + getMarshallerName() + ".json"); FileSystemResource resource = new FileSystemResource(outputFilePath); JsonFileItemWriter writer = new JsonFileItemWriterBuilder().name("tradesItemWriter") - .resource(resource).jsonObjectMarshaller(item -> { - throw new IllegalArgumentException("Bad item"); - }).build(); + .resource(resource) + .jsonObjectMarshaller(item -> { + throw new IllegalArgumentException("Bad item"); + }) + .build(); // when writer.open(executionContext); @@ -296,8 +315,10 @@ abstract class JsonFileItemWriterFunctionalTests { FileSystemResource resource = new FileSystemResource(outputFilePath); Files.deleteIfExists(outputFilePath); JsonFileItemWriter writer = new JsonFileItemWriterBuilder().name("tradesItemWriter") - .resource(new FileSystemResource(outputFilePath)).jsonObjectMarshaller(getJsonObjectMarshaller()) - .append(true).build(); + .resource(new FileSystemResource(outputFilePath)) + .jsonObjectMarshaller(getJsonObjectMarshaller()) + .append(true) + .build(); // when writer.open(executionContext); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/json/JsonItemReaderFunctionalTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/json/JsonItemReaderFunctionalTests.java index 404fa3810..665356f1c 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/json/JsonItemReaderFunctionalTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/json/JsonItemReaderFunctionalTests.java @@ -46,8 +46,9 @@ abstract class JsonItemReaderFunctionalTests { @Test void testJsonReading() throws Exception { JsonItemReader itemReader = new JsonItemReaderBuilder().jsonObjectReader(getJsonObjectReader()) - .resource(new ClassPathResource("org/springframework/batch/item/json/trades.json")) - .name("tradeJsonItemReader").build(); + .resource(new ClassPathResource("org/springframework/batch/item/json/trades.json")) + .name("tradeJsonItemReader") + .build(); itemReader.open(new ExecutionContext()); @@ -86,7 +87,9 @@ abstract class JsonItemReaderFunctionalTests { @Test void testEmptyResource() throws Exception { JsonItemReader itemReader = new JsonItemReaderBuilder().jsonObjectReader(getJsonObjectReader()) - .resource(new ByteArrayResource("[]".getBytes())).name("tradeJsonItemReader").build(); + .resource(new ByteArrayResource("[]".getBytes())) + .name("tradeJsonItemReader") + .build(); itemReader.open(new ExecutionContext()); @@ -98,7 +101,9 @@ abstract class JsonItemReaderFunctionalTests { void testInvalidResourceFormat() { // given JsonItemReader itemReader = new JsonItemReaderBuilder().jsonObjectReader(getJsonObjectReader()) - .resource(new ByteArrayResource("{}, {}".getBytes())).name("tradeJsonItemReader").build(); + .resource(new ByteArrayResource("{}, {}".getBytes())) + .name("tradeJsonItemReader") + .build(); // when final Exception expectedException = assertThrows(ItemStreamException.class, @@ -113,7 +118,9 @@ abstract class JsonItemReaderFunctionalTests { void testInvalidResourceContent() { // given JsonItemReader itemReader = new JsonItemReaderBuilder().jsonObjectReader(getJsonObjectReader()) - .resource(new ByteArrayResource("[{]".getBytes())).name("tradeJsonItemReader").build(); + .resource(new ByteArrayResource("[{]".getBytes())) + .name("tradeJsonItemReader") + .build(); itemReader.open(new ExecutionContext()); // when diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/json/builder/JsonFileItemWriterBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/json/builder/JsonFileItemWriterBuilderTests.java index c0769d3dc..1fa37b7aa 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/json/builder/JsonFileItemWriterBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/json/builder/JsonFileItemWriterBuilderTests.java @@ -68,7 +68,7 @@ class JsonFileItemWriterBuilderTests { @Test void testMandatoryNameWhenSaveStateIsSet() { var builder = new JsonFileItemWriterBuilder().resource(this.resource) - .jsonObjectMarshaller(this.jsonObjectMarshaller); + .jsonObjectMarshaller(this.jsonObjectMarshaller); assertThrows(IllegalArgumentException.class, builder::build); } @@ -87,10 +87,18 @@ class JsonFileItemWriterBuilderTests { // when JsonFileItemWriter writer = new JsonFileItemWriterBuilder().name("jsonFileItemWriter") - .resource(this.resource).jsonObjectMarshaller(this.jsonObjectMarshaller).append(append) - .encoding(encoding).forceSync(forceSync).headerCallback(headerCallback).footerCallback(footerCallback) - .lineSeparator(lineSeparator).shouldDeleteIfEmpty(shouldDeleteIfEmpty) - .shouldDeleteIfExists(shouldDeleteIfExists).transactional(transactional).build(); + .resource(this.resource) + .jsonObjectMarshaller(this.jsonObjectMarshaller) + .append(append) + .encoding(encoding) + .forceSync(forceSync) + .headerCallback(headerCallback) + .footerCallback(footerCallback) + .lineSeparator(lineSeparator) + .shouldDeleteIfEmpty(shouldDeleteIfEmpty) + .shouldDeleteIfExists(shouldDeleteIfExists) + .transactional(transactional) + .build(); // then validateBuilderFlags(writer, encoding, lineSeparator, headerCallback, footerCallback); @@ -111,10 +119,17 @@ class JsonFileItemWriterBuilderTests { // when JsonFileItemWriter writer = new JsonFileItemWriterBuilder().name("jsonFileItemWriter") - .resource(this.resource).jsonObjectMarshaller(this.jsonObjectMarshaller).append(append) - .forceSync(forceSync).headerCallback(headerCallback).footerCallback(footerCallback) - .lineSeparator(lineSeparator).shouldDeleteIfEmpty(shouldDeleteIfEmpty) - .shouldDeleteIfExists(shouldDeleteIfExists).transactional(transactional).build(); + .resource(this.resource) + .jsonObjectMarshaller(this.jsonObjectMarshaller) + .append(append) + .forceSync(forceSync) + .headerCallback(headerCallback) + .footerCallback(footerCallback) + .lineSeparator(lineSeparator) + .shouldDeleteIfEmpty(shouldDeleteIfEmpty) + .shouldDeleteIfExists(shouldDeleteIfExists) + .transactional(transactional) + .build(); // then validateBuilderFlags(writer, encoding, lineSeparator, headerCallback, footerCallback); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/json/builder/JsonItemReaderBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/json/builder/JsonItemReaderBuilderTests.java index 1131c7d0f..a0e677b3f 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/json/builder/JsonItemReaderBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/json/builder/JsonItemReaderBuilderTests.java @@ -55,8 +55,13 @@ class JsonItemReaderBuilderTests { @Test void testConfiguration() { JsonItemReader itemReader = new JsonItemReaderBuilder().jsonObjectReader(this.jsonObjectReader) - .resource(this.resource).saveState(true).strict(true).name("jsonItemReader").maxItemCount(100) - .currentItemCount(50).build(); + .resource(this.resource) + .saveState(true) + .strict(true) + .name("jsonItemReader") + .maxItemCount(100) + .currentItemCount(50) + .build(); assertEquals(this.jsonObjectReader, getField(itemReader, "jsonObjectReader")); assertEquals(this.resource, getField(itemReader, "resource")); @@ -71,7 +76,12 @@ class JsonItemReaderBuilderTests { @Test void shouldBuildJsonItemReaderWhenResourceIsNotProvided() { JsonItemReader itemReader = new JsonItemReaderBuilder().jsonObjectReader(this.jsonObjectReader) - .saveState(true).strict(true).name("jsonItemReader").maxItemCount(100).currentItemCount(50).build(); + .saveState(true) + .strict(true) + .name("jsonItemReader") + .maxItemCount(100) + .currentItemCount(50) + .build(); assertEquals(this.jsonObjectReader, getField(itemReader, "jsonObjectReader")); assertEquals(100, getField(itemReader, "maxItemCount")); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/kafka/builder/KafkaItemReaderBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/kafka/builder/KafkaItemReaderBuilderTests.java index 989fefad5..b8a4ae5ae 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/kafka/builder/KafkaItemReaderBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/kafka/builder/KafkaItemReaderBuilderTests.java @@ -61,7 +61,7 @@ class KafkaItemReaderBuilderTests { void testNullConsumerProperties() { // given final KafkaItemReaderBuilder builder = new KafkaItemReaderBuilder<>().name("kafkaItemReader") - .consumerProperties(null); + .consumerProperties(null); // when final Exception expectedException = assertThrows(IllegalArgumentException.class, builder::build); @@ -93,15 +93,19 @@ class KafkaItemReaderBuilderTests { assertEquals("value.deserializer property must be provided", exception.getMessage()); consumerProperties.put("value.deserializer", StringDeserializer.class.getName()); - new KafkaItemReaderBuilder<>().name("kafkaItemReader").consumerProperties(consumerProperties).topic("test") - .partitions(0, 1).build(); + new KafkaItemReaderBuilder<>().name("kafkaItemReader") + .consumerProperties(consumerProperties) + .topic("test") + .partitions(0, 1) + .build(); } @Test void testNullTopicName() { // given final KafkaItemReaderBuilder builder = new KafkaItemReaderBuilder<>().name("kafkaItemReader") - .consumerProperties(this.consumerProperties).topic(null); + .consumerProperties(this.consumerProperties) + .topic(null); // when final Exception expectedException = assertThrows(IllegalArgumentException.class, builder::build); @@ -114,7 +118,8 @@ class KafkaItemReaderBuilderTests { void testEmptyTopicName() { // given final KafkaItemReaderBuilder builder = new KafkaItemReaderBuilder<>().name("kafkaItemReader") - .consumerProperties(this.consumerProperties).topic(""); + .consumerProperties(this.consumerProperties) + .topic(""); // when final Exception expectedException = assertThrows(IllegalArgumentException.class, builder::build); @@ -127,7 +132,9 @@ class KafkaItemReaderBuilderTests { void testNullPollTimeout() { // given final KafkaItemReaderBuilder builder = new KafkaItemReaderBuilder<>().name("kafkaItemReader") - .consumerProperties(this.consumerProperties).topic("test").pollTimeout(null); + .consumerProperties(this.consumerProperties) + .topic("test") + .pollTimeout(null); // when final Exception expectedException = assertThrows(IllegalArgumentException.class, builder::build); @@ -140,7 +147,9 @@ class KafkaItemReaderBuilderTests { void testNegativePollTimeout() { // given final KafkaItemReaderBuilder builder = new KafkaItemReaderBuilder<>().name("kafkaItemReader") - .consumerProperties(this.consumerProperties).topic("test").pollTimeout(Duration.ofSeconds(-1)); + .consumerProperties(this.consumerProperties) + .topic("test") + .pollTimeout(Duration.ofSeconds(-1)); // when final Exception expectedException = assertThrows(IllegalArgumentException.class, builder::build); @@ -153,7 +162,9 @@ class KafkaItemReaderBuilderTests { void testZeroPollTimeout() { // given final KafkaItemReaderBuilder builder = new KafkaItemReaderBuilder<>().name("kafkaItemReader") - .consumerProperties(this.consumerProperties).topic("test").pollTimeout(Duration.ZERO); + .consumerProperties(this.consumerProperties) + .topic("test") + .pollTimeout(Duration.ZERO); // when final Exception expectedException = assertThrows(IllegalArgumentException.class, builder::build); @@ -166,7 +177,9 @@ class KafkaItemReaderBuilderTests { void testEmptyPartitions() { // given final KafkaItemReaderBuilder builder = new KafkaItemReaderBuilder<>().name("kafkaItemReader") - .consumerProperties(this.consumerProperties).topic("test").pollTimeout(Duration.ofSeconds(10)); + .consumerProperties(this.consumerProperties) + .topic("test") + .pollTimeout(Duration.ofSeconds(10)); // when final Exception expectedException = assertThrows(IllegalArgumentException.class, builder::build); @@ -189,8 +202,13 @@ class KafkaItemReaderBuilderTests { // when KafkaItemReader reader = new KafkaItemReaderBuilder().name("kafkaItemReader") - .consumerProperties(this.consumerProperties).topic(topic).partitions(partitions) - .partitionOffsets(partitionOffsets).pollTimeout(pollTimeout).saveState(saveState).build(); + .consumerProperties(this.consumerProperties) + .topic(topic) + .partitions(partitions) + .partitionOffsets(partitionOffsets) + .pollTimeout(pollTimeout) + .saveState(saveState) + .build(); // then assertNotNull(reader); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/kafka/builder/KafkaItemWriterBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/kafka/builder/KafkaItemWriterBuilderTests.java index d4c06dce9..f752db0d8 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/kafka/builder/KafkaItemWriterBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/kafka/builder/KafkaItemWriterBuilderTests.java @@ -52,7 +52,7 @@ class KafkaItemWriterBuilderTests { void testNullKafkaTemplate() { // given final KafkaItemWriterBuilder builder = new KafkaItemWriterBuilder() - .itemKeyMapper(this.itemKeyMapper); + .itemKeyMapper(this.itemKeyMapper); // when final Exception expectedException = assertThrows(IllegalArgumentException.class, builder::build); @@ -65,7 +65,7 @@ class KafkaItemWriterBuilderTests { void testNullItemKeyMapper() { // given final KafkaItemWriterBuilder builder = new KafkaItemWriterBuilder() - .kafkaTemplate(this.kafkaTemplate); + .kafkaTemplate(this.kafkaTemplate); // when final Exception expectedException = assertThrows(IllegalArgumentException.class, builder::build); @@ -82,8 +82,11 @@ class KafkaItemWriterBuilderTests { // when KafkaItemWriter writer = new KafkaItemWriterBuilder() - .kafkaTemplate(this.kafkaTemplate).itemKeyMapper(this.itemKeyMapper).delete(delete).timeout(timeout) - .build(); + .kafkaTemplate(this.kafkaTemplate) + .itemKeyMapper(this.itemKeyMapper) + .delete(delete) + .timeout(timeout) + .build(); // then assertTrue((Boolean) ReflectionTestUtils.getField(writer, "delete")); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/builder/SimpleMailMessageItemWriterBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/builder/SimpleMailMessageItemWriterBuilderTests.java index 1bffb1f23..3e3849502 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/builder/SimpleMailMessageItemWriterBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/mail/builder/SimpleMailMessageItemWriterBuilderTests.java @@ -64,7 +64,7 @@ class SimpleMailMessageItemWriterBuilderTests { @Test void testSend() { SimpleMailMessageItemWriter writer = new SimpleMailMessageItemWriterBuilder().mailSender(this.mailSender) - .build(); + .build(); writer.write(Chunk.of(this.items)); verify(this.mailSender).send(this.foo, this.bar); @@ -80,11 +80,11 @@ class SimpleMailMessageItemWriterBuilderTests { @Test void testErrorHandler() { SimpleMailMessageItemWriter writer = new SimpleMailMessageItemWriterBuilder().mailSender(this.mailSender) - .build(); + .build(); this.mailSender.send(this.foo, this.bar); when(this.mailSender) - .thenThrow(new MailSendException(Collections.singletonMap(this.foo, new MessagingException("FOO")))); + .thenThrow(new MailSendException(Collections.singletonMap(this.foo, new MessagingException("FOO")))); assertThrows(MailSendException.class, () -> writer.write(Chunk.of(this.items))); } @@ -92,16 +92,18 @@ class SimpleMailMessageItemWriterBuilderTests { void testCustomErrorHandler() { final AtomicReference content = new AtomicReference<>(); SimpleMailMessageItemWriter writer = new SimpleMailMessageItemWriterBuilder() - .mailErrorHandler(new MailErrorHandler() { - @Override - public void handle(MailMessage message, Exception exception) throws MailException { - content.set(exception.getMessage()); - } - }).mailSender(this.mailSender).build(); + .mailErrorHandler(new MailErrorHandler() { + @Override + public void handle(MailMessage message, Exception exception) throws MailException { + content.set(exception.getMessage()); + } + }) + .mailSender(this.mailSender) + .build(); this.mailSender.send(this.foo, this.bar); when(this.mailSender) - .thenThrow(new MailSendException(Collections.singletonMap(this.foo, new MessagingException("FOO")))); + .thenThrow(new MailSendException(Collections.singletonMap(this.foo, new MessagingException("FOO")))); writer.write(Chunk.of(this.items)); assertEquals("FOO", content.get()); } diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/ScriptItemProcessorTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/ScriptItemProcessorTests.java index 202941b99..a577a0d12 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/ScriptItemProcessorTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/ScriptItemProcessorTests.java @@ -194,7 +194,7 @@ class ScriptItemProcessorTests { void testScriptSourceWithNoLanguage() { ScriptItemProcessor scriptItemProcessor = new ScriptItemProcessor<>(); assertThrows(IllegalArgumentException.class, () -> scriptItemProcessor - .setScriptSource("function process(item) { return item.toUpperCase(); } process(item);", null)); + .setScriptSource("function process(item) { return item.toUpperCase(); } process(item);", null)); } @Test diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/ClassifierCompositeItemProcessorBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/ClassifierCompositeItemProcessorBuilderTests.java index 0155961bf..1a56181cc 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/ClassifierCompositeItemProcessorBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/ClassifierCompositeItemProcessorBuilderTests.java @@ -43,7 +43,8 @@ class ClassifierCompositeItemProcessorBuilderTests { routingConfiguration.put("foo", fooProcessor); routingConfiguration.put("*", defaultProcessor); ClassifierCompositeItemProcessor processor = new ClassifierCompositeItemProcessorBuilder() - .classifier(new PatternMatchingClassifier<>(routingConfiguration)).build(); + .classifier(new PatternMatchingClassifier<>(routingConfiguration)) + .build(); assertEquals("bar", processor.process("bar")); assertEquals("foo: foo", processor.process("foo")); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/ClassifierCompositeItemWriterBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/ClassifierCompositeItemWriterBuilderTests.java index 484beb790..4ac76e052 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/ClassifierCompositeItemWriterBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/ClassifierCompositeItemWriterBuilderTests.java @@ -58,7 +58,8 @@ class ClassifierCompositeItemWriterBuilderTests { map.put("foo", fooWriter); map.put("*", defaultWriter); ClassifierCompositeItemWriter writer = new ClassifierCompositeItemWriterBuilder() - .classifier(new PatternMatchingClassifier<>(map)).build(); + .classifier(new PatternMatchingClassifier<>(map)) + .build(); writer.write(Chunk.of("foo", "foo", "one", "two", "three")); assertIterableEquals(Chunk.of("foo", "foo"), foos); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/CompositeItemProcessorBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/CompositeItemProcessorBuilderTests.java index f84e94b34..666bbf723 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/CompositeItemProcessorBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/CompositeItemProcessorBuilderTests.java @@ -60,7 +60,8 @@ class CompositeItemProcessorBuilderTests { Object itemAfterFirstTransformation = new Object(); Object itemAfterSecondTransformation = new Object(); CompositeItemProcessor composite = new CompositeItemProcessorBuilder<>() - .delegates(this.processors).build(); + .delegates(this.processors) + .build(); when(processor1.process(item)).thenReturn(itemAfterFirstTransformation); when(processor2.process(itemAfterFirstTransformation)).thenReturn(itemAfterSecondTransformation); @@ -74,7 +75,8 @@ class CompositeItemProcessorBuilderTests { Object itemAfterFirstTransformation = new Object(); Object itemAfterSecondTransformation = new Object(); CompositeItemProcessor composite = new CompositeItemProcessorBuilder<>() - .delegates(this.processor1, this.processor2).build(); + .delegates(this.processor1, this.processor2) + .build(); when(processor1.process(item)).thenReturn(itemAfterFirstTransformation); when(processor2.process(itemAfterFirstTransformation)).thenReturn(itemAfterSecondTransformation); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/CompositeItemWriterBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/CompositeItemWriterBuilderTests.java index b2cd3aeca..6ecc25f3e 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/CompositeItemWriterBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/CompositeItemWriterBuilderTests.java @@ -97,7 +97,8 @@ class CompositeItemWriterBuilderTests { List> writers = new ArrayList<>(); writers.add(writer); CompositeItemWriter itemWriter = new CompositeItemWriterBuilder<>().delegates(writers) - .ignoreItemStream(ignoreItemStream).build(); + .ignoreItemStream(ignoreItemStream) + .build(); itemWriter.open(executionContext); int openCount = 0; diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/ScriptItemProcessorBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/ScriptItemProcessorBuilderTests.java index 85a343720..3f96e8fcc 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/ScriptItemProcessorBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/ScriptItemProcessorBuilderTests.java @@ -58,7 +58,9 @@ class ScriptItemProcessorBuilderTests { @Test void testScriptSource() throws Exception { ScriptItemProcessor scriptItemProcessor = new ScriptItemProcessorBuilder() - .scriptSource("item.toUpperCase();").language("javascript").build(); + .scriptSource("item.toUpperCase();") + .language("javascript") + .build(); scriptItemProcessor.afterPropertiesSet(); assertEquals("AA", scriptItemProcessor.process("aa"), "Incorrect transformed value"); @@ -67,7 +69,10 @@ class ScriptItemProcessorBuilderTests { @Test void testItemBinding() throws Exception { ScriptItemProcessor scriptItemProcessor = new ScriptItemProcessorBuilder() - .scriptSource("foo.contains('World');").language("javascript").itemBindingVariableName("foo").build(); + .scriptSource("foo.contains('World');") + .language("javascript") + .itemBindingVariableName("foo") + .build(); scriptItemProcessor.afterPropertiesSet(); assertEquals(true, scriptItemProcessor.process("Hello World"), "Incorrect transformed value"); @@ -77,7 +82,8 @@ class ScriptItemProcessorBuilderTests { void testScriptResource() throws Exception { Resource resource = new ClassPathResource("org/springframework/batch/item/support/processor-test-simple.js"); ScriptItemProcessor scriptItemProcessor = new ScriptItemProcessorBuilder() - .scriptResource(resource).build(); + .scriptResource(resource) + .build(); scriptItemProcessor.afterPropertiesSet(); assertEquals("BB", scriptItemProcessor.process("bb"), "Incorrect transformed value"); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/SingleItemPeekableItemReaderBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/SingleItemPeekableItemReaderBuilderTests.java index 6909ae4ce..3cb833132 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/SingleItemPeekableItemReaderBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/SingleItemPeekableItemReaderBuilderTests.java @@ -41,7 +41,8 @@ class SingleItemPeekableItemReaderBuilderTests { @Test void testPeek() throws Exception { SingleItemPeekableItemReader reader = new SingleItemPeekableItemReaderBuilder() - .delegate(new ListItemReader<>(Arrays.asList("a", "b"))).build(); + .delegate(new ListItemReader<>(Arrays.asList("a", "b"))) + .build(); assertEquals("a", reader.peek()); assertEquals("a", reader.read()); assertEquals("b", reader.read()); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/SynchronizedItemStreamReaderBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/SynchronizedItemStreamReaderBuilderTests.java index 4b77c637c..63184ed7e 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/SynchronizedItemStreamReaderBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/builder/SynchronizedItemStreamReaderBuilderTests.java @@ -46,7 +46,8 @@ class SynchronizedItemStreamReaderBuilderTests { final SynchronizedItemStreamReaderBuilderTests.TestItemReader testItemReader = new SynchronizedItemStreamReaderBuilderTests.TestItemReader(); final SynchronizedItemStreamReader synchronizedItemStreamReader = new SynchronizedItemStreamReaderBuilder() - .delegate(testItemReader).build(); + .delegate(testItemReader) + .build(); // Open the ItemReader and make sure it's initialized properly. synchronizedItemStreamReader.open(executionContext); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/AbstractStaxEventWriterItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/AbstractStaxEventWriterItemWriterTests.java index a6de23b62..cfe260cc6 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/AbstractStaxEventWriterItemWriterTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/AbstractStaxEventWriterItemWriterTests.java @@ -92,7 +92,7 @@ abstract class AbstractStaxEventWriterItemWriterTests { logger.info("Timing for XML writer: " + stopWatch); assertThat(Input.from(expected.getFile()), CompareMatcher.isSimilarTo(Input.from(resource.getFile())) - .withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byNameAndText))); + .withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byNameAndText))); } @BeforeEach diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/Jaxb2NamespaceUnmarshallingTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/Jaxb2NamespaceUnmarshallingTests.java index 8d9b7c30f..a8df64c1c 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/Jaxb2NamespaceUnmarshallingTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/Jaxb2NamespaceUnmarshallingTests.java @@ -55,7 +55,7 @@ class Jaxb2NamespaceUnmarshallingTests { @Test void testUnmarshal() throws Exception { QualifiedTrade trade = (QualifiedTrade) getUnmarshaller() - .unmarshal(new StreamSource(new StringReader(TRADE_XML))); + .unmarshal(new StreamSource(new StringReader(TRADE_XML))); assertEquals("XYZ0001", trade.getIsin()); assertEquals(5, trade.getQuantity()); assertEquals(new BigDecimal("11.39"), trade.getPrice()); 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 aa650802b..befea018a 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 @@ -424,7 +424,7 @@ class StaxEventItemWriterTests { writer.write(items); writer.update(executionContext); long writeStatistics = executionContext - .getLong(ClassUtils.getShortName(StaxEventItemWriter.class) + ".record.count"); + .getLong(ClassUtils.getShortName(StaxEventItemWriter.class) + ".record.count"); assertEquals(i, writeStatistics); } @@ -993,10 +993,11 @@ class StaxEventItemWriterTests { public void marshal(Object graph, Result result) throws XmlMappingException, IOException { Assert.isInstanceOf(Result.class, result); try { - StaxTestUtils.getXmlEventWriter(result).add( - XMLEventFactory.newInstance().createStartElement(namespacePrefix, namespace, graph.toString())); - StaxTestUtils.getXmlEventWriter(result).add( - XMLEventFactory.newInstance().createEndElement(namespacePrefix, namespace, graph.toString())); + StaxTestUtils.getXmlEventWriter(result) + .add(XMLEventFactory.newInstance() + .createStartElement(namespacePrefix, namespace, graph.toString())); + StaxTestUtils.getXmlEventWriter(result) + .add(XMLEventFactory.newInstance().createEndElement(namespacePrefix, namespace, graph.toString())); } catch (Exception e) { throw new RuntimeException("Exception while writing to output file", e); 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 c8c7c14df..320c7edcb 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 @@ -224,7 +224,7 @@ class TransactionalStaxEventItemWriterTests { public void marshal(Object graph, Result result) throws XmlMappingException, IOException { try { StaxTestUtils.getXmlEventWriter(result) - .add(XMLEventFactory.newInstance().createComment(graph.toString())); + .add(XMLEventFactory.newInstance().createComment(graph.toString())); } catch (Exception e) { throw new RuntimeException("Exception while writing to output file", e); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/builder/StaxEventItemReaderBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/builder/StaxEventItemReaderBuilderTests.java index 1a41db40e..fda1c647e 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/builder/StaxEventItemReaderBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/builder/StaxEventItemReaderBuilderTests.java @@ -68,7 +68,8 @@ class StaxEventItemReaderBuilderTests { @Test void testBuildWithoutProvidingResource() { StaxEventItemReader reader = new StaxEventItemReaderBuilder().name("fooReader") - .addFragmentRootElements("foo").build(); + .addFragmentRootElements("foo") + .build(); assertNotNull(reader); } @@ -79,8 +80,13 @@ class StaxEventItemReaderBuilderTests { unmarshaller.setClassesToBeBound(Foo.class); StaxEventItemReader reader = new StaxEventItemReaderBuilder().name("fooReader") - .resource(getResource(SIMPLE_XML)).addFragmentRootElements("foo").currentItemCount(1).maxItemCount(2) - .unmarshaller(unmarshaller).xmlInputFactory(XMLInputFactory.newInstance()).build(); + .resource(getResource(SIMPLE_XML)) + .addFragmentRootElements("foo") + .currentItemCount(1) + .maxItemCount(2) + .unmarshaller(unmarshaller) + .xmlInputFactory(XMLInputFactory.newInstance()) + .build(); reader.afterPropertiesSet(); @@ -110,9 +116,14 @@ class StaxEventItemReaderBuilderTests { ByteBuffer xml = charset.encode(SIMPLE_XML); StaxEventItemReader reader = new StaxEventItemReaderBuilder().name("fooReader") - .resource(new ByteArrayResource(xml.array())).encoding(charset.name()).addFragmentRootElements("foo") - .currentItemCount(1).maxItemCount(2).unmarshaller(unmarshaller) - .xmlInputFactory(XMLInputFactory.newInstance()).build(); + .resource(new ByteArrayResource(xml.array())) + .encoding(charset.name()) + .addFragmentRootElements("foo") + .currentItemCount(1) + .maxItemCount(2) + .unmarshaller(unmarshaller) + .xmlInputFactory(XMLInputFactory.newInstance()) + .build(); reader.afterPropertiesSet(); @@ -136,7 +147,10 @@ class StaxEventItemReaderBuilderTests { unmarshaller.setClassesToBeBound(Foo.class); StaxEventItemReader reader = new StaxEventItemReaderBuilder().name("fooReader") - .resource(this.resource).addFragmentRootElements("foo").unmarshaller(unmarshaller).build(); + .resource(this.resource) + .addFragmentRootElements("foo") + .unmarshaller(unmarshaller) + .build(); reader.afterPropertiesSet(); @@ -150,8 +164,11 @@ class StaxEventItemReaderBuilderTests { unmarshaller.setClassesToBeBound(Foo.class); StaxEventItemReader reader = new StaxEventItemReaderBuilder().name("fooReader") - .resource(getResource(SIMPLE_XML)).addFragmentRootElements("foo").unmarshaller(unmarshaller) - .saveState(false).build(); + .resource(getResource(SIMPLE_XML)) + .addFragmentRootElements("foo") + .unmarshaller(unmarshaller) + .saveState(false) + .build(); reader.afterPropertiesSet(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/builder/StaxEventItemWriterBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/builder/StaxEventItemWriterBuilderTests.java index 8c26c695d..95a84ff56 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/builder/StaxEventItemWriterBuilderTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/builder/StaxEventItemWriterBuilderTests.java @@ -84,7 +84,10 @@ class StaxEventItemWriterBuilderTests { @Test void testOverwriteOutput() throws Exception { StaxEventItemWriter staxEventItemWriter = new StaxEventItemWriterBuilder().name("fooWriter") - .marshaller(marshaller).resource(this.resource).overwriteOutput(false).build(); + .marshaller(marshaller) + .resource(this.resource) + .overwriteOutput(false) + .build(); staxEventItemWriter.afterPropertiesSet(); assertThrows(ItemStreamException.class, () -> staxEventItemWriter.open(new ExecutionContext())); } @@ -94,7 +97,10 @@ class StaxEventItemWriterBuilderTests { ExecutionContext executionContext = new ExecutionContext(); StaxEventItemWriter staxEventItemWriter = new StaxEventItemWriterBuilder().name("fooWriter") - .resource(this.resource).marshaller(this.marshaller).shouldDeleteIfEmpty(true).build(); + .resource(this.resource) + .marshaller(this.marshaller) + .shouldDeleteIfEmpty(true) + .build(); staxEventItemWriter.afterPropertiesSet(); staxEventItemWriter.open(executionContext); @@ -111,7 +117,11 @@ class StaxEventItemWriterBuilderTests { void testTransactional() { StaxEventItemWriter staxEventItemWriter = new StaxEventItemWriterBuilder().name("fooWriter") - .resource(this.resource).marshaller(this.marshaller).transactional(true).forceSync(true).build(); + .resource(this.resource) + .marshaller(this.marshaller) + .transactional(true) + .forceSync(true) + .build(); ExecutionContext executionContext = new ExecutionContext(); @@ -130,24 +140,32 @@ class StaxEventItemWriterBuilderTests { rootElementAttributes.put("baz", "quix"); StaxEventItemWriter staxEventItemWriter = new StaxEventItemWriterBuilder().name("fooWriter") - .marshaller(marshaller).encoding("UTF-16").footerCallback(writer -> { - XMLEventFactory factory = XMLEventFactory.newInstance(); - try { - writer.add(factory.createEndElement("ns", "https://www.springframework.org/test", "group")); - } - catch (XMLStreamException e) { - throw new RuntimeException(e); - } - }).headerCallback(writer -> { - XMLEventFactory factory = XMLEventFactory.newInstance(); - try { - writer.add(factory.createStartElement("ns", "https://www.springframework.org/test", "group")); - } - catch (XMLStreamException e) { - throw new RuntimeException(e); - } - }).resource(this.resource).rootTagName("foobarred").rootElementAttributes(rootElementAttributes) - .saveState(false).version("1.1").build(); + .marshaller(marshaller) + .encoding("UTF-16") + .footerCallback(writer -> { + XMLEventFactory factory = XMLEventFactory.newInstance(); + try { + writer.add(factory.createEndElement("ns", "https://www.springframework.org/test", "group")); + } + catch (XMLStreamException e) { + throw new RuntimeException(e); + } + }) + .headerCallback(writer -> { + XMLEventFactory factory = XMLEventFactory.newInstance(); + try { + writer.add(factory.createStartElement("ns", "https://www.springframework.org/test", "group")); + } + catch (XMLStreamException e) { + throw new RuntimeException(e); + } + }) + .resource(this.resource) + .rootTagName("foobarred") + .rootElementAttributes(rootElementAttributes) + .saveState(false) + .version("1.1") + .build(); staxEventItemWriter.afterPropertiesSet(); @@ -178,7 +196,9 @@ class StaxEventItemWriterBuilderTests { @Test void testStandaloneDeclarationInHeaderWhenNotSet() throws Exception { StaxEventItemWriter staxEventItemWriter = new StaxEventItemWriterBuilder().name("fooWriter") - .marshaller(marshaller).resource(this.resource).build(); + .marshaller(marshaller) + .resource(this.resource) + .build(); staxEventItemWriter.afterPropertiesSet(); @@ -194,7 +214,10 @@ class StaxEventItemWriterBuilderTests { @Test void testStandaloneDeclarationInHeaderWhenSetToTrue() throws Exception { StaxEventItemWriter staxEventItemWriter = new StaxEventItemWriterBuilder().name("fooWriter") - .marshaller(marshaller).resource(this.resource).standalone(true).build(); + .marshaller(marshaller) + .resource(this.resource) + .standalone(true) + .build(); staxEventItemWriter.afterPropertiesSet(); @@ -210,7 +233,10 @@ class StaxEventItemWriterBuilderTests { @Test void testStandaloneDeclarationInHeaderWhenSetToFalse() throws Exception { StaxEventItemWriter staxEventItemWriter = new StaxEventItemWriterBuilder().name("fooWriter") - .marshaller(marshaller).resource(this.resource).standalone(false).build(); + .marshaller(marshaller) + .resource(this.resource) + .standalone(false) + .build(); staxEventItemWriter.afterPropertiesSet(); 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 55341bf01..4df9b8d06 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 @@ -52,13 +52,13 @@ class CompositeCompletionPolicyTests { @Test void testNonTrivialPolicies() { CompositeCompletionPolicy policy = new CompositeCompletionPolicy(); - policy.setPolicies( - new CompletionPolicy[] { new MockCompletionPolicySupport(), new MockCompletionPolicySupport() { - @Override - public boolean isComplete(RepeatContext context) { - return true; - } - } }); + policy + .setPolicies(new CompletionPolicy[] { new MockCompletionPolicySupport(), new MockCompletionPolicySupport() { + @Override + public boolean isComplete(RepeatContext context) { + return true; + } + } }); RepeatContext context = policy.start(null); assertTrue(policy.isComplete(context)); } @@ -66,13 +66,13 @@ class CompositeCompletionPolicyTests { @Test void testNonTrivialPoliciesWithResult() { CompositeCompletionPolicy policy = new CompositeCompletionPolicy(); - policy.setPolicies( - new CompletionPolicy[] { new MockCompletionPolicySupport(), new MockCompletionPolicySupport() { - @Override - public boolean isComplete(RepeatContext context, RepeatStatus result) { - return true; - } - } }); + policy + .setPolicies(new CompletionPolicy[] { new MockCompletionPolicySupport(), new MockCompletionPolicySupport() { + @Override + public boolean isComplete(RepeatContext context, RepeatStatus result) { + return true; + } + } }); RepeatContext context = policy.start(null); assertTrue(policy.isComplete(context, null)); } 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 85c733b39..cd3348cb3 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 @@ -121,7 +121,7 @@ class TransactionAwareBufferedWriterTests { ArgumentCaptor byteBufferCaptor = ArgumentCaptor.forClass(ByteBuffer.class); when(fileChannel.write(byteBufferCaptor.capture())) - .thenAnswer(invocation -> ((ByteBuffer) invocation.getArguments()[0]).remaining()); + .thenAnswer(invocation -> ((ByteBuffer) invocation.getArguments()[0]).remaining()); writer.write("foo"); writer.close(); diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareProxyFactoryTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareProxyFactoryTests.java index 8435c4671..c27239484 100644 --- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareProxyFactoryTests.java +++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/support/transaction/TransactionAwareProxyFactoryTests.java @@ -63,7 +63,7 @@ class TransactionAwareProxyFactoryTests { @Test void testCreateMapWithValues() { Map map = TransactionAwareProxyFactory - .createTransactionalMap(Collections.singletonMap("foo", "bar")); + .createTransactionalMap(Collections.singletonMap("foo", "bar")); assertEquals(1, map.size()); } diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java index 76ccde41b..904e6ad0a 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/ChunkMessageChannelItemWriter.java @@ -149,8 +149,8 @@ public class ChunkMessageChannelItemWriter } if (timedOut) { stepExecution.setStatus(BatchStatus.FAILED); - return ExitStatus.FAILED.addExitDescription( - "Timed out waiting for " + localState.getExpecting() + " backlog at end of step"); + return ExitStatus.FAILED + .addExitDescription("Timed out waiting for " + localState.getExpecting() + " backlog at end of step"); } return ExitStatus.COMPLETED.addExitDescription("Waited for " + expecting + " results."); } diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkingManagerStepBuilderFactory.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkingManagerStepBuilderFactory.java index 27ecd908f..2568d1db2 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkingManagerStepBuilderFactory.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkingManagerStepBuilderFactory.java @@ -53,7 +53,7 @@ public class RemoteChunkingManagerStepBuilderFactory { */ public RemoteChunkingManagerStepBuilder get(String name) { return new RemoteChunkingManagerStepBuilder(name, this.jobRepository) - .transactionManager(this.transactionManager); + .transactionManager(this.transactionManager); } } diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkingWorkerBuilder.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkingWorkerBuilder.java index 4282d97aa..d97050d9b 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkingWorkerBuilder.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkingWorkerBuilder.java @@ -116,8 +116,10 @@ public class RemoteChunkingWorkerBuilder { ChunkProcessorChunkHandler chunkProcessorChunkHandler = new ChunkProcessorChunkHandler<>(); chunkProcessorChunkHandler.setChunkProcessor(chunkProcessor); - return IntegrationFlow.from(this.inputChannel).handle(chunkProcessorChunkHandler, SERVICE_ACTIVATOR_METHOD_NAME) - .channel(this.outputChannel).get(); + return IntegrationFlow.from(this.inputChannel) + .handle(chunkProcessorChunkHandler, SERVICE_ACTIVATOR_METHOD_NAME) + .channel(this.outputChannel) + .get(); } } diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/config/annotation/EnableBatchIntegration.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/config/annotation/EnableBatchIntegration.java index 66088d169..0e9f0bcb7 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/config/annotation/EnableBatchIntegration.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/config/annotation/EnableBatchIntegration.java @@ -132,6 +132,7 @@ import org.springframework.integration.config.EnableIntegration; * * } * + * * @since 4.1 * @author Mahmoud Ben Hassine * @author Taeik Lim diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/config/xml/JobLaunchingGatewayParser.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/config/xml/JobLaunchingGatewayParser.java index 1435e16df..eddb35d1e 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/config/xml/JobLaunchingGatewayParser.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/config/xml/JobLaunchingGatewayParser.java @@ -48,7 +48,7 @@ public class JobLaunchingGatewayParser extends AbstractConsumerEndpointParser { protected BeanDefinitionBuilder parseHandler(Element element, ParserContext parserContext) { final BeanDefinitionBuilder jobLaunchingGatewayBuilder = BeanDefinitionBuilder - .genericBeanDefinition(JobLaunchingGateway.class); + .genericBeanDefinition(JobLaunchingGateway.class); final String jobLauncher = element.getAttribute("job-launcher"); diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/config/xml/RemoteChunkingManagerParser.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/config/xml/RemoteChunkingManagerParser.java index 082fcab92..cd7b6a894 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/config/xml/RemoteChunkingManagerParser.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/config/xml/RemoteChunkingManagerParser.java @@ -70,16 +70,18 @@ public class RemoteChunkingManagerParser extends AbstractBeanDefinitionParser { BeanDefinitionRegistry beanDefinitionRegistry = parserContext.getRegistry(); BeanDefinition chunkMessageChannelItemWriter = BeanDefinitionBuilder - .genericBeanDefinition(ChunkMessageChannelItemWriter.class) - .addPropertyReference(MESSAGING_OPERATIONS_PROPERTY, messageTemplate) - .addPropertyReference(REPLY_CHANNEL_PROPERTY, replyChannel).getBeanDefinition(); + .genericBeanDefinition(ChunkMessageChannelItemWriter.class) + .addPropertyReference(MESSAGING_OPERATIONS_PROPERTY, messageTemplate) + .addPropertyReference(REPLY_CHANNEL_PROPERTY, replyChannel) + .getBeanDefinition(); beanDefinitionRegistry.registerBeanDefinition(id, chunkMessageChannelItemWriter); BeanDefinition remoteChunkHandlerFactoryBean = BeanDefinitionBuilder - .genericBeanDefinition(RemoteChunkHandlerFactoryBean.class) - .addPropertyValue(CHUNK_WRITER_PROPERTY, chunkMessageChannelItemWriter) - .addPropertyValue(STEP_PROPERTY, step).getBeanDefinition(); + .genericBeanDefinition(RemoteChunkHandlerFactoryBean.class) + .addPropertyValue(CHUNK_WRITER_PROPERTY, chunkMessageChannelItemWriter) + .addPropertyValue(STEP_PROPERTY, step) + .getBeanDefinition(); beanDefinitionRegistry.registerBeanDefinition(CHUNK_HANDLER_BEAN_NAME_PREFIX + step, remoteChunkHandlerFactoryBean); diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/config/xml/RemoteChunkingWorkerParser.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/config/xml/RemoteChunkingWorkerParser.java index 2fa90ff7b..25fd3a3dc 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/config/xml/RemoteChunkingWorkerParser.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/config/xml/RemoteChunkingWorkerParser.java @@ -81,8 +81,8 @@ public class RemoteChunkingWorkerParser extends AbstractBeanDefinitionParser { BeanDefinitionRegistry beanDefinitionRegistry = parserContext.getRegistry(); BeanDefinitionBuilder chunkProcessorBuilder = BeanDefinitionBuilder - .genericBeanDefinition(SimpleChunkProcessor.class) - .addPropertyReference(ITEM_WRITER_PROPERTY_NAME, itemWriter); + .genericBeanDefinition(SimpleChunkProcessor.class) + .addPropertyReference(ITEM_WRITER_PROPERTY_NAME, itemWriter); if (StringUtils.hasText(itemProcessor)) { chunkProcessorBuilder.addPropertyReference(ITEM_PROCESSOR_PROPERTY_NAME, itemProcessor); @@ -92,9 +92,9 @@ public class RemoteChunkingWorkerParser extends AbstractBeanDefinitionParser { } BeanDefinition chunkProcessorChunkHandler = BeanDefinitionBuilder - .genericBeanDefinition(ChunkProcessorChunkHandler.class) - .addPropertyValue(CHUNK_PROCESSOR_PROPERTY_NAME, chunkProcessorBuilder.getBeanDefinition()) - .getBeanDefinition(); + .genericBeanDefinition(ChunkProcessorChunkHandler.class) + .addPropertyValue(CHUNK_PROCESSOR_PROPERTY_NAME, chunkProcessorBuilder.getBeanDefinition()) + .getBeanDefinition(); beanDefinitionRegistry.registerBeanDefinition(CHUNK_PROCESSOR_CHUNK_HANDLER_BEAN_NAME_PREFIX + id, chunkProcessorChunkHandler); @@ -123,7 +123,7 @@ public class RemoteChunkingWorkerParser extends AbstractBeanDefinitionParser { @Override protected BeanDefinitionBuilder parseHandler(Element element, ParserContext parserContext) { BeanDefinitionBuilder builder = BeanDefinitionBuilder - .genericBeanDefinition(ServiceActivatorFactoryBean.class); + .genericBeanDefinition(ServiceActivatorFactoryBean.class); builder.addPropertyValue(TARGET_METHOD_NAME_PROPERTY_NAME, HANDLE_CHUNK_METHOD_NAME); builder.addPropertyValue(TARGET_OBJECT_PROPERTY_NAME, new RuntimeBeanReference(CHUNK_PROCESSOR_CHUNK_HANDLER_BEAN_NAME_PREFIX + id)); diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/MessageChannelPartitionHandler.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/MessageChannelPartitionHandler.java index 2ac196a49..42885187a 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/MessageChannelPartitionHandler.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/MessageChannelPartitionHandler.java @@ -256,13 +256,16 @@ public class MessageChannelPartitionHandler extends AbstractPartitionHandler imp Callable> callback = new Callable>() { @Override public Set call() throws Exception { - Set currentStepExecutionIds = split.stream().map(StepExecution::getId) - .collect(Collectors.toSet()); + Set currentStepExecutionIds = split.stream() + .map(StepExecution::getId) + .collect(Collectors.toSet()); JobExecution jobExecution = jobExplorer.getJobExecution(managerStepExecution.getJobExecutionId()); - jobExecution.getStepExecutions().stream() - .filter(stepExecution -> currentStepExecutionIds.contains(stepExecution.getId())) - .filter(stepExecution -> !result.contains(stepExecution)) - .filter(stepExecution -> !stepExecution.getStatus().isRunning()).forEach(result::add); + jobExecution.getStepExecutions() + .stream() + .filter(stepExecution -> currentStepExecutionIds.contains(stepExecution.getId())) + .filter(stepExecution -> !result.contains(stepExecution)) + .filter(stepExecution -> !stepExecution.getStatus().isRunning()) + .forEach(result::add); if (logger.isDebugEnabled()) { logger.debug(String.format("Currently waiting on %s partitions to finish", split.size())); @@ -290,7 +293,7 @@ public class MessageChannelPartitionHandler extends AbstractPartitionHandler imp private Set receiveReplies(PollableChannel currentReplyChannel) { Message> message = (Message>) messagingGateway - .receive(currentReplyChannel); + .receive(currentReplyChannel); if (message == null) { throw new MessageTimeoutException("Timeout occurred before all partitions returned"); @@ -304,10 +307,12 @@ public class MessageChannelPartitionHandler extends AbstractPartitionHandler imp private Message createMessage(int sequenceNumber, int sequenceSize, StepExecutionRequest stepExecutionRequest, PollableChannel replyChannel) { - return MessageBuilder.withPayload(stepExecutionRequest).setSequenceNumber(sequenceNumber) - .setSequenceSize(sequenceSize) - .setCorrelationId(stepExecutionRequest.getJobExecutionId() + ":" + stepExecutionRequest.getStepName()) - .setReplyChannel(replyChannel).build(); + return MessageBuilder.withPayload(stepExecutionRequest) + .setSequenceNumber(sequenceNumber) + .setSequenceSize(sequenceSize) + .setCorrelationId(stepExecutionRequest.getJobExecutionId() + ":" + stepExecutionRequest.getStepName()) + .setReplyChannel(replyChannel) + .build(); } } diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilder.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilder.java index a45f16809..0bb92a36e 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilder.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilder.java @@ -220,7 +220,9 @@ public class RemotePartitioningManagerStepBuilder extends PartitionStepBuilder { PollableChannel replies = new QueueChannel(); partitionHandler.setReplyChannel(replies); StandardIntegrationFlow standardIntegrationFlow = IntegrationFlow.from(this.inputChannel) - .aggregate(aggregatorSpec -> aggregatorSpec.processor(partitionHandler)).channel(replies).get(); + .aggregate(aggregatorSpec -> aggregatorSpec.processor(partitionHandler)) + .channel(replies) + .get(); IntegrationFlowContext integrationFlowContext = this.beanFactory.getBean(IntegrationFlowContext.class); integrationFlowContext.registration(standardIntegrationFlow).autoStartup(false).register(); } diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilderFactory.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilderFactory.java index b5f87ad69..60a1f8d01 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilderFactory.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilderFactory.java @@ -63,7 +63,7 @@ public class RemotePartitioningManagerStepBuilderFactory implements BeanFactoryA */ public RemotePartitioningManagerStepBuilder get(String name) { return new RemotePartitioningManagerStepBuilder(name, this.jobRepository).jobExplorer(this.jobExplorer) - .beanFactory(this.beanFactory); + .beanFactory(this.beanFactory); } } diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningWorkerStepBuilder.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningWorkerStepBuilder.java index 0bec965a4..7f6dda318 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningWorkerStepBuilder.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningWorkerStepBuilder.java @@ -278,7 +278,9 @@ public class RemotePartitioningWorkerStepBuilder extends StepBuilder { stepExecutionRequestHandler.setStepLocator(this.stepLocator); StandardIntegrationFlow standardIntegrationFlow = IntegrationFlow.from(this.inputChannel) - .handle(stepExecutionRequestHandler, SERVICE_ACTIVATOR_METHOD_NAME).channel(this.outputChannel).get(); + .handle(stepExecutionRequestHandler, SERVICE_ACTIVATOR_METHOD_NAME) + .channel(this.outputChannel) + .get(); IntegrationFlowContext integrationFlowContext = this.beanFactory.getBean(IntegrationFlowContext.class); integrationFlowContext.registration(standardIntegrationFlow).autoStartup(false).register(); } diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningWorkerStepBuilderFactory.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningWorkerStepBuilderFactory.java index d94e21266..b3c13a1f7 100644 --- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningWorkerStepBuilderFactory.java +++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/partition/RemotePartitioningWorkerStepBuilderFactory.java @@ -63,7 +63,7 @@ public class RemotePartitioningWorkerStepBuilderFactory implements BeanFactoryAw */ public RemotePartitioningWorkerStepBuilder get(String name) { return new RemotePartitioningWorkerStepBuilder(name, this.jobRepository).jobExplorer(this.jobExplorer) - .beanFactory(this.beanFactory); + .beanFactory(this.beanFactory); } } diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/AsyncItemProcessorMessagingGatewayTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/AsyncItemProcessorMessagingGatewayTests.java index 4aa7c1747..6e19aacfc 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/AsyncItemProcessorMessagingGatewayTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/AsyncItemProcessorMessagingGatewayTests.java @@ -47,7 +47,7 @@ class AsyncItemProcessorMessagingGatewayTests { StepExecution getStepExecution() { return MetaDataInstanceFactory - .createStepExecution(new JobParametersBuilder().addLong("factor", 2L).toJobParameters()); + .createStepExecution(new JobParametersBuilder().addLong("factor", 2L).toJobParameters()); } @Test diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/PollingAsyncItemProcessorMessagingGatewayTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/PollingAsyncItemProcessorMessagingGatewayTests.java index 5225376cd..9cc6e88f3 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/PollingAsyncItemProcessorMessagingGatewayTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/async/PollingAsyncItemProcessorMessagingGatewayTests.java @@ -49,7 +49,7 @@ class PollingAsyncItemProcessorMessagingGatewayTests { StepExecution getStepExecution() { return MetaDataInstanceFactory - .createStepExecution(new JobParametersBuilder().addLong("factor", 2L).toJobParameters()); + .createStepExecution(new JobParametersBuilder().addLong("factor", 2L).toJobParameters()); } @Test diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests.java index 7c6c2537d..4022e3dea 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/ChunkMessageItemWriterIntegrationTests.java @@ -78,8 +78,9 @@ class ChunkMessageItemWriterIntegrationTests { @BeforeEach void setUp() throws Exception { EmbeddedDatabase embeddedDatabase = new EmbeddedDatabaseBuilder().generateUniqueName(true) - .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").build(); + .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .build(); JdbcTransactionManager transactionManager = new JdbcTransactionManager(embeddedDatabase); JobRepositoryFactoryBean repositoryFactoryBean = new JobRepositoryFactoryBean(); repositoryFactoryBean.setDataSource(embeddedDatabase); @@ -208,7 +209,8 @@ class ChunkMessageItemWriterIntegrationTests { @SuppressWarnings({ "unchecked", "rawtypes" }) private GenericMessage getSimpleMessage(Long jobId, String... items) { StepContribution stepContribution = new JobExecution(new JobInstance(0L, "job"), new JobParameters()) - .createStepExecution("step").createStepContribution(); + .createStepExecution("step") + .createStepContribution(); ChunkRequest chunk = new ChunkRequest(0, Chunk.of(items), jobId, stepContribution); GenericMessage message = new GenericMessage<>(chunk); return message; diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkingManagerStepBuilderTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkingManagerStepBuilderTests.java index d1e98846f..c4749e8c8 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkingManagerStepBuilderTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkingManagerStepBuilderTests.java @@ -97,7 +97,8 @@ class RemoteChunkingManagerStepBuilderTests { // when final Exception expectedException = assertThrows(IllegalArgumentException.class, () -> new RemoteChunkingManagerStepBuilder("step", this.jobRepository) - .inputChannel(null).build()); + .inputChannel(null) + .build()); // then assertThat(expectedException).hasMessage("inputChannel must not be null"); @@ -108,7 +109,8 @@ class RemoteChunkingManagerStepBuilderTests { // when final Exception expectedException = assertThrows(IllegalArgumentException.class, () -> new RemoteChunkingManagerStepBuilder("step", this.jobRepository) - .outputChannel(null).build()); + .outputChannel(null) + .build()); // then assertThat(expectedException).hasMessage("outputChannel must not be null"); @@ -119,7 +121,8 @@ class RemoteChunkingManagerStepBuilderTests { // when final Exception expectedException = assertThrows(IllegalArgumentException.class, () -> new RemoteChunkingManagerStepBuilder("step", this.jobRepository) - .messagingTemplate(null).build()); + .messagingTemplate(null) + .build()); // then assertThat(expectedException).hasMessage("messagingTemplate must not be null"); @@ -130,7 +133,8 @@ class RemoteChunkingManagerStepBuilderTests { // when final Exception expectedException = assertThrows(IllegalArgumentException.class, () -> new RemoteChunkingManagerStepBuilder("step", this.jobRepository) - .maxWaitTimeouts(-1).build()); + .maxWaitTimeouts(-1) + .build()); // then assertThat(expectedException).hasMessage("maxWaitTimeouts must be greater than zero"); @@ -141,7 +145,8 @@ class RemoteChunkingManagerStepBuilderTests { // when final Exception expectedException = assertThrows(IllegalArgumentException.class, () -> new RemoteChunkingManagerStepBuilder("step", this.jobRepository) - .throttleLimit(-1L).build()); + .throttleLimit(-1L) + .build()); // then assertThat(expectedException).hasMessage("throttleLimit must be greater than zero"); @@ -164,15 +169,17 @@ class RemoteChunkingManagerStepBuilderTests { void eitherOutputChannelOrMessagingTemplateMustBeProvided() { // given RemoteChunkingManagerStepBuilder builder = new RemoteChunkingManagerStepBuilder( - "step", this.jobRepository).inputChannel(this.inputChannel).outputChannel(new DirectChannel()) - .messagingTemplate(new MessagingTemplate()); + "step", this.jobRepository) + .inputChannel(this.inputChannel) + .outputChannel(new DirectChannel()) + .messagingTemplate(new MessagingTemplate()); // when final Exception expectedException = assertThrows(IllegalStateException.class, builder::build); // then assertThat(expectedException) - .hasMessage("You must specify either an outputChannel or a messagingTemplate but not both."); + .hasMessage("You must specify either an outputChannel or a messagingTemplate but not both."); } @Test @@ -180,9 +187,14 @@ class RemoteChunkingManagerStepBuilderTests { // when final Exception expectedException = assertThrows(UnsupportedOperationException.class, () -> new RemoteChunkingManagerStepBuilder("step", this.jobRepository) - .reader(this.itemReader).writer(items -> { - }).repository(this.jobRepository).transactionManager(this.transactionManager) - .inputChannel(this.inputChannel).outputChannel(this.outputChannel).build()); + .reader(this.itemReader) + .writer(items -> { + }) + .repository(this.jobRepository) + .transactionManager(this.transactionManager) + .inputChannel(this.inputChannel) + .outputChannel(this.outputChannel) + .build()); // then assertThat(expectedException).hasMessage( @@ -195,8 +207,11 @@ class RemoteChunkingManagerStepBuilderTests { void testManagerStepCreation() { // when TaskletStep taskletStep = new RemoteChunkingManagerStepBuilder("step", this.jobRepository) - .reader(this.itemReader).transactionManager(this.transactionManager).inputChannel(this.inputChannel) - .outputChannel(this.outputChannel).build(); + .reader(this.itemReader) + .transactionManager(this.transactionManager) + .inputChannel(this.inputChannel) + .outputChannel(this.outputChannel) + .build(); // then assertNotNull(taskletStep); @@ -266,15 +281,36 @@ class RemoteChunkingManagerStepBuilderTests { }; TaskletStep taskletStep = new RemoteChunkingManagerStepBuilder("step", this.jobRepository) - .reader(itemReader).readerIsTransactionalQueue().processor(itemProcessor) - .transactionManager(this.transactionManager).transactionAttribute(transactionAttribute) - .inputChannel(this.inputChannel).outputChannel(this.outputChannel).listener(annotatedListener) - .listener(skipListener).listener(chunkListener).listener(stepExecutionListener) - .listener(itemReadListener).listener(itemWriteListener).listener(retryListener).skip(Exception.class) - .noSkip(RuntimeException.class).skipLimit(10).retry(IOException.class).noRetry(RuntimeException.class) - .retryLimit(10).retryContextCache(retryCache).noRollback(Exception.class).startLimit(3) - .allowStartIfComplete(true).stepOperations(stepOperations).chunk(3).backOffPolicy(backOffPolicy) - .stream(stream).keyGenerator(Object::hashCode).build(); + .reader(itemReader) + .readerIsTransactionalQueue() + .processor(itemProcessor) + .transactionManager(this.transactionManager) + .transactionAttribute(transactionAttribute) + .inputChannel(this.inputChannel) + .outputChannel(this.outputChannel) + .listener(annotatedListener) + .listener(skipListener) + .listener(chunkListener) + .listener(stepExecutionListener) + .listener(itemReadListener) + .listener(itemWriteListener) + .listener(retryListener) + .skip(Exception.class) + .noSkip(RuntimeException.class) + .skipLimit(10) + .retry(IOException.class) + .noRetry(RuntimeException.class) + .retryLimit(10) + .retryContextCache(retryCache) + .noRollback(Exception.class) + .startLimit(3) + .allowStartIfComplete(true) + .stepOperations(stepOperations) + .chunk(3) + .backOffPolicy(backOffPolicy) + .stream(stream) + .keyGenerator(Object::hashCode) + .build(); JobExecution jobExecution = this.jobRepository.createJobExecution("job1", new JobParameters()); StepExecution stepExecution = new StepExecution("step1", jobExecution); @@ -328,7 +364,9 @@ class RemoteChunkingManagerStepBuilderTests { @Bean DataSource dataSource() { return new EmbeddedDatabaseBuilder().addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").generateUniqueName(true).build(); + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .generateUniqueName(true) + .build(); } @Bean diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkingWorkerBuilderTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkingWorkerBuilderTests.java index 753c38f36..c0d1562a7 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkingWorkerBuilderTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/chunk/RemoteChunkingWorkerBuilderTests.java @@ -93,8 +93,8 @@ class RemoteChunkingWorkerBuilderTests { void testMandatoryInputChannel() { // given RemoteChunkingWorkerBuilder builder = new RemoteChunkingWorkerBuilder() - .itemWriter(items -> { - }); + .itemWriter(items -> { + }); // when final Exception expectedException = assertThrows(IllegalArgumentException.class, builder::build); @@ -107,8 +107,9 @@ class RemoteChunkingWorkerBuilderTests { void testMandatoryOutputChannel() { // given RemoteChunkingWorkerBuilder builder = new RemoteChunkingWorkerBuilder() - .itemWriter(items -> { - }).inputChannel(new DirectChannel()); + .itemWriter(items -> { + }) + .inputChannel(new DirectChannel()); // when final Exception expectedException = assertThrows(IllegalArgumentException.class, builder::build); @@ -123,8 +124,10 @@ class RemoteChunkingWorkerBuilderTests { DirectChannel inputChannel = new DirectChannel(); DirectChannel outputChannel = new DirectChannel(); RemoteChunkingWorkerBuilder builder = new RemoteChunkingWorkerBuilder() - .itemProcessor(this.itemProcessor).itemWriter(this.itemWriter).inputChannel(inputChannel) - .outputChannel(outputChannel); + .itemProcessor(this.itemProcessor) + .itemWriter(this.itemWriter) + .inputChannel(inputChannel) + .outputChannel(outputChannel); // when IntegrationFlow integrationFlow = builder.build(); diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/config/xml/JobLauncherParserTestsConfiguration.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/config/xml/JobLauncherParserTestsConfiguration.java index d525fcc25..5b88e0c08 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/config/xml/JobLauncherParserTestsConfiguration.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/config/xml/JobLauncherParserTestsConfiguration.java @@ -33,7 +33,9 @@ public class JobLauncherParserTestsConfiguration { @Bean public DataSource dataSource() { return new EmbeddedDatabaseBuilder().addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").generateUniqueName(true).build(); + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .generateUniqueName(true) + .build(); } @Bean diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/config/xml/RemoteChunkingParserTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/config/xml/RemoteChunkingParserTests.java index 9b4a48de0..b2c894b28 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/config/xml/RemoteChunkingParserTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/config/xml/RemoteChunkingParserTests.java @@ -70,7 +70,7 @@ class RemoteChunkingParserTests { assertTrue(itemWriter instanceof Writer, "Got wrong instance of ItemWriter"); ItemProcessor itemProcessor = (ItemProcessor) TestUtils - .getPropertyValue(chunkProcessor, "itemProcessor"); + .getPropertyValue(chunkProcessor, "itemProcessor"); assertNotNull(itemProcessor, "ChunkProcessor ItemWriter must not be null"); assertTrue(itemProcessor instanceof Processor, "Got wrong instance of ItemProcessor"); @@ -104,7 +104,7 @@ class RemoteChunkingParserTests { assertNotNull(chunkProcessor, "ChunkProcessor must not be null"); ItemProcessor itemProcessor = (ItemProcessor) TestUtils - .getPropertyValue(chunkProcessor, "itemProcessor"); + .getPropertyValue(chunkProcessor, "itemProcessor"); assertNotNull(itemProcessor, "ChunkProcessor ItemWriter must not be null"); assertTrue(itemProcessor instanceof PassThroughItemProcessor, "Got wrong instance of ItemProcessor"); } @@ -121,7 +121,7 @@ class RemoteChunkingParserTests { assertNotNull(TestUtils.getPropertyValue(itemWriter, "replyChannel"), "Reply channel must not be null"); FactoryBean remoteChunkingHandlerFactoryBean = applicationContext - .getBean(RemoteChunkHandlerFactoryBean.class); + .getBean(RemoteChunkHandlerFactoryBean.class); assertNotNull(TestUtils.getPropertyValue(remoteChunkingHandlerFactoryBean, "chunkWriter"), "Chunk writer must not be null"); assertNotNull(TestUtils.getPropertyValue(remoteChunkingHandlerFactoryBean, "step"), "Step must not be null"); diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingGatewayTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingGatewayTests.java index 0b545dd1e..9bb331429 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingGatewayTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/launch/JobLaunchingGatewayTests.java @@ -42,11 +42,12 @@ class JobLaunchingGatewayTests { void testExceptionRaised() throws Exception { final Message message = MessageBuilder - .withPayload(new JobLaunchRequest(new JobSupport("testJob"), new JobParameters())).build(); + .withPayload(new JobLaunchRequest(new JobSupport("testJob"), new JobParameters())) + .build(); final JobLauncher jobLauncher = mock(JobLauncher.class); when(jobLauncher.run(any(Job.class), any(JobParameters.class))) - .thenThrow(new JobParametersInvalidException("This is a JobExecutionException.")); + .thenThrow(new JobParametersInvalidException("This is a JobExecutionException.")); JobLaunchingGateway jobLaunchingGateway = new JobLaunchingGateway(jobLauncher); Exception exception = assertThrows(MessageHandlingException.class, diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilderTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilderTests.java index 4da9aaf84..fc9ca6d28 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilderTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/RemotePartitioningManagerStepBuilderTests.java @@ -127,14 +127,16 @@ class RemotePartitioningManagerStepBuilderTests { void eitherOutputChannelOrMessagingTemplateMustBeProvided() { // given RemotePartitioningManagerStepBuilder builder = new RemotePartitioningManagerStepBuilder("step", - this.jobRepository).outputChannel(new DirectChannel()).messagingTemplate(new MessagingTemplate()); + this.jobRepository) + .outputChannel(new DirectChannel()) + .messagingTemplate(new MessagingTemplate()); // when final Exception expectedException = assertThrows(IllegalStateException.class, builder::build); // then assertThat(expectedException) - .hasMessage("You must specify either an outputChannel or a messagingTemplate but not both."); + .hasMessage("You must specify either an outputChannel or a messagingTemplate but not both."); } @Test @@ -169,9 +171,15 @@ class RemotePartitioningManagerStepBuilderTests { // when Step step = new RemotePartitioningManagerStepBuilder("managerStep", this.jobRepository) - .outputChannel(outputChannel).partitioner("workerStep", partitioner).gridSize(gridSize) - .pollInterval(pollInterval).timeout(timeout).startLimit(startLimit).aggregator(stepExecutionAggregator) - .allowStartIfComplete(true).build(); + .outputChannel(outputChannel) + .partitioner("workerStep", partitioner) + .gridSize(gridSize) + .pollInterval(pollInterval) + .timeout(timeout) + .startLimit(startLimit) + .aggregator(stepExecutionAggregator) + .allowStartIfComplete(true) + .build(); // then assertNotNull(step); @@ -206,8 +214,13 @@ class RemotePartitioningManagerStepBuilderTests { // when Step step = new RemotePartitioningManagerStepBuilder("managerStep", this.jobRepository) - .outputChannel(outputChannel).partitioner("workerStep", partitioner).gridSize(gridSize) - .startLimit(startLimit).aggregator(stepExecutionAggregator).allowStartIfComplete(true).build(); + .outputChannel(outputChannel) + .partitioner("workerStep", partitioner) + .gridSize(gridSize) + .startLimit(startLimit) + .aggregator(stepExecutionAggregator) + .allowStartIfComplete(true) + .build(); // then assertNotNull(step); @@ -239,7 +252,9 @@ class RemotePartitioningManagerStepBuilderTests { @Bean DataSource dataSource() { return new EmbeddedDatabaseBuilder().addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").generateUniqueName(true).build(); + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .generateUniqueName(true) + .build(); } @Bean diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/RemotePartitioningWorkerStepBuilderTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/RemotePartitioningWorkerStepBuilderTests.java index e781cf06c..87c4fbef1 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/RemotePartitioningWorkerStepBuilderTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/partition/RemotePartitioningWorkerStepBuilderTests.java @@ -130,7 +130,8 @@ class RemotePartitioningWorkerStepBuilderTests { // given DirectChannel inputChannel = new DirectChannel(); final RemotePartitioningWorkerStepBuilder builder = new RemotePartitioningWorkerStepBuilder("step", - this.jobRepository).inputChannel(inputChannel); + this.jobRepository) + .inputChannel(inputChannel); // when final Exception expectedException = assertThrows(IllegalArgumentException.class, diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/RepeatTransactionalPollingIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/RepeatTransactionalPollingIntegrationTests.java index 256445267..31a2d803e 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/RepeatTransactionalPollingIntegrationTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/RepeatTransactionalPollingIntegrationTests.java @@ -94,8 +94,8 @@ class RepeatTransactionalPollingIntegrationTests implements ApplicationContextAw @Test @DirtiesContext void testSunnyDay() throws Exception { - list = TransactionAwareProxyFactory.createTransactionalList( - Arrays.asList(StringUtils.commaDelimitedListToStringArray("a,b,c,d,e,f,g,h,j,k"))); + list = TransactionAwareProxyFactory + .createTransactionalList(Arrays.asList(StringUtils.commaDelimitedListToStringArray("a,b,c,d,e,f,g,h,j,k"))); expected = Arrays.asList(StringUtils.commaDelimitedListToStringArray("a,b,c,d")); waitForResults(bus, expected.size(), 60); assertEquals(expected, processed); diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/RetryRepeatTransactionalPollingIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/RetryRepeatTransactionalPollingIntegrationTests.java index ad8aaf339..c315ee457 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/RetryRepeatTransactionalPollingIntegrationTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/RetryRepeatTransactionalPollingIntegrationTests.java @@ -80,8 +80,8 @@ class RetryRepeatTransactionalPollingIntegrationTests implements ApplicationCont @Test @DirtiesContext void testSunnyDay() throws Exception { - list = TransactionAwareProxyFactory.createTransactionalList( - Arrays.asList(StringUtils.commaDelimitedListToStringArray("a,b,c,d,e,f,g,h,j,k"))); + list = TransactionAwareProxyFactory + .createTransactionalList(Arrays.asList(StringUtils.commaDelimitedListToStringArray("a,b,c,d,e,f,g,h,j,k"))); List expected = Arrays.asList(StringUtils.commaDelimitedListToStringArray("a,b,c,d")); service.setExpected(expected); waitForResults(lifecycle, expected.size(), 60); diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/RetryTransactionalPollingIntegrationTests.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/RetryTransactionalPollingIntegrationTests.java index 200f47628..5cf701a7f 100644 --- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/RetryTransactionalPollingIntegrationTests.java +++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/retry/RetryTransactionalPollingIntegrationTests.java @@ -82,8 +82,8 @@ public class RetryTransactionalPollingIntegrationTests implements ApplicationCon @Test @DirtiesContext void testSunnyDay() throws Exception { - list = TransactionAwareProxyFactory.createTransactionalList( - Arrays.asList(StringUtils.commaDelimitedListToStringArray("a,b,c,d,e,f,g,h,j,k"))); + list = TransactionAwareProxyFactory + .createTransactionalList(Arrays.asList(StringUtils.commaDelimitedListToStringArray("a,b,c,d,e,f,g,h,j,k"))); List expected = Arrays.asList(StringUtils.commaDelimitedListToStringArray("a,b,c,d")); service.setExpected(expected); waitForResults(bus, expected.size(), 60); diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/config/RetrySampleConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/config/RetrySampleConfiguration.java index b0d24e442..2724b9389 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/config/RetrySampleConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/config/RetrySampleConfiguration.java @@ -50,8 +50,13 @@ public class RetrySampleConfiguration { @Bean protected Step step(JobRepository jobRepository) { - return new StepBuilder("step", jobRepository).chunk(1, this.transactionManager).reader(reader()) - .writer(writer()).faultTolerant().retry(Exception.class).retryLimit(3).build(); + return new StepBuilder("step", jobRepository).chunk(1, this.transactionManager) + .reader(reader()) + .writer(writer()) + .faultTolerant() + .retry(Exception.class) + .retryLimit(3) + .build(); } @Bean diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/JdbcGameDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/JdbcGameDao.java index ee726c96e..dad2229df 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/JdbcGameDao.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/JdbcGameDao.java @@ -31,9 +31,10 @@ public class JdbcGameDao extends JdbcDaoSupport implements ItemWriter { @Override protected void initDao() throws Exception { super.initDao(); - insertGame = new SimpleJdbcInsert(getDataSource()).withTableName("GAMES").usingColumns("player_id", "year_no", - "team", "week", "opponent", " completes", "attempts", "passing_yards", "passing_td", "interceptions", - "rushes", "rush_yards", "receptions", "receptions_yards", "total_td"); + insertGame = new SimpleJdbcInsert(getDataSource()).withTableName("GAMES") + .usingColumns("player_id", "year_no", "team", "week", "opponent", " completes", "attempts", "passing_yards", + "passing_td", "interceptions", "rushes", "rush_yards", "receptions", "receptions_yards", + "total_td"); } @Override @@ -42,13 +43,20 @@ public class JdbcGameDao extends JdbcDaoSupport implements ItemWriter { for (Game game : games) { SqlParameterSource values = new MapSqlParameterSource().addValue("player_id", game.getId()) - .addValue("year_no", game.getYear()).addValue("team", game.getTeam()) - .addValue("week", game.getWeek()).addValue("opponent", game.getOpponent()) - .addValue("completes", game.getCompletes()).addValue("attempts", game.getAttempts()) - .addValue("passing_yards", game.getPassingYards()).addValue("passing_td", game.getPassingTd()) - .addValue("interceptions", game.getInterceptions()).addValue("rushes", game.getRushes()) - .addValue("rush_yards", game.getRushYards()).addValue("receptions", game.getReceptions()) - .addValue("receptions_yards", game.getReceptionYards()).addValue("total_td", game.getTotalTd()); + .addValue("year_no", game.getYear()) + .addValue("team", game.getTeam()) + .addValue("week", game.getWeek()) + .addValue("opponent", game.getOpponent()) + .addValue("completes", game.getCompletes()) + .addValue("attempts", game.getAttempts()) + .addValue("passing_yards", game.getPassingYards()) + .addValue("passing_td", game.getPassingTd()) + .addValue("interceptions", game.getInterceptions()) + .addValue("rushes", game.getRushes()) + .addValue("rush_yards", game.getRushYards()) + .addValue("receptions", game.getReceptions()) + .addValue("receptions_yards", game.getReceptionYards()) + .addValue("total_td", game.getTotalTd()); this.insertGame.execute(values); } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/JdbcPlayerSummaryDao.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/JdbcPlayerSummaryDao.java index 4b7e4c037..45b407bee 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/JdbcPlayerSummaryDao.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/football/internal/JdbcPlayerSummaryDao.java @@ -40,12 +40,17 @@ public class JdbcPlayerSummaryDao implements ItemWriter { for (PlayerSummary summary : summaries) { MapSqlParameterSource args = new MapSqlParameterSource().addValue("id", summary.getId()) - .addValue("year", summary.getYear()).addValue("completes", summary.getCompletes()) - .addValue("attempts", summary.getAttempts()).addValue("passingYards", summary.getPassingYards()) - .addValue("passingTd", summary.getPassingTd()).addValue("interceptions", summary.getInterceptions()) - .addValue("rushes", summary.getRushes()).addValue("rushYards", summary.getRushYards()) - .addValue("receptions", summary.getReceptions()) - .addValue("receptionYards", summary.getReceptionYards()).addValue("totalTd", summary.getTotalTd()); + .addValue("year", summary.getYear()) + .addValue("completes", summary.getCompletes()) + .addValue("attempts", summary.getAttempts()) + .addValue("passingYards", summary.getPassingYards()) + .addValue("passingTd", summary.getPassingTd()) + .addValue("interceptions", summary.getInterceptions()) + .addValue("rushes", summary.getRushes()) + .addValue("rushYards", summary.getRushYards()) + .addValue("receptions", summary.getReceptions()) + .addValue("receptionYards", summary.getReceptionYards()) + .addValue("totalTd", summary.getTotalTd()); namedParameterJdbcTemplate.update(INSERT_SUMMARY, args); } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/validator/OrderValidator.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/validator/OrderValidator.java index 0f6e4ab90..e2c3bbab1 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/validator/OrderValidator.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/validator/OrderValidator.java @@ -167,7 +167,7 @@ public class OrderValidator implements Validator { // price for single item = discountedPrice + shipping + handling BigDecimal singleItemPrice = discountedPrice.add(lineItem.getShippingPrice()) - .add(lineItem.getHandlingPrice()); + .add(lineItem.getHandlingPrice()); // total price = singleItemPrice * quantity BigDecimal quantity = new BigDecimal(lineItem.getQuantity()); diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/metrics/Job1Configuration.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/metrics/Job1Configuration.java index 0a001f6f4..bc572489e 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/metrics/Job1Configuration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/metrics/Job1Configuration.java @@ -39,7 +39,8 @@ public class Job1Configuration { @Bean public Job job1(JobRepository jobRepository, PlatformTransactionManager transactionManager) { return new JobBuilder("job1", jobRepository).start(step1(jobRepository, transactionManager)) - .next(step2(jobRepository, transactionManager)).build(); + .next(step2(jobRepository, transactionManager)) + .build(); } @Bean diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/metrics/Job2Configuration.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/metrics/Job2Configuration.java index 1d09d3147..17a07ca14 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/metrics/Job2Configuration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/metrics/Job2Configuration.java @@ -48,7 +48,9 @@ public class Job2Configuration { @Bean public Step step(JobRepository jobRepository, PlatformTransactionManager transactionManager) { return new StepBuilder("step1", jobRepository).chunk(3, transactionManager) - .reader(itemReader()).writer(itemWriter()).build(); + .reader(itemReader()) + .writer(itemWriter()) + .build(); } @Bean diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/metrics/JobScheduler.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/metrics/JobScheduler.java index ab5e6d4f2..06e9c417e 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/metrics/JobScheduler.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/metrics/JobScheduler.java @@ -27,7 +27,7 @@ public class JobScheduler { @Scheduled(cron = "*/10 * * * * *") public void launchJob1() throws Exception { JobParameters jobParameters = new JobParametersBuilder().addLong("time", System.currentTimeMillis()) - .toJobParameters(); + .toJobParameters(); jobLauncher.run(job1, jobParameters); } @@ -35,7 +35,7 @@ public class JobScheduler { @Scheduled(cron = "*/15 * * * * *") public void launchJob2() throws Exception { JobParameters jobParameters = new JobParametersBuilder().addLong("time", System.currentTimeMillis()) - .toJobParameters(); + .toJobParameters(); jobLauncher.run(job2, jobParameters); } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mongodb/DeletionJobConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/mongodb/DeletionJobConfiguration.java index 782ffde48..9babf2da2 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mongodb/DeletionJobConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/mongodb/DeletionJobConfiguration.java @@ -49,22 +49,30 @@ public class DeletionJobConfiguration { public MongoItemReader mongoPersonReader(MongoTemplate mongoTemplate) { Map sortOptions = new HashMap<>(); sortOptions.put("name", Sort.Direction.DESC); - return new MongoItemReaderBuilder().name("personItemReader").collection("person_out") - .targetType(Person.class).template(mongoTemplate) - .query(new Query().addCriteria(where("name").is("foo3"))).sorts(sortOptions).build(); + return new MongoItemReaderBuilder().name("personItemReader") + .collection("person_out") + .targetType(Person.class) + .template(mongoTemplate) + .query(new Query().addCriteria(where("name").is("foo3"))) + .sorts(sortOptions) + .build(); } @Bean public MongoItemWriter mongoPersonRemover(MongoTemplate mongoTemplate) { - return new MongoItemWriterBuilder().template(mongoTemplate).delete(true).collection("person_out") - .build(); + return new MongoItemWriterBuilder().template(mongoTemplate) + .delete(true) + .collection("person_out") + .build(); } @Bean public Step deletionStep(JobRepository jobRepository, PlatformTransactionManager transactionManager, MongoItemReader mongoPersonReader, MongoItemWriter mongoPersonRemover) { return new StepBuilder("step", jobRepository).chunk(2, transactionManager) - .reader(mongoPersonReader).writer(mongoPersonRemover).build(); + .reader(mongoPersonReader) + .writer(mongoPersonRemover) + .build(); } @Bean diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mongodb/InsertionJobConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/mongodb/InsertionJobConfiguration.java index cda2b3741..518d14a07 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mongodb/InsertionJobConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/mongodb/InsertionJobConfiguration.java @@ -46,8 +46,13 @@ public class InsertionJobConfiguration { public MongoItemReader mongoItemReader(MongoTemplate mongoTemplate) { Map sortOptions = new HashMap<>(); sortOptions.put("name", Sort.Direction.DESC); - return new MongoItemReaderBuilder().name("personItemReader").collection("person_in") - .targetType(Person.class).template(mongoTemplate).jsonQuery("{}").sorts(sortOptions).build(); + return new MongoItemReaderBuilder().name("personItemReader") + .collection("person_in") + .targetType(Person.class) + .template(mongoTemplate) + .jsonQuery("{}") + .sorts(sortOptions) + .build(); } @Bean @@ -59,7 +64,9 @@ public class InsertionJobConfiguration { public Step step(JobRepository jobRepository, PlatformTransactionManager transactionManager, MongoItemReader mongoItemReader, MongoItemWriter mongoItemWriter) { return new StepBuilder("step", jobRepository).chunk(2, transactionManager) - .reader(mongoItemReader).writer(mongoItemWriter).build(); + .reader(mongoItemReader) + .writer(mongoItemWriter) + .build(); } @Bean diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/remotechunking/DataSourceConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/remotechunking/DataSourceConfiguration.java index 0b55d46c7..9147d301d 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/remotechunking/DataSourceConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/remotechunking/DataSourceConfiguration.java @@ -32,7 +32,9 @@ public class DataSourceConfiguration { @Bean public DataSource dataSource() { return new EmbeddedDatabaseBuilder().addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").generateUniqueName(true).build(); + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .generateUniqueName(true) + .build(); } @Bean diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/remotechunking/ManagerConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/remotechunking/ManagerConfiguration.java index 725ef9810..c9c8317a2 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/remotechunking/ManagerConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/remotechunking/ManagerConfiguration.java @@ -78,8 +78,9 @@ public class ManagerConfiguration { @Bean public IntegrationFlow outboundFlow(ActiveMQConnectionFactory connectionFactory) { - return IntegrationFlow.from(requests()).handle(Jms.outboundAdapter(connectionFactory).destination("requests")) - .get(); + return IntegrationFlow.from(requests()) + .handle(Jms.outboundAdapter(connectionFactory).destination("requests")) + .get(); } /* @@ -93,7 +94,8 @@ public class ManagerConfiguration { @Bean public IntegrationFlow inboundFlow(ActiveMQConnectionFactory connectionFactory) { return IntegrationFlow.from(Jms.messageDrivenChannelAdapter(connectionFactory).destination("replies")) - .channel(replies()).get(); + .channel(replies()) + .get(); } /* @@ -106,8 +108,12 @@ public class ManagerConfiguration { @Bean public TaskletStep managerStep() { - return this.managerStepBuilderFactory.get("managerStep").chunk(3).reader(itemReader()) - .outputChannel(requests()).inputChannel(replies()).build(); + return this.managerStepBuilderFactory.get("managerStep") + .chunk(3) + .reader(itemReader()) + .outputChannel(requests()) + .inputChannel(replies()) + .build(); } @Bean diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/remotechunking/WorkerConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/remotechunking/WorkerConfiguration.java index 1da466a5d..84c185b3d 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/remotechunking/WorkerConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/remotechunking/WorkerConfiguration.java @@ -78,7 +78,8 @@ public class WorkerConfiguration { @Bean public IntegrationFlow inboundFlow(ActiveMQConnectionFactory connectionFactory) { return IntegrationFlow.from(Jms.messageDrivenChannelAdapter(connectionFactory).destination("requests")) - .channel(requests()).get(); + .channel(requests()) + .get(); } /* @@ -91,8 +92,9 @@ public class WorkerConfiguration { @Bean public IntegrationFlow outboundFlow(ActiveMQConnectionFactory connectionFactory) { - return IntegrationFlow.from(replies()).handle(Jms.outboundAdapter(connectionFactory).destination("replies")) - .get(); + return IntegrationFlow.from(replies()) + .handle(Jms.outboundAdapter(connectionFactory).destination("replies")) + .get(); } /* @@ -117,8 +119,11 @@ public class WorkerConfiguration { @Bean public IntegrationFlow workerIntegrationFlow() { - return this.remoteChunkingWorkerBuilder.itemProcessor(itemProcessor()).itemWriter(itemWriter()) - .inputChannel(requests()).outputChannel(replies()).build(); + return this.remoteChunkingWorkerBuilder.itemProcessor(itemProcessor()) + .itemWriter(itemWriter()) + .inputChannel(requests()) + .outputChannel(replies()) + .build(); } } diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/remotepartitioning/aggregating/ManagerConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/remotepartitioning/aggregating/ManagerConfiguration.java index baa6fc8ee..eb0dde1e4 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/remotepartitioning/aggregating/ManagerConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/remotepartitioning/aggregating/ManagerConfiguration.java @@ -65,8 +65,9 @@ public class ManagerConfiguration { @Bean public IntegrationFlow outboundFlow(ActiveMQConnectionFactory connectionFactory) { - return IntegrationFlow.from(requests()).handle(Jms.outboundAdapter(connectionFactory).destination("requests")) - .get(); + return IntegrationFlow.from(requests()) + .handle(Jms.outboundAdapter(connectionFactory).destination("requests")) + .get(); } /* @@ -80,7 +81,8 @@ public class ManagerConfiguration { @Bean public IntegrationFlow inboundFlow(ActiveMQConnectionFactory connectionFactory) { return IntegrationFlow.from(Jms.messageDrivenChannelAdapter(connectionFactory).destination("replies")) - .channel(replies()).get(); + .channel(replies()) + .get(); } /* @@ -88,8 +90,12 @@ public class ManagerConfiguration { */ @Bean public Step managerStep() { - return this.managerStepBuilderFactory.get("managerStep").partitioner("workerStep", new BasicPartitioner()) - .gridSize(GRID_SIZE).outputChannel(requests()).inputChannel(replies()).build(); + return this.managerStepBuilderFactory.get("managerStep") + .partitioner("workerStep", new BasicPartitioner()) + .gridSize(GRID_SIZE) + .outputChannel(requests()) + .inputChannel(replies()) + .build(); } @Bean diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/remotepartitioning/aggregating/WorkerConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/remotepartitioning/aggregating/WorkerConfiguration.java index 6f0069c53..6e83c4dfe 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/remotepartitioning/aggregating/WorkerConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/remotepartitioning/aggregating/WorkerConfiguration.java @@ -64,7 +64,8 @@ public class WorkerConfiguration { @Bean public IntegrationFlow inboundFlow(ActiveMQConnectionFactory connectionFactory) { return IntegrationFlow.from(Jms.messageDrivenChannelAdapter(connectionFactory).destination("requests")) - .channel(requests()).get(); + .channel(requests()) + .get(); } /* @@ -77,8 +78,9 @@ public class WorkerConfiguration { @Bean public IntegrationFlow outboundFlow(ActiveMQConnectionFactory connectionFactory) { - return IntegrationFlow.from(replies()).handle(Jms.outboundAdapter(connectionFactory).destination("replies")) - .get(); + return IntegrationFlow.from(replies()) + .handle(Jms.outboundAdapter(connectionFactory).destination("replies")) + .get(); } /* @@ -86,8 +88,11 @@ public class WorkerConfiguration { */ @Bean public Step workerStep(PlatformTransactionManager transactionManager) { - return this.workerStepBuilderFactory.get("workerStep").inputChannel(requests()).outputChannel(replies()) - .tasklet(tasklet(null), transactionManager).build(); + return this.workerStepBuilderFactory.get("workerStep") + .inputChannel(requests()) + .outputChannel(replies()) + .tasklet(tasklet(null), transactionManager) + .build(); } @Bean diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/remotepartitioning/polling/ManagerConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/remotepartitioning/polling/ManagerConfiguration.java index 820a92990..e179f057f 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/remotepartitioning/polling/ManagerConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/remotepartitioning/polling/ManagerConfiguration.java @@ -65,8 +65,9 @@ public class ManagerConfiguration { @Bean public IntegrationFlow outboundFlow(ActiveMQConnectionFactory connectionFactory) { - return IntegrationFlow.from(requests()).handle(Jms.outboundAdapter(connectionFactory).destination("requests")) - .get(); + return IntegrationFlow.from(requests()) + .handle(Jms.outboundAdapter(connectionFactory).destination("requests")) + .get(); } /* @@ -74,8 +75,11 @@ public class ManagerConfiguration { */ @Bean public Step managerStep() { - return this.managerStepBuilderFactory.get("managerStep").partitioner("workerStep", new BasicPartitioner()) - .gridSize(GRID_SIZE).outputChannel(requests()).build(); + return this.managerStepBuilderFactory.get("managerStep") + .partitioner("workerStep", new BasicPartitioner()) + .gridSize(GRID_SIZE) + .outputChannel(requests()) + .build(); } @Bean diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/remotepartitioning/polling/WorkerConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/remotepartitioning/polling/WorkerConfiguration.java index 98012b37a..747304aa8 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/remotepartitioning/polling/WorkerConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/remotepartitioning/polling/WorkerConfiguration.java @@ -64,7 +64,8 @@ public class WorkerConfiguration { @Bean public IntegrationFlow inboundFlow(ActiveMQConnectionFactory connectionFactory) { return IntegrationFlow.from(Jms.messageDrivenChannelAdapter(connectionFactory).destination("requests")) - .channel(requests()).get(); + .channel(requests()) + .get(); } /* @@ -72,8 +73,10 @@ public class WorkerConfiguration { */ @Bean public Step workerStep(PlatformTransactionManager transactionManager) { - return this.workerStepBuilderFactory.get("workerStep").inputChannel(requests()) - .tasklet(tasklet(null), transactionManager).build(); + return this.workerStepBuilderFactory.get("workerStep") + .inputChannel(requests()) + .tasklet(tasklet(null), transactionManager) + .build(); } @Bean diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/skip/DataSourceConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/skip/DataSourceConfiguration.java index 0cddf5004..9a464c4df 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/skip/DataSourceConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/skip/DataSourceConfiguration.java @@ -28,7 +28,9 @@ public class DataSourceConfiguration { @Bean public DataSource dataSource() { return new EmbeddedDatabaseBuilder().addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").generateUniqueName(true).build(); + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .generateUniqueName(true) + .build(); } @Bean diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/skip/SkippableExceptionDuringProcessSample.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/skip/SkippableExceptionDuringProcessSample.java index 805d16b8a..74a0f3935 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/skip/SkippableExceptionDuringProcessSample.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/skip/SkippableExceptionDuringProcessSample.java @@ -84,8 +84,13 @@ public class SkippableExceptionDuringProcessSample { @Bean public Step step(JobRepository jobRepository) { return new StepBuilder("step", jobRepository).chunk(3, this.transactionManager) - .reader(itemReader()).processor(itemProcessor()).writer(itemWriter()).faultTolerant() - .skip(IllegalArgumentException.class).skipLimit(3).build(); + .reader(itemReader()) + .processor(itemProcessor()) + .writer(itemWriter()) + .faultTolerant() + .skip(IllegalArgumentException.class) + .skipLimit(3) + .build(); } @Bean diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/skip/SkippableExceptionDuringReadSample.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/skip/SkippableExceptionDuringReadSample.java index 9bda9cbe3..871482dbb 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/skip/SkippableExceptionDuringReadSample.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/skip/SkippableExceptionDuringReadSample.java @@ -84,8 +84,13 @@ public class SkippableExceptionDuringReadSample { @Bean public Step step(JobRepository jobRepository) { return new StepBuilder("step", jobRepository).chunk(3, this.transactionManager) - .reader(itemReader()).processor(itemProcessor()).writer(itemWriter()).faultTolerant() - .skip(IllegalArgumentException.class).skipLimit(3).build(); + .reader(itemReader()) + .processor(itemProcessor()) + .writer(itemWriter()) + .faultTolerant() + .skip(IllegalArgumentException.class) + .skipLimit(3) + .build(); } @Bean diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/skip/SkippableExceptionDuringWriteSample.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/skip/SkippableExceptionDuringWriteSample.java index 225f0949f..f8cea00fa 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/skip/SkippableExceptionDuringWriteSample.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/skip/SkippableExceptionDuringWriteSample.java @@ -84,8 +84,13 @@ public class SkippableExceptionDuringWriteSample { @Bean public Step step(JobRepository jobRepository) { return new StepBuilder("step", jobRepository).chunk(3, this.transactionManager) - .reader(itemReader()).processor(itemProcessor()).writer(itemWriter()).faultTolerant() - .skip(IllegalArgumentException.class).skipLimit(3).build(); + .reader(itemReader()) + .processor(itemProcessor()) + .writer(itemWriter()) + .faultTolerant() + .skip(IllegalArgumentException.class) + .skipLimit(3) + .build(); } @Bean diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/ValidationSampleConfiguration.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/ValidationSampleConfiguration.java index af8573452..e3b402af7 100644 --- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/ValidationSampleConfiguration.java +++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/validation/ValidationSampleConfiguration.java @@ -66,7 +66,10 @@ public class ValidationSampleConfiguration { @Bean public Step step(JobRepository jobRepository) throws Exception { return new StepBuilder("step", jobRepository).chunk(1, transactionManager(dataSource())) - .reader(itemReader()).processor(itemValidator()).writer(itemWriter()).build(); + .reader(itemReader()) + .processor(itemValidator()) + .writer(itemWriter()) + .build(); } @Bean @@ -77,7 +80,9 @@ public class ValidationSampleConfiguration { @Bean public DataSource dataSource() { return new EmbeddedDatabaseBuilder().addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").generateUniqueName(true).build(); + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .generateUniqueName(true) + .build(); } @Bean diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/GracefulShutdownFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/GracefulShutdownFunctionalTests.java index fae8a1089..91693d069 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/GracefulShutdownFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/GracefulShutdownFunctionalTests.java @@ -59,7 +59,7 @@ class GracefulShutdownFunctionalTests { @Test void testLaunchJob() throws Exception { final JobParameters jobParameters = new JobParametersBuilder().addLong("timestamp", System.currentTimeMillis()) - .toJobParameters(); + .toJobParameters(); JobExecution jobExecution = jobLauncherTestUtils.launchJob(jobParameters); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java index fa1705636..b397608ca 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/HibernateFailureJobFunctionalTests.java @@ -124,17 +124,17 @@ class HibernateFailureJobFunctionalTests { protected void validatePreConditions() { ensureState(); creditsBeforeUpdate = new TransactionTemplate(transactionManager) - .execute(new TransactionCallback>() { - @Override - public List doInTransaction(TransactionStatus status) { - return jdbcTemplate.query(ALL_CUSTOMERS, new RowMapper() { - @Override - public BigDecimal mapRow(ResultSet rs, int rowNum) throws SQLException { - return rs.getBigDecimal(CREDIT_COLUMN); - } - }); - } - }); + .execute(new TransactionCallback>() { + @Override + public List doInTransaction(TransactionStatus status) { + return jdbcTemplate.query(ALL_CUSTOMERS, new RowMapper() { + @Override + public BigDecimal mapRow(ResultSet rs, int rowNum) throws SQLException { + return rs.getBigDecimal(CREDIT_COLUMN); + } + }); + } + }); } /* diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/JobStepFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/JobStepFunctionalTests.java index 875244aef..7d2f605d5 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/JobStepFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/JobStepFunctionalTests.java @@ -56,8 +56,8 @@ class JobStepFunctionalTests { JdbcTestUtils.deleteFromTables(jdbcTemplate, "TRADE"); jobLauncherTestUtils - .launchJob(new DefaultJobParametersConverter().getJobParameters(PropertiesConverter.stringToProperties( - "input.file=classpath:data/fixedLengthImportJob/input/20070122.teststream.ImportTradeDataStep.txt"))); + .launchJob(new DefaultJobParametersConverter().getJobParameters(PropertiesConverter.stringToProperties( + "input.file=classpath:data/fixedLengthImportJob/input/20070122.teststream.ImportTradeDataStep.txt"))); int after = JdbcTestUtils.countRowsInTable(jdbcTemplate, "TRADE"); assertEquals(5, after); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/JsonSupportIntegrationTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/JsonSupportIntegrationTests.java index 6f2e417a6..7eb693988 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/JsonSupportIntegrationTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/JsonSupportIntegrationTests.java @@ -76,21 +76,27 @@ class JsonSupportIntegrationTests { @Bean public JsonItemReader itemReader() { return new JsonItemReaderBuilder().name("tradesJsonItemReader") - .resource(new FileSystemResource(INPUT_FILE_DIRECTORY + "trades.json")) - .jsonObjectReader(new GsonJsonObjectReader<>(Trade.class)).build(); + .resource(new FileSystemResource(INPUT_FILE_DIRECTORY + "trades.json")) + .jsonObjectReader(new GsonJsonObjectReader<>(Trade.class)) + .build(); } @Bean public JsonFileItemWriter itemWriter() { return new JsonFileItemWriterBuilder() - .resource(new FileSystemResource(OUTPUT_FILE_DIRECTORY + "trades.json")).lineSeparator("\n") - .jsonObjectMarshaller(new JacksonJsonObjectMarshaller<>()).name("tradesJsonFileItemWriter").build(); + .resource(new FileSystemResource(OUTPUT_FILE_DIRECTORY + "trades.json")) + .lineSeparator("\n") + .jsonObjectMarshaller(new JacksonJsonObjectMarshaller<>()) + .name("tradesJsonFileItemWriter") + .build(); } @Bean public Step step(JobRepository jobRepository) { return new StepBuilder("step", jobRepository).chunk(2, transactionManager(dataSource())) - .reader(itemReader()).writer(itemWriter()).build(); + .reader(itemReader()) + .writer(itemWriter()) + .build(); } @Bean @@ -101,7 +107,9 @@ class JsonSupportIntegrationTests { @Bean public DataSource dataSource() { return new EmbeddedDatabaseBuilder().addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").generateUniqueName(true).build(); + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .generateUniqueName(true) + .build(); } @Bean diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionFileJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionFileJobFunctionalTests.java index c638483cd..c5518ac89 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionFileJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionFileJobFunctionalTests.java @@ -76,7 +76,7 @@ class PartitionFileJobFunctionalTests implements ApplicationContextAware { @SuppressWarnings("unchecked") ItemReader outputReader = (ItemReader) applicationContext - .getBean("outputTestReader"); + .getBean("outputTestReader"); open(outputReader); List outputs = new ArrayList<>(getCredits(outputReader)); close(outputReader); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionJdbcJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionJdbcJobFunctionalTests.java index 60c913101..067961323 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionJdbcJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/PartitionJdbcJobFunctionalTests.java @@ -76,7 +76,7 @@ class PartitionJdbcJobFunctionalTests implements ApplicationContextAware { @SuppressWarnings("unchecked") ItemReader outputReader = (ItemReader) applicationContext - .getBean("outputTestReader"); + .getBean("outputTestReader"); open(outputReader); List outputs = new ArrayList<>(getCredits(outputReader)); close(outputReader); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RemoteChunkingJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RemoteChunkingJobFunctionalTests.java index 8b2d60694..c3f408972 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RemoteChunkingJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RemoteChunkingJobFunctionalTests.java @@ -59,8 +59,10 @@ class RemoteChunkingJobFunctionalTests { @BeforeEach void setUp() throws Exception { Configuration configuration = new ConfigurationImpl().addAcceptorConfiguration("jms", "tcp://localhost:61616") - .setPersistenceEnabled(false).setSecurityEnabled(false).setJMXManagementEnabled(false) - .setJournalDatasync(false); + .setPersistenceEnabled(false) + .setSecurityEnabled(false) + .setJMXManagementEnabled(false) + .setJournalDatasync(false); this.brokerService = new EmbeddedActiveMQ().setConfiguration(configuration).start(); this.workerApplicationContext = new AnnotationConfigApplicationContext(WorkerConfiguration.class); } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RemotePartitioningJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RemotePartitioningJobFunctionalTests.java index 4199ce8ee..2a2c73bb6 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RemotePartitioningJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RemotePartitioningJobFunctionalTests.java @@ -69,8 +69,10 @@ public abstract class RemotePartitioningJobFunctionalTests { @BeforeEach void setUp() throws Exception { Configuration configuration = new ConfigurationImpl().addAcceptorConfiguration("jms", "tcp://localhost:61617") - .setPersistenceEnabled(false).setSecurityEnabled(false).setJMXManagementEnabled(false) - .setJournalDatasync(false); + .setPersistenceEnabled(false) + .setSecurityEnabled(false) + .setJMXManagementEnabled(false) + .setJournalDatasync(false); this.brokerService = new EmbeddedActiveMQ().setConfiguration(configuration).start(); ResourceDatabasePopulator databasePopulator = new ResourceDatabasePopulator(); databasePopulator.addScript(new ClassPathResource("/org/springframework/batch/core/schema-drop-hsqldb.sql")); diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RestartFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RestartFunctionalTests.java index 118abcf7e..5c5b074c0 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/RestartFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/RestartFunctionalTests.java @@ -93,8 +93,8 @@ class RestartFunctionalTests { // load the application context and launch the job private JobExecution runJobForRestartTest() throws Exception { return jobLauncherTestUtils - .launchJob(new DefaultJobParametersConverter().getJobParameters(PropertiesConverter.stringToProperties( - "input.file=classpath:data/fixedLengthImportJob/input/20070122.teststream.ImportTradeDataStep.txt"))); + .launchJob(new DefaultJobParametersConverter().getJobParameters(PropertiesConverter.stringToProperties( + "input.file=classpath:data/fixedLengthImportJob/input/20070122.teststream.ImportTradeDataStep.txt"))); } } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/TaskletJobFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/TaskletJobFunctionalTests.java index c6454d260..9ee37466b 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/TaskletJobFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/TaskletJobFunctionalTests.java @@ -38,7 +38,7 @@ class TaskletJobFunctionalTests { @Test void testLaunchJob() throws Exception { JobExecution jobExecution = jobLauncherTestUtils - .launchJob(new JobParametersBuilder().addString("value", "foo").toJobParameters()); + .launchJob(new JobParametersBuilder().addString("value", "foo").toJobParameters()); assertEquals(BatchStatus.COMPLETED, jobExecution.getStatus()); assertEquals("yes", jobExecution.getExecutionContext().getString("done")); } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/DelimitedFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/DelimitedFunctionalTests.java index 3ac784616..92b47ff4a 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/DelimitedFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/DelimitedFunctionalTests.java @@ -37,7 +37,8 @@ class DelimitedFunctionalTests extends AbstractIoSampleTests { @Override protected void pointReaderToOutput(ItemReader reader) { JobParameters jobParameters = super.getUniqueJobParametersBuilder() - .addString("inputFile", "file:./target/test-outputs/delimitedOutput.csv").toJobParameters(); + .addString("inputFile", "file:./target/test-outputs/delimitedOutput.csv") + .toJobParameters(); StepExecution stepExecution = MetaDataInstanceFactory.createStepExecution(jobParameters); StepSynchronizationManager.close(); StepSynchronizationManager.register(stepExecution); @@ -46,7 +47,8 @@ class DelimitedFunctionalTests extends AbstractIoSampleTests { @Override protected JobParameters getUniqueJobParameters() { return super.getUniqueJobParametersBuilder().addString("inputFile", "data/iosample/input/delimited.csv") - .addString("outputFile", "file:./target/test-outputs/delimitedOutput.csv").toJobParameters(); + .addString("outputFile", "file:./target/test-outputs/delimitedOutput.csv") + .toJobParameters(); } } \ No newline at end of file diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/FixedLengthFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/FixedLengthFunctionalTests.java index d2280387d..0fb8325ff 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/FixedLengthFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/FixedLengthFunctionalTests.java @@ -30,7 +30,8 @@ class FixedLengthFunctionalTests extends AbstractIoSampleTests { @Override protected void pointReaderToOutput(ItemReader reader) { JobParameters jobParameters = super.getUniqueJobParametersBuilder() - .addString("inputFile", "file:./target/test-outputs/fixedLengthOutput.txt").toJobParameters(); + .addString("inputFile", "file:./target/test-outputs/fixedLengthOutput.txt") + .toJobParameters(); StepExecution stepExecution = MetaDataInstanceFactory.createStepExecution(jobParameters); StepSynchronizationManager.close(); StepSynchronizationManager.register(stepExecution); @@ -39,7 +40,8 @@ class FixedLengthFunctionalTests extends AbstractIoSampleTests { @Override protected JobParameters getUniqueJobParameters() { return super.getUniqueJobParametersBuilder().addString("inputFile", "data/iosample/input/fixedLength.txt") - .addString("outputFile", "file:./target/test-outputs/fixedLengthOutput.txt").toJobParameters(); + .addString("outputFile", "file:./target/test-outputs/fixedLengthOutput.txt") + .toJobParameters(); } } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/MultiResourceFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/MultiResourceFunctionalTests.java index bec690751..8c24a534e 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/MultiResourceFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/MultiResourceFunctionalTests.java @@ -37,7 +37,8 @@ class MultiResourceFunctionalTests extends AbstractIoSampleTests { @Override protected void pointReaderToOutput(ItemReader reader) { JobParameters jobParameters = super.getUniqueJobParametersBuilder() - .addString("input.file.path", "file:target/test-outputs/multiResourceOutput.csv.*").toJobParameters(); + .addString("input.file.path", "file:target/test-outputs/multiResourceOutput.csv.*") + .toJobParameters(); StepExecution stepExecution = MetaDataInstanceFactory.createStepExecution(jobParameters); StepSynchronizationManager.close(); StepSynchronizationManager.register(stepExecution); @@ -47,7 +48,8 @@ class MultiResourceFunctionalTests extends AbstractIoSampleTests { protected JobParameters getUniqueJobParameters() { JobParametersBuilder builder = super.getUniqueJobParametersBuilder(); return builder.addString("input.file.path", "classpath:data/iosample/input/delimited*.csv") - .addString("output.file.path", "file:target/test-outputs/multiResourceOutput.csv").toJobParameters(); + .addString("output.file.path", "file:target/test-outputs/multiResourceOutput.csv") + .toJobParameters(); } } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/TwoJobInstancesDelimitedFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/TwoJobInstancesDelimitedFunctionalTests.java index ad50a8cb7..f0df71098 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/TwoJobInstancesDelimitedFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/TwoJobInstancesDelimitedFunctionalTests.java @@ -75,7 +75,8 @@ class TwoJobInstancesDelimitedFunctionalTests { private void verifyOutput(int expected) throws Exception { JobParameters jobParameters = new JobParametersBuilder() - .addString("inputFile", "file:./target/test-outputs/delimitedOutput.csv").toJobParameters(); + .addString("inputFile", "file:./target/test-outputs/delimitedOutput.csv") + .toJobParameters(); StepExecution stepExecution = MetaDataInstanceFactory.createStepExecution(jobParameters); int count = StepScopeTestUtils.doInStepScope(stepExecution, new Callable() { @@ -101,8 +102,10 @@ class TwoJobInstancesDelimitedFunctionalTests { } protected JobParameters getJobParameters(String fileName) { - return new JobParametersBuilder().addLong("timestamp", new Date().getTime()).addString("inputFile", fileName) - .addString("outputFile", "file:./target/test-outputs/delimitedOutput.csv").toJobParameters(); + return new JobParametersBuilder().addLong("timestamp", new Date().getTime()) + .addString("inputFile", fileName) + .addString("outputFile", "file:./target/test-outputs/delimitedOutput.csv") + .toJobParameters(); } } diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/TwoJobInstancesPagingFunctionalTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/TwoJobInstancesPagingFunctionalTests.java index 781af3945..46b65a08e 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/TwoJobInstancesPagingFunctionalTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/iosample/TwoJobInstancesPagingFunctionalTests.java @@ -73,8 +73,9 @@ class TwoJobInstancesPagingFunctionalTests { } protected JobParameters getJobParameters(double amount) { - return new JobParametersBuilder().addLong("timestamp", new Date().getTime()).addDouble("credit", amount) - .toJobParameters(); + return new JobParametersBuilder().addLong("timestamp", new Date().getTime()) + .addDouble("credit", amount) + .toJobParameters(); } } diff --git a/spring-batch-test/src/main/java/org/springframework/batch/test/AssertFile.java b/spring-batch-test/src/main/java/org/springframework/batch/test/AssertFile.java index 625cbf8d7..8c1170c6c 100644 --- a/spring-batch-test/src/main/java/org/springframework/batch/test/AssertFile.java +++ b/spring-batch-test/src/main/java/org/springframework/batch/test/AssertFile.java @@ -69,7 +69,7 @@ public abstract class AssertFile { lineCount++; } Assert.state(expectedLineCount == lineCount, String - .format("Line count of %d does not match expected count of %d", lineCount, expectedLineCount)); + .format("Line count of %d does not match expected count of %d", lineCount, expectedLineCount)); } finally { expectedReader.close(); diff --git a/spring-batch-test/src/main/java/org/springframework/batch/test/MetaDataInstanceFactory.java b/spring-batch-test/src/main/java/org/springframework/batch/test/MetaDataInstanceFactory.java index 8d9d364ef..1348b39e6 100644 --- a/spring-batch-test/src/main/java/org/springframework/batch/test/MetaDataInstanceFactory.java +++ b/spring-batch-test/src/main/java/org/springframework/batch/test/MetaDataInstanceFactory.java @@ -121,7 +121,7 @@ public class MetaDataInstanceFactory { public static JobExecution createJobExecution(String jobName, Long instanceId, Long executionId, String jobParameters) { JobParameters params = new DefaultJobParametersConverter() - .getJobParameters(PropertiesConverter.stringToProperties(jobParameters)); + .getJobParameters(PropertiesConverter.stringToProperties(jobParameters)); return createJobExecution(jobName, instanceId, executionId, params); } diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/AbstractSampleJobTests.java b/spring-batch-test/src/test/java/org/springframework/batch/test/AbstractSampleJobTests.java index 50ba4cfa0..0cbc7c234 100644 --- a/spring-batch-test/src/test/java/org/springframework/batch/test/AbstractSampleJobTests.java +++ b/spring-batch-test/src/test/java/org/springframework/batch/test/AbstractSampleJobTests.java @@ -108,8 +108,8 @@ abstract class AbstractSampleJobTests { private void verifyTasklet(int id) { assertEquals(id, jdbcTemplate - .queryForObject("SELECT ID from TESTS where NAME = 'SampleTasklet" + id + "'", Integer.class) - .intValue()); + .queryForObject("SELECT ID from TESTS where NAME = 'SampleTasklet" + id + "'", Integer.class) + .intValue()); } } diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/JobLauncherTestUtilsTests.java b/spring-batch-test/src/test/java/org/springframework/batch/test/JobLauncherTestUtilsTests.java index fb46c44a1..e378cfd92 100644 --- a/spring-batch-test/src/test/java/org/springframework/batch/test/JobLauncherTestUtilsTests.java +++ b/spring-batch-test/src/test/java/org/springframework/batch/test/JobLauncherTestUtilsTests.java @@ -109,7 +109,9 @@ class JobLauncherTestUtilsTests { @Bean public DataSource dataSource() { return new EmbeddedDatabaseBuilder().addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").generateUniqueName(true).build(); + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .generateUniqueName(true) + .build(); } @Bean diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/MetaDataInstanceFactoryTests.java b/spring-batch-test/src/test/java/org/springframework/batch/test/MetaDataInstanceFactoryTests.java index 2284e29b1..d48a03713 100644 --- a/spring-batch-test/src/test/java/org/springframework/batch/test/MetaDataInstanceFactoryTests.java +++ b/spring-batch-test/src/test/java/org/springframework/batch/test/MetaDataInstanceFactoryTests.java @@ -37,7 +37,7 @@ class MetaDataInstanceFactoryTests { private final String jobParametersString = "foo=bar"; private final JobParameters jobParameters = new DefaultJobParametersConverter() - .getJobParameters(PropertiesConverter.stringToProperties(jobParametersString)); + .getJobParameters(PropertiesConverter.stringToProperties(jobParametersString)); private final Long executionId = 4321L; 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 58db30944..e16e1410a 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 @@ -64,7 +64,7 @@ class SampleStepTests implements ApplicationContextAware { Step step = (Step) context.getBean("s2"); assertEquals(BatchStatus.COMPLETED, stepRunner.launchStep(step).getStatus()); assertEquals(2, jdbcTemplate.queryForObject("SELECT ID from TESTS where NAME = 'SampleTasklet2'", Integer.class) - .intValue()); + .intValue()); } @Override diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/SpringBatchTestJUnit4Tests.java b/spring-batch-test/src/test/java/org/springframework/batch/test/SpringBatchTestJUnit4Tests.java index 99eb2cdba..dbe3f22da 100644 --- a/spring-batch-test/src/test/java/org/springframework/batch/test/SpringBatchTestJUnit4Tests.java +++ b/spring-batch-test/src/test/java/org/springframework/batch/test/SpringBatchTestJUnit4Tests.java @@ -112,8 +112,9 @@ public class SpringBatchTestJUnit4Tests { @Bean public DataSource dataSource() { return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL) - .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").build(); + .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .build(); } @Bean @@ -135,9 +136,11 @@ public class SpringBatchTestJUnit4Tests { @Bean public Job job(JobRepository jobRepository) { - return new JobBuilder("job", jobRepository).start(new StepBuilder("step", jobRepository) + return new JobBuilder("job", jobRepository) + .start(new StepBuilder("step", jobRepository) .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager(dataSource())) - .build()).build(); + .build()) + .build(); } } diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/SpringBatchTestJUnit5Tests.java b/spring-batch-test/src/test/java/org/springframework/batch/test/SpringBatchTestJUnit5Tests.java index ec24285f4..924779cc1 100644 --- a/spring-batch-test/src/test/java/org/springframework/batch/test/SpringBatchTestJUnit5Tests.java +++ b/spring-batch-test/src/test/java/org/springframework/batch/test/SpringBatchTestJUnit5Tests.java @@ -115,8 +115,9 @@ public class SpringBatchTestJUnit5Tests { @Bean public DataSource dataSource() { return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL) - .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").build(); + .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .build(); } @Bean @@ -138,9 +139,11 @@ public class SpringBatchTestJUnit5Tests { @Bean public Job job(JobRepository jobRepository) { - return new JobBuilder("job", jobRepository).start(new StepBuilder("step", jobRepository) + return new JobBuilder("job", jobRepository) + .start(new StepBuilder("step", jobRepository) .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager(dataSource())) - .build()).build(); + .build()) + .build(); } } diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/StepScopeAnnotatedListenerIntegrationTests.java b/spring-batch-test/src/test/java/org/springframework/batch/test/StepScopeAnnotatedListenerIntegrationTests.java index e26410dcb..4d685cb66 100644 --- a/spring-batch-test/src/test/java/org/springframework/batch/test/StepScopeAnnotatedListenerIntegrationTests.java +++ b/spring-batch-test/src/test/java/org/springframework/batch/test/StepScopeAnnotatedListenerIntegrationTests.java @@ -117,8 +117,9 @@ class StepScopeAnnotatedListenerIntegrationTests { public DataSource dataSource() { EmbeddedDatabaseBuilder embeddedDatabaseBuilder = new EmbeddedDatabaseBuilder(); return embeddedDatabaseBuilder.addScript("classpath:org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("classpath:org/springframework/batch/core/schema-hsqldb.sql") - .setType(EmbeddedDatabaseType.HSQL).build(); + .addScript("classpath:org/springframework/batch/core/schema-hsqldb.sql") + .setType(EmbeddedDatabaseType.HSQL) + .build(); } @Bean @@ -134,7 +135,10 @@ class StepScopeAnnotatedListenerIntegrationTests { @Bean public Step stepUnderTest(JobRepository jobRepository) { return new StepBuilder("step-under-test", jobRepository).chunk(1, this.transactionManager) - .reader(reader()).processor(processor()).writer(writer()).build(); + .reader(reader()) + .processor(processor()) + .writer(writer()) + .build(); } @Bean diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/context/BatchTestContextBeanPostProcessorTests.java b/spring-batch-test/src/test/java/org/springframework/batch/test/context/BatchTestContextBeanPostProcessorTests.java index 51c515c0e..06e225b2e 100644 --- a/spring-batch-test/src/test/java/org/springframework/batch/test/context/BatchTestContextBeanPostProcessorTests.java +++ b/spring-batch-test/src/test/java/org/springframework/batch/test/context/BatchTestContextBeanPostProcessorTests.java @@ -99,8 +99,10 @@ class BatchTestContextBeanPostProcessorTests { @Bean DataSource dataSource() { return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL) - .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").generateUniqueName(true).build(); + .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .generateUniqueName(true) + .build(); } @Bean diff --git a/spring-batch-test/src/test/java/org/springframework/batch/test/observability/ObservabilitySampleStepTests.java b/spring-batch-test/src/test/java/org/springframework/batch/test/observability/ObservabilitySampleStepTests.java index 9a85eb950..377aabf93 100644 --- a/spring-batch-test/src/test/java/org/springframework/batch/test/observability/ObservabilitySampleStepTests.java +++ b/spring-batch-test/src/test/java/org/springframework/batch/test/observability/ObservabilitySampleStepTests.java @@ -92,8 +92,9 @@ class ObservabilitySampleStepTests extends SampleTestRunner { assertThat(bb.getFinishedSpans()).haveSameTraceId().hasASpanWithName("job").hasASpanWithName("step"); // and - MeterRegistryAssert.assertThat(meterRegistry).hasTimerWithName("spring.batch.job") - .hasTimerWithName("spring.batch.step"); + MeterRegistryAssert.assertThat(meterRegistry) + .hasTimerWithName("spring.batch.job") + .hasTimerWithName("spring.batch.step"); }; } @@ -105,14 +106,15 @@ class ObservabilitySampleStepTests extends SampleTestRunner { public ObservationRegistry observationRegistry() { ObservationRegistry observationRegistry = ObservationRegistry.create(); observationRegistry.observationConfig() - .observationHandler(new DefaultMeterObservationHandler(Metrics.globalRegistry)); + .observationHandler(new DefaultMeterObservationHandler(Metrics.globalRegistry)); return observationRegistry; } @Bean public Step step(JobRepository jobRepository, JdbcTransactionManager transactionManager) { return new StepBuilder("step", jobRepository) - .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager).build(); + .tasklet((contribution, chunkContext) -> RepeatStatus.FINISHED, transactionManager) + .build(); } @Bean @@ -123,8 +125,9 @@ class ObservabilitySampleStepTests extends SampleTestRunner { @Bean public DataSource dataSource() { return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.HSQL) - .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") - .addScript("/org/springframework/batch/core/schema-hsqldb.sql").build(); + .addScript("/org/springframework/batch/core/schema-drop-hsqldb.sql") + .addScript("/org/springframework/batch/core/schema-hsqldb.sql") + .build(); } @Bean