Rename persistit classes Cache* -> Storage*

2 files changed, 7 insertions, 7 deletions

diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectScanContainer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectScanContainer.java
index 649e994cb05..310acabe741 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectScanContainer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectScanContainer.java
@@ -44,7 +44,6 @@ import org.sonar.scanner.cpd.CpdExecutor;
 import org.sonar.scanner.cpd.index.SonarCpdBlockIndex;
 import org.sonar.scanner.events.EventBus;
 import org.sonar.scanner.index.BatchComponentCache;
-import org.sonar.scanner.index.Caches;
 import org.sonar.scanner.index.DefaultIndex;
 import org.sonar.scanner.issue.DefaultIssueCallback;
 import org.sonar.scanner.issue.DefaultProjectIssues;
@@ -90,6 +89,7 @@ import org.sonar.scanner.scan.measure.DefaultMetricFinder;
 import org.sonar.scanner.scan.measure.DeprecatedMetricFinder;
 import org.sonar.scanner.scan.measure.MeasureCache;
 import org.sonar.scanner.source.CodeColorizers;
+import org.sonar.scanner.storage.Storages;
 import org.sonar.scanner.test.TestPlanBuilder;
 import org.sonar.scanner.test.TestableBuilder;
 
@@ -139,7 +139,7 @@ public class ProjectScanContainer extends ComponentContainer {
       MetricProvider.class,
       ProjectConfigurator.class,
       DefaultIndex.class,
-      Caches.class,
+      Storages.class,
       BatchComponentCache.class,
       DefaultIssueCallback.class,
       new RulesProvider(),
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/measure/MeasureCache.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/measure/MeasureCache.java
index b0e9b87ceeb..36695769b92 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/measure/MeasureCache.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/measure/MeasureCache.java
@@ -24,9 +24,9 @@ import javax.annotation.CheckForNull;
 import org.sonar.api.batch.ScannerSide;
 import org.sonar.api.batch.measure.MetricFinder;
 import org.sonar.api.batch.sensor.measure.internal.DefaultMeasure;
-import org.sonar.scanner.index.Cache;
-import org.sonar.scanner.index.Cache.Entry;
-import org.sonar.scanner.index.Caches;
+import org.sonar.scanner.storage.Storage;
+import org.sonar.scanner.storage.Storages;
+import org.sonar.scanner.storage.Storage.Entry;
 
 /**
  * Cache of all measures. This cache is shared amongst all project modules.
@@ -34,9 +34,9 @@ import org.sonar.scanner.index.Caches;
 @ScannerSide
 public class MeasureCache {
 
-  private final Cache<DefaultMeasure<?>> cache;
+  private final Storage<DefaultMeasure<?>> cache;
 
-  public MeasureCache(Caches caches, MetricFinder metricFinder) {
+  public MeasureCache(Storages caches, MetricFinder metricFinder) {
     caches.registerValueCoder(DefaultMeasure.class, new MeasureValueCoder(metricFinder));
     cache = caches.createCache("measures");
   }