You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2013/05/02 12:51:42 UTC
svn commit: r1478324 - in
/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd:
PmdReport.java PmdReportListener.java
Author: olamy
Date: Thu May 2 10:51:41 2013
New Revision: 1478324
URL: http://svn.apache.org/r1478324
Log:
[MPMD-169] Support multi-threaded mode of PMD 5
Submitted by Andreas Dangel
Modified:
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReportListener.java
Modified: maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java?rev=1478324&r1=1478323&r2=1478324&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReport.java Thu May 2 10:51:41 2013
@@ -26,7 +26,6 @@ import net.sourceforge.pmd.RuleContext;
import net.sourceforge.pmd.RulePriority;
import net.sourceforge.pmd.RuleSetFactory;
import net.sourceforge.pmd.RuleSetReferenceId;
-import net.sourceforge.pmd.RuleViolation;
import net.sourceforge.pmd.lang.LanguageVersion;
import net.sourceforge.pmd.renderers.CSVRenderer;
import net.sourceforge.pmd.renderers.HTMLRenderer;
@@ -212,16 +211,8 @@ public class PmdReport
PMDConfiguration pmdConfiguration = getPMDConfiguration();
final PmdReportListener reportSink = new PmdReportListener( getLog(), sink, getBundle( locale ), aggregate );
- RuleContext ruleContext = new RuleContext()
- {
- @Override
- public void setReport( Report report )
- {
- super.setReport( report );
- // make sure our listener is added - the Report is created by PMD internally now
- report.addListener( reportSink );
- }
- };
+ RuleContext ruleContext = new RuleContext();
+ ruleContext.getReport().addListener( reportSink );
reportSink.beginDocument();
RuleSetFactory ruleSetFactory = new RuleSetFactory();
@@ -285,15 +276,7 @@ public class PmdReport
try
{
- List<Renderer> renderers = Collections.emptyList();
-
- // Unfortunately we need to disable multi-threading for now - as otherwise our PmdReportListener
- // will be ignored.
- // Longer term solution could be to use a custom renderer instead. And collect with this renderer
- // all the violations.
- pmdConfiguration.setThreads( 0 );
-
- PMD.processFiles( pmdConfiguration, ruleSetFactory, dataSources, ruleContext, renderers );
+ PMD.processFiles( pmdConfiguration, ruleSetFactory, dataSources, ruleContext, Collections.<Renderer> emptyList() );
}
catch ( Exception e )
{
@@ -309,13 +292,7 @@ public class PmdReport
getLog().warn( "Failure creating the report: " + e.getLocalizedMessage(), e );
}
- // copy over the violations into a single report - PMD now creates one report per file
- Report report = new Report();
- for ( RuleViolation v : reportSink.getViolations() )
- {
- report.addRuleViolation( v );
- }
- return report;
+ return reportSink.asReport();
}
/**
Modified: maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReportListener.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReportListener.java?rev=1478324&r1=1478323&r2=1478324&view=diff
==============================================================================
--- maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReportListener.java (original)
+++ maven/plugins/trunk/maven-pmd-plugin/src/main/java/org/apache/maven/plugin/pmd/PmdReportListener.java Thu May 2 10:51:41 2013
@@ -19,13 +19,6 @@ package org.apache.maven.plugin.pmd;
* under the License.
*/
-import net.sourceforge.pmd.ReportListener;
-import net.sourceforge.pmd.RuleViolation;
-import net.sourceforge.pmd.stat.Metric;
-import org.apache.maven.doxia.sink.Sink;
-import org.apache.maven.plugin.logging.Log;
-import org.codehaus.plexus.util.StringUtils;
-
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
@@ -36,6 +29,15 @@ import java.util.List;
import java.util.Map;
import java.util.ResourceBundle;
+import net.sourceforge.pmd.Report;
+import net.sourceforge.pmd.ReportListener;
+import net.sourceforge.pmd.RuleViolation;
+import net.sourceforge.pmd.stat.Metric;
+
+import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.plugin.logging.Log;
+import org.codehaus.plexus.util.StringUtils;
+
/**
* Handle events from PMD, converting them into Doxia events.
*
@@ -90,6 +92,18 @@ public class PmdReportListener
return new ArrayList<RuleViolation>( violations );
}
+ /**
+ * Create a new single report with all violations for further rendering into other formats than HTML.
+ */
+ public Report asReport() {
+ Report report = new Report();
+ for ( RuleViolation v : violations )
+ {
+ report.addRuleViolation( v );
+ }
+ return report;
+ }
+
private void startFileSection( String currentFilename, PmdFileInfo fileInfo )
{
sink.section2();
@@ -105,7 +119,7 @@ public class PmdReportListener
this.currentFilename = StringUtils.replace( this.currentFilename, "\\", "/" );
String title = this.currentFilename;
- if ( aggregate )
+ if ( aggregate && fileInfo != null && fileInfo.getProject() != null )
{
title = fileInfo.getProject().getName() + " - " + this.currentFilename;
}