diff --git a/pom.xml b/pom.xml
index 76e379f51..390eab4db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,6 +87,9 @@
* The ID defaults to zero. */ public Entity() { diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/ExitStatus.java b/spring-batch-core/src/main/java/org/springframework/batch/core/ExitStatus.java index 510861f1c..0464017b2 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/ExitStatus.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/ExitStatus.java @@ -23,7 +23,7 @@ import java.io.StringWriter; /** * Value object used to carry information about the status of a job or step execution. - * + *
* {@code ExitStatus} is immutable and, therefore, thread-safe. * * @author Dave Syer diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/JobExecution.java b/spring-batch-core/src/main/java/org/springframework/batch/core/JobExecution.java index b4520201b..fc2096e71 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/JobExecution.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/JobExecution.java @@ -305,7 +305,7 @@ public class JobExecution extends Entity { /** * Package-private method for re-constituting the step executions from existing * instances. - * @param The {@code stepExecution} execution to be added. + * @param stepExecution The {@code stepExecution} execution to be added. */ void addStepExecution(StepExecution stepExecution) { stepExecutions.add(stepExecution); diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/JobInstance.java b/spring-batch-core/src/main/java/org/springframework/batch/core/JobInstance.java index d1211c23a..6fd343a4e 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/JobInstance.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/JobInstance.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2022 the original author or authors. + * Copyright 2006-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ import org.springframework.util.Assert; * Batch domain object representing a uniquely identifiable job run. {@code JobInstance} * can be restarted multiple times in case of execution failure, and its lifecycle ends * with first successful execution. - * + *
* Trying to execute an existing {@code JobInstance} that has already completed * successfully results in an error. An error is also raised for an attempt to restart a * failed {@code JobInstance} if the {@code Job} is not restartable. diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/JobParameters.java b/spring-batch-core/src/main/java/org/springframework/batch/core/JobParameters.java index 3589facb1..44078f7db 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/JobParameters.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/JobParameters.java @@ -40,7 +40,7 @@ import org.springframework.util.Assert; * order to determine if one {@code JobParameters} object equals another. Furthermore, * because these parameters need to be persisted, it is vital that the types added are * restricted. - * + *
* This class is immutable and, therefore, thread-safe. * * @author Lucas Ward diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/StepExecutionListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/StepExecutionListener.java index e4cb6899f..f1e9a26ba 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/StepExecutionListener.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/StepExecutionListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2022 the original author or authors. + * Copyright 2006-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,7 +39,7 @@ public interface StepExecutionListener extends StepListener { * Give a listener a chance to modify the exit status from a step. The value returned * is combined with the normal exit status by using * {@link ExitStatus#and(ExitStatus)}. - * + *
* Called after execution of the step's processing logic (whether successful or * failed). Throwing an exception in this method has no effect, as it is only logged. * @param stepExecution a {@link StepExecution} instance. diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/DefaultBatchConfiguration.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/DefaultBatchConfiguration.java index 438db0d91..60a89dbf2 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/DefaultBatchConfiguration.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/DefaultBatchConfiguration.java @@ -74,7 +74,7 @@ import org.springframework.transaction.annotation.Isolation; /** * Base {@link Configuration} class that provides common JDBC-based infrastructure beans * for enabling and using Spring Batch. - * + *
* This configuration class configures and registers the following beans in the * application context: * @@ -89,10 +89,8 @@ import org.springframework.transaction.annotation.Isolation; * * * Customization is possible by extending the class and overriding getters. - * - * A typical usage of this class is as follows: - * - *
+ *+ * A typical usage of this class is as follows:
* @Configuration * public class MyJobConfiguration extends DefaultBatchConfiguration { * diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/GenericApplicationContextFactory.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/GenericApplicationContextFactory.java index fb2c87e26..a9074f667 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/GenericApplicationContextFactory.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/support/GenericApplicationContextFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2022 the original author or authors. + * Copyright 2006-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -138,9 +138,6 @@ public class GenericApplicationContextFactory extends AbstractApplicationContext private final ApplicationContextHelper helper; - /** - * @param parent - */ public ResourceXmlApplicationContext(ConfigurableApplicationContext parent, Object... resources) { class ResourceXmlApplicationContextHelper extends ApplicationContextHelper { 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 15830607d..6c3c13af5 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 @@ -265,7 +265,7 @@ public class ChunkElementParser { /** * Handle the adapter method attribute by using an - * {@link AbstractMethodInvokingDelegator}. + * {@link org.springframework.batch.item.adapter.AbstractMethodInvokingDelegator}. */ private void handleAdapterMethodAttribute(String propertyName, String adapterClassName, MutablePropertyValues stepPvs, Element element) { diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/CoreNamespacePostProcessor.java b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/CoreNamespacePostProcessor.java index a325951a8..7f250d389 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/CoreNamespacePostProcessor.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/configuration/xml/CoreNamespacePostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2006-2021 the original author or authors. + * Copyright 2006-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -60,8 +60,8 @@ public class CoreNamespacePostProcessor /** * Automatically inject job-repository from a job into its steps. Only inject if the * step is an AbstractStep or StepParserStepFactoryBean. - * @param beanName - * @param beanFactory + * @param beanName the bean name + * @param beanFactory the bean factory */ private void injectJobRepositoryIntoSteps(String beanName, ConfigurableListableBeanFactory beanFactory) { BeanDefinition bd = beanFactory.getBeanDefinition(beanName); @@ -87,8 +87,8 @@ public class CoreNamespacePostProcessor /** * If any of the beans in the parent hierarchy is a <step/> with a * <tasklet/>, then the bean class must be {@link StepParserStepFactoryBean}. - * @param beanName - * @param beanFactory + * @param beanName the bean name + * @param beanFactory the bean factory */ private void overrideStepClass(String beanName, ConfigurableListableBeanFactory beanFactory) { BeanDefinition bd = beanFactory.getBeanDefinition(beanName); @@ -111,8 +111,8 @@ public class CoreNamespacePostProcessor *
* This converter formats dates according to the * {@link java.time.format.DateTimeFormatter#ISO_INSTANT} format. * diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/DefaultJobParametersConverter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/DefaultJobParametersConverter.java index 99df62792..ab0cfdb6b 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/DefaultJobParametersConverter.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/DefaultJobParametersConverter.java @@ -32,9 +32,9 @@ import org.springframework.util.StringUtils; /** * Converter for {@link JobParameters} instances that uses a simple naming convention for * converting job parameters. The expected notation is the following: - * + *
* key=value,type,identifying - * + *
* where: * *
* The literal values are converted to the target type by using the default Spring * conversion service, augmented if necessary by any custom converters. The conversion * service should be configured with a converter to and from string literals to job * parameter types. - * + *
* By default, the Spring conversion service is augmented to support the conversion of the * following types: * diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/JsonJobParametersConverter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/JsonJobParametersConverter.java index c1dbe2792..bc1834738 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/JsonJobParametersConverter.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/JsonJobParametersConverter.java @@ -24,10 +24,10 @@ import org.springframework.batch.core.JobParameters; /** * Converter for {@link JobParameters} instances that uses a JSON naming convention for * converting job parameters. The expected notation is the following: - * + *
* key='{"value": "parameterStringLiteralValue", * "type":"fully.qualified.name.of.the.parameter.Type", "identifying": "booleanValue"}' - * + *
* where: * *
* The literal values are converted to the correct type by using the default Spring * conversion service, augmented if necessary by any custom converters. The conversion * service should be configured with a converter to and from string literals to job * parameter types. - * + *
* By default, the Spring conversion service is augmented to support the conversion of the * following types: * diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/LocalDateTimeToStringConverter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/LocalDateTimeToStringConverter.java index 4c68325a1..e434b68af 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/LocalDateTimeToStringConverter.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/LocalDateTimeToStringConverter.java @@ -22,7 +22,7 @@ import org.springframework.core.convert.converter.Converter; /** * {@link Converter} implementation from {@link LocalDateTime} to {@link String}. - * + *
* This converter formats dates according to the * {@link DateTimeFormatter#ISO_LOCAL_DATE_TIME} format. * diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/LocalDateToStringConverter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/LocalDateToStringConverter.java index 7d9f875d5..af38941b2 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/LocalDateToStringConverter.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/LocalDateToStringConverter.java @@ -21,7 +21,7 @@ import org.springframework.core.convert.converter.Converter; /** * {@link Converter} implementation from {@link LocalDate} to {@link String}. - * + *
* This converter formats dates according to the * {@link java.time.format.DateTimeFormatter#ISO_LOCAL_DATE} format. * diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/LocalTimeToStringConverter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/LocalTimeToStringConverter.java index 70be12834..077614b50 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/LocalTimeToStringConverter.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/LocalTimeToStringConverter.java @@ -22,7 +22,7 @@ import org.springframework.core.convert.converter.Converter; /** * {@link Converter} implementation from {@link LocalTime} to {@link String}. - * + *
* This converter formats times according to the {@link DateTimeFormatter#ISO_LOCAL_TIME} * format. * diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/StringToDateConverter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/StringToDateConverter.java index 2015ec609..1c31221fc 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/StringToDateConverter.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/StringToDateConverter.java @@ -22,7 +22,7 @@ import org.springframework.core.convert.converter.Converter; /** * {@link Converter} implementation from {@link String} to {@link java.util.Date}. - * + *
* This converter expects strings in the * {@link java.time.format.DateTimeFormatter#ISO_INSTANT} format. * diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/StringToLocalDateConverter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/StringToLocalDateConverter.java index f35a6e1c7..ddf1dafd8 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/StringToLocalDateConverter.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/StringToLocalDateConverter.java @@ -21,7 +21,7 @@ import org.springframework.core.convert.converter.Converter; /** * {@link Converter} implementation from {@link String} to {@link LocalDate}. - * + *
* This converter expects strings in the * {@link java.time.format.DateTimeFormatter#ISO_LOCAL_DATE} format. * diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/StringToLocalDateTimeConverter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/StringToLocalDateTimeConverter.java index 5f1eb343f..3ea8dbaba 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/StringToLocalDateTimeConverter.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/StringToLocalDateTimeConverter.java @@ -21,7 +21,7 @@ import org.springframework.core.convert.converter.Converter; /** * {@link Converter} implementation from {@link String} to {@link LocalDateTime}. - * + *
* This converter expects strings in the * {@link java.time.format.DateTimeFormatter#ISO_LOCAL_DATE_TIME} format. * diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/StringToLocalTimeConverter.java b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/StringToLocalTimeConverter.java index 0b3c2ef11..3b56e2235 100644 --- a/spring-batch-core/src/main/java/org/springframework/batch/core/converter/StringToLocalTimeConverter.java +++ b/spring-batch-core/src/main/java/org/springframework/batch/core/converter/StringToLocalTimeConverter.java @@ -21,7 +21,7 @@ import org.springframework.core.convert.converter.Converter; /** * {@link Converter} implementation from {@link String} to {@link LocalTime}. - * + *
* This converter expects strings in the
* {@link java.time.format.DateTimeFormatter#ISO_LOCAL_TIME} format.
*
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/explore/JobExplorer.java b/spring-batch-core/src/main/java/org/springframework/batch/core/explore/JobExplorer.java
index 05ea95b6d..85c69655f 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/explore/JobExplorer.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/explore/JobExplorer.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -113,7 +113,7 @@ public interface JobExplorer {
* depending on the implementation. In that case, use
* {@link #getStepExecution(Long, Long)} to hydrate them.
* @param jobInstance The {@link JobInstance} to query.
- * @return the set of all executions for the specified {@link JobInstance}.
+ * @return the list of all executions for the specified {@link JobInstance}.
*/
List
* Public setter for the {@link DataSource}.
* @param dataSource A {@code DataSource}.
*/
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/FlowBuilder.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/FlowBuilder.java
index c105a795c..dde3e6571 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/FlowBuilder.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/builder/FlowBuilder.java
@@ -572,7 +572,7 @@ public class FlowBuilder
* Note: Adding a split to a chain of states is not supported. For example,
* the following configuration is not supported. Instead, the configuration would need
* to create a flow3 that was the split flow and assemble them separately.
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowJob.java b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowJob.java
index 114d0af8d..33e2f491f 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowJob.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/job/flow/FlowJob.java
@@ -88,10 +88,6 @@ public class FlowJob extends AbstractJob {
initialized = true;
}
- /**
- * @param flow
- * @param map
- */
private void findSteps(Flow flow, Map
* Example usage:
*
*
* The parent context is created in a separate thread, and the program will pause for
* input in an infinite loop until the user hits any key.
* @param args the context locations to use (first one is for parent)
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJobLauncher.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJobLauncher.java
index 744e64e42..6369c092b 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJobLauncher.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/SimpleJobLauncher.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@ import org.springframework.util.Assert;
* Care should be taken to ensure any users of this class understand fully whether or not
* the implementation of TaskExecutor used will start tasks synchronously or
* asynchronously. The default setting uses a synchronous task executor.
- *
+ *
* There is only one required dependency of this Launcher, a {@link JobRepository}. The
* JobRepository is used to obtain a valid JobExecution. The Repository must be used
* because the provided {@link Job} could be a restart of an existing {@link JobInstance},
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/TaskExecutorJobLauncher.java b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/TaskExecutorJobLauncher.java
index 98ee2bb8b..fe003d3d4 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/TaskExecutorJobLauncher.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/launch/support/TaskExecutorJobLauncher.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2022 the original author or authors.
+ * Copyright 2022-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@ import org.springframework.core.task.TaskExecutor;
* of this class understand fully whether or not the implementation of TaskExecutor used
* will start tasks synchronously or asynchronously. The default setting uses a
* synchronous task executor.
- *
+ *
* There is only one required dependency of this Launcher, a {@link JobRepository}. The
* JobRepository is used to obtain a valid JobExecution. The Repository must be used
* because the provided {@link Job} could be a restart of an existing {@link JobInstance},
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ExecutionContextPromotionListener.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ExecutionContextPromotionListener.java
index 4abfa685c..525dc86b9 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ExecutionContextPromotionListener.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/ExecutionContextPromotionListener.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ import org.springframework.util.ObjectUtils;
* {@link ExecutionContext} to the {@link Job} {@link ExecutionContext} at the end of a
* step. A list of keys should be provided that correspond to the items in the
* {@link Step} {@link ExecutionContext} that should be promoted.
- *
+ *
* Additionally, an optional list of statuses can be set to indicate for which exit status
* codes the promotion should occur. These statuses will be checked using the
* {@link PatternMatcher}, so wildcards are allowed. By default, promotion will only occur
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/OrderedComposite.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/OrderedComposite.java
index 9bb9a5b0a..abd24cbc7 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/OrderedComposite.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/OrderedComposite.java
@@ -43,7 +43,7 @@ class OrderedComposite
* Remember to register the {@link DefaultMeterObservationHandler} via the
* {@code Metrics.globalRegistry.withTimerObservationHandler()} in the user code.
* Otherwise you won't observe any metrics.
@@ -110,7 +110,7 @@ public final class BatchMetrics {
/**
* Create a new {@link Observation}. It's not started, you must explicitly call
* {@link Observation#start()} to start it.
- *
+ *
* Remember to register the {@link DefaultMeterObservationHandler} via the
* {@code Metrics.globalRegistry.withTimerObservationHandler()} in the user code.
* Otherwise you won't observe any metrics.
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobRepository.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobRepository.java
index 6d7bcf03e..b8db9253b 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobRepository.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/JobRepository.java
@@ -137,7 +137,7 @@ public interface JobRepository {
/**
* Update the {@link JobExecution} (but not its {@link ExecutionContext}).
- *
+ *
* Preconditions: {@link JobExecution} must contain a valid {@link JobInstance} and be
* saved (have an id assigned).
* @param jobExecution {@link JobExecution} instance to be updated in the repo.
@@ -148,7 +148,7 @@ public interface JobRepository {
* Save the {@link StepExecution} and its {@link ExecutionContext}. ID will be
* assigned - it is not permitted that an ID be assigned before calling this method.
* Instead, it should be left blank, to be assigned by a {@link JobRepository}.
- *
+ *
* Preconditions: {@link StepExecution} must have a valid {@link Step}.
* @param stepExecution {@link StepExecution} instance to be added to the repo.
*/
@@ -159,7 +159,7 @@ public interface JobRepository {
* StepExecution ID will be assigned - it is not permitted that an ID be assigned
* before calling this method. Instead, it should be left blank, to be assigned by
* {@link JobRepository}.
- *
+ *
* Preconditions: {@link StepExecution} must have a valid {@link Step}.
* @param stepExecutions collection of {@link StepExecution} instances to be added to
* the repo.
@@ -168,7 +168,7 @@ public interface JobRepository {
/**
* Update the {@link StepExecution} (but not its {@link ExecutionContext}).
- *
+ *
* Preconditions: {@link StepExecution} must be saved (have an id assigned).
* @param stepExecution {@link StepExecution} instance to be updated in the repo.
*/
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcExecutionContextDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcExecutionContextDao.java
index 91e1903fb..3276c46b5 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcExecutionContextDao.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JdbcExecutionContextDao.java
@@ -45,7 +45,7 @@ import org.springframework.util.Assert;
/**
* JDBC DAO for {@link ExecutionContext}.
- *
+ *
* Stores execution context data related to both Step and Job using a different table for
* each.
*
@@ -269,8 +269,8 @@ public class JdbcExecutionContextDao extends AbstractJdbcBatchMetadataDao implem
}
/**
- * @param executionId
- * @param serializedContext
+ * @param executionId the job or step execution id
+ * @param serializedContext the serialized context to persist
* @param sql with parameters (shortContext, longContext, executionId)
*/
private void persistSerializedContext(final Long executionId, String serializedContext, String sql) {
@@ -301,7 +301,7 @@ public class JdbcExecutionContextDao extends AbstractJdbcBatchMetadataDao implem
}
/**
- * @param serializedContexts
+ * @param serializedContexts the execution contexts to serialize
* @param sql with parameters (shortContext, longContext, executionId)
*/
private void persistSerializedContexts(final Map
* Preconditions: jobInstance the jobExecution belongs to must have a jobInstanceId.
* @param jobExecution {@link JobExecution} instance to be saved.
*/
@@ -42,7 +42,7 @@ public interface JobExecutionDao {
/**
* Update and existing JobExecution.
- *
+ *
* Preconditions: jobExecution must have an Id (which can be obtained by the save
* method) and a jobInstanceId.
* @param jobExecution {@link JobExecution} instance to be updated.
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JobInstanceDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JobInstanceDao.java
index ea857a99d..4c2ac43be 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JobInstanceDao.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/JobInstanceDao.java
@@ -37,9 +37,9 @@ public interface JobInstanceDao {
/**
* Create a JobInstance with given name and parameters.
- *
+ *
* PreConditions: JobInstance for given name and parameters must not already exist
- *
+ *
* PostConditions: A valid job instance will be returned which has been persisted and
* contains an unique Id.
* @param jobName {@link String} containing the name of the job.
@@ -80,7 +80,7 @@ public interface JobInstanceDao {
/**
* Fetch the last job instances with the provided name, sorted backwards by primary
* key.
- *
+ *
* if using the JdbcJobInstance, you can provide the jobName with a wildcard (e.g.
* *Job) to return 'like' job names. (e.g. *Job will return 'someJob' and 'otherJob')
* @param jobName the job name
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/StepExecutionDao.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/StepExecutionDao.java
index 88358521b..58e43bd8e 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/StepExecutionDao.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/dao/StepExecutionDao.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -27,9 +27,9 @@ public interface StepExecutionDao {
/**
* Save the given StepExecution.
- *
+ *
* Preconditions: Id must be null.
- *
+ *
* Postconditions: Id will be set to a unique Long.
* @param stepExecution {@link StepExecution} instance to be saved.
*/
@@ -37,9 +37,9 @@ public interface StepExecutionDao {
/**
* Save the given collection of StepExecution as a batch.
- *
+ *
* Preconditions: StepExecution Id must be null.
- *
+ *
* Postconditions: StepExecution Id will be set to a unique Long.
* @param stepExecutions a collection of {@link JobExecution} instances to be saved.
*/
@@ -47,7 +47,7 @@ public interface StepExecutionDao {
/**
* Update the given StepExecution
- *
+ *
* Preconditions: Id must not be null.
* @param stepExecution {@link StepExecution} instance to be updated.
*/
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/SimpleJobRepository.java b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/SimpleJobRepository.java
index 4b79eb0a6..20eaacafe 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/SimpleJobRepository.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/repository/support/SimpleJobRepository.java
@@ -283,7 +283,7 @@ public class SimpleJobRepository implements JobRepository {
* provided StepExecution has been interrupted. If, after synchronizing the status
* with the database, the status has been updated to STOPPING, then the job has been
* interrupted.
- * @param stepExecution
+ * @param stepExecution the step execution
*/
private void checkForInterruption(StepExecution stepExecution) {
JobExecution jobExecution = stepExecution.getJobExecution();
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/FaultTolerantStepBuilder.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/FaultTolerantStepBuilder.java
index 7dca854e6..ba0c63d7f 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/FaultTolerantStepBuilder.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/builder/FaultTolerantStepBuilder.java
@@ -689,7 +689,7 @@ public class FaultTolerantStepBuilder extends SimpleStepBuilder {
/**
* ChunkListener that wraps exceptions thrown from the ChunkListener in
* {@link FatalStepExecutionException} to force termination of StepExecution
- *
+ *
* ChunkListeners shoulnd't throw exceptions and expect continued processing, they
* must be handled in the implementation or the step will terminate
*
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/factory/FaultTolerantStepFactoryBean.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/factory/FaultTolerantStepFactoryBean.java
index ae4c6d7ec..48aed1eae 100755
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/factory/FaultTolerantStepFactoryBean.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/factory/FaultTolerantStepFactoryBean.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ import org.springframework.retry.policy.RetryContextCache;
* Factory bean for step that provides options for configuring skip behavior. User can set
* {@link #setSkipLimit(int)} to set how many exceptions of
* {@link #setSkippableExceptionClasses(Map)} types are tolerated.
- *
+ *
* Skippable exceptions on write will by default cause transaction rollback - to avoid
* rollback for specific exception class include it in the transaction attribute as "no
* rollback for".
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 cb25af7c2..a91546229 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
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@ import org.springframework.transaction.interceptor.TransactionAttribute;
/**
* Most common configuration options for simple steps should be found here. Use this
* factory bean instead of creating a {@link Step} implementation manually.
- *
+ *
* This factory does not support configuration of fault-tolerant behavior, use appropriate
* subclass of this factory bean to configure skip or retry.
*
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/SimpleSystemProcessExitCodeMapper.java b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/SimpleSystemProcessExitCodeMapper.java
index 651b9ff17..1685914c1 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/SimpleSystemProcessExitCodeMapper.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/step/tasklet/SimpleSystemProcessExitCodeMapper.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2013 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import org.springframework.batch.core.ExitStatus;
/**
* Simple {@link SystemProcessExitCodeMapper} implementation that performs following
* mapping:
- *
+ *
* 0 -> ExitStatus.FINISHED else -> ExitStatus.FAILED
*
* @author Robert Kasanicky
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 a980ceb8c..b35a228a4 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
@@ -41,18 +41,18 @@ import org.springframework.util.StringUtils;
/**
* {@link Tasklet} that executes a system command.
- *
+ *
* The system command is executed asynchronously using injected
* {@link #setTaskExecutor(TaskExecutor)} - timeout value is required to be set, so that
* the batch job does not hang forever if the external process hangs.
- *
+ *
* Tasklet periodically checks for termination status (i.e. {@link #setCommand(String...)}
* finished its execution or {@link #setTimeout(long)} expired or job was interrupted).
* The check interval is given by {@link #setTerminationCheckInterval(long)}.
- *
+ *
* When job interrupt is detected tasklet's execution is terminated immediately by
* throwing {@link JobInterruptedException}.
- *
+ *
* {@link #setInterruptOnCancel(boolean)} specifies whether the tasklet should attempt to
* interrupt the thread that executes the system command if it is still running when
* tasklet exits (abnormally).
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 fc26f91ec..79a5684b1 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
@@ -194,10 +194,6 @@ class ExtendedAbstractJobTests {
*/
private static class StubJob extends AbstractJob {
- /**
- * @param name
- * @param jobRepository
- */
private StubJob(String name, JobRepository jobRepository) {
super(name);
try {
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/JobSupport.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/JobSupport.java
index 53d25ef99..7d1fee79c 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/JobSupport.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/JobSupport.java
@@ -63,7 +63,7 @@ public class JobSupport implements BeanNameAware, Job, StepLocator {
/**
* Convenience constructor to immediately add name (which is mandatory but not final).
- * @param name
+ * @param name the job name
*/
public JobSupport(String name) {
super();
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 9f99e445b..ff0ea2a72 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
@@ -544,23 +544,17 @@ class SimpleJobTests {
private ExecutionContext passedInJobContext;
/**
- * @param string
+ * @param string the step name
*/
public StubStep(String string, JobRepository jobRepository) {
super(string);
this.jobRepository = jobRepository;
}
- /**
- * @param exception
- */
public void setProcessException(Throwable exception) {
this.exception = exception;
}
- /**
- * @param runnable
- */
public void setCallback(Runnable runnable) {
this.runnable = runnable;
}
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 3696ed18d..349497096 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
@@ -702,11 +702,6 @@ public class FlowJobTests {
}
- /**
- * @param jobExecution
- * @param stepName
- * @return the StepExecution corresponding to the specified step
- */
private StepExecution getStepExecution(JobExecution jobExecution, String stepName) {
for (StepExecution stepExecution : jobExecution.getStepExecutions()) {
if (stepExecution.getStepName().equals(stepName)) {
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/SimpleFlowTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/SimpleFlowTests.java
index b1f7e1b92..0cdc2b842 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/SimpleFlowTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/SimpleFlowTests.java
@@ -220,7 +220,7 @@ class SimpleFlowTests {
protected static class StubState extends StateSupport {
/**
- * @param string
+ * @param string the state name
*/
public StubState(String string) {
super(string);
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/state/EndStateTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/state/EndStateTests.java
index 5c5a56d4f..ada677235 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/state/EndStateTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/job/flow/support/state/EndStateTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,11 +22,11 @@ import org.junit.jupiter.api.Test;
import org.springframework.batch.core.BatchStatus;
import org.springframework.batch.core.JobExecution;
import org.springframework.batch.core.job.flow.FlowExecutionStatus;
-import org.springframework.batch.core.job.flow.FlowExecutor;
import org.springframework.batch.core.job.flow.support.JobFlowExecutorSupport;
/**
* @author Dave Syer
+ * @author Mahmoud Ben Hassine
*
*/
class EndStateTests {
@@ -38,10 +38,6 @@ class EndStateTests {
jobExecution = new JobExecution(0L);
}
- /**
- * Test method for {@link EndState#handle(FlowExecutor)}.
- * @throws Exception
- */
@Test
void testHandleRestartSunnyDay() throws Exception {
@@ -59,10 +55,6 @@ class EndStateTests {
}
- /**
- * Test method for {@link EndState#handle(FlowExecutor)}.
- * @throws Exception
- */
@Test
void testHandleOngoingSunnyDay() throws Exception {
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/ExecutionContextPromotionListenerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/ExecutionContextPromotionListenerTests.java
index 7544e0c14..b0100489b 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/ExecutionContextPromotionListenerTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/ExecutionContextPromotionListenerTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2022 the original author or authors.
+ * Copyright 2009-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@ class ExecutionContextPromotionListenerTests {
/**
* CONDITION: ExecutionContext contains {key, key2}. keys = {key}. statuses is not set
* (defaults to {COMPLETED}).
- *
+ *
* EXPECTED: key is promoted. key2 is not.
*/
@Test
@@ -77,7 +77,7 @@ class ExecutionContextPromotionListenerTests {
/**
* CONDITION: ExecutionContext contains {key, key2}. keys = {key, key2}. statuses =
* {status}. ExitStatus = status
- *
+ *
* EXPECTED: key is promoted. key2 is not.
*/
@Test
@@ -108,7 +108,7 @@ class ExecutionContextPromotionListenerTests {
/**
* CONDITION: ExecutionContext contains {key, key2}. keys = {key, key2}. statuses =
* {status}. ExitStatus = status2
- *
+ *
* EXPECTED: no promotions.
*/
@Test
@@ -137,7 +137,7 @@ class ExecutionContextPromotionListenerTests {
/**
* CONDITION: keys = {key, key2}. statuses = {statusWildcard}. ExitStatus = status
- *
+ *
* EXPECTED: key is promoted. key2 is not.
*/
@Test
@@ -166,7 +166,7 @@ class ExecutionContextPromotionListenerTests {
/**
* CONDITION: keys = {key, key2}. Only {key} exists in the ExecutionContext.
- *
+ *
* EXPECTED: key is promoted. key2 is not.
*/
@Test
@@ -193,7 +193,7 @@ class ExecutionContextPromotionListenerTests {
/**
* CONDITION: keys = {key}. key is already in job but not in step.
- *
+ *
* EXPECTED: key is not erased.
*/
@Test
@@ -220,7 +220,7 @@ class ExecutionContextPromotionListenerTests {
/**
* CONDITION: strict = true. keys = {key, key2}. Only {key} exists in the
* ExecutionContext.
- *
+ *
* EXPECTED: IllegalArgumentException
*/
@Test
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/MulticasterBatchListenerTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/MulticasterBatchListenerTests.java
index 68a90fdb4..d87de812b 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/listener/MulticasterBatchListenerTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/listener/MulticasterBatchListenerTests.java
@@ -20,7 +20,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.Arrays;
-import java.util.List;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -264,7 +263,7 @@ class MulticasterBatchListenerTests {
/**
* Test method for
- * {@link org.springframework.batch.core.listener.MulticasterBatchListener#afterWrite(java.util.List)}
+ * {@link org.springframework.batch.core.listener.MulticasterBatchListener#afterWrite(Chunk)}
* .
*/
@Test
@@ -275,7 +274,7 @@ class MulticasterBatchListenerTests {
/**
* Test method for
- * {@link org.springframework.batch.core.listener.MulticasterBatchListener#afterWrite(java.util.List)}
+ * {@link org.springframework.batch.core.listener.MulticasterBatchListener#afterWrite(Chunk)}
* .
*/
@Test
@@ -289,7 +288,7 @@ class MulticasterBatchListenerTests {
/**
* Test method for
- * {@link org.springframework.batch.core.listener.MulticasterBatchListener#beforeWrite(List)}
+ * {@link org.springframework.batch.core.listener.MulticasterBatchListener#beforeWrite(Chunk)}
* .
*/
@Test
@@ -300,7 +299,7 @@ class MulticasterBatchListenerTests {
/**
* Test method for
- * {@link org.springframework.batch.core.listener.MulticasterBatchListener#beforeWrite(List)}
+ * {@link org.springframework.batch.core.listener.MulticasterBatchListener#beforeWrite(Chunk)}
* .
*/
@Test
@@ -314,7 +313,7 @@ class MulticasterBatchListenerTests {
/**
* Test method for
- * {@link org.springframework.batch.core.listener.MulticasterBatchListener#onWriteError(Exception, java.util.List)}
+ * {@link org.springframework.batch.core.listener.MulticasterBatchListener#onWriteError(Exception, Chunk)}
* .
*/
@Test
@@ -325,7 +324,7 @@ class MulticasterBatchListenerTests {
/**
* Test method for
- * {@link org.springframework.batch.core.listener.MulticasterBatchListener#onWriteError(Exception, java.util.List)}
+ * {@link org.springframework.batch.core.listener.MulticasterBatchListener#onWriteError(Exception, Chunk)}
* .
*/
@Test
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 eb848ce84..2a17a5664 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
@@ -80,9 +80,8 @@ class SimpleStepExecutionSplitterTests {
}
}
- /**
+ /*
* Tests the results of BATCH-2490
- * @throws Exception
*/
@Test
void testAddressabilityOfSetResults() throws Exception {
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/StepSupport.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/StepSupport.java
index 057c07d87..571b199c5 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/StepSupport.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/StepSupport.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2013 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -45,7 +45,7 @@ public class StepSupport implements Step, BeanNameAware {
}
/**
- * @param string
+ * @param string the step name
*/
public StepSupport(String string) {
super();
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 85d1bf015..83292b4f5 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
@@ -88,12 +88,11 @@ class RegisterMultiListenerTests {
}
}
- /**
+ /*
* The times the beforeChunkCalled occurs are: - Before chunk 1 (item1, item2) -
* Before the re-attempt of item1 (scanning) - Before the re-attempt of item2
* (scanning) - Before the checking that scanning is complete - Before chunk 2 (item3,
* item4) - Before chunk 3 (null)
- * @throws Exception
*/
@Test
void testMultiListenerFaultTolerantStep() throws Exception {
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 c87631b71..5070b277a 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
@@ -185,7 +185,6 @@ class FaultTolerantChunkProcessorTests {
/**
* An Error can be retried or skipped but by default it is just propagated
- * @throws Exception
*/
@Test
void testWriteSkipOnError() throws Exception {
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 079481841..84cb8a044 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
@@ -275,7 +275,6 @@ class FaultTolerantStepFactoryBeanRetryTests {
* N.B. this doesn't really test retry, since the retry is only on write failures, but
* it does test that read errors are re-presented for another try when the retryLimit
* is high enough (it is used to build an exception handler).
- * @throws Exception
*/
@SuppressWarnings("unchecked")
@Test
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 e67809373..02f1f3b39 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
@@ -175,7 +175,6 @@ public class FaultTolerantStepFactoryBeanTests {
/**
* Non-skippable (and non-fatal) exception causes failure immediately.
- * @throws Exception
*/
@SuppressWarnings("unchecked")
@Test
@@ -1039,7 +1038,7 @@ public class FaultTolerantStepFactoryBeanTests {
/**
* condition: skippable < fatal; exception is unclassified
- *
+ *
* expected: false; default classification
*/
@Test
@@ -1049,7 +1048,7 @@ public class FaultTolerantStepFactoryBeanTests {
/**
* condition: skippable < fatal; exception is skippable
- *
+ *
* expected: true
*/
@Test
@@ -1059,7 +1058,7 @@ public class FaultTolerantStepFactoryBeanTests {
/**
* condition: skippable < fatal; exception is fatal
- *
+ *
* expected: false
*/
@Test
@@ -1069,7 +1068,7 @@ public class FaultTolerantStepFactoryBeanTests {
/**
* condition: fatal < skippable; exception is unclassified
- *
+ *
* expected: false; default classification
*/
@Test
@@ -1079,7 +1078,7 @@ public class FaultTolerantStepFactoryBeanTests {
/**
* condition: fatal < skippable; exception is skippable
- *
+ *
* expected: true
*/
@Test
@@ -1089,7 +1088,7 @@ public class FaultTolerantStepFactoryBeanTests {
/**
* condition: fatal < skippable; exception is fatal
- *
+ *
* expected: false
*/
@Test
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 816e35440..09743e3c6 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
@@ -328,9 +328,8 @@ class SimpleStepFactoryBeanTests {
assertTrue(writeListener.trail.startsWith("1234"), "Listener order not as expected: " + writeListener.trail);
}
- /**
+ /*
* Commit interval specified is not allowed to be zero or negative.
- * @throws Exception
*/
@Test
void testCommitIntervalMustBeGreaterThanZero() throws Exception {
@@ -344,9 +343,8 @@ class SimpleStepFactoryBeanTests {
assertThrows(IllegalStateException.class, factory::getObject);
}
- /**
+ /*
* Commit interval specified is not allowed to be zero or negative.
- * @throws Exception
*/
@Test
void testCommitIntervalAndCompletionPolicyBothSet() {
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/step/skip/LimitCheckingItemSkipPolicyTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/step/skip/LimitCheckingItemSkipPolicyTests.java
index 74ea51f8f..3f6164f12 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/step/skip/LimitCheckingItemSkipPolicyTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/step/skip/LimitCheckingItemSkipPolicyTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -71,7 +71,7 @@ class LimitCheckingItemSkipPolicyTests {
/**
* condition: skippable < fatal; exception is unclassified
- *
+ *
* expected: false; default classification
*/
@Test
@@ -81,7 +81,7 @@ class LimitCheckingItemSkipPolicyTests {
/**
* condition: skippable < fatal; exception is skippable
- *
+ *
* expected: true
*/
@Test
@@ -91,7 +91,7 @@ class LimitCheckingItemSkipPolicyTests {
/**
* condition: skippable < fatal; exception is fatal
- *
+ *
* expected: false
*/
@Test
@@ -108,7 +108,7 @@ class LimitCheckingItemSkipPolicyTests {
/**
* condition: fatal < skippable; exception is unclassified
- *
+ *
* expected: false; default classification
*/
@Test
@@ -118,7 +118,7 @@ class LimitCheckingItemSkipPolicyTests {
/**
* condition: fatal < skippable; exception is skippable
- *
+ *
* expected: true
*/
@Test
@@ -128,7 +128,7 @@ class LimitCheckingItemSkipPolicyTests {
/**
* condition: fatal < skippable; exception is fatal
- *
+ *
* expected: false
*/
@Test
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 2ff333b76..b8bc295ff 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
@@ -227,9 +227,6 @@ class StepExecutorInterruptionTests {
assertEquals(BatchStatus.FAILED, stepExecution.getStatus());
}
- /**
- * @return
- */
private Thread createThread(final StepExecution stepExecution) {
Thread processingThread = new Thread(() -> {
try {
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 f10516980..ef6e917b7 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
@@ -838,10 +838,9 @@ class TaskletStepTests {
assertEquals(3, stepExecution.getReadCount());
}
- /**
+ /*
* Exception in {@link StepExecutionListener#afterStep(StepExecution)} doesn't cause
* step failure.
- * @throws JobInterruptedException
*/
@Test
void testStepFailureInAfterStepCallback() throws JobInterruptedException {
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 5ede7450f..f8bbf9ebd 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
@@ -173,7 +173,7 @@ class ConcurrentTransactionTests {
@Configuration
static class DataSourceConfiguration {
- /**
+ /*
* This datasource configuration configures the HSQLDB instance using MVCC. When
* configured using the default behavior, transaction serialization errors are
* thrown (default configuration example below).
@@ -182,7 +182,6 @@ class ConcurrentTransactionTests {
* addScript("classpath:org/springframework/batch/core/schema-drop-hsqldb.sql").
* addScript("classpath:org/springframework/batch/core/schema-hsqldb.sql").
* build());
- * @return
*/
@Bean
public DataSource dataSource() {
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 6928d35f3..5b8d8a0a6 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
@@ -61,8 +61,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* The official Docker image for SAP HANA is not publicly available. SAP HANA support is
- * tested manually. See
- * https://hub.docker.com/_/sap-hana-express-edition/plans/f2dc436a-d851-4c22-a2ba-9de07db7a9ac
+ * tested manually. See ...
* FTR, from the previous link: "This installation does not support Docker for Windows or
* Docker for Mac."
*
@@ -196,8 +196,8 @@ class HANAJobRepositoryIntegrationTests {
/**
* Accepts the license for the SAP HANA Express container by setting the
* AGREE_TO_SAP_LICENSE=Y Calling this method will automatically accept the
- * license at:
- * https://www.sap.com/docs/download/cmp/2016/06/sap-hana-express-dev-agmt-and-exhibit.pdf
+ * license at: ...
* @return The container itself with an environment variable accepting the SAP
* HANA Express license
*/
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 c13067382..e46fe91d0 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
@@ -52,7 +52,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Official Docker images for Oracle are not publicly available. Oracle support is tested
* semi-manually for the moment: 1. Build a docker image for oracle/database:11.2.0.2-xe:
- * https://github.com/oracle/docker-images/tree/main/OracleDatabase/SingleInstance#running-oracle-database-11gr2-express-edition-in-a-container
+ * ...
* 2. Run the test `testJobExecution`
*
* @author Mahmoud Ben Hassine
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/test/step/FaultTolerantStepFactoryBeanIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/test/step/FaultTolerantStepFactoryBeanIntegrationTests.java
index e991e537f..99dbc190a 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/test/step/FaultTolerantStepFactoryBeanIntegrationTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/test/step/FaultTolerantStepFactoryBeanIntegrationTests.java
@@ -244,9 +244,6 @@ class FaultTolerantStepFactoryBeanIntegrationTests {
private final JdbcTemplate jdbcTemplate;
- /**
- * @param dataSource
- */
public SkipProcessorStub(DataSource dataSource) {
jdbcTemplate = new JdbcTemplate(dataSource);
}
diff --git a/spring-batch-core/src/test/java/org/springframework/batch/core/test/step/FaultTolerantStepFactoryBeanRollbackIntegrationTests.java b/spring-batch-core/src/test/java/org/springframework/batch/core/test/step/FaultTolerantStepFactoryBeanRollbackIntegrationTests.java
index 294799de3..6eb416fa0 100644
--- a/spring-batch-core/src/test/java/org/springframework/batch/core/test/step/FaultTolerantStepFactoryBeanRollbackIntegrationTests.java
+++ b/spring-batch-core/src/test/java/org/springframework/batch/core/test/step/FaultTolerantStepFactoryBeanRollbackIntegrationTests.java
@@ -270,9 +270,6 @@ class FaultTolerantStepFactoryBeanRollbackIntegrationTests {
private final JdbcTemplate jdbcTemplate;
- /**
- * @param dataSource
- */
public SkipProcessorStub(DataSource dataSource) {
jdbcTemplate = new JdbcTemplate(dataSource);
}
diff --git a/spring-batch-infrastructure/pom.xml b/spring-batch-infrastructure/pom.xml
index 56448ec1c..432a27638 100644
--- a/spring-batch-infrastructure/pom.xml
+++ b/spring-batch-infrastructure/pom.xml
@@ -413,6 +413,14 @@
* Note that putting
* A {@code null} item will never reach this method because the only possible sources
* are:
*
* {@link Exception}s thrown by a successfully invoked delegate method are re-thrown
* without wrapping. In case the delegate method throws a {@link Throwable} that doesn't
* subclass {@link Exception} it will be wrapped by
@@ -197,7 +197,7 @@ public abstract class AbstractMethodInvokingDelegator
* If arguments are set to not-null value {@link #afterPropertiesSet()} will check the
* values are compatible with target method's signature. In case arguments are null
* (not set) method signature will not be checked and it is assumed correct values
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/DynamicMethodInvocationException.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/DynamicMethodInvocationException.java
index d87d8bffa..a02d2cfa0 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/DynamicMethodInvocationException.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/DynamicMethodInvocationException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2007 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import org.springframework.util.MethodInvoker;
/**
* Indicates an error has been encountered while trying to dynamically invoke a method
* e.g. using {@link MethodInvoker}.
- *
+ *
* The exception should be caused by a failed invocation of a method, it shouldn't be used
* to wrap an exception thrown by successfully invoked method.
*
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/avro/AvroItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/avro/AvroItemWriter.java
index 0d300a958..99a63b04b 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/avro/AvroItemWriter.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/avro/AvroItemWriter.java
@@ -41,7 +41,7 @@ import org.springframework.util.Assert;
/**
* An {@link ItemWriter} that serializes data to an {@link WritableResource} using Avro.
- *
+ *
* This does not support restart on failure.
*
*
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/AbstractPaginatedDataItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/AbstractPaginatedDataItemReader.java
index 466d01391..05580de0e 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/AbstractPaginatedDataItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/AbstractPaginatedDataItemReader.java
@@ -27,7 +27,7 @@ import java.util.Iterator;
* A base class that handles basic reading logic based on the paginated semantics of
* Spring Data's paginated facilities. It also handles the semantics required for
* restartability based on those facilities.
- *
+ *
* This reader is not thread-safe.
*
* @author Michael Minella
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/Neo4jItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/Neo4jItemReader.java
index e0a0c5fad..07daeaa9d 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/Neo4jItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/Neo4jItemReader.java
@@ -59,8 +59,8 @@ import org.springframework.util.StringUtils;
*
* @author Michael Minella
* @author Mahmoud Ben Hassine
- * @deprecated since 5.0 in favor of the item reader from
- * https://github.com/spring-projects/spring-batch-extensions/blob/main/spring-batch-neo4j
+ * @deprecated since 5.0 in favor of the item reader from ...
*/
@Deprecated
public class Neo4jItemReader
* Note: The repository that is used by the repositoryMethodReference must be
* non-final.
* @param repositoryMethodReference of the used to get a repository and type-safe
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/AbstractCursorItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/AbstractCursorItemReader.java
index 6f747567a..92e23beb8 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/AbstractCursorItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/AbstractCursorItemReader.java
@@ -345,7 +345,7 @@ public abstract class AbstractCursorItemReader
* When you set this option to
* The connection can be kept open over multiple transactions when used together with any
* of Spring's {@link org.springframework.transaction.PlatformTransactionManager}
* implementations.
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateCursorItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateCursorItemReader.java
index 4fdcde65d..ea1bba034 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateCursorItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateCursorItemReader.java
@@ -39,7 +39,6 @@ import org.springframework.util.ClassUtils;
* {@link #setQueryName(String)}, or a query provider strategy can be supplied via
* {@link #setQueryProvider(HibernateQueryProvider)}.
*
- *
*
* The reader can be configured to use either {@link StatelessSession} sufficient for
* simple mappings without the need to cascade to associated objects or standard hibernate
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcParameterUtils.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcParameterUtils.java
index de5b59815..9dff9b026 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcParameterUtils.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcParameterUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2021 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ import java.util.List;
/**
* Helper methods for SQL statement parameter parsing.
- *
+ *
* Only intended for internal use.
*
* @author Thomas Risberg
@@ -38,7 +38,7 @@ public class JdbcParameterUtils {
* literal, that is, surrounded by single or double quotes. This method will count
* traditional placeholders in the form of a question mark ('?') as well as named
* parameters indicated with a leading ':' or '&'.
- *
+ *
* The code for this method is taken from an early version of the
* {@link org.springframework.jdbc.core.namedparam.NamedParameterUtils} class. That
* method was later removed after some refactoring, but the code is useful here for
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JpaCursorItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JpaCursorItemReader.java
index 4dbae5361..89324c5c5 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JpaCursorItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JpaCursorItemReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2022 the original author or authors.
+ * Copyright 2020-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@ import org.springframework.util.StringUtils;
* corresponding to the current row. The query can be set directly using
* {@link #setQueryString(String)}, or using a query provider via
* {@link #setQueryProvider(JpaQueryProvider)}.
- *
+ *
* The implementation is not thread-safe.
*
* @author Mahmoud Ben Hassine
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JpaItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JpaItemWriter.java
index d6ff2ebcf..a3e531c3a 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JpaItemWriter.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JpaItemWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -32,12 +32,12 @@ import org.springframework.util.Assert;
/**
* {@link org.springframework.batch.item.ItemWriter} that is using a JPA
* EntityManagerFactory to merge any Entities that aren't part of the persistence context.
- *
+ *
* It is required that {@link #write(Chunk)} is called inside a transaction.
* The writer is thread-safe after its properties are set (normal singleton behaviour), so
* it can be used to write in multiple concurrent transactions.
*
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 69fd69ae3..ab74683bc 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
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -132,7 +132,7 @@ public class JdbcBatchItemWriterBuilder
* NOTE: The item type for this {@link org.springframework.batch.item.ItemWriter} must
* be castable to
* Any implementation must provide a way to specify the select clause, from clause and
* optionally a where clause. In addition a way to specify a single column sort key must
* also be provided. This sort key will be used to provide the paging functionality. It is
* recommended that there should be an index for the sort key to provide better
* performance.
- *
+ *
* Provides properties and preparation for the mandatory "selectClause" and "fromClause"
* as well as for the optional "whereClause". Also provides property for the mandatory
* "sortKeys". Note: The columns that make up the sort key must be a true key and
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/DefaultDataFieldMaxValueIncrementerFactory.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/DefaultDataFieldMaxValueIncrementerFactory.java
index ba0c28edd..ef9c279cf 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/DefaultDataFieldMaxValueIncrementerFactory.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/DefaultDataFieldMaxValueIncrementerFactory.java
@@ -52,7 +52,7 @@ import static org.springframework.batch.support.DatabaseType.SYBASE;
/**
* Default implementation of the {@link DataFieldMaxValueIncrementerFactory} interface.
* Valid database types are given by the {@link DatabaseType} enum.
- *
+ *
* Note: For MySql databases, the
* {@link MySQLMaxValueIncrementer#setUseNewConnection(boolean)} will be set to true.
*
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/DerbyPagingQueryProvider.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/DerbyPagingQueryProvider.java
index ac6422191..b2f4ab422 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/DerbyPagingQueryProvider.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/DerbyPagingQueryProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2021 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ import org.springframework.jdbc.support.JdbcUtils;
/**
* Derby implementation of a {@link PagingQueryProvider} using standard SQL:2003 windowing
* functions. These features are supported starting with Apache Derby version 10.4.1.3.
- *
+ *
* As the OVER() function does not support the ORDER BY clause a sub query is instead used
* to order the results before the ROW_NUM restriction is applied
*
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/PostgresPagingQueryProvider.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/PostgresPagingQueryProvider.java
index c9d050017..4b65d2e3d 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/PostgresPagingQueryProvider.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/PostgresPagingQueryProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ import org.springframework.util.StringUtils;
* Postgres implementation of a
* {@link org.springframework.batch.item.database.PagingQueryProvider} using database
* specific features.
- *
+ *
* When using the groupClause, this implementation expects all select fields not used in
* aggregate functions to be included in the groupClause (the provider does not add them
* for you).
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 dd2dd14a1..1f75726aa 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
@@ -118,7 +118,7 @@ public class SqlWindowingPagingQueryProvider extends AbstractSqlPagingQueryProvi
/**
* Generates ORDER BY attributes based on the sort keys.
- * @param provider
+ * @param provider the paging query provider
* @return a String that can be appended to an ORDER BY clause.
*/
private String buildSortClause(AbstractSqlPagingQueryProvider provider) {
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/MultiResourceItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/MultiResourceItemReader.java
index c985498c8..341f4222e 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/MultiResourceItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/MultiResourceItemReader.java
@@ -37,7 +37,7 @@ import org.springframework.util.ClassUtils;
* Reads items from multiple resources sequentially - resource list is given by
* {@link #setResources(Resource[])}, the actual reading is delegated to
* {@link #setDelegate(ResourceAwareItemReaderItemStream)}.
- *
+ *
* Input resources are ordered using {@link #setComparator(Comparator)} to make sure
* resource ordering is preserved between job runs in restart scenario.
*
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/MultiResourceItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/MultiResourceItemWriter.java
index fb1ac8c9e..1480cba40 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/MultiResourceItemWriter.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/MultiResourceItemWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@ import org.springframework.util.ClassUtils;
* when the count of items written in current resource exceeds
* {@link #setItemCountLimitPerResource(int)}. Suffix creation can be customized with
* {@link #setResourceSuffixCreator(ResourceSuffixCreator)}.
- *
+ *
* Note that new resources are created only at chunk boundaries i.e. the number of items
* written into one resource is between the limit set by
* {@link #setItemCountLimitPerResource(int)} and (limit + chunk size).
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/SimpleBinaryBufferedReaderFactory.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/SimpleBinaryBufferedReaderFactory.java
index 0314896ff..098ff06eb 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/SimpleBinaryBufferedReaderFactory.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/SimpleBinaryBufferedReaderFactory.java
@@ -66,9 +66,6 @@ public class SimpleBinaryBufferedReaderFactory implements BufferedReaderFactory
private final String ending;
- /**
- * @param in
- */
private BinaryBufferedReader(Reader in, String ending) {
super(in);
this.ending = ending;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapper.java
index 665cf4ec7..0a4ecdaef 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapper.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapper.java
@@ -134,7 +134,7 @@ public class BeanWrapperFieldSetMapper
* Either this property or the type property must be specified, but not both.
* @param name the name of a prototype bean in the enclosing BeanFactory
*/
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/separator/DefaultRecordSeparatorPolicy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/separator/DefaultRecordSeparatorPolicy.java
index fb86c78c1..16e86efc1 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/separator/DefaultRecordSeparatorPolicy.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/separator/DefaultRecordSeparatorPolicy.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2007 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -109,8 +109,8 @@ public class DefaultRecordSeparatorPolicy extends SimpleRecordSeparatorPolicy {
/**
* Determine if the current line (or buffered concatenation of lines) contains an
* unterminated quote, indicating that the record is continuing onto the next line.
- * @param line
- * @return
+ * @param line the line to check
+ * @return true if the quote is unterminated, false otherwise
*/
private boolean isQuoteUnterminated(String line) {
return StringUtils.countOccurrencesOf(line, quoteCharacter) % 2 != 0;
@@ -119,8 +119,8 @@ public class DefaultRecordSeparatorPolicy extends SimpleRecordSeparatorPolicy {
/**
* Determine if the current line (or buffered concatenation of lines) ends with the
* continuation marker, indicating that the record is continuing onto the next line.
- * @param line
- * @return
+ * @param line the line to check
+ * @return true if the line ends with the continuation marker, false otherwise
*/
private boolean isContinued(String line) {
if (line == null) {
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/DefaultFieldSet.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/DefaultFieldSet.java
index df75d60a2..c0e833831 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/DefaultFieldSet.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/transform/DefaultFieldSet.java
@@ -28,6 +28,7 @@ import java.util.List;
import java.util.Locale;
import java.util.Properties;
+import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
@@ -627,6 +628,7 @@ public class DefaultFieldSet implements FieldSet {
* @param index the offset in the token array to obtain the value to be trimmed.
* @return null if the field value is
* Subclasses are inherently not thread-safe.
*
* @author Robert Kasanicky
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AbstractItemStreamItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AbstractItemStreamItemReader.java
index b0db566bc..90ce517d0 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AbstractItemStreamItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AbstractItemStreamItemReader.java
@@ -22,7 +22,7 @@ import org.springframework.batch.item.ItemStreamSupport;
/**
* Base class for {@link ItemReader} implementations.
- *
+ *
* This abstract reader is thread-safe.
*
* @author Dave Syer
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AbstractItemStreamItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AbstractItemStreamItemWriter.java
index e513b0d74..104f6686b 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AbstractItemStreamItemWriter.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AbstractItemStreamItemWriter.java
@@ -22,7 +22,7 @@ import org.springframework.batch.item.ItemWriter;
/**
* Base class for {@link ItemWriter} implementations.
- *
+ *
* This abstract writer is thread-safe.
*
* @author Dave Syer
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ClassifierCompositeItemProcessor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ClassifierCompositeItemProcessor.java
index c06e911f2..da0d1d473 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ClassifierCompositeItemProcessor.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ClassifierCompositeItemProcessor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ import org.springframework.lang.Nullable;
/**
* Calls one of a collection of ItemProcessors, based on a router pattern implemented
* through the provided {@link Classifier}.
- *
+ *
* Note the user is responsible for injecting a {@link Classifier} that returns an
* ItemProcessor that conforms to the declared input and output types.
*
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ClassifierCompositeItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ClassifierCompositeItemWriter.java
index abb8c01b9..7b82bab5e 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ClassifierCompositeItemWriter.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ClassifierCompositeItemWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ import org.springframework.util.Assert;
/**
* Calls one of a collection of ItemWriters for each item, based on a router pattern
* implemented through the provided {@link Classifier}.
- *
+ *
* The implementation is thread-safe if all delegates are thread-safe.
*
* @author Dave Syer
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ScriptItemProcessor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ScriptItemProcessor.java
index 79a0840c5..44e563bee 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ScriptItemProcessor.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/ScriptItemProcessor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@ import java.util.Map;
*/
public class ScriptItemProcessor implements ItemProcessor, InitializingBean {
- private static final String ITEM_BINDING_VARIABLE_NAME = "item";
+ public static final String ITEM_BINDING_VARIABLE_NAME = "item";
private String language;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/SynchronizedItemStreamReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/SynchronizedItemStreamReader.java
index 5b79c401e..61de9f70b 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/SynchronizedItemStreamReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/SynchronizedItemStreamReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015-2022 the original author or authors.
+ * Copyright 2015-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -28,13 +28,11 @@ import org.springframework.util.Assert;
*
* This is a simple ItemStreamReader decorator with a synchronized ItemReader.read()
* method - which makes a non-thread-safe ItemReader thread-safe.
- *
+ *
* However, if reprocessing an item is problematic then using this will make a job not
* restartable.
- *
- * Here are some links about the motivation behind this class: -
- * https://projects.spring.io/spring-batch/faq.html#threading-reader} -
- * https://stackoverflow.com/a/20002493/2910265}
+ *
+ * Here is the motivation behind this class: https://stackoverflow.com/a/20002493/2910265
*
* @author Matthew Ouyang
* @since 3.0.4
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/SynchronizedItemStreamWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/SynchronizedItemStreamWriter.java
index f26245c72..56fc6710b 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/SynchronizedItemStreamWriter.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/SynchronizedItemStreamWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2020-2022 the original author or authors.
+ * Copyright 2020-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@ import org.springframework.util.Assert;
/**
* An {@link ItemStreamWriter} decorator with a synchronized
* {@link SynchronizedItemStreamWriter#write write()} method.
- *
+ *
* This decorator is useful when using a non thread-safe item writer in a multi-threaded
* step. Typical delegate examples are the
* {@link org.springframework.batch.item.json.JsonFileItemWriter JsonFileItemWriter} and
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemReader.java
index 827c1fa2e..2a70c39d4 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/xml/StaxEventItemReader.java
@@ -50,11 +50,11 @@ import org.springframework.util.xml.StaxUtils;
/**
* Item reader for reading XML input based on StAX.
- *
+ *
* It extracts fragments from the input XML document which correspond to records for
* processing. The fragments are wrapped with StartDocument and EndDocument events so that
* the fragments can be further processed like standalone XML documents.
- *
+ *
* The implementation is not thread-safe.
*
* @author Robert Kasanicky
@@ -170,7 +170,7 @@ public class StaxEventItemReader
* This implementation simply looks for the next corresponding element, it does not
* care about element nesting. You will need to override this method to correctly
* handle composite fragments.
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 d6c9af1e5..86df8cf35 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
@@ -64,10 +64,10 @@ import org.springframework.util.xml.StaxUtils;
/**
* An implementation of {@link ItemWriter} which uses StAX and {@link Marshaller} for
* serializing object to XML.
- *
+ *
* This item writer also provides restart, statistics and transaction features by
* implementing corresponding interfaces.
- *
+ *
* The implementation is not thread-safe.
*
* @author Peter Zozom
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/context/SynchronizedAttributeAccessor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/context/SynchronizedAttributeAccessor.java
index bef84e66d..51f1bd1a5 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/context/SynchronizedAttributeAccessor.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/context/SynchronizedAttributeAccessor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2007 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ package org.springframework.batch.repeat.context;
import org.springframework.core.AttributeAccessor;
import org.springframework.core.AttributeAccessorSupport;
+import org.springframework.lang.Nullable;
/**
* An {@link AttributeAccessor} that synchronizes on a mutex (not this) before modifying
@@ -141,6 +142,7 @@ public class SynchronizedAttributeAccessor implements AttributeAccessor {
* @param value the value of the attribute
* @return null if the attribute was not already set, the existing value otherwise.
*/
+ @Nullable
public Object setAttributeIfAbsent(String name, Object value) {
synchronized (support) {
Object old = getAttribute(name);
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/RepeatOperationsInterceptor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/RepeatOperationsInterceptor.java
index 422370fb9..805e7555c 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/RepeatOperationsInterceptor.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/interceptor/RepeatOperationsInterceptor.java
@@ -121,10 +121,6 @@ public class RepeatOperationsInterceptor implements MethodInterceptor {
+ ". The invocation was never called, so maybe there is a problem with the completion policy?");
}
- /**
- * @param result
- * @return
- */
private boolean isComplete(Object result) {
return result == null || (result instanceof Boolean) && !(Boolean) result;
}
@@ -139,10 +135,6 @@ public class RepeatOperationsInterceptor implements MethodInterceptor {
@SuppressWarnings("serial")
private static class RepeatOperationsInterceptorException extends RepeatException {
- /**
- * @param message
- * @param e
- */
public RepeatOperationsInterceptorException(String message, Throwable e) {
super(message, e);
}
@@ -170,9 +162,6 @@ public class RepeatOperationsInterceptor implements MethodInterceptor {
this.value = value;
}
- /**
- * @param value
- */
public void setFinalValue(Object value) {
if (ready) {
// Only set the value the last time if the last time was also
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/ResultHolder.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/ResultHolder.java
index 44215fc1b..86764f3f4 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/ResultHolder.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/repeat/support/ResultHolder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -33,7 +33,6 @@ interface ResultHolder {
* Get the result for client from this holder. Does not block if none is available
* yet.
* @return the result, or null if there is none.
- * @throws IllegalStateException
*/
RepeatStatus getResult();
@@ -41,7 +40,6 @@ interface ResultHolder {
* Get the error for client from this holder if any. Does not block if none is
* available yet.
* @return the error, or null if there is none.
- * @throws IllegalStateException
*/
Throwable getError();
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/MethodInvokerUtils.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/MethodInvokerUtils.java
index febfe44e2..dc45b17e5 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/MethodInvokerUtils.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/MethodInvokerUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@ import java.util.concurrent.atomic.AtomicReference;
import org.springframework.aop.framework.Advised;
import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.ObjectUtils;
@@ -43,7 +44,7 @@ public class MethodInvokerUtils {
* @param paramsRequired boolean indicating whether the parameters are required, if
* false, a no args version of the method will be searched for.
* @param paramTypes - parameter types of the method to search for.
- * @return MethodInvoker if the method is found, null if it is not.
+ * @return MethodInvoker if the method is found
*/
public static MethodInvoker getMethodInvokerByName(Object object, String methodName, boolean paramsRequired,
Class>... paramTypes) {
@@ -87,6 +88,7 @@ public class MethodInvokerUtils {
* @param paramTypes - parameter types of the method to search for.
* @return MethodInvoker if the method is found, null if it is not.
*/
+ @Nullable
public static MethodInvoker getMethodInvokerForInterface(Class> cls, String methodName, Object object,
Class>... paramTypes) {
@@ -141,6 +143,7 @@ public class MethodInvokerUtils {
* @param target to be invoked
* @return MethodInvoker for the provided annotation, null if none is found.
*/
+ @Nullable
public static MethodInvoker getMethodInvokerByAnnotation(final Class extends Annotation> annotationType,
final Object target) {
Assert.notNull(target, "Target must not be null");
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/transaction/TransactionAwareBufferedWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/transaction/TransactionAwareBufferedWriter.java
index 390fd98e8..c67c4e4f0 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/transaction/TransactionAwareBufferedWriter.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/transaction/TransactionAwareBufferedWriter.java
@@ -85,7 +85,7 @@ public class TransactionAwareBufferedWriter extends Writer {
}
/**
- * @return
+ * @return the current buffer
*/
private StringBuilder getCurrentBuffer() {
@@ -166,7 +166,7 @@ public class TransactionAwareBufferedWriter extends Writer {
}
/**
- * @return
+ * @return true if the actual transaction is active, false otherwise
*/
private boolean transactionActive() {
return TransactionSynchronizationManager.isActualTransactionActive();
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/avro/example/AvroTestUtils.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/avro/example/AvroTestUtils.java
index 86e4599c7..63182ec24 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/avro/example/AvroTestUtils.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/avro/example/AvroTestUtils.java
@@ -28,7 +28,8 @@ import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
/**
- * Used to create test data. See http://avro.apache.org/docs/1.9.0/gettingstartedjava.html
+ * Used to create test data. See
+ * ...
*
* @author David Turanski
* @author Mahmoud Ben Hassine
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 166fcd0f9..0416ff9ec 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
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-/**
+/*
* Autogenerated by Avro
*
* DO NOT EDIT DIRECTLY
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateCursorItemReaderIntegrationTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateCursorItemReaderIntegrationTests.java
index db84f185a..3bd5ed7a6 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateCursorItemReaderIntegrationTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/HibernateCursorItemReaderIntegrationTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2022 the original author or authors.
+ * Copyright 2008-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ class HibernateCursorItemReaderIntegrationTests extends AbstractHibernateCursorI
/**
* Exception scenario.
- *
+ *
* {@link HibernateCursorItemReader#setUseStatelessSession(boolean)} can be called
* only in uninitialized state.
*/
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderAsyncTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderAsyncTests.java
index 26aeb6592..55206574b 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderAsyncTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcPagingItemReaderAsyncTests.java
@@ -105,11 +105,6 @@ class JdbcPagingItemReaderAsyncTests {
}
}
- /**
- * @throws Exception
- * @throws InterruptedException
- * @throws ExecutionException
- */
private void doTest() throws Exception, InterruptedException, ExecutionException {
final ItemReader
* This is a complex type.
*/
public class Customer {
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/LineItem.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/LineItem.java
index fcd0d743a..9df21958c 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/LineItem.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/LineItem.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2007 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ package org.springframework.batch.item.sample;
/**
* An XML line-item.
- *
+ *
* This is a complex type.
*/
public class LineItem {
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/Order.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/Order.java
index 6fa2fc68c..07ce6b744 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/Order.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/Order.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2007 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import java.util.List;
/**
* An XML order.
- *
+ *
* This is a complex type.
*/
public class Order {
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/Shipper.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/Shipper.java
index 5685d5e78..9d973d4bb 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/Shipper.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/Shipper.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2007 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ package org.springframework.batch.item.sample;
/**
* An XML shipper.
- *
+ *
* This is a complex type.
*/
public class Shipper {
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/AbstractSynchronizedItemStreamWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/AbstractSynchronizedItemStreamWriterTests.java
index 79eae3687..1df146585 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/AbstractSynchronizedItemStreamWriterTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/support/AbstractSynchronizedItemStreamWriterTests.java
@@ -28,8 +28,7 @@ import org.springframework.batch.item.ItemStreamWriter;
import static org.mockito.Mockito.verify;
/**
- * Common parent class for {@link SynchronizedItemStreamWriterTests} and
- * {@link org.springframework.batch.item.support.builder.SynchronizedItemStreamWriterBuilderTests}
+ * Common parent class for {@link SynchronizedItemStreamWriter} related tests.
*
* @author Dimitrios Liapis
* @author Mahmoud Ben Hassine
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java
index 570e880a9..7b08eb6b0 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/xml/StaxEventItemReaderTests.java
@@ -715,7 +715,7 @@ class StaxEventItemReaderTests {
/**
* A simple mapFragment implementation checking the StaxEventReaderItemReader
* basic read functionality.
- * @param source
+ * @param source to unmarshal
* @return list of the events from fragment body
*/
@Override
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/SimpleLimitExceptionHandlerTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/SimpleLimitExceptionHandlerTests.java
index 353e37c9b..e064c604c 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/SimpleLimitExceptionHandlerTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/exception/SimpleLimitExceptionHandlerTests.java
@@ -64,10 +64,9 @@ class SimpleLimitExceptionHandlerTests {
assertSame(expected, throwable);
}
- /**
+ /*
* Other than nominated exception type should be rethrown, ignoring the exception
* limit.
- * @throws Exception
*/
@Test
void testNormalExceptionThrown() throws Throwable {
@@ -83,9 +82,8 @@ class SimpleLimitExceptionHandlerTests {
assertSame(expected, throwable);
}
- /**
+ /*
* TransactionInvalidException should only be rethrown below the exception limit.
- * @throws Exception
*/
@Test
void testLimitedExceptionTypeNotThrown() throws Throwable {
@@ -97,9 +95,8 @@ class SimpleLimitExceptionHandlerTests {
assertDoesNotThrow(() -> handler.handleException(new RepeatContextSupport(null), new RuntimeException("foo")));
}
- /**
+ /*
* TransactionInvalidException should only be rethrown below the exception limit.
- * @throws Exception
*/
@Test
void testLimitedExceptionNotThrownFromSiblings() throws Throwable {
@@ -120,9 +117,8 @@ class SimpleLimitExceptionHandlerTests {
});
}
- /**
+ /*
* TransactionInvalidException should only be rethrown below the exception limit.
- * @throws Exception
*/
@Test
void testLimitedExceptionThrownFromSiblingsWhenUsingParent() throws Throwable {
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ItemReaderRepeatCallback.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ItemReaderRepeatCallback.java
index b5a1fc791..2fc2035b8 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ItemReaderRepeatCallback.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/repeat/support/ItemReaderRepeatCallback.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -33,10 +33,6 @@ public class ItemReaderRepeatCallback
* Because the {@link Future} is typically unwrapped in the {@link ItemWriter}, there are
* lifecycle and stats limitations (since the framework doesn't know what the result of
* the processor is). While not an exhaustive list, things like
- * {@link StepExecution#filterCount} will not reflect the number of filtered items and
+ * {@link StepExecution#getFilterCount()} will not reflect the number of filtered items
+ * and
* {@link org.springframework.batch.core.ItemProcessListener#onProcessError(Object, Exception)}
* will not be called.
*
diff --git a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkingManagerStepBuilder.java b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkingManagerStepBuilder.java
index daf2fd19d..6d2f8ef25 100644
--- a/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkingManagerStepBuilder.java
+++ b/spring-batch-integration/src/main/java/org/springframework/batch/integration/chunk/RemoteChunkingManagerStepBuilder.java
@@ -363,7 +363,7 @@ public class RemoteChunkingManagerStepBuilder extends FaultTolerantStepBui
* This method will throw a {@link UnsupportedOperationException} since the item
* writer of the manager step in a remote chunking setup will be automatically set to
* an instance of {@link ChunkMessageChannelItemWriter}.
- *
+ *
* When building a manager step for remote chunking, no item writer must be provided.
* @throws UnsupportedOperationException if an item writer is provided
* @see ChunkMessageChannelItemWriter
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 20be4c397..9b1696410 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
@@ -64,7 +64,7 @@ import org.springframework.util.CollectionUtils;
* pick up missing messages and processing. The remote workers need access to the Spring
* Batch {@link JobRepository} so that the shared state across those restarts can be
* managed centrally.
- *
+ *
* While a {@link org.springframework.messaging.MessageChannel} is used for sending the
* requests to the workers, the worker's responses can be obtained in one of two ways:
*
* When building a manager step for remote partitioning using this builder, no
* partition handler must be provided.
* @param partitionHandler a partition handler
diff --git a/spring-batch-integration/src/test/java/org/springframework/batch/integration/StepSupport.java b/spring-batch-integration/src/test/java/org/springframework/batch/integration/StepSupport.java
index fdfce19c0..0a5479d61 100644
--- a/spring-batch-integration/src/test/java/org/springframework/batch/integration/StepSupport.java
+++ b/spring-batch-integration/src/test/java/org/springframework/batch/integration/StepSupport.java
@@ -31,7 +31,7 @@ public class StepSupport implements Step {
private int startLimit = 1;
/**
- * @param name
+ * @param name the step name
*/
public StepSupport(String name) {
super();
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemReader.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemReader.java
index 55d925413..3472f00d2 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemReader.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/common/StagingItemReader.java
@@ -40,7 +40,7 @@ import org.springframework.util.Assert;
/**
* Thread-safe database {@link ItemReader} implementing the process indicator pattern.
- *
+ *
* To achieve restartability use together with {@link StagingItemProcessor}.
*/
public class StagingItemReader
* This is a complex type.
*/
public class Customer {
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/xml/LineItem.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/xml/LineItem.java
index 83f0fd56c..bdc71dc2e 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/xml/LineItem.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/xml/LineItem.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2007 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ package org.springframework.batch.sample.domain.order.internal.xml;
/**
* An XML line-item.
- *
+ *
* This is a complex type.
*/
public class LineItem {
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/xml/Order.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/xml/Order.java
index cd51369d1..081849dad 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/xml/Order.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/xml/Order.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2014 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import java.util.List;
/**
* An XML order.
- *
+ *
* This is a complex type.
*/
public class Order {
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/xml/Shipper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/xml/Shipper.java
index 9fe8905f5..40a844dbe 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/xml/Shipper.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/order/internal/xml/Shipper.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2007 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ package org.springframework.batch.sample.domain.order.internal.xml;
/**
* An XML shipper.
- *
+ *
* This is a complex type.
*/
public class Shipper {
diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mongodb/MongoDBSampleApp.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/mongodb/MongoDBSampleApp.java
index 73e2ff69c..bb651fdcf 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/mongodb/MongoDBSampleApp.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/mongodb/MongoDBSampleApp.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2020 the original author or authors.
+ * Copyright 2020-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ import org.springframework.data.mongodb.core.MongoTemplate;
/**
* Ensure a MongoDB instance is running on "localhost:27017", otherwise modify
* mongodb-sample.properties file as needed.
- *
+ *
* If you use docker, you can run a mongo db server with: "docker run --name mongodb --rm
* -d -p 27017:27017 mongo"
*
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 5c5b074c0..52e67c68e 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
@@ -61,12 +61,11 @@ class RestartFunctionalTests {
JdbcTestUtils.deleteFromTables(jdbcTemplate, "TRADE");
}
- /**
+ /*
* Job fails on first run, because the module throws exception after processing more
* than half of the input. On the second run, the job should finish successfully,
* because it continues execution where the previous run stopped (module throws
* exception after fixed number of processed records).
- * @throws Exception
*/
@Test
void testLaunchJob() throws Exception {
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/ErrorLogTasklet.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/ErrorLogTasklet.java
index 98a698c3e..255e66dc4 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/ErrorLogTasklet.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/common/ErrorLogTasklet.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2021 the original author or authors.
+ * Copyright 2008-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@ public class ErrorLogTasklet implements Tasklet, StepExecutionListener {
}
/**
- * @return
+ * @return the skip count
*/
private long getSkipCount() {
if (stepExecution == null || stepName == null) {
diff --git a/spring-batch-test/pom.xml b/spring-batch-test/pom.xml
index 69f37e86d..31df07185 100644
--- a/spring-batch-test/pom.xml
+++ b/spring-batch-test/pom.xml
@@ -112,5 +112,13 @@
+
+
+ {
*
* In this example, a flow consisting of
step1 will be executed in
* parallel with flow.
- *
+ *
@@ -182,7 +182,7 @@ public class JobRegistryBackgroundJobRunner {
* The child contexts are created only when needed though the {@link JobFactory}
* interface (but the XML is validated on startup by using it to create a
* {@link BeanFactory} which is then discarded).
- *
+ * {
/**
* Public setter for the listeners.
- * @param items
+ * @param items to set
*/
public void setItems(List extends S> items) {
unordered.clear();
@@ -55,7 +55,7 @@ class OrderedComposite {
/**
* Register additional item.
- * @param item
+ * @param item to add
*/
public void add(S item) {
if (item instanceof Ordered) {
diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerMetaData.java b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerMetaData.java
index cb18878ef..943497828 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerMetaData.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/listener/StepListenerMetaData.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2022 the original author or authors.
+ * Copyright 2002-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -46,6 +46,7 @@ import org.springframework.batch.core.annotation.OnSkipInWrite;
import org.springframework.batch.core.annotation.OnWriteError;
import org.springframework.batch.core.scope.context.ChunkContext;
import org.springframework.batch.item.Chunk;
+import org.springframework.lang.Nullable;
/**
* Enumeration for {@link StepListener} meta data, which ties together the names of
@@ -140,6 +141,7 @@ public enum StepListenerMetaData implements ListenerMetaData {
* @param propertyName property name to retrieve data for.
* @return meta data with supplied property name, null if none exists.
*/
+ @Nullable
public static StepListenerMetaData fromPropertyName(String propertyName) {
return propertyMap.get(propertyName);
}
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 117b13d5b..a0d6196b1 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
@@ -1,5 +1,5 @@
/*
- * Copyright 2019-2022 the original author or authors.
+ * Copyright 2019-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -93,7 +93,7 @@ public final class BatchMetrics {
/**
* Create a new {@link Observation}. It's not started, you must explicitly call
* {@link Observation#start()} to start it.
- *
+ * null value is equivalent to removing the entry for the
* given key.
*
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemProcessor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemProcessor.java
index 934a45985..83ec8c45b 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemProcessor.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/ItemProcessor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@ public interface ItemProcessor {
* Process the provided item, returning a potentially modified or new item for
* continued processing. If the returned result is {@code null}, it is assumed that
* processing of the item should not continue.
- *
+ *
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/AbstractMethodInvokingDelegator.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/AbstractMethodInvokingDelegator.java
index fc96aa521..a4738b50f 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/AbstractMethodInvokingDelegator.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/AbstractMethodInvokingDelegator.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ import org.springframework.util.StringUtils;
* Superclass for delegating classes which dynamically call a custom method of injected
* object. Provides convenient API for dynamic method invocation shielding subclasses from
* low-level details and exception handling.
- *
+ *
true then the statement used to open the
* cursor will be created with both 'READ_ONLY' and 'HOLD_CURSORS_OVER_COMMIT'
* options. This allows holding the cursor open over transaction start and commits
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/ExtendedConnectionDataSourceProxy.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/ExtendedConnectionDataSourceProxy.java
index 0a0df0b66..9fe20ac92 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/ExtendedConnectionDataSourceProxy.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/ExtendedConnectionDataSourceProxy.java
@@ -40,7 +40,7 @@ import org.springframework.util.MethodInvoker;
* Implementation of {@link SmartDataSource} that is capable of keeping a single JDBC
* Connection which is NOT closed after each use even if {@link Connection#close()} is
* called.
- *
+ *
*
* The reader must be configured with an {@link jakarta.persistence.EntityManagerFactory}
* that is capable of participating in Spring managed transactions.
- *
+ * Map<String,Object>>.
* @return The current instance of the builder for chaining
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/AbstractSqlPagingQueryProvider.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/AbstractSqlPagingQueryProvider.java
index 439b10543..af9a17b39 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/AbstractSqlPagingQueryProvider.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/support/AbstractSqlPagingQueryProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2022 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -32,13 +32,13 @@ import org.springframework.util.StringUtils;
/**
* Abstract SQL Paging Query Provider to serve as a base class for all provided SQL paging
* query providers.
- *
+ * null.
*/
+ @Nullable
protected String readAndTrim(int index) {
String value = tokens[index];
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/mail/builder/SimpleMailMessageItemWriterBuilder.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/mail/builder/SimpleMailMessageItemWriterBuilder.java
index 25b96b384..247f0d1c3 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/mail/builder/SimpleMailMessageItemWriterBuilder.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/mail/builder/SimpleMailMessageItemWriterBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017-2022 the original author or authors.
+ * Copyright 2017-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
package org.springframework.batch.item.mail.builder;
+import org.springframework.batch.item.Chunk;
import org.springframework.batch.item.mail.DefaultMailErrorHandler;
import org.springframework.batch.item.mail.MailErrorHandler;
import org.springframework.batch.item.mail.SimpleMailMessageItemWriter;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AbstractItemCountingItemStreamItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AbstractItemCountingItemStreamItemReader.java
index 23034eb7c..ff008e5e4 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AbstractItemCountingItemStreamItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/AbstractItemCountingItemStreamItemReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2019 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@ import org.springframework.util.Assert;
* Abstract superclass for {@link ItemReader}s that supports restart by storing item count
* in the {@link ExecutionContext} (therefore requires item ordering to be preserved
* between runs).
- *
+ * > completionService = new ExecutorCompletionService<>(
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderAsyncTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderAsyncTests.java
index fd91b44cd..b2b36bf25 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderAsyncTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JpaPagingItemReaderAsyncTests.java
@@ -99,11 +99,6 @@ class JpaPagingItemReaderAsyncTests {
}
}
- /**
- * @throws Exception
- * @throws InterruptedException
- * @throws ExecutionException
- */
private void doTest() throws Exception, InterruptedException, ExecutionException {
final JpaPagingItemReader
> completionService = new ExecutorCompletionService<>(
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemWriterTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemWriterTests.java
index 361b6b2c9..f8f4df0cc 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemWriterTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/FlatFileItemWriterTests.java
@@ -212,7 +212,6 @@ class FlatFileItemWriterTests {
/**
* Regular usage of
write(String) method
- * @throws Exception
*/
@Test
void testWriteString() throws Exception {
@@ -237,7 +236,6 @@ class FlatFileItemWriterTests {
/**
* Regular usage of write(String) method
- * @throws Exception
*/
@Test
void testWriteWithConverter() throws Exception {
@@ -252,7 +250,6 @@ class FlatFileItemWriterTests {
/**
* Regular usage of write(String) method
- * @throws Exception
*/
@Test
void testWriteWithConverterAndString() throws Exception {
@@ -265,7 +262,6 @@ class FlatFileItemWriterTests {
/**
* Regular usage of write(String[], LineDescriptor) method
- * @throws Exception
*/
@Test
void testWriteRecord() throws Exception {
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/Customer.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/Customer.java
index bd0136ddc..814c40968 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/Customer.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/sample/Customer.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2007 the original author or authors.
+ * Copyright 2006-2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ package org.springframework.batch.item.sample;
/**
* An XML customer.
- *
+ *
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 60178e3da..089f3eee8 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
@@ -306,7 +306,7 @@ public class RemotePartitioningManagerStepBuilder extends PartitionStepBuilder {
* This method will throw a {@link UnsupportedOperationException} since the partition
* handler of the manager step will be automatically set to an instance of
* {@link MessageChannelPartitionHandler}.
- *
+ *