More warnings cleanup

FasterXML · Jan 8, 2021 · 913c115 · 913c115
1 parent 90b048a
commit 913c115
Show file tree

Hide file tree

Showing 13 changed files with 30 additions and 39 deletions.
diff --git a/pom.xml b/pom.xml
@@ -305,26 +305,26 @@ SAX2 and Stax2 APIs
 		  will have to use `moduleInfoFile` which is crappy but anything else requires
 		  JDK 9+.
               -->
-	    <plugin>
+         <plugin>
               <groupId>org.moditect</groupId>
               <artifactId>moditect-maven-plugin</artifactId>
               <executions>
-		<execution>
-		  <id>add-module-infos</id>
-		  <phase>package</phase>
-		  <goals>
-		    <goal>add-module-info</goal>
-		  </goals>
-		  <configuration>
-		    <overwriteExistingFiles>true</overwriteExistingFiles>
-		    <module>
+                <execution>
+                  <id>add-module-infos</id>
+                  <phase>package</phase>
+                  <goals>
+                    <goal>add-module-info</goal>
+                  </goals>
+                  <configuration>
+                    <overwriteExistingFiles>true</overwriteExistingFiles>
+                    <module>
                       <moduleInfoFile>src/moditect/module-info.java</moduleInfoFile>
-		    </module>
-		  </configuration>
-		</execution>
+                    </module>
+                  </configuration>
+                </execution>
               </executions>
-	    </plugin>
-	</plugins>
+         </plugin>
+       </plugins>
     </build>
 
     <reporting>

diff --git a/src/main/java/com/ctc/wstx/dtd/FullDTDReader.java b/src/main/java/com/ctc/wstx/dtd/FullDTDReader.java
@@ -713,7 +713,7 @@ protected void parseDirective()
 
     /**
      * Method similar to {@link #parseDirective}, but one that takes care
-     * to properly output dtd contents via {@link com.ctc.wstx.dtd.DTDWriter}
+     * to properly output dtd contents using {@code com.ctc.wstx.dtd.DTDWriter}
      * as necessary.
      * Separated to simplify both methods; otherwise would end up with
      * 'if (... flatten...) ... else ...' spaghetti code.

diff --git a/src/main/java/com/ctc/wstx/msv/W3CMultiSchemaFactory.java b/src/main/java/com/ctc/wstx/msv/W3CMultiSchemaFactory.java
@@ -31,7 +31,6 @@
 
 import org.xml.sax.Locator;
 
-import com.ctc.wstx.msv.W3CSchema;
 import com.sun.msv.grammar.ExpressionPool;
 import com.sun.msv.grammar.xmlschema.XMLSchemaGrammar;
 import com.sun.msv.grammar.xmlschema.XMLSchemaSchema;

diff --git a/src/main/java/com/ctc/wstx/sax/WstxSAXParser.java b/src/main/java/com/ctc/wstx/sax/WstxSAXParser.java
@@ -168,11 +168,11 @@ public class WstxSAXParser
 
     protected ContentHandler mContentHandler;
     protected DTDHandler mDTDHandler;
-    private EntityResolver mEntityResolver;
-    private ErrorHandler mErrorHandler;
+    protected EntityResolver mEntityResolver;
+    protected ErrorHandler mErrorHandler;
 
-    private LexicalHandler mLexicalHandler;
-    private DeclHandler mDeclHandler;
+    protected LexicalHandler mLexicalHandler;
+    protected DeclHandler mDeclHandler;
 
     // // // State:
 

diff --git a/src/main/java/com/ctc/wstx/stax/WstxOutputFactory.java b/src/main/java/com/ctc/wstx/stax/WstxOutputFactory.java
@@ -303,8 +303,8 @@ private XMLStreamWriter2 createSW(OutputStream out, Writer w, String enc,
     }
 
     /**
-     * Called by {@link #createSW(OutputStream, Writer, String, boolean)} after all of the nessesary configuration
-     * logic is complete.
+     * Called by {code createSW(OutputStream, Writer, String, boolean)} after all of the
+     * necessary configuration logic is complete.
      */
     protected XMLStreamWriter2 createSW(String enc, WriterConfig cfg, XmlWriter xw) {
         if (cfg.willSupportNamespaces()) {

diff --git a/src/main/java/com/ctc/wstx/util/BijectiveNsMap.java b/src/main/java/com/ctc/wstx/util/BijectiveNsMap.java
@@ -20,8 +20,6 @@
 import javax.xml.XMLConstants;
 import javax.xml.namespace.NamespaceContext;
 
-import com.ctc.wstx.util.DataUtil;
-
 /**
  * Helper class that implements "bijective map" (Map that allows use of values
  * as keys and vice versa, bidirectional access), and is specifically

diff --git a/src/main/java/com/ctc/wstx/util/DefaultXmlSymbolTable.java b/src/main/java/com/ctc/wstx/util/DefaultXmlSymbolTable.java
@@ -1,7 +1,5 @@
 package com.ctc.wstx.util;
 
-import com.ctc.wstx.util.SymbolTable;
-
 /**
  * Factory class used for instantiating pre-populated XML symbol
  * tables. Such tables already have basic String constants that

diff --git a/src/main/java/com/ctc/wstx/util/TextBuffer.java b/src/main/java/com/ctc/wstx/util/TextBuffer.java
@@ -19,7 +19,6 @@
 import com.ctc.wstx.api.ReaderConfig;
 import com.ctc.wstx.dtd.DTDEventListener;
 import com.ctc.wstx.sr.InputProblemReporter;
-import com.ctc.wstx.util.StringUtil;
 
 /**
  * TextBuffer is a class similar to {@link StringBuilder}, with

diff --git a/src/main/java/com/ctc/wstx/util/WordResolver.java b/src/main/java/com/ctc/wstx/util/WordResolver.java
@@ -59,7 +59,7 @@ public final class WordResolver
     ////////////////////////////////////////////////
      */
 
-    private WordResolver(String[] words, char[] index) {
+    WordResolver(String[] words, char[] index) {
         mWords = words;
         mData = index;
     }

diff --git a/src/test/java/failing/TestBasicSax.java b/src/test/java/failing/TestBasicSax.java
@@ -42,11 +42,11 @@ public void testCData() throws Exception
 
     /*
     ////////////////////////////////////////////////////
-    // Helper methods
+    // Helper classes
     ////////////////////////////////////////////////////
      */
 
-    private static class CDATASectionCounter extends DefaultHandler2 {
+    static class CDATASectionCounter extends DefaultHandler2 {
         private int cdataSectionCount;
         private int segmentCount;
 

diff --git a/src/test/java/wstxtest/cfg/InputConfigIterator.java b/src/test/java/wstxtest/cfg/InputConfigIterator.java
@@ -4,8 +4,6 @@
 
 import javax.xml.stream.XMLInputFactory;
 
-import wstxtest.cfg.InputTestConfig;
-
 /**
  * Class that implements iteration over set of input configuration
  * Objects, so that the input factory gets configured to all test

diff --git a/src/test/java/wstxtest/msv/TestWsdlValidation.java b/src/test/java/wstxtest/msv/TestWsdlValidation.java
@@ -28,10 +28,9 @@
 import com.sun.msv.reader.GrammarReaderController2;
 import com.sun.msv.reader.xmlschema.WSDLSchemaReader;
 
-public class TestWsdlValidation extends BaseStax2Test {
-
-	 private static class LocalController implements GrammarReaderController2 {
-
+public class TestWsdlValidation extends BaseStax2Test
+{
+    static class LocalController implements GrammarReaderController2 {
 	     @Override
 	     public LSResourceResolver getLSResourceResolver() {
 	         return null;

diff --git a/src/test/java/wstxtest/stream/TestConfig.java b/src/test/java/wstxtest/stream/TestConfig.java
@@ -99,7 +99,7 @@ public void testWriterProperties()
     //////////////////////////////////////////////////////
      */
 
-    private final static class DTDResolver
+    final static class DTDResolver
         implements XMLResolver
     {
         @Override
@@ -110,7 +110,7 @@ public Object resolveEntity(String publicID, String systemID,
         }
     }
 
-    private final static class EntityResolver
+    final static class EntityResolver
         implements XMLResolver
     {
         @Override