MetricsVisitor doesn't need a ClassLoader

This commit is contained in:
oowekyala
2017-06-09 14:33:36 +02:00
parent 2b3d12242e
commit bfbecd23c6
5 changed files with 6 additions and 8 deletions

View File

@ -160,7 +160,7 @@ public class SourceCodeProcessor {
if (ruleSets.usesMetrics(language)) { if (ruleSets.usesMetrics(language)) {
long start = System.nanoTime(); long start = System.nanoTime();
languageVersion.getLanguageVersionHandler().getMetricsVisitorFacade(configuration.getClassLoader()) languageVersion.getLanguageVersionHandler().getMetricsVisitorFacade()
.start(rootNode); .start(rootNode);
long end = System.nanoTime(); long end = System.nanoTime();
Benchmarker.mark(Benchmark.MetricsVisitor, end - start, 0); Benchmarker.mark(Benchmark.MetricsVisitor, end - start, 0);

View File

@ -51,7 +51,7 @@ public abstract class AbstractLanguageVersionHandler implements LanguageVersionH
} }
@Override @Override
public VisitorStarter getMetricsVisitorFacade(ClassLoader classLoader) { public VisitorStarter getMetricsVisitorFacade() {
return VisitorStarter.DUMMY; return VisitorStarter.DUMMY;
} }

View File

@ -81,11 +81,9 @@ public interface LanguageVersionHandler {
/** /**
* Get the Metrics Framework visitor. * Get the Metrics Framework visitor.
* *
* @param classLoader
* A ClassLoader to use for resolving Types.
* @return VisitorStarter * @return VisitorStarter
*/ */
VisitorStarter getMetricsVisitorFacade(ClassLoader classLoader); VisitorStarter getMetricsVisitorFacade();
/** /**

View File

@ -98,11 +98,11 @@ public abstract class AbstractJavaHandler extends AbstractLanguageVersionHandler
} }
@Override @Override
public VisitorStarter getMetricsVisitorFacade(final ClassLoader classLoader) { public VisitorStarter getMetricsVisitorFacade() {
return new VisitorStarter() { return new VisitorStarter() {
@Override @Override
public void start(Node rootNode) { public void start(Node rootNode) {
new MetricsVisitorFacade().initializeWith(classLoader, (ASTCompilationUnit) rootNode); new MetricsVisitorFacade().initializeWith((ASTCompilationUnit) rootNode);
} }
}; };
} }

View File

@ -15,7 +15,7 @@ import net.sourceforge.pmd.lang.java.oom.Metrics;
*/ */
public class MetricsVisitorFacade extends JavaParserVisitorAdapter { public class MetricsVisitorFacade extends JavaParserVisitorAdapter {
public void initializeWith(ClassLoader classLoader, ASTCompilationUnit rootNode) { public void initializeWith(ASTCompilationUnit rootNode) {
MetricsVisitor visitor = new MetricsVisitor(); MetricsVisitor visitor = new MetricsVisitor();
rootNode.jjtAccept(visitor, Metrics.getTopLevelPackageStats()); rootNode.jjtAccept(visitor, Metrics.getTopLevelPackageStats());
} }