IO-162 and IO-178 Minor refactoring to simplify

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

Author: Niall Pemberton

src/java/org/apache/commons/io/input/BOMInputStream.java

@@ -181,6 +181,18 @@ public ByteOrderMark getBOM() throws IOException {
         return byteOrderMark;
     }
 
+    /**
+     * Return the BOM charset Name - {@link ByteOrderMark#getCharsetName()}.
+     *
+     * @return The BOM charset Name or null if no BOM found
+     * @throws IOException if an error reading the first bytes of the stream occurs
+     * 
+     */
+    public String getBOMCharsetName() throws IOException {
+        getBOM();
+        return (byteOrderMark == null ? null : byteOrderMark.getCharsetName());
+    }
+
     /**
      * This method reads and either preserves or skips the first bytes in the
      * stream. It behaves like the single-byte <code>read()</code> method,

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

@@ -447,8 +447,8 @@ private void doRawStream(InputStream is, boolean lenient)
             throws IOException {
         BOMInputStream bom = new BOMInputStream(new BufferedInputStream(is, BUFFER_SIZE), false, BOMS);
         BOMInputStream pis = new BOMInputStream(bom, true, XML_GUESS_BYTES);
-        String bomEnc      = (bom.hasBOM() ? bom.getBOM().getCharsetName() : null);
-        String xmlGuessEnc = (pis.hasBOM() ? pis.getBOM().getCharsetName() : null);
+        String bomEnc      = bom.getBOMCharsetName();
+        String xmlGuessEnc = pis.getBOMCharsetName();
         String xmlEnc = getXmlProlog(pis, xmlGuessEnc);
         this.encoding = calculateRawEncoding(bomEnc, xmlGuessEnc, xmlEnc, pis);
         this.reader = new InputStreamReader(is, encoding);
@@ -469,8 +469,8 @@ private void doHttpStream(InputStream is, String httpContentType,
         BOMInputStream pis = new BOMInputStream(bom, true, XML_GUESS_BYTES);
         String cTMime = getContentTypeMime(httpContentType);
         String cTEnc = getContentTypeEncoding(httpContentType);
-        String bomEnc      = (bom.hasBOM() ? bom.getBOM().getCharsetName() : null);
-        String xmlGuessEnc = (pis.hasBOM() ? pis.getBOM().getCharsetName() : null);
+        String bomEnc      = bom.getBOMCharsetName();
+        String xmlGuessEnc = pis.getBOMCharsetName();
         String xmlEnc = getXmlProlog(pis, xmlGuessEnc);
         this.encoding = calculateHttpEncoding(cTMime, cTEnc, bomEnc,
                 xmlGuessEnc, xmlEnc, pis, lenient);