more cleanup

Author: rbri

src/main/java/com/gargoylesoftware/css/parser/InputSource.java

@@ -16,11 +16,7 @@
 
 import java.io.Closeable;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.Reader;
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.Charset;
 
 /**
  * The input supported by the parser.
@@ -33,21 +29,6 @@ public class InputSource implements Closeable {
     private String media_;
     private String title_;
 
-    /**
-     * Create a new input source backed by byteStream.
-     * @param byteStream the byte stream
-     * @param encoding the encoding
-     * @throws UnsupportedEncodingException if the encoding is not supported
-     */
-    public InputSource(final InputStream byteStream, final String encoding) throws UnsupportedEncodingException {
-        if (encoding == null || encoding.length() < 1) {
-            reader_ = new InputStreamReader(byteStream, Charset.defaultCharset());
-        }
-        else {
-            reader_ = new InputStreamReader(byteStream, encoding);
-        }
-    }
-
     /**
      * Create a new input source backed by a reader.
      * @param reader the reader

src/test/java/com/gargoylesoftware/css/parser/CSS3ParserTest.java

@@ -18,7 +18,9 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.Reader;
 import java.io.StringReader;
+import java.nio.charset.Charset;
 import java.util.Set;
 import java.util.TreeSet;
 
@@ -3407,7 +3409,8 @@ private void realWorld(final String resourceName, final int rules, final int pro
     public void unicodeInputByteStream() throws Exception {
         final String css = "h1:before { content: \"\u04c5 - \u0666\" }";
 
-        final InputSource source = new InputSource(new ByteArrayInputStream(css.getBytes("UTF-8")), "UTF-8");
+        final Reader reader = new InputStreamReader(new ByteArrayInputStream(css.getBytes("UTF-8")), "UTF-8");
+        final InputSource source = new InputSource(reader);
         final CSSStyleSheetImpl sheet = parse(source, 0, 0, 0);
 
         Assert.assertEquals(css, sheet.toString());
@@ -3422,8 +3425,8 @@ public void unicodeInputByteStream() throws Exception {
     public void unicodeInputByteStreamDefaultEncoding() throws Exception {
         final String css = "h1:before { content: \"\u00fe - \u00e4\" }";
 
-        final InputSource source = new InputSource(new ByteArrayInputStream(css.getBytes()), null);
-
+        final Reader reader = new InputStreamReader(new ByteArrayInputStream(css.getBytes()), Charset.defaultCharset());
+        final InputSource source = new InputSource(reader);
         final CSSStyleSheetImpl sheet = parse(source, 0, 0, 0);
 
         Assert.assertEquals(css, sheet.toString());
@@ -3436,7 +3439,8 @@ public void unicodeInputByteStreamDefaultEncoding() throws Exception {
     public void clip() throws Exception {
         final String css = "h1 { clip: rect(0px 0px 1px 1px); }";
 
-        final InputSource source = new InputSource(new ByteArrayInputStream(css.getBytes()), null);
+        final Reader reader = new InputStreamReader(new ByteArrayInputStream(css.getBytes()), Charset.defaultCharset());
+        final InputSource source = new InputSource(reader);
         final CSSStyleSheetImpl sheet = parse(source, 0, 0, 0);
 
         Assert.assertEquals("h1 { clip: rect(0px, 0px, 1px, 1px) }", sheet.toString());