Replace manual close with try-with-resources

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

7 files changed, 24 insertions, 60 deletions

diff --git a/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java b/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java
index ee69630638..349043b9c9 100644
--- a/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java
+++ b/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java
@@ -157,13 +157,12 @@ public final class TestFormulaParser {
     public void testMacroFunction() throws IOException {
         // testNames.xls contains a VB function called 'myFunc'
         final String testFile = "testNames.xls";
-        HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook(testFile);
-        try {
+        try (HSSFWorkbook wb = HSSFTestDataSamples.openSampleWorkbook(testFile)) {
             HSSFEvaluationWorkbook book = HSSFEvaluationWorkbook.create(wb);
 
             //Expected ptg stack: [NamePtg(myFunc), StringPtg(arg), (additional operands go here...), FunctionPtg(myFunc)]
             Ptg[] ptg = FormulaParser.parse("myFunc(\"arg\")", book, FormulaType.CELL, -1);
-            assertEquals(3, ptg.length); 
+            assertEquals(3, ptg.length);
 
             // the name gets encoded as the first operand on the stack
             NamePtg tname = (NamePtg) ptg[0];
@@ -192,8 +191,7 @@ public final class TestFormulaParser {
             FormulaParser.parse("yourFunc(\"arg\")", book, FormulaType.CELL, -1);
 
             // Verify that myFunc and yourFunc were successfully added to Workbook names
-            HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb);
-            try {
+            try (HSSFWorkbook wb2 = HSSFTestDataSamples.writeOutAndReadBack(wb)) {
                 // HSSFWorkbook/EXCEL97-specific side-effects user-defined function names must be added to Workbook's defined names in order to be saved.
                 assertNotNull(wb2.getName("myFunc"));
                 assertEqualsIgnoreCase("myFunc", wb2.getName("myFunc").getNameName());
@@ -210,11 +208,7 @@ public final class TestFormulaParser {
                 wb2.write(fos);
                 fos.close();
                 */
-            } finally {
-                wb2.close();
             }
-        } finally {
-            wb.close();
         }
     }
     
@@ -779,21 +773,18 @@ public final class TestFormulaParser {
         }
         assertEquals("test\"ing", sp.getValue());
 
-        HSSFWorkbook wb = new HSSFWorkbook();
-        try {
+        try (HSSFWorkbook wb = new HSSFWorkbook()) {
             HSSFSheet sheet = wb.createSheet();
             wb.setSheetName(0, "Sheet1");
-    
+
             HSSFRow row = sheet.createRow(0);
             HSSFCell cell = row.createCell(0);
             cell.setCellFormula("right(\"test\"\"ing\", 3)");
             String actualCellFormula = cell.getCellFormula();
-            if("RIGHT(\"test\"ing\",3)".equals(actualCellFormula)) {
+            if ("RIGHT(\"test\"ing\",3)".equals(actualCellFormula)) {
                 fail("Identified bug 28754b");
             }
             assertEquals("RIGHT(\"test\"\"ing\",3)", actualCellFormula);
-        } finally {
-            wb.close();
         }
     }
 
diff --git a/src/testcases/org/apache/poi/hssf/record/TestLbsDataSubRecord.java b/src/testcases/org/apache/poi/hssf/record/TestLbsDataSubRecord.java
index 0f53548406..5d89e627d9 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestLbsDataSubRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/TestLbsDataSubRecord.java
@@ -158,21 +158,15 @@ public final class TestLbsDataSubRecord extends TestCase {
                                  "00, " +      //compression flag
                                  "00");        //padding byte
 
-        LittleEndianInputStream in = new LittleEndianInputStream(new ByteArrayInputStream(data));
-        try {
+        try (LittleEndianInputStream in = new LittleEndianInputStream(new ByteArrayInputStream(data))) {
             LbsDataSubRecord.LbsDropData lbs = new LbsDataSubRecord.LbsDropData(in);
-    
+
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            LittleEndianOutputStream out = new LittleEndianOutputStream(baos);
-            try {
+            try (LittleEndianOutputStream out = new LittleEndianOutputStream(baos)) {
                 lbs.serialize(out);
-        
+
                 assertArrayEquals(data, baos.toByteArray());
-            } finally {
-                out.close();
             }
-        } finally {
-            in.close();
         }
     }
 }
diff --git a/src/testcases/org/apache/poi/poifs/nio/TestDataSource.java b/src/testcases/org/apache/poi/poifs/nio/TestDataSource.java
index 1bc3f4532e..4b3932bad1 100644
--- a/src/testcases/org/apache/poi/poifs/nio/TestDataSource.java
+++ b/src/testcases/org/apache/poi/poifs/nio/TestDataSource.java
@@ -116,17 +116,11 @@ public class TestDataSource extends TestCase
     }
 
     private void writeDataToFile(File temp) throws IOException {
-        OutputStream str = new FileOutputStream(temp);
-           try {
-               InputStream in = data.openResourceAsStream("Notes.ole2");
-               try {
-                   IOUtils.copy(in, str);
-               } finally {
-                   in.close();
-               }
-           } finally {
-               str.close();
-           }
+        try (OutputStream str = new FileOutputStream(temp)) {
+            try (InputStream in = data.openResourceAsStream("Notes.ole2")) {
+                IOUtils.copy(in, str);
+            }
+        }
     }
     
     private void checkDataSource(FileBackedDataSource ds, boolean writeable) throws IOException {
diff --git a/src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java b/src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java
index be2cc54cde..06c37dc025 100644
--- a/src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java
+++ b/src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java
@@ -226,8 +226,7 @@ public class TestWorkbookEvaluator {
      */
     @Test
     public void testResultOutsideRange() throws IOException {
-        Workbook wb = new HSSFWorkbook();
-        try {
+        try (Workbook wb = new HSSFWorkbook()) {
             Cell cell = wb.createSheet("Sheet1").createRow(0).createCell(0);
             cell.setCellFormula("D2:D5"); // IF(TRUE,D2:D5,D2) or  OFFSET(D2:D5,0,0) would work too
             FormulaEvaluator fe = wb.getCreationHelper().createFormulaEvaluator();
@@ -249,8 +248,6 @@ public class TestWorkbookEvaluator {
             cv = fe.evaluate(cell);
             assertEquals(CellType.ERROR, cv.getCellType());
             assertEquals(ErrorEval.CIRCULAR_REF_ERROR.getErrorCode(), cv.getErrorValue());
-        } finally {
-            wb.close();
         }
     }
 
diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestFixed.java b/src/testcases/org/apache/poi/ss/formula/functions/TestFixed.java
index 6cc50e742b..462acd3115 100644
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestFixed.java
+++ b/src/testcases/org/apache/poi/ss/formula/functions/TestFixed.java
@@ -44,13 +44,10 @@ public final class TestFixed {
 
     @Before
     public void setUp() throws IOException {
-        HSSFWorkbook wb = new HSSFWorkbook();
-        try {
+        try (HSSFWorkbook wb = new HSSFWorkbook()) {
             HSSFSheet sheet = wb.createSheet("new sheet");
             cell11 = sheet.createRow(0).createCell(0);
             evaluator = new HSSFFormulaEvaluator(wb);
-        } finally {
-            wb.close();
         }
     }
 
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestDataFormat.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestDataFormat.java
index 70ba300b71..2208cf5f49 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestDataFormat.java
+++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestDataFormat.java
@@ -112,14 +112,11 @@ public abstract class BaseTestDataFormat {
     }
 
     private void readbackFormat(String msg, String fmt) throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        try {
+        try (Workbook wb = _testDataProvider.createWorkbook()) {
             DataFormat dataFormat = wb.createDataFormat();
             short fmtIdx = dataFormat.getFormat(fmt);
             String readbackFmt = dataFormat.getFormat(fmtIdx);
             assertEquals(msg, fmt, readbackFmt);
-        } finally {
-            wb.close();
         }
     }
 
diff --git a/src/testcases/org/apache/poi/ss/usermodel/BaseTestPicture.java b/src/testcases/org/apache/poi/ss/usermodel/BaseTestPicture.java
index d7c68940ce..555a232480 100644
--- a/src/testcases/org/apache/poi/ss/usermodel/BaseTestPicture.java
+++ b/src/testcases/org/apache/poi/ss/usermodel/BaseTestPicture.java
@@ -76,30 +76,24 @@ public abstract class BaseTestPicture {
 
     @Test
     public void testResizeNoColumns() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        try {
+        try (Workbook wb = _testDataProvider.createWorkbook()) {
             Sheet sheet = wb.createSheet();
-    
+
             Row row = sheet.createRow(0);
-            
+
             handleResize(wb, sheet, row);
-        } finally {
-            wb.close();
         }
     }
 
     @Test
     public void testResizeWithColumns() throws IOException {
-        Workbook wb = _testDataProvider.createWorkbook();
-        try {
+        try (Workbook wb = _testDataProvider.createWorkbook()) {
             Sheet sheet = wb.createSheet();
-    
+
             Row row = sheet.createRow(0);
             row.createCell(0);
-            
+
             handleResize(wb, sheet, row);
-        } finally {
-            wb.close();
         }
     }