Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
[JENKINS-14024] Added option to disable resolving of relative paths.
  • Loading branch information
uhafner committed Jun 15, 2012
1 parent bc1d46c commit 991752ce43d115a1039dc33e606c82710990e8c6
Showing with 292 additions and 204 deletions.
  1. +141 −132 src/main/java/hudson/plugins/analysis/core/FilesParser.java
  2. +151 −72 src/main/java/hudson/plugins/analysis/core/HealthAwarePublisher.java
@@ -48,133 +48,50 @@ public class FilesParser implements FileCallable<ParserResult> {

private final String pluginId;

/**
* Creates a new instance of {@link FilesParser}.
* @param filePattern
* ant file-set pattern to scan for files to parse
* @param parser
* the parser to apply on the found files
* @param isMavenBuild
* determines whether this build uses maven
*/
private final boolean canResolveRelativePaths;

private FilesParser(final String filePattern, final AnnotationParser parser, final boolean isMavenBuild, final String moduleName) {
this.filePattern = filePattern;
this.parser = parser;
this.isMavenBuild = isMavenBuild;
this.moduleName = moduleName;
pluginId = "[ANALYSIS] ";
canResolveRelativePaths = true;
}

/**
* Creates a new instance of {@link FilesParser}.
*
* @param logger
* the logger
* @param filePattern
* ant file-set pattern to scan for files to parse
* @param parser
* the parser to apply on the found files
* @param isMavenBuild
* determines whether this build uses maven
* @deprecated Use
* {@link #FilesParser(String, String, AnnotationParser, boolean, boolean)}
*/
@Deprecated
@SuppressWarnings("PMD")
public FilesParser(final PluginLogger logger, final String filePattern, final AnnotationParser parser, final boolean isMavenBuild) {
this(filePattern, parser, isMavenBuild, StringUtils.EMPTY);
}

/**
* Creates a new instance of {@link FilesParser}. Assumes that this is a
* Maven build with the specified module name.
*
* @param logger
* the logger
* @param filePattern
* ant file-set pattern to scan for files to parse
* @param parser
* the parser to apply on the found files
* @param moduleName
* the name of the module to use for all files
* @deprecated Use
* {@link #FilesParser(String, String, AnnotationParser, boolean, boolean)}
*/
@Deprecated
@SuppressWarnings("PMD")
public FilesParser(final PluginLogger logger, final String filePattern, final AnnotationParser parser, final String moduleName) {
this(filePattern, parser, true, moduleName);
}

/**
* Creates a new instance of {@link FilesParser}. Assumes that this is a
* Maven build with the specified module name.
*
* @param logger
* the logger
* @param filePattern
* ant file-set pattern to scan for files to parse
* @param parser
* the parser to apply on the found files
* @deprecated Use
* {@link #FilesParser(String, String, AnnotationParser, boolean, boolean)}
*/
@Deprecated
@SuppressWarnings("PMD")
public FilesParser(final PluginLogger logger, final String filePattern, final AnnotationParser parser) {
this(filePattern, parser, true, StringUtils.EMPTY);

shouldDetectModules = false;
private FilesParser(final String pluginId, final String filePattern, final AnnotationParser parser, final boolean shouldDetectModules,
final boolean isMavenBuild, final String moduleName, final boolean canResolveRelativePaths) {
this.pluginId = pluginId;
this.filePattern = filePattern;
this.parser = parser;
this.isMavenBuild = isMavenBuild;
this.moduleName = moduleName;
this.shouldDetectModules = shouldDetectModules;
this.canResolveRelativePaths = canResolveRelativePaths;
}

/**
* Creates a new instance of {@link FilesParser}.
*
* @param logger
* the logger
* @param pluginId
* the ID of the plug-in that uses this parser
* @param filePattern
* ant file-set pattern to scan for files to parse
* @param parser
* the parser to apply on the found files
* @param moduleName
* the name of the module to use for all files
* @deprecated Use
* {@link #FilesParser(String, String, AnnotationParser, boolean, boolean)}
*/
@Deprecated
@SuppressWarnings("PMD")
public FilesParser(final StringPluginLogger logger, final String filePattern,
final AnnotationParser parser, final String moduleName) {
this(filePattern, parser, true, moduleName);
public FilesParser(final String pluginId, final String filePattern, final AnnotationParser parser,
final String moduleName) {
this(pluginId, filePattern, parser, true, true, moduleName, true);
}

/**
* Creates a new instance of {@link FilesParser}.
*
* @param logger
* the logger
* @param filePattern
* ant file-set pattern to scan for files to parse
* @param parser
* the parser to apply on the found files
* @param shouldDetectModules
* determines whether modules should be detected from pom.xml or
* build.xml files
* @param isMavenBuild
* determines whether this build uses maven
* @deprecated Use
* {@link #FilesParser(String, String, AnnotationParser, boolean, boolean)}
*/
@Deprecated
@SuppressWarnings("PMD")
public FilesParser(final StringPluginLogger logger, final String filePattern,
final AnnotationParser parser,
final boolean shouldDetectModules, final boolean isMavenBuild) {
this(filePattern, parser, isMavenBuild, StringUtils.EMPTY);
}

/**
* Creates a new instance of {@link FilesParser}.
* @param pluginId
* the ID of the plug-in that uses this parser
* @param filePattern
* ant file-set pattern to scan for files to parse
* @param parser
@@ -184,34 +101,10 @@ public FilesParser(final StringPluginLogger logger, final String filePattern,
* build.xml files
* @param isMavenBuild
* determines whether this build uses maven
* @param moduleName
* the name of the module to use for all files
*/
private FilesParser(final String pluginId, final String filePattern, final AnnotationParser parser, final boolean shouldDetectModules,
final boolean isMavenBuild, final String moduleName) {
this.pluginId = pluginId;
this.filePattern = filePattern;
this.parser = parser;
this.isMavenBuild = isMavenBuild;
this.moduleName = moduleName;
this.shouldDetectModules = shouldDetectModules;
}

/**
* Creates a new instance of {@link FilesParser}.
*
* @param pluginId
* the ID of the plug-in that uses this parser
* @param filePattern
* ant file-set pattern to scan for files to parse
* @param parser
* the parser to apply on the found files
* @param moduleName
* the name of the module to use for all files
*/
public FilesParser(final String pluginId, final String filePattern, final AnnotationParser parser,
final String moduleName) {
this(pluginId, filePattern, parser, true, true, moduleName);
final boolean shouldDetectModules, final boolean isMavenBuild) {
this(pluginId, filePattern, parser, shouldDetectModules, isMavenBuild, true);
}

/**
@@ -228,10 +121,14 @@ public FilesParser(final String pluginId, final String filePattern, final Annota
* build.xml files
* @param isMavenBuild
* determines whether this build uses maven
* @param canResolveRelativePaths
* determines whether relative paths in warnings should be
* resolved using a time expensive operation that scans the whole
* workspace for matching files.
*/
public FilesParser(final String pluginId, final String filePattern, final AnnotationParser parser,
final boolean shouldDetectModules, final boolean isMavenBuild) {
this(pluginId, filePattern, parser, shouldDetectModules, isMavenBuild, StringUtils.EMPTY);
final boolean shouldDetectModules, final boolean isMavenBuild, final boolean canResolveRelativePaths) {
this(pluginId, filePattern, parser, shouldDetectModules, isMavenBuild, StringUtils.EMPTY, canResolveRelativePaths);
}

/**
@@ -248,8 +145,13 @@ protected void log(final String message) {

/** {@inheritDoc} */
public ParserResult invoke(final File workspace, final VirtualChannel channel) throws IOException {
ParserResult result = new ParserResult(new FilePath(workspace));

ParserResult result;
if (canResolveRelativePaths) {
result = new ParserResult(new FilePath(workspace));
}
else {
result = new ParserResult();
}
try {
String[] fileNames = new FileFinder(filePattern).find(workspace);

@@ -368,4 +270,111 @@ private void parseFile(final File file, final String module, final ParserResult
log(errorMessage);
}
}
/**
* Creates a new instance of {@link FilesParser}.
*
* @param logger
* the logger
* @param filePattern
* ant file-set pattern to scan for files to parse
* @param parser
* the parser to apply on the found files
* @param isMavenBuild
* determines whether this build uses maven
* @deprecated Use
* {@link #FilesParser(String, String, AnnotationParser, boolean, boolean)}
*/
@Deprecated
@SuppressWarnings("PMD")
public FilesParser(final PluginLogger logger, final String filePattern, final AnnotationParser parser, final boolean isMavenBuild) {
this(filePattern, parser, isMavenBuild, StringUtils.EMPTY);
}

/**
* Creates a new instance of {@link FilesParser}. Assumes that this is a
* Maven build with the specified module name.
*
* @param logger
* the logger
* @param filePattern
* ant file-set pattern to scan for files to parse
* @param parser
* the parser to apply on the found files
* @param moduleName
* the name of the module to use for all files
* @deprecated Use
* {@link #FilesParser(String, String, AnnotationParser, boolean, boolean)}
*/
@Deprecated
@SuppressWarnings("PMD")
public FilesParser(final PluginLogger logger, final String filePattern, final AnnotationParser parser, final String moduleName) {
this(filePattern, parser, true, moduleName);
}

/**
* Creates a new instance of {@link FilesParser}. Assumes that this is a
* Maven build with the specified module name.
*
* @param logger
* the logger
* @param filePattern
* ant file-set pattern to scan for files to parse
* @param parser
* the parser to apply on the found files
* @deprecated Use
* {@link #FilesParser(String, String, AnnotationParser, boolean, boolean)}
*/
@Deprecated
@SuppressWarnings("PMD")
public FilesParser(final PluginLogger logger, final String filePattern, final AnnotationParser parser) {
this(filePattern, parser, true, StringUtils.EMPTY);

shouldDetectModules = false;
}

/**
* Creates a new instance of {@link FilesParser}.
*
* @param logger
* the logger
* @param filePattern
* ant file-set pattern to scan for files to parse
* @param parser
* the parser to apply on the found files
* @param moduleName
* the name of the module to use for all files
* @deprecated Use
* {@link #FilesParser(String, String, AnnotationParser, boolean, boolean)}
*/
@Deprecated
@SuppressWarnings("PMD")
public FilesParser(final StringPluginLogger logger, final String filePattern,
final AnnotationParser parser, final String moduleName) {
this(filePattern, parser, true, moduleName);
}

/**
* Creates a new instance of {@link FilesParser}.
*
* @param logger
* the logger
* @param filePattern
* ant file-set pattern to scan for files to parse
* @param parser
* the parser to apply on the found files
* @param shouldDetectModules
* determines whether modules should be detected from pom.xml or
* build.xml files
* @param isMavenBuild
* determines whether this build uses maven
* @deprecated Use
* {@link #FilesParser(String, String, AnnotationParser, boolean, boolean)}
*/
@Deprecated
@SuppressWarnings("PMD")
public FilesParser(final StringPluginLogger logger, final String filePattern,
final AnnotationParser parser,
final boolean shouldDetectModules, final boolean isMavenBuild) {
this(filePattern, parser, isMavenBuild, StringUtils.EMPTY);
}
}

0 comments on commit 991752c

Please sign in to comment.