IO-162 Remove the static setDefaultEncoding() accessor - IMO this is a bad practice. Add two constructors to compensate

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/io/trunk@1004874 13f79535-47bb-0310-9956-ffa450edef68

Author: Niall Pemberton

src/main/java/org/apache/commons/io/input/XmlStreamReader.java

@@ -91,28 +91,12 @@ public class XmlStreamReader extends Reader {
     };
 
 
-    private static String staticDefaultEncoding = null;
-
     private Reader reader;
 
     private String encoding;
 
     private final String defaultEncoding;
 
-    /**
-     * Sets the default encoding to use if none is set in HTTP content-type, XML
-     * prolog and the rules based on content-type are not adequate.
-     * <p>
-     * If it is set to NULL the content-type based rules are used.
-     * <p>
-     * By default it is NULL.
-     *
-     * @param encoding charset encoding to default to.
-     */
-    public static void setDefaultEncoding(String encoding) {
-        staticDefaultEncoding = encoding;
-    }
-
     /**
      * Returns the default encoding to use if none is set in HTTP content-type,
      * XML prolog and the rules based on content-type are not adequate.
@@ -121,8 +105,8 @@ public static void setDefaultEncoding(String encoding) {
      *
      * @return the default encoding to use.
      */
-    public static String getDefaultEncoding() {
-        return staticDefaultEncoding;
+    public String getDefaultEncoding() {
+        return defaultEncoding;
     }
 
     /**
@@ -184,7 +168,39 @@ public XmlStreamReader(InputStream is) throws IOException {
      *         be determined according to the specs.
      */
     public XmlStreamReader(InputStream is, boolean lenient) throws IOException {
-        defaultEncoding = staticDefaultEncoding;
+        this(is, lenient, null);
+    }
+
+    /**
+     * Creates a Reader for a raw InputStream.
+     * <p>
+     * It follows the same logic used for files.
+     * <p>
+     * If lenient detection is indicated and the detection above fails as per
+     * specifications it then attempts the following:
+     * <p>
+     * If the content type was 'text/html' it replaces it with 'text/xml' and
+     * tries the detection again.
+     * <p>
+     * Else if the XML prolog had a charset encoding that encoding is used.
+     * <p>
+     * Else if the content type had a charset encoding that encoding is used.
+     * <p>
+     * Else 'UTF-8' is used.
+     * <p>
+     * If lenient detection is indicated an XmlStreamReaderException is never
+     * thrown.
+     *
+     * @param is InputStream to create a Reader from.
+     * @param lenient indicates if the charset encoding detection should be
+     *        relaxed.
+     * @param defaultEncoding The default encoding
+     * @throws IOException thrown if there is a problem reading the stream.
+     * @throws XmlStreamReaderException thrown if the charset encoding could not
+     *         be determined according to the specs.
+     */
+    public XmlStreamReader(InputStream is, boolean lenient, String defaultEncoding) throws IOException {
+        this.defaultEncoding = defaultEncoding;
         doRawStream(is, lenient);
     }
 
@@ -206,7 +222,7 @@ public XmlStreamReader(InputStream is, boolean lenient) throws IOException {
      *         the URL.
      */
     public XmlStreamReader(URL url) throws IOException {
-        this(url.openConnection());
+        this(url.openConnection(), null);
     }
 
     /**
@@ -224,11 +240,12 @@ public XmlStreamReader(URL url) throws IOException {
      * the lenient parameter for details.
      *
      * @param conn URLConnection to create a Reader from.
+     * @param defaultEncoding The default encoding
      * @throws IOException thrown if there is a problem reading the stream of
      *         the URLConnection.
      */
-    public XmlStreamReader(URLConnection conn) throws IOException {
-        defaultEncoding = staticDefaultEncoding;
+    public XmlStreamReader(URLConnection conn, String defaultEncoding) throws IOException {
+        this.defaultEncoding = defaultEncoding;
         boolean lenient = true;
         String contentType = conn.getContentType();
         if (conn instanceof HttpURLConnection || contentType != null) {
@@ -296,8 +313,7 @@ public XmlStreamReader(InputStream is, String httpContentType)
      */
     public XmlStreamReader(InputStream is, String httpContentType,
             boolean lenient, String defaultEncoding) throws IOException {
-        this.defaultEncoding = (defaultEncoding == null) ? staticDefaultEncoding
-                : defaultEncoding;
+        this.defaultEncoding = defaultEncoding;
         doHttpStream(is, httpContentType, lenient);
     }
 

src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java

@@ -219,8 +219,7 @@ public void _testAlternateDefaultEncoding(String cT, String bomEnc,
         try {
             InputStream is = getXmlStream(bomEnc, (prologEnc == null) ? XML1
                     : XML3, streamEnc, prologEnc);
-            XmlStreamReader.setDefaultEncoding(alternateEnc);
-            XmlStreamReader xmlReader = new XmlStreamReader(is, cT, false);
+            XmlStreamReader xmlReader = new XmlStreamReader(is, cT, false, alternateEnc);
             if (!streamEnc.equals("UTF-16")) {
                 // we can not assert things here because UTF-8, US-ASCII and
                 // ISO-8859-1 look alike for the chars used for detection
@@ -230,7 +229,6 @@ public void _testAlternateDefaultEncoding(String cT, String bomEnc,
                         streamEnc.length()), streamEnc);
             }
         } finally {
-            XmlStreamReader.setDefaultEncoding(null);
         }
     }