From ad73704e81efd7b4f63a7e8063f9f2bd48d8281f Mon Sep 17 00:00:00 2001
From: Andreas Beeker <kiwiwings@apache.org>
Date: Wed, 22 Apr 2020 21:25:25 +0000
Subject: [PATCH] Sonar fix - "Add the missing @deprecated Javadoc tag."

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1876854 13f79535-47bb-0310-9956-ffa450edef68
---
 src/java/org/apache/poi/ddf/AbstractEscherOptRecord.java  | 3 +++
 src/java/org/apache/poi/ddf/EscherComplexProperty.java    | 4 ++++
 .../poi/hssf/record/AbstractEscherHolderRecord.java       | 5 ++++-
 src/java/org/apache/poi/hssf/record/ArrayRecord.java      | 3 +++
 .../org/apache/poi/hssf/record/AutoFilterInfoRecord.java  | 3 +++
 src/java/org/apache/poi/hssf/record/BOFRecord.java        | 3 +++
 src/java/org/apache/poi/hssf/record/BlankRecord.java      | 3 +++
 src/java/org/apache/poi/hssf/record/BoolErrRecord.java    | 3 +++
 .../org/apache/poi/hssf/record/BottomMarginRecord.java    | 3 +++
 src/java/org/apache/poi/hssf/record/CFHeader12Record.java | 3 +++
 src/java/org/apache/poi/hssf/record/CFHeaderBase.java     | 3 +++
 src/java/org/apache/poi/hssf/record/CFHeaderRecord.java   | 3 +++
 src/java/org/apache/poi/hssf/record/CFRule12Record.java   | 3 +++
 src/java/org/apache/poi/hssf/record/CFRuleBase.java       | 3 +++
 src/java/org/apache/poi/hssf/record/CFRuleRecord.java     | 3 +++
 src/java/org/apache/poi/hssf/record/CalcCountRecord.java  | 3 +++
 src/java/org/apache/poi/hssf/record/CalcModeRecord.java   | 3 +++
 src/java/org/apache/poi/hssf/record/ColumnInfoRecord.java | 3 +++
 .../apache/poi/hssf/record/CommonObjectDataSubRecord.java | 3 +++
 src/java/org/apache/poi/hssf/record/ContinueRecord.java   | 3 +++
 src/java/org/apache/poi/hssf/record/DBCellRecord.java     | 3 +++
 src/java/org/apache/poi/hssf/record/DVALRecord.java       | 3 +++
 src/java/org/apache/poi/hssf/record/DVRecord.java         | 3 +++
 .../org/apache/poi/hssf/record/DefaultColWidthRecord.java | 3 +++
 .../apache/poi/hssf/record/DefaultRowHeightRecord.java    | 3 +++
 src/java/org/apache/poi/hssf/record/DeltaRecord.java      | 3 +++
 src/java/org/apache/poi/hssf/record/DimensionsRecord.java | 3 +++
 .../apache/poi/hssf/record/DrawingSelectionRecord.java    | 3 +++
 src/java/org/apache/poi/hssf/record/EOFRecord.java        | 3 +++
 .../poi/hssf/record/EmbeddedObjectRefSubRecord.java       | 3 +++
 src/java/org/apache/poi/hssf/record/EndSubRecord.java     | 3 +++
 src/java/org/apache/poi/hssf/record/FeatHdrRecord.java    | 3 +++
 src/java/org/apache/poi/hssf/record/FeatRecord.java       | 3 +++
 src/java/org/apache/poi/hssf/record/FilePassRecord.java   | 3 +++
 .../org/apache/poi/hssf/record/FileSharingRecord.java     | 3 +++
 src/java/org/apache/poi/hssf/record/FooterRecord.java     | 3 +++
 src/java/org/apache/poi/hssf/record/FormatRecord.java     | 3 +++
 src/java/org/apache/poi/hssf/record/FormulaRecord.java    | 3 +++
 src/java/org/apache/poi/hssf/record/FtCblsSubRecord.java  | 3 +++
 src/java/org/apache/poi/hssf/record/FtCfSubRecord.java    | 3 +++
 .../org/apache/poi/hssf/record/FtPioGrbitSubRecord.java   | 3 +++
 src/java/org/apache/poi/hssf/record/GridsetRecord.java    | 3 +++
 .../org/apache/poi/hssf/record/GroupMarkerSubRecord.java  | 3 +++
 src/java/org/apache/poi/hssf/record/GutsRecord.java       | 3 +++
 src/java/org/apache/poi/hssf/record/HCenterRecord.java    | 3 +++
 .../org/apache/poi/hssf/record/HeaderFooterRecord.java    | 3 +++
 src/java/org/apache/poi/hssf/record/HeaderRecord.java     | 3 +++
 .../apache/poi/hssf/record/HorizontalPageBreakRecord.java | 3 +++
 src/java/org/apache/poi/hssf/record/HyperlinkRecord.java  | 3 +++
 src/java/org/apache/poi/hssf/record/IndexRecord.java      | 3 +++
 src/java/org/apache/poi/hssf/record/IterationRecord.java  | 3 +++
 src/java/org/apache/poi/hssf/record/LabelRecord.java      | 3 +++
 src/java/org/apache/poi/hssf/record/LabelSSTRecord.java   | 3 +++
 src/java/org/apache/poi/hssf/record/LbsDataSubRecord.java | 3 +++
 src/java/org/apache/poi/hssf/record/LeftMarginRecord.java | 3 +++
 src/java/org/apache/poi/hssf/record/Margin.java           | 8 ++++----
 src/java/org/apache/poi/hssf/record/MergeCellsRecord.java | 3 +++
 src/java/org/apache/poi/hssf/record/MulBlankRecord.java   | 3 +++
 src/java/org/apache/poi/hssf/record/NoteRecord.java       | 3 +++
 .../apache/poi/hssf/record/NoteStructureSubRecord.java    | 3 +++
 src/java/org/apache/poi/hssf/record/NumberRecord.java     | 3 +++
 src/java/org/apache/poi/hssf/record/ObjRecord.java        | 3 +++
 .../org/apache/poi/hssf/record/ObjectProtectRecord.java   | 3 +++
 src/java/org/apache/poi/hssf/record/PaneRecord.java       | 3 +++
 src/java/org/apache/poi/hssf/record/PasswordRecord.java   | 3 +++
 .../org/apache/poi/hssf/record/PrintGridlinesRecord.java  | 3 +++
 .../org/apache/poi/hssf/record/PrintHeadersRecord.java    | 3 +++
 src/java/org/apache/poi/hssf/record/PrintSetupRecord.java | 3 +++
 src/java/org/apache/poi/hssf/record/ProtectRecord.java    | 3 +++
 src/java/org/apache/poi/hssf/record/RKRecord.java         | 3 +++
 src/java/org/apache/poi/hssf/record/RefModeRecord.java    | 3 +++
 src/java/org/apache/poi/hssf/record/RefreshAllRecord.java | 3 +++
 .../org/apache/poi/hssf/record/RightMarginRecord.java     | 3 +++
 src/java/org/apache/poi/hssf/record/RowRecord.java        | 3 +++
 src/java/org/apache/poi/hssf/record/SCLRecord.java        | 3 +++
 src/java/org/apache/poi/hssf/record/SaveRecalcRecord.java | 3 +++
 .../org/apache/poi/hssf/record/ScenarioProtectRecord.java | 3 +++
 src/java/org/apache/poi/hssf/record/SelectionRecord.java  | 3 +++
 .../org/apache/poi/hssf/record/SharedFormulaRecord.java   | 3 +++
 src/java/org/apache/poi/hssf/record/StringRecord.java     | 3 +++
 src/java/org/apache/poi/hssf/record/SubRecord.java        | 3 +++
 src/java/org/apache/poi/hssf/record/TextObjectRecord.java | 3 +++
 src/java/org/apache/poi/hssf/record/TopMarginRecord.java  | 3 +++
 src/java/org/apache/poi/hssf/record/UnknownRecord.java    | 3 +++
 src/java/org/apache/poi/hssf/record/UseSelFSRecord.java   | 3 +++
 src/java/org/apache/poi/hssf/record/UserSViewBegin.java   | 3 +++
 src/java/org/apache/poi/hssf/record/UserSViewEnd.java     | 3 +++
 src/java/org/apache/poi/hssf/record/VCenterRecord.java    | 3 +++
 .../apache/poi/hssf/record/VerticalPageBreakRecord.java   | 3 +++
 src/java/org/apache/poi/hssf/record/WSBoolRecord.java     | 3 +++
 .../org/apache/poi/hssf/record/WindowProtectRecord.java   | 3 +++
 src/java/org/apache/poi/hssf/record/WindowTwoRecord.java  | 3 +++
 .../record/aggregates/ColumnInfoRecordsAggregate.java     | 3 +++
 .../poi/hssf/record/aggregates/ValueRecordsAggregate.java | 4 ++++
 .../org/apache/poi/hssf/record/cf/BorderFormatting.java   | 3 +++
 .../poi/hssf/record/cf/ColorGradientFormatting.java       | 3 +++
 .../apache/poi/hssf/record/cf/ColorGradientThreshold.java | 3 +++
 .../org/apache/poi/hssf/record/cf/DataBarFormatting.java  | 3 +++
 .../org/apache/poi/hssf/record/cf/DataBarThreshold.java   | 3 +++
 .../org/apache/poi/hssf/record/cf/FontFormatting.java     | 3 +++
 .../poi/hssf/record/cf/IconMultiStateFormatting.java      | 3 +++
 .../poi/hssf/record/cf/IconMultiStateThreshold.java       | 3 +++
 .../org/apache/poi/hssf/record/cf/PatternFormatting.java  | 3 +++
 .../apache/poi/hssf/record/chart/AreaFormatRecord.java    | 3 +++
 src/java/org/apache/poi/hssf/record/chart/AreaRecord.java | 3 +++
 .../poi/hssf/record/chart/AxisLineFormatRecord.java       | 3 +++
 .../apache/poi/hssf/record/chart/AxisOptionsRecord.java   | 3 +++
 .../apache/poi/hssf/record/chart/AxisParentRecord.java    | 3 +++
 src/java/org/apache/poi/hssf/record/chart/AxisRecord.java | 3 +++
 .../org/apache/poi/hssf/record/chart/AxisUsedRecord.java  | 3 +++
 src/java/org/apache/poi/hssf/record/chart/BarRecord.java  | 3 +++
 .../org/apache/poi/hssf/record/chart/BeginRecord.java     | 3 +++
 .../poi/hssf/record/chart/CategorySeriesAxisRecord.java   | 3 +++
 .../apache/poi/hssf/record/chart/ChartEndBlockRecord.java | 3 +++
 .../org/apache/poi/hssf/record/chart/ChartRecord.java     | 3 +++
 .../poi/hssf/record/chart/ChartStartBlockRecord.java      | 3 +++
 src/java/org/apache/poi/hssf/record/chart/DatRecord.java  | 3 +++
 .../apache/poi/hssf/record/chart/DataFormatRecord.java    | 3 +++
 .../chart/DefaultDataLabelTextPropertiesRecord.java       | 3 +++
 src/java/org/apache/poi/hssf/record/chart/EndRecord.java  | 3 +++
 .../org/apache/poi/hssf/record/chart/FontBasisRecord.java | 3 +++
 .../org/apache/poi/hssf/record/chart/FontIndexRecord.java | 3 +++
 .../org/apache/poi/hssf/record/chart/FrameRecord.java     | 3 +++
 .../org/apache/poi/hssf/record/chart/LegendRecord.java    | 3 +++
 .../apache/poi/hssf/record/chart/LineFormatRecord.java    | 3 +++
 .../apache/poi/hssf/record/chart/LinkedDataRecord.java    | 3 +++
 .../poi/hssf/record/chart/NumberFormatIndexRecord.java    | 3 +++
 .../apache/poi/hssf/record/chart/ObjectLinkRecord.java    | 3 +++
 .../org/apache/poi/hssf/record/chart/PlotAreaRecord.java  | 3 +++
 .../apache/poi/hssf/record/chart/PlotGrowthRecord.java    | 3 +++
 .../hssf/record/chart/SeriesChartGroupIndexRecord.java    | 3 +++
 .../apache/poi/hssf/record/chart/SeriesIndexRecord.java   | 3 +++
 .../apache/poi/hssf/record/chart/SeriesLabelsRecord.java  | 3 +++
 .../apache/poi/hssf/record/chart/SeriesListRecord.java    | 3 +++
 .../org/apache/poi/hssf/record/chart/SeriesRecord.java    | 3 +++
 .../apache/poi/hssf/record/chart/SeriesTextRecord.java    | 3 +++
 .../poi/hssf/record/chart/SheetPropertiesRecord.java      | 3 +++
 src/java/org/apache/poi/hssf/record/chart/TickRecord.java | 3 +++
 .../org/apache/poi/hssf/record/chart/UnitsRecord.java     | 3 +++
 .../apache/poi/hssf/record/chart/ValueRangeRecord.java    | 3 +++
 .../org/apache/poi/hssf/record/common/ExtendedColor.java  | 3 +++
 src/java/org/apache/poi/hssf/record/common/FtrHeader.java | 3 +++
 .../org/apache/poi/hssf/record/common/UnicodeString.java  | 3 +++
 143 files changed, 433 insertions(+), 5 deletions(-)

diff --git a/src/java/org/apache/poi/ddf/AbstractEscherOptRecord.java b/src/java/org/apache/poi/ddf/AbstractEscherOptRecord.java
index 1563363f10..dd98cc11e0 100644
--- a/src/java/org/apache/poi/ddf/AbstractEscherOptRecord.java
+++ b/src/java/org/apache/poi/ddf/AbstractEscherOptRecord.java
@@ -153,6 +153,9 @@ public abstract class AbstractEscherOptRecord extends EscherRecord {
         sortProperties();
     }
 
+    /**
+     * @deprecated use {@link #removeEscherProperty(EscherPropertyTypes)} instead
+     */
     @Deprecated
     @Removal(version = "5.0.0")
     public void removeEscherProperty(int num){
diff --git a/src/java/org/apache/poi/ddf/EscherComplexProperty.java b/src/java/org/apache/poi/ddf/EscherComplexProperty.java
index 47e8582ae3..fc8e75b978 100644
--- a/src/java/org/apache/poi/ddf/EscherComplexProperty.java
+++ b/src/java/org/apache/poi/ddf/EscherComplexProperty.java
@@ -44,6 +44,8 @@ public class EscherComplexProperty extends EscherProperty {
      * @param id          The id consists of the property number, a flag indicating whether this is a blip id and a flag
      *                    indicating that this is a complex property.
      * @param complexData The value of this property.
+     *
+     * @deprecated use {@link #EscherComplexProperty(short, int)} and {@link #setComplexData(byte[])} instead
      */
     @Deprecated
     @Removal(version = "5.0.0")
@@ -59,6 +61,8 @@ public class EscherComplexProperty extends EscherProperty {
      * @param propertyNumber The property number
      * @param isBlipId       Whether this is a blip id.  Should be false.
      * @param complexData    The value of this complex property.
+     *
+     * @deprecated use {@link #EscherComplexProperty(EscherPropertyTypes, boolean, int)} and {@link #setComplexData(byte[])} instead
      */
     @Deprecated
     @Removal(version = "5.0.0")
diff --git a/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java b/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java
index 7289eda2f1..f23df355c3 100644
--- a/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java
+++ b/src/java/org/apache/poi/hssf/record/AbstractEscherHolderRecord.java
@@ -126,8 +126,11 @@ public abstract class AbstractEscherHolderRecord extends Record {
     @Override
     public abstract short getSid();
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
-    @SuppressWarnings("squid:S2975")
+    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
     @Removal(version = "5.0.0")
     public AbstractEscherHolderRecord clone() {
diff --git a/src/java/org/apache/poi/hssf/record/ArrayRecord.java b/src/java/org/apache/poi/hssf/record/ArrayRecord.java
index 1f3bab38d8..aeff00ca72 100644
--- a/src/java/org/apache/poi/hssf/record/ArrayRecord.java
+++ b/src/java/org/apache/poi/hssf/record/ArrayRecord.java
@@ -89,6 +89,9 @@ public final class ArrayRecord extends SharedValueRecordBase {
 		return sid;
 	}
 
+	/**
+	 * @deprecated use {@link #copy()} instead
+	 */
 	@Override
 	@SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
 	@Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/AutoFilterInfoRecord.java b/src/java/org/apache/poi/hssf/record/AutoFilterInfoRecord.java
index c30f648271..a0bb68d76a 100644
--- a/src/java/org/apache/poi/hssf/record/AutoFilterInfoRecord.java
+++ b/src/java/org/apache/poi/hssf/record/AutoFilterInfoRecord.java
@@ -84,6 +84,9 @@ public final class AutoFilterInfoRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/BOFRecord.java b/src/java/org/apache/poi/hssf/record/BOFRecord.java
index 8df3c2d0ad..e197d0ab89 100644
--- a/src/java/org/apache/poi/hssf/record/BOFRecord.java
+++ b/src/java/org/apache/poi/hssf/record/BOFRecord.java
@@ -262,6 +262,9 @@ public final class BOFRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/BlankRecord.java b/src/java/org/apache/poi/hssf/record/BlankRecord.java
index 3b99e5cc8b..1c2aff8e1d 100644
--- a/src/java/org/apache/poi/hssf/record/BlankRecord.java
+++ b/src/java/org/apache/poi/hssf/record/BlankRecord.java
@@ -132,6 +132,9 @@ public final class BlankRecord extends StandardRecord implements CellValueRecord
         return 6;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/BoolErrRecord.java b/src/java/org/apache/poi/hssf/record/BoolErrRecord.java
index 430e51f78d..d54ac52b49 100644
--- a/src/java/org/apache/poi/hssf/record/BoolErrRecord.java
+++ b/src/java/org/apache/poi/hssf/record/BoolErrRecord.java
@@ -178,6 +178,9 @@ public final class BoolErrRecord extends CellRecord {
 		return sid;
 	}
 
+	/**
+	 * @deprecated use {@link #copy()} instead
+	 */
 	@Override
 	@SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
 	@Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java b/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java
index a3ba5a7315..aeb7cbf788 100644
--- a/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java
+++ b/src/java/org/apache/poi/hssf/record/BottomMarginRecord.java
@@ -74,6 +74,9 @@ public final class BottomMarginRecord extends StandardRecord implements Margin {
         this.field_1_margin = field_1_margin;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/CFHeader12Record.java b/src/java/org/apache/poi/hssf/record/CFHeader12Record.java
index 04edf28c5d..2b3b3fd954 100644
--- a/src/java/org/apache/poi/hssf/record/CFHeader12Record.java
+++ b/src/java/org/apache/poi/hssf/record/CFHeader12Record.java
@@ -89,6 +89,9 @@ public final class CFHeader12Record extends CFHeaderBase implements FutureRecord
         return futureHeader.getAssociatedRange();
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/CFHeaderBase.java b/src/java/org/apache/poi/hssf/record/CFHeaderBase.java
index 90f460e451..e50d5421a6 100644
--- a/src/java/org/apache/poi/hssf/record/CFHeaderBase.java
+++ b/src/java/org/apache/poi/hssf/record/CFHeaderBase.java
@@ -146,6 +146,9 @@ public abstract class CFHeaderBase extends StandardRecord {
         field_4_cell_ranges.serialize(out);
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java b/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java
index 8fe78550cc..19e67a476c 100644
--- a/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java
+++ b/src/java/org/apache/poi/hssf/record/CFHeaderRecord.java
@@ -52,6 +52,9 @@ public final class CFHeaderRecord extends CFHeaderBase {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/CFRule12Record.java b/src/java/org/apache/poi/hssf/record/CFRule12Record.java
index 7f33cb4127..bd4805cc32 100644
--- a/src/java/org/apache/poi/hssf/record/CFRule12Record.java
+++ b/src/java/org/apache/poi/hssf/record/CFRule12Record.java
@@ -449,6 +449,9 @@ public final class CFRule12Record extends CFRuleBase implements FutureRecord {
         return len;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/CFRuleBase.java b/src/java/org/apache/poi/hssf/record/CFRuleBase.java
index b669a4d537..6fd5728d81 100644
--- a/src/java/org/apache/poi/hssf/record/CFRuleBase.java
+++ b/src/java/org/apache/poi/hssf/record/CFRuleBase.java
@@ -462,6 +462,9 @@ 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
diff --git a/src/java/org/apache/poi/hssf/record/CFRuleRecord.java b/src/java/org/apache/poi/hssf/record/CFRuleRecord.java
index ed65ef08a0..3d2fb83926 100644
--- a/src/java/org/apache/poi/hssf/record/CFRuleRecord.java
+++ b/src/java/org/apache/poi/hssf/record/CFRuleRecord.java
@@ -132,6 +132,9 @@ public final class CFRuleRecord extends CFRuleBase {
                getFormulaSize(getFormula2());
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/CalcCountRecord.java b/src/java/org/apache/poi/hssf/record/CalcCountRecord.java
index 15a4f2404e..8b8d48ab9f 100644
--- a/src/java/org/apache/poi/hssf/record/CalcCountRecord.java
+++ b/src/java/org/apache/poi/hssf/record/CalcCountRecord.java
@@ -86,6 +86,9 @@ public final class CalcCountRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/CalcModeRecord.java b/src/java/org/apache/poi/hssf/record/CalcModeRecord.java
index 566833ce24..4ad145595f 100644
--- a/src/java/org/apache/poi/hssf/record/CalcModeRecord.java
+++ b/src/java/org/apache/poi/hssf/record/CalcModeRecord.java
@@ -101,6 +101,9 @@ public final class CalcModeRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/ColumnInfoRecord.java b/src/java/org/apache/poi/hssf/record/ColumnInfoRecord.java
index fd8809b82d..4f0e9bac4e 100644
--- a/src/java/org/apache/poi/hssf/record/ColumnInfoRecord.java
+++ b/src/java/org/apache/poi/hssf/record/ColumnInfoRecord.java
@@ -239,6 +239,9 @@ public final class ColumnInfoRecord extends StandardRecord {
         return 12;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java b/src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java
index bcd714421e..b9797905df 100644
--- a/src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java
+++ b/src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java
@@ -136,6 +136,9 @@ public final class CommonObjectDataSubRecord extends SubRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/ContinueRecord.java b/src/java/org/apache/poi/hssf/record/ContinueRecord.java
index 3d74a3d107..28f9b7b175 100644
--- a/src/java/org/apache/poi/hssf/record/ContinueRecord.java
+++ b/src/java/org/apache/poi/hssf/record/ContinueRecord.java
@@ -66,6 +66,9 @@ public final class ContinueRecord extends StandardRecord {
         _data = in.readRemainder();
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/DBCellRecord.java b/src/java/org/apache/poi/hssf/record/DBCellRecord.java
index 1f35f94159..fe24f3accd 100644
--- a/src/java/org/apache/poi/hssf/record/DBCellRecord.java
+++ b/src/java/org/apache/poi/hssf/record/DBCellRecord.java
@@ -67,6 +67,9 @@ public final class DBCellRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/DVALRecord.java b/src/java/org/apache/poi/hssf/record/DVALRecord.java
index afe8d5687f..93b4bb641c 100644
--- a/src/java/org/apache/poi/hssf/record/DVALRecord.java
+++ b/src/java/org/apache/poi/hssf/record/DVALRecord.java
@@ -155,6 +155,9 @@ public final class DVALRecord extends StandardRecord {
         return sid;
     }
 
+	/**
+	 * @deprecated use {@link #copy()} instead
+	 */
 	@Override
 	@SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
 	@Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/DVRecord.java b/src/java/org/apache/poi/hssf/record/DVRecord.java
index 9cd8569f52..5f1598fb9e 100644
--- a/src/java/org/apache/poi/hssf/record/DVRecord.java
+++ b/src/java/org/apache/poi/hssf/record/DVRecord.java
@@ -331,6 +331,9 @@ public final class DVRecord extends StandardRecord {
 		return sid;
 	}
 
+	/**
+	 * @deprecated use {@link #copy()} instead
+	 */
 	@Override
 	@SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
 	@Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java b/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java
index 96750006aa..e51a2ceabc 100644
--- a/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java
+++ b/src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java
@@ -86,6 +86,9 @@ public final class DefaultColWidthRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java b/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java
index db2ea7517d..5d0d5ed539 100644
--- a/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java
+++ b/src/java/org/apache/poi/hssf/record/DefaultRowHeightRecord.java
@@ -110,6 +110,9 @@ public final class DefaultRowHeightRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/DeltaRecord.java b/src/java/org/apache/poi/hssf/record/DeltaRecord.java
index b1a145870d..01bac3b6cc 100644
--- a/src/java/org/apache/poi/hssf/record/DeltaRecord.java
+++ b/src/java/org/apache/poi/hssf/record/DeltaRecord.java
@@ -66,6 +66,9 @@ public final class DeltaRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/DimensionsRecord.java b/src/java/org/apache/poi/hssf/record/DimensionsRecord.java
index 3b937e06d9..9580f6ef4a 100644
--- a/src/java/org/apache/poi/hssf/record/DimensionsRecord.java
+++ b/src/java/org/apache/poi/hssf/record/DimensionsRecord.java
@@ -166,6 +166,9 @@ public final class DimensionsRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/DrawingSelectionRecord.java b/src/java/org/apache/poi/hssf/record/DrawingSelectionRecord.java
index 5f02ed75d8..894ac930c4 100644
--- a/src/java/org/apache/poi/hssf/record/DrawingSelectionRecord.java
+++ b/src/java/org/apache/poi/hssf/record/DrawingSelectionRecord.java
@@ -114,6 +114,9 @@ public final class DrawingSelectionRecord extends StandardRecord {
 		}
 	}
 
+	/**
+	 * @deprecated use {@link #copy()} instead
+	 */
 	@Override
 	@SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
 	@Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/EOFRecord.java b/src/java/org/apache/poi/hssf/record/EOFRecord.java
index 540d43e8a0..d9097fc430 100644
--- a/src/java/org/apache/poi/hssf/record/EOFRecord.java
+++ b/src/java/org/apache/poi/hssf/record/EOFRecord.java
@@ -53,6 +53,9 @@ public final class EOFRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java b/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java
index 124584e675..5ef7fdfcd9 100644
--- a/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java
+++ b/src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java
@@ -320,6 +320,9 @@ public final class EmbeddedObjectRefSubRecord extends SubRecord {
 		return field_6_unknown;
 	}
 
+	/**
+	 * @deprecated use {@link #copy()} instead
+	 */
 	@Override
 	@SuppressWarnings("squid:S2975")
 	@Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/EndSubRecord.java b/src/java/org/apache/poi/hssf/record/EndSubRecord.java
index fb83b6f4cc..4158dd6ea9 100644
--- a/src/java/org/apache/poi/hssf/record/EndSubRecord.java
+++ b/src/java/org/apache/poi/hssf/record/EndSubRecord.java
@@ -70,6 +70,9 @@ public final class EndSubRecord extends SubRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/FeatHdrRecord.java b/src/java/org/apache/poi/hssf/record/FeatHdrRecord.java
index fc25f380c9..c46551f79e 100644
--- a/src/java/org/apache/poi/hssf/record/FeatHdrRecord.java
+++ b/src/java/org/apache/poi/hssf/record/FeatHdrRecord.java
@@ -112,6 +112,9 @@ public final class FeatHdrRecord extends StandardRecord {
 		return 12 + 2+1+4+rgbHdrData.length;
 	}
 
+	/**
+	 * @deprecated use {@link #copy()} instead
+	 */
 	@Override
 	@SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
 	@Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/FeatRecord.java b/src/java/org/apache/poi/hssf/record/FeatRecord.java
index de412227d4..d955a911d3 100644
--- a/src/java/org/apache/poi/hssf/record/FeatRecord.java
+++ b/src/java/org/apache/poi/hssf/record/FeatRecord.java
@@ -181,6 +181,9 @@ public final class FeatRecord extends StandardRecord {
 		}
 	}
 
+	/**
+	 * @deprecated use {@link #copy()} instead
+	 */
 	@Override
 	@SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
 	@Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/FilePassRecord.java b/src/java/org/apache/poi/hssf/record/FilePassRecord.java
index 614018dc19..2054dedf13 100644
--- a/src/java/org/apache/poi/hssf/record/FilePassRecord.java
+++ b/src/java/org/apache/poi/hssf/record/FilePassRecord.java
@@ -138,6 +138,9 @@ public final class FilePassRecord extends StandardRecord {
 		return sid;
 	}
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/FileSharingRecord.java b/src/java/org/apache/poi/hssf/record/FileSharingRecord.java
index b49bca0f23..66f0af1987 100644
--- a/src/java/org/apache/poi/hssf/record/FileSharingRecord.java
+++ b/src/java/org/apache/poi/hssf/record/FileSharingRecord.java
@@ -133,6 +133,9 @@ public final class FileSharingRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/FooterRecord.java b/src/java/org/apache/poi/hssf/record/FooterRecord.java
index 4af7b2c217..e41d889d8c 100644
--- a/src/java/org/apache/poi/hssf/record/FooterRecord.java
+++ b/src/java/org/apache/poi/hssf/record/FooterRecord.java
@@ -41,6 +41,9 @@ public final class FooterRecord extends HeaderFooterBase {
 		return sid;
 	}
 
+	/**
+	 * @deprecated use {@link #copy()} instead
+	 */
 	@Override
 	@SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
 	@Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/FormatRecord.java b/src/java/org/apache/poi/hssf/record/FormatRecord.java
index 92a4898b08..3e34b77686 100644
--- a/src/java/org/apache/poi/hssf/record/FormatRecord.java
+++ b/src/java/org/apache/poi/hssf/record/FormatRecord.java
@@ -107,6 +107,9 @@ public final class FormatRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/FormulaRecord.java b/src/java/org/apache/poi/hssf/record/FormulaRecord.java
index a8b9622102..3c094a92a0 100644
--- a/src/java/org/apache/poi/hssf/record/FormulaRecord.java
+++ b/src/java/org/apache/poi/hssf/record/FormulaRecord.java
@@ -230,6 +230,9 @@ public final class FormulaRecord extends CellRecord {
 		return "FORMULA";
 	}
 
+	/**
+	 * @deprecated use {@link #copy()} instead
+	 */
 	@Override
 	@SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
 	@Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/FtCblsSubRecord.java b/src/java/org/apache/poi/hssf/record/FtCblsSubRecord.java
index 6d739d74b2..df65a451fe 100644
--- a/src/java/org/apache/poi/hssf/record/FtCblsSubRecord.java
+++ b/src/java/org/apache/poi/hssf/record/FtCblsSubRecord.java
@@ -87,6 +87,9 @@ public final class FtCblsSubRecord extends SubRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/FtCfSubRecord.java b/src/java/org/apache/poi/hssf/record/FtCfSubRecord.java
index 8c83c8c699..0dd6fddab2 100644
--- a/src/java/org/apache/poi/hssf/record/FtCfSubRecord.java
+++ b/src/java/org/apache/poi/hssf/record/FtCfSubRecord.java
@@ -99,6 +99,9 @@ public final class FtCfSubRecord extends SubRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/FtPioGrbitSubRecord.java b/src/java/org/apache/poi/hssf/record/FtPioGrbitSubRecord.java
index ffa6a0217e..5569f14ba1 100644
--- a/src/java/org/apache/poi/hssf/record/FtPioGrbitSubRecord.java
+++ b/src/java/org/apache/poi/hssf/record/FtPioGrbitSubRecord.java
@@ -153,6 +153,9 @@ public final class FtPioGrbitSubRecord extends SubRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/GridsetRecord.java b/src/java/org/apache/poi/hssf/record/GridsetRecord.java
index 31bb5ae94d..4ed5d9ec2c 100644
--- a/src/java/org/apache/poi/hssf/record/GridsetRecord.java
+++ b/src/java/org/apache/poi/hssf/record/GridsetRecord.java
@@ -80,6 +80,9 @@ public final class GridsetRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/GroupMarkerSubRecord.java b/src/java/org/apache/poi/hssf/record/GroupMarkerSubRecord.java
index f7e428444f..f92164ff7d 100644
--- a/src/java/org/apache/poi/hssf/record/GroupMarkerSubRecord.java
+++ b/src/java/org/apache/poi/hssf/record/GroupMarkerSubRecord.java
@@ -75,6 +75,9 @@ public final class GroupMarkerSubRecord extends SubRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/GutsRecord.java b/src/java/org/apache/poi/hssf/record/GutsRecord.java
index d96dc71936..4ce3fcdd33 100644
--- a/src/java/org/apache/poi/hssf/record/GutsRecord.java
+++ b/src/java/org/apache/poi/hssf/record/GutsRecord.java
@@ -164,6 +164,9 @@ public final class GutsRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/HCenterRecord.java b/src/java/org/apache/poi/hssf/record/HCenterRecord.java
index 247cdcfdcb..33a0b11592 100644
--- a/src/java/org/apache/poi/hssf/record/HCenterRecord.java
+++ b/src/java/org/apache/poi/hssf/record/HCenterRecord.java
@@ -73,6 +73,9 @@ public final class HCenterRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/HeaderFooterRecord.java b/src/java/org/apache/poi/hssf/record/HeaderFooterRecord.java
index 5589cf5369..58e550ab33 100644
--- a/src/java/org/apache/poi/hssf/record/HeaderFooterRecord.java
+++ b/src/java/org/apache/poi/hssf/record/HeaderFooterRecord.java
@@ -88,6 +88,9 @@ public final class HeaderFooterRecord extends StandardRecord {
         return Arrays.equals(getGuid(), BLANK_GUID);
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/HeaderRecord.java b/src/java/org/apache/poi/hssf/record/HeaderRecord.java
index 84933d3811..37018570d4 100644
--- a/src/java/org/apache/poi/hssf/record/HeaderRecord.java
+++ b/src/java/org/apache/poi/hssf/record/HeaderRecord.java
@@ -41,6 +41,9 @@ public final class HeaderRecord extends HeaderFooterBase {
 		return sid;
 	}
 
+	/**
+	 * @deprecated use {@link #copy()} instead
+	 */
 	@Override
 	@SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
 	@Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/HorizontalPageBreakRecord.java b/src/java/org/apache/poi/hssf/record/HorizontalPageBreakRecord.java
index b55b3968cf..328239d6ca 100644
--- a/src/java/org/apache/poi/hssf/record/HorizontalPageBreakRecord.java
+++ b/src/java/org/apache/poi/hssf/record/HorizontalPageBreakRecord.java
@@ -48,6 +48,9 @@ public final class HorizontalPageBreakRecord extends PageBreakRecord {
 		return sid;
 	}
 
+	/**
+	 * @deprecated use {@link #copy()} instead
+	 */
 	@Override
 	@SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
 	@Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java b/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java
index ec724ef833..3924a68200 100644
--- a/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java
+++ b/src/java/org/apache/poi/hssf/record/HyperlinkRecord.java
@@ -599,6 +599,9 @@ public final class HyperlinkRecord extends StandardRecord {
         setTextMark("");
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/IndexRecord.java b/src/java/org/apache/poi/hssf/record/IndexRecord.java
index 5a25c0700b..43c80f0901 100644
--- a/src/java/org/apache/poi/hssf/record/IndexRecord.java
+++ b/src/java/org/apache/poi/hssf/record/IndexRecord.java
@@ -141,6 +141,9 @@ public final class IndexRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/IterationRecord.java b/src/java/org/apache/poi/hssf/record/IterationRecord.java
index c0e27a10c7..3ce9a711de 100644
--- a/src/java/org/apache/poi/hssf/record/IterationRecord.java
+++ b/src/java/org/apache/poi/hssf/record/IterationRecord.java
@@ -80,6 +80,9 @@ public final class IterationRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/LabelRecord.java b/src/java/org/apache/poi/hssf/record/LabelRecord.java
index 57cd0237f4..acddcfbe50 100644
--- a/src/java/org/apache/poi/hssf/record/LabelRecord.java
+++ b/src/java/org/apache/poi/hssf/record/LabelRecord.java
@@ -177,6 +177,9 @@ public final class LabelRecord extends Record implements CellValueRecordInterfac
     {
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/LabelSSTRecord.java b/src/java/org/apache/poi/hssf/record/LabelSSTRecord.java
index 0fe04a942a..134c266503 100644
--- a/src/java/org/apache/poi/hssf/record/LabelSSTRecord.java
+++ b/src/java/org/apache/poi/hssf/record/LabelSSTRecord.java
@@ -84,6 +84,9 @@ public final class LabelSSTRecord extends CellRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/LbsDataSubRecord.java b/src/java/org/apache/poi/hssf/record/LbsDataSubRecord.java
index 37def8b5c1..db751b084f 100644
--- a/src/java/org/apache/poi/hssf/record/LbsDataSubRecord.java
+++ b/src/java/org/apache/poi/hssf/record/LbsDataSubRecord.java
@@ -281,6 +281,9 @@ public class LbsDataSubRecord extends SubRecord {
         }
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/LeftMarginRecord.java b/src/java/org/apache/poi/hssf/record/LeftMarginRecord.java
index 02fb4b2031..441cb99753 100644
--- a/src/java/org/apache/poi/hssf/record/LeftMarginRecord.java
+++ b/src/java/org/apache/poi/hssf/record/LeftMarginRecord.java
@@ -69,6 +69,9 @@ 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
diff --git a/src/java/org/apache/poi/hssf/record/Margin.java b/src/java/org/apache/poi/hssf/record/Margin.java
index 546db9838a..933eb75e65 100644
--- a/src/java/org/apache/poi/hssf/record/Margin.java
+++ b/src/java/org/apache/poi/hssf/record/Margin.java
@@ -25,15 +25,15 @@ public interface Margin {
 	// TODO - introduce MarginBaseRecord
 	/**
 	 * Get the margin field for the Margin.
-	 * 
+	 *
 	 * @return the margin
 	 */
-	public double getMargin();
+	double getMargin();
 
 	/**
 	 * Set the margin field for the Margin.
-	 * 
+	 *
 	 * @param field_1_margin the margin
 	 */
-	public void setMargin(double field_1_margin);
+	void setMargin(double field_1_margin);
 }
diff --git a/src/java/org/apache/poi/hssf/record/MergeCellsRecord.java b/src/java/org/apache/poi/hssf/record/MergeCellsRecord.java
index 81ebc8764d..b43a6ebac4 100644
--- a/src/java/org/apache/poi/hssf/record/MergeCellsRecord.java
+++ b/src/java/org/apache/poi/hssf/record/MergeCellsRecord.java
@@ -103,6 +103,9 @@ public final class MergeCellsRecord extends StandardRecord {
 		}
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/MulBlankRecord.java b/src/java/org/apache/poi/hssf/record/MulBlankRecord.java
index 86f07b68c1..fee9c7025c 100644
--- a/src/java/org/apache/poi/hssf/record/MulBlankRecord.java
+++ b/src/java/org/apache/poi/hssf/record/MulBlankRecord.java
@@ -119,6 +119,9 @@ public final class MulBlankRecord extends StandardRecord {
 		return 6 + _xfs.length * 2;
 	}
 
+	/**
+	 * @deprecated use {@link #copy()} instead
+	 */
 	@Override
 	@SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
 	@Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/NoteRecord.java b/src/java/org/apache/poi/hssf/record/NoteRecord.java
index e1db23fc19..2a73c545e3 100644
--- a/src/java/org/apache/poi/hssf/record/NoteRecord.java
+++ b/src/java/org/apache/poi/hssf/record/NoteRecord.java
@@ -241,6 +241,9 @@ public final class NoteRecord extends StandardRecord {
       field_5_hasMultibyte = StringUtil.hasMultibyte(author);
 	}
 
+	/**
+	 * @deprecated use {@link #copy()} instead
+	 */
 	@Override
 	@SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
 	@Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/NoteStructureSubRecord.java b/src/java/org/apache/poi/hssf/record/NoteStructureSubRecord.java
index ddac20f063..b2e2b49857 100644
--- a/src/java/org/apache/poi/hssf/record/NoteStructureSubRecord.java
+++ b/src/java/org/apache/poi/hssf/record/NoteStructureSubRecord.java
@@ -99,6 +99,9 @@ public final class NoteStructureSubRecord extends SubRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/NumberRecord.java b/src/java/org/apache/poi/hssf/record/NumberRecord.java
index dd3b29c787..93d6dccb39 100644
--- a/src/java/org/apache/poi/hssf/record/NumberRecord.java
+++ b/src/java/org/apache/poi/hssf/record/NumberRecord.java
@@ -86,6 +86,9 @@ public final class NumberRecord extends CellRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/ObjRecord.java b/src/java/org/apache/poi/hssf/record/ObjRecord.java
index 2450f9a88d..20a3f44065 100644
--- a/src/java/org/apache/poi/hssf/record/ObjRecord.java
+++ b/src/java/org/apache/poi/hssf/record/ObjRecord.java
@@ -215,6 +215,9 @@ public final class ObjRecord extends Record {
         return subrecords.add(o);
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/ObjectProtectRecord.java b/src/java/org/apache/poi/hssf/record/ObjectProtectRecord.java
index 1ddc719f85..a92ddb3b3d 100644
--- a/src/java/org/apache/poi/hssf/record/ObjectProtectRecord.java
+++ b/src/java/org/apache/poi/hssf/record/ObjectProtectRecord.java
@@ -81,6 +81,9 @@ public final class ObjectProtectRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/PaneRecord.java b/src/java/org/apache/poi/hssf/record/PaneRecord.java
index 6e7493b303..f936c90c70 100644
--- a/src/java/org/apache/poi/hssf/record/PaneRecord.java
+++ b/src/java/org/apache/poi/hssf/record/PaneRecord.java
@@ -82,6 +82,9 @@ public final class PaneRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/PasswordRecord.java b/src/java/org/apache/poi/hssf/record/PasswordRecord.java
index 591c48622e..5593d5fd1f 100644
--- a/src/java/org/apache/poi/hssf/record/PasswordRecord.java
+++ b/src/java/org/apache/poi/hssf/record/PasswordRecord.java
@@ -77,6 +77,9 @@ public final class PasswordRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java b/src/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java
index 7bede5d528..c47ea430aa 100644
--- a/src/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java
+++ b/src/java/org/apache/poi/hssf/record/PrintGridlinesRecord.java
@@ -75,6 +75,9 @@ public final class PrintGridlinesRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/PrintHeadersRecord.java b/src/java/org/apache/poi/hssf/record/PrintHeadersRecord.java
index 0421be4165..04063e2f32 100644
--- a/src/java/org/apache/poi/hssf/record/PrintHeadersRecord.java
+++ b/src/java/org/apache/poi/hssf/record/PrintHeadersRecord.java
@@ -79,6 +79,9 @@ public final class PrintHeadersRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/PrintSetupRecord.java b/src/java/org/apache/poi/hssf/record/PrintSetupRecord.java
index ec39b94b45..35dc61cc63 100644
--- a/src/java/org/apache/poi/hssf/record/PrintSetupRecord.java
+++ b/src/java/org/apache/poi/hssf/record/PrintSetupRecord.java
@@ -316,6 +316,9 @@ public final class PrintSetupRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/ProtectRecord.java b/src/java/org/apache/poi/hssf/record/ProtectRecord.java
index f61841e84a..cd6ee87134 100644
--- a/src/java/org/apache/poi/hssf/record/ProtectRecord.java
+++ b/src/java/org/apache/poi/hssf/record/ProtectRecord.java
@@ -84,6 +84,9 @@ public final class ProtectRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/RKRecord.java b/src/java/org/apache/poi/hssf/record/RKRecord.java
index f1a3943a64..dae2cb9f40 100644
--- a/src/java/org/apache/poi/hssf/record/RKRecord.java
+++ b/src/java/org/apache/poi/hssf/record/RKRecord.java
@@ -94,6 +94,9 @@ public final class RKRecord extends CellRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/RefModeRecord.java b/src/java/org/apache/poi/hssf/record/RefModeRecord.java
index 4e042d3944..b832427e41 100644
--- a/src/java/org/apache/poi/hssf/record/RefModeRecord.java
+++ b/src/java/org/apache/poi/hssf/record/RefModeRecord.java
@@ -86,6 +86,9 @@ public final class RefModeRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/RefreshAllRecord.java b/src/java/org/apache/poi/hssf/record/RefreshAllRecord.java
index e93f74762d..b1653f49e7 100644
--- a/src/java/org/apache/poi/hssf/record/RefreshAllRecord.java
+++ b/src/java/org/apache/poi/hssf/record/RefreshAllRecord.java
@@ -83,6 +83,9 @@ public final class RefreshAllRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/RightMarginRecord.java b/src/java/org/apache/poi/hssf/record/RightMarginRecord.java
index edc3b496be..22ceed94ff 100644
--- a/src/java/org/apache/poi/hssf/record/RightMarginRecord.java
+++ b/src/java/org/apache/poi/hssf/record/RightMarginRecord.java
@@ -63,6 +63,9 @@ public final class RightMarginRecord extends StandardRecord implements Margin {
     public void setMargin( double field_1_margin )
     {        this.field_1_margin = field_1_margin;    }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/RowRecord.java b/src/java/org/apache/poi/hssf/record/RowRecord.java
index d46f7525b7..cbd56c9116 100644
--- a/src/java/org/apache/poi/hssf/record/RowRecord.java
+++ b/src/java/org/apache/poi/hssf/record/RowRecord.java
@@ -403,6 +403,9 @@ public final class RowRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/SCLRecord.java b/src/java/org/apache/poi/hssf/record/SCLRecord.java
index 73c0205321..decb9d4e32 100644
--- a/src/java/org/apache/poi/hssf/record/SCLRecord.java
+++ b/src/java/org/apache/poi/hssf/record/SCLRecord.java
@@ -64,6 +64,9 @@ public final class SCLRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/SaveRecalcRecord.java b/src/java/org/apache/poi/hssf/record/SaveRecalcRecord.java
index f1faefcf2e..0574296a5c 100644
--- a/src/java/org/apache/poi/hssf/record/SaveRecalcRecord.java
+++ b/src/java/org/apache/poi/hssf/record/SaveRecalcRecord.java
@@ -75,6 +75,9 @@ public final class SaveRecalcRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/ScenarioProtectRecord.java b/src/java/org/apache/poi/hssf/record/ScenarioProtectRecord.java
index e0a2f4da9f..d343e5b027 100644
--- a/src/java/org/apache/poi/hssf/record/ScenarioProtectRecord.java
+++ b/src/java/org/apache/poi/hssf/record/ScenarioProtectRecord.java
@@ -86,6 +86,9 @@ public final class ScenarioProtectRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/SelectionRecord.java b/src/java/org/apache/poi/hssf/record/SelectionRecord.java
index b38a28e0d3..e6d0a02215 100644
--- a/src/java/org/apache/poi/hssf/record/SelectionRecord.java
+++ b/src/java/org/apache/poi/hssf/record/SelectionRecord.java
@@ -173,6 +173,9 @@ public final class SelectionRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/SharedFormulaRecord.java b/src/java/org/apache/poi/hssf/record/SharedFormulaRecord.java
index 29beec68a6..37a8b3a58f 100644
--- a/src/java/org/apache/poi/hssf/record/SharedFormulaRecord.java
+++ b/src/java/org/apache/poi/hssf/record/SharedFormulaRecord.java
@@ -103,6 +103,9 @@ public final class SharedFormulaRecord extends SharedValueRecordBase {
         return sf.convertSharedFormulas(field_7_parsed_expr.getTokens(), formulaRow, formulaColumn);
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/StringRecord.java b/src/java/org/apache/poi/hssf/record/StringRecord.java
index f390714ca3..218906c1c6 100644
--- a/src/java/org/apache/poi/hssf/record/StringRecord.java
+++ b/src/java/org/apache/poi/hssf/record/StringRecord.java
@@ -86,6 +86,9 @@ public final class StringRecord extends ContinuableRecord {
         _is16bitUnicode = StringUtil.hasMultibyte(string);
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/SubRecord.java b/src/java/org/apache/poi/hssf/record/SubRecord.java
index 0c41e051de..ac56f4fed2 100644
--- a/src/java/org/apache/poi/hssf/record/SubRecord.java
+++ b/src/java/org/apache/poi/hssf/record/SubRecord.java
@@ -167,6 +167,9 @@ public abstract class SubRecord implements Duplicatable, GenericRecord {
 			out.write(_data);
 		}
 
+		/**
+		 * @deprecated use {@link #copy()} instead
+		 */
 		@Override
 		@SuppressWarnings("squid:S2975")
 		@Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/TextObjectRecord.java b/src/java/org/apache/poi/hssf/record/TextObjectRecord.java
index 0f9149b0cc..c3377e2c89 100644
--- a/src/java/org/apache/poi/hssf/record/TextObjectRecord.java
+++ b/src/java/org/apache/poi/hssf/record/TextObjectRecord.java
@@ -317,6 +317,9 @@ public final class TextObjectRecord extends ContinuableRecord {
 		return _linkRefPtg;
 	}
 
+	/**
+	 * @deprecated use {@link #copy()} instead
+	 */
 	@Override
 	@SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
 	@Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/TopMarginRecord.java b/src/java/org/apache/poi/hssf/record/TopMarginRecord.java
index 56efc6f497..31cd8509b4 100644
--- a/src/java/org/apache/poi/hssf/record/TopMarginRecord.java
+++ b/src/java/org/apache/poi/hssf/record/TopMarginRecord.java
@@ -67,6 +67,9 @@ public final class TopMarginRecord extends StandardRecord implements Margin {
     public void setMargin( double field_1_margin )
     {        this.field_1_margin = field_1_margin;    }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/UnknownRecord.java b/src/java/org/apache/poi/hssf/record/UnknownRecord.java
index aa46fb43b4..941faec803 100644
--- a/src/java/org/apache/poi/hssf/record/UnknownRecord.java
+++ b/src/java/org/apache/poi/hssf/record/UnknownRecord.java
@@ -265,6 +265,9 @@ public final class UnknownRecord extends StandardRecord {
         return false;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/UseSelFSRecord.java b/src/java/org/apache/poi/hssf/record/UseSelFSRecord.java
index e39023b751..070baa52f6 100644
--- a/src/java/org/apache/poi/hssf/record/UseSelFSRecord.java
+++ b/src/java/org/apache/poi/hssf/record/UseSelFSRecord.java
@@ -68,6 +68,9 @@ public final class UseSelFSRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/UserSViewBegin.java b/src/java/org/apache/poi/hssf/record/UserSViewBegin.java
index 5f34019256..0b91f44add 100644
--- a/src/java/org/apache/poi/hssf/record/UserSViewBegin.java
+++ b/src/java/org/apache/poi/hssf/record/UserSViewBegin.java
@@ -78,6 +78,9 @@ public final class UserSViewBegin extends StandardRecord {
         return Arrays.copyOf(_rawData, 16);
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/UserSViewEnd.java b/src/java/org/apache/poi/hssf/record/UserSViewEnd.java
index 80d79cdd56..7182d22cd8 100644
--- a/src/java/org/apache/poi/hssf/record/UserSViewEnd.java
+++ b/src/java/org/apache/poi/hssf/record/UserSViewEnd.java
@@ -66,6 +66,9 @@ public final class UserSViewEnd extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/VCenterRecord.java b/src/java/org/apache/poi/hssf/record/VCenterRecord.java
index 8d15a2c402..058970f633 100644
--- a/src/java/org/apache/poi/hssf/record/VCenterRecord.java
+++ b/src/java/org/apache/poi/hssf/record/VCenterRecord.java
@@ -78,6 +78,9 @@ public final class VCenterRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/VerticalPageBreakRecord.java b/src/java/org/apache/poi/hssf/record/VerticalPageBreakRecord.java
index 095d64f172..7644a54417 100644
--- a/src/java/org/apache/poi/hssf/record/VerticalPageBreakRecord.java
+++ b/src/java/org/apache/poi/hssf/record/VerticalPageBreakRecord.java
@@ -48,6 +48,9 @@ public final class VerticalPageBreakRecord extends PageBreakRecord {
 		return sid;
 	}
 
+	/**
+	 * @deprecated use {@link #copy()} instead
+	 */
 	@Override
 	@SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
 	@Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/WSBoolRecord.java b/src/java/org/apache/poi/hssf/record/WSBoolRecord.java
index 2a049cdcf7..7111c0ee0d 100644
--- a/src/java/org/apache/poi/hssf/record/WSBoolRecord.java
+++ b/src/java/org/apache/poi/hssf/record/WSBoolRecord.java
@@ -296,6 +296,9 @@ public final class WSBoolRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/WindowProtectRecord.java b/src/java/org/apache/poi/hssf/record/WindowProtectRecord.java
index 1d62a7e5ed..34004525f1 100644
--- a/src/java/org/apache/poi/hssf/record/WindowProtectRecord.java
+++ b/src/java/org/apache/poi/hssf/record/WindowProtectRecord.java
@@ -84,6 +84,9 @@ public final class WindowProtectRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/WindowTwoRecord.java b/src/java/org/apache/poi/hssf/record/WindowTwoRecord.java
index b896eb719c..3ce2816954 100644
--- a/src/java/org/apache/poi/hssf/record/WindowTwoRecord.java
+++ b/src/java/org/apache/poi/hssf/record/WindowTwoRecord.java
@@ -461,6 +461,9 @@ public final class WindowTwoRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java b/src/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java
index 4b43327918..96c8e6d568 100644
--- a/src/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java
+++ b/src/java/org/apache/poi/hssf/record/aggregates/ColumnInfoRecordsAggregate.java
@@ -61,6 +61,9 @@ public final class ColumnInfoRecordsAggregate extends RecordAggregate implements
 		}
 	}
 
+	/**
+	 * @deprecated use {@link #copy()} instead
+	 */
 	@Override
 	@SuppressWarnings("squid:S2975")
 	@Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java b/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java
index ab4eeac311..fff9cc9b37 100644
--- a/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java
+++ b/src/java/org/apache/poi/hssf/record/aggregates/ValueRecordsAggregate.java
@@ -29,6 +29,7 @@ import org.apache.poi.hssf.record.Record;
 import org.apache.poi.hssf.record.RecordBase;
 import org.apache.poi.hssf.record.StringRecord;
 import org.apache.poi.hssf.record.aggregates.RecordAggregate.RecordVisitor;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.formula.FormulaShifter;
 import org.apache.poi.ss.formula.ptg.Ptg;
 import org.apache.poi.util.Removal;
@@ -360,6 +361,9 @@ public final class ValueRecordsAggregate implements Iterable<CellValueRecordInte
 		return new ValueIterator();
 	}
 
+	/**
+	 * @deprecated use {@link org.apache.poi.hssf.usermodel.HSSFSheet#cloneSheet(HSSFWorkbook)} instead
+	 */
 	@Override
 	@SuppressWarnings("squid:S2975")
 	@Deprecated
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 f1dd9ec413..4c22693281 100644
--- a/src/java/org/apache/poi/hssf/record/cf/BorderFormatting.java
+++ b/src/java/org/apache/poi/hssf/record/cf/BorderFormatting.java
@@ -463,6 +463,9 @@ public final class BorderFormatting implements Duplicatable, GenericRecord {
         return GenericRecordJsonWriter.marshal(this);
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
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 26c18b50de..5cb2947cc6 100644
--- a/src/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java
+++ b/src/java/org/apache/poi/hssf/record/cf/ColorGradientFormatting.java
@@ -151,6 +151,9 @@ public final class ColorGradientFormatting implements Duplicatable, GenericRecor
         return GenericRecordJsonWriter.marshal(this);
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java b/src/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java
index 6335237813..15f22d8187 100644
--- a/src/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java
+++ b/src/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java
@@ -60,6 +60,9 @@ public final class ColorGradientThreshold extends Threshold implements Duplicata
         return super.getDataLength() + 8;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
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 a0f29b1d05..e66462fb87 100644
--- a/src/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java
+++ b/src/java/org/apache/poi/hssf/record/cf/DataBarFormatting.java
@@ -154,6 +154,9 @@ public final class DataBarFormatting implements Duplicatable, GenericRecord {
         return GenericRecordJsonWriter.marshal(this);
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java b/src/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java
index 8d88a6ab23..ade385a46e 100644
--- a/src/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java
+++ b/src/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java
@@ -39,6 +39,9 @@ public final class DataBarThreshold extends Threshold implements Duplicatable {
         super(in);
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
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 afed4f1e02..fba9f2475e 100644
--- a/src/java/org/apache/poi/hssf/record/cf/FontFormatting.java
+++ b/src/java/org/apache/poi/hssf/record/cf/FontFormatting.java
@@ -488,6 +488,9 @@ public final class FontFormatting implements Duplicatable, GenericRecord {
         return GenericRecordJsonWriter.marshal(this);
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
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 85ffc30056..3feb5fd649 100644
--- a/src/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java
+++ b/src/java/org/apache/poi/hssf/record/cf/IconMultiStateFormatting.java
@@ -121,6 +121,9 @@ public final class IconMultiStateFormatting implements Duplicatable, GenericReco
         return GenericRecordJsonWriter.marshal(this);
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/cf/IconMultiStateThreshold.java b/src/java/org/apache/poi/hssf/record/cf/IconMultiStateThreshold.java
index a8c9e807cd..f7c2d55794 100644
--- a/src/java/org/apache/poi/hssf/record/cf/IconMultiStateThreshold.java
+++ b/src/java/org/apache/poi/hssf/record/cf/IconMultiStateThreshold.java
@@ -65,6 +65,9 @@ public final class IconMultiStateThreshold extends Threshold implements Duplicat
         return super.getDataLength() + 5;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
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 b495d6183d..8e0d867d75 100644
--- a/src/java/org/apache/poi/hssf/record/cf/PatternFormatting.java
+++ b/src/java/org/apache/poi/hssf/record/cf/PatternFormatting.java
@@ -185,6 +185,9 @@ public final class PatternFormatting implements Duplicatable, GenericRecord {
         return GenericRecordJsonWriter.marshal(this);
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
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 dae5979b40..967af47e0d 100644
--- a/src/java/org/apache/poi/hssf/record/chart/AreaFormatRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/AreaFormatRecord.java
@@ -86,6 +86,9 @@ public final class AreaFormatRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
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 090256885a..dbc99e8e95 100644
--- a/src/java/org/apache/poi/hssf/record/chart/AreaRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/AreaRecord.java
@@ -65,6 +65,9 @@ public final class AreaRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
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 1046dfe176..a12d05a2ce 100644
--- a/src/java/org/apache/poi/hssf/record/chart/AxisLineFormatRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/AxisLineFormatRecord.java
@@ -63,6 +63,9 @@ public final class AxisLineFormatRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
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 901c865dd5..3a905a2b53 100644
--- a/src/java/org/apache/poi/hssf/record/chart/AxisOptionsRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/AxisOptionsRecord.java
@@ -112,6 +112,9 @@ public final class AxisOptionsRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
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 107c551fbe..41f69a0a99 100644
--- a/src/java/org/apache/poi/hssf/record/chart/AxisParentRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/AxisParentRecord.java
@@ -79,6 +79,9 @@ public final class AxisParentRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
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 f8f8c4ac2b..5a1eb62465 100644
--- a/src/java/org/apache/poi/hssf/record/chart/AxisRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/AxisRecord.java
@@ -78,6 +78,9 @@ public final class AxisRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
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 c5d77ec204..8b2694a6bf 100644
--- a/src/java/org/apache/poi/hssf/record/chart/AxisUsedRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/AxisUsedRecord.java
@@ -59,6 +59,9 @@ public final class AxisUsedRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
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 43b00b940b..e83f922880 100644
--- a/src/java/org/apache/poi/hssf/record/chart/BarRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/BarRecord.java
@@ -76,6 +76,9 @@ public final class BarRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
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 f931432894..15726d27b9 100644
--- a/src/java/org/apache/poi/hssf/record/chart/BeginRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/BeginRecord.java
@@ -58,6 +58,9 @@ public final class BeginRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
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 b1394fb1e4..6d951d4976 100644
--- a/src/java/org/apache/poi/hssf/record/chart/CategorySeriesAxisRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/CategorySeriesAxisRecord.java
@@ -78,6 +78,9 @@ public final class CategorySeriesAxisRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/chart/ChartEndBlockRecord.java b/src/java/org/apache/poi/hssf/record/chart/ChartEndBlockRecord.java
index 3dfae05c15..c0e37307ed 100644
--- a/src/java/org/apache/poi/hssf/record/chart/ChartEndBlockRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/ChartEndBlockRecord.java
@@ -81,6 +81,9 @@ public final class ChartEndBlockRecord extends StandardRecord {
 		out.write(unused);
 	}
 
+	/**
+	 * @deprecated use {@link #copy()} instead
+	 */
 	@Override
 	@SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
 	@Deprecated
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 01765fcf5a..d6d39b84ff 100644
--- a/src/java/org/apache/poi/hssf/record/chart/ChartRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/ChartRecord.java
@@ -84,6 +84,9 @@ public final class ChartRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/chart/ChartStartBlockRecord.java b/src/java/org/apache/poi/hssf/record/chart/ChartStartBlockRecord.java
index 3d1802ed93..f03ad4d7b9 100644
--- a/src/java/org/apache/poi/hssf/record/chart/ChartStartBlockRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/ChartStartBlockRecord.java
@@ -81,6 +81,9 @@ public final class ChartStartBlockRecord extends StandardRecord {
 		out.writeShort(iObjectInstance2);
 	}
 
+	/**
+	 * @deprecated use {@link #copy()} instead
+	 */
 	@Override
 	@SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
 	@Deprecated
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 e253e7624c..25e6b55f47 100644
--- a/src/java/org/apache/poi/hssf/record/chart/DatRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/DatRecord.java
@@ -66,6 +66,9 @@ public final class DatRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
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 2f5e3e3df4..7e748780ed 100644
--- a/src/java/org/apache/poi/hssf/record/chart/DataFormatRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/DataFormatRecord.java
@@ -75,6 +75,9 @@ public final class DataFormatRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
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 8b1d42d721..5c1f13aace 100644
--- a/src/java/org/apache/poi/hssf/record/chart/DefaultDataLabelTextPropertiesRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/DefaultDataLabelTextPropertiesRecord.java
@@ -62,6 +62,9 @@ public final class DefaultDataLabelTextPropertiesRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
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 efc67f9a68..2b8e35364b 100644
--- a/src/java/org/apache/poi/hssf/record/chart/EndRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/EndRecord.java
@@ -56,6 +56,9 @@ public final class EndRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
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 23c0391607..5c78ad1288 100644
--- a/src/java/org/apache/poi/hssf/record/chart/FontBasisRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/FontBasisRecord.java
@@ -74,6 +74,9 @@ public final class FontBasisRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
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 5edcb56b7c..6d295f72dc 100644
--- a/src/java/org/apache/poi/hssf/record/chart/FontIndexRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/FontIndexRecord.java
@@ -56,6 +56,9 @@ public final class FontIndexRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
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 f6b96ffabd..4521a34d5f 100644
--- a/src/java/org/apache/poi/hssf/record/chart/FrameRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/FrameRecord.java
@@ -71,6 +71,9 @@ public final class FrameRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
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 01d3556eff..5b8a27bd71 100644
--- a/src/java/org/apache/poi/hssf/record/chart/LegendRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/LegendRecord.java
@@ -106,6 +106,9 @@ public final class LegendRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
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 2a4075efe3..de14e20687 100644
--- a/src/java/org/apache/poi/hssf/record/chart/LineFormatRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/LineFormatRecord.java
@@ -101,6 +101,9 @@ public final class LineFormatRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
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 1a4617bfef..f2195f472f 100644
--- a/src/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java
@@ -95,6 +95,9 @@ public final class LinkedDataRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
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 31c06d3488..45ca7fb757 100644
--- a/src/java/org/apache/poi/hssf/record/chart/NumberFormatIndexRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/NumberFormatIndexRecord.java
@@ -59,6 +59,9 @@ public final class NumberFormatIndexRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
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 349c95eece..0b8c629dad 100644
--- a/src/java/org/apache/poi/hssf/record/chart/ObjectLinkRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/ObjectLinkRecord.java
@@ -75,6 +75,9 @@ public final class ObjectLinkRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
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 b02a8498e3..5ff7e1af03 100644
--- a/src/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/PlotAreaRecord.java
@@ -51,6 +51,9 @@ public final class PlotAreaRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
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 f154d3ac0b..42ce6734f2 100644
--- a/src/java/org/apache/poi/hssf/record/chart/PlotGrowthRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/PlotGrowthRecord.java
@@ -62,6 +62,9 @@ public final class PlotGrowthRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
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 527d8efbe6..2804e798e6 100644
--- a/src/java/org/apache/poi/hssf/record/chart/SeriesChartGroupIndexRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/SeriesChartGroupIndexRecord.java
@@ -59,6 +59,9 @@ public final class SeriesChartGroupIndexRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/chart/SeriesIndexRecord.java b/src/java/org/apache/poi/hssf/record/chart/SeriesIndexRecord.java
index 138e9fafc7..561148828c 100644
--- a/src/java/org/apache/poi/hssf/record/chart/SeriesIndexRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/SeriesIndexRecord.java
@@ -58,6 +58,9 @@ public final class SeriesIndexRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
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 8eb1a70a52..2789717934 100644
--- a/src/java/org/apache/poi/hssf/record/chart/SeriesLabelsRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/SeriesLabelsRecord.java
@@ -70,6 +70,9 @@ public final class SeriesLabelsRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
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 bd39dff1d4..9b525d81ee 100644
--- a/src/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/SeriesListRecord.java
@@ -75,6 +75,9 @@ public final class SeriesListRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
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 d82f1168ea..10fcbb5caa 100644
--- a/src/java/org/apache/poi/hssf/record/chart/SeriesRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/SeriesRecord.java
@@ -95,6 +95,9 @@ public final class SeriesRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/chart/SeriesTextRecord.java b/src/java/org/apache/poi/hssf/record/chart/SeriesTextRecord.java
index 87a12b478b..02c4216cfd 100644
--- a/src/java/org/apache/poi/hssf/record/chart/SeriesTextRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/SeriesTextRecord.java
@@ -90,6 +90,9 @@ public final class SeriesTextRecord extends StandardRecord {
 		return sid;
 	}
 
+	/**
+	 * @deprecated use {@link #copy()} instead
+	 */
 	@Override
 	@SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
 	@Deprecated
diff --git a/src/java/org/apache/poi/hssf/record/chart/SheetPropertiesRecord.java b/src/java/org/apache/poi/hssf/record/chart/SheetPropertiesRecord.java
index fe639831ea..16ce5e4ab6 100644
--- a/src/java/org/apache/poi/hssf/record/chart/SheetPropertiesRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/SheetPropertiesRecord.java
@@ -80,6 +80,9 @@ public final class SheetPropertiesRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
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 110d05e7ab..e9d2bc70e1 100644
--- a/src/java/org/apache/poi/hssf/record/chart/TickRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/TickRecord.java
@@ -115,6 +115,9 @@ public final class TickRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
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 a71ae9d1ab..60fc4fbb17 100644
--- a/src/java/org/apache/poi/hssf/record/chart/UnitsRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/UnitsRecord.java
@@ -59,6 +59,9 @@ public final class UnitsRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
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 85824b1078..8538016b5b 100644
--- a/src/java/org/apache/poi/hssf/record/chart/ValueRangeRecord.java
+++ b/src/java/org/apache/poi/hssf/record/chart/ValueRangeRecord.java
@@ -91,6 +91,9 @@ public final class ValueRangeRecord extends StandardRecord {
         return sid;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
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 af6e889a7a..fa8cbe4d69 100644
--- a/src/java/org/apache/poi/hssf/record/common/ExtendedColor.java
+++ b/src/java/org/apache/poi/hssf/record/common/ExtendedColor.java
@@ -167,6 +167,9 @@ public final class ExtendedColor implements Duplicatable, GenericRecord {
         return GenericRecordJsonWriter.marshal(this);
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
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 04b22bf3d6..05367d92de 100644
--- a/src/java/org/apache/poi/hssf/record/common/FtrHeader.java
+++ b/src/java/org/apache/poi/hssf/record/common/FtrHeader.java
@@ -96,6 +96,9 @@ public final class FtrHeader implements Duplicatable, GenericRecord {
         this.associatedRange = associatedRange;
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
     @Deprecated
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 95ccbdaf07..c7ed578401 100644
--- a/src/java/org/apache/poi/hssf/record/common/UnicodeString.java
+++ b/src/java/org/apache/poi/hssf/record/common/UnicodeString.java
@@ -497,6 +497,9 @@ public class UnicodeString implements Comparable<UnicodeString>, Duplicatable, G
         return extBit.isSet(getOptionFlags());
     }
 
+    /**
+     * @deprecated use {@link #copy()} instead
+     */
     @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated