Fix some quality flaws

diff --git a/sonar-batch/src/main/java/org/sonar/batch/highlighting/SyntaxHighlightingDataValueCoder.java b/sonar-batch/src/main/java/org/sonar/batch/highlighting/SyntaxHighlightingDataValueCoder.java
index b3be41fa2f617949f591f361af61115665eb3b4d..621c1e5c2f535c12f099410a7f2a7299991797de 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/highlighting/SyntaxHighlightingDataValueCoder.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/highlighting/SyntaxHighlightingDataValueCoder.java
@@ -24,6 +24,7 @@ import com.persistit.encoding.CoderContext;
 import com.persistit.encoding.ValueCoder;
 
 import java.util.ArrayList;
+import java.util.List;
 
 public class SyntaxHighlightingDataValueCoder implements ValueCoder {
 
@@ -41,7 +42,7 @@ public class SyntaxHighlightingDataValueCoder implements ValueCoder {
   @Override
   public Object get(Value value, Class clazz, CoderContext context) {
     int count = value.getInt();
-    ArrayList<SyntaxHighlightingRule> rules = new ArrayList<SyntaxHighlightingRule>(count);
+    List<SyntaxHighlightingRule> rules = new ArrayList<SyntaxHighlightingRule>(count);
     for (int i = 0; i < count; i++) {
       rules.add((SyntaxHighlightingRule) rulesCoder.get(value, SyntaxHighlightingRule.class, context));
     }

diff --git a/sonar-batch/src/main/java/org/sonar/batch/mediumtest/BatchMediumTester.java b/sonar-batch/src/main/java/org/sonar/batch/mediumtest/BatchMediumTester.java
index bdb052ddc1ec4a78a6bad3f41fc82cfd2b1b4367..be3185f7b6d6922a9b15b891d4fad19d53fbff29 100644 (file)
--- a/sonar-batch/src/main/java/org/sonar/batch/mediumtest/BatchMediumTester.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/mediumtest/BatchMediumTester.java
@@ -19,8 +19,6 @@
  */
 package org.sonar.batch.mediumtest;
 
-import org.sonar.api.batch.sensor.highlighting.TypeOfText;
-
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -32,6 +30,7 @@ import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.fs.InputPath;
 import org.sonar.api.batch.fs.internal.DefaultInputFile;
 import org.sonar.api.batch.sensor.duplication.DuplicationGroup;
+import org.sonar.api.batch.sensor.highlighting.TypeOfText;
 import org.sonar.api.batch.sensor.issue.Issue;
 import org.sonar.api.batch.sensor.measure.Measure;
 import org.sonar.api.batch.sensor.symbol.Symbol;
@@ -67,6 +66,7 @@ import javax.annotation.CheckForNull;
 import java.io.File;
 import java.io.FileReader;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -291,11 +291,10 @@ public class BatchMediumTester {
      * Get highlighting types at a given position in an inputfile
      * @param charIndex 0-based offset in file
      */
-    @CheckForNull
     public List<TypeOfText> highlightingTypeFor(InputFile file, int charIndex) {
       SyntaxHighlightingData syntaxHighlightingData = highlightingPerFile.get(file);
       if (syntaxHighlightingData == null) {
-        return null;
+        return Collections.emptyList();
       }
       List<TypeOfText> result = new ArrayList<TypeOfText>();
       for (SyntaxHighlightingRule sortedRule : syntaxHighlightingData.syntaxHighlightingRuleSet()) {