try to fix some jdk 14 build issues due to java.lang.Record causing existing POI Record classes to be ambiguous

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

28 files changed, 99 insertions, 99 deletions

diff --git a/src/testcases/org/apache/poi/hssf/eventmodel/TestAbortableListener.java b/src/testcases/org/apache/poi/hssf/eventmodel/TestAbortableListener.java
index f47104c225..8a80b78393 100644
--- a/src/testcases/org/apache/poi/hssf/eventmodel/TestAbortableListener.java
+++ b/src/testcases/org/apache/poi/hssf/eventmodel/TestAbortableListener.java
@@ -95,7 +95,7 @@ public final class TestAbortableListener {
 			lastRecordSeen = null;
 		}
 		@Override
-		public short abortableProcessRecord(Record record) {
+		public short abortableProcessRecord(org.apache.poi.hssf.record.Record record) {
 			countSeen++;
 			lastRecordSeen = record;
 
diff --git a/src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java b/src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java
index ca45d61501..d639c2c3f8 100644
--- a/src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java
+++ b/src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java
@@ -61,7 +61,7 @@ public final class TestEventWorkbookBuilder {
         }
     }
 
-    private void addFormulaRecord(Record r) {
+    private void addFormulaRecord(org.apache.poi.hssf.record.Record r) {
         if (r instanceof FormulaRecord) {
             fRecs.add((FormulaRecord)r);
         }
diff --git a/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java b/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java
index 89efb527f5..ad9640647d 100644
--- a/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java
+++ b/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java
@@ -82,7 +82,7 @@ public final class TestFormatTrackingHSSFListener {
 			
 			// Now check we can turn all the numeric
 			//  cells into strings without error
-			for(Record r : mockListen._records) {
+			for(org.apache.poi.hssf.record.Record r : mockListen._records) {
 				CellValueRecordInterface cvr = null;
 				
 				if(r instanceof NumberRecord) {
@@ -106,10 +106,10 @@ public final class TestFormatTrackingHSSFListener {
 	
 	private static final class MockHSSFListener implements HSSFListener {
 		public MockHSSFListener() {}
-		private final List<Record> _records = new ArrayList<>();
+		private final List<org.apache.poi.hssf.record.Record> _records = new ArrayList<>();
 
 		@Override
-        public void processRecord(Record record) {
+        public void processRecord(org.apache.poi.hssf.record.Record record) {
 			_records.add(record);
 		}
 	}
diff --git a/src/testcases/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java b/src/testcases/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java
index 6ad37f618e..f3d4569963 100644
--- a/src/testcases/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java
+++ b/src/testcases/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java
@@ -47,7 +47,7 @@ import org.junit.Test;
  * Testing for {@link HSSFEventFactory}
  */
 public final class TestHSSFEventFactory {
-    private final List<Record> records = new ArrayList<>();
+    private final List<org.apache.poi.hssf.record.Record> records = new ArrayList<>();
 
     private void openSample(String sampleFileName) throws IOException {
         records.clear();
@@ -132,7 +132,7 @@ public final class TestHSSFEventFactory {
 
             // Has one sheet, with values 1,2,3 in column A rows 1-3
             boolean hasSheet = false, hasA1 = false, hasA2 = false, hasA3 = false;
-            for (Record r : records) {
+            for (org.apache.poi.hssf.record.Record r : records) {
                 if (r instanceof BoundSheetRecord) {
                     BoundSheetRecord bsr = (BoundSheetRecord) r;
                     assertEquals("Sheet1", bsr.getSheetname());
diff --git a/src/testcases/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java b/src/testcases/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java
index 0b1fff72bf..29be9baab2 100644
--- a/src/testcases/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java
+++ b/src/testcases/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java
@@ -48,7 +48,7 @@ import org.junit.Test;
  */
 public final class TestMissingRecordAwareHSSFListener {
 
-	private final List<Record> _records = new ArrayList<>();
+	private final List<org.apache.poi.hssf.record.Record> _records = new ArrayList<>();
 
 	private void readRecords(String sampleFileName) throws IOException {
 		_records.clear();
@@ -103,7 +103,7 @@ public final class TestMissingRecordAwareHSSFListener {
 		readRecords("MRExtraLines.xls");
 
 		int rowCount=0;
-		for (Record rec : _records) {
+		for (org.apache.poi.hssf.record.Record rec : _records) {
 			if (rec instanceof LastCellOfRowDummyRecord) {
 				LastCellOfRowDummyRecord eor = (LastCellOfRowDummyRecord) rec;
 				assertEquals(rowCount, eor.getRow());
@@ -158,10 +158,10 @@ public final class TestMissingRecordAwareHSSFListener {
 		assertEquals(exp, act);
 	}
 
-	private int lastIndexOf(Predicate<Record> pre) {
+	private int lastIndexOf(Predicate<org.apache.poi.hssf.record.Record> pre) {
 		int found = -1;
 		int i = 0;
-		for (Record r : _records) {
+		for (org.apache.poi.hssf.record.Record r : _records) {
 			if (pre.test(r)) {
 				found = i;
 			}
@@ -173,7 +173,7 @@ public final class TestMissingRecordAwareHSSFListener {
 	private String digest(int start, int len) {
 		StringBuilder sb = new StringBuilder(len*10);
 		int lastRow = -1;
-		for (Record r : _records.subList(start, start+len+1)) {
+		for (org.apache.poi.hssf.record.Record r : _records.subList(start, start+len+1)) {
 			String dig = null;
 			int row = -1;
 			if (r instanceof RowRecord) {
@@ -221,7 +221,7 @@ public final class TestMissingRecordAwareHSSFListener {
 		return sb.toString();
 	}
 
-	private long matches(Predicate<Record> r) {
+	private long matches(Predicate<org.apache.poi.hssf.record.Record> r) {
 		return _records.stream().filter(r).count();
 	}
 }
diff --git a/src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java b/src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java
index abc58d3f7d..f655e953ab 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java
+++ b/src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java
@@ -113,7 +113,7 @@ public class TestDrawingAggregate {
         byte[] getRawBytes(){
             ByteArrayOutputStream out = new ByteArrayOutputStream();
             for (RecordBase rb : aggRecords) {
-                Record r = (Record) rb;
+                Record r = (org.apache.poi.hssf.record.Record) rb;
                 try {
                     out.write(r.serialize());
                 } catch (IOException e) {
@@ -255,7 +255,7 @@ public class TestDrawingAggregate {
     private static byte[] toByteArray(List<RecordBase> records) {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         for (RecordBase rb : records) {
-            Record r = (Record) rb;
+            Record r = (org.apache.poi.hssf.record.Record) rb;
             try {
                 out.write(r.serialize());
             } catch (IOException e) {
@@ -370,7 +370,7 @@ public class TestDrawingAggregate {
             byte[] dgBytes = toByteArray(dgRecords);
 
             for (RecordBase rb : dgRecords) {
-                Record r = (Record) rb;
+                Record r = (org.apache.poi.hssf.record.Record) rb;
                 short sid = r.getSid();
                 // we expect that drawing block consists of either
                 // DrawingRecord or ContinueRecord or ObjRecord or TextObjectRecord
@@ -435,7 +435,7 @@ public class TestDrawingAggregate {
             // records to be aggregated
             List<RecordBase> dgRecords = records.subList(19, 26);
             for (RecordBase rb : dgRecords) {
-                Record r = (Record) rb;
+                Record r = (org.apache.poi.hssf.record.Record) rb;
                 short sid = r.getSid();
                 // we expect that drawing block consists of either
                 // DrawingRecord or ContinueRecord or ObjRecord or TextObjectRecord
@@ -493,8 +493,8 @@ public class TestDrawingAggregate {
                     assertSame(r1.getClass(), r2.getClass());
                     assertEquals(r1.getRecordSize(), r2.getRecordSize());
                     if (r1 instanceof Record) {
-                        assertEquals(((Record) r1).getSid(), ((Record) r2).getSid());
-                        assertArrayEquals(((Record) r1).serialize(), ((Record) r2).serialize());
+                        assertEquals(((org.apache.poi.hssf.record.Record) r1).getSid(), ((org.apache.poi.hssf.record.Record) r2).getSid());
+                        assertArrayEquals(((org.apache.poi.hssf.record.Record) r1).serialize(), ((org.apache.poi.hssf.record.Record) r2).serialize());
                     }
                 }
             }
@@ -520,7 +520,7 @@ public class TestDrawingAggregate {
             // records to be aggregated
             List<RecordBase> dgRecords = records.subList(19, 39);
             for (RecordBase rb : dgRecords) {
-                Record r = (Record) rb;
+                Record r = (org.apache.poi.hssf.record.Record) rb;
                 short sid = r.getSid();
                 // we expect that drawing block consists of either
                 // DrawingRecord or ContinueRecord or ObjRecord or TextObjectRecord
@@ -581,7 +581,7 @@ public class TestDrawingAggregate {
             // records to be aggregated
             List<RecordBase> dgRecords = records.subList(22, 300);
             for (RecordBase rb : dgRecords) {
-                Record r = (Record) rb;
+                Record r = (org.apache.poi.hssf.record.Record) rb;
                 short sid = r.getSid();
                 // we expect that drawing block consists of either
                 // DrawingRecord or ContinueRecord or ObjRecord or TextObjectRecord
@@ -723,7 +723,7 @@ public class TestDrawingAggregate {
             "fvcr1v8aFU6POn+OCqfj4ffS/e+pcOEMKhABrCdUAAPhwB+pQHYGFcT/BBUEz6LC/wGpc+eRNSkAAA==";
 
         byte[] dgBytes = decompress(data);
-        List<Record> dgRecords = RecordFactory.createRecords(new ByteArrayInputStream(dgBytes));
+        List<org.apache.poi.hssf.record.Record> dgRecords = RecordFactory.createRecords(new ByteArrayInputStream(dgBytes));
         assertEquals(20, dgRecords.size());
 
         short[] expectedSids = {
@@ -901,7 +901,7 @@ public class TestDrawingAggregate {
             "BPza/oPKABD5z4SARKQEELP1WQsFMc+QwP8ATkmhK404AAA=";
 
         byte[] dgBytes = decompress(data);
-        List<Record> dgRecords = RecordFactory.createRecords(new ByteArrayInputStream(dgBytes));
+        List<org.apache.poi.hssf.record.Record> dgRecords = RecordFactory.createRecords(new ByteArrayInputStream(dgBytes));
         assertEquals(14, dgRecords.size());
 
         short[] expectedSids = {
diff --git a/src/testcases/org/apache/poi/hssf/model/TestEscherRecordFactory.java b/src/testcases/org/apache/poi/hssf/model/TestEscherRecordFactory.java
index c0b00c2c64..a3776e5bdc 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestEscherRecordFactory.java
+++ b/src/testcases/org/apache/poi/hssf/model/TestEscherRecordFactory.java
@@ -44,7 +44,7 @@ public class TestEscherRecordFactory {
     private static byte[] toByteArray(List<RecordBase> records) {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         for (RecordBase rb : records) {
-            Record r = (Record) rb;
+            Record r = (org.apache.poi.hssf.record.Record) rb;
             try {
                 out.write(r.serialize());
             } catch (IOException e) {
diff --git a/src/testcases/org/apache/poi/hssf/model/TestLinkTable.java b/src/testcases/org/apache/poi/hssf/model/TestLinkTable.java
index c43c0fd843..3ff44152ac 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestLinkTable.java
+++ b/src/testcases/org/apache/poi/hssf/model/TestLinkTable.java
@@ -127,7 +127,7 @@ public final class TestLinkTable {
 				SupBookRecord.createAddInFunctions(),
 				new SSTRecord(),
 		};
-		List<Record> recList = Arrays.asList(recs);
+		List<org.apache.poi.hssf.record.Record> recList = Arrays.asList(recs);
 		WorkbookRecordList wrl = new WorkbookRecordList();
 
 		// Bug 47001b: Expected an EXTERNSHEET record but got (org.apache.poi.hssf.record.SSTRecord)
@@ -145,7 +145,7 @@ public final class TestLinkTable {
         new NameCommentRecord("name2", "comment2"),
 
 		};
-		final List<Record> recList = Arrays.asList(recs);
+		final List<org.apache.poi.hssf.record.Record> recList = Arrays.asList(recs);
 		final WorkbookRecordList wrl = new WorkbookRecordList();
 		final Map<String, NameCommentRecord> commentRecords = new LinkedHashMap<>();
 
diff --git a/src/testcases/org/apache/poi/hssf/model/TestSheet.java b/src/testcases/org/apache/poi/hssf/model/TestSheet.java
index 9bd9f1eb4c..8042be6e0e 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestSheet.java
+++ b/src/testcases/org/apache/poi/hssf/model/TestSheet.java
@@ -50,24 +50,24 @@ import org.junit.Test;
  * Unit test for the {@link InternalSheet} class.
  */
 public final class TestSheet {
-	private static InternalSheet createSheet(List<Record> inRecs) {
+	private static InternalSheet createSheet(List<org.apache.poi.hssf.record.Record> inRecs) {
 		return InternalSheet.createSheet(new RecordStream(inRecs, 0));
 	}
 
 	@Test
 	public void testCreateSheet() {
 		// Check we're adding row and cell aggregates
-		List<Record> records = new ArrayList<>();
+		List<org.apache.poi.hssf.record.Record> records = new ArrayList<>();
 		records.add(BOFRecord.createSheetBOF());
 		records.add( new DimensionsRecord() );
 		records.add(createWindow2Record());
 		records.add(EOFRecord.instance);
 		InternalSheet sheet = createSheet(records);
 
-		List<Record> outRecs = new ArrayList<>();
+		List<org.apache.poi.hssf.record.Record> outRecs = new ArrayList<>();
 		sheet.visitContainedRecords(outRecs::add, 0);
 
-		Iterator<Record> iter = outRecs.iterator();
+		Iterator<org.apache.poi.hssf.record.Record> iter = outRecs.iterator();
 		assertTrue(iter.next() instanceof BOFRecord );
 		assertTrue(iter.next() instanceof IndexRecord);
 		assertTrue(iter.next() instanceof DimensionsRecord);
@@ -75,7 +75,7 @@ public final class TestSheet {
 		assertTrue(iter.next() instanceof EOFRecord);
 	}
 
-	private static Record createWindow2Record() {
+	private static org.apache.poi.hssf.record.Record createWindow2Record() {
 		WindowTwoRecord result = new WindowTwoRecord();
 		result.setOptions(( short ) 0x6b6);
 		result.setTopRow(( short ) 0);
@@ -93,7 +93,7 @@ public final class TestSheet {
 			_count = 0;
 		}
 		@Override
-        public void visitRecord(Record r) {
+        public void visitRecord(org.apache.poi.hssf.record.Record r) {
 			if (r instanceof MergeCellsRecord) {
 				_count++;
 			}
@@ -179,7 +179,7 @@ public final class TestSheet {
 	 */
     @Test
 	public void testMovingMergedRegion() {
-		List<Record> records = new ArrayList<>();
+		List<org.apache.poi.hssf.record.Record> records = new ArrayList<>();
 
 		CellRangeAddress[] cras = {
 			new CellRangeAddress(0, 1, 0, 2),
@@ -218,7 +218,7 @@ public final class TestSheet {
 	 */
     @Test
 	public void testRowAggregation() {
-		List<Record> records = new ArrayList<>();
+		List<org.apache.poi.hssf.record.Record> records = new ArrayList<>();
 
 		records.add(InternalSheet.createBOF());
 		records.add(new DimensionsRecord());
@@ -430,7 +430,7 @@ public final class TestSheet {
     @Test
 	public void testUncalcSize_bug45066() {
 
-		List<Record> records = new ArrayList<>();
+		List<org.apache.poi.hssf.record.Record> records = new ArrayList<>();
 		records.add(BOFRecord.createSheetBOF());
 		records.add(new UncalcedRecord());
 		records.add(new DimensionsRecord());
@@ -510,7 +510,7 @@ public final class TestSheet {
 			return _indexRecord;
 		}
 		@Override
-        public void visitRecord(Record r) {
+        public void visitRecord(org.apache.poi.hssf.record.Record r) {
 			if (r instanceof IndexRecord) {
 				if (_indexRecord != null) {
 					throw new RuntimeException("too many index records");
@@ -588,7 +588,7 @@ public final class TestSheet {
 		nr.setColumn((short) colIx);
 		nr.setValue(3.0);
 
-		List<Record> inRecs = new ArrayList<>();
+		List<org.apache.poi.hssf.record.Record> inRecs = new ArrayList<>();
 		inRecs.add(BOFRecord.createSheetBOF());
 		inRecs.add(new RowRecord(rowIx));
 		inRecs.add(nr);
@@ -596,7 +596,7 @@ public final class TestSheet {
 		inRecs.add(EOFRecord.instance);
 		InternalSheet sheet = createSheet(inRecs);
 
-		List<Record> outRecs = new ArrayList<>();
+		List<org.apache.poi.hssf.record.Record> outRecs = new ArrayList<>();
 		sheet.visitContainedRecords(outRecs::add, rowIx);
 		assertEquals(8, outRecs.size());
 		DimensionsRecord dims = (DimensionsRecord) outRecs.get(5);
@@ -643,7 +643,7 @@ public final class TestSheet {
 
     @Test
 	public void testCloneMulBlank_bug46776() {
-		Record[]  recs = {
+		org.apache.poi.hssf.record.Record[] recs = {
 				InternalSheet.createBOF(),
 				new DimensionsRecord(),
 				new RowRecord(1),
@@ -657,7 +657,7 @@ public final class TestSheet {
 
 		InternalSheet sheet2 = sheet.cloneSheet();
 
-		List<Record> clonedRecs = new ArrayList<>();
+		List<org.apache.poi.hssf.record.Record> clonedRecs = new ArrayList<>();
 		sheet2.visitContainedRecords(clonedRecs::add, 0);
 		// +2 for INDEX and DBCELL
 		assertEquals(recs.length+2, clonedRecs.size());
@@ -700,7 +700,7 @@ public final class TestSheet {
         r2.setStr(new HSSFRichTextString("Aggregated"));
         NoteRecord n2 = new NoteRecord();
 
-        List<Record> recordStream = new ArrayList<>();
+        List<org.apache.poi.hssf.record.Record> recordStream = new ArrayList<>();
         recordStream.add(InternalSheet.createBOF());
         recordStream.add( d1 );
         recordStream.add( r1 );
@@ -734,7 +734,7 @@ public final class TestSheet {
         confirmAggregatedRecords(recordStream);
      }
 
-    private void confirmAggregatedRecords(List<Record> recordStream){
+    private void confirmAggregatedRecords(List<org.apache.poi.hssf.record.Record> recordStream){
         InternalSheet sheet = InternalSheet.createSheet();
         sheet.getRecords().clear();
         sheet.getRecords().addAll(recordStream);
@@ -745,10 +745,10 @@ public final class TestSheet {
         sheet.aggregateDrawingRecords(drawingManager, false);
 
         assertEquals(4, sheetRecords.size());
-        assertEquals(BOFRecord.sid, ((Record)sheetRecords.get(0)).getSid());
-        assertEquals(EscherAggregate.sid, ((Record)sheetRecords.get(1)).getSid());
-        assertEquals(WindowTwoRecord.sid, ((Record)sheetRecords.get(2)).getSid());
-        assertEquals(EOFRecord.sid, ((Record)sheetRecords.get(3)).getSid());
+        assertEquals(BOFRecord.sid, ((org.apache.poi.hssf.record.Record)sheetRecords.get(0)).getSid());
+        assertEquals(EscherAggregate.sid, ((org.apache.poi.hssf.record.Record)sheetRecords.get(1)).getSid());
+        assertEquals(WindowTwoRecord.sid, ((org.apache.poi.hssf.record.Record)sheetRecords.get(2)).getSid());
+        assertEquals(EOFRecord.sid, ((org.apache.poi.hssf.record.Record)sheetRecords.get(3)).getSid());
     }
 
     @Test
diff --git a/src/testcases/org/apache/poi/hssf/record/TestDrawingRecord.java b/src/testcases/org/apache/poi/hssf/record/TestDrawingRecord.java
index 10491b080c..9b2c650c42 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestDrawingRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestDrawingRecord.java
@@ -53,7 +53,7 @@ public final class TestDrawingRecord {
         ContinueRecord cn = new ContinueRecord(data2);
         out.write(cn.serialize());
 
-        List<Record> rec = RecordFactory.createRecords(new ByteArrayInputStream(out.toByteArray()));
+        List<org.apache.poi.hssf.record.Record> rec = RecordFactory.createRecords(new ByteArrayInputStream(out.toByteArray()));
         assertEquals(2, rec.size());
         assertTrue(rec.get(0) instanceof DrawingRecord);
         assertTrue(rec.get(1) instanceof ContinueRecord);
diff --git a/src/testcases/org/apache/poi/hssf/record/TestFeatRecord.java b/src/testcases/org/apache/poi/hssf/record/TestFeatRecord.java
index 5cde3d1734..b2e75a642b 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestFeatRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestFeatRecord.java
@@ -48,7 +48,7 @@ public final class TestFeatRecord {
 		int countFRH = 0;
 
 		// Check on the workbook, but shouldn't be there!
-		for(Record r : wb.getRecords()) {
+		for(org.apache.poi.hssf.record.Record r : wb.getRecords()) {
 			if(r instanceof FeatRecord) {
 				countFR++;
 			} else if (r.getSid() == FeatRecord.sid) {
@@ -70,7 +70,7 @@ public final class TestFeatRecord {
 
 		for(RecordBase rb : sheet.getRecords()) {
 			if(rb instanceof Record) {
-				Record r = (Record)rb;
+				Record r = (org.apache.poi.hssf.record.Record)rb;
 				if(r instanceof FeatRecord) {
 					countFR++;
 				} else if (r.getSid() == FeatRecord.sid) {
@@ -102,7 +102,7 @@ public final class TestFeatRecord {
 		// First check it isn't on the Workbook
 		int countFR = 0;
 		int countFRH = 0;
-		for(Record r : wb.getRecords()) {
+		for(org.apache.poi.hssf.record.Record r : wb.getRecords()) {
 			if(r instanceof FeatRecord) {
 				fr = (FeatRecord)r;
 				countFR++;
@@ -125,7 +125,7 @@ public final class TestFeatRecord {
 
 		for(RecordBase rb : sheet.getRecords()) {
 			if(rb instanceof Record) {
-				Record r = (Record)rb;
+				Record r = (org.apache.poi.hssf.record.Record)rb;
 				if(r instanceof FeatRecord) {
 					fr = (FeatRecord)r;
 					countFR++;
diff --git a/src/testcases/org/apache/poi/hssf/record/TestInterfaceEndRecord.java b/src/testcases/org/apache/poi/hssf/record/TestInterfaceEndRecord.java
index 84d4bd6efd..f085cf15c8 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestInterfaceEndRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestInterfaceEndRecord.java
@@ -52,7 +52,7 @@ public final class TestInterfaceEndRecord {
                 "E2 00 02 00 B0 04 " + //INTERFACEEND with extra two bytes
                 "0A 00 00 00";    // EOF
         byte[] data = HexRead.readFromString(hex);
-        List<Record> records = RecordFactory.createRecords(new ByteArrayInputStream(data));
+        List<org.apache.poi.hssf.record.Record> records = RecordFactory.createRecords(new ByteArrayInputStream(data));
         assertEquals(3, records.size());
         Record rec1 = records.get(1);
         assertEquals(InterfaceHdrRecord.class, rec1.getClass());
diff --git a/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java b/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java
index b100238c1d..fa4dc0b1e5 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java
@@ -59,7 +59,7 @@ public final class TestMergeCellsRecord {
 	@Test
 	public void testMCTable_bug46009() {
 		MergedCellsTable mct = new MergedCellsTable();
-		List<Record> recList = new ArrayList<>();
+		List<org.apache.poi.hssf.record.Record> recList = new ArrayList<>();
 		CellRangeAddress[] cras = new CellRangeAddress[] {
 				new CellRangeAddress(0, 0, 0, 3),
 		};
diff --git a/src/testcases/org/apache/poi/hssf/record/TestRecordFactory.java b/src/testcases/org/apache/poi/hssf/record/TestRecordFactory.java
index 5b46346bd4..2e67f25b7d 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestRecordFactory.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestRecordFactory.java
@@ -182,7 +182,7 @@ public final class TestRecordFactory {
 				"00 00 00 00 00 00 00";
 		byte[] data = HexRead.readFromString(dump);
 
-		List<Record> records = RecordFactory.createRecords(new ByteArrayInputStream(data));
+		List<org.apache.poi.hssf.record.Record> records = RecordFactory.createRecords(new ByteArrayInputStream(data));
 		assertEquals(5, records.size());
 		assertTrue(records.get(0) instanceof ObjRecord);
 		assertTrue(records.get(1) instanceof DrawingRecord);
@@ -192,7 +192,7 @@ public final class TestRecordFactory {
 
 		//serialize and verify that the serialized data is the same as the original
 		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		for(Record rec : records){
+		for(org.apache.poi.hssf.record.Record rec : records){
 			out.write(rec.serialize());
 		}
 
@@ -211,7 +211,7 @@ public final class TestRecordFactory {
 			EOFRecord.instance,
 		};
 		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		for (Record rec : recs) {
+		for (org.apache.poi.hssf.record.Record rec : recs) {
 			try {
 				baos.write(rec.serialize());
 			} catch (IOException e) {
@@ -232,7 +232,7 @@ public final class TestRecordFactory {
         fs.createDocument(new ByteArrayInputStream(baos.toByteArray()), "dummy");
 		InputStream is = fs.getRoot().createDocumentInputStream("dummy");
 
-		List<Record> outRecs = RecordFactory.createRecords(is);
+		List<org.apache.poi.hssf.record.Record> outRecs = RecordFactory.createRecords(is);
 		// Buffer underrun - requested 512 bytes but 192 was available
 		assertEquals(5, outRecs.size());
 		fs.close();
diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java b/src/testcases/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java
index 7bef9df51d..e5fb8e769d 100644
--- a/src/testcases/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java
+++ b/src/testcases/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java
@@ -55,7 +55,7 @@ public final class TestCFRecordsAggregate {
         HSSFWorkbook workbook = new HSSFWorkbook();
         HSSFSheet sheet = workbook.createSheet();
 
-        List<Record> recs = new ArrayList<>();
+        List<org.apache.poi.hssf.record.Record> recs = new ArrayList<>();
         CFHeaderBase header = new CFHeaderRecord();
         CFRuleBase rule1 = CFRuleRecord.create(sheet, "7");
         CFRuleBase rule2 = CFRuleRecord.create(sheet, ComparisonOperator.BETWEEN, "2", "5");
diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java b/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java
index 6b9e1e62ed..569ffbc8fc 100644
--- a/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java
+++ b/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java
@@ -69,7 +69,7 @@ public final class TestColumnInfoRecordsAggregate {
 		// bug 45639 - ArrayIndexOutOfBoundsException
 		agg.groupColumnRange( 1, 15, true);
 
-		List<Record> cirs = new ArrayList<>();
+		List<org.apache.poi.hssf.record.Record> cirs = new ArrayList<>();
 		agg.visitContainedRecords(cirs::add);
 
 		assertEquals(5, cirs.size());
@@ -89,7 +89,7 @@ public final class TestColumnInfoRecordsAggregate {
 		agg.groupColumnRange(1, 15, true);
 		agg.groupColumnRange(4, 12, true);
 
-		List<Record> cirs = new ArrayList<>();
+		List<org.apache.poi.hssf.record.Record> cirs = new ArrayList<>();
 
 		// collapse both inner and outer groups
 		agg.collapseColumn(6);
@@ -116,7 +116,7 @@ public final class TestColumnInfoRecordsAggregate {
 		confirmCIR(cirs, 3, 16, 16, 0, false, true);
 	}
 
-	private static void confirmCIR(List<Record> cirs, int ix, int startColIx, int endColIx, int level, boolean isHidden, boolean isCollapsed) {
+	private static void confirmCIR(List<org.apache.poi.hssf.record.Record> cirs, int ix, int startColIx, int endColIx, int level, boolean isHidden, boolean isCollapsed) {
 		assertTrue(cirs.get(ix) instanceof ColumnInfoRecord);
 		ColumnInfoRecord cir = (ColumnInfoRecord)cirs.get(ix);
 		assertEquals("startColIx", startColIx, cir.getFirstColumn());
diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java b/src/testcases/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java
index a7f851d9dd..798fa54b5a 100644
--- a/src/testcases/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java
+++ b/src/testcases/org/apache/poi/hssf/record/aggregates/TestFormulaRecordAggregate.java
@@ -65,7 +65,7 @@ public final class TestFormulaRecordAggregate {
 		SharedValueManager svm = SharedValueManager.createEmpty();
 		// bug 46213 -> String record was  supplied but formula record flag is not  set
 		FormulaRecordAggregate fra = new FormulaRecordAggregate(fr, sr, svm);
-		List<Record> vraRecs = new ArrayList<>();
+		List<org.apache.poi.hssf.record.Record> vraRecs = new ArrayList<>();
 		fra.visitContainedRecords(vraRecs::add);
 		assertEquals(1, vraRecs.size());
 		assertEquals(fr, vraRecs.get(0));
diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java b/src/testcases/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java
index 0252a14206..1862efeb6a 100644
--- a/src/testcases/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java
+++ b/src/testcases/org/apache/poi/hssf/record/aggregates/TestPageSettingsBlock.java
@@ -92,7 +92,7 @@ public final class TestPageSettingsBlock {
 		nr.setColumn((short) colIx);
 		nr.setValue(3.0);
 
-		Record[] recs = {
+		org.apache.poi.hssf.record.Record[] recs = {
 				BOFRecord.createSheetBOF(),
 				new HeaderRecord("&LSales Figures"),
 				new FooterRecord("&LJanuary"),
@@ -111,7 +111,7 @@ public final class TestPageSettingsBlock {
 		// bug 46480- two Page Settings Blocks found in the same sheet
 		InternalSheet sheet = InternalSheet.createSheet(rs);
 
-		List<Record> outRecs = new ArrayList<>();
+		List<org.apache.poi.hssf.record.Record> outRecs = new ArrayList<>();
 		sheet.visitContainedRecords(outRecs::add, rowIx);
 		assertEquals(13, outRecs.size());
 	}
@@ -129,7 +129,7 @@ public final class TestPageSettingsBlock {
 		nr.setColumn((short) colIx);
 		nr.setValue(3.0);
 
-		Record[] recs = {
+		org.apache.poi.hssf.record.Record[] recs = {
 				BOFRecord.createSheetBOF(),
 				new HeaderRecord("&LSales Figures"),
 				new FooterRecord("&LJanuary"),
@@ -141,7 +141,7 @@ public final class TestPageSettingsBlock {
 		RecordStream rs = new RecordStream(Arrays.asList(recs), 0);
 		InternalSheet sheet = InternalSheet.createSheet(rs);
 
-		List<Record> outRecs = new ArrayList<>();
+		List<org.apache.poi.hssf.record.Record> outRecs = new ArrayList<>();
 		sheet.visitContainedRecords(outRecs::add, 0);
 		// Identified bug 46953 - EOF incorrectly appended to PSB
 		assertNotEquals(EOFRecord.instance, outRecs.get(4));
@@ -170,7 +170,7 @@ public final class TestPageSettingsBlock {
 		BottomMarginRecord bottomMargin = new BottomMarginRecord();
 		bottomMargin.setMargin(0.787F);
 
-		Record[] recs = {
+		org.apache.poi.hssf.record.Record[] recs = {
 				BOFRecord.createSheetBOF(),
 				new HeaderRecord("&LSales Figures"),
 				new FooterRecord("&LJanuary"),
@@ -184,7 +184,7 @@ public final class TestPageSettingsBlock {
 		// bug 47199a - failed to process late margins records
 		InternalSheet sheet = InternalSheet.createSheet(rs);
 
-		List<Record> outRecs = new ArrayList<>();
+		List<org.apache.poi.hssf.record.Record> outRecs = new ArrayList<>();
 		sheet.visitContainedRecords(outRecs::add, 0);
 		assertEquals(recs.length+1, outRecs.size()); // +1 for index record
 
@@ -201,7 +201,7 @@ public final class TestPageSettingsBlock {
 	@Test
 	public void testDuplicatePSBRecord_bug47199() {
 		// Hypothetical setup of PSB records which should cause POI to crash
-		Record[] recs = {
+		org.apache.poi.hssf.record.Record[] recs = {
 				new HeaderRecord("&LSales Figures"),
 				new HeaderRecord("&LInventory"),
 		};
@@ -220,7 +220,7 @@ public final class TestPageSettingsBlock {
 	@Test
 	public void testMissingHeaderFooter() {
 		// initialise PSB with some records, but not the header / footer
-		Record[] recs = {
+		org.apache.poi.hssf.record.Record[] recs = {
 				new HCenterRecord(),
 				new VCenterRecord(),
 		};
@@ -228,7 +228,7 @@ public final class TestPageSettingsBlock {
 		PageSettingsBlock psb = new PageSettingsBlock(rs);
 
 		// serialize the PSB to see what records come out
-		List<Record> outRecs = new ArrayList<>();
+		List<org.apache.poi.hssf.record.Record> outRecs = new ArrayList<>();
 		psb.visitContainedRecords(outRecs::add);
 
 		assertNotEquals("PageSettingsBlock didn't add missing header/footer records", 2, outRecs.size());
@@ -259,7 +259,7 @@ public final class TestPageSettingsBlock {
 		Record plsB = new UnknownRecord(UnknownRecord.PLS_004D, HexRead.readFromString("DE AD BE EF"));
 		Record contB1 = new ContinueRecord(HexRead.readFromString("FE ED"));
 		Record contB2 = new ContinueRecord(HexRead.readFromString("FA CE"));
-		Record[] recs = {
+		org.apache.poi.hssf.record.Record[] recs = {
 				new HeaderRecord("&LSales Figures"),
 				new FooterRecord("&LInventory"),
 				new HCenterRecord(),
@@ -272,7 +272,7 @@ public final class TestPageSettingsBlock {
 		PageSettingsBlock psb = new PageSettingsBlock(rs);
 
 		// serialize the PSB to see what records come out
-		List<Record> outRecs = new ArrayList<>();
+		List<org.apache.poi.hssf.record.Record> outRecs = new ArrayList<>();
 		psb.visitContainedRecords(outRecs::add);
 
 		// records were assembled in standard order, so this simple check is OK
@@ -282,7 +282,7 @@ public final class TestPageSettingsBlock {
 	@Test
     public void testDuplicateHeaderFooter_bug48026() {
 
-        Record[] recs = {
+        org.apache.poi.hssf.record.Record[] recs = {
                 BOFRecord.createSheetBOF(),
                 new IndexRecord(),
 
@@ -309,7 +309,7 @@ public final class TestPageSettingsBlock {
         // bug 48026 - Duplicate PageSettingsBlock record (sid=0x89c)
         InternalSheet sheet = InternalSheet.createSheet(rs);
 
-        List<Record> outRecs = new ArrayList<>();
+        List<org.apache.poi.hssf.record.Record> outRecs = new ArrayList<>();
         sheet.visitContainedRecords(outRecs::add, 0);
 
         assertEquals(recs.length, outRecs.size());
@@ -382,7 +382,7 @@ public final class TestPageSettingsBlock {
         // Bug 48026 : Duplicate PageSettingsBlock record (sid=0x89c)
         InternalSheet sheet = InternalSheet.createSheet(rs);
 
-		List<Record> outRecs = new ArrayList<>();
+		List<org.apache.poi.hssf.record.Record> outRecs = new ArrayList<>();
         sheet.visitContainedRecords(outRecs::add, 0);
 
         assertEquals(recs.length+1, outRecs.size());
diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java b/src/testcases/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java
index a5fe0f0ea6..c6b44be8f4 100644
--- a/src/testcases/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java
+++ b/src/testcases/org/apache/poi/hssf/record/aggregates/TestRowRecordsAggregate.java
@@ -71,7 +71,7 @@ public final class TestRowRecordsAggregate {
     @Test
 	public void testArraysAndTables() throws Exception {
 		try (HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook("testArraysAndTables.xls")) {
-			final List<Record> sheetRecs = new ArrayList<>();
+			final List<org.apache.poi.hssf.record.Record> sheetRecs = new ArrayList<>();
 			wb.getSheetAt(0).getSheet().visitContainedRecords(sheetRecs::add, 0);
 
 			int countArrayFormulas = verifySharedValues(sheetRecs, ArrayRecord.class);
@@ -100,7 +100,7 @@ public final class TestRowRecordsAggregate {
 		}
 	}
 
-	private static int verifySharedValues(List<Record> recs, Class<? extends SharedValueRecordBase> shfClass) {
+	private static int verifySharedValues(List<org.apache.poi.hssf.record.Record> recs, Class<? extends SharedValueRecordBase> shfClass) {
 
 		int result =0;
 		for(int i=0; i<recs.size(); i++) {
@@ -137,7 +137,7 @@ public final class TestRowRecordsAggregate {
 	 */
 	@Test
 	public void testUnknownContinue_bug46280() {
-		Record[] inRecs = {
+		org.apache.poi.hssf.record.Record[] inRecs = {
 			new RowRecord(0),
 			new NumberRecord(),
 			new UnknownRecord(0x5555, "dummydata".getBytes(LocaleUtil.CHARSET_1252)),
@@ -154,7 +154,7 @@ public final class TestRowRecordsAggregate {
 			throw e;
 		}
 
-		List<Record> outRecs = new ArrayList<>();
+		List<org.apache.poi.hssf.record.Record> outRecs = new ArrayList<>();
 		rra.visitContainedRecords(outRecs::add);
 		assertEquals(5, outRecs.size());
 	}
diff --git a/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java b/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java
index 61984e1295..477affdbf0 100644
--- a/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java
+++ b/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java
@@ -67,7 +67,7 @@ public final class TestValueRecordsAggregate {
 	 */
     @Test
 	public void testSharedFormula() {
-		List<Record> records = new ArrayList<>();
+		List<org.apache.poi.hssf.record.Record> records = new ArrayList<>();
 		records.add(new FormulaRecord());
 		records.add(new SharedFormulaRecord());
 		records.add(new WindowTwoRecord());
@@ -82,7 +82,7 @@ public final class TestValueRecordsAggregate {
 		assertTrue( "First record is a FormulaRecordsAggregate", ( record instanceof FormulaRecordAggregate ) );
 	}
 
-	private void constructValueRecord(List<Record> records) {
+	private void constructValueRecord(List<org.apache.poi.hssf.record.Record> records) {
 		RowBlocksReader rbr = new RowBlocksReader(new RecordStream(records, 0));
 		SharedValueManager sfrh = rbr.getSharedFormulaManager();
 		RecordStream rs = rbr.getPlainRecordStream();
@@ -92,8 +92,8 @@ public final class TestValueRecordsAggregate {
 		}
 	}
 
-	private static List<Record> testData() {
-		List<Record> records = new ArrayList<>();
+	private static List<org.apache.poi.hssf.record.Record> testData() {
+		List<org.apache.poi.hssf.record.Record> records = new ArrayList<>();
 		FormulaRecord formulaRecord = new FormulaRecord();
 		BlankRecord blankRecord = new BlankRecord();
 		formulaRecord.setRow(1);
@@ -174,7 +174,7 @@ public final class TestValueRecordsAggregate {
 
 		}
 		@Override
-        public void visitRecord(Record r) {
+        public void visitRecord(org.apache.poi.hssf.record.Record r) {
 			r.serialize(_writeIndex, _buf);
 			_writeIndex += r.getRecordSize();
 		}
@@ -191,7 +191,7 @@ public final class TestValueRecordsAggregate {
 				+ "01 02 06 00 " // Blank
 				+ "02 00 02 00 00 00");
 		byte[] actualArray = new byte[expectedArray.length];
-		List<Record> records = testData();
+		List<org.apache.poi.hssf.record.Record> records = testData();
 		constructValueRecord(records);
 
 		SerializerVisitor sv = new SerializerVisitor(actualArray);
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java
index b345c89b3d..53774be9ac 100644
--- a/src/testcases/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java
@@ -71,7 +71,7 @@ public final class TestChartTitleFormatRecord {
 		}
 
 		@Override
-        public void processRecord(Record record) {
+        public void processRecord(org.apache.poi.hssf.record.Record record) {
 			if(record instanceof ChartTitleFormatRecord) {
 				chartTitleFormatRecords.add((ChartTitleFormatRecord)record);
 			}
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/SanityChecker.java b/src/testcases/org/apache/poi/hssf/usermodel/SanityChecker.java
index 5f90b7285f..04ac448d25 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/SanityChecker.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/SanityChecker.java
@@ -258,7 +258,7 @@ public class SanityChecker {
 
     private void checkWorkbookRecords(InternalWorkbook workbook)
     {
-        List<Record> records = workbook.getRecords();
+        List<org.apache.poi.hssf.record.Record> records = workbook.getRecords();
         assertTrue(records.get(0) instanceof BOFRecord);
         assertTrue(records.get(records.size() - 1) instanceof EOFRecord);
 
@@ -338,7 +338,7 @@ public class SanityChecker {
         int checkIndex = 0;
         for (int recordIndex = 0; recordIndex < records.size(); recordIndex++)
         {
-            Record record = (Record) records.get(recordIndex);
+            Record record = (org.apache.poi.hssf.record.Record) records.get(recordIndex);
             if (check[checkIndex].getRecord().isInstance(record))
             {
                 if (check[checkIndex].getOccurance() == 'M')
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java b/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
index 811633f689..00828e4305 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java
@@ -1641,7 +1641,7 @@ public final class TestBugs extends BaseTestBugzillaIssues {
             try (HSSFWorkbook wb2 = writeOutAndReadBack(wb1)) {
                 // Ensure the tab index
                 TabIdRecord tr = null;
-                for (Record r : wb2.getWorkbook().getRecords()) {
+                for (org.apache.poi.hssf.record.Record r : wb2.getWorkbook().getRecords()) {
                     if (r instanceof TabIdRecord) {
                         tr = (TabIdRecord) r;
                     }
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java
index 95cbdb7992..e3372c629b 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFCell.java
@@ -327,7 +327,7 @@ public final class TestHSSFCell extends BaseTestCell {
 			confirmStringRecord(sheet, true);
 			cell.setCellValue(123);
 
-			final List<Record> recs = new ArrayList<>();
+			final List<org.apache.poi.hssf.record.Record> recs = new ArrayList<>();
 			sheet.getSheet().visitContainedRecords(recs::add, 0);
 			assertFalse("Identified bug - leftover StringRecord", recs.size() == 28 && recs.get(23) instanceof StringRecord);
 			confirmStringRecord(sheet, false);
@@ -347,11 +347,11 @@ public final class TestHSSFCell extends BaseTestCell {
 	}
 
 	private static void confirmStringRecord(HSSFSheet sheet, boolean isPresent) {
-		List<Record> recs = new ArrayList<>();
+		List<org.apache.poi.hssf.record.Record> recs = new ArrayList<>();
 		sheet.getSheet().visitContainedRecords(recs::add, 0);
 		assertEquals(isPresent ? 28 : 27, recs.size());
 
-		ListIterator<Record> iter = recs.listIterator(22);
+		ListIterator<org.apache.poi.hssf.record.Record> iter = recs.listIterator(22);
 		assertEquals(FormulaRecord.class, iter.next().getClass());
 		if (isPresent) {
 			assertEquals(StringRecord.class, iter.next().getClass());
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
index 78d6756cb4..821a14b9ef 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheet.java
@@ -414,7 +414,7 @@ public final class TestHSSFSheet extends BaseTestSheet {
         try (HSSFWorkbook wb = new HSSFWorkbook()) {
             HSSFSheet s = wb.createSheet();
             s.protectSheet("secret");
-            List<Record> recs = new ArrayList<>();
+            List<org.apache.poi.hssf.record.Record> recs = new ArrayList<>();
             s.getSheet().visitContainedRecords(recs::add, 0);
             int nRecs = recs.size();
 
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetUpdateArrayFormulas.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetUpdateArrayFormulas.java
index ac8df385cf..cc06e8fca6 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetUpdateArrayFormulas.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFSheetUpdateArrayFormulas.java
@@ -86,11 +86,11 @@ public final class TestHSSFSheetUpdateArrayFormulas extends BaseTestSheetUpdateA
             HSSFSheet s = wb.createSheet("Sheet1");
 
             CellRange<HSSFCell> cr = s.setArrayFormula("123", CellRangeAddress.valueOf("B5:C6"));
-            List<Record> recs = new ArrayList<>();
+            List<org.apache.poi.hssf.record.Record> recs = new ArrayList<>();
             s.getSheet().visitContainedRecords(recs::add, 0);
 
             int ix = 0;
-            for (Record r : recs) {
+            for (org.apache.poi.hssf.record.Record r : recs) {
                 if (r instanceof ArrayRecord) break;
                 ix++;
             }
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestSanityChecker.java b/src/testcases/org/apache/poi/hssf/usermodel/TestSanityChecker.java
index c8b10d1b39..0293348636 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestSanityChecker.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestSanityChecker.java
@@ -47,7 +47,7 @@ public final class TestSanityChecker {
 	@Test
 	public void testCheckRecordOrder() {
 		final SanityChecker c = new SanityChecker();
-		List<Record> records = new ArrayList<>();
+		List<org.apache.poi.hssf.record.Record> records = new ArrayList<>();
 		records.add(new BOFRecord());
 		records.add(INTERFACEHDR);
 		records.add(createBoundSheetRec());
@@ -121,7 +121,7 @@ public final class TestSanityChecker {
 	}
 	private static void confirmBadRecordOrder(final SanityChecker.CheckRecord[] check, Record[] recs) {
 		final SanityChecker c = new SanityChecker();
-		final List<Record> records = Arrays.asList(recs);
+		final List<org.apache.poi.hssf.record.Record> records = Arrays.asList(recs);
 		try {
 			new Runnable() {
 				@Override
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestWorkbook.java b/src/testcases/org/apache/poi/hssf/usermodel/TestWorkbook.java
index 04d85130fd..79d9553eca 100644
--- a/src/testcases/org/apache/poi/hssf/usermodel/TestWorkbook.java
+++ b/src/testcases/org/apache/poi/hssf/usermodel/TestWorkbook.java
@@ -456,7 +456,7 @@ public final class TestWorkbook {
             return _count;
         }
         @Override
-        public void visitRecord(Record r) {
+        public void visitRecord(org.apache.poi.hssf.record.Record r) {
             if (r instanceof LabelSSTRecord) {
                 _count++;
             }