From 5f6e2b780a1263ec989084513fa3c6e6b9a646a1 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Thu, 29 Jun 2017 08:45:00 +0000 Subject: [PATCH] remove deprecated POIXMLDocument.hasOOXMLHeader git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1800254 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/poi/POIXMLDocument.java | 20 ------------------- .../org/apache/poi/TestDetectAsOOXML.java | 3 +-- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/src/ooxml/java/org/apache/poi/POIXMLDocument.java b/src/ooxml/java/org/apache/poi/POIXMLDocument.java index 93afa6163..3443f332e 100644 --- a/src/ooxml/java/org/apache/poi/POIXMLDocument.java +++ b/src/ooxml/java/org/apache/poi/POIXMLDocument.java @@ -134,26 +134,6 @@ public abstract class POIXMLDocument extends POIXMLDocumentPart implements Close return parts; } - /** - * Checks that the supplied InputStream (which MUST - * support mark and reset, or be a PushbackInputStream) - * has a OOXML (zip) header at the start of it. - * If your InputStream does not support mark / reset, - * then wrap it in a PushBackInputStream, then be - * sure to always use that, and not the original! - * - * @param inp An InputStream which supports either mark/reset, or is a PushbackInputStream - * @return true, if the InputStream is an ooxml document - * - * @throws IOException if the InputStream can't be read - * - * @deprecated use the method from DocumentFactoryHelper, deprecated as of 3.15-beta1, therefore eligible for removal in 3.17 - */ - @Deprecated - public static boolean hasOOXMLHeader(InputStream inp) throws IOException { - return DocumentFactoryHelper.hasOOXMLHeader(inp); - } - /** * Get the document properties. This gives you access to the * core ooxml properties, and the extended ooxml properties. diff --git a/src/ooxml/testcases/org/apache/poi/TestDetectAsOOXML.java b/src/ooxml/testcases/org/apache/poi/TestDetectAsOOXML.java index 137f631b5..d5f898531 100644 --- a/src/ooxml/testcases/org/apache/poi/TestDetectAsOOXML.java +++ b/src/ooxml/testcases/org/apache/poi/TestDetectAsOOXML.java @@ -75,13 +75,12 @@ public class TestDetectAsOOXML extends TestCase // detect header InputStream in = new PushbackInputStream(testInput, 10); assertFalse(DocumentFactoryHelper.hasOOXMLHeader(in)); - //noinspection deprecation - assertFalse(POIXMLDocument.hasOOXMLHeader(in)); // check if InputStream is still intact byte[] test = new byte[3]; assertEquals(3, in.read(test)); assertTrue(Arrays.equals(testData, test)); assertEquals(-1, in.read()); + in.close(); } }