From 6ace78128277d173c22a02518305838454bd95f8 Mon Sep 17 00:00:00 2001 From: Julien HENRY Date: Mon, 7 Jul 2014 16:28:58 +0200 Subject: [PATCH] Improve filesystem logger --- .../sonar/batch/scan/filesystem/FileSystemLogger.java | 9 ++++++--- .../org/sonar/api/batch/bootstrap/ProjectDefinition.java | 8 ++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/FileSystemLogger.java b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/FileSystemLogger.java index 3238b870e43..d715e31792f 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/FileSystemLogger.java +++ b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/FileSystemLogger.java @@ -20,6 +20,7 @@ package org.sonar.batch.scan.filesystem; import com.google.common.annotations.VisibleForTesting; +import org.codehaus.plexus.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.sonar.api.BatchComponent; @@ -68,10 +69,12 @@ public class FileSystemLogger implements BatchComponent { for (Iterator it = paths.iterator(); it.hasNext();) { File file = it.next(); String relativePathToBaseDir = resolver.relativePath(baseDir, file); - if (relativePathToBaseDir != null) { - sb.append(relativePathToBaseDir); - } else { + if (relativePathToBaseDir == null) { sb.append(file); + } else if (StringUtils.isBlank(relativePathToBaseDir)) { + sb.append("."); + } else { + sb.append(relativePathToBaseDir); } if (it.hasNext()) { sb.append(", "); diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/batch/bootstrap/ProjectDefinition.java b/sonar-plugin-api/src/main/java/org/sonar/api/batch/bootstrap/ProjectDefinition.java index b228e383421..29fb31ce86f 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/batch/bootstrap/ProjectDefinition.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/batch/bootstrap/ProjectDefinition.java @@ -182,8 +182,12 @@ public class ProjectDefinition { } private void appendProperty(String key, String value) { - String newValue = properties.getProperty(key, "") + SEPARATOR + value; - properties.put(key, newValue); + String current = properties.getProperty(key, ""); + if (StringUtils.isBlank(current)) { + properties.put(key, value); + } else { + properties.put(key, current + SEPARATOR + value); + } } /** -- 2.39.5