You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@batchee.apache.org by rm...@apache.org on 2015/03/24 20:05:53 UTC

incubator-batchee git commit: BATCHEE-60 skippedHeaderLines in BeanIOReader

Repository: incubator-batchee
Updated Branches:
  refs/heads/master e2db9619b -> 3fa7a949a


BATCHEE-60 skippedHeaderLines in BeanIOReader


Project: http://git-wip-us.apache.org/repos/asf/incubator-batchee/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-batchee/commit/3fa7a949
Tree: http://git-wip-us.apache.org/repos/asf/incubator-batchee/tree/3fa7a949
Diff: http://git-wip-us.apache.org/repos/asf/incubator-batchee/diff/3fa7a949

Branch: refs/heads/master
Commit: 3fa7a949aaa6db055f932e2460507e4caab02266
Parents: e2db961
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Tue Mar 24 20:05:46 2015 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Tue Mar 24 20:05:46 2015 +0100

----------------------------------------------------------------------
 .../java/org/apache/batchee/beanio/BeanIOReader.java  | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/3fa7a949/extensions/beanio/src/main/java/org/apache/batchee/beanio/BeanIOReader.java
----------------------------------------------------------------------
diff --git a/extensions/beanio/src/main/java/org/apache/batchee/beanio/BeanIOReader.java b/extensions/beanio/src/main/java/org/apache/batchee/beanio/BeanIOReader.java
index e6f2e03..7fb72d1 100644
--- a/extensions/beanio/src/main/java/org/apache/batchee/beanio/BeanIOReader.java
+++ b/extensions/beanio/src/main/java/org/apache/batchee/beanio/BeanIOReader.java
@@ -23,6 +23,7 @@ import org.beanio.BeanReaderErrorHandler;
 import javax.batch.api.BatchProperty;
 import javax.batch.api.chunk.ItemReader;
 import javax.inject.Inject;
+import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.Serializable;
 import java.util.Locale;
@@ -33,6 +34,10 @@ public class BeanIOReader extends CountedReader implements ItemReader {
     protected String filePath;
 
     @Inject
+    @BatchProperty(name = "skippedHeaderLines")
+    protected int skippedHeaderLines;
+
+    @Inject
     @BatchProperty
     protected String streamName;
 
@@ -52,10 +57,15 @@ public class BeanIOReader extends CountedReader implements ItemReader {
 
     @Override
     public void open(final Serializable checkpoint) throws Exception {
-        reader = BeanIOs.open(filePath, streamName, configuration).createReader(streamName, new FileReader(filePath), initLocale());
+        final BufferedReader reader = new BufferedReader(new FileReader(filePath));
+        for (int i = 0; i < skippedHeaderLines; i++) {
+            reader.readLine();
+        }
+
+        this.reader = BeanIOs.open(filePath, streamName, configuration).createReader(streamName, reader, initLocale());
         if (errorHandlerStr != null) {
             final BeanReaderErrorHandler handler = BeanReaderErrorHandler.class.cast(Thread.currentThread().getContextClassLoader().loadClass(errorHandlerStr).newInstance());
-            reader.setErrorHandler(handler);
+            this.reader.setErrorHandler(handler);
         }
 
         super.open(checkpoint);