Repository: incubator-batchee Updated Branches: refs/heads/master 3a72a4c9a -> 332e5ae04
BATCHEE-83 using 1 as default header size Project: http://git-wip-us.apache.org/repos/asf/incubator-batchee/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-batchee/commit/332e5ae0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-batchee/tree/332e5ae0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-batchee/diff/332e5ae0 Branch: refs/heads/master Commit: 332e5ae04616b81ca588d1cbe394b773cd4ccb36 Parents: 3a72a4c Author: Reinhard Sandtner <[email protected]> Authored: Mon Dec 7 21:31:44 2015 +0100 Committer: Reinhard Sandtner <[email protected]> Committed: Mon Dec 7 21:31:44 2015 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/batchee/jsefa/JSefaCsvReader.java | 9 ++++++--- .../java/org/apache/batchee/jsefa/JSefaCsvReaderTest.java | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/332e5ae0/extensions/jsefa/src/main/java/org/apache/batchee/jsefa/JSefaCsvReader.java ---------------------------------------------------------------------- diff --git a/extensions/jsefa/src/main/java/org/apache/batchee/jsefa/JSefaCsvReader.java b/extensions/jsefa/src/main/java/org/apache/batchee/jsefa/JSefaCsvReader.java index 4068e19..b1a878d 100644 --- a/extensions/jsefa/src/main/java/org/apache/batchee/jsefa/JSefaCsvReader.java +++ b/extensions/jsefa/src/main/java/org/apache/batchee/jsefa/JSefaCsvReader.java @@ -88,7 +88,7 @@ public class JSefaCsvReader extends JSefaReader { private Boolean ignoreHeader; @Inject - @BatchProperty() + @BatchProperty @Documentation("number of header lines") private Integer headerSize; @@ -102,8 +102,11 @@ public class JSefaCsvReader extends JSefaReader { specialRecordDelimiter, simpleTypeProvider, typeMappingRegistry); if (config.getLineFilter() == null && - Boolean.TRUE.equals(ignoreHeader) && - headerSize != null && headerSize > 0) { + Boolean.TRUE.equals(ignoreHeader)) { + + if (headerSize == null || headerSize == 0) { + headerSize = 1; // the default size if nothing was specified + } config.setLineFilter(new HeaderAndFooterFilter(headerSize, false, false)); } http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/332e5ae0/extensions/jsefa/src/test/java/org/apache/batchee/jsefa/JSefaCsvReaderTest.java ---------------------------------------------------------------------- diff --git a/extensions/jsefa/src/test/java/org/apache/batchee/jsefa/JSefaCsvReaderTest.java b/extensions/jsefa/src/test/java/org/apache/batchee/jsefa/JSefaCsvReaderTest.java index 5d1eede..54ace83 100644 --- a/extensions/jsefa/src/test/java/org/apache/batchee/jsefa/JSefaCsvReaderTest.java +++ b/extensions/jsefa/src/test/java/org/apache/batchee/jsefa/JSefaCsvReaderTest.java @@ -65,6 +65,7 @@ public class JSefaCsvReaderTest { properties.setProperty("input", path); StringBuilder csvBuilder = new StringBuilder(200); + csvBuilder.append("firstName;lastName;street;zip;city"); for (int i = 0; i < 10; i++) { csvBuilder.append(IOs.LINE_SEPARATOR) .append(CsvUtil.toCsv(new PersonWithAddress("firstName_" + i,
