SONAR-6134, SONAR-6048 Improve performance of FS indexation

2 files changed, 4 insertions, 12 deletions

diff --git a/sonar-deprecated/src/main/java/org/sonar/api/batch/AbstractSourceImporter.java b/sonar-deprecated/src/main/java/org/sonar/api/batch/AbstractSourceImporter.java
index f453c1e6579..137437fae4f 100644
--- a/sonar-deprecated/src/main/java/org/sonar/api/batch/AbstractSourceImporter.java
+++ b/sonar-deprecated/src/main/java/org/sonar/api/batch/AbstractSourceImporter.java
@@ -22,7 +22,6 @@ package org.sonar.api.batch;
 import org.sonar.api.resources.Language;
 import org.sonar.api.resources.Project;
 import org.sonar.api.resources.ProjectFileSystem;
-import org.sonar.api.resources.Qualifiers;
 import org.sonar.api.resources.Resource;
 
 import java.io.File;
@@ -66,14 +65,7 @@ public abstract class AbstractSourceImporter implements Sensor {
   }
 
   protected Resource createResource(File file, List<File> sourceDirs, boolean unitTest) {
-    org.sonar.api.resources.File resource = org.sonar.api.resources.File.fromIOFile(file, sourceDirs);
-    if (resource != null) {
-      resource.setLanguage(language);
-      if (unitTest) {
-        resource.setQualifier(Qualifiers.UNIT_TEST_FILE);
-      }
-    }
-    return resource;
+    return null;
   }
 
   protected boolean isEnabled(Project project) {
diff --git a/sonar-deprecated/src/test/java/org/sonar/api/checks/NoSonarFilterTest.java b/sonar-deprecated/src/test/java/org/sonar/api/checks/NoSonarFilterTest.java
index 1521ca67b52..4cc3bda8872 100644
--- a/sonar-deprecated/src/test/java/org/sonar/api/checks/NoSonarFilterTest.java
+++ b/sonar-deprecated/src/test/java/org/sonar/api/checks/NoSonarFilterTest.java
@@ -45,8 +45,8 @@ public class NoSonarFilterTest {
   @Before
   public void prepare() {
     when(chain.accept(isA(Issue.class))).thenReturn(true);
-    javaFile = new File("org.foo.Bar");
-    javaFile.setEffectiveKey("struts:org.apache.Action");
+    javaFile = File.create("org/foo/Bar.java");
+    javaFile.setEffectiveKey("struts:org/foo/Bar.java");
     when(sonarIndex.getResource(javaFile)).thenReturn(javaFile);
   }
 
@@ -58,7 +58,7 @@ public class NoSonarFilterTest {
     filter.addResource(javaFile, noSonarLines);
 
     Issue issue = mock(Issue.class);
-    when(issue.componentKey()).thenReturn("struts:org.apache.Action");
+    when(issue.componentKey()).thenReturn("struts:org/foo/Bar.java");
     when(issue.ruleKey()).thenReturn(RuleKey.of("squid", "Foo"));
 
     // violation on class