Commit Graph

821 Commits

Author SHA1 Message Date
Sebastian Bazley 7b168ebbbe Merge Lexer with CSVLexer
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1511006 13f79535-47bb-0310-9956-ffa450edef68
2013-08-06 15:44:41 +00:00
Sebastian Bazley 7755640784 No longer wanted
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1511005 13f79535-47bb-0310-9956-ffa450edef68
2013-08-06 15:43:10 +00:00
Gary D. Gregory 8d8bbf459e [CSV-42] Lots of possible changes. Add Bob Smith as a contributor.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1510967 13f79535-47bb-0310-9956-ffa450edef68
2013-08-06 14:18:40 +00:00
Gary D. Gregory a064b97305 [CSV-42] Lots of possible changes: Make classes final.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1510761 13f79535-47bb-0310-9956-ffa450edef68
2013-08-05 21:45:01 +00:00
Gary D. Gregory 258387e3ce Use US English spelling of 'recognized'.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1510664 13f79535-47bb-0310-9956-ffa450edef68
2013-08-05 19:10:04 +00:00
Gary D. Gregory ed72da2552 Remove extra semicolon.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1510660 13f79535-47bb-0310-9956-ffa450edef68
2013-08-05 19:03:09 +00:00
Gary D. Gregory b042bd8522 Remove primitive APIs in CSVRecord.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1510455 13f79535-47bb-0310-9956-ffa450edef68
2013-08-05 12:43:23 +00:00
Sebastian Bazley 6208f0c9af Fix up TODOs
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1509967 13f79535-47bb-0310-9956-ffa450edef68
2013-08-03 11:59:28 +00:00
Sebastian Bazley 3fd92ec4a4 Use NotEscaped where character has not been escaped
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1509966 13f79535-47bb-0310-9956-ffa450edef68
2013-08-03 11:51:21 +00:00
Benedikt Ritter 575c88d8a2 Add some more tests that document escaping behavior
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1509957 13f79535-47bb-0310-9956-ffa450edef68
2013-08-03 11:12:48 +00:00
Benedikt Ritter 3178725e98 Align test names to other tests of the same kind
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1509956 13f79535-47bb-0310-9956-ffa450edef68
2013-08-03 11:01:36 +00:00
Gary D. Gregory 70485e44f2 Add CSVRecord#getInt(String) API and tests.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1509450 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 21:57:46 +00:00
Gary D. Gregory 4bb75e3edb Add CSVRecord#getLong(String) API and tests.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1509449 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 21:54:37 +00:00
Gary D. Gregory ac03c2eaa7 Simplify tests.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1509446 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 21:51:10 +00:00
Gary D. Gregory 666350b94a Sort members.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1509442 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 21:48:39 +00:00
Gary D. Gregory 50b7f79338 CSVRecord.get(String) throws IAE if the column is not mapped (does not exist). This is similar to what JDBC does in ResultSet. Add getBoolean(String) API and tests.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1509431 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 21:11:10 +00:00
Benedikt Ritter 412d05d166 Better throw a NoSuchElementException if no more elements are available because parser has been closed
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1509395 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 19:41:10 +00:00
Gary D. Gregory 7e63096d47 Javadoc.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1509368 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 18:24:37 +00:00
Gary D. Gregory 7aca6adc4c [LEGAL-175] Distribute sample files from www.ferc.gov for unit tests.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1509328 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 16:58:31 +00:00
Sebastian Bazley 86d488407b Ensure Closeable is closed
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1509264 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 14:42:35 +00:00
Sebastian Bazley efdcb376e8 Don't split ternary expression over two lines
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1509261 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 14:39:29 +00:00
Sebastian Bazley 4b57058ebb Remove doc for non-existent parameter
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1509260 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 14:38:17 +00:00
Sebastian Bazley 105f907767 CSV-78 Use Character instead of char for char fields except delimiter
Already done as part of CSV-99 etc.
Updated Javadoc to clarify that null can be used to disable settings

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1509239 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 14:02:20 +00:00
Sebastian Bazley cf764bc9ae Doc tweak
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1509232 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 13:45:35 +00:00
Gary D. Gregory 1d767ad946 Sort members.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1509231 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 13:43:17 +00:00
Gary D. Gregory f69ddb394a [CSV-99] Revert Builder implementation in CSVFormat. Update Javadoc.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1509216 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 13:05:25 +00:00
Gary D. Gregory fcc0d15c7b - Remove trailing spaces.
- Add missing final keywords.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1509069 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 02:04:27 +00:00
Gary D. Gregory 316a51f520 - Add some real world CSV files.
- Add a record API to get column values using an Enum.
- Throw a better exception when a resource is not found in a class loader for the parser.
- Replace some tabs with spaces.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1509068 13f79535-47bb-0310-9956-ffa450edef68
2013-08-01 02:03:33 +00:00
Gary D. Gregory 816c652997 Better example.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1509012 13f79535-47bb-0310-9956-ffa450edef68
2013-07-31 20:03:02 +00:00
Benedikt Ritter c0d91d205d Remove copy method. It is not needed since every withXxx() method returns a copy
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1508966 13f79535-47bb-0310-9956-ffa450edef68
2013-07-31 17:43:14 +00:00
Gary D. Gregory 55eff9dcfa Use ch instead of c as a character var name.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1508943 13f79535-47bb-0310-9956-ffa450edef68
2013-07-31 15:53:05 +00:00
Gary D. Gregory 7909a7c386 Fix boxing and unboxing warnings.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1508940 13f79535-47bb-0310-9956-ffa450edef68
2013-07-31 15:51:20 +00:00
Gary D. Gregory 2b14b16d4b Fix NPE when format is null.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1508938 13f79535-47bb-0310-9956-ffa450edef68
2013-07-31 15:48:54 +00:00
Gary D. Gregory a062477946 Use ch instead of c as a character var name.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1508937 13f79535-47bb-0310-9956-ffa450edef68
2013-07-31 15:46:05 +00:00
Gary D. Gregory 9599bfe743 Document empty block. Formatting.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1508936 13f79535-47bb-0310-9956-ffa450edef68
2013-07-31 15:43:33 +00:00
Gary D. Gregory e33dced746 Document empty block.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1508935 13f79535-47bb-0310-9956-ffa450edef68
2013-07-31 15:42:36 +00:00
Gary D. Gregory 97d34575a1 Revert back to NOT skipping a record when withHeader is called with a non-empty array. Add skipHeaderRecord setting to CSVFormat and use when headers are initialized.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1508933 13f79535-47bb-0310-9956-ffa450edef68
2013-07-31 15:39:57 +00:00
Gary D. Gregory e6759b8c10 Sort members.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1508635 13f79535-47bb-0310-9956-ffa450edef68
2013-07-30 21:24:52 +00:00
Gary D. Gregory f881372d92 Validate that headers do not contain duplicates.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1508618 13f79535-47bb-0310-9956-ffa450edef68
2013-07-30 20:44:15 +00:00
Gary D. Gregory 3320c53e27 Sort members.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1508613 13f79535-47bb-0310-9956-ffa450edef68
2013-07-30 20:37:17 +00:00
Gary D. Gregory 1533facb19 When withHeader is set to any non-null value, the first record is the first <em>data</em> record, not the header record.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1508612 13f79535-47bb-0310-9956-ffa450edef68
2013-07-30 20:36:12 +00:00
Gary D. Gregory 390800f288 Make org.apache.commons.csv.CSVFormat.getHeader() public and make it return a clone.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1508585 13f79535-47bb-0310-9956-ffa450edef68
2013-07-30 19:32:40 +00:00
Gary D. Gregory 69997467d4 Refactor to only have minimal CSVParser constructors in favor of CSVParser factory methods for String, resource path, URL, and File. Update some tests to use the APIs.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1508544 13f79535-47bb-0310-9956-ffa450edef68
2013-07-30 17:36:34 +00:00
Gary D. Gregory 61fdb7a03a Sort members.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1508511 13f79535-47bb-0310-9956-ffa450edef68
2013-07-30 16:26:43 +00:00
Gary D. Gregory 21ed5b135c Better lvar name.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1508510 13f79535-47bb-0310-9956-ffa450edef68
2013-07-30 16:25:30 +00:00
Gary D. Gregory f78b5a14ca Change CSVFormat#Iterable<CSVRecord> parse(final Reader in) to return a CSVParser, which is compatible since CSVParser implements Iterable<CSVRecord>. This allows a caller to end the parsing by calling CSVParser#close() or to use CSVParser in a Java 7 try-with-resources, without tracking a reader or input stream.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1508509 13f79535-47bb-0310-9956-ffa450edef68
2013-07-30 16:22:07 +00:00
Gary D. Gregory 7af334d7d5 Allow a caller to close the parser before reading all records and free resources. The parser and lexer now implement java.io.Closeable.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1508475 13f79535-47bb-0310-9956-ffa450edef68
2013-07-30 14:50:42 +00:00
Gary D. Gregory ee7335a2fc [CSV-99] Revert Builder implementation in CSVFormat.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1508472 13f79535-47bb-0310-9956-ffa450edef68
2013-07-30 14:44:48 +00:00
Gary D. Gregory 75f39a81a7 [CSV-99] Revert Builder implementation in CSVFormat.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1508470 13f79535-47bb-0310-9956-ffa450edef68
2013-07-30 14:42:32 +00:00
Benedikt Ritter 7dbc976992 Better use maven.compiler.target instead of the old property (maven.compile.target)
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1504978 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 19:40:59 +00:00