You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@commons.apache.org by br...@apache.org on 2018/09/25 13:16:04 UTC
svn commit: r1035683 [9/32] - in
/websites/production/commons/content/proper/commons-csv: ./ apidocs/
apidocs/org/apache/commons/csv/ apidocs/org/apache/commons/csv/class-use/
apidocs/src-html/org/apache/commons/csv/ jacoco-aggregate/
jacoco-aggregate/...
Modified: websites/production/commons/content/proper/commons-csv/apidocs/src-html/org/apache/commons/csv/CSVParser.html
==============================================================================
--- websites/production/commons/content/proper/commons-csv/apidocs/src-html/org/apache/commons/csv/CSVParser.html (original)
+++ websites/production/commons/content/proper/commons-csv/apidocs/src-html/org/apache/commons/csv/CSVParser.html Tue Sep 25 13:16:01 2018
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="en">
+<html lang="de">
<head>
<title>Source code</title>
<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
@@ -107,7 +107,7 @@
<span class="sourceLineNo">099</span> *<a name="line.99"></a>
<span class="sourceLineNo">100</span> * <p><a name="line.100"></a>
<span class="sourceLineNo">101</span> * If the predefined formats don't match the format at hands, custom formats can be defined. More information about<a name="line.101"></a>
-<span class="sourceLineNo">102</span> * customising CSVFormats is available in {@link CSVFormat CSVFormat JavaDoc}.<a name="line.102"></a>
+<span class="sourceLineNo">102</span> * customising CSVFormats is available in {@link CSVFormat CSVFormat Javadoc}.<a name="line.102"></a>
<span class="sourceLineNo">103</span> * </p><a name="line.103"></a>
<span class="sourceLineNo">104</span> *<a name="line.104"></a>
<span class="sourceLineNo">105</span> * <h2>Parsing into memory</h2><a name="line.105"></a>
@@ -211,7 +211,7 @@
<span class="sourceLineNo">203</span> public static CSVParser parse(final Path path, final Charset charset, final CSVFormat format) throws IOException {<a name="line.203"></a>
<span class="sourceLineNo">204</span> Assertions.notNull(path, "path");<a name="line.204"></a>
<span class="sourceLineNo">205</span> Assertions.notNull(format, "format");<a name="line.205"></a>
-<span class="sourceLineNo">206</span> return parse(Files.newBufferedReader(path, charset), format);<a name="line.206"></a>
+<span class="sourceLineNo">206</span> return parse(Files.newInputStream(path), charset, format);<a name="line.206"></a>
<span class="sourceLineNo">207</span> }<a name="line.207"></a>
<span class="sourceLineNo">208</span><a name="line.208"></a>
<span class="sourceLineNo">209</span> /**<a name="line.209"></a>
@@ -233,7 +233,7 @@
<span class="sourceLineNo">225</span> * If there is a problem reading the header or skipping the first record<a name="line.225"></a>
<span class="sourceLineNo">226</span> * @since 1.5<a name="line.226"></a>
<span class="sourceLineNo">227</span> */<a name="line.227"></a>
-<span class="sourceLineNo">228</span> public static CSVParser parse(Reader reader, final CSVFormat format) throws IOException {<a name="line.228"></a>
+<span class="sourceLineNo">228</span> public static CSVParser parse(final Reader reader, final CSVFormat format) throws IOException {<a name="line.228"></a>
<span class="sourceLineNo">229</span> return new CSVParser(reader, format);<a name="line.229"></a>
<span class="sourceLineNo">230</span> }<a name="line.230"></a>
<span class="sourceLineNo">231</span><a name="line.231"></a>
@@ -294,342 +294,347 @@
<span class="sourceLineNo">286</span><a name="line.286"></a>
<span class="sourceLineNo">287</span> private final Lexer lexer;<a name="line.287"></a>
<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span> /** A record buffer for getRecord(). Grows as necessary and is reused. */<a name="line.289"></a>
-<span class="sourceLineNo">290</span> private final List<String> recordList = new ArrayList<>();<a name="line.290"></a>
-<span class="sourceLineNo">291</span><a name="line.291"></a>
-<span class="sourceLineNo">292</span> /**<a name="line.292"></a>
-<span class="sourceLineNo">293</span> * The next record number to assign.<a name="line.293"></a>
-<span class="sourceLineNo">294</span> */<a name="line.294"></a>
-<span class="sourceLineNo">295</span> private long recordNumber;<a name="line.295"></a>
-<span class="sourceLineNo">296</span><a name="line.296"></a>
-<span class="sourceLineNo">297</span> /**<a name="line.297"></a>
-<span class="sourceLineNo">298</span> * Lexer offset when the parser does not start parsing at the beginning of the source. Usually used in combination<a name="line.298"></a>
-<span class="sourceLineNo">299</span> * with {@link #recordNumber}.<a name="line.299"></a>
-<span class="sourceLineNo">300</span> */<a name="line.300"></a>
-<span class="sourceLineNo">301</span> private final long characterOffset;<a name="line.301"></a>
-<span class="sourceLineNo">302</span><a name="line.302"></a>
-<span class="sourceLineNo">303</span> private final Token reusableToken = new Token();<a name="line.303"></a>
+<span class="sourceLineNo">289</span> private final CSVRecordIterator csvRecordIterator;<a name="line.289"></a>
+<span class="sourceLineNo">290</span><a name="line.290"></a>
+<span class="sourceLineNo">291</span> /** A record buffer for getRecord(). Grows as necessary and is reused. */<a name="line.291"></a>
+<span class="sourceLineNo">292</span> private final List<String> recordList = new ArrayList<>();<a name="line.292"></a>
+<span class="sourceLineNo">293</span><a name="line.293"></a>
+<span class="sourceLineNo">294</span> /**<a name="line.294"></a>
+<span class="sourceLineNo">295</span> * The next record number to assign.<a name="line.295"></a>
+<span class="sourceLineNo">296</span> */<a name="line.296"></a>
+<span class="sourceLineNo">297</span> private long recordNumber;<a name="line.297"></a>
+<span class="sourceLineNo">298</span><a name="line.298"></a>
+<span class="sourceLineNo">299</span> /**<a name="line.299"></a>
+<span class="sourceLineNo">300</span> * Lexer offset when the parser does not start parsing at the beginning of the source. Usually used in combination<a name="line.300"></a>
+<span class="sourceLineNo">301</span> * with {@link #recordNumber}.<a name="line.301"></a>
+<span class="sourceLineNo">302</span> */<a name="line.302"></a>
+<span class="sourceLineNo">303</span> private final long characterOffset;<a name="line.303"></a>
<span class="sourceLineNo">304</span><a name="line.304"></a>
-<span class="sourceLineNo">305</span> /**<a name="line.305"></a>
-<span class="sourceLineNo">306</span> * Customized CSV parser using the given {@link CSVFormat}<a name="line.306"></a>
-<span class="sourceLineNo">307</span> *<a name="line.307"></a>
-<span class="sourceLineNo">308</span> * <p><a name="line.308"></a>
-<span class="sourceLineNo">309</span> * If you do not read all records from the given {@code reader}, you should call {@link #close()} on the parser,<a name="line.309"></a>
-<span class="sourceLineNo">310</span> * unless you close the {@code reader}.<a name="line.310"></a>
-<span class="sourceLineNo">311</span> * </p><a name="line.311"></a>
-<span class="sourceLineNo">312</span> *<a name="line.312"></a>
-<span class="sourceLineNo">313</span> * @param reader<a name="line.313"></a>
-<span class="sourceLineNo">314</span> * a Reader containing CSV-formatted input. Must not be null.<a name="line.314"></a>
-<span class="sourceLineNo">315</span> * @param format<a name="line.315"></a>
-<span class="sourceLineNo">316</span> * the CSVFormat used for CSV parsing. Must not be null.<a name="line.316"></a>
-<span class="sourceLineNo">317</span> * @throws IllegalArgumentException<a name="line.317"></a>
-<span class="sourceLineNo">318</span> * If the parameters of the format are inconsistent or if either reader or format are null.<a name="line.318"></a>
-<span class="sourceLineNo">319</span> * @throws IOException<a name="line.319"></a>
-<span class="sourceLineNo">320</span> * If there is a problem reading the header or skipping the first record<a name="line.320"></a>
-<span class="sourceLineNo">321</span> */<a name="line.321"></a>
-<span class="sourceLineNo">322</span> public CSVParser(final Reader reader, final CSVFormat format) throws IOException {<a name="line.322"></a>
-<span class="sourceLineNo">323</span> this(reader, format, 0, 1);<a name="line.323"></a>
-<span class="sourceLineNo">324</span> }<a name="line.324"></a>
-<span class="sourceLineNo">325</span><a name="line.325"></a>
-<span class="sourceLineNo">326</span> /**<a name="line.326"></a>
-<span class="sourceLineNo">327</span> * Customized CSV parser using the given {@link CSVFormat}<a name="line.327"></a>
-<span class="sourceLineNo">328</span> *<a name="line.328"></a>
-<span class="sourceLineNo">329</span> * <p><a name="line.329"></a>
-<span class="sourceLineNo">330</span> * If you do not read all records from the given {@code reader}, you should call {@link #close()} on the parser,<a name="line.330"></a>
-<span class="sourceLineNo">331</span> * unless you close the {@code reader}.<a name="line.331"></a>
-<span class="sourceLineNo">332</span> * </p><a name="line.332"></a>
-<span class="sourceLineNo">333</span> *<a name="line.333"></a>
-<span class="sourceLineNo">334</span> * @param reader<a name="line.334"></a>
-<span class="sourceLineNo">335</span> * a Reader containing CSV-formatted input. Must not be null.<a name="line.335"></a>
-<span class="sourceLineNo">336</span> * @param format<a name="line.336"></a>
-<span class="sourceLineNo">337</span> * the CSVFormat used for CSV parsing. Must not be null.<a name="line.337"></a>
-<span class="sourceLineNo">338</span> * @param characterOffset<a name="line.338"></a>
-<span class="sourceLineNo">339</span> * Lexer offset when the parser does not start parsing at the beginning of the source.<a name="line.339"></a>
-<span class="sourceLineNo">340</span> * @param recordNumber<a name="line.340"></a>
-<span class="sourceLineNo">341</span> * The next record number to assign<a name="line.341"></a>
-<span class="sourceLineNo">342</span> * @throws IllegalArgumentException<a name="line.342"></a>
-<span class="sourceLineNo">343</span> * If the parameters of the format are inconsistent or if either reader or format are null.<a name="line.343"></a>
-<span class="sourceLineNo">344</span> * @throws IOException<a name="line.344"></a>
-<span class="sourceLineNo">345</span> * If there is a problem reading the header or skipping the first record<a name="line.345"></a>
-<span class="sourceLineNo">346</span> * @since 1.1<a name="line.346"></a>
-<span class="sourceLineNo">347</span> */<a name="line.347"></a>
-<span class="sourceLineNo">348</span> @SuppressWarnings("resource")<a name="line.348"></a>
-<span class="sourceLineNo">349</span> public CSVParser(final Reader reader, final CSVFormat format, final long characterOffset, final long recordNumber)<a name="line.349"></a>
-<span class="sourceLineNo">350</span> throws IOException {<a name="line.350"></a>
-<span class="sourceLineNo">351</span> Assertions.notNull(reader, "reader");<a name="line.351"></a>
-<span class="sourceLineNo">352</span> Assertions.notNull(format, "format");<a name="line.352"></a>
-<span class="sourceLineNo">353</span><a name="line.353"></a>
-<span class="sourceLineNo">354</span> this.format = format;<a name="line.354"></a>
-<span class="sourceLineNo">355</span> this.lexer = new Lexer(format, new ExtendedBufferedReader(reader));<a name="line.355"></a>
-<span class="sourceLineNo">356</span> this.headerMap = this.initializeHeader();<a name="line.356"></a>
-<span class="sourceLineNo">357</span> this.characterOffset = characterOffset;<a name="line.357"></a>
-<span class="sourceLineNo">358</span> this.recordNumber = recordNumber - 1;<a name="line.358"></a>
-<span class="sourceLineNo">359</span> }<a name="line.359"></a>
-<span class="sourceLineNo">360</span><a name="line.360"></a>
-<span class="sourceLineNo">361</span> private void addRecordValue(final boolean lastRecord) {<a name="line.361"></a>
-<span class="sourceLineNo">362</span> final String input = this.reusableToken.content.toString();<a name="line.362"></a>
-<span class="sourceLineNo">363</span> final String inputClean = this.format.getTrim() ? input.trim() : input;<a name="line.363"></a>
-<span class="sourceLineNo">364</span> if (lastRecord && inputClean.isEmpty() && this.format.getTrailingDelimiter()) {<a name="line.364"></a>
-<span class="sourceLineNo">365</span> return;<a name="line.365"></a>
-<span class="sourceLineNo">366</span> }<a name="line.366"></a>
-<span class="sourceLineNo">367</span> final String nullString = this.format.getNullString();<a name="line.367"></a>
-<span class="sourceLineNo">368</span> this.recordList.add(inputClean.equals(nullString) ? null : inputClean);<a name="line.368"></a>
-<span class="sourceLineNo">369</span> }<a name="line.369"></a>
-<span class="sourceLineNo">370</span><a name="line.370"></a>
-<span class="sourceLineNo">371</span> /**<a name="line.371"></a>
-<span class="sourceLineNo">372</span> * Closes resources.<a name="line.372"></a>
-<span class="sourceLineNo">373</span> *<a name="line.373"></a>
-<span class="sourceLineNo">374</span> * @throws IOException<a name="line.374"></a>
-<span class="sourceLineNo">375</span> * If an I/O error occurs<a name="line.375"></a>
-<span class="sourceLineNo">376</span> */<a name="line.376"></a>
-<span class="sourceLineNo">377</span> @Override<a name="line.377"></a>
-<span class="sourceLineNo">378</span> public void close() throws IOException {<a name="line.378"></a>
-<span class="sourceLineNo">379</span> if (this.lexer != null) {<a name="line.379"></a>
-<span class="sourceLineNo">380</span> this.lexer.close();<a name="line.380"></a>
-<span class="sourceLineNo">381</span> }<a name="line.381"></a>
-<span class="sourceLineNo">382</span> }<a name="line.382"></a>
-<span class="sourceLineNo">383</span><a name="line.383"></a>
-<span class="sourceLineNo">384</span> /**<a name="line.384"></a>
-<span class="sourceLineNo">385</span> * Returns the current line number in the input stream.<a name="line.385"></a>
-<span class="sourceLineNo">386</span> *<a name="line.386"></a>
-<span class="sourceLineNo">387</span> * <p><a name="line.387"></a>
-<span class="sourceLineNo">388</span> * <strong>ATTENTION:</strong> If your CSV input has multi-line values, the returned number does not correspond to<a name="line.388"></a>
-<span class="sourceLineNo">389</span> * the record number.<a name="line.389"></a>
-<span class="sourceLineNo">390</span> * </p><a name="line.390"></a>
-<span class="sourceLineNo">391</span> *<a name="line.391"></a>
-<span class="sourceLineNo">392</span> * @return current line number<a name="line.392"></a>
-<span class="sourceLineNo">393</span> */<a name="line.393"></a>
-<span class="sourceLineNo">394</span> public long getCurrentLineNumber() {<a name="line.394"></a>
-<span class="sourceLineNo">395</span> return this.lexer.getCurrentLineNumber();<a name="line.395"></a>
-<span class="sourceLineNo">396</span> }<a name="line.396"></a>
-<span class="sourceLineNo">397</span><a name="line.397"></a>
-<span class="sourceLineNo">398</span> /**<a name="line.398"></a>
-<span class="sourceLineNo">399</span> * Gets the first end-of-line string encountered.<a name="line.399"></a>
-<span class="sourceLineNo">400</span> *<a name="line.400"></a>
-<span class="sourceLineNo">401</span> * @return the first end-of-line string<a name="line.401"></a>
-<span class="sourceLineNo">402</span> * @since 1.5<a name="line.402"></a>
-<span class="sourceLineNo">403</span> */<a name="line.403"></a>
-<span class="sourceLineNo">404</span> public String getFirstEndOfLine() {<a name="line.404"></a>
-<span class="sourceLineNo">405</span> return lexer.getFirstEol();<a name="line.405"></a>
-<span class="sourceLineNo">406</span> }<a name="line.406"></a>
-<span class="sourceLineNo">407</span><a name="line.407"></a>
-<span class="sourceLineNo">408</span> /**<a name="line.408"></a>
-<span class="sourceLineNo">409</span> * Returns a copy of the header map that iterates in column order.<a name="line.409"></a>
-<span class="sourceLineNo">410</span> * <p><a name="line.410"></a>
-<span class="sourceLineNo">411</span> * The map keys are column names. The map values are 0-based indices.<a name="line.411"></a>
-<span class="sourceLineNo">412</span> * </p><a name="line.412"></a>
-<span class="sourceLineNo">413</span> * @return a copy of the header map that iterates in column order.<a name="line.413"></a>
-<span class="sourceLineNo">414</span> */<a name="line.414"></a>
-<span class="sourceLineNo">415</span> public Map<String, Integer> getHeaderMap() {<a name="line.415"></a>
-<span class="sourceLineNo">416</span> return this.headerMap == null ? null : new LinkedHashMap<>(this.headerMap);<a name="line.416"></a>
-<span class="sourceLineNo">417</span> }<a name="line.417"></a>
-<span class="sourceLineNo">418</span><a name="line.418"></a>
-<span class="sourceLineNo">419</span> /**<a name="line.419"></a>
-<span class="sourceLineNo">420</span> * Returns the current record number in the input stream.<a name="line.420"></a>
-<span class="sourceLineNo">421</span> *<a name="line.421"></a>
-<span class="sourceLineNo">422</span> * <p><a name="line.422"></a>
-<span class="sourceLineNo">423</span> * <strong>ATTENTION:</strong> If your CSV input has multi-line values, the returned number does not correspond to<a name="line.423"></a>
-<span class="sourceLineNo">424</span> * the line number.<a name="line.424"></a>
-<span class="sourceLineNo">425</span> * </p><a name="line.425"></a>
-<span class="sourceLineNo">426</span> *<a name="line.426"></a>
-<span class="sourceLineNo">427</span> * @return current record number<a name="line.427"></a>
-<span class="sourceLineNo">428</span> */<a name="line.428"></a>
-<span class="sourceLineNo">429</span> public long getRecordNumber() {<a name="line.429"></a>
-<span class="sourceLineNo">430</span> return this.recordNumber;<a name="line.430"></a>
-<span class="sourceLineNo">431</span> }<a name="line.431"></a>
-<span class="sourceLineNo">432</span><a name="line.432"></a>
-<span class="sourceLineNo">433</span> /**<a name="line.433"></a>
-<span class="sourceLineNo">434</span> * Parses the CSV input according to the given format and returns the content as a list of<a name="line.434"></a>
-<span class="sourceLineNo">435</span> * {@link CSVRecord CSVRecords}.<a name="line.435"></a>
-<span class="sourceLineNo">436</span> *<a name="line.436"></a>
-<span class="sourceLineNo">437</span> * <p><a name="line.437"></a>
-<span class="sourceLineNo">438</span> * The returned content starts at the current parse-position in the stream.<a name="line.438"></a>
-<span class="sourceLineNo">439</span> * </p><a name="line.439"></a>
-<span class="sourceLineNo">440</span> *<a name="line.440"></a>
-<span class="sourceLineNo">441</span> * @return list of {@link CSVRecord CSVRecords}, may be empty<a name="line.441"></a>
-<span class="sourceLineNo">442</span> * @throws IOException<a name="line.442"></a>
-<span class="sourceLineNo">443</span> * on parse error or input read-failure<a name="line.443"></a>
-<span class="sourceLineNo">444</span> */<a name="line.444"></a>
-<span class="sourceLineNo">445</span> public List<CSVRecord> getRecords() throws IOException {<a name="line.445"></a>
-<span class="sourceLineNo">446</span> CSVRecord rec;<a name="line.446"></a>
-<span class="sourceLineNo">447</span> final List<CSVRecord> records = new ArrayList<>();<a name="line.447"></a>
-<span class="sourceLineNo">448</span> while ((rec = this.nextRecord()) != null) {<a name="line.448"></a>
-<span class="sourceLineNo">449</span> records.add(rec);<a name="line.449"></a>
-<span class="sourceLineNo">450</span> }<a name="line.450"></a>
-<span class="sourceLineNo">451</span> return records;<a name="line.451"></a>
-<span class="sourceLineNo">452</span> }<a name="line.452"></a>
-<span class="sourceLineNo">453</span><a name="line.453"></a>
-<span class="sourceLineNo">454</span> /**<a name="line.454"></a>
-<span class="sourceLineNo">455</span> * Initializes the name to index mapping if the format defines a header.<a name="line.455"></a>
-<span class="sourceLineNo">456</span> *<a name="line.456"></a>
-<span class="sourceLineNo">457</span> * @return null if the format has no header.<a name="line.457"></a>
-<span class="sourceLineNo">458</span> * @throws IOException if there is a problem reading the header or skipping the first record<a name="line.458"></a>
-<span class="sourceLineNo">459</span> */<a name="line.459"></a>
-<span class="sourceLineNo">460</span> private Map<String, Integer> initializeHeader() throws IOException {<a name="line.460"></a>
-<span class="sourceLineNo">461</span> Map<String, Integer> hdrMap = null;<a name="line.461"></a>
-<span class="sourceLineNo">462</span> final String[] formatHeader = this.format.getHeader();<a name="line.462"></a>
-<span class="sourceLineNo">463</span> if (formatHeader != null) {<a name="line.463"></a>
-<span class="sourceLineNo">464</span> hdrMap = this.format.getIgnoreHeaderCase() ?<a name="line.464"></a>
-<span class="sourceLineNo">465</span> new TreeMap<String, Integer>(String.CASE_INSENSITIVE_ORDER) :<a name="line.465"></a>
-<span class="sourceLineNo">466</span> new LinkedHashMap<String, Integer>();<a name="line.466"></a>
-<span class="sourceLineNo">467</span><a name="line.467"></a>
-<span class="sourceLineNo">468</span> String[] headerRecord = null;<a name="line.468"></a>
-<span class="sourceLineNo">469</span> if (formatHeader.length == 0) {<a name="line.469"></a>
-<span class="sourceLineNo">470</span> // read the header from the first line of the file<a name="line.470"></a>
-<span class="sourceLineNo">471</span> final CSVRecord nextRecord = this.nextRecord();<a name="line.471"></a>
-<span class="sourceLineNo">472</span> if (nextRecord != null) {<a name="line.472"></a>
-<span class="sourceLineNo">473</span> headerRecord = nextRecord.values();<a name="line.473"></a>
-<span class="sourceLineNo">474</span> }<a name="line.474"></a>
-<span class="sourceLineNo">475</span> } else {<a name="line.475"></a>
-<span class="sourceLineNo">476</span> if (this.format.getSkipHeaderRecord()) {<a name="line.476"></a>
-<span class="sourceLineNo">477</span> this.nextRecord();<a name="line.477"></a>
-<span class="sourceLineNo">478</span> }<a name="line.478"></a>
-<span class="sourceLineNo">479</span> headerRecord = formatHeader;<a name="line.479"></a>
-<span class="sourceLineNo">480</span> }<a name="line.480"></a>
-<span class="sourceLineNo">481</span><a name="line.481"></a>
-<span class="sourceLineNo">482</span> // build the name to index mappings<a name="line.482"></a>
-<span class="sourceLineNo">483</span> if (headerRecord != null) {<a name="line.483"></a>
-<span class="sourceLineNo">484</span> for (int i = 0; i < headerRecord.length; i++) {<a name="line.484"></a>
-<span class="sourceLineNo">485</span> final String header = headerRecord[i];<a name="line.485"></a>
-<span class="sourceLineNo">486</span> final boolean containsHeader = hdrMap.containsKey(header);<a name="line.486"></a>
-<span class="sourceLineNo">487</span> final boolean emptyHeader = header == null || header.trim().isEmpty();<a name="line.487"></a>
-<span class="sourceLineNo">488</span> if (containsHeader && (!emptyHeader || !this.format.getAllowMissingColumnNames())) {<a name="line.488"></a>
-<span class="sourceLineNo">489</span> throw new IllegalArgumentException("The header contains a duplicate name: \"" + header +<a name="line.489"></a>
-<span class="sourceLineNo">490</span> "\" in " + Arrays.toString(headerRecord));<a name="line.490"></a>
-<span class="sourceLineNo">491</span> }<a name="line.491"></a>
-<span class="sourceLineNo">492</span> hdrMap.put(header, Integer.valueOf(i));<a name="line.492"></a>
-<span class="sourceLineNo">493</span> }<a name="line.493"></a>
-<span class="sourceLineNo">494</span> }<a name="line.494"></a>
-<span class="sourceLineNo">495</span> }<a name="line.495"></a>
-<span class="sourceLineNo">496</span> return hdrMap;<a name="line.496"></a>
-<span class="sourceLineNo">497</span> }<a name="line.497"></a>
-<span class="sourceLineNo">498</span><a name="line.498"></a>
-<span class="sourceLineNo">499</span> /**<a name="line.499"></a>
-<span class="sourceLineNo">500</span> * Gets whether this parser is closed.<a name="line.500"></a>
-<span class="sourceLineNo">501</span> *<a name="line.501"></a>
-<span class="sourceLineNo">502</span> * @return whether this parser is closed.<a name="line.502"></a>
-<span class="sourceLineNo">503</span> */<a name="line.503"></a>
-<span class="sourceLineNo">504</span> public boolean isClosed() {<a name="line.504"></a>
-<span class="sourceLineNo">505</span> return this.lexer.isClosed();<a name="line.505"></a>
-<span class="sourceLineNo">506</span> }<a name="line.506"></a>
-<span class="sourceLineNo">507</span><a name="line.507"></a>
-<span class="sourceLineNo">508</span> /**<a name="line.508"></a>
-<span class="sourceLineNo">509</span> * Returns an iterator on the records.<a name="line.509"></a>
-<span class="sourceLineNo">510</span> *<a name="line.510"></a>
-<span class="sourceLineNo">511</span> * <p><a name="line.511"></a>
-<span class="sourceLineNo">512</span> * An {@link IOException} caught during the iteration are re-thrown as an<a name="line.512"></a>
-<span class="sourceLineNo">513</span> * {@link IllegalStateException}.<a name="line.513"></a>
-<span class="sourceLineNo">514</span> * </p><a name="line.514"></a>
-<span class="sourceLineNo">515</span> * <p><a name="line.515"></a>
-<span class="sourceLineNo">516</span> * If the parser is closed a call to {@link Iterator#next()} will throw a<a name="line.516"></a>
-<span class="sourceLineNo">517</span> * {@link NoSuchElementException}.<a name="line.517"></a>
-<span class="sourceLineNo">518</span> * </p><a name="line.518"></a>
-<span class="sourceLineNo">519</span> */<a name="line.519"></a>
-<span class="sourceLineNo">520</span> @Override<a name="line.520"></a>
-<span class="sourceLineNo">521</span> public Iterator<CSVRecord> iterator() {<a name="line.521"></a>
-<span class="sourceLineNo">522</span> return new Iterator<CSVRecord>() {<a name="line.522"></a>
-<span class="sourceLineNo">523</span> private CSVRecord current;<a name="line.523"></a>
-<span class="sourceLineNo">524</span><a name="line.524"></a>
-<span class="sourceLineNo">525</span> private CSVRecord getNextRecord() {<a name="line.525"></a>
-<span class="sourceLineNo">526</span> try {<a name="line.526"></a>
-<span class="sourceLineNo">527</span> return CSVParser.this.nextRecord();<a name="line.527"></a>
-<span class="sourceLineNo">528</span> } catch (final IOException e) {<a name="line.528"></a>
-<span class="sourceLineNo">529</span> throw new IllegalStateException(<a name="line.529"></a>
-<span class="sourceLineNo">530</span> e.getClass().getSimpleName() + " reading next record: " + e.toString(), e);<a name="line.530"></a>
-<span class="sourceLineNo">531</span> }<a name="line.531"></a>
-<span class="sourceLineNo">532</span> }<a name="line.532"></a>
-<span class="sourceLineNo">533</span><a name="line.533"></a>
-<span class="sourceLineNo">534</span> @Override<a name="line.534"></a>
-<span class="sourceLineNo">535</span> public boolean hasNext() {<a name="line.535"></a>
-<span class="sourceLineNo">536</span> if (CSVParser.this.isClosed()) {<a name="line.536"></a>
-<span class="sourceLineNo">537</span> return false;<a name="line.537"></a>
-<span class="sourceLineNo">538</span> }<a name="line.538"></a>
-<span class="sourceLineNo">539</span> if (this.current == null) {<a name="line.539"></a>
-<span class="sourceLineNo">540</span> this.current = this.getNextRecord();<a name="line.540"></a>
-<span class="sourceLineNo">541</span> }<a name="line.541"></a>
-<span class="sourceLineNo">542</span><a name="line.542"></a>
-<span class="sourceLineNo">543</span> return this.current != null;<a name="line.543"></a>
+<span class="sourceLineNo">305</span> private final Token reusableToken = new Token();<a name="line.305"></a>
+<span class="sourceLineNo">306</span><a name="line.306"></a>
+<span class="sourceLineNo">307</span> /**<a name="line.307"></a>
+<span class="sourceLineNo">308</span> * Customized CSV parser using the given {@link CSVFormat}<a name="line.308"></a>
+<span class="sourceLineNo">309</span> *<a name="line.309"></a>
+<span class="sourceLineNo">310</span> * <p><a name="line.310"></a>
+<span class="sourceLineNo">311</span> * If you do not read all records from the given {@code reader}, you should call {@link #close()} on the parser,<a name="line.311"></a>
+<span class="sourceLineNo">312</span> * unless you close the {@code reader}.<a name="line.312"></a>
+<span class="sourceLineNo">313</span> * </p><a name="line.313"></a>
+<span class="sourceLineNo">314</span> *<a name="line.314"></a>
+<span class="sourceLineNo">315</span> * @param reader<a name="line.315"></a>
+<span class="sourceLineNo">316</span> * a Reader containing CSV-formatted input. Must not be null.<a name="line.316"></a>
+<span class="sourceLineNo">317</span> * @param format<a name="line.317"></a>
+<span class="sourceLineNo">318</span> * the CSVFormat used for CSV parsing. Must not be null.<a name="line.318"></a>
+<span class="sourceLineNo">319</span> * @throws IllegalArgumentException<a name="line.319"></a>
+<span class="sourceLineNo">320</span> * If the parameters of the format are inconsistent or if either reader or format are null.<a name="line.320"></a>
+<span class="sourceLineNo">321</span> * @throws IOException<a name="line.321"></a>
+<span class="sourceLineNo">322</span> * If there is a problem reading the header or skipping the first record<a name="line.322"></a>
+<span class="sourceLineNo">323</span> */<a name="line.323"></a>
+<span class="sourceLineNo">324</span> public CSVParser(final Reader reader, final CSVFormat format) throws IOException {<a name="line.324"></a>
+<span class="sourceLineNo">325</span> this(reader, format, 0, 1);<a name="line.325"></a>
+<span class="sourceLineNo">326</span> }<a name="line.326"></a>
+<span class="sourceLineNo">327</span><a name="line.327"></a>
+<span class="sourceLineNo">328</span> /**<a name="line.328"></a>
+<span class="sourceLineNo">329</span> * Customized CSV parser using the given {@link CSVFormat}<a name="line.329"></a>
+<span class="sourceLineNo">330</span> *<a name="line.330"></a>
+<span class="sourceLineNo">331</span> * <p><a name="line.331"></a>
+<span class="sourceLineNo">332</span> * If you do not read all records from the given {@code reader}, you should call {@link #close()} on the parser,<a name="line.332"></a>
+<span class="sourceLineNo">333</span> * unless you close the {@code reader}.<a name="line.333"></a>
+<span class="sourceLineNo">334</span> * </p><a name="line.334"></a>
+<span class="sourceLineNo">335</span> *<a name="line.335"></a>
+<span class="sourceLineNo">336</span> * @param reader<a name="line.336"></a>
+<span class="sourceLineNo">337</span> * a Reader containing CSV-formatted input. Must not be null.<a name="line.337"></a>
+<span class="sourceLineNo">338</span> * @param format<a name="line.338"></a>
+<span class="sourceLineNo">339</span> * the CSVFormat used for CSV parsing. Must not be null.<a name="line.339"></a>
+<span class="sourceLineNo">340</span> * @param characterOffset<a name="line.340"></a>
+<span class="sourceLineNo">341</span> * Lexer offset when the parser does not start parsing at the beginning of the source.<a name="line.341"></a>
+<span class="sourceLineNo">342</span> * @param recordNumber<a name="line.342"></a>
+<span class="sourceLineNo">343</span> * The next record number to assign<a name="line.343"></a>
+<span class="sourceLineNo">344</span> * @throws IllegalArgumentException<a name="line.344"></a>
+<span class="sourceLineNo">345</span> * If the parameters of the format are inconsistent or if either reader or format are null.<a name="line.345"></a>
+<span class="sourceLineNo">346</span> * @throws IOException<a name="line.346"></a>
+<span class="sourceLineNo">347</span> * If there is a problem reading the header or skipping the first record<a name="line.347"></a>
+<span class="sourceLineNo">348</span> * @since 1.1<a name="line.348"></a>
+<span class="sourceLineNo">349</span> */<a name="line.349"></a>
+<span class="sourceLineNo">350</span> @SuppressWarnings("resource")<a name="line.350"></a>
+<span class="sourceLineNo">351</span> public CSVParser(final Reader reader, final CSVFormat format, final long characterOffset, final long recordNumber)<a name="line.351"></a>
+<span class="sourceLineNo">352</span> throws IOException {<a name="line.352"></a>
+<span class="sourceLineNo">353</span> Assertions.notNull(reader, "reader");<a name="line.353"></a>
+<span class="sourceLineNo">354</span> Assertions.notNull(format, "format");<a name="line.354"></a>
+<span class="sourceLineNo">355</span><a name="line.355"></a>
+<span class="sourceLineNo">356</span> this.format = format;<a name="line.356"></a>
+<span class="sourceLineNo">357</span> this.lexer = new Lexer(format, new ExtendedBufferedReader(reader));<a name="line.357"></a>
+<span class="sourceLineNo">358</span> this.csvRecordIterator = new CSVRecordIterator();<a name="line.358"></a>
+<span class="sourceLineNo">359</span> this.headerMap = this.initializeHeader();<a name="line.359"></a>
+<span class="sourceLineNo">360</span> this.characterOffset = characterOffset;<a name="line.360"></a>
+<span class="sourceLineNo">361</span> this.recordNumber = recordNumber - 1;<a name="line.361"></a>
+<span class="sourceLineNo">362</span> }<a name="line.362"></a>
+<span class="sourceLineNo">363</span><a name="line.363"></a>
+<span class="sourceLineNo">364</span> private void addRecordValue(final boolean lastRecord) {<a name="line.364"></a>
+<span class="sourceLineNo">365</span> final String input = this.reusableToken.content.toString();<a name="line.365"></a>
+<span class="sourceLineNo">366</span> final String inputClean = this.format.getTrim() ? input.trim() : input;<a name="line.366"></a>
+<span class="sourceLineNo">367</span> if (lastRecord && inputClean.isEmpty() && this.format.getTrailingDelimiter()) {<a name="line.367"></a>
+<span class="sourceLineNo">368</span> return;<a name="line.368"></a>
+<span class="sourceLineNo">369</span> }<a name="line.369"></a>
+<span class="sourceLineNo">370</span> final String nullString = this.format.getNullString();<a name="line.370"></a>
+<span class="sourceLineNo">371</span> this.recordList.add(inputClean.equals(nullString) ? null : inputClean);<a name="line.371"></a>
+<span class="sourceLineNo">372</span> }<a name="line.372"></a>
+<span class="sourceLineNo">373</span><a name="line.373"></a>
+<span class="sourceLineNo">374</span> /**<a name="line.374"></a>
+<span class="sourceLineNo">375</span> * Closes resources.<a name="line.375"></a>
+<span class="sourceLineNo">376</span> *<a name="line.376"></a>
+<span class="sourceLineNo">377</span> * @throws IOException<a name="line.377"></a>
+<span class="sourceLineNo">378</span> * If an I/O error occurs<a name="line.378"></a>
+<span class="sourceLineNo">379</span> */<a name="line.379"></a>
+<span class="sourceLineNo">380</span> @Override<a name="line.380"></a>
+<span class="sourceLineNo">381</span> public void close() throws IOException {<a name="line.381"></a>
+<span class="sourceLineNo">382</span> if (this.lexer != null) {<a name="line.382"></a>
+<span class="sourceLineNo">383</span> this.lexer.close();<a name="line.383"></a>
+<span class="sourceLineNo">384</span> }<a name="line.384"></a>
+<span class="sourceLineNo">385</span> }<a name="line.385"></a>
+<span class="sourceLineNo">386</span><a name="line.386"></a>
+<span class="sourceLineNo">387</span> /**<a name="line.387"></a>
+<span class="sourceLineNo">388</span> * Returns the current line number in the input stream.<a name="line.388"></a>
+<span class="sourceLineNo">389</span> *<a name="line.389"></a>
+<span class="sourceLineNo">390</span> * <p><a name="line.390"></a>
+<span class="sourceLineNo">391</span> * <strong>ATTENTION:</strong> If your CSV input has multi-line values, the returned number does not correspond to<a name="line.391"></a>
+<span class="sourceLineNo">392</span> * the record number.<a name="line.392"></a>
+<span class="sourceLineNo">393</span> * </p><a name="line.393"></a>
+<span class="sourceLineNo">394</span> *<a name="line.394"></a>
+<span class="sourceLineNo">395</span> * @return current line number<a name="line.395"></a>
+<span class="sourceLineNo">396</span> */<a name="line.396"></a>
+<span class="sourceLineNo">397</span> public long getCurrentLineNumber() {<a name="line.397"></a>
+<span class="sourceLineNo">398</span> return this.lexer.getCurrentLineNumber();<a name="line.398"></a>
+<span class="sourceLineNo">399</span> }<a name="line.399"></a>
+<span class="sourceLineNo">400</span><a name="line.400"></a>
+<span class="sourceLineNo">401</span> /**<a name="line.401"></a>
+<span class="sourceLineNo">402</span> * Gets the first end-of-line string encountered.<a name="line.402"></a>
+<span class="sourceLineNo">403</span> *<a name="line.403"></a>
+<span class="sourceLineNo">404</span> * @return the first end-of-line string<a name="line.404"></a>
+<span class="sourceLineNo">405</span> * @since 1.5<a name="line.405"></a>
+<span class="sourceLineNo">406</span> */<a name="line.406"></a>
+<span class="sourceLineNo">407</span> public String getFirstEndOfLine() {<a name="line.407"></a>
+<span class="sourceLineNo">408</span> return lexer.getFirstEol();<a name="line.408"></a>
+<span class="sourceLineNo">409</span> }<a name="line.409"></a>
+<span class="sourceLineNo">410</span><a name="line.410"></a>
+<span class="sourceLineNo">411</span> /**<a name="line.411"></a>
+<span class="sourceLineNo">412</span> * Returns a copy of the header map that iterates in column order.<a name="line.412"></a>
+<span class="sourceLineNo">413</span> * <p><a name="line.413"></a>
+<span class="sourceLineNo">414</span> * The map keys are column names. The map values are 0-based indices.<a name="line.414"></a>
+<span class="sourceLineNo">415</span> * </p><a name="line.415"></a>
+<span class="sourceLineNo">416</span> * @return a copy of the header map that iterates in column order.<a name="line.416"></a>
+<span class="sourceLineNo">417</span> */<a name="line.417"></a>
+<span class="sourceLineNo">418</span> public Map<String, Integer> getHeaderMap() {<a name="line.418"></a>
+<span class="sourceLineNo">419</span> return this.headerMap == null ? null : new LinkedHashMap<>(this.headerMap);<a name="line.419"></a>
+<span class="sourceLineNo">420</span> }<a name="line.420"></a>
+<span class="sourceLineNo">421</span><a name="line.421"></a>
+<span class="sourceLineNo">422</span> /**<a name="line.422"></a>
+<span class="sourceLineNo">423</span> * Returns the current record number in the input stream.<a name="line.423"></a>
+<span class="sourceLineNo">424</span> *<a name="line.424"></a>
+<span class="sourceLineNo">425</span> * <p><a name="line.425"></a>
+<span class="sourceLineNo">426</span> * <strong>ATTENTION:</strong> If your CSV input has multi-line values, the returned number does not correspond to<a name="line.426"></a>
+<span class="sourceLineNo">427</span> * the line number.<a name="line.427"></a>
+<span class="sourceLineNo">428</span> * </p><a name="line.428"></a>
+<span class="sourceLineNo">429</span> *<a name="line.429"></a>
+<span class="sourceLineNo">430</span> * @return current record number<a name="line.430"></a>
+<span class="sourceLineNo">431</span> */<a name="line.431"></a>
+<span class="sourceLineNo">432</span> public long getRecordNumber() {<a name="line.432"></a>
+<span class="sourceLineNo">433</span> return this.recordNumber;<a name="line.433"></a>
+<span class="sourceLineNo">434</span> }<a name="line.434"></a>
+<span class="sourceLineNo">435</span><a name="line.435"></a>
+<span class="sourceLineNo">436</span> /**<a name="line.436"></a>
+<span class="sourceLineNo">437</span> * Parses the CSV input according to the given format and returns the content as a list of<a name="line.437"></a>
+<span class="sourceLineNo">438</span> * {@link CSVRecord CSVRecords}.<a name="line.438"></a>
+<span class="sourceLineNo">439</span> *<a name="line.439"></a>
+<span class="sourceLineNo">440</span> * <p><a name="line.440"></a>
+<span class="sourceLineNo">441</span> * The returned content starts at the current parse-position in the stream.<a name="line.441"></a>
+<span class="sourceLineNo">442</span> * </p><a name="line.442"></a>
+<span class="sourceLineNo">443</span> *<a name="line.443"></a>
+<span class="sourceLineNo">444</span> * @return list of {@link CSVRecord CSVRecords}, may be empty<a name="line.444"></a>
+<span class="sourceLineNo">445</span> * @throws IOException<a name="line.445"></a>
+<span class="sourceLineNo">446</span> * on parse error or input read-failure<a name="line.446"></a>
+<span class="sourceLineNo">447</span> */<a name="line.447"></a>
+<span class="sourceLineNo">448</span> public List<CSVRecord> getRecords() throws IOException {<a name="line.448"></a>
+<span class="sourceLineNo">449</span> CSVRecord rec;<a name="line.449"></a>
+<span class="sourceLineNo">450</span> final List<CSVRecord> records = new ArrayList<>();<a name="line.450"></a>
+<span class="sourceLineNo">451</span> while ((rec = this.nextRecord()) != null) {<a name="line.451"></a>
+<span class="sourceLineNo">452</span> records.add(rec);<a name="line.452"></a>
+<span class="sourceLineNo">453</span> }<a name="line.453"></a>
+<span class="sourceLineNo">454</span> return records;<a name="line.454"></a>
+<span class="sourceLineNo">455</span> }<a name="line.455"></a>
+<span class="sourceLineNo">456</span><a name="line.456"></a>
+<span class="sourceLineNo">457</span> /**<a name="line.457"></a>
+<span class="sourceLineNo">458</span> * Initializes the name to index mapping if the format defines a header.<a name="line.458"></a>
+<span class="sourceLineNo">459</span> *<a name="line.459"></a>
+<span class="sourceLineNo">460</span> * @return null if the format has no header.<a name="line.460"></a>
+<span class="sourceLineNo">461</span> * @throws IOException if there is a problem reading the header or skipping the first record<a name="line.461"></a>
+<span class="sourceLineNo">462</span> */<a name="line.462"></a>
+<span class="sourceLineNo">463</span> private Map<String, Integer> initializeHeader() throws IOException {<a name="line.463"></a>
+<span class="sourceLineNo">464</span> Map<String, Integer> hdrMap = null;<a name="line.464"></a>
+<span class="sourceLineNo">465</span> final String[] formatHeader = this.format.getHeader();<a name="line.465"></a>
+<span class="sourceLineNo">466</span> if (formatHeader != null) {<a name="line.466"></a>
+<span class="sourceLineNo">467</span> hdrMap = this.format.getIgnoreHeaderCase() ?<a name="line.467"></a>
+<span class="sourceLineNo">468</span> new TreeMap<String, Integer>(String.CASE_INSENSITIVE_ORDER) :<a name="line.468"></a>
+<span class="sourceLineNo">469</span> new LinkedHashMap<String, Integer>();<a name="line.469"></a>
+<span class="sourceLineNo">470</span><a name="line.470"></a>
+<span class="sourceLineNo">471</span> String[] headerRecord = null;<a name="line.471"></a>
+<span class="sourceLineNo">472</span> if (formatHeader.length == 0) {<a name="line.472"></a>
+<span class="sourceLineNo">473</span> // read the header from the first line of the file<a name="line.473"></a>
+<span class="sourceLineNo">474</span> final CSVRecord nextRecord = this.nextRecord();<a name="line.474"></a>
+<span class="sourceLineNo">475</span> if (nextRecord != null) {<a name="line.475"></a>
+<span class="sourceLineNo">476</span> headerRecord = nextRecord.values();<a name="line.476"></a>
+<span class="sourceLineNo">477</span> }<a name="line.477"></a>
+<span class="sourceLineNo">478</span> } else {<a name="line.478"></a>
+<span class="sourceLineNo">479</span> if (this.format.getSkipHeaderRecord()) {<a name="line.479"></a>
+<span class="sourceLineNo">480</span> this.nextRecord();<a name="line.480"></a>
+<span class="sourceLineNo">481</span> }<a name="line.481"></a>
+<span class="sourceLineNo">482</span> headerRecord = formatHeader;<a name="line.482"></a>
+<span class="sourceLineNo">483</span> }<a name="line.483"></a>
+<span class="sourceLineNo">484</span><a name="line.484"></a>
+<span class="sourceLineNo">485</span> // build the name to index mappings<a name="line.485"></a>
+<span class="sourceLineNo">486</span> if (headerRecord != null) {<a name="line.486"></a>
+<span class="sourceLineNo">487</span> for (int i = 0; i < headerRecord.length; i++) {<a name="line.487"></a>
+<span class="sourceLineNo">488</span> final String header = headerRecord[i];<a name="line.488"></a>
+<span class="sourceLineNo">489</span> final boolean containsHeader = hdrMap.containsKey(header);<a name="line.489"></a>
+<span class="sourceLineNo">490</span> final boolean emptyHeader = header == null || header.trim().isEmpty();<a name="line.490"></a>
+<span class="sourceLineNo">491</span> if (containsHeader && (!emptyHeader || !this.format.getAllowMissingColumnNames())) {<a name="line.491"></a>
+<span class="sourceLineNo">492</span> throw new IllegalArgumentException("The header contains a duplicate name: \"" + header +<a name="line.492"></a>
+<span class="sourceLineNo">493</span> "\" in " + Arrays.toString(headerRecord));<a name="line.493"></a>
+<span class="sourceLineNo">494</span> }<a name="line.494"></a>
+<span class="sourceLineNo">495</span> hdrMap.put(header, Integer.valueOf(i));<a name="line.495"></a>
+<span class="sourceLineNo">496</span> }<a name="line.496"></a>
+<span class="sourceLineNo">497</span> }<a name="line.497"></a>
+<span class="sourceLineNo">498</span> }<a name="line.498"></a>
+<span class="sourceLineNo">499</span> return hdrMap;<a name="line.499"></a>
+<span class="sourceLineNo">500</span> }<a name="line.500"></a>
+<span class="sourceLineNo">501</span><a name="line.501"></a>
+<span class="sourceLineNo">502</span> /**<a name="line.502"></a>
+<span class="sourceLineNo">503</span> * Gets whether this parser is closed.<a name="line.503"></a>
+<span class="sourceLineNo">504</span> *<a name="line.504"></a>
+<span class="sourceLineNo">505</span> * @return whether this parser is closed.<a name="line.505"></a>
+<span class="sourceLineNo">506</span> */<a name="line.506"></a>
+<span class="sourceLineNo">507</span> public boolean isClosed() {<a name="line.507"></a>
+<span class="sourceLineNo">508</span> return this.lexer.isClosed();<a name="line.508"></a>
+<span class="sourceLineNo">509</span> }<a name="line.509"></a>
+<span class="sourceLineNo">510</span><a name="line.510"></a>
+<span class="sourceLineNo">511</span> /**<a name="line.511"></a>
+<span class="sourceLineNo">512</span> * Returns an iterator on the records.<a name="line.512"></a>
+<span class="sourceLineNo">513</span> *<a name="line.513"></a>
+<span class="sourceLineNo">514</span> * <p><a name="line.514"></a>
+<span class="sourceLineNo">515</span> * An {@link IOException} caught during the iteration are re-thrown as an<a name="line.515"></a>
+<span class="sourceLineNo">516</span> * {@link IllegalStateException}.<a name="line.516"></a>
+<span class="sourceLineNo">517</span> * </p><a name="line.517"></a>
+<span class="sourceLineNo">518</span> * <p><a name="line.518"></a>
+<span class="sourceLineNo">519</span> * If the parser is closed a call to {@link Iterator#next()} will throw a<a name="line.519"></a>
+<span class="sourceLineNo">520</span> * {@link NoSuchElementException}.<a name="line.520"></a>
+<span class="sourceLineNo">521</span> * </p><a name="line.521"></a>
+<span class="sourceLineNo">522</span> */<a name="line.522"></a>
+<span class="sourceLineNo">523</span> @Override<a name="line.523"></a>
+<span class="sourceLineNo">524</span> public Iterator<CSVRecord> iterator() {<a name="line.524"></a>
+<span class="sourceLineNo">525</span> return csvRecordIterator;<a name="line.525"></a>
+<span class="sourceLineNo">526</span> }<a name="line.526"></a>
+<span class="sourceLineNo">527</span><a name="line.527"></a>
+<span class="sourceLineNo">528</span> class CSVRecordIterator implements Iterator<CSVRecord> {<a name="line.528"></a>
+<span class="sourceLineNo">529</span> private CSVRecord current;<a name="line.529"></a>
+<span class="sourceLineNo">530</span><a name="line.530"></a>
+<span class="sourceLineNo">531</span> private CSVRecord getNextRecord() {<a name="line.531"></a>
+<span class="sourceLineNo">532</span> try {<a name="line.532"></a>
+<span class="sourceLineNo">533</span> return CSVParser.this.nextRecord();<a name="line.533"></a>
+<span class="sourceLineNo">534</span> } catch (final IOException e) {<a name="line.534"></a>
+<span class="sourceLineNo">535</span> throw new IllegalStateException(<a name="line.535"></a>
+<span class="sourceLineNo">536</span> e.getClass().getSimpleName() + " reading next record: " + e.toString(), e);<a name="line.536"></a>
+<span class="sourceLineNo">537</span> }<a name="line.537"></a>
+<span class="sourceLineNo">538</span> }<a name="line.538"></a>
+<span class="sourceLineNo">539</span><a name="line.539"></a>
+<span class="sourceLineNo">540</span> @Override<a name="line.540"></a>
+<span class="sourceLineNo">541</span> public boolean hasNext() {<a name="line.541"></a>
+<span class="sourceLineNo">542</span> if (CSVParser.this.isClosed()) {<a name="line.542"></a>
+<span class="sourceLineNo">543</span> return false;<a name="line.543"></a>
<span class="sourceLineNo">544</span> }<a name="line.544"></a>
-<span class="sourceLineNo">545</span><a name="line.545"></a>
-<span class="sourceLineNo">546</span> @Override<a name="line.546"></a>
-<span class="sourceLineNo">547</span> public CSVRecord next() {<a name="line.547"></a>
-<span class="sourceLineNo">548</span> if (CSVParser.this.isClosed()) {<a name="line.548"></a>
-<span class="sourceLineNo">549</span> throw new NoSuchElementException("CSVParser has been closed");<a name="line.549"></a>
-<span class="sourceLineNo">550</span> }<a name="line.550"></a>
-<span class="sourceLineNo">551</span> CSVRecord next = this.current;<a name="line.551"></a>
-<span class="sourceLineNo">552</span> this.current = null;<a name="line.552"></a>
-<span class="sourceLineNo">553</span><a name="line.553"></a>
-<span class="sourceLineNo">554</span> if (next == null) {<a name="line.554"></a>
-<span class="sourceLineNo">555</span> // hasNext() wasn't called before<a name="line.555"></a>
-<span class="sourceLineNo">556</span> next = this.getNextRecord();<a name="line.556"></a>
-<span class="sourceLineNo">557</span> if (next == null) {<a name="line.557"></a>
-<span class="sourceLineNo">558</span> throw new NoSuchElementException("No more CSV records available");<a name="line.558"></a>
-<span class="sourceLineNo">559</span> }<a name="line.559"></a>
-<span class="sourceLineNo">560</span> }<a name="line.560"></a>
-<span class="sourceLineNo">561</span><a name="line.561"></a>
-<span class="sourceLineNo">562</span> return next;<a name="line.562"></a>
-<span class="sourceLineNo">563</span> }<a name="line.563"></a>
-<span class="sourceLineNo">564</span><a name="line.564"></a>
-<span class="sourceLineNo">565</span> @Override<a name="line.565"></a>
-<span class="sourceLineNo">566</span> public void remove() {<a name="line.566"></a>
-<span class="sourceLineNo">567</span> throw new UnsupportedOperationException();<a name="line.567"></a>
-<span class="sourceLineNo">568</span> }<a name="line.568"></a>
-<span class="sourceLineNo">569</span> };<a name="line.569"></a>
-<span class="sourceLineNo">570</span> }<a name="line.570"></a>
-<span class="sourceLineNo">571</span><a name="line.571"></a>
-<span class="sourceLineNo">572</span> /**<a name="line.572"></a>
-<span class="sourceLineNo">573</span> * Parses the next record from the current point in the stream.<a name="line.573"></a>
-<span class="sourceLineNo">574</span> *<a name="line.574"></a>
-<span class="sourceLineNo">575</span> * @return the record as an array of values, or {@code null} if the end of the stream has been reached<a name="line.575"></a>
-<span class="sourceLineNo">576</span> * @throws IOException<a name="line.576"></a>
-<span class="sourceLineNo">577</span> * on parse error or input read-failure<a name="line.577"></a>
-<span class="sourceLineNo">578</span> */<a name="line.578"></a>
-<span class="sourceLineNo">579</span> CSVRecord nextRecord() throws IOException {<a name="line.579"></a>
-<span class="sourceLineNo">580</span> CSVRecord result = null;<a name="line.580"></a>
-<span class="sourceLineNo">581</span> this.recordList.clear();<a name="line.581"></a>
-<span class="sourceLineNo">582</span> StringBuilder sb = null;<a name="line.582"></a>
-<span class="sourceLineNo">583</span> final long startCharPosition = lexer.getCharacterPosition() + this.characterOffset;<a name="line.583"></a>
-<span class="sourceLineNo">584</span> do {<a name="line.584"></a>
-<span class="sourceLineNo">585</span> this.reusableToken.reset();<a name="line.585"></a>
-<span class="sourceLineNo">586</span> this.lexer.nextToken(this.reusableToken);<a name="line.586"></a>
-<span class="sourceLineNo">587</span> switch (this.reusableToken.type) {<a name="line.587"></a>
-<span class="sourceLineNo">588</span> case TOKEN:<a name="line.588"></a>
-<span class="sourceLineNo">589</span> this.addRecordValue(false);<a name="line.589"></a>
-<span class="sourceLineNo">590</span> break;<a name="line.590"></a>
-<span class="sourceLineNo">591</span> case EORECORD:<a name="line.591"></a>
-<span class="sourceLineNo">592</span> this.addRecordValue(true);<a name="line.592"></a>
-<span class="sourceLineNo">593</span> break;<a name="line.593"></a>
-<span class="sourceLineNo">594</span> case EOF:<a name="line.594"></a>
-<span class="sourceLineNo">595</span> if (this.reusableToken.isReady) {<a name="line.595"></a>
-<span class="sourceLineNo">596</span> this.addRecordValue(true);<a name="line.596"></a>
-<span class="sourceLineNo">597</span> }<a name="line.597"></a>
+<span class="sourceLineNo">545</span> if (this.current == null) {<a name="line.545"></a>
+<span class="sourceLineNo">546</span> this.current = this.getNextRecord();<a name="line.546"></a>
+<span class="sourceLineNo">547</span> }<a name="line.547"></a>
+<span class="sourceLineNo">548</span><a name="line.548"></a>
+<span class="sourceLineNo">549</span> return this.current != null;<a name="line.549"></a>
+<span class="sourceLineNo">550</span> }<a name="line.550"></a>
+<span class="sourceLineNo">551</span><a name="line.551"></a>
+<span class="sourceLineNo">552</span> @Override<a name="line.552"></a>
+<span class="sourceLineNo">553</span> public CSVRecord next() {<a name="line.553"></a>
+<span class="sourceLineNo">554</span> if (CSVParser.this.isClosed()) {<a name="line.554"></a>
+<span class="sourceLineNo">555</span> throw new NoSuchElementException("CSVParser has been closed");<a name="line.555"></a>
+<span class="sourceLineNo">556</span> }<a name="line.556"></a>
+<span class="sourceLineNo">557</span> CSVRecord next = this.current;<a name="line.557"></a>
+<span class="sourceLineNo">558</span> this.current = null;<a name="line.558"></a>
+<span class="sourceLineNo">559</span><a name="line.559"></a>
+<span class="sourceLineNo">560</span> if (next == null) {<a name="line.560"></a>
+<span class="sourceLineNo">561</span> // hasNext() wasn't called before<a name="line.561"></a>
+<span class="sourceLineNo">562</span> next = this.getNextRecord();<a name="line.562"></a>
+<span class="sourceLineNo">563</span> if (next == null) {<a name="line.563"></a>
+<span class="sourceLineNo">564</span> throw new NoSuchElementException("No more CSV records available");<a name="line.564"></a>
+<span class="sourceLineNo">565</span> }<a name="line.565"></a>
+<span class="sourceLineNo">566</span> }<a name="line.566"></a>
+<span class="sourceLineNo">567</span><a name="line.567"></a>
+<span class="sourceLineNo">568</span> return next;<a name="line.568"></a>
+<span class="sourceLineNo">569</span> }<a name="line.569"></a>
+<span class="sourceLineNo">570</span><a name="line.570"></a>
+<span class="sourceLineNo">571</span> @Override<a name="line.571"></a>
+<span class="sourceLineNo">572</span> public void remove() {<a name="line.572"></a>
+<span class="sourceLineNo">573</span> throw new UnsupportedOperationException();<a name="line.573"></a>
+<span class="sourceLineNo">574</span> }<a name="line.574"></a>
+<span class="sourceLineNo">575</span> };<a name="line.575"></a>
+<span class="sourceLineNo">576</span><a name="line.576"></a>
+<span class="sourceLineNo">577</span> /**<a name="line.577"></a>
+<span class="sourceLineNo">578</span> * Parses the next record from the current point in the stream.<a name="line.578"></a>
+<span class="sourceLineNo">579</span> *<a name="line.579"></a>
+<span class="sourceLineNo">580</span> * @return the record as an array of values, or {@code null} if the end of the stream has been reached<a name="line.580"></a>
+<span class="sourceLineNo">581</span> * @throws IOException<a name="line.581"></a>
+<span class="sourceLineNo">582</span> * on parse error or input read-failure<a name="line.582"></a>
+<span class="sourceLineNo">583</span> */<a name="line.583"></a>
+<span class="sourceLineNo">584</span> CSVRecord nextRecord() throws IOException {<a name="line.584"></a>
+<span class="sourceLineNo">585</span> CSVRecord result = null;<a name="line.585"></a>
+<span class="sourceLineNo">586</span> this.recordList.clear();<a name="line.586"></a>
+<span class="sourceLineNo">587</span> StringBuilder sb = null;<a name="line.587"></a>
+<span class="sourceLineNo">588</span> final long startCharPosition = lexer.getCharacterPosition() + this.characterOffset;<a name="line.588"></a>
+<span class="sourceLineNo">589</span> do {<a name="line.589"></a>
+<span class="sourceLineNo">590</span> this.reusableToken.reset();<a name="line.590"></a>
+<span class="sourceLineNo">591</span> this.lexer.nextToken(this.reusableToken);<a name="line.591"></a>
+<span class="sourceLineNo">592</span> switch (this.reusableToken.type) {<a name="line.592"></a>
+<span class="sourceLineNo">593</span> case TOKEN:<a name="line.593"></a>
+<span class="sourceLineNo">594</span> this.addRecordValue(false);<a name="line.594"></a>
+<span class="sourceLineNo">595</span> break;<a name="line.595"></a>
+<span class="sourceLineNo">596</span> case EORECORD:<a name="line.596"></a>
+<span class="sourceLineNo">597</span> this.addRecordValue(true);<a name="line.597"></a>
<span class="sourceLineNo">598</span> break;<a name="line.598"></a>
-<span class="sourceLineNo">599</span> case INVALID:<a name="line.599"></a>
-<span class="sourceLineNo">600</span> throw new IOException("(line " + this.getCurrentLineNumber() + ") invalid parse sequence");<a name="line.600"></a>
-<span class="sourceLineNo">601</span> case COMMENT: // Ignored currently<a name="line.601"></a>
-<span class="sourceLineNo">602</span> if (sb == null) { // first comment for this record<a name="line.602"></a>
-<span class="sourceLineNo">603</span> sb = new StringBuilder();<a name="line.603"></a>
-<span class="sourceLineNo">604</span> } else {<a name="line.604"></a>
-<span class="sourceLineNo">605</span> sb.append(Constants.LF);<a name="line.605"></a>
-<span class="sourceLineNo">606</span> }<a name="line.606"></a>
-<span class="sourceLineNo">607</span> sb.append(this.reusableToken.content);<a name="line.607"></a>
-<span class="sourceLineNo">608</span> this.reusableToken.type = TOKEN; // Read another token<a name="line.608"></a>
-<span class="sourceLineNo">609</span> break;<a name="line.609"></a>
-<span class="sourceLineNo">610</span> default:<a name="line.610"></a>
-<span class="sourceLineNo">611</span> throw new IllegalStateException("Unexpected Token type: " + this.reusableToken.type);<a name="line.611"></a>
-<span class="sourceLineNo">612</span> }<a name="line.612"></a>
-<span class="sourceLineNo">613</span> } while (this.reusableToken.type == TOKEN);<a name="line.613"></a>
-<span class="sourceLineNo">614</span><a name="line.614"></a>
-<span class="sourceLineNo">615</span> if (!this.recordList.isEmpty()) {<a name="line.615"></a>
-<span class="sourceLineNo">616</span> this.recordNumber++;<a name="line.616"></a>
-<span class="sourceLineNo">617</span> final String comment = sb == null ? null : sb.toString();<a name="line.617"></a>
-<span class="sourceLineNo">618</span> result = new CSVRecord(this.recordList.toArray(new String[this.recordList.size()]), this.headerMap, comment,<a name="line.618"></a>
-<span class="sourceLineNo">619</span> this.recordNumber, startCharPosition);<a name="line.619"></a>
-<span class="sourceLineNo">620</span> }<a name="line.620"></a>
-<span class="sourceLineNo">621</span> return result;<a name="line.621"></a>
-<span class="sourceLineNo">622</span> }<a name="line.622"></a>
-<span class="sourceLineNo">623</span><a name="line.623"></a>
-<span class="sourceLineNo">624</span>}<a name="line.624"></a>
+<span class="sourceLineNo">599</span> case EOF:<a name="line.599"></a>
+<span class="sourceLineNo">600</span> if (this.reusableToken.isReady) {<a name="line.600"></a>
+<span class="sourceLineNo">601</span> this.addRecordValue(true);<a name="line.601"></a>
+<span class="sourceLineNo">602</span> }<a name="line.602"></a>
+<span class="sourceLineNo">603</span> break;<a name="line.603"></a>
+<span class="sourceLineNo">604</span> case INVALID:<a name="line.604"></a>
+<span class="sourceLineNo">605</span> throw new IOException("(line " + this.getCurrentLineNumber() + ") invalid parse sequence");<a name="line.605"></a>
+<span class="sourceLineNo">606</span> case COMMENT: // Ignored currently<a name="line.606"></a>
+<span class="sourceLineNo">607</span> if (sb == null) { // first comment for this record<a name="line.607"></a>
+<span class="sourceLineNo">608</span> sb = new StringBuilder();<a name="line.608"></a>
+<span class="sourceLineNo">609</span> } else {<a name="line.609"></a>
+<span class="sourceLineNo">610</span> sb.append(Constants.LF);<a name="line.610"></a>
+<span class="sourceLineNo">611</span> }<a name="line.611"></a>
+<span class="sourceLineNo">612</span> sb.append(this.reusableToken.content);<a name="line.612"></a>
+<span class="sourceLineNo">613</span> this.reusableToken.type = TOKEN; // Read another token<a name="line.613"></a>
+<span class="sourceLineNo">614</span> break;<a name="line.614"></a>
+<span class="sourceLineNo">615</span> default:<a name="line.615"></a>
+<span class="sourceLineNo">616</span> throw new IllegalStateException("Unexpected Token type: " + this.reusableToken.type);<a name="line.616"></a>
+<span class="sourceLineNo">617</span> }<a name="line.617"></a>
+<span class="sourceLineNo">618</span> } while (this.reusableToken.type == TOKEN);<a name="line.618"></a>
+<span class="sourceLineNo">619</span><a name="line.619"></a>
+<span class="sourceLineNo">620</span> if (!this.recordList.isEmpty()) {<a name="line.620"></a>
+<span class="sourceLineNo">621</span> this.recordNumber++;<a name="line.621"></a>
+<span class="sourceLineNo">622</span> final String comment = sb == null ? null : sb.toString();<a name="line.622"></a>
+<span class="sourceLineNo">623</span> result = new CSVRecord(this.recordList.toArray(new String[this.recordList.size()]), this.headerMap, comment,<a name="line.623"></a>
+<span class="sourceLineNo">624</span> this.recordNumber, startCharPosition);<a name="line.624"></a>
+<span class="sourceLineNo">625</span> }<a name="line.625"></a>
+<span class="sourceLineNo">626</span> return result;<a name="line.626"></a>
+<span class="sourceLineNo">627</span> }<a name="line.627"></a>
+<span class="sourceLineNo">628</span><a name="line.628"></a>
+<span class="sourceLineNo">629</span>}<a name="line.629"></a>