Removed the deprecated constructors

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

Author: ebourg

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

@@ -14,11 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.commons.csv;
 
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.Reader;
 import java.util.ArrayList;
 import java.util.List;
@@ -117,16 +116,6 @@ Token reset() {
     //  the constructor
     // ======================================================
 
-    /**
-     * Default strategy for the parser follows the default {@link CSVStrategy}.
-     *
-     * @param input an InputStream containing "csv-formatted" stream
-     * @deprecated use {@link #CSVParser(Reader)}.
-     */
-    public CSVParser(InputStream input) {
-        this(new InputStreamReader(input));
-    }
-
     /**
      * CSV parser using the default {@link CSVStrategy}.
      *
@@ -136,37 +125,6 @@ public CSVParser(Reader input) {
         this(input, (CSVStrategy) CSVStrategy.DEFAULT_STRATEGY.clone());
     }
 
-    /**
-     * Customized value delimiter parser.
-     * <p/>
-     * The parser follows the default {@link CSVStrategy}
-     * except for the delimiter setting.
-     *
-     * @param input     a Reader based on "csv-formatted" input
-     * @param delimiter a Char used for value separation
-     * @deprecated use {@link #CSVParser(Reader, CSVStrategy)}.
-     */
-    public CSVParser(Reader input, char delimiter) {
-        this(input, delimiter, '"', CSVStrategy.COMMENTS_DISABLED);
-    }
-
-    /**
-     * Customized csv parser.
-     * <p/>
-     * The parser parses according to the given CSV dialect settings.
-     * Leading whitespaces are truncated, unicode escapes are
-     * not interpreted and empty lines are ignored.
-     *
-     * @param input        a Reader based on "csv-formatted" input
-     * @param delimiter    a Char used for value separation
-     * @param encapsulator a Char used as value encapsulation marker
-     * @param commentStart a Char used for comment identification
-     * @deprecated use {@link #CSVParser(Reader, CSVStrategy)}.
-     */
-    public CSVParser(Reader input, char delimiter, char encapsulator, char commentStart) {
-        this(input, new CSVStrategy(delimiter, encapsulator, commentStart));
-    }
-
     /**
      * Customized CSV parser using the given {@link CSVStrategy}
      *

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

@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.commons.csv;
 
 import java.io.Serializable;
@@ -51,7 +52,7 @@ public class CSVStrategy implements Cloneable, Serializable {
 
 
     public CSVStrategy(char delimiter, char encapsulator, char commentStart) {
-        this(delimiter, encapsulator, commentStart, true, false, true);
+        this(delimiter, encapsulator, commentStart, ESCAPE_DISABLED, true, true, false, true);
     }
 
     /**
@@ -85,20 +86,6 @@ public CSVStrategy(
         this.ignoreEmptyLines = ignoreEmptyLines;
     }
 
-    /**
-     * @deprecated
-     */
-    public CSVStrategy(
-            char delimiter,
-            char encapsulator,
-            char commentStart,
-            boolean ignoreLeadingWhitespaces,
-            boolean interpretUnicodeEscapes,
-            boolean ignoreEmptyLines) {
-        this(delimiter, encapsulator, commentStart, CSVStrategy.ESCAPE_DISABLED, ignoreLeadingWhitespaces,
-                true, interpretUnicodeEscapes, ignoreEmptyLines);
-    }
-
     public void setDelimiter(char delimiter) {
         this.delimiter = delimiter;
     }