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

Internal refactoring for delimiter

This commit is contained in:
Gary Gregory 2024-03-11 13:52:30 -04:00
parent fca97cd9ce
commit 98f46ac661
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/org/apache/commons/csv/CSVFormat.java
View File

@ -1679,6 +1679,15 @@ public final class CSVFormat implements Serializable {
return delimiter.charAt(0);
}
/**
* Gets the character delimiting the values (typically ";", "," or "\t").
*
* @return the delimiter.
*/
char[] getDelimiterCharArray() {
return delimiter.toCharArray();
}
/**
* Gets the character delimiting the values (typically ";", "," or "\t").
*
@ -2126,7 +2135,7 @@ public final class CSVFormat implements Serializable {
int start = 0;
int pos = 0;
final int end = charSeq.length();
final char[] delim = getDelimiterString().toCharArray();
final char[] delim = getDelimiterCharArray();
final int delimLength = delim.length;
final char escape = getEscapeCharacter().charValue();
while (pos < end) {
@ -2168,7 +2177,7 @@ public final class CSVFormat implements Serializable {
int pos = 0;
@SuppressWarnings("resource") // Temp reader on input reader.
final ExtendedBufferedReader bufferedReader = new ExtendedBufferedReader(reader);
final char[] delim = getDelimiterString().toCharArray();
final char[] delim = getDelimiterCharArray();
final int delimLength = delim.length;
final char escape = getEscapeCharacter().charValue();
final StringBuilder builder = new StringBuilder(IOUtils.DEFAULT_BUFFER_SIZE);
@ -2217,7 +2226,7 @@ public final class CSVFormat implements Serializable {
int start = 0;
int pos = 0;
final int len = charSeq.length();
final char[] delim = getDelimiterString().toCharArray();
final char[] delim = getDelimiterCharArray();
final int delimLength = delim.length;
final char quoteChar = getQuoteCharacter().charValue();
// If escape char not specified, default to the quote char

2
src/main/java/org/apache/commons/csv/Lexer.java
View File

@ -65,7 +65,7 @@ final class Lexer implements Closeable {
Lexer(final CSVFormat format, final ExtendedBufferedReader reader) {
this.reader = reader;
this.delimiter = format.getDelimiterString().toCharArray();
this.delimiter = format.getDelimiterCharArray();
this.escape = mapNullToDisabled(format.getEscapeCharacter());
this.quoteChar = mapNullToDisabled(format.getQuoteCharacter());
this.commentStart = mapNullToDisabled(format.getCommentMarker());