Apache
/
commons-csv
mirror of https://github.com/apache/commons-csv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Implement Quote.NON_NUMERIC and Quote.MINIMAL. NONE throws a 'not implemented yet' exception. 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1398137 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary D. Gregory 2012-10-14 21:23:33 +00:00
parent b9b3b58cbd
commit f51f43d184
2 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/org/apache/commons/csv/CSVPrinter.java
View File

@ -150,9 +150,9 @@ public class CSVPrinter {
println();
}
private void print(final CharSequence value, final int offset, final int len) throws IOException {
private void print(Object object, final CharSequence value, final int offset, final int len) throws IOException {
if (format.isQuoting()) {
printAndQuote(value, offset, len);
printAndQuote(object, value, offset, len);
} else if (format.isEscaping()) {
printAndEscape(value, offset, len);
} else {
@ -207,7 +207,7 @@ public class CSVPrinter {
}
}
void printAndQuote(final CharSequence value, final int offset, final int len) throws IOException {
void printAndQuote(Object object, final CharSequence value, final int offset, final int len) throws IOException {
final boolean first = newLine; // is this the first value on this line?
boolean quote = false;
int start = offset;
@ -219,9 +219,20 @@ public class CSVPrinter {
final char delimChar = format.getDelimiter();
final char quoteChar = format.getQuoteChar();
if (format.getQuotePolicy() == Quote.ALL) {
Quote quotePolicy = format.getQuotePolicy();
if (quotePolicy == null) {
quotePolicy = Quote.MINIMAL;
}
switch (quotePolicy) {
case ALL:
quote = true;
} else {
break;
case NON_NUMERIC:
quote = !(object instanceof Number);
break;
case NONE:
throw new IllegalArgumentException("Not implemented yet");
case MINIMAL:
if (len <= 0) {
// always quote an empty token that is the first
// on the line, as it may be the only thing on the
@ -270,8 +281,15 @@ public class CSVPrinter {
out.append(value, start, end);
return;
}
break;
}
if (!quote) {
// no encapsulation needed - write out the original value
out.append(value, start, end);
return;
}
// we hit something that needed encapsulation
out.append(quoteChar);
@ -313,7 +331,7 @@ public class CSVPrinter {
printDelimiter();
out.append(value);
} else {
print(value, 0, value.length());
print(object, value, 0, value.length());
}
}
@ -325,8 +343,10 @@ public class CSVPrinter {
* @throws IOException
* If an I/O error occurs
*/
public void print(final Object value) throws IOException {
print(value, true);
public void print(final Object object) throws IOException {
// null values are considered empty
final String value = object == null ? EMPTY : object.toString();
print(object, value, 0, value.length());
}
/**

8
src/test/java/org/apache/commons/csv/CSVPrinterTest.java
View File

@ -293,6 +293,14 @@ public class CSVPrinterTest {
assertEquals("\"a\",\"b\nc\",\"d\"" + lineSeparator, sw.toString());
}
@Test
public void testQuoteNonNumeric() throws IOException {
final StringWriter sw = new StringWriter();
final CSVPrinter printer = new CSVPrinter(sw, CSVFormat.DEFAULT.withQuotePolicy(Quote.NON_NUMERIC));
printer.printRecord("a", "b\nc", Integer.valueOf(1));
assertEquals("\"a\",\"b\nc\",1" + lineSeparator, sw.toString());
}
@Test
public void testRandom() throws Exception {
final int iter = 10000;