SONAR-926 remove dependency on JavaFile

2 files changed, 2 insertions, 6 deletions

diff --git a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/ComponentIndexer.java b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/ComponentIndexer.java
index ee96bf4ffac..25cda6e9fb1 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/ComponentIndexer.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/scan/filesystem/ComponentIndexer.java
@@ -72,12 +72,8 @@ public class ComponentIndexer implements BatchComponent {
         pathFromSourceDir = inputFile.relativePath();
       }
       Resource sonarFile = File.create(inputFile.relativePath(), pathFromSourceDir, languages.get(languageKey), unitTest);
-      if (Java.KEY.equals(languageKey)) {
-        sonarFile.setDeprecatedKey(JavaFile.fromRelativePath(pathFromSourceDir, false).getDeprecatedKey());
-      } else {
-        sonarFile.setDeprecatedKey(pathFromSourceDir);
-      }
       if (sonarFile != null) {
+        sonarFile.setDeprecatedKey(((DefaultInputFile)inputFile).deprecatedKey());
         moduleLanguages.addLanguage(languageKey);
         sonarIndex.index(sonarFile);
         importSources(fs, shouldImportSource, inputFile, sonarFile);
diff --git a/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/ComponentIndexerTest.java b/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/ComponentIndexerTest.java
index 1744309ea1d..aef24d43e0b 100644
--- a/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/ComponentIndexerTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/scan/filesystem/ComponentIndexerTest.java
@@ -94,7 +94,7 @@ public class ComponentIndexerTest {
       @Override
       public boolean matches(Object arg0) {
         org.sonar.api.resources.File javaFile = (org.sonar.api.resources.File) arg0;
-        return javaFile.getKey().equals("src/test/java/foo/bar/FooTest.java") && javaFile.getDeprecatedKey().equals("foo.bar.FooTest")
+        return javaFile.getKey().equals("src/test/java/foo/bar/FooTest.java")
           && javaFile.getPath().equals("src/test/java/foo/bar/FooTest.java")
           && javaFile.getQualifier().equals(Qualifiers.UNIT_TEST_FILE);
       }