diff options
Diffstat (limited to 'src/testcases')
59 files changed, 97 insertions, 97 deletions
diff --git a/src/testcases/org/apache/poi/POITestCase.java b/src/testcases/org/apache/poi/POITestCase.java index 88c6eb69ee..4aec492a4c 100644 --- a/src/testcases/org/apache/poi/POITestCase.java +++ b/src/testcases/org/apache/poi/POITestCase.java @@ -176,7 +176,7 @@ public final class POITestCase { @Override @SuppressForbidden("Test only") public List<Field> run() throws Exception { - List<Field> flds = new ArrayList<Field>(); + List<Field> flds = new ArrayList<>(); for (Class<?> c = expected.getClass(); c != null; c = c.getSuperclass()) { Field[] fs = c.getDeclaredFields(); AccessibleObject.setAccessible(fs, true); diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestReadAllFiles.java b/src/testcases/org/apache/poi/hpsf/basic/TestReadAllFiles.java index ce3cf6d34d..ad42ee0534 100644 --- a/src/testcases/org/apache/poi/hpsf/basic/TestReadAllFiles.java +++ b/src/testcases/org/apache/poi/hpsf/basic/TestReadAllFiles.java @@ -60,7 +60,7 @@ public class TestReadAllFiles { @Parameters(name="{index}: {0} using {1}") public static Iterable<Object[]> files() { - final List<Object[]> files = new ArrayList<Object[]>(); + final List<Object[]> files = new ArrayList<>(); _samples.getFile("").listFiles(new FileFilter() { @Override @@ -112,7 +112,7 @@ public class TestReadAllFiles { @Test public void recreate() throws IOException, HPSFException { /* Read the POI filesystem's property set streams: */ - Map<String,PropertySet> psMap = new HashMap<String,PropertySet>(); + Map<String,PropertySet> psMap = new HashMap<>(); /* Create a new POI filesystem containing the origin file's * property set streams: */ diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java b/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java index 911a27b699..278ac9421d 100644 --- a/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java +++ b/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java @@ -480,7 +480,7 @@ public class TestWrite { final POIFSFileSystem poiFs = new POIFSFileSystem(); final PropertySet ps1 = new PropertySet(); final Section s = ps1.getSections().get(0); - final Map<Long,String> m = new HashMap<Long,String>(3, 1.0f); + final Map<Long,String> m = new HashMap<>(3, 1.0f); m.put(Long.valueOf(1), "String 1"); m.put(Long.valueOf(2), "String 2"); m.put(Long.valueOf(3), "String 3"); @@ -744,7 +744,7 @@ public class TestWrite { final POIFSFileSystem poiFs = new POIFSFileSystem(); final PropertySet ps1 = new PropertySet(); final Section s = ps1.getSections().get(0); - final Map<Long,String> m = new HashMap<Long, String>(3, 1.0f); + final Map<Long,String> m = new HashMap<>(3, 1.0f); m.put(Long.valueOf(1), "String 1"); m.put(Long.valueOf(2), "String 2"); m.put(Long.valueOf(3), "String 3"); diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java b/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java index 46cf64b51c..af4674e4d1 100644 --- a/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java +++ b/src/testcases/org/apache/poi/hpsf/basic/TestWriteWellKnown.java @@ -550,7 +550,7 @@ public class TestWriteWellKnown { final int ID_2 = 3; final String NAME_1 = "Schl\u00fcssel \u00e4"; final String VALUE_1 = "Wert 1"; - final Map<Long,String> dictionary = new HashMap<Long, String>(); + final Map<Long,String> dictionary = new HashMap<>(); DocumentSummaryInformation dsi = PropertySetFactory.newDocumentSummaryInformation(); CustomProperties cps; diff --git a/src/testcases/org/apache/poi/hpsf/basic/Util.java b/src/testcases/org/apache/poi/hpsf/basic/Util.java index cc489d8533..daa58d789d 100644 --- a/src/testcases/org/apache/poi/hpsf/basic/Util.java +++ b/src/testcases/org/apache/poi/hpsf/basic/Util.java @@ -60,7 +60,7 @@ final class Util { */ public static List<POIFile> readPOIFiles(final File poiFs, final String... poiFiles) throws FileNotFoundException, IOException { - final List<POIFile> files = new ArrayList<POIFile>(); + final List<POIFile> files = new ArrayList<>(); POIFSReader r = new POIFSReader(); POIFSReaderListener pfl = new POIFSReaderListener() { @Override @@ -116,7 +116,7 @@ final class Util { * @exception IOException if an I/O exception occurs */ public static List<POIFile> readPropertySets(final File poiFs) throws IOException { - final List<POIFile> files = new ArrayList<POIFile>(7); + final List<POIFile> files = new ArrayList<>(7); final POIFSReader r = new POIFSReader(); POIFSReaderListener pfl = new POIFSReaderListener() { @Override diff --git a/src/testcases/org/apache/poi/hssf/dev/BaseXLSIteratingTest.java b/src/testcases/org/apache/poi/hssf/dev/BaseXLSIteratingTest.java index e69c700dea..d740a8a37e 100644 --- a/src/testcases/org/apache/poi/hssf/dev/BaseXLSIteratingTest.java +++ b/src/testcases/org/apache/poi/hssf/dev/BaseXLSIteratingTest.java @@ -54,7 +54,7 @@ public abstract class BaseXLSIteratingTest { public ExpectedException thrown = ExpectedException.none(); protected static final Map<String,Class<? extends Throwable>> EXCLUDED = - new HashMap<String,Class<? extends Throwable>>(); + new HashMap<>(); @Parameters(name="{index}: {0}") public static Iterable<Object[]> files() { @@ -63,7 +63,7 @@ public abstract class BaseXLSIteratingTest { dataDirName = "test-data"; } - List<Object[]> files = new ArrayList<Object[]>(); + List<Object[]> files = new ArrayList<>(); findFile(files, dataDirName + "/spreadsheet"); findFile(files, dataDirName + "/hpsf"); diff --git a/src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java b/src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java index 609640c6dd..296eff6458 100644 --- a/src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java +++ b/src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java @@ -150,8 +150,8 @@ public final class TestEventWorkbookBuilder extends TestCase { private static final class MockHSSFListener implements HSSFListener { public MockHSSFListener() {} - private final List<Record> _records = new ArrayList<Record>(); - private final List<Record> _frecs = new ArrayList<Record>(); + private final List<Record> _records = new ArrayList<>(); + private final List<Record> _frecs = new ArrayList<>(); @Override public void processRecord(Record record) { diff --git a/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java b/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java index e617735b6a..89efb527f5 100644 --- a/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java +++ b/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java @@ -106,7 +106,7 @@ public final class TestFormatTrackingHSSFListener { private static final class MockHSSFListener implements HSSFListener { public MockHSSFListener() {} - private final List<Record> _records = new ArrayList<Record>(); + private final List<Record> _records = new ArrayList<>(); @Override public void processRecord(Record record) { diff --git a/src/testcases/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java b/src/testcases/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java index 040b83cfb0..e57118b835 100644 --- a/src/testcases/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java +++ b/src/testcases/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java @@ -121,7 +121,7 @@ public final class TestHSSFEventFactory extends TestCase { } private static class MockHSSFListener implements HSSFListener { - private final List<Record> records = new ArrayList<Record>(); + private final List<Record> records = new ArrayList<>(); public MockHSSFListener() {} public Record[] getRecords() { diff --git a/src/testcases/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java b/src/testcases/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java index 0867720f79..5387723b81 100644 --- a/src/testcases/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java +++ b/src/testcases/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java @@ -364,7 +364,7 @@ public final class TestMissingRecordAwareHSSFListener extends TestCase { private static final class MockHSSFListener implements HSSFListener { public MockHSSFListener() {} - private final List<Record> _records = new ArrayList<Record>(); + private final List<Record> _records = new ArrayList<>(); private final boolean logToStdOut = false; @Override diff --git a/src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java b/src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java index ddeacd6fb8..f051529b75 100644 --- a/src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java +++ b/src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java @@ -102,7 +102,7 @@ public class TestDrawingAggregate { } } if(info != null){ - info.aggRecords = new ArrayList<RecordBase>( + info.aggRecords = new ArrayList<>( records.subList(info.startRecordIndex, info.endRecordIndex + 1)); } return info; @@ -134,7 +134,7 @@ public class TestDrawingAggregate { */ private static void assertWriteAndReadBack(HSSFWorkbook wb) throws IOException { // map aggregate info by sheet index - Map<Integer, DrawingAggregateInfo> aggs = new HashMap<Integer, DrawingAggregateInfo>(); + Map<Integer, DrawingAggregateInfo> aggs = new HashMap<>(); for(int i = 0; i < wb.getNumberOfSheets(); i++){ HSSFSheet sheet = wb.getSheetAt(i); DrawingAggregateInfo info = DrawingAggregateInfo.get(sheet); @@ -223,7 +223,7 @@ public class TestDrawingAggregate { "+2eqbvLdxQ0ndhy5KJ/lc1ZZK9okY5X/gSbrHZTH1vE/ozagTcwAAAA="; byte[] dgBytes = decompress(data); - List<EscherRecord> records = new ArrayList<EscherRecord>(); + List<EscherRecord> records = new ArrayList<>(); EscherRecordFactory recordFactory = new DefaultEscherRecordFactory(); int pos = 0; while (pos < dgBytes.length) { diff --git a/src/testcases/org/apache/poi/hssf/model/TestLinkTable.java b/src/testcases/org/apache/poi/hssf/model/TestLinkTable.java index d34de10923..fbd562b444 100644 --- a/src/testcases/org/apache/poi/hssf/model/TestLinkTable.java +++ b/src/testcases/org/apache/poi/hssf/model/TestLinkTable.java @@ -175,7 +175,7 @@ public final class TestLinkTable extends TestCase { }; final List<Record> recList = Arrays.asList(recs); final WorkbookRecordList wrl = new WorkbookRecordList(); - final Map<String, NameCommentRecord> commentRecords = new LinkedHashMap<String, NameCommentRecord>(); + final Map<String, NameCommentRecord> commentRecords = new LinkedHashMap<>(); final LinkTable lt = new LinkTable(recList, 0, wrl, commentRecords); assertNotNull(lt); diff --git a/src/testcases/org/apache/poi/hssf/model/TestRVA.java b/src/testcases/org/apache/poi/hssf/model/TestRVA.java index ec090bd537..cf5fc4ab36 100644 --- a/src/testcases/org/apache/poi/hssf/model/TestRVA.java +++ b/src/testcases/org/apache/poi/hssf/model/TestRVA.java @@ -72,7 +72,7 @@ public final class TestRVA { workbook = new HSSFWorkbook(poifs); sheet = workbook.getSheetAt(0); - List<Object[]> data = new ArrayList<Object[]>(); + List<Object[]> data = new ArrayList<>(); for (int rowIdx = 0; true; rowIdx++) { HSSFRow row = sheet.getRow(rowIdx); diff --git a/src/testcases/org/apache/poi/hssf/model/TestSheet.java b/src/testcases/org/apache/poi/hssf/model/TestSheet.java index cbd1200eed..e8e2db0823 100644 --- a/src/testcases/org/apache/poi/hssf/model/TestSheet.java +++ b/src/testcases/org/apache/poi/hssf/model/TestSheet.java @@ -87,7 +87,7 @@ public final class TestSheet { @Test public void testCreateSheet() { // Check we're adding row and cell aggregates - List<Record> records = new ArrayList<Record>(); + List<Record> records = new ArrayList<>(); records.add(BOFRecord.createSheetBOF()); records.add( new DimensionsRecord() ); records.add(createWindow2Record()); @@ -205,7 +205,7 @@ public final class TestSheet { */ @Test public void testMovingMergedRegion() { - List<Record> records = new ArrayList<Record>(); + List<Record> records = new ArrayList<>(); CellRangeAddress[] cras = { new CellRangeAddress(0, 1, 0, 2), @@ -244,7 +244,7 @@ public final class TestSheet { */ @Test public void testRowAggregation() { - List<Record> records = new ArrayList<Record>(); + List<Record> records = new ArrayList<>(); records.add(InternalSheet.createBOF()); records.add(new DimensionsRecord()); @@ -479,7 +479,7 @@ public final class TestSheet { @Test public void testUncalcSize_bug45066() { - List<Record> records = new ArrayList<Record>(); + List<Record> records = new ArrayList<>(); records.add(BOFRecord.createSheetBOF()); records.add(new UncalcedRecord()); records.add(new DimensionsRecord()); @@ -640,7 +640,7 @@ public final class TestSheet { nr.setColumn((short) colIx); nr.setValue(3.0); - List<Record> inRecs = new ArrayList<Record>(); + List<Record> inRecs = new ArrayList<>(); inRecs.add(BOFRecord.createSheetBOF()); inRecs.add(new RowRecord(rowIx)); inRecs.add(nr); @@ -777,7 +777,7 @@ public final class TestSheet { r2.setStr(new HSSFRichTextString("Aggregated")); NoteRecord n2 = new NoteRecord(); - List<Record> recordStream = new ArrayList<Record>(); + List<Record> recordStream = new ArrayList<>(); recordStream.add(InternalSheet.createBOF()); recordStream.add( d1 ); recordStream.add( r1 ); @@ -787,7 +787,7 @@ public final class TestSheet { confirmAggregatedRecords(recordStream); - recordStream = new ArrayList<Record>(); + recordStream = new ArrayList<>(); recordStream.add(InternalSheet.createBOF()); recordStream.add( d1 ); recordStream.add( r1 ); @@ -798,7 +798,7 @@ public final class TestSheet { confirmAggregatedRecords(recordStream); - recordStream = new ArrayList<Record>(); + recordStream = new ArrayList<>(); recordStream.add(InternalSheet.createBOF()); recordStream.add( d1 ); recordStream.add( r1 ); diff --git a/src/testcases/org/apache/poi/hssf/record/TestBoundSheetRecord.java b/src/testcases/org/apache/poi/hssf/record/TestBoundSheetRecord.java index d50ae9e73a..b231e36781 100644 --- a/src/testcases/org/apache/poi/hssf/record/TestBoundSheetRecord.java +++ b/src/testcases/org/apache/poi/hssf/record/TestBoundSheetRecord.java @@ -88,7 +88,7 @@ public final class TestBoundSheetRecord extends TestCase { bs2.setPositionOfBof(33); bs3.setPositionOfBof(22); - List<BoundSheetRecord> l = new ArrayList<BoundSheetRecord>(); + List<BoundSheetRecord> l = new ArrayList<>(); l.add(bs1); l.add(bs2); l.add(bs3); diff --git a/src/testcases/org/apache/poi/hssf/record/TestEscherAggregate.java b/src/testcases/org/apache/poi/hssf/record/TestEscherAggregate.java index 0df5d44f40..0e9a0ba297 100644 --- a/src/testcases/org/apache/poi/hssf/record/TestEscherAggregate.java +++ b/src/testcases/org/apache/poi/hssf/record/TestEscherAggregate.java @@ -70,7 +70,7 @@ public final class TestEscherAggregate extends TestCase { ObjRecord r2 = new ObjRecord(); - List<RecordBase> records = new ArrayList<RecordBase>(); + List<RecordBase> records = new ArrayList<>(); records.add( d1 ); records.add( r1 ); records.add( d2 ); diff --git a/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java b/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java index d7d05ab459..fdc2fd779e 100644 --- a/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java +++ b/src/testcases/org/apache/poi/hssf/record/TestMergeCellsRecord.java @@ -65,7 +65,7 @@ public final class TestMergeCellsRecord extends TestCase { }; public void testMCTable_bug46009() { MergedCellsTable mct = new MergedCellsTable(); - List<Record> recList = new ArrayList<Record>(); + List<Record> recList = new ArrayList<>(); CellRangeAddress[] cras = new CellRangeAddress[] { new CellRangeAddress(0, 0, 0, 3), }; diff --git a/src/testcases/org/apache/poi/hssf/record/TestSSTDeserializer.java b/src/testcases/org/apache/poi/hssf/record/TestSSTDeserializer.java index c7797115a4..17a5a8852f 100644 --- a/src/testcases/org/apache/poi/hssf/record/TestSSTDeserializer.java +++ b/src/testcases/org/apache/poi/hssf/record/TestSSTDeserializer.java @@ -59,7 +59,7 @@ public final class TestSSTDeserializer { RecordInputStream in = TestcaseRecordInputStream.create(concat(header, continueBytes)); - IntMapper<UnicodeString> strings = new IntMapper<UnicodeString>(); + IntMapper<UnicodeString> strings = new IntMapper<>(); SSTDeserializer deserializer = new SSTDeserializer( strings ); deserializer.manufactureStrings(1, in ); @@ -72,7 +72,7 @@ public final class TestSSTDeserializer { byte[] continueBytes = readSampleHexData("evencontinuation.txt", "continue1", ContinueRecord.sid); RecordInputStream in = TestcaseRecordInputStream.create(concat(header, continueBytes)); - IntMapper<UnicodeString> strings = new IntMapper<UnicodeString>(); + IntMapper<UnicodeString> strings = new IntMapper<>(); SSTDeserializer deserializer = new SSTDeserializer( strings ); deserializer.manufactureStrings( 2, in); @@ -91,7 +91,7 @@ public final class TestSSTDeserializer { RecordInputStream in = TestcaseRecordInputStream.create(concat(header, concat(continue1, continue2))); - IntMapper<UnicodeString> strings = new IntMapper<UnicodeString>(); + IntMapper<UnicodeString> strings = new IntMapper<>(); SSTDeserializer deserializer = new SSTDeserializer( strings ); deserializer.manufactureStrings( 2, in); @@ -105,7 +105,7 @@ public final class TestSSTDeserializer { byte[] continueBytes = readSampleHexData("extendedtextstrings.txt", "rich-continue1", ContinueRecord.sid); RecordInputStream in = TestcaseRecordInputStream.create(concat(header, continueBytes)); - IntMapper<UnicodeString> strings = new IntMapper<UnicodeString>(); + IntMapper<UnicodeString> strings = new IntMapper<>(); SSTDeserializer deserializer = new SSTDeserializer( strings ); deserializer.manufactureStrings( 1, in); @@ -116,7 +116,7 @@ public final class TestSSTDeserializer { continueBytes = readSampleHexData("extendedtextstrings.txt", "norich-continue1", ContinueRecord.sid); in = TestcaseRecordInputStream.create(concat(header, continueBytes)); - strings = new IntMapper<UnicodeString>(); + strings = new IntMapper<>(); deserializer = new SSTDeserializer( strings ); deserializer.manufactureStrings( 1, in); diff --git a/src/testcases/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java b/src/testcases/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java index 80380ac5e2..e2b2652a43 100644 --- a/src/testcases/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java +++ b/src/testcases/org/apache/poi/hssf/record/TestSSTRecordSizeCalculator.java @@ -33,7 +33,7 @@ public final class TestSSTRecordSizeCalculator extends TestCase { private static final int COMPRESSED_PLAIN_STRING_OVERHEAD = 3; private static final int OPTION_FIELD_SIZE = 1; - private final IntMapper<UnicodeString> strings = new IntMapper<UnicodeString>(); + private final IntMapper<UnicodeString> strings = new IntMapper<>(); private void confirmSize(int expectedSize) { ContinuableRecordOutput cro = ContinuableRecordOutput.createForCountingOnly(); 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 ee04ed01a1..26455497b0 100644 --- a/src/testcases/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java +++ b/src/testcases/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java @@ -49,7 +49,7 @@ public final class TestCFRecordsAggregate extends TestCase { HSSFWorkbook workbook = new HSSFWorkbook(); HSSFSheet sheet = workbook.createSheet(); - List<Record> recs = new ArrayList<Record>(); + List<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 28299b8cad..b4e696fe30 100644 --- a/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java +++ b/src/testcases/org/apache/poi/hssf/record/aggregates/TestColumnInfoRecordsAggregate.java @@ -64,7 +64,7 @@ public final class TestColumnInfoRecordsAggregate { private static final class CIRCollector implements RecordVisitor { - private final List<Record> _list = new ArrayList<Record>(); + private final List<Record> _list = new ArrayList<>(); @Override public void visitRecord(Record r) { 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 be9e6a9017..e63e8167bb 100644 --- a/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java +++ b/src/testcases/org/apache/poi/hssf/record/aggregates/TestValueRecordsAggregate.java @@ -52,7 +52,7 @@ public final class TestValueRecordsAggregate { private final ValueRecordsAggregate valueRecord = new ValueRecordsAggregate(); private List<CellValueRecordInterface> getValueRecords() { - List<CellValueRecordInterface> list = new ArrayList<CellValueRecordInterface>(); + List<CellValueRecordInterface> list = new ArrayList<>(); for ( CellValueRecordInterface rec : valueRecord ) { list.add(rec); } @@ -65,7 +65,7 @@ public final class TestValueRecordsAggregate { */ @Test public void testSharedFormula() { - List<Record> records = new ArrayList<Record>(); + List<Record> records = new ArrayList<>(); records.add(new FormulaRecord()); records.add(new SharedFormulaRecord()); records.add(new WindowTwoRecord()); @@ -91,7 +91,7 @@ public final class TestValueRecordsAggregate { } private static List<Record> testData() { - List<Record> records = new ArrayList<Record>(); + List<Record> records = new ArrayList<>(); FormulaRecord formulaRecord = new FormulaRecord(); BlankRecord blankRecord = new BlankRecord(); formulaRecord.setRow(1); 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 d65c37e702..53d03f4b8b 100644 --- a/src/testcases/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java +++ b/src/testcases/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java @@ -67,7 +67,7 @@ public final class TestChartTitleFormatRecord { private final List<ChartTitleFormatRecord> chartTitleFormatRecords; public ChartTitleFormatRecordGrabber() { - chartTitleFormatRecords = new ArrayList<ChartTitleFormatRecord>(); + chartTitleFormatRecords = new ArrayList<>(); } @Override diff --git a/src/testcases/org/apache/poi/hssf/usermodel/RecordInspector.java b/src/testcases/org/apache/poi/hssf/usermodel/RecordInspector.java index 1784d95aa6..2a49b7d250 100644 --- a/src/testcases/org/apache/poi/hssf/usermodel/RecordInspector.java +++ b/src/testcases/org/apache/poi/hssf/usermodel/RecordInspector.java @@ -39,7 +39,7 @@ public final class RecordInspector { private final List<Record> _list; public RecordCollector() { - _list = new ArrayList<Record>(128); + _list = new ArrayList<>(128); } @Override diff --git a/src/testcases/org/apache/poi/hssf/usermodel/StreamUtility.java b/src/testcases/org/apache/poi/hssf/usermodel/StreamUtility.java index 06aa0b84b8..d467333ffc 100644 --- a/src/testcases/org/apache/poi/hssf/usermodel/StreamUtility.java +++ b/src/testcases/org/apache/poi/hssf/usermodel/StreamUtility.java @@ -82,7 +82,7 @@ public final class StreamUtility { private static int[] diffInternal(InputStream isA, InputStream isB, int[] allowableDifferenceRegions) throws IOException { int offset = 0; - List<Integer> temp = new ArrayList<Integer>(); + List<Integer> temp = new ArrayList<>(); while (true) { int b = isA.read(); int b2 = isB.read(); diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java b/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java index f249fadf40..244bad98bd 100644 --- a/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java +++ b/src/testcases/org/apache/poi/hssf/usermodel/TestBugs.java @@ -2055,7 +2055,7 @@ public final class TestBugs extends BaseTestBugzillaIssues { "Good", "Heading 1", "Heading 2", "Heading 3", "Heading 4", "Input", "Linked Cell", "Neutral", "Note", "Output", "Title", "Total", "Warning Text"); - List<String> collecteddStyles = new ArrayList<String>(); + List<String> collecteddStyles = new ArrayList<>(); for (int i = 0; i < numCellStyles; i++) { HSSFCellStyle cellStyle = wb.getCellStyleAt(i); String styleName = cellStyle.getUserStyleName(); @@ -2492,7 +2492,7 @@ public final class TestBugs extends BaseTestBugzillaIssues { @Test public void bug51675() throws Exception { - final List<Short> list = new ArrayList<Short>(); + final List<Short> list = new ArrayList<>(); HSSFWorkbook wb = openSample("51675.xls"); HSSFSheet sh = wb.getSheetAt(0); InternalSheet ish = HSSFTestHelper.getSheetForTest(sh); diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java index 55e1d77db6..fdcd8b21a8 100644 --- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java +++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFWorkbook.java @@ -225,7 +225,7 @@ public final class TestHSSFWorkbook extends BaseTestWorkbook { } private static List<Integer> arrayToList(int[] array) { - List<Integer> list = new ArrayList<Integer>(array.length); + List<Integer> list = new ArrayList<>(array.length); for ( Integer element : array ) { list.add(element); } diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestSanityChecker.java b/src/testcases/org/apache/poi/hssf/usermodel/TestSanityChecker.java index c656248dcf..c8b10d1b39 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<Record>(); + List<Record> records = new ArrayList<>(); records.add(new BOFRecord()); records.add(INTERFACEHDR); records.add(createBoundSheetRec()); diff --git a/src/testcases/org/apache/poi/poifs/eventfilesystem/TestPOIFSReaderRegistry.java b/src/testcases/org/apache/poi/poifs/eventfilesystem/TestPOIFSReaderRegistry.java index 7a0e3d6d0c..d920d2ce8c 100644 --- a/src/testcases/org/apache/poi/poifs/eventfilesystem/TestPOIFSReaderRegistry.java +++ b/src/testcases/org/apache/poi/poifs/eventfilesystem/TestPOIFSReaderRegistry.java @@ -103,7 +103,7 @@ public final class TestPOIFSReaderRegistry extends TestCase { else { Set<POIFSReaderListener> registeredListeners = - new HashSet<POIFSReaderListener>(); + new HashSet<>(); while (listeners.hasNext()) { @@ -135,7 +135,7 @@ public final class TestPOIFSReaderRegistry extends TestCase { Iterator<POIFSReaderListener> listeners = registry.getListeners(path, name); Set<POIFSReaderListener> registeredListeners = - new HashSet<POIFSReaderListener>(); + new HashSet<>(); while (listeners.hasNext()) { diff --git a/src/testcases/org/apache/poi/poifs/filesystem/ReaderWriter.java b/src/testcases/org/apache/poi/poifs/filesystem/ReaderWriter.java index 2aae3729dc..54257598bf 100644 --- a/src/testcases/org/apache/poi/poifs/filesystem/ReaderWriter.java +++ b/src/testcases/org/apache/poi/poifs/filesystem/ReaderWriter.java @@ -58,7 +58,7 @@ public class ReaderWriter { this.filesystem = filesystem; root = this.filesystem.getRoot(); - dataMap = new HashMap<DocumentDescriptor, byte[]>(); + dataMap = new HashMap<>(); } /** diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestEntryUtils.java b/src/testcases/org/apache/poi/poifs/filesystem/TestEntryUtils.java index da3e383925..502c1fa62e 100644 --- a/src/testcases/org/apache/poi/poifs/filesystem/TestEntryUtils.java +++ b/src/testcases/org/apache/poi/poifs/filesystem/TestEntryUtils.java @@ -85,7 +85,7 @@ public class TestEntryUtils { fsD = new POIFSFileSystem(); assertEquals(0, fsD.getRoot().getEntryCount()); - EntryUtils.copyNodes(fs, fsD, new ArrayList<String>()); + EntryUtils.copyNodes(fs, fsD, new ArrayList<>()); assertEquals(3, fsD.getRoot().getEntryCount()); assertNotNull(fsD.getRoot().getEntry(dirA.getName())); assertNotNull(fsD.getRoot().getEntry(dirB.getName())); diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java b/src/testcases/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java index 2bdcb0052c..6b859d9380 100644 --- a/src/testcases/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java +++ b/src/testcases/org/apache/poi/poifs/filesystem/TestFileSystemBugs.java @@ -65,7 +65,7 @@ public final class TestFileSystemBugs extends TestCase { } protected DirectoryNode[] openSamples(InputStream[] inps, boolean oldFails) throws Exception { NPOIFSFileSystem nfs = new NPOIFSFileSystem(inps[0]); - if (openedFSs == null) openedFSs = new ArrayList<NPOIFSFileSystem>(); + if (openedFSs == null) openedFSs = new ArrayList<>(); openedFSs.add(nfs); OPOIFSFileSystem ofs = null; @@ -131,7 +131,7 @@ public final class TestFileSystemBugs extends TestCase { public void testHeavilyNestedReWrite() throws Exception { for (DirectoryNode root : openSSSample("ex42570-20305.xls", false)) { // Record the structure - Map<String,Integer> entries = new HashMap<String, Integer>(); + Map<String,Integer> entries = new HashMap<>(); fetchSizes("/", root, entries); // Prepare to copy diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java b/src/testcases/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java index bef0281f23..0bf0e54ee5 100644 --- a/src/testcases/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java +++ b/src/testcases/org/apache/poi/poifs/filesystem/TestFilteringDirectoryNode.java @@ -51,7 +51,7 @@ public final class TestFilteringDirectoryNode extends TestCase { } public void testNoFiltering() throws Exception { - FilteringDirectoryNode d = new FilteringDirectoryNode(fs.getRoot(), new HashSet<String>()); + FilteringDirectoryNode d = new FilteringDirectoryNode(fs.getRoot(), new HashSet<>()); assertEquals(3, d.getEntryCount()); assertEquals(dirA.getName(), d.getEntry(dirA.getName()).getName()); diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestOle10Native.java b/src/testcases/org/apache/poi/poifs/filesystem/TestOle10Native.java index d63061c389..9bde78ee82 100644 --- a/src/testcases/org/apache/poi/poifs/filesystem/TestOle10Native.java +++ b/src/testcases/org/apache/poi/poifs/filesystem/TestOle10Native.java @@ -64,7 +64,7 @@ public class TestOle10Native { for (File f : files) { NPOIFSFileSystem fs = new NPOIFSFileSystem(f, true); - List<Entry> entries = new ArrayList<Entry>(); + List<Entry> entries = new ArrayList<>(); findOle10(entries, fs.getRoot(), "/", ""); for (Entry e : entries) { diff --git a/src/testcases/org/apache/poi/poifs/filesystem/TestPropertySorter.java b/src/testcases/org/apache/poi/poifs/filesystem/TestPropertySorter.java index 09388c233e..fd2c3d3b74 100644 --- a/src/testcases/org/apache/poi/poifs/filesystem/TestPropertySorter.java +++ b/src/testcases/org/apache/poi/poifs/filesystem/TestPropertySorter.java @@ -123,7 +123,7 @@ public final class TestPropertySorter extends TestCase { DirectoryNode vba = (DirectoryNode)vba_project.getEntry(VBA); DirectoryProperty p = (DirectoryProperty)vba.getProperty(); - List<Property> lst = new ArrayList<Property>(); + List<Property> lst = new ArrayList<>(); for (Iterator<Property> it = p.getChildren(); it.hasNext();){ Property ch = it.next(); lst.add(ch); diff --git a/src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java b/src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java index 12e2f16f02..71a210b8d7 100644 --- a/src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java +++ b/src/testcases/org/apache/poi/poifs/macros/TestVBAMacroReader.java @@ -64,7 +64,7 @@ public class TestVBAMacroReader { } static { - final Map<POIDataSamples, String> _expectedMacroContents = new HashMap<POIDataSamples, String>(); + final Map<POIDataSamples, String> _expectedMacroContents = new HashMap<>(); final POIDataSamples[] dataSamples = { POIDataSamples.getSpreadSheetInstance(), POIDataSamples.getSlideShowInstance(), diff --git a/src/testcases/org/apache/poi/poifs/property/TestDirectoryProperty.java b/src/testcases/org/apache/poi/poifs/property/TestDirectoryProperty.java index 8db101c25d..2d94aba13a 100644 --- a/src/testcases/org/apache/poi/poifs/property/TestDirectoryProperty.java +++ b/src/testcases/org/apache/poi/poifs/property/TestDirectoryProperty.java @@ -102,7 +102,7 @@ public final class TestDirectoryProperty { private void verifyChildren(int count) { Iterator<Property> iter = _property.getChildren(); - List<Property> children = new ArrayList<Property>(); + List<Property> children = new ArrayList<>(); while (iter.hasNext()) { diff --git a/src/testcases/org/apache/poi/poifs/storage/LocalRawDataBlockList.java b/src/testcases/org/apache/poi/poifs/storage/LocalRawDataBlockList.java index 7358f00249..ae9969a398 100644 --- a/src/testcases/org/apache/poi/poifs/storage/LocalRawDataBlockList.java +++ b/src/testcases/org/apache/poi/poifs/storage/LocalRawDataBlockList.java @@ -39,7 +39,7 @@ public final class LocalRawDataBlockList extends RawDataBlockList { throws IOException { super(new ByteArrayInputStream(new byte[ 0 ]), POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS); - _list = new ArrayList<RawDataBlock>(); + _list = new ArrayList<>(); _array = null; } diff --git a/src/testcases/org/apache/poi/poifs/storage/TestBATBlock.java b/src/testcases/org/apache/poi/poifs/storage/TestBATBlock.java index 5ee5309264..025425e0b2 100644 --- a/src/testcases/org/apache/poi/poifs/storage/TestBATBlock.java +++ b/src/testcases/org/apache/poi/poifs/storage/TestBATBlock.java @@ -337,7 +337,7 @@ public final class TestBATBlock extends TestCase { public void testGetBATBlockAndIndex() throws Exception { HeaderBlock header = new HeaderBlock(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS); - List<BATBlock> blocks = new ArrayList<BATBlock>(); + List<BATBlock> blocks = new ArrayList<>(); int offset; diff --git a/src/testcases/org/apache/poi/poifs/storage/TestBlockListImpl.java b/src/testcases/org/apache/poi/poifs/storage/TestBlockListImpl.java index 344b514853..6666fc8b23 100644 --- a/src/testcases/org/apache/poi/poifs/storage/TestBlockListImpl.java +++ b/src/testcases/org/apache/poi/poifs/storage/TestBlockListImpl.java @@ -174,7 +174,7 @@ public final class TestBlockListImpl { // that includes a reserved (XBAT) block, and one that // points off into space somewhere BlockListImpl list = create(); - List<RawDataBlock> raw_blocks = new ArrayList<RawDataBlock>(); + List<RawDataBlock> raw_blocks = new ArrayList<>(); byte[] data = new byte[ 512 ]; int offset = 0; diff --git a/src/testcases/org/apache/poi/poifs/storage/TestPropertyBlock.java b/src/testcases/org/apache/poi/poifs/storage/TestPropertyBlock.java index e4af23a99a..cc9d27cb60 100644 --- a/src/testcases/org/apache/poi/poifs/storage/TestPropertyBlock.java +++ b/src/testcases/org/apache/poi/poifs/storage/TestPropertyBlock.java @@ -37,7 +37,7 @@ public final class TestPropertyBlock { public void testCreatePropertyBlocks() throws Exception { // test with 0 properties - List<Property> properties = new ArrayList<Property>(); + List<Property> properties = new ArrayList<>(); BlockWritable[] blocks = PropertyBlock.createPropertyBlockArray(POIFSConstants.SMALLER_BIG_BLOCK_SIZE_DETAILS,properties); diff --git a/src/testcases/org/apache/poi/poifs/storage/TestSmallBlockTableWriter.java b/src/testcases/org/apache/poi/poifs/storage/TestSmallBlockTableWriter.java index 9bb4f6a166..dc96174a58 100644 --- a/src/testcases/org/apache/poi/poifs/storage/TestSmallBlockTableWriter.java +++ b/src/testcases/org/apache/poi/poifs/storage/TestSmallBlockTableWriter.java @@ -37,7 +37,7 @@ import org.apache.poi.poifs.property.RootProperty; public final class TestSmallBlockTableWriter extends TestCase { public void testWritingConstructor() throws IOException { - List<OPOIFSDocument> documents = new ArrayList<OPOIFSDocument>(); + List<OPOIFSDocument> documents = new ArrayList<>(); documents.add( new OPOIFSDocument( diff --git a/src/testcases/org/apache/poi/poifs/storage/TestSmallDocumentBlock.java b/src/testcases/org/apache/poi/poifs/storage/TestSmallDocumentBlock.java index 2d6ef1845c..c637e79706 100644 --- a/src/testcases/org/apache/poi/poifs/storage/TestSmallDocumentBlock.java +++ b/src/testcases/org/apache/poi/poifs/storage/TestSmallDocumentBlock.java @@ -52,7 +52,7 @@ public final class TestSmallDocumentBlock extends TestCase { throws IOException { ByteArrayInputStream stream = new ByteArrayInputStream(_testdata); - List<DocumentBlock> documents = new ArrayList<DocumentBlock>(); + List<DocumentBlock> documents = new ArrayList<>(); while (true) { @@ -138,7 +138,7 @@ public final class TestSmallDocumentBlock extends TestCase { { for (int j = 0; j <= 8; j++) { - List<SmallDocumentBlock> blocks = new ArrayList<SmallDocumentBlock>(); + List<SmallDocumentBlock> blocks = new ArrayList<>(); for (int k = 0; k < j; k++) { diff --git a/src/testcases/org/apache/poi/ss/format/CellFormatTestBase.java b/src/testcases/org/apache/poi/ss/format/CellFormatTestBase.java index 1e7ea393aa..df20a3c8e7 100644 --- a/src/testcases/org/apache/poi/ss/format/CellFormatTestBase.java +++ b/src/testcases/org/apache/poi/ss/format/CellFormatTestBase.java @@ -103,7 +103,7 @@ public class CellFormatTestBase { readFlags(workbook); - Set<String> runCategories = new TreeSet<String>( + Set<String> runCategories = new TreeSet<>( String.CASE_INSENSITIVE_ORDER); String runCategoryList = flagString("Categories", ""); if (runCategoryList != null) { @@ -155,7 +155,7 @@ public class CellFormatTestBase { */ private void readFlags(Workbook wb) { Sheet flagSheet = wb.getSheet("Flags"); - testFlags = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER); + testFlags = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); if (flagSheet != null) { int end = flagSheet.getLastRowNum(); // Skip the header row, therefore "+ 1" diff --git a/src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java b/src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java index 4641c4fdc3..923392a30c 100644 --- a/src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java +++ b/src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java @@ -96,9 +96,9 @@ public class TestEvaluationCache extends TestCase { public EvalListener(HSSFWorkbook wb) { _book = wb; - _logList = new ArrayList<String>(); - _formulaCellsByCacheEntry = new HashMap<ICacheEntry,EvaluationCell>(); - _plainCellLocsByCacheEntry = new HashMap<ICacheEntry, Loc>(); + _logList = new ArrayList<>(); + _formulaCellsByCacheEntry = new HashMap<>(); + _plainCellLocsByCacheEntry = new HashMap<>(); } @Override public void onCacheHit(int sheetIndex, int rowIndex, int columnIndex, ValueEval result) { diff --git a/src/testcases/org/apache/poi/ss/formula/TestMissingWorkbook.java b/src/testcases/org/apache/poi/ss/formula/TestMissingWorkbook.java index 3e467b2bef..b9f09a1318 100644 --- a/src/testcases/org/apache/poi/ss/formula/TestMissingWorkbook.java +++ b/src/testcases/org/apache/poi/ss/formula/TestMissingWorkbook.java @@ -117,7 +117,7 @@ public class TestMissingWorkbook extends TestCase { FormulaEvaluator lMainWorkbookEvaluator = mainWorkbook.getCreationHelper().createFormulaEvaluator(); FormulaEvaluator lSourceEvaluator = sourceWorkbook.getCreationHelper().createFormulaEvaluator(); - Map<String,FormulaEvaluator> workbooks = new HashMap<String, FormulaEvaluator>(); + Map<String,FormulaEvaluator> workbooks = new HashMap<>(); workbooks.put(MAIN_WORKBOOK_FILENAME, lMainWorkbookEvaluator); workbooks.put(SOURCE_DUMMY_WORKBOOK_FILENAME, lSourceEvaluator); lMainWorkbookEvaluator.setupReferencedWorkbooks(workbooks); diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java b/src/testcases/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java index f92204d872..678b766fe8 100644 --- a/src/testcases/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java +++ b/src/testcases/org/apache/poi/ss/formula/atp/TestNetworkdaysFunction.java @@ -88,7 +88,7 @@ public class TestNetworkdaysFunction extends TestCase { public MockAreaEval(String... holidays) { this(0, 0, 0, holidays.length - 1); - this.holidays = new ArrayList<ValueEval>(); + this.holidays = new ArrayList<>(); for (String holiday : holidays) { this.holidays.add(new StringEval(holiday)); } diff --git a/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java b/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java index bbd6e56aad..365d1352cc 100644 --- a/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java +++ b/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayFunction.java @@ -177,7 +177,7 @@ public class TestWorkdayFunction { public MockAreaEval(String... holidays) { this(0, 0, 0, holidays.length - 1); - this.holidays = new ArrayList<ValueEval>(); + this.holidays = new ArrayList<>(); for (String holiday : holidays) { this.holidays.add(new StringEval(holiday)); } diff --git a/src/testcases/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java b/src/testcases/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java index 87b1fed4a4..99f1b8a56e 100644 --- a/src/testcases/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java +++ b/src/testcases/org/apache/poi/ss/formula/eval/TestFormulasFromSpreadsheet.java @@ -124,7 +124,7 @@ public final class TestFormulasFromSpreadsheet { sheet = workbook.getSheetAt( 0 ); evaluator = new HSSFFormulaEvaluator(workbook); - List<Object[]> data = new ArrayList<Object[]>(); + List<Object[]> data = new ArrayList<>(); processFunctionGroup(data, SS.START_OPERATORS_ROW_INDEX, null); processFunctionGroup(data, SS.START_FUNCTIONS_ROW_INDEX, null); diff --git a/src/testcases/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java b/src/testcases/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java index 2dab84ca7e..8da0aded7e 100644 --- a/src/testcases/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java +++ b/src/testcases/org/apache/poi/ss/formula/function/ExcelFileFormatDocFunctionExtractor.java @@ -159,10 +159,10 @@ public final class ExcelFileFormatDocFunctionExtractor { public FunctionDataCollector(PrintStream ps) { _ps = ps; - _allFunctionsByIndex = new HashMap<Integer, FunctionData>(); - _allFunctionsByName = new HashMap<String, FunctionData>(); - _groupFunctionIndexes = new HashSet<Integer>(); - _groupFunctionNames = new HashSet<String>(); + _allFunctionsByIndex = new HashMap<>(); + _allFunctionsByName = new HashMap<>(); + _groupFunctionIndexes = new HashSet<>(); + _groupFunctionNames = new HashSet<>(); } public void addFuntion(int funcIx, boolean hasFootnote, String funcName, int minParams, int maxParams, @@ -265,11 +265,11 @@ public final class ExcelFileFormatDocFunctionExtractor { public EFFDocHandler(FunctionDataCollector fdc) { _fdc = fdc; - _elemNameStack = new Stack<String>(); + _elemNameStack = new Stack<>(); _isInsideTable = false; - _rowData = new ArrayList<String>(); + _rowData = new ArrayList<>(); _textNodeBuffer = new StringBuffer(); - _rowNoteFlags = new ArrayList<Boolean>(); + _rowNoteFlags = new ArrayList<>(); } private boolean matchesTargetPath() { diff --git a/src/testcases/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java b/src/testcases/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java index 2d589217ed..72ab0b67db 100644 --- a/src/testcases/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/BaseTestFunctionsFromSpreadsheet.java @@ -87,7 +87,7 @@ public abstract class BaseTestFunctionsFromSpreadsheet { HSSFWorkbook workbook = HSSFTestDataSamples.openSampleWorkbook(filename); confirmReadMeSheet(workbook, clazz); - List<Object[]> data = new ArrayList<Object[]>(); + List<Object[]> data = new ArrayList<>(); int nSheets = workbook.getNumberOfSheets(); for(int sheetIdx=1; sheetIdx< nSheets; sheetIdx++) { diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java index 914d2b97fd..5cad19f4d8 100644 --- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java +++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestBugzillaIssues.java @@ -936,7 +936,7 @@ public abstract class BaseTestBugzillaIssues { Workbook wb3 = _testDataProvider.createWorkbook(); wb3.createSheet().createRow(1).createCell(0).setCellValue(otherCellText); - Map<String,FormulaEvaluator> evaluators = new HashMap<String, FormulaEvaluator>(); + Map<String,FormulaEvaluator> evaluators = new HashMap<>(); evaluators.put(refLocal, wb3.getCreationHelper().createFormulaEvaluator()); evaluators.put(refHttp, wb3.getCreationHelper().createFormulaEvaluator()); diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java index 38192d90f1..1c15804fb7 100644 --- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java +++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheet.java @@ -430,7 +430,7 @@ public abstract class BaseTestSheet { Workbook wb = _testDataProvider.createWorkbook(); Sheet sheet = wb.createSheet(); - Map<Integer, CellRangeAddress> mergedRegions = new HashMap<Integer, CellRangeAddress>(); + Map<Integer, CellRangeAddress> mergedRegions = new HashMap<>(); for (int r=0; r<10; r++) { CellRangeAddress region = new CellRangeAddress(r, r, 0, 1); mergedRegions.put(r, region); @@ -447,8 +447,8 @@ public abstract class BaseTestSheet { } private static <T> void assertCollectionEquals(Collection<T> expected, Collection<T> actual) { - Set<T> e = new HashSet<T>(expected); - Set<T> a = new HashSet<T>(actual); + Set<T> e = new HashSet<>(expected); + Set<T> a = new HashSet<>(actual); assertEquals(e, a); } diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java index 30764c4cb9..882be57da8 100644 --- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java +++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestSheetShiftRows.java @@ -323,7 +323,7 @@ public abstract class BaseTestSheetShiftRows { sheet.shiftRows(4, sheet.getLastRowNum(), 1); // all regions should still start at row 3, and elongate by 1 row - List<CellRangeAddress> expectedMergedRegions = new ArrayList<CellRangeAddress>(); + List<CellRangeAddress> expectedMergedRegions = new ArrayList<>(); CellRangeAddress A4_B8 = CellRangeAddress.valueOf("A4:B8"); //A4:B7 should be elongated by 1 row CellRangeAddress C4_D8 = CellRangeAddress.valueOf("C4:D8"); //C4:B7 should be elongated by 1 row expectedMergedRegions.add(A4_B8); diff --git a/src/testcases/org/apache/poi/ss/usermodel/TestExcelStyleDateFormatter.java b/src/testcases/org/apache/poi/ss/usermodel/TestExcelStyleDateFormatter.java index af5baf2fb2..e966f8ad22 100644 --- a/src/testcases/org/apache/poi/ss/usermodel/TestExcelStyleDateFormatter.java +++ b/src/testcases/org/apache/poi/ss/usermodel/TestExcelStyleDateFormatter.java @@ -84,7 +84,7 @@ public class TestExcelStyleDateFormatter { "\u004a", "\u004a", "\u0041", "\u0053", "\u004f", "\u004e", "\u0044"); - Map<Locale, List<String>> testMap = new HashMap<Locale, List<String>>(); + Map<Locale, List<String>> testMap = new HashMap<>(); testMap.put(germanLocale, germanResultList); testMap.put(russianLocale, russianResultList); testMap.put(austrianLocale, austrianResultList); diff --git a/src/testcases/org/apache/poi/ss/util/BaseTestCellUtil.java b/src/testcases/org/apache/poi/ss/util/BaseTestCellUtil.java index be653fd91b..215b64a340 100644 --- a/src/testcases/org/apache/poi/ss/util/BaseTestCellUtil.java +++ b/src/testcases/org/apache/poi/ss/util/BaseTestCellUtil.java @@ -118,7 +118,7 @@ public class BaseTestCellUtil { // Add multiple border properties to cell should create a single new style int styCnt1 = wb.getNumCellStyles(); - Map<String, Object> props = new HashMap<String, Object>(); + Map<String, Object> props = new HashMap<>(); props.put(CellUtil.BORDER_TOP, BorderStyle.THIN); props.put(CellUtil.BORDER_BOTTOM, BorderStyle.THIN); props.put(CellUtil.BORDER_LEFT, BorderStyle.THIN); @@ -376,7 +376,7 @@ public class BaseTestCellUtil { public void setFillForegroundColorBeforeFillBackgroundColor() throws IOException { Workbook wb1 = _testDataProvider.createWorkbook(); Cell A1 = wb1.createSheet().createRow(0).createCell(0); - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put(CellUtil.FILL_PATTERN, FillPatternType.BRICKS); properties.put(CellUtil.FILL_FOREGROUND_COLOR, IndexedColors.BLUE.index); properties.put(CellUtil.FILL_BACKGROUND_COLOR, IndexedColors.RED.index); @@ -396,7 +396,7 @@ public class BaseTestCellUtil { public void setFillForegroundColorBeforeFillBackgroundColorEnum() throws IOException { Workbook wb1 = _testDataProvider.createWorkbook(); Cell A1 = wb1.createSheet().createRow(0).createCell(0); - Map<String, Object> properties = new HashMap<String, Object>(); + Map<String, Object> properties = new HashMap<>(); properties.put(CellUtil.FILL_PATTERN, FillPatternType.BRICKS); properties.put(CellUtil.FILL_FOREGROUND_COLOR, IndexedColors.BLUE.index); properties.put(CellUtil.FILL_BACKGROUND_COLOR, IndexedColors.RED.index); diff --git a/src/testcases/org/apache/poi/ss/util/NumberComparisonExamples.java b/src/testcases/org/apache/poi/ss/util/NumberComparisonExamples.java index 265e40d8c9..79fe64cda7 100644 --- a/src/testcases/org/apache/poi/ss/util/NumberComparisonExamples.java +++ b/src/testcases/org/apache/poi/ss/util/NumberComparisonExamples.java @@ -66,7 +66,7 @@ final class NumberComparisonExamples { private static ComparisonExample[] initExamples() { - List<ComparisonExample> temp = new ArrayList<ComparisonExample>(); + List<ComparisonExample> temp = new ArrayList<>(); addStepTransition(temp, 0x4010000000000005L); addStepTransition(temp, 0x4010000000000010L); diff --git a/src/testcases/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java b/src/testcases/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java index f810f3093e..35ea428c88 100644 --- a/src/testcases/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java +++ b/src/testcases/org/apache/poi/ss/util/NumberRenderingSpreadsheetGenerator.java @@ -58,7 +58,7 @@ public class NumberRenderingSpreadsheetGenerator { writeHeaderRow(wb, sheet); _sheet = sheet; _rowIndex = 1; - _replacementNaNs = new ArrayList<Long>(); + _replacementNaNs = new ArrayList<>(); } public void addTestRow(long rawBits, String expectedExcelRendering) { diff --git a/src/testcases/org/apache/poi/util/DummyPOILogger.java b/src/testcases/org/apache/poi/util/DummyPOILogger.java index 7da48ce269..ca8b2ca615 100644 --- a/src/testcases/org/apache/poi/util/DummyPOILogger.java +++ b/src/testcases/org/apache/poi/util/DummyPOILogger.java @@ -25,10 +25,10 @@ import java.util.List; */ @Internal public class DummyPOILogger extends POILogger { - public List<String>logged = new ArrayList<String>(); + public List<String>logged = new ArrayList<>(); public void reset() { - logged = new ArrayList<String>(); + logged = new ArrayList<>(); } @Override |