From e5ac0e99756c9501ce8e4c045b3edd0a7dc233fa Mon Sep 17 00:00:00 2001
From: Mahmoud Ben Hassine <mbenhassine@pivotal.io>
Date: Wed, 28 Nov 2018 22:32:11 +0100
Subject: [PATCH] Polish 2f0c2a6772bbd804e793d120bd8840a2e19b5d6a

---
 .../file/builder/FlatFileItemReaderBuilder.java  |  2 +-
 .../builder/FlatFileItemReaderBuilderTests.java  | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/builder/FlatFileItemReaderBuilder.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/builder/FlatFileItemReaderBuilder.java
index 0ef4c0704..89f2d755b 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/builder/FlatFileItemReaderBuilder.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/builder/FlatFileItemReaderBuilder.java
@@ -572,7 +572,7 @@ public class FlatFileItemReaderBuilder<T> {
 		 * @return The instance of the builder for chaining.
 		 * @see DelimitedLineTokenizer#setIncludedFields(int[])
 		 */
-		public DelimitedBuilder<T> includedFields(Integer[] fields) {
+		public DelimitedBuilder<T> includedFields(Integer... fields) {
 			this.includedFields.addAll(Arrays.asList(fields));
 			return this;
 		}
diff --git a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/FlatFileItemReaderBuilderTests.java b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/FlatFileItemReaderBuilderTests.java
index bafd1b8ea..7a917834b 100644
--- a/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/FlatFileItemReaderBuilderTests.java
+++ b/spring-batch-infrastructure/src/test/java/org/springframework/batch/item/file/builder/FlatFileItemReaderBuilderTests.java
@@ -170,7 +170,7 @@ public class FlatFileItemReaderBuilderTests {
 				.name("fooReader")
 				.resource(getResource("1 2%\n  3\n4 5%\n  6\n@this is a comment\n7 8%\n  9\n"))
 				.fixedLength()
-				.columns(new Range[] {new Range(1, 2), new Range(3, 5), new Range(6)})
+				.columns(new Range(1, 2), new Range(3, 5), new Range(6))
 				.names("first", "second", "third")
 				.targetType(Foo.class)
 				.recordSeparatorPolicy(new DefaultRecordSeparatorPolicy("\"", "%"))
@@ -315,7 +315,7 @@ public class FlatFileItemReaderBuilderTests {
 				.name("fooReader")
 				.resource(getResource("1,2,3"))
 				.delimited()
-				.includedFields(new Integer[] {0, 2})
+				.includedFields(0, 2)
 				.addIncludedField(1)
 				.names("first", "second", "third")
 				.targetType(Foo.class)
@@ -383,7 +383,7 @@ public class FlatFileItemReaderBuilderTests {
 						return fieldSet;
 					}
 				})
-				.columns(new Range[] {new Range(1, 3), new Range(4, 6), new Range(7)})
+				.columns(new Range(1, 3), new Range(4, 6), new Range(7))
 				.names("first", "second", "third")
 				.targetType(Foo.class)
 				.build();
@@ -403,7 +403,7 @@ public class FlatFileItemReaderBuilderTests {
 			new FlatFileItemReaderBuilder<Foo>()
 					.resource(getResource("1  2  3"))
 					.fixedLength()
-					.columns(new Range[]{new Range(1, 3), new Range(4, 6), new Range(7)})
+					.columns(new Range(1, 3), new Range(4, 6), new Range(7))
 					.names("first", "second", "third")
 					.targetType(Foo.class)
 					.build();
@@ -416,7 +416,7 @@ public class FlatFileItemReaderBuilderTests {
 			new FlatFileItemReaderBuilder<Foo>()
 					.resource(getResource("1  2  3"))
 					.fixedLength()
-					.columns(new Range[]{new Range(1, 3), new Range(4, 6), new Range(7)})
+					.columns(new Range(1, 3), new Range(4, 6), new Range(7))
 					.names("first", "second", "third")
 					.targetType(Foo.class)
 					.name(null)
@@ -428,7 +428,7 @@ public class FlatFileItemReaderBuilderTests {
 		assertNotNull("builder should return new instance of FlatFileItemReader", new FlatFileItemReaderBuilder<Foo>()
 				.resource(getResource("1  2  3"))
 				.fixedLength()
-				.columns(new Range[]{new Range(1, 3), new Range(4, 6), new Range(7)})
+				.columns(new Range(1, 3), new Range(4, 6), new Range(7))
 				.names("first", "second", "third")
 				.targetType(Foo.class)
 				.saveState(false)
@@ -437,7 +437,7 @@ public class FlatFileItemReaderBuilderTests {
 		assertNotNull("builder should return new instance of FlatFileItemReader", new FlatFileItemReaderBuilder<Foo>()
 				.resource(getResource("1  2  3"))
 				.fixedLength()
-				.columns(new Range[]{new Range(1, 3), new Range(4, 6), new Range(7)})
+				.columns(new Range(1, 3), new Range(4, 6), new Range(7))
 				.names("first", "second", "third")
 				.targetType(Foo.class)
 				.name("foobar")
@@ -467,7 +467,7 @@ public class FlatFileItemReaderBuilderTests {
 				.resource(getResource("1  2  3"))
 				.encoding(encoding)
 				.fixedLength()
-				.columns(new Range[] {new Range(1, 3), new Range(4, 6), new Range(7)})
+				.columns(new Range(1, 3), new Range(4, 6), new Range(7))
 				.names("first", "second", "third")
 				.targetType(Foo.class)
 				.build();