IO-162 Refactor lenient processing - simplifies the code and avoids reprocessing the stream

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

Author: Niall Pemberton

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

@@ -185,15 +185,7 @@ public XmlStreamReader(InputStream is) throws IOException {
      */
     public XmlStreamReader(InputStream is, boolean lenient) throws IOException {
         defaultEncoding = staticDefaultEncoding;
-        try {
-            doRawStream(is, lenient);
-        } catch (XmlStreamReaderException ex) {
-            if (!lenient) {
-                throw ex;
-            } else {
-                doLenientDetection(null, is, ex);
-            }
-        }
+        doRawStream(is, lenient);
     }
 
     /**
@@ -238,20 +230,11 @@ public XmlStreamReader(URL url) throws IOException {
     public XmlStreamReader(URLConnection conn) throws IOException {
         defaultEncoding = staticDefaultEncoding;
         boolean lenient = true;
-        InputStream is = conn.getInputStream();
         String contentType = conn.getContentType();
         if (conn instanceof HttpURLConnection || contentType != null) {
-            try {
-                doHttpStream(is, contentType, lenient);
-            } catch (XmlStreamReaderException ex) {
-                doLenientDetection(contentType, is, ex);
-            }
+            doHttpStream(conn.getInputStream(), contentType, lenient);
         } else {
-            try {
-                doRawStream(is, lenient);
-            } catch (XmlStreamReaderException ex) {
-                doLenientDetection(null, is, ex);
-            }
+            doRawStream(conn.getInputStream(), lenient);
         }
     }
 
@@ -315,15 +298,7 @@ public XmlStreamReader(InputStream is, String httpContentType,
             boolean lenient, String defaultEncoding) throws IOException {
         this.defaultEncoding = (defaultEncoding == null) ? staticDefaultEncoding
                 : defaultEncoding;
-        try {
-            doHttpStream(is, httpContentType, lenient);
-        } catch (XmlStreamReaderException ex) {
-            if (!lenient) {
-                throw ex;
-            } else {
-                doLenientDetection(httpContentType, is, ex);
-            }
-        }
+        doHttpStream(is, httpContentType, lenient);
     }
 
     /**
@@ -371,34 +346,32 @@ public XmlStreamReader(InputStream is, String httpContentType,
      *        the charset encoding.
      * @param is the unconsumed InputStream
      * @param ex The thrown exception
+     * @return the encoding
      * @throws IOException thrown if there is a problem reading the stream.
      */
-    private void doLenientDetection(String httpContentType, InputStream is,
+    private String doLenientDetection(String httpContentType, InputStream is,
             XmlStreamReaderException ex) throws IOException {
         if (httpContentType != null) {
             if (httpContentType.startsWith("text/html")) {
                 httpContentType = httpContentType.substring("text/html"
                         .length());
                 httpContentType = "text/xml" + httpContentType;
                 try {
-                    doHttpStream(is, httpContentType, true);
-                    ex = null;
+                    return calculateHttpEncoding(httpContentType, ex.getBomEncoding(),
+                            ex.getXmlGuessEncoding(), ex.getXmlEncoding(), true);
                 } catch (XmlStreamReaderException ex2) {
                     ex = ex2;
                 }
             }
         }
-        if (ex != null) {
-            String encoding = ex.getXmlEncoding();
-            if (encoding == null) {
-                encoding = ex.getContentTypeEncoding();
-            }
-            if (encoding == null) {
-                encoding = (defaultEncoding == null) ? UTF_8 : defaultEncoding;
-            }
-            this.encoding = encoding;
-            this.reader = new InputStreamReader(is, encoding);
+        String encoding = ex.getXmlEncoding();
+        if (encoding == null) {
+            encoding = ex.getContentTypeEncoding();
+        }
+        if (encoding == null) {
+            encoding = (defaultEncoding == null) ? UTF_8 : defaultEncoding;
         }
+        return encoding;
     }
 
     /**
@@ -448,7 +421,15 @@ private void doRawStream(InputStream is, boolean lenient)
         String bomEnc      = bom.getBOMCharsetName();
         String xmlGuessEnc = pis.getBOMCharsetName();
         String xmlEnc = getXmlProlog(pis, xmlGuessEnc);
-        this.encoding = calculateRawEncoding(bomEnc, xmlGuessEnc, xmlEnc);
+        try {
+            this.encoding = calculateRawEncoding(bomEnc, xmlGuessEnc, xmlEnc);
+        } catch (XmlStreamReaderException ex) {
+            if (lenient) {
+                this.encoding = doLenientDetection(null, is, ex);
+            } else {
+                throw ex;
+            }
+        }
         this.reader = new InputStreamReader(is, encoding);
     }
 
@@ -468,8 +449,16 @@ private void doHttpStream(InputStream is, String httpContentType,
         String bomEnc      = bom.getBOMCharsetName();
         String xmlGuessEnc = pis.getBOMCharsetName();
         String xmlEnc = getXmlProlog(pis, xmlGuessEnc);
-        this.encoding = calculateHttpEncoding(httpContentType, bomEnc,
-                xmlGuessEnc, xmlEnc, lenient);
+        try {
+            this.encoding = calculateHttpEncoding(httpContentType, bomEnc,
+                    xmlGuessEnc, xmlEnc, lenient);
+        } catch (XmlStreamReaderException ex) {
+            if (lenient) {
+                this.encoding = doLenientDetection(httpContentType, is, ex);
+            } else {
+                throw ex;
+            }
+        }
         this.reader = new InputStreamReader(is, encoding);
     }