SONAR-6620 replace MetricCache by MetricRepository everywhere

and remove MetricCache

server/sonar-server/src/main/java/org/sonar/server/computation/container/ComputeEngineContainerImpl.java

@@ -51,7 +51,6 @@
 import org.sonar.server.computation.issue.SourceLinesCache;
 import org.sonar.server.computation.language.PlatformLanguageRepository;
 import org.sonar.server.computation.measure.MeasureRepositoryImpl;
-import org.sonar.server.computation.measure.MetricCache;
 import org.sonar.server.computation.metric.MetricRepositoryImpl;
 import org.sonar.server.computation.period.PeriodsHolderImpl;
 import org.sonar.server.computation.qualitygate.QualityGateHolderImpl;
@@ -154,7 +153,6 @@ private static List componentClasses() {
       RuleCache.class,
       RuleCacheLoader.class,
       IssueCache.class,
-      MetricCache.class,
       UpdateConflictResolver.class,
 
       // views

server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStep.java

@@ -34,7 +34,7 @@
 import org.sonar.server.computation.component.DbIdsRepository;
 import org.sonar.server.computation.component.DepthTraversalTypeAwareVisitor;
 import org.sonar.server.computation.component.TreeRootHolder;
-import org.sonar.server.computation.measure.MetricCache;
+import org.sonar.server.computation.metric.MetricRepository;
 import org.sonar.server.db.DbClient;
 import org.sonar.server.source.index.SourceLineIndex;
 
@@ -47,17 +47,17 @@ public class PersistNumberOfDaysSinceLastCommitStep implements ComputationStep {
 
   private final DbClient dbClient;
   private final SourceLineIndex sourceLineIndex;
-  private final MetricCache metricCache;
+  private final MetricRepository metricRepository;
   private final System2 system;
   private final TreeRootHolder treeRootHolder;
   private final BatchReportReader reportReader;
   private final DbIdsRepository dbIdsRepository;
 
-  public PersistNumberOfDaysSinceLastCommitStep(System2 system, DbClient dbClient, SourceLineIndex sourceLineIndex, MetricCache metricCache,
+  public PersistNumberOfDaysSinceLastCommitStep(System2 system, DbClient dbClient, SourceLineIndex sourceLineIndex, MetricRepository metricRepository,
     TreeRootHolder treeRootHolder, BatchReportReader reportReader, DbIdsRepository dbIdsRepository) {
     this.dbClient = dbClient;
     this.sourceLineIndex = sourceLineIndex;
-    this.metricCache = metricCache;
+    this.metricRepository = metricRepository;
     this.system = system;
     this.treeRootHolder = treeRootHolder;
     this.reportReader = reportReader;
@@ -98,7 +98,7 @@ private void persistNumberOfDaysSinceLastCommit(long lastCommitTimestamp, long p
     try {
       dbClient.measureDao().insert(dbSession, new MeasureDto()
         .setValue((double) numberOfDaysSinceLastCommit)
-        .setMetricId(metricCache.get(CoreMetrics.DAYS_SINCE_LAST_COMMIT_KEY).getId())
+        .setMetricId(metricRepository.getByKey(CoreMetrics.DAYS_SINCE_LAST_COMMIT_KEY).getId())
         .setSnapshotId(projectSnapshotId));
       dbSession.commit();
     } finally {

server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStepTest.java

@@ -29,15 +29,16 @@
 import org.sonar.api.utils.DateUtils;
 import org.sonar.api.utils.System2;
 import org.sonar.batch.protocol.output.BatchReport;
-import org.sonar.core.metric.db.MetricDto;
 import org.sonar.core.persistence.DbTester;
 import org.sonar.server.computation.batch.BatchReportReaderRule;
 import org.sonar.server.computation.batch.TreeRootHolderRule;
 import org.sonar.server.computation.component.Component;
 import org.sonar.server.computation.component.DbIdsRepository;
 import org.sonar.server.computation.component.DumbComponent;
 import org.sonar.server.computation.language.LanguageRepository;
-import org.sonar.server.computation.measure.MetricCache;
+import org.sonar.server.computation.metric.Metric;
+import org.sonar.server.computation.metric.MetricImpl;
+import org.sonar.server.computation.metric.MetricRepository;
 import org.sonar.server.db.DbClient;
 import org.sonar.server.measure.persistence.MeasureDao;
 import org.sonar.server.source.index.SourceLineIndex;
@@ -63,7 +64,7 @@ public class PersistNumberOfDaysSinceLastCommitStepTest extends BaseStepTest {
 
   DbClient dbClient;
   SourceLineIndex sourceLineIndex;
-  MetricCache metricCache;
+  MetricRepository metricRepository;
   Settings projectSettings;
   LanguageRepository languageRepository;
 
@@ -72,12 +73,12 @@ public void setUp() throws Exception {
     db.truncateTables();
     dbClient = new DbClient(db.database(), db.myBatis(), new MeasureDao());
     sourceLineIndex = mock(SourceLineIndex.class);
-    metricCache = mock(MetricCache.class);
+    metricRepository = mock(MetricRepository.class);
     projectSettings = new Settings();
     languageRepository = mock(LanguageRepository.class);
-    when(metricCache.get(anyString())).thenReturn(new MetricDto().setId(10));
+    when(metricRepository.getByKey(anyString())).thenReturn(new MetricImpl(10, "key", "name", Metric.MetricType.STRING));
 
-    sut = new PersistNumberOfDaysSinceLastCommitStep(System2.INSTANCE, dbClient, sourceLineIndex, metricCache, treeRootHolder, reportReader, dbIdsRepository);
+    sut = new PersistNumberOfDaysSinceLastCommitStep(System2.INSTANCE, dbClient, sourceLineIndex, metricRepository, treeRootHolder, reportReader, dbIdsRepository);
   }
 
   @Override