Warnings cleanup

FasterXML · Jun 4, 2019 · 5f0bbc9 · 5f0bbc9
1 parent fd938d5
commit 5f0bbc9
Show file tree

Hide file tree

Showing 14 changed files with 68 additions and 68 deletions.
diff --git a/src/main/java/com/ctc/wstx/util/DataUtil.java b/src/main/java/com/ctc/wstx/util/DataUtil.java
@@ -9,7 +9,7 @@ public final class DataUtil
 {
     final static char[] EMPTY_CHAR_ARRAY = new char[0];
 
-    final static Long MAX_LONG = new Long(Long.MAX_VALUE);
+    final static Long MAX_LONG = Long.valueOf(Long.MAX_VALUE);
 
     // Replace with Java 7 `Collections.emptyIterator()` once we can use it
     private final static class EI implements Iterator<Object>

diff --git a/src/test/java/org/codehaus/stax/test/BaseStaxTest.java b/src/test/java/org/codehaus/stax/test/BaseStaxTest.java
@@ -34,20 +34,20 @@ public abstract class BaseStaxTest
 
     final static HashMap<Integer,String> mTokenTypes = new HashMap<Integer,String>();
     static {
-        mTokenTypes.put(new Integer(START_ELEMENT), "START_ELEMENT");
-        mTokenTypes.put(new Integer(END_ELEMENT), "END_ELEMENT");
-        mTokenTypes.put(new Integer(START_DOCUMENT), "START_DOCUMENT");
-        mTokenTypes.put(new Integer(END_DOCUMENT), "END_DOCUMENT");
-        mTokenTypes.put(new Integer(CHARACTERS), "CHARACTERS");
-        mTokenTypes.put(new Integer(CDATA), "CDATA");
-        mTokenTypes.put(new Integer(COMMENT), "COMMENT");
-        mTokenTypes.put(new Integer(PROCESSING_INSTRUCTION), "PROCESSING_INSTRUCTION");
-        mTokenTypes.put(new Integer(DTD), "DTD");
-        mTokenTypes.put(new Integer(SPACE), "SPACE");
-        mTokenTypes.put(new Integer(ENTITY_REFERENCE), "ENTITY_REFERENCE");
-        mTokenTypes.put(new Integer(NAMESPACE), "NAMESPACE_DECLARATION");
-        mTokenTypes.put(new Integer(NOTATION_DECLARATION), "NOTATION_DECLARATION");
-        mTokenTypes.put(new Integer(ENTITY_DECLARATION), "ENTITY_DECLARATION");
+        mTokenTypes.put(Integer.valueOf(START_ELEMENT), "START_ELEMENT");
+        mTokenTypes.put(Integer.valueOf(END_ELEMENT), "END_ELEMENT");
+        mTokenTypes.put(Integer.valueOf(START_DOCUMENT), "START_DOCUMENT");
+        mTokenTypes.put(Integer.valueOf(END_DOCUMENT), "END_DOCUMENT");
+        mTokenTypes.put(Integer.valueOf(CHARACTERS), "CHARACTERS");
+        mTokenTypes.put(Integer.valueOf(CDATA), "CDATA");
+        mTokenTypes.put(Integer.valueOf(COMMENT), "COMMENT");
+        mTokenTypes.put(Integer.valueOf(PROCESSING_INSTRUCTION), "PROCESSING_INSTRUCTION");
+        mTokenTypes.put(Integer.valueOf(DTD), "DTD");
+        mTokenTypes.put(Integer.valueOf(SPACE), "SPACE");
+        mTokenTypes.put(Integer.valueOf(ENTITY_REFERENCE), "ENTITY_REFERENCE");
+        mTokenTypes.put(Integer.valueOf(NAMESPACE), "NAMESPACE_DECLARATION");
+        mTokenTypes.put(Integer.valueOf(NOTATION_DECLARATION), "NOTATION_DECLARATION");
+        mTokenTypes.put(Integer.valueOf(ENTITY_DECLARATION), "ENTITY_DECLARATION");
     }
 
     /*
@@ -530,7 +530,7 @@ protected static String stripXmlDecl(String xml) {
 
     protected static String tokenTypeDesc(int tt)
     {
-        String desc = (String) mTokenTypes.get(new Integer(tt));
+        String desc = (String) mTokenTypes.get(Integer.valueOf(tt));
         if (desc == null) {
             return "["+tt+"]";
         }

diff --git a/src/test/java/org/codehaus/stax/test/stream/TestCDataRead.java b/src/test/java/org/codehaus/stax/test/stream/TestCDataRead.java
@@ -284,7 +284,7 @@ public void testLongerCData3() throws Exception {
         // This should still work, although with linefeed replacements
         String text = sr.getText();
         if (text.length() != DST_TEXT.length()) {
-            System.err.println("DEBUG: initial length = "+text.length());
+//            System.err.println("DEBUG: initial length = "+text.length());
             while (sr.next() == CDATA) {
                 text += sr.getText();
                 System.err.println("DEBUG: another CDATA, len now: "+text.length());

diff --git a/src/test/java/org/codehaus/stax/test/stream/TestCommentRead.java b/src/test/java/org/codehaus/stax/test/stream/TestCommentRead.java
@@ -192,11 +192,11 @@ private void doTestProperties(boolean nsAware, boolean dtd)
                     break;
                 case 4:
                     method = "getNamespaceCount";
-                    result = new Integer(sr.getNamespaceCount());
+                    result = Integer.valueOf(sr.getNamespaceCount());
                     break;
                 case 5:
                     method = "getAttributeCount";
-                    result = new Integer(sr.getAttributeCount());
+                    result = Integer.valueOf(sr.getAttributeCount());
                     break;
                 case 6:
                     method = "getPITarget";

diff --git a/src/test/java/org/codehaus/stax/test/stream/TestDoctypeDecl.java b/src/test/java/org/codehaus/stax/test/stream/TestDoctypeDecl.java
@@ -210,11 +210,11 @@ private void doTestProperties(boolean nsAware)
                     break;
                 case 4:
                     method = "getNamespaceCount";
-                    result = new Integer(sr.getNamespaceCount());
+                    result = Integer.valueOf(sr.getNamespaceCount());
                     break;
                 case 5:
                     method = "getAttributeCount";
-                    result = new Integer(sr.getAttributeCount());
+                    result = Integer.valueOf(sr.getAttributeCount());
                     break;
                 case 6:
                     method = "getPITarget";
@@ -230,11 +230,11 @@ private void doTestProperties(boolean nsAware)
                     break;
                 case 9:
                     method = "getTextStart";
-                    result = new Integer(sr.getTextStart());
+                    result = Integer.valueOf(sr.getTextStart());
                     break;
                 case 10:
                     method = "getTextLength";
-                    result = new Integer(sr.getTextLength());
+                    result = Integer.valueOf(sr.getTextLength());
                     break;
                 }
                 fail("Expected IllegalStateException, when calling "

diff --git a/src/test/java/org/codehaus/stax/test/stream/TestEntityRead.java b/src/test/java/org/codehaus/stax/test/stream/TestEntityRead.java
@@ -542,11 +542,11 @@ private void doTestProperties(boolean nsAware)
                     break;
                 case 3:
                     method = "getNamespaceCount";
-                    result = new Integer(sr.getNamespaceCount());
+                    result = Integer.valueOf(sr.getNamespaceCount());
                     break;
                 case 4:
                     method = "getAttributeCount";
-                    result = new Integer(sr.getAttributeCount());
+                    result = Integer.valueOf(sr.getAttributeCount());
                     break;
                 case 5:
                     method = "getPITarget";
@@ -562,11 +562,11 @@ private void doTestProperties(boolean nsAware)
                     break;
                 case 8:
                     method = "getTextStart";
-                    result = new Integer(sr.getTextStart());
+                    result = Integer.valueOf(sr.getTextStart());
                     break;
                 case 9:
                     method = "getTextLength";
-                    result = new Integer(sr.getTextLength());
+                    result = Integer.valueOf(sr.getTextLength());
                     break;
                 }
                 fail("Expected IllegalArgumentException, when calling "

diff --git a/src/test/java/org/codehaus/stax/test/stream/TestProcInstrRead.java b/src/test/java/org/codehaus/stax/test/stream/TestProcInstrRead.java
@@ -217,11 +217,11 @@ private void doTestProperties(boolean ns, boolean dtd)
                     break;
                 case 4:
                     method = "getNamespaceCount";
-                    result = new Integer(sr.getNamespaceCount());
+                    result = Integer.valueOf(sr.getNamespaceCount());
                     break;
                 case 5:
                     method = "getAttributeCount";
-                    result = new Integer(sr.getAttributeCount());
+                    result = Integer.valueOf(sr.getAttributeCount());
                     break;
                 case 6:
                     method = "getText";
@@ -233,11 +233,11 @@ private void doTestProperties(boolean ns, boolean dtd)
                     break;
                 case 8:
                     method = "getTextStart";
-                    result = new Integer(sr.getTextStart());
+                    result = Integer.valueOf(sr.getTextStart());
                     break;
                 case 9:
                     method = "getTextLength";
-                    result = new Integer(sr.getTextLength());
+                    result = Integer.valueOf(sr.getTextLength());
                     break;
                 }
                 fail("Expected IllegalStateException, when calling "

diff --git a/src/test/java/org/codehaus/stax/test/stream/TestXmlDecl.java b/src/test/java/org/codehaus/stax/test/stream/TestXmlDecl.java
@@ -127,11 +127,11 @@ private void doTestProperties(boolean nsAware)
                     break;
                 case 4:
                     method = "getNamespaceCount";
-                    result = new Integer(sr.getNamespaceCount());
+                    result = Integer.valueOf(sr.getNamespaceCount());
                     break;
                 case 5:
                     method = "getAttributeCount";
-                    result = new Integer(sr.getAttributeCount());
+                    result = Integer.valueOf(sr.getAttributeCount());
                     break;
                 case 6:
                     method = "getPITarget";

diff --git a/src/test/java/stax2/BaseStax2Test.java b/src/test/java/stax2/BaseStax2Test.java
@@ -35,17 +35,17 @@ public abstract class BaseStax2Test
 
     final static HashMap<Integer,String> mTokenTypes = new HashMap<Integer,String>();
     static {
-        mTokenTypes.put(new Integer(START_ELEMENT), "START_ELEMENT");
-        mTokenTypes.put(new Integer(END_ELEMENT), "END_ELEMENT");
-        mTokenTypes.put(new Integer(START_DOCUMENT), "START_DOCUMENT");
-        mTokenTypes.put(new Integer(END_DOCUMENT), "END_DOCUMENT");
-        mTokenTypes.put(new Integer(CHARACTERS), "CHARACTERS");
-        mTokenTypes.put(new Integer(CDATA), "CDATA");
-        mTokenTypes.put(new Integer(COMMENT), "COMMENT");
-        mTokenTypes.put(new Integer(PROCESSING_INSTRUCTION), "PROCESSING_INSTRUCTION");
-        mTokenTypes.put(new Integer(DTD), "DTD");
-        mTokenTypes.put(new Integer(SPACE), "SPACE");
-        mTokenTypes.put(new Integer(ENTITY_REFERENCE), "ENTITY_REFERENCE");
+        mTokenTypes.put(Integer.valueOf(START_ELEMENT), "START_ELEMENT");
+        mTokenTypes.put(Integer.valueOf(END_ELEMENT), "END_ELEMENT");
+        mTokenTypes.put(Integer.valueOf(START_DOCUMENT), "START_DOCUMENT");
+        mTokenTypes.put(Integer.valueOf(END_DOCUMENT), "END_DOCUMENT");
+        mTokenTypes.put(Integer.valueOf(CHARACTERS), "CHARACTERS");
+        mTokenTypes.put(Integer.valueOf(CDATA), "CDATA");
+        mTokenTypes.put(Integer.valueOf(COMMENT), "COMMENT");
+        mTokenTypes.put(Integer.valueOf(PROCESSING_INSTRUCTION), "PROCESSING_INSTRUCTION");
+        mTokenTypes.put(Integer.valueOf(DTD), "DTD");
+        mTokenTypes.put(Integer.valueOf(SPACE), "SPACE");
+        mTokenTypes.put(Integer.valueOf(ENTITY_REFERENCE), "ENTITY_REFERENCE");
     }
 
     /**
@@ -414,7 +414,7 @@ protected int streamThroughFailing(XMLStreamReader sr, String msg)
 
     protected static String tokenTypeDesc(int tt)
     {
-	String desc = mTokenTypes.get(new Integer(tt));
+	String desc = mTokenTypes.get(Integer.valueOf(tt));
 	return (desc == null) ? ("["+tt+"]") : desc;
     }
 

diff --git a/src/test/java/stax2/stream/TestXMLStreamReader2.java b/src/test/java/stax2/stream/TestXMLStreamReader2.java
@@ -94,7 +94,7 @@ public void _testCData(boolean wrapped, boolean report) throws XMLStreamExceptio
         XMLInputFactory2 f = getInputFactory();
         // important: don't force coalescing, that'll convert CDATA to CHARACTERS
         setCoalescing(f, false);
-        f.setProperty(XMLInputFactory2.P_REPORT_CDATA, new Boolean(report));
+        f.setProperty(XMLInputFactory2.P_REPORT_CDATA, Boolean.valueOf(report));
         XMLStreamReader sr = f.createXMLStreamReader(new StringReader(XML));
         if (wrapped) {
             sr = wrapWithAdapter(sr);

diff --git a/src/test/java/stax2/vwstream/BaseOutputTest.java b/src/test/java/stax2/vwstream/BaseOutputTest.java
@@ -16,8 +16,8 @@ public XMLStreamWriter2 getDTDValidatingWriter(Writer w, String dtdSrc,
         throws XMLStreamException
     {
         XMLOutputFactory2 outf = getOutputFactory();
-        outf.setProperty(XMLStreamProperties.XSP_NAMESPACE_AWARE, new Boolean(nsAware));
-        outf.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, new Boolean(repairing));
+        outf.setProperty(XMLStreamProperties.XSP_NAMESPACE_AWARE, Boolean.valueOf(nsAware));
+        outf.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(repairing));
 
         XMLStreamWriter2 strw = (XMLStreamWriter2)outf.createXMLStreamWriter(w);
         XMLValidationSchema schema = parseDTDSchema(dtdSrc);
@@ -33,7 +33,7 @@ public XMLStreamWriter2 getSchemaValidatingWriter(Writer w, String schemaSrc,
     {
         XMLOutputFactory2 outf = getOutputFactory();
         outf.setProperty(XMLStreamProperties.XSP_NAMESPACE_AWARE, true);
-        outf.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, new Boolean(repairing));
+        outf.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, Boolean.valueOf(repairing));
 
         XMLStreamWriter2 strw = (XMLStreamWriter2)outf.createXMLStreamWriter(w);
         XMLValidationSchema schema = parseW3CSchema(schemaSrc);

diff --git a/src/test/java/wstxtest/BaseWstxTest.java b/src/test/java/wstxtest/BaseWstxTest.java
@@ -24,17 +24,17 @@ public abstract class BaseWstxTest
 {
     final static HashMap<Integer,String> mTokenTypes = new HashMap<Integer,String>();
     static {
-        mTokenTypes.put(new Integer(START_ELEMENT), "START_ELEMENT");
-        mTokenTypes.put(new Integer(END_ELEMENT), "END_ELEMENT");
-        mTokenTypes.put(new Integer(START_DOCUMENT), "START_DOCUMENT");
-        mTokenTypes.put(new Integer(END_DOCUMENT), "END_DOCUMENT");
-        mTokenTypes.put(new Integer(CHARACTERS), "CHARACTERS");
-        mTokenTypes.put(new Integer(CDATA), "CDATA");
-        mTokenTypes.put(new Integer(COMMENT), "COMMENT");
-        mTokenTypes.put(new Integer(PROCESSING_INSTRUCTION), "PROCESSING_INSTRUCTION");
-        mTokenTypes.put(new Integer(DTD), "DTD");
-        mTokenTypes.put(new Integer(SPACE), "SPACE");
-        mTokenTypes.put(new Integer(ENTITY_REFERENCE), "ENTITY_REFERENCE");
+        mTokenTypes.put(Integer.valueOf(START_ELEMENT), "START_ELEMENT");
+        mTokenTypes.put(Integer.valueOf(END_ELEMENT), "END_ELEMENT");
+        mTokenTypes.put(Integer.valueOf(START_DOCUMENT), "START_DOCUMENT");
+        mTokenTypes.put(Integer.valueOf(END_DOCUMENT), "END_DOCUMENT");
+        mTokenTypes.put(Integer.valueOf(CHARACTERS), "CHARACTERS");
+        mTokenTypes.put(Integer.valueOf(CDATA), "CDATA");
+        mTokenTypes.put(Integer.valueOf(COMMENT), "COMMENT");
+        mTokenTypes.put(Integer.valueOf(PROCESSING_INSTRUCTION), "PROCESSING_INSTRUCTION");
+        mTokenTypes.put(Integer.valueOf(DTD), "DTD");
+        mTokenTypes.put(Integer.valueOf(SPACE), "SPACE");
+        mTokenTypes.put(Integer.valueOf(ENTITY_REFERENCE), "ENTITY_REFERENCE");
     }
 
     /**
@@ -182,7 +182,7 @@ protected static void setLazyParsing(XMLInputFactory f, boolean state)
     protected static void setMinTextSegment(XMLInputFactory f, int len)
         throws XMLStreamException
     {
-        f.setProperty(WstxInputProperties.P_MIN_TEXT_SEGMENT, new Integer(len));
+        f.setProperty(WstxInputProperties.P_MIN_TEXT_SEGMENT, Integer.valueOf(len));
     }
 
     /*

diff --git a/src/test/java/wstxtest/util/TestArgUtil.java b/src/test/java/wstxtest/util/TestArgUtil.java
@@ -24,7 +24,7 @@ public void testBoolean()
 
         // and then errors:
         try {
-            /*boolean b =*/ ArgUtil.convertToBoolean("test", new Integer(0));
+            /*boolean b =*/ ArgUtil.convertToBoolean("test", Integer.valueOf(0));
             fail("Expected an IllegalArgumentException");
         } catch (IllegalArgumentException iae) { }
 
@@ -37,10 +37,10 @@ public void testBoolean()
     public void testInt()
     {
         assertEquals(14, ArgUtil.convertToInt("test", "14", 0));
-        assertEquals(14, ArgUtil.convertToInt("test", new Integer(14), 0));
-        assertEquals(14, ArgUtil.convertToInt("test", new Long(14L), 0));
-        assertEquals(14, ArgUtil.convertToInt("test", new Short((short) 14), 0));
-        assertEquals(14, ArgUtil.convertToInt("test", new Byte((byte) 14), 0));
+        assertEquals(14, ArgUtil.convertToInt("test", Integer.valueOf(14), 0));
+        assertEquals(14, ArgUtil.convertToInt("test", Long.valueOf(14L), 0));
+        assertEquals(14, ArgUtil.convertToInt("test", Short.valueOf((short) 14), 0));
+        assertEquals(14, ArgUtil.convertToInt("test", Byte.valueOf((byte) 14), 0));
 
         // and then errors:
         try {

diff --git a/src/test/java/wstxtest/util/TestDataUtil.java b/src/test/java/wstxtest/util/TestDataUtil.java
@@ -27,12 +27,12 @@ public void testContainment()
         c1.add(new String("bar"));
         Collection<Object> c2 = new ArrayList<Object>();
         c2.add("foobar");
-        c2.add(new Integer(3));
+        c2.add(Integer.valueOf(3));
 
         assertFalse(DataUtil.anyValuesInCommon(c1, c2));
 
         // Then a match
-        c1.add(new Integer(3));
+        c1.add(Integer.valueOf(3));
         assertTrue(DataUtil.anyValuesInCommon(c1, c2));
 
         // And another one: