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/11/24 12:11:18 UTC
incubator-batchee git commit: renaming readHeaders writeHeaders for
CommonsCsvWriter for consistency
Repository: incubator-batchee
Updated Branches:
refs/heads/master 6047c395c -> ef9bfa9ba
renaming readHeaders writeHeaders for CommonsCsvWriter for consistency
Project: http://git-wip-us.apache.org/repos/asf/incubator-batchee/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-batchee/commit/ef9bfa9b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-batchee/tree/ef9bfa9b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-batchee/diff/ef9bfa9b
Branch: refs/heads/master
Commit: ef9bfa9baaeaea5c115aa2f64d9f81e065606c6d
Parents: 6047c39
Author: Romain Manni-Bucau <rm...@gmail.com>
Authored: Tue Nov 24 12:11:20 2015 +0100
Committer: Romain Manni-Bucau <rm...@gmail.com>
Committed: Tue Nov 24 12:11:20 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/batchee/csv/CommonsCsvWriter.java | 14 +++++++-------
.../batch-jobs/csv-writer-defaultmapperheaders.xml | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/ef9bfa9b/extensions/commons-csv/src/main/java/org/apache/batchee/csv/CommonsCsvWriter.java
----------------------------------------------------------------------
diff --git a/extensions/commons-csv/src/main/java/org/apache/batchee/csv/CommonsCsvWriter.java b/extensions/commons-csv/src/main/java/org/apache/batchee/csv/CommonsCsvWriter.java
index b759799..471a8f6 100644
--- a/extensions/commons-csv/src/main/java/org/apache/batchee/csv/CommonsCsvWriter.java
+++ b/extensions/commons-csv/src/main/java/org/apache/batchee/csv/CommonsCsvWriter.java
@@ -109,7 +109,7 @@ public class CommonsCsvWriter implements ItemWriter {
@Inject
@BatchProperty
- private String readHeaders;
+ private String writeHeaders;
private CSVPrinter writer;
private BeanLocator.LocatorInstance<CsvWriterMapper> mapperInstance;
@@ -122,7 +122,7 @@ public class CommonsCsvWriter implements ItemWriter {
(defaultMapper != null ? new BeanLocator.LocatorInstance<CsvWriterMapper>(defaultMapper, null) : null) :
BeanLocator.Finder.get(locator).newInstance(CsvWriterMapper.class, mapper);
- if ((header == null || header.isEmpty()) && Boolean.parseBoolean(readHeaders) && DefaultMapper.class.isInstance(mapperInstance.getValue())) {
+ if ((header == null || header.isEmpty()) && Boolean.parseBoolean(writeHeaders) && DefaultMapper.class.isInstance(mapperInstance.getValue())) {
header = toListString(DefaultMapper.class.cast(mapperInstance.getValue()).getHeaders());
}
final CSVFormat format = newFormat();
@@ -178,7 +178,7 @@ public class CommonsCsvWriter implements ItemWriter {
return CSVFormatFactory.newFormat(
format, delimiter, quoteCharacter, quoteMode, commentMarker, escapeCharacter, ignoreSurroundingSpaces,
ignoreEmptyLines, recordSeparator, nullString, headerComments, header, skipHeaderRecord, allowMissingColumnNames,
- readHeaders);
+ writeHeaders);
}
public void setFormat(final String format) {
@@ -261,11 +261,11 @@ public class CommonsCsvWriter implements ItemWriter {
this.skipHeaderRecord = skipHeaderRecord;
}
- public void setReadHeaders(final String readHeaders) {
- this.readHeaders = readHeaders;
+ public void setWriteHeaders(final String readHeaders) {
+ this.writeHeaders = readHeaders;
}
- public void readHeaders() {
- this.readHeaders = "true";
+ public void writeHeaders() {
+ this.writeHeaders = "true";
}
}
http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/ef9bfa9b/extensions/commons-csv/src/test/resources/META-INF/batch-jobs/csv-writer-defaultmapperheaders.xml
----------------------------------------------------------------------
diff --git a/extensions/commons-csv/src/test/resources/META-INF/batch-jobs/csv-writer-defaultmapperheaders.xml b/extensions/commons-csv/src/test/resources/META-INF/batch-jobs/csv-writer-defaultmapperheaders.xml
index 393d61d..f98a362 100644
--- a/extensions/commons-csv/src/test/resources/META-INF/batch-jobs/csv-writer-defaultmapperheaders.xml
+++ b/extensions/commons-csv/src/test/resources/META-INF/batch-jobs/csv-writer-defaultmapperheaders.xml
@@ -21,7 +21,7 @@
<properties>
<property name="output" value="#{jobParameters['output']}"/>
<property name="mapping" value="org.apache.batchee.csv.CommonsCsvWriterMappingHeadersTest$Record"/>
- <property name="readHeaders" value="true"/>
+ <property name="writeHeaders" value="true"/>
</properties>
</writer>
</chunk>