Fix various IDE warnings and some JavaDoc adjustments

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1849763 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 69 insertions, 68 deletions

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestContentType.java b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestContentType.java
index 4e97633285..9050e01a59 100644
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestContentType.java
+++ b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestContentType.java
@@ -17,9 +17,6 @@
 
 package org.apache.poi.openxml4j.opc;
 
-import java.io.InputStream;
-import java.net.URL;
-
 import org.apache.poi.ooxml.util.POIXMLConstants;
 import org.apache.poi.openxml4j.OpenXML4JTestDataSamples;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
@@ -28,9 +25,13 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-import static org.junit.Assert.*;
-
 import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.InputStream;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 /**
  * Tests for content type (ContentType class).
@@ -169,67 +170,67 @@ public final class TestContentType {
      */
     @Test
     public void testFileWithContentTypeParams() throws Exception {
-        InputStream is = OpenXML4JTestDataSamples.openSampleStream("ContentTypeHasParameters.ooxml");
-
-        OPCPackage p = OPCPackage.open(is);
-
-        final String typeResqml = "application/x-resqml+xml";
-
-        // Check the types on everything
-        for (PackagePart part : p.getParts()) {
-            final String contentType = part.getContentType();
-            final ContentType details = part.getContentTypeDetails();
-            final int length = details.getParameterKeys().length;
-            final boolean hasParameters = details.hasParameters();
-
-            // _rels type doesn't have any params
-            if (part.isRelationshipPart()) {
-                assertEquals(ContentTypes.RELATIONSHIPS_PART, contentType);
-                assertEquals(ContentTypes.RELATIONSHIPS_PART, details.toString());
-                assertEquals(false, hasParameters);
-                assertEquals(0, length);
-            }
-            // Core type doesn't have any params
-            else if (part.getPartName().toString().equals("/docProps/core.xml")) {
-                assertEquals(ContentTypes.CORE_PROPERTIES_PART, contentType);
-                assertEquals(ContentTypes.CORE_PROPERTIES_PART, details.toString());
-                assertEquals(false, hasParameters);
-                assertEquals(0, length);
-            }
-            // Global Crs types do have params
-            else if (part.getPartName().toString().equals("/global1dCrs.xml")) {
-                assertTrue(part.getContentType().startsWith(typeResqml));
-                assertEquals(typeResqml, details.toString(false));
-                assertEquals(true, hasParameters);
-                assertContains("version=2.0", details.toString());
-                assertContains("type=obj_global1dCrs", details.toString());
-                assertEquals(2, length);
-                assertEquals("2.0", details.getParameter("version"));
-                assertEquals("obj_global1dCrs", details.getParameter("type"));
-            } else if (part.getPartName().toString().equals("/global2dCrs.xml")) {
-                assertTrue(part.getContentType().startsWith(typeResqml));
-                assertEquals(typeResqml, details.toString(false));
-                assertEquals(true, hasParameters);
-                assertContains("version=2.0", details.toString());
-                assertContains("type=obj_global2dCrs", details.toString());
-                assertEquals(2, length);
-                assertEquals("2.0", details.getParameter("version"));
-                assertEquals("obj_global2dCrs", details.getParameter("type"));
-            }
-            // Other thingy
-            else if (part.getPartName().toString().equals("/myTestingGuid.xml")) {
-                assertTrue(part.getContentType().startsWith(typeResqml));
-                assertEquals(typeResqml, details.toString(false));
-                assertEquals(true, hasParameters);
-                assertContains("version=2.0", details.toString());
-                assertContains("type=obj_tectonicBoundaryFeature", details.toString());
-                assertEquals(2, length);
-                assertEquals("2.0", details.getParameter("version"));
-                assertEquals("obj_tectonicBoundaryFeature", details.getParameter("type"));
-            }
-            // That should be it!
-            else {
-                fail("Unexpected part " + part);
+        try (InputStream is = OpenXML4JTestDataSamples.openSampleStream("ContentTypeHasParameters.ooxml");
+             OPCPackage p = OPCPackage.open(is)) {
+
+            final String typeResqml = "application/x-resqml+xml";
+
+            // Check the types on everything
+            for (PackagePart part : p.getParts()) {
+                final String contentType = part.getContentType();
+                final ContentType details = part.getContentTypeDetails();
+                final int length = details.getParameterKeys().length;
+                final boolean hasParameters = details.hasParameters();
+
+                // _rels type doesn't have any params
+                if (part.isRelationshipPart()) {
+                    assertEquals(ContentTypes.RELATIONSHIPS_PART, contentType);
+                    assertEquals(ContentTypes.RELATIONSHIPS_PART, details.toString());
+                    assertFalse(hasParameters);
+                    assertEquals(0, length);
+                }
+                // Core type doesn't have any params
+                else if (part.getPartName().toString().equals("/docProps/core.xml")) {
+                    assertEquals(ContentTypes.CORE_PROPERTIES_PART, contentType);
+                    assertEquals(ContentTypes.CORE_PROPERTIES_PART, details.toString());
+                    assertFalse(hasParameters);
+                    assertEquals(0, length);
+                }
+                // Global Crs types do have params
+                else if (part.getPartName().toString().equals("/global1dCrs.xml")) {
+                    assertTrue(part.getContentType().startsWith(typeResqml));
+                    assertEquals(typeResqml, details.toString(false));
+                    assertTrue(hasParameters);
+                    assertContains("version=2.0", details.toString());
+                    assertContains("type=obj_global1dCrs", details.toString());
+                    assertEquals(2, length);
+                    assertEquals("2.0", details.getParameter("version"));
+                    assertEquals("obj_global1dCrs", details.getParameter("type"));
+                } else if (part.getPartName().toString().equals("/global2dCrs.xml")) {
+                    assertTrue(part.getContentType().startsWith(typeResqml));
+                    assertEquals(typeResqml, details.toString(false));
+                    assertTrue(hasParameters);
+                    assertContains("version=2.0", details.toString());
+                    assertContains("type=obj_global2dCrs", details.toString());
+                    assertEquals(2, length);
+                    assertEquals("2.0", details.getParameter("version"));
+                    assertEquals("obj_global2dCrs", details.getParameter("type"));
+                }
+                // Other thingy
+                else if (part.getPartName().toString().equals("/myTestingGuid.xml")) {
+                    assertTrue(part.getContentType().startsWith(typeResqml));
+                    assertEquals(typeResqml, details.toString(false));
+                    assertTrue(hasParameters);
+                    assertContains("version=2.0", details.toString());
+                    assertContains("type=obj_tectonicBoundaryFeature", details.toString());
+                    assertEquals(2, length);
+                    assertEquals("2.0", details.getParameter("version"));
+                    assertEquals("obj_tectonicBoundaryFeature", details.getParameter("type"));
+                }
+                // That should be it!
+                else {
+                    fail("Unexpected part " + part);
+                }
             }
         }
     }
diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestFileHelper.java b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestFileHelper.java
index 8bccffb3ee..d15281b2d3 100644
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestFileHelper.java
+++ b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestFileHelper.java
@@ -17,7 +17,7 @@
 
 package org.apache.poi.openxml4j.opc;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
 
 import java.io.File;
 import java.util.TreeMap;
@@ -52,7 +52,7 @@ public final class TestFileHelper {
 //				assertTrue(expectedValue.get(filename).equalsIgnoreCase(f2.getAbsolutePath()));
 //				// This comparison is platform dependent. A better approach is below
 //			}
-			assertTrue(f1.equals(f2));
+			assertEquals(f1, f2);
 		}
 	}
 }