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 361046a4a..e253f0e1d 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
@@ -17,11 +17,11 @@
package org.springframework.batch.item;
/**
- *
Interface for item transformation. Given an item as input, this interface provides
+ * Interface for item transformation. Given an item as input, this interface provides
* an extension point which allows for the application of business logic in an item
* oriented processing scenario. It should be noted that while it's possible to return
* a different type than the one provided, it's not strictly necessary. Furthermore,
- * returning null indicates that the item should not be continued to be processed.
+ * returning null indicates that the item should not be continued to be processed.
*
* @author Robert Kasanicky
* @author Dave Syer
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 835b5044c..cb7b80969 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
@@ -78,6 +78,7 @@ import org.springframework.util.Assert;
* @see java.sql.Connection#close()
* @see DataSourceUtils#releaseConnection
* @see org.springframework.jdbc.support.nativejdbc.NativeJdbcExtractor
+ * @since 2.0
*/
public class ExtendedConnectionDataSourceProxy implements SmartDataSource, InitializingBean {
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 fba973214..1d126041c 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
@@ -33,22 +33,19 @@ import org.springframework.util.StringUtils;
/**
* {@link ItemReader} for reading database records built on top of Hibernate.
- *
* It executes the HQL query when initialized iterates over the result set as
* {@link #read()} method is called, returning an object corresponding to
* current row. The query can be set directly using
* {@link #setQueryString(String)} or a named query can be used by
* {@link #setQueryName(String)}.
*
- * The reader can be configured to use either {@link StatelessSession}
+ * 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 {@link Session} for more advanced mappings or
- * when caching is desired.
+ * when caching is desired. When stateful session is used it will be cleared after successful commit
+ * without being flushed (no inserts or updates are expected).
*
- * When stateful session is used it will be cleared after successful commit
- * without being flushed (no inserts or updates are expected).
- *
- * The implementation is *not* thread-safe.
+ * The implementation is not thread-safe.
*
* @author Robert Kasanicky
* @author Dave Syer
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateItemWriter.java
index db3f81f77..395785f27 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateItemWriter.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/HibernateItemWriter.java
@@ -32,7 +32,7 @@ import org.springframework.util.Assert;
* and clear the session at chunk boundaries.
*
* The writer is thread safe after its properties are set (normal singleton
- * behaviour), so it can be used to write in multiple concurrent transactions.
+ * behavior), so it can be used to write in multiple concurrent transactions.
*
* @author Dave Syer
* @author Thomas Risberg
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/ItemPreparedStatementSetter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/ItemPreparedStatementSetter.java
index 19730f4eb..e3ea33f8c 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/ItemPreparedStatementSetter.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/ItemPreparedStatementSetter.java
@@ -23,6 +23,7 @@ import org.springframework.jdbc.core.RowMapper;
/**
* A convenient strategy for SQL updates, acting effectively as the inverse of
* {@link RowMapper}.
+ *
* @author Dave Syer
*
*/
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcBatchItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcBatchItemWriter.java
index 23f1ebc7a..1d07dc838 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcBatchItemWriter.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcBatchItemWriter.java
@@ -37,9 +37,9 @@ import org.springframework.jdbc.core.simple.SimpleJdbcTemplate;
import org.springframework.util.Assert;
/**
- * {@link ItemWriter} that uses the batching features from
+ * {@link ItemWriter} that uses the batching features from
* {@link SimpleJdbcTemplate} to execute a batch of statements for all items
- * provided.
+ * provided.
*
* The user must provide an SQL query and a special callback in the for of either
* {@link ItemPreparedStatementSetter}, or a {@link ItemSqlParameterSourceProvider}.
@@ -52,7 +52,7 @@ import org.springframework.util.Assert;
* It is expected that {@link #write(List)} 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.
+ * behavior), so it can be used to write in multiple concurrent transactions.
*
* @author Dave Syer
* @author Thomas Risberg
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 fadfb7f2c..2e8ca4542 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
@@ -38,10 +38,6 @@ import org.springframework.util.StringUtils;
* @author Rob Harrop
* @author Dave Syer
*/
-/**
- * @author dsyer
- *
- */
public class DefaultFieldSet implements FieldSet {
private final static String DEFAULT_DATE_PATTERN = "yyyy-MM-dd";
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/jms/JmsItemReader.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/jms/JmsItemReader.java
index 6957fc44b..7fcac9b9a 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/jms/JmsItemReader.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/jms/JmsItemReader.java
@@ -31,7 +31,7 @@ import org.springframework.util.Assert;
* {@link #read()}.
*
* The implementation is thread safe after its properties are set (normal
- * singleton behaviour).
+ * singleton behavior).
*
* @author Dave Syer
*
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/jms/JmsItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/jms/JmsItemWriter.java
index 056ec39ff..2046073ef 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/jms/JmsItemWriter.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/jms/JmsItemWriter.java
@@ -30,7 +30,7 @@ import org.springframework.jms.core.JmsTemplate;
* {@link #write(List)}.
*
* The implementation is thread safe after its properties are set (normal
- * singleton behaviour).
+ * singleton behavior).
*
* @author Dave Syer
*
@@ -42,7 +42,7 @@ public class JmsItemWriter implements ItemWriter {
private JmsOperations jmsTemplate;
/**
- * Setter for jms template.
+ * Setter for JMS template.
*
* @param jmsTemplate a {@link JmsOperations} instance
*/
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 745b94731..44688e254 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
@@ -32,6 +32,7 @@ import org.springframework.batch.item.ItemWriter;
* The implementation is thread-safe if all delegates are thread-safe.
*
* @author Dave Syer
+ * @since 2.0
*/
public class ClassifierCompositeItemWriter implements ItemWriter {
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemProcessor.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemProcessor.java
index 076bd330b..1e6b88c9e 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemProcessor.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemProcessor.java
@@ -25,7 +25,7 @@ import org.springframework.util.Assert;
/**
* Composite {@link ItemProcessor} that passes the item through a sequence of
* injected ItemTransformers (return value of previous
- * transformation is the entry value of the next).
+ * transformation is the entry value of the next).
*
* Note the user is responsible for injecting a chain of {@link ItemProcessor}
* s that conforms to declared input and output types.
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemWriter.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemWriter.java
index d1bb73f7b..b7078b73a 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemWriter.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/support/CompositeItemWriter.java
@@ -22,7 +22,7 @@ import java.util.List;
import org.springframework.batch.item.ItemWriter;
/**
- * Calls a collection of ItemWriters in fixed-order sequence.
+ * Calls a collection of {@link ItemWriter}s in fixed-order sequence.
*
* The implementation is thread-safe if all delegates are thread-safe.
*
diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DatabaseType.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DatabaseType.java
index 419ae17af..0953219a5 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DatabaseType.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/support/DatabaseType.java
@@ -27,7 +27,7 @@ import org.springframework.jdbc.support.MetaDataAccessException;
/**
* Enum representing a database type, such as DB2 or oracle. The type also
- * contains a product name, which is expected to the same as the product name
+ * contains a product name, which is expected to be the same as the product name
* provided by the database driver's metadata.
*
* @author Lucas Ward
@@ -53,7 +53,7 @@ public enum DatabaseType {
nameMap.put(type.getProductName(), type);
}
}
- //A description is necessary due to the length of database descriptions
+ //A description is necessary due to the nature of database descriptions
//in metadata.
private final String productName;