From b7e55e211b6ac2c12652c666ce8153151e94c294 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Fri, 15 Sep 2017 12:29:35 +0000 Subject: [PATCH] remove some deprecated code slated for removal in 3.18 git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1808455 13f79535-47bb-0310-9956-ffa450edef68 --- .../poi/poifs/crypt/EncryptionHeader.java | 11 +----- .../poi/ss/formula/atp/WorkdayCalculator.java | 12 ------ .../apache/poi/xwpf/model/XMLParagraph.java | 39 ------------------- .../org/apache/poi/xwpf/TestXWPFBugs.java | 4 +- .../poi/hslf/usermodel/HSLFSlideShowImpl.java | 13 ------- .../ss/formula/atp/TestWorkdayCalculator.java | 11 ------ 6 files changed, 3 insertions(+), 87 deletions(-) delete mode 100644 src/ooxml/java/org/apache/poi/xwpf/model/XMLParagraph.java diff --git a/src/java/org/apache/poi/poifs/crypt/EncryptionHeader.java b/src/java/org/apache/poi/poifs/crypt/EncryptionHeader.java index f13c116e0b..616dbcf19e 100644 --- a/src/java/org/apache/poi/poifs/crypt/EncryptionHeader.java +++ b/src/java/org/apache/poi/poifs/crypt/EncryptionHeader.java @@ -17,7 +17,6 @@ package org.apache.poi.poifs.crypt; import org.apache.poi.EncryptedDocumentException; -import org.apache.poi.util.Removal; /** * Reads and processes OOXML Encryption Headers @@ -93,15 +92,7 @@ public abstract class EncryptionHeader implements Cloneable { public HashAlgorithm getHashAlgorithm() { return hashAlgorithm; } - - /** - * @deprecated POI 3.16 beta 1. use {@link #getHashAlgorithm()} - */ - @Removal(version="3.18") - public HashAlgorithm getHashAlgorithmEx() { - return hashAlgorithm; - } - + protected void setHashAlgorithm(HashAlgorithm hashAlgorithm) { this.hashAlgorithm = hashAlgorithm; } diff --git a/src/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java b/src/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java index 326a7e02f7..666501d540 100644 --- a/src/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java +++ b/src/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java @@ -146,18 +146,6 @@ public class WorkdayCalculator { return false; } - /** - * @param aDate a given date. - * @param holidays an array of holidays. - * @return 1 is not a workday, 0 otherwise. - * - * @deprecated POI 3.16 - will be removed, not used in POI itself - */ - @Removal(version="3.18") - protected int isNonWorkday(double aDate, double[] holidays) { - return isWeekend(aDate) || isHoliday(aDate, holidays) ? 1 : 0; - } - /** * @param start start date. * @param end end date. diff --git a/src/ooxml/java/org/apache/poi/xwpf/model/XMLParagraph.java b/src/ooxml/java/org/apache/poi/xwpf/model/XMLParagraph.java deleted file mode 100644 index 497b9fe5a8..0000000000 --- a/src/ooxml/java/org/apache/poi/xwpf/model/XMLParagraph.java +++ /dev/null @@ -1,39 +0,0 @@ -/* ==================================================================== - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -==================================================================== */ -package org.apache.poi.xwpf.model; - -import org.apache.poi.util.Removal; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTP; - -/** - * Base class for XWPF paragraphs - * - * @deprecated 3.16 beta1. This class isn't used ... - */ -@Deprecated -@Removal(version="3.18") -public class XMLParagraph { - protected CTP paragraph; - - public XMLParagraph(CTP paragraph) { - this.paragraph = paragraph; - } - - public CTP getCTP() { - return paragraph; - } -} \ No newline at end of file diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFBugs.java b/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFBugs.java index 377d98b33c..7f41870419 100644 --- a/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFBugs.java +++ b/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFBugs.java @@ -56,7 +56,7 @@ public class TestXWPFBugs { EncryptionInfo info = new EncryptionInfo(filesystem); assertEquals(128, info.getHeader().getKeySize()); assertEquals(CipherAlgorithm.aes128, info.getHeader().getCipherAlgorithm()); - assertEquals(HashAlgorithm.sha1, info.getHeader().getHashAlgorithmEx()); + assertEquals(HashAlgorithm.sha1, info.getHeader().getHashAlgorithm()); // Check it can be decoded Decryptor d = Decryptor.getInstance(info); @@ -92,7 +92,7 @@ public class TestXWPFBugs { assertEquals(16, info.getHeader().getBlockSize()); assertEquals(256, info.getHeader().getKeySize()); assertEquals(CipherAlgorithm.aes256, info.getHeader().getCipherAlgorithm()); - assertEquals(HashAlgorithm.sha1, info.getHeader().getHashAlgorithmEx()); + assertEquals(HashAlgorithm.sha1, info.getHeader().getHashAlgorithm()); // Check it can be decoded Decryptor d = Decryptor.getInstance(info); diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java index 2b758cff3d..814d588340 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java +++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java @@ -57,7 +57,6 @@ import org.apache.poi.util.LittleEndian; import org.apache.poi.util.LittleEndianConsts; import org.apache.poi.util.POILogFactory; import org.apache.poi.util.POILogger; -import org.apache.poi.util.Removal; /** * This class contains the main functionality for the Powerpoint file @@ -84,18 +83,6 @@ public final class HSLFSlideShowImpl extends POIDocument implements Closeable { // Embedded objects stored in storage records in the document stream, lazily populated. private HSLFObjectData[] _objects; - /** - * Returns the directory in the underlying POIFSFileSystem for the - * document that is open. - * - * @deprecated POI 3.16 beta 1. use {@link POIDocument#getDirectory()} instead - */ - @Deprecated - @Removal(version="3.18") - protected DirectoryNode getPOIFSDirectory() { - return getDirectory(); - } - /** * Constructs a Powerpoint document from fileName. Parses the document * and places all the important stuff into data structures. diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayCalculator.java b/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayCalculator.java index 80adae743e..3ea70b9947 100644 --- a/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayCalculator.java +++ b/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayCalculator.java @@ -153,15 +153,4 @@ public class TestWorkdayCalculator { assertEquals("Expected 1 non-weekend-holiday for " + start + " to " + end + " and " + holiday1 + " and " + holiday2, 1, count); } - - @SuppressWarnings("deprecation") - @Test - public void testIsNonWorkday() throws Exception { - final double weekend = DateUtil.getExcelDate(d(2016, 12, 25)); - final double holiday = DateUtil.getExcelDate(d(2016, 12, 26)); - final double workday = DateUtil.getExcelDate(d(2016, 12, 27)); - assertEquals(1, WorkdayCalculator.instance.isNonWorkday(weekend, new double[]{holiday})); - assertEquals(1, WorkdayCalculator.instance.isNonWorkday(holiday, new double[]{holiday})); - assertEquals(0, WorkdayCalculator.instance.isNonWorkday(workday, new double[]{holiday})); - } } -- 2.39.5