Skip to content

Commit 98f46ac

Browse files
committed
Internal refactoring for delimiter
1 parent fca97cd commit 98f46ac

2 files changed

Lines changed: 13 additions & 4 deletions

File tree

src/main/java/org/apache/commons/csv/CSVFormat.java

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1679,6 +1679,15 @@ public char getDelimiter() {
16791679
return delimiter.charAt(0);
16801680
}
16811681

1682+
/**
1683+
* Gets the character delimiting the values (typically ";", "," or "\t").
1684+
*
1685+
* @return the delimiter.
1686+
*/
1687+
char[] getDelimiterCharArray() {
1688+
return delimiter.toCharArray();
1689+
}
1690+
16821691
/**
16831692
* Gets the character delimiting the values (typically ";", "," or "\t").
16841693
*
@@ -2126,7 +2135,7 @@ private void printWithEscapes(final CharSequence charSeq, final Appendable appen
21262135
int start = 0;
21272136
int pos = 0;
21282137
final int end = charSeq.length();
2129-
final char[] delim = getDelimiterString().toCharArray();
2138+
final char[] delim = getDelimiterCharArray();
21302139
final int delimLength = delim.length;
21312140
final char escape = getEscapeCharacter().charValue();
21322141
while (pos < end) {
@@ -2168,7 +2177,7 @@ private void printWithEscapes(final Reader reader, final Appendable appendable)
21682177
int pos = 0;
21692178
@SuppressWarnings("resource") // Temp reader on input reader.
21702179
final ExtendedBufferedReader bufferedReader = new ExtendedBufferedReader(reader);
2171-
final char[] delim = getDelimiterString().toCharArray();
2180+
final char[] delim = getDelimiterCharArray();
21722181
final int delimLength = delim.length;
21732182
final char escape = getEscapeCharacter().charValue();
21742183
final StringBuilder builder = new StringBuilder(IOUtils.DEFAULT_BUFFER_SIZE);
@@ -2217,7 +2226,7 @@ private void printWithQuotes(final Object object, final CharSequence charSeq, fi
22172226
int start = 0;
22182227
int pos = 0;
22192228
final int len = charSeq.length();
2220-
final char[] delim = getDelimiterString().toCharArray();
2229+
final char[] delim = getDelimiterCharArray();
22212230
final int delimLength = delim.length;
22222231
final char quoteChar = getQuoteCharacter().charValue();
22232232
// If escape char not specified, default to the quote char

src/main/java/org/apache/commons/csv/Lexer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ final class Lexer implements Closeable {
6565

6666
Lexer(final CSVFormat format, final ExtendedBufferedReader reader) {
6767
this.reader = reader;
68-
this.delimiter = format.getDelimiterString().toCharArray();
68+
this.delimiter = format.getDelimiterCharArray();
6969
this.escape = mapNullToDisabled(format.getEscapeCharacter());
7070
this.quoteChar = mapNullToDisabled(format.getQuoteCharacter());
7171
this.commentStart = mapNullToDisabled(format.getCommentMarker());

0 commit comments

Comments
 (0)