Fix default value of comment prefix in FlatFileItemReaderBuilder

Before this commit, the default value of comment prefix in
FlatFileItemReaderBuilder was not consistent with the one in
FlatFileItemReader.

This commit changes the default value of comment prefix to # in
the builder to be consistent with the reader.

Resolves BATCH-2862

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/FlatFileItemReader.java

@@ -41,6 +41,7 @@
  * about the problematic line and its line number.
  * 
  * @author Robert Kasanicky
+ * @author Mahmoud Ben Hassine
  */
 public class FlatFileItemReader<T> extends AbstractItemCountingItemStreamItemReader<T> implements
 		ResourceAwareItemReaderItemStream<T>, InitializingBean {
@@ -50,6 +51,8 @@ public class FlatFileItemReader<T> extends AbstractItemCountingItemStreamItemRea
 	// default encoding for input files
 	public static final String DEFAULT_CHARSET = Charset.defaultCharset().name();
 
+	public static final String[] DEFAULT_COMMENT_PREFIXES = new String[] { "#" };
+
 	private RecordSeparatorPolicy recordSeparatorPolicy = new SimpleRecordSeparatorPolicy();
 
 	private Resource resource;
@@ -58,7 +61,7 @@ public class FlatFileItemReader<T> extends AbstractItemCountingItemStreamItemRea
 
 	private int lineCount = 0;
 
-	private String[] comments = new String[] { "#" };
+	private String[] comments = DEFAULT_COMMENT_PREFIXES;
 
 	private boolean noInput = false;
 
@@ -134,7 +137,7 @@ public void setBufferedReaderFactory(BufferedReaderFactory bufferedReaderFactory
 
 	/**
 	 * Setter for comment prefixes. Can be used to ignore header lines as well by using e.g. the first couple of column
-	 * names as a prefix.
+	 * names as a prefix. Defaults to {@link #DEFAULT_COMMENT_PREFIXES}.
 	 * 
 	 * @param comments an array of comment line prefixes.
 	 */

spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/builder/FlatFileItemReaderBuilder.java

@@ -76,7 +76,8 @@ public class FlatFileItemReaderBuilder<T> {
 
 	private Resource resource;
 
-	private List<String> comments = new ArrayList<>();
+	private List<String> comments =
+			new ArrayList<>(Arrays.asList(FlatFileItemReader.DEFAULT_COMMENT_PREFIXES));
 
 	private int linesToSkip = 0;
 
@@ -171,6 +172,7 @@ public FlatFileItemReaderBuilder<T> currentItemCount(int currentItemCount) {
 
 	/**
 	 * Add a string to the list of Strings that indicate commented lines.
+	 * Defaults to {@link FlatFileItemReader#DEFAULT_COMMENT_PREFIXES}.
 	 *
 	 * @param comment the string to define a commented line.
 	 * @return The current instance of the builder.
@@ -182,15 +184,16 @@ public FlatFileItemReaderBuilder<T> addComment(String comment) {
 	}
 
 	/**
-	 * An array of Strings that indicate lines that are comments (and therefore skipped by
-	 * the reader.
+	 * Set an array of Strings that indicate lines that are comments (and therefore skipped by
+	 * the reader). This method overrides the default comment prefixes which are
+	 * {@link FlatFileItemReader#DEFAULT_COMMENT_PREFIXES}.
 	 *
 	 * @param comments an array of strings to identify comments.
 	 * @return The current instance of the builder.
 	 * @see FlatFileItemReader#setComments(String[])
 	 */
 	public FlatFileItemReaderBuilder<T> comments(String... comments) {
-		this.comments.addAll(Arrays.asList(comments));
+		this.comments = Arrays.asList(comments);
 		return this;
 	}
 

spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/FlatFileItemReaderBuilderTests.java

@@ -300,7 +300,7 @@ public void testEmptyComments() throws Exception {
 	public void testDefaultComments() throws Exception {
 		FlatFileItemReader<Foo> reader = new FlatFileItemReaderBuilder<Foo>()
 				.name("fooReader")
-				.resource(getResource("1,2,3\n4,5,6"))
+				.resource(getResource("1,2,3\n4,5,6\n#this is a default comment"))
 				.delimited()
 				.names("first", "second", "third")
 				.targetType(Foo.class)