Author: gboue
Date: Sun Oct 2 01:51:45 2016
New Revision: 1763036
URL: http://svn.apache.org/viewvc?rev=1763036&view=rev
Log:
Improved code to use the try-with-resources construct instead of closing all
InputStream and Reader manually.
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/ExcludeViolationsFromFile.java
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.java
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/AbstractPmdReportTest.java
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/DefaultConfigurationMavenProjectStub.java
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/ExcludeViolationsFromFile.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/ExcludeViolationsFromFile.java?rev=1763036&r1=1763035&r2=1763036&view=diff
==============================================================================
---
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/ExcludeViolationsFromFile.java
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/ExcludeViolationsFromFile.java
Sun Oct 2 01:51:45 2016
@@ -32,7 +32,6 @@ import java.util.Set;
import org.apache.commons.lang3.StringUtils;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.pmd.model.Violation;
-import org.codehaus.plexus.util.IOUtil;
import net.sourceforge.pmd.RuleViolation;
@@ -62,22 +61,14 @@ public class ExcludeViolationsFromFile i
return;
}
final Properties props = new Properties();
- FileInputStream fileInputStream = null;
- try
+ try ( FileInputStream fileInputStream = new FileInputStream( new File(
excludeFromFailureFile ) ) )
{
- fileInputStream = new FileInputStream( new File(
excludeFromFailureFile ) );
props.load( fileInputStream );
- fileInputStream.close();
- fileInputStream = null;
}
catch ( final IOException e )
{
throw new MojoExecutionException( "Cannot load properties file " +
excludeFromFailureFile, e );
}
- finally
- {
- IOUtil.close( fileInputStream );
- }
for ( final Entry<Object, Object> propEntry : props.entrySet() )
{
final Set<String> excludedRuleSet = new HashSet<>();
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.java?rev=1763036&r1=1763035&r2=1763036&view=diff
==============================================================================
---
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.java
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdViolationCheckMojo.java
Sun Oct 2 01:51:45 2016
@@ -117,8 +117,7 @@ public class PmdViolationCheckMojo
protected List<Violation> getErrorDetails( File pmdFile )
throws XmlPullParserException, IOException
{
- final FileReader reader1 = new FileReader( pmdFile );
- try
+ try ( FileReader reader1 = new FileReader( pmdFile ) )
{
PmdXpp3Reader reader = new PmdXpp3Reader();
PmdErrorDetail details = reader.read( reader1, false );
@@ -136,10 +135,6 @@ public class PmdViolationCheckMojo
}
return violations;
}
- finally
- {
- reader1.close();
- }
}
@Override
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/AbstractPmdReportTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/AbstractPmdReportTest.java?rev=1763036&r1=1763035&r2=1763036&view=diff
==============================================================================
---
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/AbstractPmdReportTest.java
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/AbstractPmdReportTest.java
Sun Oct 2 01:51:45 2016
@@ -29,7 +29,6 @@ import org.apache.maven.doxia.siterender
import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.WriterFactory;
/**
@@ -51,25 +50,16 @@ public abstract class AbstractPmdReportT
protected void renderer( AbstractPmdReport mojo, File outputHtml )
throws RendererException, IOException
{
- Writer writer = null;
SiteRenderingContext context = new SiteRenderingContext();
context.setDecoration( new DecorationModel() );
context.setTemplateName(
"org/apache/maven/doxia/siterenderer/resources/default-site.vm" );
context.setLocale( Locale.ENGLISH );
+
+ outputHtml.getParentFile().mkdirs();
- try
+ try ( Writer writer = WriterFactory.newXmlWriter( outputHtml ) )
{
- outputHtml.getParentFile().mkdirs();
- writer = WriterFactory.newXmlWriter( outputHtml );
-
mojo.getSiteRenderer().generateDocument( writer,
(SiteRendererSink) mojo.getSink(), context );
-
- writer.close();
- writer = null;
- }
- finally
- {
- IOUtil.close( writer );
}
}
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java?rev=1763036&r1=1763035&r2=1763036&view=diff
==============================================================================
---
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/CpdReportTest.java
Sun Oct 2 01:51:45 2016
@@ -172,14 +172,14 @@ public class CpdReportTest
{
String strTmp;
StringBuilder str = new StringBuilder( (int) file.length() );
- BufferedReader in = new BufferedReader( new FileReader( file ) );
-
- while ( ( strTmp = in.readLine() ) != null )
+ try ( BufferedReader in = new BufferedReader( new FileReader( file ) )
)
{
- str.append( ' ' );
- str.append( strTmp );
+ while ( ( strTmp = in.readLine() ) != null )
+ {
+ str.append( ' ' );
+ str.append( strTmp );
+ }
}
- in.close();
return str.toString();
}
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java?rev=1763036&r1=1763035&r2=1763036&view=diff
==============================================================================
---
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/PmdReportTest.java
Sun Oct 2 01:51:45 2016
@@ -30,7 +30,6 @@ import java.util.Locale;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.IOUtil;
import com.github.tomakehurst.wiremock.WireMockServer;
import com.github.tomakehurst.wiremock.client.WireMock;
@@ -337,11 +336,8 @@ public class PmdReportTest
private String readFile( File file )
throws IOException
{
- BufferedReader reader = null;
- try
+ try ( BufferedReader reader = new BufferedReader( new FileReader( file
) ) )
{
- reader = new BufferedReader( new FileReader( file ) );
-
final StringBuilder str = new StringBuilder( (int) file.length() );
for ( String line = reader.readLine(); line != null; line =
reader.readLine() )
@@ -349,16 +345,8 @@ public class PmdReportTest
str.append( ' ' );
str.append( line );
}
-
- reader.close();
- reader = null;
-
return str.toString();
}
- finally
- {
- IOUtil.close( reader );
- }
}
/**
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/DefaultConfigurationMavenProjectStub.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/DefaultConfigurationMavenProjectStub.java?rev=1763036&r1=1763035&r2=1763036&view=diff
==============================================================================
---
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/DefaultConfigurationMavenProjectStub.java
(original)
+++
maven/plugins/trunk/maven-pmd-plugin/src/test/java/org/apache/maven/plugin/pmd/stubs/DefaultConfigurationMavenProjectStub.java
Sun Oct 2 01:51:45 2016
@@ -31,7 +31,6 @@ import org.apache.maven.model.ReportPlug
import org.apache.maven.model.Scm;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-import org.codehaus.plexus.util.IOUtil;
/**
* @author <a href="mailto:[email protected]";>Maria Odea Ching</a>
@@ -49,23 +48,16 @@ public class DefaultConfigurationMavenPr
MavenXpp3Reader pomReader = new MavenXpp3Reader();
Model model = null;
- FileReader reader = null;
- try
+ try ( FileReader reader = new FileReader( new File( getBasedir()
+ +
"/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml"
) ) )
{
- reader = new FileReader( new File( getBasedir() +
"/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml"
) );
model = pomReader.read( reader );
- reader.close();
- reader = null;
setModel( model );
}
catch ( Exception e )
{
}
- finally
- {
- IOUtil.close( reader );
- }
setGroupId( model.getGroupId() );
setArtifactId( model.getArtifactId() );
