From: PJ Fanning Date: Tue, 8 Dec 2020 23:30:40 +0000 (+0000) Subject: remove some deprecated code X-Git-Tag: before_ooxml_3rd_edition~21 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e4d6fc0a7fd8cc68f2ca56123df15569e15880d0;p=poi.git remove some deprecated code git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1884223 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java b/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java index f23df355c3..46565e550c 100644 --- a/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java +++ b/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java @@ -27,7 +27,6 @@ import org.apache.poi.ddf.EscherRecordFactory; import org.apache.poi.ddf.NullEscherSerializationListener; import org.apache.poi.hssf.util.LazilyConcatenatedByteArray; import org.apache.poi.util.LittleEndian; -import org.apache.poi.util.Removal; /** * The escher container record is used to hold escher records. It is abstract and @@ -126,17 +125,6 @@ public abstract class AbstractEscherHolderRecord extends Record { @Override public abstract short getSid(); - /** - * @deprecated use {@link #copy()} instead - */ - @Override - @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) - @Deprecated - @Removal(version = "5.0.0") - public AbstractEscherHolderRecord clone() { - return copy(); - } - @Override public abstract AbstractEscherHolderRecord copy(); diff --git a/src/java/org/apache/poi/hssf/record/ArrayRecord.java b/src/java/org/apache/poi/hssf/record/ArrayRecord.java index aeff00ca72..3ea1c82939 100644 --- a/src/java/org/apache/poi/hssf/record/ArrayRecord.java +++ b/src/java/org/apache/poi/hssf/record/ArrayRecord.java @@ -25,7 +25,6 @@ import org.apache.poi.ss.formula.Formula; import org.apache.poi.ss.formula.ptg.Ptg; import org.apache.poi.util.GenericRecordUtil; import org.apache.poi.util.LittleEndianOutput; -import org.apache.poi.util.Removal; /** * ARRAY (0x0221)

@@ -89,17 +88,6 @@ public final class ArrayRecord extends SharedValueRecordBase { return sid; } - /** - * @deprecated use {@link #copy()} instead - */ - @Override - @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) - @Deprecated - @Removal(version = "5.0.0") - public ArrayRecord clone() { - return copy(); - } - @Override public ArrayRecord copy() { return new ArrayRecord(this); diff --git a/src/java/org/apache/poi/hssf/record/AutoFilterInfoRecord.java b/src/java/org/apache/poi/hssf/record/AutoFilterInfoRecord.java index a0bb68d76a..cd981f73c8 100644 --- a/src/java/org/apache/poi/hssf/record/AutoFilterInfoRecord.java +++ b/src/java/org/apache/poi/hssf/record/AutoFilterInfoRecord.java @@ -24,7 +24,6 @@ import java.util.function.Supplier; import org.apache.poi.util.GenericRecordUtil; import org.apache.poi.util.LittleEndianOutput; -import org.apache.poi.util.Removal; /** * The AutoFilterInfo record specifies the number of columns that have AutoFilter enabled @@ -84,17 +83,6 @@ public final class AutoFilterInfoRecord extends StandardRecord { return sid; } - /** - * @deprecated use {@link #copy()} instead - */ - @Override - @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) - @Deprecated - @Removal(version = "5.0.0") - public AutoFilterInfoRecord clone() { - return copy(); - } - @Override public AutoFilterInfoRecord copy() { return new AutoFilterInfoRecord(this); diff --git a/src/java/org/apache/poi/hssf/record/BOFRecord.java b/src/java/org/apache/poi/hssf/record/BOFRecord.java index e197d0ab89..5f081c1bac 100644 --- a/src/java/org/apache/poi/hssf/record/BOFRecord.java +++ b/src/java/org/apache/poi/hssf/record/BOFRecord.java @@ -23,7 +23,6 @@ import java.util.Map; import java.util.function.Supplier; import org.apache.poi.util.LittleEndianOutput; -import org.apache.poi.util.Removal; /** * Somewhat of a misnomer, its used for the beginning of a set of records that @@ -262,17 +261,6 @@ public final class BOFRecord extends StandardRecord { return sid; } - /** - * @deprecated use {@link #copy()} instead - */ - @Override - @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) - @Deprecated - @Removal(version = "5.0.0") - public BOFRecord clone() { - return copy(); - } - @Override public BOFRecord copy() { return new BOFRecord(this); diff --git a/src/java/org/apache/poi/hssf/record/BlankRecord.java b/src/java/org/apache/poi/hssf/record/BlankRecord.java index 1c2aff8e1d..8b0f54ca37 100644 --- a/src/java/org/apache/poi/hssf/record/BlankRecord.java +++ b/src/java/org/apache/poi/hssf/record/BlankRecord.java @@ -22,7 +22,6 @@ import java.util.function.Supplier; import org.apache.poi.util.GenericRecordUtil; import org.apache.poi.util.LittleEndianOutput; -import org.apache.poi.util.Removal; /** * Represents a column in a row with no value but with styling. @@ -132,17 +131,6 @@ public final class BlankRecord extends StandardRecord implements CellValueRecord return 6; } - /** - * @deprecated use {@link #copy()} instead - */ - @Override - @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) - @Deprecated - @Removal(version = "5.0.0") - public BlankRecord clone() { - return copy(); - } - @Override public BlankRecord copy() { return new BlankRecord(this); diff --git a/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java b/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java index aeb7cbf788..92c8e07e9a 100644 --- a/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java +++ b/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java @@ -77,7 +77,6 @@ public final class BottomMarginRecord extends StandardRecord implements Margin { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/CFHeader12Record.java b/src/java/org/apache/poi/hssf/record/CFHeader12Record.java index 2b3b3fd954..217ed37157 100644 --- a/src/java/org/apache/poi/hssf/record/CFHeader12Record.java +++ b/src/java/org/apache/poi/hssf/record/CFHeader12Record.java @@ -25,7 +25,6 @@ import org.apache.poi.hssf.record.common.FutureRecord; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.util.GenericRecordUtil; import org.apache.poi.util.LittleEndianOutput; -import org.apache.poi.util.Removal; /** * Conditional Formatting Header v12 record CFHEADER12 (0x0879), @@ -89,17 +88,6 @@ public final class CFHeader12Record extends CFHeaderBase implements FutureRecord return futureHeader.getAssociatedRange(); } - /** - * @deprecated use {@link #copy()} instead - */ - @Override - @SuppressWarnings("squid:S2975") - @Deprecated - @Removal(version = "5.0.0") - public CFHeader12Record clone() { - return copy(); - } - @Override public CFHeader12Record copy() { return new CFHeader12Record(this); diff --git a/src/java/org/apache/poi/hssf/record/CFHeaderBase.java b/src/java/org/apache/poi/hssf/record/CFHeaderBase.java index e50d5421a6..0e4c41396c 100644 --- a/src/java/org/apache/poi/hssf/record/CFHeaderBase.java +++ b/src/java/org/apache/poi/hssf/record/CFHeaderBase.java @@ -25,7 +25,6 @@ import org.apache.poi.ss.util.CellRangeAddressList; import org.apache.poi.ss.util.CellRangeUtil; import org.apache.poi.util.GenericRecordUtil; import org.apache.poi.util.LittleEndianOutput; -import org.apache.poi.util.Removal; /** * Parent of Conditional Formatting Header records, @@ -146,15 +145,6 @@ public abstract class CFHeaderBase extends StandardRecord { field_4_cell_ranges.serialize(out); } - /** - * @deprecated use {@link #copy()} instead - */ - @Override - @SuppressWarnings("squid:S2975") - @Deprecated - @Removal(version = "5.0.0") - public abstract CFHeaderBase clone(); - @Override public abstract CFHeaderBase copy(); diff --git a/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java b/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java index 19e67a476c..fc837d1afb 100644 --- a/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java +++ b/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java @@ -18,7 +18,6 @@ package org.apache.poi.hssf.record; import org.apache.poi.ss.util.CellRangeAddress; -import org.apache.poi.util.Removal; /** * Conditional Formatting Header record CFHEADER (0x01B0). @@ -52,17 +51,6 @@ public final class CFHeaderRecord extends CFHeaderBase { return sid; } - /** - * @deprecated use {@link #copy()} instead - */ - @Override - @SuppressWarnings("squid:S2975") - @Deprecated - @Removal(version = "5.0.0") - public CFHeaderRecord clone() { - return copy(); - } - @Override public CFHeaderRecord copy() { return new CFHeaderRecord(this); diff --git a/src/java/org/apache/poi/hssf/record/CFRuleBase.java b/src/java/org/apache/poi/hssf/record/CFRuleBase.java index 6fd5728d81..052251e434 100644 --- a/src/java/org/apache/poi/hssf/record/CFRuleBase.java +++ b/src/java/org/apache/poi/hssf/record/CFRuleBase.java @@ -34,7 +34,6 @@ import org.apache.poi.util.GenericRecordUtil; import org.apache.poi.util.LittleEndianOutput; import org.apache.poi.util.POILogFactory; import org.apache.poi.util.POILogger; -import org.apache.poi.util.Removal; /** * Conditional Formatting Rules. This can hold old-style rules @@ -462,15 +461,6 @@ public abstract class CFRuleBase extends StandardRecord { return HSSFFormulaParser.parse(formula, sheet.getWorkbook(), FormulaType.CELL, sheetIndex); } - /** - * @deprecated use {@link #copy()} instead - */ - @Override - @SuppressWarnings("squid:S2975") - @Deprecated - @Removal(version = "5.0.0") - public abstract CFRuleBase clone(); - @Override public abstract CFRuleBase copy(); diff --git a/src/java/org/apache/poi/hssf/record/CFRuleRecord.java b/src/java/org/apache/poi/hssf/record/CFRuleRecord.java index 3d2fb83926..c685da52fa 100644 --- a/src/java/org/apache/poi/hssf/record/CFRuleRecord.java +++ b/src/java/org/apache/poi/hssf/record/CFRuleRecord.java @@ -21,7 +21,6 @@ import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.ss.formula.Formula; import org.apache.poi.ss.formula.ptg.Ptg; import org.apache.poi.util.LittleEndianOutput; -import org.apache.poi.util.Removal; /** * Conditional Formatting Rule Record (0x01B1). @@ -132,17 +131,6 @@ public final class CFRuleRecord extends CFRuleBase { getFormulaSize(getFormula2()); } - /** - * @deprecated use {@link #copy()} instead - */ - @Override - @SuppressWarnings("squid:S2975") - @Deprecated - @Removal(version = "5.0.0") - public CFRuleRecord clone() { - return copy(); - } - @Override public CFRuleRecord copy() { return new CFRuleRecord(this); diff --git a/src/java/org/apache/poi/hssf/record/CalcCountRecord.java b/src/java/org/apache/poi/hssf/record/CalcCountRecord.java index 8b8d48ab9f..4f865ecf42 100644 --- a/src/java/org/apache/poi/hssf/record/CalcCountRecord.java +++ b/src/java/org/apache/poi/hssf/record/CalcCountRecord.java @@ -89,7 +89,6 @@ public final class CalcCountRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/CalcModeRecord.java b/src/java/org/apache/poi/hssf/record/CalcModeRecord.java index 4ad145595f..1dd6f93cd0 100644 --- a/src/java/org/apache/poi/hssf/record/CalcModeRecord.java +++ b/src/java/org/apache/poi/hssf/record/CalcModeRecord.java @@ -104,7 +104,6 @@ public final class CalcModeRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/ColumnInfoRecord.java b/src/java/org/apache/poi/hssf/record/ColumnInfoRecord.java index 4f0e9bac4e..edfb06a75e 100644 --- a/src/java/org/apache/poi/hssf/record/ColumnInfoRecord.java +++ b/src/java/org/apache/poi/hssf/record/ColumnInfoRecord.java @@ -242,7 +242,6 @@ public final class ColumnInfoRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/ContinueRecord.java b/src/java/org/apache/poi/hssf/record/ContinueRecord.java index 28f9b7b175..0041437fed 100644 --- a/src/java/org/apache/poi/hssf/record/ContinueRecord.java +++ b/src/java/org/apache/poi/hssf/record/ContinueRecord.java @@ -69,7 +69,6 @@ public final class ContinueRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/DBCellRecord.java b/src/java/org/apache/poi/hssf/record/DBCellRecord.java index fe24f3accd..f041d4dd96 100644 --- a/src/java/org/apache/poi/hssf/record/DBCellRecord.java +++ b/src/java/org/apache/poi/hssf/record/DBCellRecord.java @@ -70,7 +70,6 @@ public final class DBCellRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java b/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java index e51a2ceabc..ab79205130 100644 --- a/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java +++ b/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java @@ -89,7 +89,6 @@ public final class DefaultColWidthRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java b/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java index 5d0d5ed539..96462bc128 100644 --- a/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java +++ b/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java @@ -113,7 +113,6 @@ public final class DefaultRowHeightRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/DeltaRecord.java b/src/java/org/apache/poi/hssf/record/DeltaRecord.java index 01bac3b6cc..3649e41999 100644 --- a/src/java/org/apache/poi/hssf/record/DeltaRecord.java +++ b/src/java/org/apache/poi/hssf/record/DeltaRecord.java @@ -69,7 +69,6 @@ public final class DeltaRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/DimensionsRecord.java b/src/java/org/apache/poi/hssf/record/DimensionsRecord.java index 9580f6ef4a..7fd6ce9807 100644 --- a/src/java/org/apache/poi/hssf/record/DimensionsRecord.java +++ b/src/java/org/apache/poi/hssf/record/DimensionsRecord.java @@ -26,7 +26,6 @@ import org.apache.poi.util.GenericRecordUtil; import org.apache.poi.util.LittleEndianOutput; import org.apache.poi.util.POILogFactory; import org.apache.poi.util.POILogger; -import org.apache.poi.util.Removal; /** * Provides the minumum and maximum bounds of a sheet. @@ -166,17 +165,6 @@ public final class DimensionsRecord extends StandardRecord { return sid; } - /** - * @deprecated use {@link #copy()} instead - */ - @Override - @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) - @Deprecated - @Removal(version = "5.0.0") - public DimensionsRecord clone() { - return copy(); - } - @Override public DimensionsRecord copy() { return new DimensionsRecord(this); diff --git a/src/java/org/apache/poi/hssf/record/DrawingRecord.java b/src/java/org/apache/poi/hssf/record/DrawingRecord.java index 1231a3dcec..35ed7eb961 100644 --- a/src/java/org/apache/poi/hssf/record/DrawingRecord.java +++ b/src/java/org/apache/poi/hssf/record/DrawingRecord.java @@ -83,7 +83,6 @@ public final class DrawingRecord extends StandardRecord { recordData = thedata; } - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/EOFRecord.java b/src/java/org/apache/poi/hssf/record/EOFRecord.java index d9097fc430..73245a82e9 100644 --- a/src/java/org/apache/poi/hssf/record/EOFRecord.java +++ b/src/java/org/apache/poi/hssf/record/EOFRecord.java @@ -56,7 +56,6 @@ public final class EOFRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/FilePassRecord.java b/src/java/org/apache/poi/hssf/record/FilePassRecord.java index 2054dedf13..2704402f92 100644 --- a/src/java/org/apache/poi/hssf/record/FilePassRecord.java +++ b/src/java/org/apache/poi/hssf/record/FilePassRecord.java @@ -141,7 +141,6 @@ public final class FilePassRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/FileSharingRecord.java b/src/java/org/apache/poi/hssf/record/FileSharingRecord.java index 66f0af1987..d534e7167d 100644 --- a/src/java/org/apache/poi/hssf/record/FileSharingRecord.java +++ b/src/java/org/apache/poi/hssf/record/FileSharingRecord.java @@ -136,7 +136,6 @@ public final class FileSharingRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/FooterRecord.java b/src/java/org/apache/poi/hssf/record/FooterRecord.java index e41d889d8c..5aee71d1c8 100644 --- a/src/java/org/apache/poi/hssf/record/FooterRecord.java +++ b/src/java/org/apache/poi/hssf/record/FooterRecord.java @@ -17,8 +17,6 @@ package org.apache.poi.hssf.record; -import org.apache.poi.util.Removal; - /** * Specifies the footer for a sheet */ @@ -41,17 +39,6 @@ public final class FooterRecord extends HeaderFooterBase { return sid; } - /** - * @deprecated use {@link #copy()} instead - */ - @Override - @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) - @Deprecated - @Removal(version = "5.0.0") - public FooterRecord clone() { - return copy(); - } - @Override public FooterRecord copy() { return new FooterRecord(this); diff --git a/src/java/org/apache/poi/hssf/record/FormatRecord.java b/src/java/org/apache/poi/hssf/record/FormatRecord.java index 3e34b77686..87600d6ed3 100644 --- a/src/java/org/apache/poi/hssf/record/FormatRecord.java +++ b/src/java/org/apache/poi/hssf/record/FormatRecord.java @@ -110,7 +110,6 @@ public final class FormatRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/GridsetRecord.java b/src/java/org/apache/poi/hssf/record/GridsetRecord.java index 4ed5d9ec2c..a7f050b2aa 100644 --- a/src/java/org/apache/poi/hssf/record/GridsetRecord.java +++ b/src/java/org/apache/poi/hssf/record/GridsetRecord.java @@ -83,7 +83,6 @@ public final class GridsetRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/GutsRecord.java b/src/java/org/apache/poi/hssf/record/GutsRecord.java index 4ce3fcdd33..8534b6612f 100644 --- a/src/java/org/apache/poi/hssf/record/GutsRecord.java +++ b/src/java/org/apache/poi/hssf/record/GutsRecord.java @@ -167,7 +167,6 @@ public final class GutsRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/HCenterRecord.java b/src/java/org/apache/poi/hssf/record/HCenterRecord.java index 33a0b11592..2bb7193942 100644 --- a/src/java/org/apache/poi/hssf/record/HCenterRecord.java +++ b/src/java/org/apache/poi/hssf/record/HCenterRecord.java @@ -76,7 +76,6 @@ public final class HCenterRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/HeaderFooterRecord.java b/src/java/org/apache/poi/hssf/record/HeaderFooterRecord.java index 58e550ab33..8db7fcb238 100644 --- a/src/java/org/apache/poi/hssf/record/HeaderFooterRecord.java +++ b/src/java/org/apache/poi/hssf/record/HeaderFooterRecord.java @@ -23,7 +23,6 @@ import java.util.function.Supplier; import org.apache.poi.util.GenericRecordUtil; import org.apache.poi.util.LittleEndianOutput; -import org.apache.poi.util.Removal; /** * The HEADERFOOTER record stores information added in Office Excel 2007 for headers/footers. @@ -88,17 +87,6 @@ public final class HeaderFooterRecord extends StandardRecord { return Arrays.equals(getGuid(), BLANK_GUID); } - /** - * @deprecated use {@link #copy()} instead - */ - @Override - @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) - @Deprecated - @Removal(version = "5.0.0") - public HeaderFooterRecord clone() { - return copy(); - } - @Override public HeaderFooterRecord copy() { return new HeaderFooterRecord(this); diff --git a/src/java/org/apache/poi/hssf/record/HeaderRecord.java b/src/java/org/apache/poi/hssf/record/HeaderRecord.java index 37018570d4..b3447121ad 100644 --- a/src/java/org/apache/poi/hssf/record/HeaderRecord.java +++ b/src/java/org/apache/poi/hssf/record/HeaderRecord.java @@ -17,8 +17,6 @@ package org.apache.poi.hssf.record; -import org.apache.poi.util.Removal; - /** * Specifies a header for a sheet */ @@ -41,17 +39,6 @@ public final class HeaderRecord extends HeaderFooterBase { return sid; } - /** - * @deprecated use {@link #copy()} instead - */ - @Override - @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) - @Deprecated - @Removal(version = "5.0.0") - public HeaderRecord clone() { - return copy(); - } - @Override public HeaderRecord copy() { return new HeaderRecord(this); diff --git a/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java b/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java index 3924a68200..68ed39de03 100644 --- a/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java +++ b/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java @@ -602,7 +602,6 @@ public final class HyperlinkRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/IndexRecord.java b/src/java/org/apache/poi/hssf/record/IndexRecord.java index 43c80f0901..7ebe0ac7e6 100644 --- a/src/java/org/apache/poi/hssf/record/IndexRecord.java +++ b/src/java/org/apache/poi/hssf/record/IndexRecord.java @@ -144,7 +144,6 @@ public final class IndexRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/IterationRecord.java b/src/java/org/apache/poi/hssf/record/IterationRecord.java index 3ce9a711de..ccfbe7928a 100644 --- a/src/java/org/apache/poi/hssf/record/IterationRecord.java +++ b/src/java/org/apache/poi/hssf/record/IterationRecord.java @@ -83,7 +83,6 @@ public final class IterationRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/LabelRecord.java b/src/java/org/apache/poi/hssf/record/LabelRecord.java index acddcfbe50..d6b1d031ae 100644 --- a/src/java/org/apache/poi/hssf/record/LabelRecord.java +++ b/src/java/org/apache/poi/hssf/record/LabelRecord.java @@ -180,7 +180,6 @@ public final class LabelRecord extends Record implements CellValueRecordInterfac /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/LabelSSTRecord.java b/src/java/org/apache/poi/hssf/record/LabelSSTRecord.java index 134c266503..50889ce706 100644 --- a/src/java/org/apache/poi/hssf/record/LabelSSTRecord.java +++ b/src/java/org/apache/poi/hssf/record/LabelSSTRecord.java @@ -87,7 +87,6 @@ public final class LabelSSTRecord extends CellRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/LeftMarginRecord.java b/src/java/org/apache/poi/hssf/record/LeftMarginRecord.java index 441cb99753..1157a32823 100644 --- a/src/java/org/apache/poi/hssf/record/LeftMarginRecord.java +++ b/src/java/org/apache/poi/hssf/record/LeftMarginRecord.java @@ -22,7 +22,6 @@ import java.util.function.Supplier; import org.apache.poi.util.GenericRecordUtil; import org.apache.poi.util.LittleEndianOutput; -import org.apache.poi.util.Removal; /** * Record for the left margin. @@ -69,17 +68,6 @@ public final class LeftMarginRecord extends StandardRecord implements Margin { this.field_1_margin = field_1_margin; } - /** - * @deprecated use {@link #copy()} instead - */ - @Override - @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) - @Deprecated - @Removal(version = "5.0.0") - public LeftMarginRecord clone() { - return copy(); - } - @Override public LeftMarginRecord copy() { return new LeftMarginRecord(this); diff --git a/src/java/org/apache/poi/hssf/record/MergeCellsRecord.java b/src/java/org/apache/poi/hssf/record/MergeCellsRecord.java index b43a6ebac4..3978dc9c60 100644 --- a/src/java/org/apache/poi/hssf/record/MergeCellsRecord.java +++ b/src/java/org/apache/poi/hssf/record/MergeCellsRecord.java @@ -26,7 +26,6 @@ import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.ss.util.CellRangeAddressList; import org.apache.poi.util.GenericRecordUtil; import org.apache.poi.util.LittleEndianOutput; -import org.apache.poi.util.Removal; /** * Optional record defining a square area of cells to "merged" into one cell. @@ -103,17 +102,6 @@ public final class MergeCellsRecord extends StandardRecord { } } - /** - * @deprecated use {@link #copy()} instead - */ - @Override - @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) - @Deprecated - @Removal(version = "5.0.0") - public MergeCellsRecord clone() { - return copy(); - } - @Override public MergeCellsRecord copy() { return new MergeCellsRecord(this); diff --git a/src/java/org/apache/poi/hssf/record/NumberRecord.java b/src/java/org/apache/poi/hssf/record/NumberRecord.java index 93d6dccb39..1b3753de7c 100644 --- a/src/java/org/apache/poi/hssf/record/NumberRecord.java +++ b/src/java/org/apache/poi/hssf/record/NumberRecord.java @@ -89,7 +89,6 @@ public final class NumberRecord extends CellRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/ObjRecord.java b/src/java/org/apache/poi/hssf/record/ObjRecord.java index 20a3f44065..2efd1bfa22 100644 --- a/src/java/org/apache/poi/hssf/record/ObjRecord.java +++ b/src/java/org/apache/poi/hssf/record/ObjRecord.java @@ -218,7 +218,6 @@ public final class ObjRecord extends Record { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/ObjectProtectRecord.java b/src/java/org/apache/poi/hssf/record/ObjectProtectRecord.java index a92ddb3b3d..da8d892954 100644 --- a/src/java/org/apache/poi/hssf/record/ObjectProtectRecord.java +++ b/src/java/org/apache/poi/hssf/record/ObjectProtectRecord.java @@ -24,7 +24,6 @@ import java.util.function.Supplier; import org.apache.poi.util.GenericRecordUtil; import org.apache.poi.util.LittleEndianOutput; -import org.apache.poi.util.Removal; /** * Protect embedded object with the lamest "security" ever invented. @@ -81,17 +80,6 @@ public final class ObjectProtectRecord extends StandardRecord { return sid; } - /** - * @deprecated use {@link #copy()} instead - */ - @Override - @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) - @Deprecated - @Removal(version = "5.0.0") - public ObjectProtectRecord clone() { - return copy(); - } - @Override public ObjectProtectRecord copy() { return new ObjectProtectRecord(this); diff --git a/src/java/org/apache/poi/hssf/record/PaneRecord.java b/src/java/org/apache/poi/hssf/record/PaneRecord.java index f936c90c70..6db2d7a15c 100644 --- a/src/java/org/apache/poi/hssf/record/PaneRecord.java +++ b/src/java/org/apache/poi/hssf/record/PaneRecord.java @@ -85,7 +85,6 @@ public final class PaneRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/PasswordRecord.java b/src/java/org/apache/poi/hssf/record/PasswordRecord.java index 5593d5fd1f..054c81fdee 100644 --- a/src/java/org/apache/poi/hssf/record/PasswordRecord.java +++ b/src/java/org/apache/poi/hssf/record/PasswordRecord.java @@ -80,7 +80,6 @@ public final class PasswordRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java b/src/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java index c47ea430aa..c1e3a15934 100644 --- a/src/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java +++ b/src/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java @@ -78,7 +78,6 @@ public final class PrintGridlinesRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/PrintHeadersRecord.java b/src/java/org/apache/poi/hssf/record/PrintHeadersRecord.java index 04063e2f32..ec3906f7d3 100644 --- a/src/java/org/apache/poi/hssf/record/PrintHeadersRecord.java +++ b/src/java/org/apache/poi/hssf/record/PrintHeadersRecord.java @@ -82,7 +82,6 @@ public final class PrintHeadersRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/PrintSetupRecord.java b/src/java/org/apache/poi/hssf/record/PrintSetupRecord.java index 35dc61cc63..00ebf2dbb6 100644 --- a/src/java/org/apache/poi/hssf/record/PrintSetupRecord.java +++ b/src/java/org/apache/poi/hssf/record/PrintSetupRecord.java @@ -319,7 +319,6 @@ public final class PrintSetupRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/ProtectRecord.java b/src/java/org/apache/poi/hssf/record/ProtectRecord.java index cd6ee87134..0d49793fc1 100644 --- a/src/java/org/apache/poi/hssf/record/ProtectRecord.java +++ b/src/java/org/apache/poi/hssf/record/ProtectRecord.java @@ -87,7 +87,6 @@ public final class ProtectRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/RKRecord.java b/src/java/org/apache/poi/hssf/record/RKRecord.java index dae2cb9f40..cd6dacc154 100644 --- a/src/java/org/apache/poi/hssf/record/RKRecord.java +++ b/src/java/org/apache/poi/hssf/record/RKRecord.java @@ -97,7 +97,6 @@ public final class RKRecord extends CellRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/RefModeRecord.java b/src/java/org/apache/poi/hssf/record/RefModeRecord.java index b832427e41..018b3cba79 100644 --- a/src/java/org/apache/poi/hssf/record/RefModeRecord.java +++ b/src/java/org/apache/poi/hssf/record/RefModeRecord.java @@ -89,7 +89,6 @@ public final class RefModeRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/RefreshAllRecord.java b/src/java/org/apache/poi/hssf/record/RefreshAllRecord.java index b1653f49e7..919901e5fb 100644 --- a/src/java/org/apache/poi/hssf/record/RefreshAllRecord.java +++ b/src/java/org/apache/poi/hssf/record/RefreshAllRecord.java @@ -86,7 +86,6 @@ public final class RefreshAllRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/RightMarginRecord.java b/src/java/org/apache/poi/hssf/record/RightMarginRecord.java index 22ceed94ff..a19ac0c01c 100644 --- a/src/java/org/apache/poi/hssf/record/RightMarginRecord.java +++ b/src/java/org/apache/poi/hssf/record/RightMarginRecord.java @@ -66,7 +66,6 @@ public final class RightMarginRecord extends StandardRecord implements Margin { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/RowRecord.java b/src/java/org/apache/poi/hssf/record/RowRecord.java index cbd56c9116..405f19afdc 100644 --- a/src/java/org/apache/poi/hssf/record/RowRecord.java +++ b/src/java/org/apache/poi/hssf/record/RowRecord.java @@ -406,7 +406,6 @@ public final class RowRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/SCLRecord.java b/src/java/org/apache/poi/hssf/record/SCLRecord.java index decb9d4e32..52bf1ff22d 100644 --- a/src/java/org/apache/poi/hssf/record/SCLRecord.java +++ b/src/java/org/apache/poi/hssf/record/SCLRecord.java @@ -67,7 +67,6 @@ public final class SCLRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/SaveRecalcRecord.java b/src/java/org/apache/poi/hssf/record/SaveRecalcRecord.java index 0574296a5c..8e08d6a201 100644 --- a/src/java/org/apache/poi/hssf/record/SaveRecalcRecord.java +++ b/src/java/org/apache/poi/hssf/record/SaveRecalcRecord.java @@ -78,7 +78,6 @@ public final class SaveRecalcRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/ScenarioProtectRecord.java b/src/java/org/apache/poi/hssf/record/ScenarioProtectRecord.java index d343e5b027..0a63b88d6c 100644 --- a/src/java/org/apache/poi/hssf/record/ScenarioProtectRecord.java +++ b/src/java/org/apache/poi/hssf/record/ScenarioProtectRecord.java @@ -89,7 +89,6 @@ public final class ScenarioProtectRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/SelectionRecord.java b/src/java/org/apache/poi/hssf/record/SelectionRecord.java index e6d0a02215..3f22c45c66 100644 --- a/src/java/org/apache/poi/hssf/record/SelectionRecord.java +++ b/src/java/org/apache/poi/hssf/record/SelectionRecord.java @@ -176,7 +176,6 @@ public final class SelectionRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/SharedFormulaRecord.java b/src/java/org/apache/poi/hssf/record/SharedFormulaRecord.java index 37a8b3a58f..f51dee1438 100644 --- a/src/java/org/apache/poi/hssf/record/SharedFormulaRecord.java +++ b/src/java/org/apache/poi/hssf/record/SharedFormulaRecord.java @@ -106,7 +106,6 @@ public final class SharedFormulaRecord extends SharedValueRecordBase { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/StringRecord.java b/src/java/org/apache/poi/hssf/record/StringRecord.java index 218906c1c6..96a22f8bd3 100644 --- a/src/java/org/apache/poi/hssf/record/StringRecord.java +++ b/src/java/org/apache/poi/hssf/record/StringRecord.java @@ -89,7 +89,6 @@ public final class StringRecord extends ContinuableRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/TopMarginRecord.java b/src/java/org/apache/poi/hssf/record/TopMarginRecord.java index 31cd8509b4..1067ab2d84 100644 --- a/src/java/org/apache/poi/hssf/record/TopMarginRecord.java +++ b/src/java/org/apache/poi/hssf/record/TopMarginRecord.java @@ -70,7 +70,6 @@ public final class TopMarginRecord extends StandardRecord implements Margin { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/UnknownRecord.java b/src/java/org/apache/poi/hssf/record/UnknownRecord.java index 941faec803..a787aca968 100644 --- a/src/java/org/apache/poi/hssf/record/UnknownRecord.java +++ b/src/java/org/apache/poi/hssf/record/UnknownRecord.java @@ -268,7 +268,6 @@ public final class UnknownRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/UseSelFSRecord.java b/src/java/org/apache/poi/hssf/record/UseSelFSRecord.java index 070baa52f6..dda12ab18a 100644 --- a/src/java/org/apache/poi/hssf/record/UseSelFSRecord.java +++ b/src/java/org/apache/poi/hssf/record/UseSelFSRecord.java @@ -71,7 +71,6 @@ public final class UseSelFSRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/UserSViewBegin.java b/src/java/org/apache/poi/hssf/record/UserSViewBegin.java index 0b91f44add..056ca8f4d2 100644 --- a/src/java/org/apache/poi/hssf/record/UserSViewBegin.java +++ b/src/java/org/apache/poi/hssf/record/UserSViewBegin.java @@ -81,7 +81,6 @@ public final class UserSViewBegin extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/UserSViewEnd.java b/src/java/org/apache/poi/hssf/record/UserSViewEnd.java index 7182d22cd8..4acfa89a2e 100644 --- a/src/java/org/apache/poi/hssf/record/UserSViewEnd.java +++ b/src/java/org/apache/poi/hssf/record/UserSViewEnd.java @@ -22,7 +22,6 @@ import java.util.function.Supplier; import org.apache.poi.util.GenericRecordUtil; import org.apache.poi.util.LittleEndianOutput; -import org.apache.poi.util.Removal; /** * The UserSViewEnd record marks the end of the settings for a custom view associated with the sheet @@ -66,17 +65,6 @@ public final class UserSViewEnd extends StandardRecord { return sid; } - /** - * @deprecated use {@link #copy()} instead - */ - @Override - @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) - @Deprecated - @Removal(version = "5.0.0") - public UserSViewEnd clone() { - return copy(); - } - @Override public UserSViewEnd copy() { return new UserSViewEnd(this); diff --git a/src/java/org/apache/poi/hssf/record/VCenterRecord.java b/src/java/org/apache/poi/hssf/record/VCenterRecord.java index 058970f633..4090730e9b 100644 --- a/src/java/org/apache/poi/hssf/record/VCenterRecord.java +++ b/src/java/org/apache/poi/hssf/record/VCenterRecord.java @@ -22,7 +22,6 @@ import java.util.function.Supplier; import org.apache.poi.util.GenericRecordUtil; import org.apache.poi.util.LittleEndianOutput; -import org.apache.poi.util.Removal; /** * Tells whether to center the sheet between vertical margins @@ -78,17 +77,6 @@ public final class VCenterRecord extends StandardRecord { return sid; } - /** - * @deprecated use {@link #copy()} instead - */ - @Override - @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) - @Deprecated - @Removal(version = "5.0.0") - public VCenterRecord clone() { - return copy(); - } - @Override public VCenterRecord copy() { return new VCenterRecord(this); diff --git a/src/java/org/apache/poi/hssf/record/WSBoolRecord.java b/src/java/org/apache/poi/hssf/record/WSBoolRecord.java index 7111c0ee0d..0bdee8b994 100644 --- a/src/java/org/apache/poi/hssf/record/WSBoolRecord.java +++ b/src/java/org/apache/poi/hssf/record/WSBoolRecord.java @@ -26,7 +26,6 @@ import org.apache.poi.util.BitField; import org.apache.poi.util.BitFieldFactory; import org.apache.poi.util.GenericRecordUtil; import org.apache.poi.util.LittleEndianOutput; -import org.apache.poi.util.Removal; /** * Stores workbook settings (aka its a big "everything we didn't put somewhere else") @@ -296,17 +295,6 @@ public final class WSBoolRecord extends StandardRecord { return sid; } - /** - * @deprecated use {@link #copy()} instead - */ - @Override - @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) - @Deprecated - @Removal(version = "5.0.0") - public WSBoolRecord clone() { - return copy(); - } - @Override public WSBoolRecord copy() { return new WSBoolRecord(this); diff --git a/src/java/org/apache/poi/hssf/record/WindowProtectRecord.java b/src/java/org/apache/poi/hssf/record/WindowProtectRecord.java index 34004525f1..4b5df7b737 100644 --- a/src/java/org/apache/poi/hssf/record/WindowProtectRecord.java +++ b/src/java/org/apache/poi/hssf/record/WindowProtectRecord.java @@ -87,7 +87,6 @@ public final class WindowProtectRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/WindowTwoRecord.java b/src/java/org/apache/poi/hssf/record/WindowTwoRecord.java index 3ce2816954..e64be7d396 100644 --- a/src/java/org/apache/poi/hssf/record/WindowTwoRecord.java +++ b/src/java/org/apache/poi/hssf/record/WindowTwoRecord.java @@ -464,7 +464,6 @@ public final class WindowTwoRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/cf/BorderFormatting.java b/src/java/org/apache/poi/hssf/record/cf/BorderFormatting.java index 4c22693281..6ba55906d3 100644 --- a/src/java/org/apache/poi/hssf/record/cf/BorderFormatting.java +++ b/src/java/org/apache/poi/hssf/record/cf/BorderFormatting.java @@ -466,7 +466,6 @@ public final class BorderFormatting implements Duplicatable, GenericRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java b/src/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java index 5cb2947cc6..9e16650a66 100644 --- a/src/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java +++ b/src/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java @@ -154,7 +154,6 @@ public final class ColorGradientFormatting implements Duplicatable, GenericRecor /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java b/src/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java index e66462fb87..9c90f349de 100644 --- a/src/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java +++ b/src/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java @@ -157,7 +157,6 @@ public final class DataBarFormatting implements Duplicatable, GenericRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/cf/FontFormatting.java b/src/java/org/apache/poi/hssf/record/cf/FontFormatting.java index fba9f2475e..1027c5e215 100644 --- a/src/java/org/apache/poi/hssf/record/cf/FontFormatting.java +++ b/src/java/org/apache/poi/hssf/record/cf/FontFormatting.java @@ -491,7 +491,6 @@ public final class FontFormatting implements Duplicatable, GenericRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java b/src/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java index 3feb5fd649..7578cab3e3 100644 --- a/src/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java +++ b/src/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java @@ -124,7 +124,6 @@ public final class IconMultiStateFormatting implements Duplicatable, GenericReco /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/cf/PatternFormatting.java b/src/java/org/apache/poi/hssf/record/cf/PatternFormatting.java index 8e0d867d75..2820fc2cf6 100644 --- a/src/java/org/apache/poi/hssf/record/cf/PatternFormatting.java +++ b/src/java/org/apache/poi/hssf/record/cf/PatternFormatting.java @@ -188,7 +188,6 @@ public final class PatternFormatting implements Duplicatable, GenericRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/chart/AreaFormatRecord.java b/src/java/org/apache/poi/hssf/record/chart/AreaFormatRecord.java index 967af47e0d..5bf5b49d08 100644 --- a/src/java/org/apache/poi/hssf/record/chart/AreaFormatRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/AreaFormatRecord.java @@ -89,7 +89,6 @@ public final class AreaFormatRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/chart/AreaRecord.java b/src/java/org/apache/poi/hssf/record/chart/AreaRecord.java index dbc99e8e95..85d016baf7 100644 --- a/src/java/org/apache/poi/hssf/record/chart/AreaRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/AreaRecord.java @@ -68,7 +68,6 @@ public final class AreaRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/chart/AxisLineFormatRecord.java b/src/java/org/apache/poi/hssf/record/chart/AxisLineFormatRecord.java index a12d05a2ce..9d5a359206 100644 --- a/src/java/org/apache/poi/hssf/record/chart/AxisLineFormatRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/AxisLineFormatRecord.java @@ -66,7 +66,6 @@ public final class AxisLineFormatRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/chart/AxisOptionsRecord.java b/src/java/org/apache/poi/hssf/record/chart/AxisOptionsRecord.java index 3a905a2b53..291e8603f9 100644 --- a/src/java/org/apache/poi/hssf/record/chart/AxisOptionsRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/AxisOptionsRecord.java @@ -115,7 +115,6 @@ public final class AxisOptionsRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/chart/AxisParentRecord.java b/src/java/org/apache/poi/hssf/record/chart/AxisParentRecord.java index 41f69a0a99..4a98ad4971 100644 --- a/src/java/org/apache/poi/hssf/record/chart/AxisParentRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/AxisParentRecord.java @@ -82,7 +82,6 @@ public final class AxisParentRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/chart/AxisRecord.java b/src/java/org/apache/poi/hssf/record/chart/AxisRecord.java index 5a1eb62465..8979d8fc88 100644 --- a/src/java/org/apache/poi/hssf/record/chart/AxisRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/AxisRecord.java @@ -81,7 +81,6 @@ public final class AxisRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/chart/AxisUsedRecord.java b/src/java/org/apache/poi/hssf/record/chart/AxisUsedRecord.java index 8b2694a6bf..8a45bb28c2 100644 --- a/src/java/org/apache/poi/hssf/record/chart/AxisUsedRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/AxisUsedRecord.java @@ -62,7 +62,6 @@ public final class AxisUsedRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/chart/BarRecord.java b/src/java/org/apache/poi/hssf/record/chart/BarRecord.java index e83f922880..8b5551f133 100644 --- a/src/java/org/apache/poi/hssf/record/chart/BarRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/BarRecord.java @@ -79,7 +79,6 @@ public final class BarRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/chart/BeginRecord.java b/src/java/org/apache/poi/hssf/record/chart/BeginRecord.java index 15726d27b9..7717fb196a 100644 --- a/src/java/org/apache/poi/hssf/record/chart/BeginRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/BeginRecord.java @@ -61,7 +61,6 @@ public final class BeginRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/chart/CategorySeriesAxisRecord.java b/src/java/org/apache/poi/hssf/record/chart/CategorySeriesAxisRecord.java index 6d951d4976..2b11411705 100644 --- a/src/java/org/apache/poi/hssf/record/chart/CategorySeriesAxisRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/CategorySeriesAxisRecord.java @@ -81,7 +81,6 @@ public final class CategorySeriesAxisRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/chart/ChartRecord.java b/src/java/org/apache/poi/hssf/record/chart/ChartRecord.java index d6d39b84ff..400b4e1d84 100644 --- a/src/java/org/apache/poi/hssf/record/chart/ChartRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/ChartRecord.java @@ -87,7 +87,6 @@ public final class ChartRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/chart/DatRecord.java b/src/java/org/apache/poi/hssf/record/chart/DatRecord.java index 25e6b55f47..0dc4c0c3d2 100644 --- a/src/java/org/apache/poi/hssf/record/chart/DatRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/DatRecord.java @@ -69,7 +69,6 @@ public final class DatRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/chart/DataFormatRecord.java b/src/java/org/apache/poi/hssf/record/chart/DataFormatRecord.java index 7e748780ed..91bbf62ec2 100644 --- a/src/java/org/apache/poi/hssf/record/chart/DataFormatRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/DataFormatRecord.java @@ -78,7 +78,6 @@ public final class DataFormatRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/chart/DefaultDataLabelTextPropertiesRecord.java b/src/java/org/apache/poi/hssf/record/chart/DefaultDataLabelTextPropertiesRecord.java index 5c1f13aace..36cd0b019e 100644 --- a/src/java/org/apache/poi/hssf/record/chart/DefaultDataLabelTextPropertiesRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/DefaultDataLabelTextPropertiesRecord.java @@ -65,7 +65,6 @@ public final class DefaultDataLabelTextPropertiesRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/chart/EndRecord.java b/src/java/org/apache/poi/hssf/record/chart/EndRecord.java index 2b8e35364b..ec194ae765 100644 --- a/src/java/org/apache/poi/hssf/record/chart/EndRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/EndRecord.java @@ -59,7 +59,6 @@ public final class EndRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/chart/FontBasisRecord.java b/src/java/org/apache/poi/hssf/record/chart/FontBasisRecord.java index 5c78ad1288..7cab960b2d 100644 --- a/src/java/org/apache/poi/hssf/record/chart/FontBasisRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/FontBasisRecord.java @@ -77,7 +77,6 @@ public final class FontBasisRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/chart/FontIndexRecord.java b/src/java/org/apache/poi/hssf/record/chart/FontIndexRecord.java index 6d295f72dc..4cdc3a079f 100644 --- a/src/java/org/apache/poi/hssf/record/chart/FontIndexRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/FontIndexRecord.java @@ -59,7 +59,6 @@ public final class FontIndexRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/chart/FrameRecord.java b/src/java/org/apache/poi/hssf/record/chart/FrameRecord.java index 4521a34d5f..a59b7e09d6 100644 --- a/src/java/org/apache/poi/hssf/record/chart/FrameRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/FrameRecord.java @@ -74,7 +74,6 @@ public final class FrameRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/chart/LegendRecord.java b/src/java/org/apache/poi/hssf/record/chart/LegendRecord.java index 5b8a27bd71..3737a25767 100644 --- a/src/java/org/apache/poi/hssf/record/chart/LegendRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/LegendRecord.java @@ -109,7 +109,6 @@ public final class LegendRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/chart/LineFormatRecord.java b/src/java/org/apache/poi/hssf/record/chart/LineFormatRecord.java index de14e20687..13960ba462 100644 --- a/src/java/org/apache/poi/hssf/record/chart/LineFormatRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/LineFormatRecord.java @@ -104,7 +104,6 @@ public final class LineFormatRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java b/src/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java index f2195f472f..7061c07f7e 100644 --- a/src/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java @@ -98,7 +98,6 @@ public final class LinkedDataRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/chart/NumberFormatIndexRecord.java b/src/java/org/apache/poi/hssf/record/chart/NumberFormatIndexRecord.java index 45ca7fb757..8a4077b7d6 100644 --- a/src/java/org/apache/poi/hssf/record/chart/NumberFormatIndexRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/NumberFormatIndexRecord.java @@ -25,7 +25,6 @@ import org.apache.poi.hssf.record.RecordInputStream; import org.apache.poi.hssf.record.StandardRecord; import org.apache.poi.util.GenericRecordUtil; import org.apache.poi.util.LittleEndianOutput; -import org.apache.poi.util.Removal; /** * The number format index record indexes format table. This applies to an axis. @@ -59,17 +58,6 @@ public final class NumberFormatIndexRecord extends StandardRecord { return sid; } - /** - * @deprecated use {@link #copy()} instead - */ - @Override - @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) - @Deprecated - @Removal(version = "5.0.0") - public NumberFormatIndexRecord clone() { - return copy(); - } - @Override public NumberFormatIndexRecord copy() { return new NumberFormatIndexRecord(this); diff --git a/src/java/org/apache/poi/hssf/record/chart/ObjectLinkRecord.java b/src/java/org/apache/poi/hssf/record/chart/ObjectLinkRecord.java index 0b8c629dad..7b47fb5fc4 100644 --- a/src/java/org/apache/poi/hssf/record/chart/ObjectLinkRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/ObjectLinkRecord.java @@ -78,7 +78,6 @@ public final class ObjectLinkRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java b/src/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java index 5ff7e1af03..6c195ab6fd 100644 --- a/src/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java @@ -54,7 +54,6 @@ public final class PlotAreaRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/chart/PlotGrowthRecord.java b/src/java/org/apache/poi/hssf/record/chart/PlotGrowthRecord.java index 42ce6734f2..d80b2c64ad 100644 --- a/src/java/org/apache/poi/hssf/record/chart/PlotGrowthRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/PlotGrowthRecord.java @@ -65,7 +65,6 @@ public final class PlotGrowthRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/chart/SeriesChartGroupIndexRecord.java b/src/java/org/apache/poi/hssf/record/chart/SeriesChartGroupIndexRecord.java index 2804e798e6..2d340d9440 100644 --- a/src/java/org/apache/poi/hssf/record/chart/SeriesChartGroupIndexRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/SeriesChartGroupIndexRecord.java @@ -62,7 +62,6 @@ public final class SeriesChartGroupIndexRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/chart/SeriesLabelsRecord.java b/src/java/org/apache/poi/hssf/record/chart/SeriesLabelsRecord.java index 2789717934..42ef718864 100644 --- a/src/java/org/apache/poi/hssf/record/chart/SeriesLabelsRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/SeriesLabelsRecord.java @@ -73,7 +73,6 @@ public final class SeriesLabelsRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java b/src/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java index 9b525d81ee..52c5fcf4f1 100644 --- a/src/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java @@ -78,7 +78,6 @@ public final class SeriesListRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/chart/SeriesRecord.java b/src/java/org/apache/poi/hssf/record/chart/SeriesRecord.java index 10fcbb5caa..4ed7ee3b60 100644 --- a/src/java/org/apache/poi/hssf/record/chart/SeriesRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/SeriesRecord.java @@ -25,7 +25,6 @@ import org.apache.poi.hssf.record.RecordInputStream; import org.apache.poi.hssf.record.StandardRecord; import org.apache.poi.util.GenericRecordUtil; import org.apache.poi.util.LittleEndianOutput; -import org.apache.poi.util.Removal; /** * The series record describes the overall data for a series. @@ -95,17 +94,6 @@ public final class SeriesRecord extends StandardRecord { return sid; } - /** - * @deprecated use {@link #copy()} instead - */ - @Override - @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) - @Deprecated - @Removal(version = "5.0.0") - public SeriesRecord clone() { - return copy(); - } - @Override public SeriesRecord copy() { return new SeriesRecord(this); diff --git a/src/java/org/apache/poi/hssf/record/chart/TickRecord.java b/src/java/org/apache/poi/hssf/record/chart/TickRecord.java index e9d2bc70e1..434f9aa74e 100644 --- a/src/java/org/apache/poi/hssf/record/chart/TickRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/TickRecord.java @@ -30,7 +30,6 @@ import org.apache.poi.hssf.record.StandardRecord; import org.apache.poi.util.BitField; import org.apache.poi.util.BitFieldFactory; import org.apache.poi.util.LittleEndianOutput; -import org.apache.poi.util.Removal; /** * The Tick record defines how tick marks and label positioning/formatting

@@ -115,17 +114,6 @@ public final class TickRecord extends StandardRecord { return sid; } - /** - * @deprecated use {@link #copy()} instead - */ - @Override - @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) - @Deprecated - @Removal(version = "5.0.0") - public TickRecord clone() { - return copy(); - } - @Override public TickRecord copy() { return new TickRecord(this); diff --git a/src/java/org/apache/poi/hssf/record/chart/UnitsRecord.java b/src/java/org/apache/poi/hssf/record/chart/UnitsRecord.java index 60fc4fbb17..4293bb9fde 100644 --- a/src/java/org/apache/poi/hssf/record/chart/UnitsRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/UnitsRecord.java @@ -62,7 +62,6 @@ public final class UnitsRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/chart/ValueRangeRecord.java b/src/java/org/apache/poi/hssf/record/chart/ValueRangeRecord.java index 8538016b5b..945bd5c2b0 100644 --- a/src/java/org/apache/poi/hssf/record/chart/ValueRangeRecord.java +++ b/src/java/org/apache/poi/hssf/record/chart/ValueRangeRecord.java @@ -94,7 +94,6 @@ public final class ValueRangeRecord extends StandardRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/common/ExtendedColor.java b/src/java/org/apache/poi/hssf/record/common/ExtendedColor.java index fa8cbe4d69..8c790b20c5 100644 --- a/src/java/org/apache/poi/hssf/record/common/ExtendedColor.java +++ b/src/java/org/apache/poi/hssf/record/common/ExtendedColor.java @@ -170,7 +170,6 @@ public final class ExtendedColor implements Duplicatable, GenericRecord { /** * @deprecated use {@link #copy()} instead */ - @Override @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) @Deprecated @Removal(version = "5.0.0") diff --git a/src/java/org/apache/poi/hssf/record/common/FtrHeader.java b/src/java/org/apache/poi/hssf/record/common/FtrHeader.java index 05367d92de..fbf46f9d01 100644 --- a/src/java/org/apache/poi/hssf/record/common/FtrHeader.java +++ b/src/java/org/apache/poi/hssf/record/common/FtrHeader.java @@ -27,7 +27,6 @@ import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.util.GenericRecordJsonWriter; import org.apache.poi.util.GenericRecordUtil; import org.apache.poi.util.LittleEndianOutput; -import org.apache.poi.util.Removal; /** * Title: FtrHeader (Future Record Header) common record part @@ -96,17 +95,6 @@ public final class FtrHeader implements Duplicatable, GenericRecord { this.associatedRange = associatedRange; } - /** - * @deprecated use {@link #copy()} instead - */ - @Override - @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"}) - @Deprecated - @Removal(version = "5.0.0") - public FtrHeader clone() { - return copy(); - } - public FtrHeader copy() { return new FtrHeader(this); } diff --git a/src/java/org/apache/poi/hssf/record/common/UnicodeString.java b/src/java/org/apache/poi/hssf/record/common/UnicodeString.java index c7ed578401..5dfb91ae3f 100644 --- a/src/java/org/apache/poi/hssf/record/common/UnicodeString.java +++ b/src/java/org/apache/poi/hssf/record/common/UnicodeString.java @@ -36,7 +36,6 @@ import org.apache.poi.util.BitFieldFactory; import org.apache.poi.util.GenericRecordUtil; import org.apache.poi.util.POILogFactory; import org.apache.poi.util.POILogger; -import org.apache.poi.util.Removal; /** * Unicode String - just standard fields that are in several records. @@ -497,17 +496,6 @@ public class UnicodeString implements Comparable, Duplicatable, G return extBit.isSet(getOptionFlags()); } - /** - * @deprecated use {@link #copy()} instead - */ - @Override - @SuppressWarnings("squid:S2975") - @Deprecated - @Removal(version = "5.0.0") - public UnicodeString clone() { - return copy(); - } - @Override public UnicodeString copy() { return new UnicodeString(this); diff --git a/src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java b/src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java index ee0615057d..f9ec1e839d 100644 --- a/src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java +++ b/src/java/org/apache/poi/ss/formula/BaseFormulaEvaluator.java @@ -27,7 +27,6 @@ import org.apache.poi.ss.usermodel.RichTextString; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; -import org.apache.poi.util.Removal; /** * Common functionality across file formats for evaluating formula cells.

@@ -187,34 +186,6 @@ public abstract class BaseFormulaEvaluator implements FormulaEvaluator, Workbook setCellValue(cell, cv); return cv.getCellType(); } - - /** - * If cell contains formula, it evaluates the formula, - * and saves the result of the formula. The cell - * remains as a formula cell. - * Else if cell does not contain formula, this method leaves - * the cell unchanged. - * Note that the type of the formula result is returned, - * so you know what kind of value is also stored with - * the formula. - * 

-     * CellType evaluatedCellType = evaluator.evaluateFormulaCell(cell);
-     *
- * Be aware that your cell will hold both the formula, - * and the result. If you want the cell replaced with - * the result of the formula, use {@link #evaluate(org.apache.poi.ss.usermodel.Cell)} } - * @param cell The cell to evaluate - * @return The type of the formula result (the cell's type remains as CellType.FORMULA however) - * If cell is not a formula cell, returns {@link CellType#_NONE} rather than throwing an exception. - * @since POI 3.15 beta 3 - * @deprecated use evaluateFormulaCell(cell) instead - */ - @Deprecated - @Removal(version = "4.2") - @Override - public CellType evaluateFormulaCellEnum(Cell cell) { - return evaluateFormulaCell(cell); - } /** * set the cell type diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFXmlColumnPr.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFXmlColumnPr.java index e0032219f5..6fad3dd567 100644 --- a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFXmlColumnPr.java +++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFXmlColumnPr.java @@ -18,7 +18,6 @@ package org.apache.poi.xssf.usermodel.helpers; import org.apache.poi.util.Internal; -import org.apache.poi.util.Removal; import org.apache.poi.xssf.usermodel.XSSFTable; import org.apache.poi.xssf.usermodel.XSSFTableColumn; import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTXmlColumnPr; @@ -72,19 +71,6 @@ public class XSSFXmlColumnPr { return ctXmlColumnPr.getXpath(); } - /** - * (see Open Office XML Part 4: chapter 3.5.1.3) - * - * @deprecated Use {@link XSSFTableColumn#getId()} instead. - * - * @return An integer representing the unique identifier of this column. - */ - @Deprecated - @Removal(version="4.2") - public long getId() { - return tableColumn.getId(); - } - /** * If the XPath is, for example, /Node1/Node2/Node3 and /Node1/Node2 is the common XPath for the table, the local XPath is /Node3 * diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java index b423708554..bbc49aea1f 100644 --- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java +++ b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFRun.java @@ -676,22 +676,6 @@ public class XWPFRun implements ISDTContents, IRunElement, CharacterRun { emboss.setVal(value ? STOnOff.TRUE : STOnOff.FALSE); } - /** - * Specifies the alignment which shall be applied to the contents of this - * run in relation to the default appearance of the run's text. - * This allows the text to be repositioned as subscript or superscript without - * altering the font size of the run properties. - * - * @return VerticalAlign - * @see {@link VerticalAlign} all possible value that could be applyed to this run - * @deprecated use {@link XWPFRun.getVerticalAlignment} - */ - @Removal(version = "4.2") - public VerticalAlign getSubscript() { - CTRPr pr = getRunProperties(false); - return (pr != null && pr.isSetVertAlign()) ? VerticalAlign.valueOf(pr.getVertAlign().getVal().intValue()) : VerticalAlign.BASELINE; - } - /** * Specifies the alignment which shall be applied to the contents of this * run in relation to the default appearance of the run's text. This allows