try with resources (#5)

elharo · web-flow · commit b974fb27221a · 2020-07-17T09:47:18.000-04:00
diff --git a/src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java b/src/test/java/org/apache/maven/plugins/resources/ResourcesMojoTest.java
@@ -37,7 +37,6 @@
 import org.apache.maven.plugins.resources.stub.MavenProjectResourcesStub;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.IOUtil;
 import org.eclipse.aether.RepositorySystemSession;
 
 public class ResourcesMojoTest
@@ -691,18 +690,9 @@ private void assertContent( String fileName, String data )
         throws IOException
     {
         assertTrue( FileUtils.fileExists( fileName ) );
-
-        BufferedReader reader = null;
-        try
+        try( BufferedReader reader = new BufferedReader( new FileReader( fileName ) ) )
         {
-            reader = new BufferedReader( new FileReader( fileName ) );
             assertEquals( data, reader.readLine() );
-            reader.close();
-            reader = null;
-        }
-        finally
-        {
-            IOUtil.close( reader );
         }
     }
 
diff --git a/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectBuildStub.java b/src/test/java/org/apache/maven/plugins/resources/stub/MavenProjectBuildStub.java
@@ -240,7 +240,7 @@ private void createDirectories( String parent, String testparent )
         }
     }
 
-    private void createFiles( String parent, String testparent )
+    private void createFiles( String parent, String testparent ) throws IOException
     {
         File currentFile;
 
@@ -278,15 +278,8 @@ private void createFiles( String parent, String testparent )
 
             if ( !currentFile.exists() )
             {
-                try
-                {
-                    currentFile.createNewFile();
-                    populateFile( currentFile );
-                }
-                catch ( IOException io )
-                {
-                    //TODO: handle exception
-                }
+                currentFile.createNewFile();
+                populateFile( currentFile );
             }
         }
     }
@@ -300,8 +293,6 @@ private void populateFile( File file ) throws IOException
             try ( FileOutputStream outputStream = new FileOutputStream( file ) )
             {
                 outputStream.write( data.getBytes() );
-                outputStream.flush();
-                outputStream.close();
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ private void createDirectories( String parent, String testparent )`
`240`	`240`	`}`
`241`	`241`	`}`
`242`	`242`
`243`		`- private void createFiles( String parent, String testparent )`
	`243`	`+ private void createFiles( String parent, String testparent ) throws IOException`
`244`	`244`	`{`
`245`	`245`	`File currentFile;`
`246`	`246`
`@@ -278,15 +278,8 @@ private void createFiles( String parent, String testparent )`
`278`	`278`
`279`	`279`	`if ( !currentFile.exists() )`
`280`	`280`	`{`
`281`		`- try`
`282`		`- {`
`283`		`- currentFile.createNewFile();`
`284`		`- populateFile( currentFile );`
`285`		`- }`
`286`		`- catch ( IOException io )`
`287`		`- {`
`288`		`- //TODO: handle exception`
`289`		`- }`
	`281`	`+ currentFile.createNewFile();`
	`282`	`+ populateFile( currentFile );`
`290`	`283`	`}`
`291`	`284`	`}`
`292`	`285`	`}`
`@@ -300,8 +293,6 @@ private void populateFile( File file ) throws IOException`
`300`	`293`	`try ( FileOutputStream outputStream = new FileOutputStream( file ) )`
`301`	`294`	`{`
`302`	`295`	`outputStream.write( data.getBytes() );`
`303`		`- outputStream.flush();`
`304`		`- outputStream.close();`
`305`	`296`	`}`
`306`	`297`	`}`
`307`	`298`	`}`