SONAR-7727 Remove SonarIndex and ResourceFilter

sonar-plugin-api/src/main/java/org/sonar/api/measures/FileLinesContextFactory.java

@@ -21,7 +21,6 @@
 
 import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.fs.InputFile;
-import org.sonar.api.resources.Resource;
 
 /**
  * <p>This interface is not intended to be implemented by clients.
@@ -31,12 +30,6 @@
 @ScannerSide
 public interface FileLinesContextFactory {
 
-  /**
-   * @deprecated since 4.4 use {@link #createFor(InputFile)}
-   */
-  @Deprecated
-  FileLinesContext createFor(Resource resource);
-
   /**
    * @since 4.2
    */

sonar-scanner-engine/src/main/java/org/sonar/batch/DefaultFileLinesContextFactory.java

@@ -19,47 +19,25 @@
  */
 package org.sonar.batch;
 
-import com.google.common.base.Preconditions;
 import org.sonar.api.batch.SensorContext;
-import org.sonar.api.batch.SonarIndex;
 import org.sonar.api.batch.fs.InputFile;
 import org.sonar.api.batch.measure.MetricFinder;
 import org.sonar.api.measures.FileLinesContext;
 import org.sonar.api.measures.FileLinesContextFactory;
-import org.sonar.api.resources.File;
-import org.sonar.api.resources.Resource;
-import org.sonar.api.resources.ResourceUtils;
-import org.sonar.batch.index.BatchComponentCache;
 import org.sonar.batch.scan.measure.MeasureCache;
 
 public class DefaultFileLinesContextFactory implements FileLinesContextFactory {
 
-  private final SonarIndex index;
   private final SensorContext sensorContext;
   private final MetricFinder metricFinder;
   private final MeasureCache measureCache;
-  private final BatchComponentCache scannerComponentCache;
 
-  public DefaultFileLinesContextFactory(SonarIndex index, SensorContext sensorContext, MetricFinder metricFinder, BatchComponentCache scannerComponentCache,
-    MeasureCache measureCache) {
-    this.index = index;
+  public DefaultFileLinesContextFactory(SensorContext sensorContext, MetricFinder metricFinder, MeasureCache measureCache) {
     this.sensorContext = sensorContext;
     this.metricFinder = metricFinder;
-    this.scannerComponentCache = scannerComponentCache;
     this.measureCache = measureCache;
   }
 
-  @Override
-  public FileLinesContext createFor(Resource resource) {
-    Preconditions.checkArgument(ResourceUtils.isFile(resource));
-    // Reload resource in case it use deprecated key
-    File file = (File) index.getResource(resource);
-    if (file == null) {
-      throw new IllegalArgumentException("Unable to find resource " + resource + " in index.");
-    }
-    return new DefaultFileLinesContext(sensorContext, (InputFile) scannerComponentCache.get(file).inputComponent(), metricFinder, measureCache);
-  }
-
   @Override
   public FileLinesContext createFor(InputFile inputFile) {
     return new DefaultFileLinesContext(sensorContext, inputFile, metricFinder, measureCache);

sonar-scanner-engine/src/main/java/org/sonar/batch/deprecated/DeprecatedSensorContext.java

@@ -26,7 +26,6 @@
 import org.sonar.api.SonarQubeVersion;
 import org.sonar.api.batch.AnalysisMode;
 import org.sonar.api.batch.SensorContext;
-import org.sonar.api.batch.SonarIndex;
 import org.sonar.api.batch.fs.FileSystem;
 import org.sonar.api.batch.fs.InputDir;
 import org.sonar.api.batch.fs.InputFile;
@@ -44,18 +43,19 @@
 import org.sonar.api.resources.Project;
 import org.sonar.api.resources.Resource;
 import org.sonar.api.utils.SonarException;
+import org.sonar.batch.index.DefaultIndex;
 import org.sonar.batch.sensor.DefaultSensorContext;
 import org.sonar.batch.sensor.coverage.CoverageExclusions;
 
 public class DeprecatedSensorContext extends DefaultSensorContext implements SensorContext {
 
   private static final Logger LOG = LoggerFactory.getLogger(DeprecatedSensorContext.class);
 
-  private final SonarIndex index;
+  private final DefaultIndex index;
   private final Project project;
   private final CoverageExclusions coverageFilter;
 
-  public DeprecatedSensorContext(InputModule module, SonarIndex index, Project project, Settings settings, FileSystem fs, ActiveRules activeRules,
+  public DeprecatedSensorContext(InputModule module, DefaultIndex index, Project project, Settings settings, FileSystem fs, ActiveRules activeRules,
     AnalysisMode analysisMode, CoverageExclusions coverageFilter, SensorStorage sensorStorage, SonarQubeVersion sqVersion) {
     super(module, settings, fs, activeRules, analysisMode, sensorStorage, sqVersion);
     this.index = index;

sonar-scanner-engine/src/main/java/org/sonar/batch/deprecated/perspectives/BatchPerspectives.java

@@ -22,20 +22,20 @@
 import com.google.common.collect.Maps;
 import java.util.Map;
 import javax.annotation.CheckForNull;
-import org.sonar.api.batch.SonarIndex;
 import org.sonar.api.batch.fs.InputPath;
 import org.sonar.api.component.Perspective;
 import org.sonar.api.component.ResourcePerspectives;
 import org.sonar.api.resources.Resource;
 import org.sonar.batch.index.BatchComponentCache;
+import org.sonar.batch.index.DefaultIndex;
 
 public class BatchPerspectives implements ResourcePerspectives {
 
   private final Map<Class<?>, PerspectiveBuilder<?>> builders = Maps.newHashMap();
-  private final SonarIndex resourceIndex;
+  private final DefaultIndex resourceIndex;
   private final BatchComponentCache componentCache;
 
-  public BatchPerspectives(PerspectiveBuilder[] builders, SonarIndex resourceIndex, BatchComponentCache componentCache) {
+  public BatchPerspectives(PerspectiveBuilder[] builders, DefaultIndex resourceIndex, BatchComponentCache componentCache) {
     this.resourceIndex = resourceIndex;
     this.componentCache = componentCache;
     for (PerspectiveBuilder builder : builders) {