Fix some quality flaws

diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/FileIndexer.java b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/FileIndexer.java
index 3d09990018e532c4c718f78ac27039c590bc41a7..b9d784723fa379263ddb6bd021b3946df676b578 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/FileIndexer.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/FileIndexer.java
@@ -110,9 +110,10 @@ public class FileIndexer implements BatchComponent {
     Collection<File> files = FileUtils.listFiles(dirToIndex, FILE_FILTER, DIR_FILTER);
     for (File file : files) {
       DefaultInputFile inputFile = inputFileBuilder.create(file);
-      if (inputFile != null && exclusionFilters.accept(inputFile, type))
+      if (inputFile != null && exclusionFilters.accept(inputFile, type)) {
         indexFile(inputFileBuilder, fileSystem, status, inputFile, type);
       }
+    }
   }
 
   private void indexFile(InputFileBuilder inputFileBuilder, DefaultModuleFileSystem fs,

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RulesDefinition.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RulesDefinition.java
index 831a05f1155d8a463e4829092b195017e0ff1079..a3b099a37b6615079f3583dc2a8b7082abbafb6e 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RulesDefinition.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RulesDefinition.java
@@ -538,8 +538,8 @@ public interface RulesDefinition extends ServerExtension {
     /**
      * Required rule name
      */
-    public NewRule setName(String s) {
-      this.name = StringUtils.trim(s);
+    public NewRule setName(@Nullable String s) {
+      this.name = StringUtils.trimToNull(s);
       return this;
     }
 
@@ -556,8 +556,8 @@ public interface RulesDefinition extends ServerExtension {
       return this;
     }
 
-    public NewRule setHtmlDescription(String s) {
-      this.htmlDescription = StringUtils.trim(s);
+    public NewRule setHtmlDescription(@Nullable String s) {
+      this.htmlDescription = StringUtils.trimToNull(s);
       return this;
     }