getErrors() {
return Collections.unmodifiableList(errors);
@@ -130,7 +130,7 @@ public void skip(Exception e) {
}
/**
- * @return true if there are no items in the chunk
+ * Return {@code true} if there are no items in the chunk.
*/
public boolean isEmpty() {
return items.isEmpty();
@@ -146,7 +146,7 @@ public ChunkIterator iterator() {
}
/**
- * @return the number of items (excluding skips)
+ * Return the number of items (excluding skips).
*/
public int size() {
return items.size();
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 c60d31ef34..bd65750db5 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
@@ -29,9 +29,9 @@
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.
+ * Superclass for delegating classes which dynamically call a custom method of an injected
+ * object. Provides a convenient API for dynamic method invocation shielding subclasses
+ * from low-level details and exception handling.
*
* {@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
@@ -164,7 +164,7 @@ private boolean targetClassDeclaresTargetMethod() {
if (arguments[j] == null) {
continue;
}
- if (!(ClassUtils.isAssignableValue(params[j], arguments[j]))) {
+ if (!ClassUtils.isAssignableValue(params[j], arguments[j])) {
argumentsMatchParameters = false;
}
}
@@ -179,24 +179,23 @@ private boolean targetClassDeclaresTargetMethod() {
}
/**
- * @param targetObject the delegate - bean id can be used to set this value in Spring
- * configuration
+ * Set the delegate - bean id can be used to set this value in Spring configuration.
*/
public void setTargetObject(Object targetObject) {
this.targetObject = targetObject;
}
/**
- * @param targetMethod name of the method to be invoked on
- * {@link #setTargetObject(Object)}.
+ * Set the name of the method to be invoked on {@link #setTargetObject(Object)}.
*/
public void setTargetMethod(String targetMethod) {
this.targetMethod = targetMethod;
}
/**
- * @param arguments arguments values for the { {@link #setTargetMethod(String)}. These
- * will be used only when the subclass tries to invoke the target method without
+ * Set the argument values for the {@link #setTargetMethod(String)}.
+ *
+ * These will be used only when the subclass tries to invoke the target method without
* providing explicit argument values.
*
* If arguments are set to not-null value {@link #afterPropertiesSet()} will check the
@@ -205,19 +204,18 @@ public void setTargetMethod(String targetMethod) {
* will be supplied at runtime.
*/
public void setArguments(Object[] arguments) {
- this.arguments = arguments == null ? null : Arrays.asList(arguments).toArray();
+ this.arguments = arguments == null ? null : arguments.clone();
}
/**
- * Return arguments.
- * @return arguments
+ * Return the argument values for the method to be invoked.
*/
protected Object[] getArguments() {
return arguments;
}
/**
- * @return the object on which the method will be invoked.
+ * Return the object on which the method will be invoked.
* @since 5.1
*/
protected Object getTargetObject() {
@@ -225,7 +223,7 @@ protected Object getTargetObject() {
}
/**
- * @return the name of the method to be invoked.
+ * Return the name of the method to be invoked.
* @since 5.1
*/
protected String getTargetMethod() {
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemWriter.java
index 75b35c7dab..b840151e24 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemWriter.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/adapter/PropertyExtractingDelegatingItemWriter.java
@@ -72,13 +72,13 @@ public void afterPropertiesSet() throws Exception {
}
/**
- * @param fieldsUsedAsMethodArguments the values of the these item's fields will be
- * used as arguments for the delegate method. Nested property values are supported,
- * e.g. address.city
+ * Sets the values of the item's fields to be used as arguments for the delegate
+ * method.
+ *
+ * Nested property values are supported, e.g. address.city
*/
public void setFieldsUsedAsTargetMethodArguments(String[] fieldsUsedAsMethodArguments) {
- this.fieldsUsedAsTargetMethodArguments = Arrays.asList(fieldsUsedAsMethodArguments)
- .toArray(new String[fieldsUsedAsMethodArguments.length]);
+ this.fieldsUsedAsTargetMethodArguments = fieldsUsedAsMethodArguments.clone();
}
}
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/avro/builder/AvroItemReaderBuilder.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/avro/builder/AvroItemReaderBuilder.java
index c9803e2590..1dd2ecabe6 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/avro/builder/AvroItemReaderBuilder.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/avro/builder/AvroItemReaderBuilder.java
@@ -24,6 +24,8 @@
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
+import java.nio.charset.Charset;
+
/**
* A builder implementation for the {@link AvroItemReader}.
*
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/avro/builder/AvroItemWriterBuilder.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/avro/builder/AvroItemWriterBuilder.java
index 69c9eb85cc..b243da4b31 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/avro/builder/AvroItemWriterBuilder.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/avro/builder/AvroItemWriterBuilder.java
@@ -22,6 +22,8 @@
import org.springframework.core.io.WritableResource;
import org.springframework.util.Assert;
+import java.nio.charset.Charset;
+
/**
* A builder implementation for the {@link AvroItemWriter}.
*
@@ -40,7 +42,8 @@ public class AvroItemWriterBuilder {
private String name = AvroItemWriter.class.getSimpleName();
/**
- * @param resource the {@link WritableResource} used to write the serialized data.
+ * Sets the {@link WritableResource} used to write the serialized data.
+ * @param resource the {@code WritableResource} used to write the serialized data.
* @return The current instance of the builder.
*/
public AvroItemWriterBuilder resource(WritableResource resource) {
@@ -50,7 +53,9 @@ public AvroItemWriterBuilder resource(WritableResource resource) {
}
/**
- * @param schema the Resource containing the schema JSON used to serialize the output.
+ * Sets the {@link Resource} containing the schema JSON used to serialize the output.
+ * @param schema the {@code Resource} containing the schema JSON used to serialize the
+ * output.
* @return The current instance of the builder.
*/
public AvroItemWriterBuilder schema(Resource schema) {
@@ -61,6 +66,7 @@ public AvroItemWriterBuilder schema(Resource schema) {
}
/**
+ * Sets the String containing the schema JSON used to serialize the output.
* @param schemaString the String containing the schema JSON used to serialize the
* output.
* @return The current instance of the builder.
@@ -72,6 +78,7 @@ public AvroItemWriterBuilder schema(String schemaString) {
}
/**
+ * Sets the Class of objects to be serialized.
* @param type the Class of objects to be serialized.
* @return The current instance of the builder.
*/
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/MongoCursorItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/MongoCursorItemReader.java
index 1759557d61..c505fdff16 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/MongoCursorItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/MongoCursorItemReader.java
@@ -101,7 +101,7 @@ public void setTargetType(Class targetType) {
}
/**
- * @param collection Mongo collection to be queried.
+ * The Mongo collection to be queried.
*/
public void setCollection(String collection) {
this.collection = collection;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/MongoItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/MongoItemReader.java
index 9c8ce109d6..b347b6728b 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/MongoItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/MongoItemReader.java
@@ -172,7 +172,7 @@ public void setSort(Map sorts) {
}
/**
- * @param collection Mongo collection to be queried.
+ * The Mongo collection to be queried.
*/
public void setCollection(String collection) {
this.collection = collection;
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/MongoItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/MongoItemWriter.java
index b7aa27f375..0ff1cdc497 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/MongoItemWriter.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/MongoItemWriter.java
@@ -107,7 +107,7 @@ public MongoItemWriter() {
*/
@Deprecated(since = "5.1", forRemoval = true)
public void setDelete(boolean delete) {
- this.mode = (delete) ? Mode.REMOVE : Mode.UPSERT;
+ this.mode = delete ? Mode.REMOVE : Mode.UPSERT;
}
/**
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/MongoPagingItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/MongoPagingItemReader.java
index 5c2278cacc..f682b9b95c 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/MongoPagingItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/MongoPagingItemReader.java
@@ -67,6 +67,7 @@
* @author Mahmoud Ben Hassine
* @author Parikshit Dutta
*/
+@SuppressWarnings("removal")
public class MongoPagingItemReader extends MongoItemReader {
/**
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/RepositoryItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/RepositoryItemReader.java
index 98ce9941f3..eccf8402e7 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/RepositoryItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/RepositoryItemReader.java
@@ -44,7 +44,7 @@
/**
*
* A {@link org.springframework.batch.item.ItemReader} that reads records utilizing a
- * {@link org.springframework.data.repository.PagingAndSortingRepository}.
+ * {@link PagingAndSortingRepository}.
*
*
*
@@ -54,9 +54,8 @@
*
*
*
- * The reader must be configured with a
- * {@link org.springframework.data.repository.PagingAndSortingRepository}, a
- * {@link org.springframework.data.domain.Sort}, and a pageSize greater than 0.
+ * The reader must be configured with a {@link PagingAndSortingRepository}, a
+ * {@link Sort}, and a pageSize greater than 0.
*
*
*
@@ -127,15 +126,14 @@ public void setSort(Map sorts) {
}
/**
- * @param pageSize The number of items to retrieve per page. Must be greater than 0.
+ * The number of items to retrieve per page. Must be greater than 0.
*/
public void setPageSize(int pageSize) {
this.pageSize = pageSize;
}
/**
- * The {@link org.springframework.data.repository.PagingAndSortingRepository}
- * implementation used to read input from.
+ * The {@link PagingAndSortingRepository} implementation used to read input from.
* @param repository underlying repository for input to be read from.
*/
public void setRepository(PagingAndSortingRepository repository) {
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/builder/MongoCursorItemReaderBuilder.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/builder/MongoCursorItemReaderBuilder.java
index b7c09835b7..a44e94baff 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/builder/MongoCursorItemReaderBuilder.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/builder/MongoCursorItemReaderBuilder.java
@@ -29,6 +29,8 @@
import org.springframework.util.StringUtils;
/**
+ * A builder implementation for the {@link MongoCursorItemReader}.
+ *
* @author LEE Juchan
* @author Mahmoud Ben Hassine
* @since 5.1
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/builder/MongoItemReaderBuilder.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/builder/MongoItemReaderBuilder.java
index 17747b8212..f04da97e7a 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/builder/MongoItemReaderBuilder.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/builder/MongoItemReaderBuilder.java
@@ -40,6 +40,7 @@
* @deprecated Use {@link MongoPagingItemReaderBuilder} instead. Scheduled for removal in
* v5.3 or later.
*/
+@SuppressWarnings("removal")
@Deprecated(since = "5.1", forRemoval = true)
public class MongoItemReaderBuilder {
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/builder/MongoItemWriterBuilder.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/builder/MongoItemWriterBuilder.java
index 4df60a7d4c..3ad740649d 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/builder/MongoItemWriterBuilder.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/builder/MongoItemWriterBuilder.java
@@ -49,7 +49,7 @@ public class MongoItemWriterBuilder {
*/
@Deprecated(since = "5.1", forRemoval = true)
public MongoItemWriterBuilder delete(boolean delete) {
- this.mode = (delete) ? Mode.REMOVE : Mode.UPSERT;
+ this.mode = delete ? Mode.REMOVE : Mode.UPSERT;
return this;
}
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/builder/MongoPagingItemReaderBuilder.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/builder/MongoPagingItemReaderBuilder.java
index 286f043f0e..c3f2aa49b4 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/builder/MongoPagingItemReaderBuilder.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/data/builder/MongoPagingItemReaderBuilder.java
@@ -36,6 +36,7 @@
* @author Parikshit Dutta
* @since 5.1
*/
+@SuppressWarnings("removal")
public class MongoPagingItemReaderBuilder extends MongoItemReaderBuilder {
/**
@@ -45,6 +46,7 @@ public class MongoPagingItemReaderBuilder extends MongoItemReaderBuilder {
* @param saveState defaults to true
* @return The current instance of the builder.
*/
+ @Override
public MongoPagingItemReaderBuilder saveState(boolean saveState) {
this.saveState = saveState;
@@ -59,6 +61,7 @@ public MongoPagingItemReaderBuilder saveState(boolean saveState) {
* @return The current instance of the builder.
* @see org.springframework.batch.item.ItemStreamSupport#setName(String)
*/
+ @Override
public MongoPagingItemReaderBuilder name(String name) {
this.name = name;
@@ -71,6 +74,7 @@ public MongoPagingItemReaderBuilder name(String name) {
* @return The current instance of the builder.
* @see org.springframework.batch.item.support.AbstractItemCountingItemStreamItemReader#setMaxItemCount(int)
*/
+ @Override
public MongoPagingItemReaderBuilder maxItemCount(int maxItemCount) {
this.maxItemCount = maxItemCount;
@@ -83,6 +87,7 @@ public MongoPagingItemReaderBuilder maxItemCount(int maxItemCount) {
* @return this instance for method chaining
* @see org.springframework.batch.item.support.AbstractItemCountingItemStreamItemReader#setCurrentItemCount(int)
*/
+ @Override
public MongoPagingItemReaderBuilder currentItemCount(int currentItemCount) {
this.currentItemCount = currentItemCount;
@@ -97,6 +102,7 @@ public MongoPagingItemReaderBuilder currentItemCount(int currentItemCount) {
* @return The current instance of the builder
* @see MongoPagingItemReader#setTemplate(MongoOperations)
*/
+ @Override
public MongoPagingItemReaderBuilder template(MongoOperations template) {
this.template = template;
@@ -111,6 +117,7 @@ public MongoPagingItemReaderBuilder template(MongoOperations template) {
* @return The current instance of the builder
* @see MongoPagingItemReader#setQuery(String)
*/
+ @Override
public MongoPagingItemReaderBuilder jsonQuery(String query) {
this.jsonQuery = query;
@@ -124,6 +131,7 @@ public MongoPagingItemReaderBuilder jsonQuery(String query) {
* @return The current instance of the builder
* @see MongoPagingItemReader#setTargetType(Class)
*/
+ @Override
public MongoPagingItemReaderBuilder targetType(Class targetType) {
this.targetType = targetType;
@@ -137,6 +145,7 @@ public MongoPagingItemReaderBuilder targetType(Class targetType)
* @return The current instance of the builder
* @see MongoPagingItemReader#setParameterValues(List)
*/
+ @Override
public MongoPagingItemReaderBuilder parameterValues(List