Resolve last lgtm warnings

Author: cowtowncoder

src/main/java/com/fasterxml/aalto/in/ByteSourceBootstrapper.java

@@ -48,15 +48,15 @@ public final class ByteSourceBootstrapper
     /**
      * Underlying InputStream to use for reading content.
      */
-    final InputStream _in;
+    protected final InputStream _in;
 
     /*
     /**********************************************************************
     /* Input buffering
     /**********************************************************************
      */
 
-    final byte[] _inputBuffer;
+    protected final byte[] _inputBuffer;
 
     private int _inputPtr;
 
@@ -68,11 +68,11 @@ public final class ByteSourceBootstrapper
     /**********************************************************************
      */
 
-    boolean mBigEndian = true;
-    int mBytesPerChar = 0; // 0 means "dunno yet"
+    protected boolean mBigEndian = true;
+    protected int mBytesPerChar = 0; // 0 means "dunno yet"
 
-    boolean mHadBOM = false;
-    boolean mByteSizeFound = false;
+    protected boolean mHadBOM = false;
+    protected boolean mByteSizeFound = false;
 
     /*
     /**********************************************************************
@@ -164,9 +164,9 @@ public XmlScanner doBootstrap() throws IOException, XMLStreamException
             return new Utf8Scanner(_config,
                                    _in, _inputBuffer, _inputPtr, _inputLen);
         } else if (normEnc.startsWith(CharsetNames.CS_UTF32)) {
-            /* Since this is such a rare encoding, we'll just create
-             * a Reader, and dispatch it to reader scanner?
-             */
+            // Since this is such a rare encoding, we'll just create
+            // a Reader, and dispatch it to reader scanner?
+
             // let's augment with actual endianness info
             if (normEnc == CharsetNames.CS_UTF32) {
                 normEnc = mBigEndian ? CharsetNames.CS_UTF32BE : CharsetNames.CS_UTF32LE;
@@ -176,19 +176,17 @@ public XmlScanner doBootstrap() throws IOException, XMLStreamException
             return new ReaderScanner(_config, r);
         }
 
-        /* And finally, if all else fails, we'll also fall back to
-         * using JDK-provided decoders and ReaderScanner:
-         */
+        // And finally, if all else fails, we'll also fall back to
+        // using JDK-provided decoders and ReaderScanner:
         InputStream in = _in;
         if (_inputPtr < _inputLen) {
-            in = new MergedStream(_config, in, _inputBuffer, _inputPtr, _inputLen);
+            in = new MergedStream(_config, in, _inputBuffer, _inputPtr, _inputLen); // lgtm [java/input-resource-leak]
         }
         if (normEnc == CharsetNames.CS_UTF16) {
             normEnc = mBigEndian ? CharsetNames.CS_UTF16BE : CharsetNames.CS_UTF16LE;
         }
         try {
-            Reader r = new InputStreamReader(in, normEnc);
-            return new ReaderScanner(_config, r);
+            return new ReaderScanner(_config, new InputStreamReader(in, normEnc));
         } catch (UnsupportedEncodingException usex) {
             throw new IoStreamException("Unsupported encoding: "+usex.getMessage());
         }
@@ -221,9 +219,8 @@ private void determineStreamEncoding()
                     | ((_inputBuffer[_inputPtr+2] & 0xFF) << 8)
                     | (_inputBuffer[_inputPtr+3] & 0xFF);
 
-                /* Handling of (usually) optional BOM (required for
-                 * multi-byte formats); first 32-bit charsets:
-                 */
+                // Handling of (usually) optional BOM (required for
+                // multi-byte formats); first 32-bit charsets:
                 switch (quartet) {
                 case 0x0000FEFF:
                     mBigEndian = true;
@@ -760,9 +757,8 @@ private void verifyEncoding(String id, int bpc)
         throws XMLStreamException
     {
         if (mByteSizeFound) {
-            /* Let's verify that if we matched an encoding, it's the same
-             * as what was declared...
-             */
+            // Let's verify that if we matched an encoding, it's the same
+            // as what was declared...
             if (bpc != mBytesPerChar) {
                 reportXmlProblem("Declared encoding '"+id+"' uses "+bpc
                                  +" bytes per character; but physical encoding appeared to use "+mBytesPerChar+"; cannot decode");

src/main/java/com/fasterxml/aalto/in/FixedNsContext.java

@@ -23,9 +23,9 @@ public final class FixedNsContext
     }
 
     /*
-    ////////////////////////////////////////////////////////
-    // Persisted namespace information
-    ////////////////////////////////////////////////////////
+    /**********************************************************************
+    /* Persisted namespace information
+    /**********************************************************************
      */
 
     /**
@@ -89,17 +89,16 @@ public FixedNsContext reuseOrCreate(final NsDeclaration currLastDecl)
     }
 
     /*
-    /////////////////////////////////////////////
-    // NamespaceContext API
-    /////////////////////////////////////////////
+    /**********************************************************************
+    /* NamespaceContext API
+    /**********************************************************************
      */
 
     @Override
     public final String getNamespaceURI(String prefix)
     {
-        /* First the known offenders; invalid args, 2 predefined xml
-         * namespace prefixes
-         */
+        // First the known offenders; invalid args, 2 predefined xml
+        // namespace prefixes
         if (prefix == null) {
             throw new IllegalArgumentException("Null prefix not allowed");
         }
@@ -115,7 +114,7 @@ public final String getNamespaceURI(String prefix)
         String[] ns = _declarationData;
         for (int i = 0, len = ns.length; i < len; i += 2) {
             if (prefix.equals(ns[i])) {
-                return ns[i+1];
+                return ns[i+1]; // lgtm [java/index-out-of-bounds]
             }
         }
         return null;
@@ -124,9 +123,8 @@ public final String getNamespaceURI(String prefix)
     @Override
     public final String getPrefix(String nsURI)
     {
-        /* First the known offenders; invalid args, 2 predefined xml
-         * namespace prefixes
-         */
+        // First the known offenders; invalid args, 2 predefined xml
+        // namespace prefixes
         if (nsURI == null || nsURI.length() == 0) {
             throw new IllegalArgumentException("Illegal to pass null/empty prefix as argument.");
         }
@@ -209,9 +207,9 @@ public final Iterator<String> getPrefixes(String nsURI)
     }
 
     /*
-    /////////////////////////////////////////////
-    // Other methods
-    /////////////////////////////////////////////
+    /**********************************************************************
+    /* Standard method overrides
+    /**********************************************************************
      */
 
     @Override
@@ -227,7 +225,7 @@ public String toString()
                 sb.append(", ");
             }
             sb.append('"').append(_declarationData[i]).append("\"->\"");
-            sb.append(_declarationData[i+1]).append('"');
+            sb.append(_declarationData[i+1]).append('"'); // lgtm [java/index-out-of-bounds]
         }
         sb.append(']');
         return sb.toString();