Added a constructor with a String to CSVParser and removed CSVUtils

git-svn-id: https://svn.apache.org/repos/asf/commons/sandbox/csv/trunk@1297135 13f79535-47bb-0310-9956-ffa450edef68

Author: ebourg

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

@@ -19,6 +19,7 @@
 
 import java.io.IOException;
 import java.io.Reader;
+import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -140,6 +141,16 @@ public CSVParser(Reader input, CSVFormat format) {
         this.format = format;
     }
 
+    /**
+     * Customized CSV parser using the given {@link CSVFormat}
+     *
+     * @param input    a String containing "csv-formatted" input
+     * @param format the CSVFormat used for CSV parsing
+     */
+    public CSVParser(String input, CSVFormat format) {
+        this(new StringReader(input), format);
+    }
+
     // ======================================================
     //  the parser
     // ======================================================

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

@@ -244,7 +244,7 @@ public void testExcelFormat1() throws IOException {
                 {""},
                 {"\"hello\"", "  \"world\"", "abc\ndef", ""}
         };
-        CSVParser parser = new CSVParser(new StringReader(code), CSVFormat.EXCEL);
+        CSVParser parser = new CSVParser(code, CSVFormat.EXCEL);
         String[][] tmp = parser.getRecords();
         assertEquals(res.length, tmp.length);
         assertTrue(tmp.length > 0);
@@ -262,7 +262,7 @@ public void testExcelFormat2() throws Exception {
                 {""},
                 {"world", ""}
         };
-        CSVParser parser = new CSVParser(new StringReader(code), CSVFormat.EXCEL);
+        CSVParser parser = new CSVParser(code, CSVFormat.EXCEL);
         String[][] tmp = parser.getRecords();
         assertEquals(res.length, tmp.length);
         assertTrue(tmp.length > 0);
@@ -289,7 +289,7 @@ public void testEndOfFileBehaviourExcel() throws Exception {
         };
 
         for (String code : codes) {
-            CSVParser parser = new CSVParser(new StringReader(code), CSVFormat.EXCEL);
+            CSVParser parser = new CSVParser(code, CSVFormat.EXCEL);
             String[][] tmp = parser.getRecords();
             assertEquals(res.length, tmp.length);
             assertTrue(tmp.length > 0);
@@ -314,9 +314,7 @@ public void testEndOfFileBehaviorCSV() throws Exception {
                 {"hello", ""},  // CSV format ignores empty lines
                 {"world", ""}
         };
-        String code;
-        for (int codeIndex = 0; codeIndex < codes.length; codeIndex++) {
-            code = codes[codeIndex];
+        for (String code : codes) {
             CSVParser parser = new CSVParser(new StringReader(code));
             String[][] tmp = parser.getRecords();
             assertEquals(res.length, tmp.length);
@@ -339,10 +337,8 @@ public void testEmptyLineBehaviourExcel() throws Exception {
                 {""},  // Excel format does not ignore empty lines
                 {""}
         };
-        String code;
-        for (int codeIndex = 0; codeIndex < codes.length; codeIndex++) {
-            code = codes[codeIndex];
-            CSVParser parser = new CSVParser(new StringReader(code), CSVFormat.EXCEL);
+        for (String code : codes) {
+            CSVParser parser = new CSVParser(code, CSVFormat.EXCEL);
             String[][] tmp = parser.getRecords();
             assertEquals(res.length, tmp.length);
             assertTrue(tmp.length > 0);
@@ -362,9 +358,7 @@ public void testEmptyLineBehaviourCSV() throws Exception {
         String[][] res = {
                 {"hello", ""}  // CSV format ignores empty lines
         };
-        String code;
-        for (int codeIndex = 0; codeIndex < codes.length; codeIndex++) {
-            code = codes[codeIndex];
+        for (String code : codes) {
             CSVParser parser = new CSVParser(new StringReader(code));
             String[][] tmp = parser.getRecords();
             assertEquals(res.length, tmp.length);
@@ -440,7 +434,7 @@ public void testBackslashEscaping() throws IOException {
 
         CSVFormat format = new CSVFormat(',', '\'', CSVFormat.DISABLED, '/', false, false, true, true);
 
-        CSVParser parser = new CSVParser(new StringReader(code), format);
+        CSVParser parser = new CSVParser(code, format);
         String[][] tmp = parser.getRecords();
         assertTrue(tmp.length > 0);
         for (int i = 0; i < res.length; i++) {
@@ -468,7 +462,7 @@ public void testBackslashEscaping2() throws IOException {
 
         CSVFormat format = new CSVFormat(',',  CSVFormat.DISABLED,  CSVFormat.DISABLED, '/', false, false, true, true);
 
-        CSVParser parser = new CSVParser(new StringReader(code), format);
+        CSVParser parser = new CSVParser(code, format);
         String[][] tmp = parser.getRecords();
         assertTrue(tmp.length > 0);
 
@@ -495,7 +489,7 @@ public void testDefaultFormat() throws IOException {
         CSVFormat format = CSVFormat.DEFAULT;
         assertEquals(CSVFormat.DISABLED, format.getCommentStart());
 
-        CSVParser parser = new CSVParser(new StringReader(code), format);
+        CSVParser parser = new CSVParser(code, format);
         String[][] tmp = parser.getRecords();
         assertTrue(tmp.length > 0);
 
@@ -510,7 +504,7 @@ public void testDefaultFormat() throws IOException {
         };
 
         format = new CSVFormat(',', '"', '#');
-        parser = new CSVParser(new StringReader(code), format);
+        parser = new CSVParser(code, format);
         tmp = parser.getRecords();
 
         if (!CSVPrinterTest.equals(res_comments, tmp)) {
@@ -521,7 +515,7 @@ public void testDefaultFormat() throws IOException {
 
     public void testUnicodeEscape() throws IOException {
         String code = "abc,\\u0070\\u0075\\u0062\\u006C\\u0069\\u0063";
-        CSVParser parser = new CSVParser(new StringReader(code), CSVFormat.DEFAULT.withUnicodeEscapesInterpreted(true));
+        CSVParser parser = new CSVParser(code, CSVFormat.DEFAULT.withUnicodeEscapesInterpreted(true));
         String[] data = parser.iterator().next();
         assertEquals(2, data.length);
         assertEquals("abc", data[0]);