remove some deprecated code

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

src/java/org/apache/poi/hssf/record/BoolErrRecord.java

@@ -24,7 +24,6 @@ import org.apache.poi.ss.usermodel.FormulaError;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
 import org.apache.poi.util.RecordFormatException;
-import org.apache.poi.util.Removal;
 
 /**
  * Creates new BoolErrRecord. (0x0205)
@@ -178,17 +177,6 @@ public final class BoolErrRecord extends CellRecord {
 		return sid;
 	}
 
-	/**
-	 * @deprecated use {@link #copy()} instead
-	 */
-	@Override
-	@SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-	@Deprecated
-	@Removal(version = "5.0.0")
-	public BoolErrRecord clone() {
-		return copy();
-	}
-
 	@Override
 	public BoolErrRecord copy() {
 		return new BoolErrRecord(this);

src/java/org/apache/poi/hssf/record/CFRule12Record.java

@@ -41,7 +41,6 @@ import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.util.IOUtils;
 import org.apache.poi.util.LittleEndianOutput;
 import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Removal;
 
 /**
  * Conditional Formatting v12 Rule Record (0x087A).
@@ -449,17 +448,6 @@ public final class CFRule12Record extends CFRuleBase implements FutureRecord {
         return len;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @Override
-    @SuppressWarnings("squid:S2975")
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public CFRule12Record clone() {
-        return copy();
-    }
-
     @Override
     public CFRule12Record copy() {
         return new CFRule12Record(this);

src/java/org/apache/poi/hssf/record/ColumnInfoRecord.java

@@ -24,7 +24,6 @@ import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * Defines with width and formatting for a range of columns
@@ -239,16 +238,6 @@ public final class ColumnInfoRecord extends StandardRecord {
         return 12;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public ColumnInfoRecord clone() {
-        return copy();
-    }
-
     @Override
     public ColumnInfoRecord copy() {
         return new ColumnInfoRecord(this);

src/java/org/apache/poi/hssf/record/CommonObjectDataSubRecord.java

@@ -28,7 +28,6 @@ import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianInput;
 import org.apache.poi.util.LittleEndianOutput;
 import org.apache.poi.util.RecordFormatException;
-import org.apache.poi.util.Removal;
 
 /**
  * The common object data record is used to store all common preferences for an excel object.
@@ -136,17 +135,6 @@ public final class CommonObjectDataSubRecord extends SubRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @Override
-    @SuppressWarnings("squid:S2975")
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public CommonObjectDataSubRecord clone() {
-        return copy();
-    }
-
     @Override
     public CommonObjectDataSubRecord copy() {
         return new CommonObjectDataSubRecord(this);

src/java/org/apache/poi/hssf/record/ContinueRecord.java

@@ -22,7 +22,6 @@ import java.util.function.Supplier;
 
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * Helper class used primarily for SST Records<p>
@@ -66,16 +65,6 @@ public final class ContinueRecord extends StandardRecord {
         _data = in.readRemainder();
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public ContinueRecord clone() {
-        return copy();
-    }
-
     @Override
     public ContinueRecord copy() {
         return new ContinueRecord(this);

src/java/org/apache/poi/hssf/record/DVALRecord.java

@@ -22,7 +22,6 @@ import java.util.function.Supplier;
 
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * This record is the list header of all data validation records (0x01BE) in the current sheet.
@@ -155,17 +154,6 @@ public final class DVALRecord extends StandardRecord {
         return sid;
     }
 
-	/**
-	 * @deprecated use {@link #copy()} instead
-	 */
-	@Override
-	@SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-	@Deprecated
-	@Removal(version = "5.0.0")
-	public DVALRecord clone() {
-		return copy();
-	}
-
 	@Override
     public DVALRecord copy() {
       return new DVALRecord(this);

src/java/org/apache/poi/hssf/record/DVRecord.java

@@ -30,7 +30,6 @@ import org.apache.poi.ss.util.CellRangeAddressList;
 import org.apache.poi.util.BitField;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 import org.apache.poi.util.StringUtil;
 
 /**
@@ -331,17 +330,6 @@ public final class DVRecord extends StandardRecord {
 		return sid;
 	}
 
-	/**
-	 * @deprecated use {@link #copy()} instead
-	 */
-	@Override
-	@SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-	@Deprecated
-	@Removal(version = "5.0.0")
-	public DVRecord clone() {
-		return copy();
-	}
-
 	/** Clones the object. */
 	@Override
 	public DVRecord copy() {

src/java/org/apache/poi/hssf/record/DefaultColWidthRecord.java

@@ -22,7 +22,6 @@ import java.util.function.Supplier;
 
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * Specifies the default width for columns that have no specific width set.
@@ -86,16 +85,6 @@ public final class DefaultColWidthRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public DefaultColWidthRecord clone() {
-        return copy();
-    }
-
     @Override
     public DefaultColWidthRecord copy() {
       return new DefaultColWidthRecord(this);

src/java/org/apache/poi/hssf/record/DeltaRecord.java

@@ -22,7 +22,6 @@ import java.util.function.Supplier;
 
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /** Controls the accuracy of the calculations */
 public final class DeltaRecord extends StandardRecord {
@@ -66,16 +65,6 @@ public final class DeltaRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public DeltaRecord clone() {
-        return copy();
-    }
-
     @Override
     public DeltaRecord copy() {
         // immutable

src/java/org/apache/poi/hssf/record/DrawingRecord.java

@@ -22,7 +22,6 @@ import java.util.function.Supplier;
 
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 public final class DrawingRecord extends StandardRecord {
     public static final short sid = 0x00EC;
@@ -83,13 +82,6 @@ public final class DrawingRecord extends StandardRecord {
         recordData = thedata;
     }
 
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public DrawingRecord clone() {
-        return copy();
-    }
-
     /**
      * Cloning of drawing records must be executed through HSSFPatriarch, because all id's must be changed
      * @return cloned drawing records

src/java/org/apache/poi/hssf/record/DrawingSelectionRecord.java

@@ -24,7 +24,6 @@ import org.apache.poi.common.usermodel.GenericRecord;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianInput;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * MsoDrawingSelection (0x00ED)<p>
@@ -114,17 +113,6 @@ public final class DrawingSelectionRecord extends StandardRecord {
 		}
 	}
 
-	/**
-	 * @deprecated use {@link #copy()} instead
-	 */
-	@Override
-	@SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-	@Deprecated
-	@Removal(version = "5.0.0")
-	public DrawingSelectionRecord clone() {
-		return copy();
-	}
-
 	@Override
 	public DrawingSelectionRecord copy() {
 		// currently immutable

src/java/org/apache/poi/hssf/record/EmbeddedObjectRefSubRecord.java

@@ -35,7 +35,6 @@ import org.apache.poi.util.LittleEndianOutput;
 import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;
 import org.apache.poi.util.RecordFormatException;
-import org.apache.poi.util.Removal;
 import org.apache.poi.util.StringUtil;
 
 /**
@@ -320,17 +319,6 @@ public final class EmbeddedObjectRefSubRecord extends SubRecord {
 		return field_6_unknown;
 	}
 
-	/**
-	 * @deprecated use {@link #copy()} instead
-	 */
-	@Override
-	@SuppressWarnings("squid:S2975")
-	@Deprecated
-	@Removal(version = "5.0.0")
-	public EmbeddedObjectRefSubRecord clone() {
-		return copy();
-	}
-
 	@Override
 	public EmbeddedObjectRefSubRecord copy() {
 		return new EmbeddedObjectRefSubRecord(this);

src/java/org/apache/poi/hssf/record/EndSubRecord.java

@@ -23,7 +23,6 @@ import java.util.function.Supplier;
 import org.apache.poi.util.LittleEndianInput;
 import org.apache.poi.util.LittleEndianOutput;
 import org.apache.poi.util.RecordFormatException;
-import org.apache.poi.util.Removal;
 
 /**
  * ftEnd (0x0000)<p>
@@ -70,17 +69,6 @@ public final class EndSubRecord extends SubRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @Override
-    @SuppressWarnings("squid:S2975")
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public EndSubRecord clone() {
-        return copy();
-    }
-
     @Override
     public EndSubRecord copy() {
         return new EndSubRecord();

src/java/org/apache/poi/hssf/record/FilePassRecord.java

@@ -35,7 +35,6 @@ import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianByteArrayOutputStream;
 import org.apache.poi.util.LittleEndianOutput;
 import org.apache.poi.util.LittleEndianOutputStream;
-import org.apache.poi.util.Removal;
 
 /**
  * File Pass Record (0x002F) <p>
@@ -138,16 +137,6 @@ public final class FilePassRecord extends StandardRecord {
 		return sid;
 	}
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public FilePassRecord clone() {
-        return copy();
-    }
-
     @Override
 	public FilePassRecord copy() {
 		return new FilePassRecord(this);

src/java/org/apache/poi/hssf/record/FormatRecord.java

@@ -26,7 +26,6 @@ import org.apache.poi.util.LittleEndianConsts;
 import org.apache.poi.util.LittleEndianOutput;
 import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Removal;
 import org.apache.poi.util.StringUtil;
 
 /**
@@ -107,16 +106,6 @@ public final class FormatRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public FormatRecord clone() {
-        return copy();
-    }
-
     @Override
     public FormatRecord copy() {
         return new FormatRecord(this);

src/java/org/apache/poi/hssf/record/FormulaRecord.java

@@ -124,7 +124,7 @@ public final class FormulaRecord extends CellRecord {
 	 * @deprecated POI 5.0.0, will be removed in 6.0, use getCachedResultTypeEnum until switch to enum is fully done
 	 */
 	@Deprecated
-	@Removal(version = "6.0.0XSSFScatterChartData.java")
+	@Removal(version = "6.0.0")
 	public int getCachedResultType() {
 		if (specialCachedValue == null) {
 			return CellType.NUMERIC.getCode();

src/java/org/apache/poi/hssf/record/FtCblsSubRecord.java

@@ -90,7 +90,6 @@ public final class FtCblsSubRecord extends SubRecord {
     /**
      * @deprecated use {@link #copy()} instead
      */
-    @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
     @Removal(version = "5.0.0")

src/java/org/apache/poi/hssf/record/FtCfSubRecord.java

@@ -26,7 +26,6 @@ import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianInput;
 import org.apache.poi.util.LittleEndianOutput;
 import org.apache.poi.util.RecordFormatException;
-import org.apache.poi.util.Removal;
 
 
 /**
@@ -99,17 +98,6 @@ public final class FtCfSubRecord extends SubRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @Override
-    @SuppressWarnings("squid:S2975")
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public FtCfSubRecord clone() {
-        return copy();
-    }
-
     @Override
     public FtCfSubRecord copy() {
         return new FtCfSubRecord(this);

src/java/org/apache/poi/hssf/record/FtPioGrbitSubRecord.java

@@ -156,7 +156,6 @@ public final class FtPioGrbitSubRecord extends SubRecord {
     /**
      * @deprecated use {@link #copy()} instead
      */
-    @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
     @Removal(version = "5.0.0")

src/java/org/apache/poi/hssf/record/GroupMarkerSubRecord.java

@@ -78,7 +78,6 @@ public final class GroupMarkerSubRecord extends SubRecord {
     /**
      * @deprecated use {@link #copy()} instead
      */
-    @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
     @Removal(version = "5.0.0")

src/java/org/apache/poi/hssf/record/IterationRecord.java

@@ -24,7 +24,6 @@ import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * Tells whether to iterate over formula calculations or not.
@@ -80,16 +79,6 @@ public final class IterationRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public IterationRecord clone() {
-        return copy();
-    }
-
     @Override
     public IterationRecord copy() {
         return new IterationRecord(this);

src/java/org/apache/poi/hssf/record/LbsDataSubRecord.java

@@ -284,7 +284,6 @@ public class LbsDataSubRecord extends SubRecord {
     /**
      * @deprecated use {@link #copy()} instead
      */
-    @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
     @Removal(version = "5.0.0")

src/java/org/apache/poi/hssf/record/MulBlankRecord.java

@@ -22,7 +22,6 @@ import java.util.function.Supplier;
 
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * Represents a set of columns in a row with no value but with styling.
@@ -119,17 +118,6 @@ public final class MulBlankRecord extends StandardRecord {
 		return 6 + _xfs.length * 2;
 	}
 
-	/**
-	 * @deprecated use {@link #copy()} instead
-	 */
-	@Override
-	@SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-	@Deprecated
-	@Removal(version = "5.0.0")
-	public MulBlankRecord clone() {
-		return copy();
-	}
-
 	@Override
 	public MulBlankRecord copy() {
 		// immutable - so OK to return this

src/java/org/apache/poi/hssf/record/NoteRecord.java

@@ -22,7 +22,6 @@ import java.util.function.Supplier;
 
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 import org.apache.poi.util.StringUtil;
 
 /**
@@ -238,19 +237,9 @@ public final class NoteRecord extends StandardRecord {
 	 */
 	public void setAuthor(String author) {
 		field_6_author = author;
-      field_5_hasMultibyte = StringUtil.hasMultibyte(author);
+      	field_5_hasMultibyte = StringUtil.hasMultibyte(author);
 	}
 
-	/**
-	 * @deprecated use {@link #copy()} instead
-	 */
-	@Override
-	@SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-	@Deprecated
-	@Removal(version = "5.0.0")
-	public NoteRecord clone() {
-		return copy();
-	}
 
 	@Override
 	public NoteRecord copy() {

src/java/org/apache/poi/hssf/record/NoteStructureSubRecord.java

@@ -102,7 +102,6 @@ public final class NoteStructureSubRecord extends SubRecord {
     /**
      * @deprecated use {@link #copy()} instead
      */
-    @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
     @Removal(version = "5.0.0")

src/java/org/apache/poi/hssf/record/ProtectRecord.java

@@ -24,7 +24,6 @@ import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * Defines whether a sheet or workbook is protected (HSSF DOES NOT SUPPORT ENCRYPTION)<p>
@@ -84,16 +83,6 @@ public final class ProtectRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public ProtectRecord clone() {
-        return copy();
-    }
-
     @Override
     public ProtectRecord copy() {
         return new ProtectRecord(this);

src/java/org/apache/poi/hssf/record/RKRecord.java

@@ -23,7 +23,6 @@ import java.util.function.Supplier;
 import org.apache.poi.hssf.util.RKUtil;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * An internal 32 bit number with the two most significant bits storing the type.
@@ -94,16 +93,6 @@ public final class RKRecord extends CellRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public RKRecord clone() {
-        return copy();
-    }
-
     @Override
     public RKRecord copy() {
         return new RKRecord(this);

src/java/org/apache/poi/hssf/record/RefreshAllRecord.java

@@ -24,7 +24,6 @@ import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * Flag whether to refresh all external data when loading a sheet.
@@ -83,16 +82,6 @@ public final class RefreshAllRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public RefreshAllRecord clone() {
-        return copy();
-    }
-
     @Override
     public RefreshAllRecord copy() {
         return new RefreshAllRecord(this);

src/java/org/apache/poi/hssf/record/SaveRecalcRecord.java

@@ -22,7 +22,6 @@ import java.util.function.Supplier;
 
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * Defines whether to recalculate before saving (set to true)
@@ -75,16 +74,6 @@ public final class SaveRecalcRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public SaveRecalcRecord clone() {
-        return copy();
-    }
-
     @Override
     public SaveRecalcRecord copy() {
         return new SaveRecalcRecord(this);

src/java/org/apache/poi/hssf/record/SelectionRecord.java

@@ -24,7 +24,6 @@ import java.util.stream.Stream;
 import org.apache.poi.hssf.util.CellRangeAddress8Bit;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * Shows the user's selection on the sheet for write set num refs to 0
@@ -173,16 +172,6 @@ public final class SelectionRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public SelectionRecord clone() {
-        return copy();
-    }
-
     @Override
     public SelectionRecord copy() {
         return new SelectionRecord(this);

src/java/org/apache/poi/hssf/record/SubRecord.java

@@ -32,7 +32,6 @@ import org.apache.poi.util.IOUtils;
 import org.apache.poi.util.LittleEndianInput;
 import org.apache.poi.util.LittleEndianOutput;
 import org.apache.poi.util.LittleEndianOutputStream;
-import org.apache.poi.util.Removal;
 
 /**
  * Subrecords are part of the OBJ class.
@@ -167,17 +166,6 @@ public abstract class SubRecord implements Duplicatable, GenericRecord {
 			out.write(_data);
 		}
 
-		/**
-		 * @deprecated use {@link #copy()} instead
-		 */
-		@Override
-		@SuppressWarnings("squid:S2975")
-		@Deprecated
-		@Removal(version = "5.0.0")
-		public UnknownSubRecord clone() {
-			return copy();
-		}
-
 		@Override
 		public UnknownSubRecord copy() {
 			return this;
@@ -197,12 +185,6 @@ public abstract class SubRecord implements Duplicatable, GenericRecord {
 		}
 	}
 
-	@Override
-	@SuppressWarnings("squid:S2975")
-	@Deprecated
-	@Removal(version = "5.0.0")
-	public abstract SubRecord  clone();
-
 	@Override
 	public abstract SubRecord copy();
 

src/java/org/apache/poi/hssf/record/UseSelFSRecord.java

@@ -26,7 +26,6 @@ import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * Tells the GUI if this was written by something that can use "natural language" formulas. HSSF can't.
@@ -68,16 +67,6 @@ public final class UseSelFSRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public UseSelFSRecord clone() {
-        return copy();
-    }
-
     @Override
     public UseSelFSRecord copy() {
         return new UseSelFSRecord(this);

src/java/org/apache/poi/hssf/record/WindowProtectRecord.java

@@ -24,7 +24,6 @@ import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * Flags whether workbook windows are protected
@@ -84,16 +83,6 @@ public final class WindowProtectRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public WindowProtectRecord clone() {
-        return copy();
-    }
-
     @Override
     public WindowProtectRecord copy() {
         return new WindowProtectRecord(this);

src/java/org/apache/poi/hssf/record/cf/ColorGradientThreshold.java

@@ -63,7 +63,6 @@ public final class ColorGradientThreshold extends Threshold implements Duplicata
     /**
      * @deprecated use {@link #copy()} instead
      */
-    @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
     @Removal(version = "5.0.0")

src/java/org/apache/poi/hssf/record/cf/DataBarThreshold.java

@@ -42,7 +42,6 @@ public final class DataBarThreshold extends Threshold implements Duplicatable {
     /**
      * @deprecated use {@link #copy()} instead
      */
-    @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
     @Removal(version = "5.0.0")

src/java/org/apache/poi/hssf/record/cf/IconMultiStateThreshold.java

@@ -68,7 +68,6 @@ public final class IconMultiStateThreshold extends Threshold implements Duplicat
     /**
      * @deprecated use {@link #copy()} instead
      */
-    @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
     @Removal(version = "5.0.0")

src/java/org/apache/poi/hssf/record/cf/PatternFormatting.java

@@ -30,7 +30,6 @@ import org.apache.poi.util.GenericRecordJsonWriter;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianInput;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * Pattern Formatting Block of the Conditional Formatting Rule Record.
@@ -185,16 +184,6 @@ public final class PatternFormatting implements Duplicatable, GenericRecord {
         return GenericRecordJsonWriter.marshal(this);
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public PatternFormatting clone()  {
-        return copy();
-    }
-
     public PatternFormatting copy()  {
         return new PatternFormatting(this);
     }

src/java/org/apache/poi/hssf/record/chart/AxisRecord.java

@@ -25,7 +25,6 @@ import org.apache.poi.hssf.record.RecordInputStream;
 import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * The axis record defines the type of an axis.
@@ -78,16 +77,6 @@ public final class AxisRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public AxisRecord clone() {
-        return copy();
-    }
-
     /**
      * Get the axis type field for the Axis record.
      *

src/java/org/apache/poi/hssf/record/chart/AxisUsedRecord.java

@@ -25,7 +25,6 @@ import org.apache.poi.hssf.record.RecordInputStream;
 import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * The number of axes used on a chart.
@@ -59,16 +58,6 @@ public final class AxisUsedRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public AxisUsedRecord clone() {
-        return copy();
-    }
-
     /**
      * Get the num axis field for the AxisUsed record.
      */

src/java/org/apache/poi/hssf/record/chart/DataFormatRecord.java

@@ -27,7 +27,6 @@ import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * The data format record is used to index into a series.
@@ -75,16 +74,6 @@ public final class DataFormatRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public DataFormatRecord clone() {
-        return copy();
-    }
-
     @Override
     public DataFormatRecord copy() {
         return new DataFormatRecord(this);

src/java/org/apache/poi/hssf/record/chart/LineFormatRecord.java

@@ -30,7 +30,6 @@ import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * Describes a line format record.  The line format record controls how a line on a chart appears.
@@ -101,16 +100,6 @@ public final class LineFormatRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public LineFormatRecord clone() {
-        return copy();
-    }
-
     @Override
     public LineFormatRecord copy() {
         return new LineFormatRecord(this);

src/java/org/apache/poi/hssf/record/chart/LinkedDataRecord.java

@@ -31,7 +31,6 @@ import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * Describes a linked data record.  This record refers to the series data or text.
@@ -95,16 +94,6 @@ public final class LinkedDataRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public LinkedDataRecord clone() {
-        return copy();
-    }
-
     @Override
     public LinkedDataRecord copy() {
         return new LinkedDataRecord(this);

src/java/org/apache/poi/hssf/record/chart/PlotGrowthRecord.java

@@ -25,7 +25,6 @@ import org.apache.poi.hssf.record.RecordInputStream;
 import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * The plot growth record specifies the scaling factors used when a font is scaled.
@@ -62,16 +61,6 @@ public final class PlotGrowthRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public PlotGrowthRecord clone() {
-        return copy();
-    }
-
     public PlotGrowthRecord copy() {
         return new PlotGrowthRecord(this);
     }

src/java/org/apache/poi/hssf/record/chart/SeriesIndexRecord.java

@@ -61,7 +61,6 @@ public final class SeriesIndexRecord extends StandardRecord {
     /**
      * @deprecated use {@link #copy()} instead
      */
-    @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
     @Removal(version = "5.0.0")

src/java/org/apache/poi/hssf/record/chart/SheetPropertiesRecord.java

@@ -30,7 +30,6 @@ import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * Describes a chart sheet properties record. SHTPROPS (0x1044)<p>
@@ -80,17 +79,6 @@ public final class SheetPropertiesRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @Override
-    @SuppressWarnings("squid:S2975")
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public SheetPropertiesRecord clone() {
-        return copy();
-    }
-
     @Override
     public SheetPropertiesRecord copy() {
         return new SheetPropertiesRecord(this);

src/java/org/apache/poi/hssf/record/chart/TextRecord.java

@@ -156,7 +156,6 @@ public final class TextRecord extends StandardRecord {
         return sid;
     }
 
-    @Override
     @SuppressWarnings("squid:S2975")
     @Deprecated
     @Removal(version = "5.0.0")

src/java/org/apache/poi/hssf/record/chart/UnitsRecord.java

@@ -25,7 +25,6 @@ import org.apache.poi.hssf.record.RecordInputStream;
 import org.apache.poi.hssf.record.StandardRecord;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * The units record describes units.
@@ -59,16 +58,6 @@ public final class UnitsRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public UnitsRecord clone() {
-        return copy();
-    }
-
     @Override
     public UnitsRecord copy() {
         return new UnitsRecord(this);

src/java/org/apache/poi/hssf/record/chart/ValueRangeRecord.java

@@ -27,7 +27,6 @@ import org.apache.poi.util.BitField;
 import org.apache.poi.util.BitFieldFactory;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
 
 /**
  * The value range record defines the range of the value axis.
@@ -91,16 +90,6 @@ public final class ValueRangeRecord extends StandardRecord {
         return sid;
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public ValueRangeRecord clone() {
-        return copy();
-    }
-
     @Override
     public ValueRangeRecord copy() {
         return new ValueRangeRecord(this);

src/java/org/apache/poi/hssf/record/common/ExtendedColor.java

@@ -26,8 +26,6 @@ import org.apache.poi.util.GenericRecordJsonWriter;
 import org.apache.poi.util.GenericRecordUtil;
 import org.apache.poi.util.LittleEndianInput;
 import org.apache.poi.util.LittleEndianOutput;
-import org.apache.poi.util.Removal;
-
 
 /**
  * Title: CTColor (Extended Color) record part
@@ -167,16 +165,6 @@ public final class ExtendedColor implements Duplicatable, GenericRecord {
         return GenericRecordJsonWriter.marshal(this);
     }
 
-    /**
-     * @deprecated use {@link #copy()} instead
-     */
-    @SuppressWarnings({"squid:S2975", "MethodDoesntCallSuperMethod"})
-    @Deprecated
-    @Removal(version = "5.0.0")
-    public ExtendedColor clone() {
-        return copy();
-    }
-
     @Override
     public ExtendedColor copy()  {
         return new ExtendedColor(this);