diff options
Diffstat (limited to 'plugins')
7 files changed, 18 insertions, 18 deletions
diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/AbstractNewCoverageFileAnalyzer.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/AbstractNewCoverageFileAnalyzer.java index e215fc18fe5..35d8a3506e4 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/AbstractNewCoverageFileAnalyzer.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/AbstractNewCoverageFileAnalyzer.java @@ -37,7 +37,7 @@ import org.sonar.api.resources.Scopes; import org.sonar.api.utils.KeyValueFormat; import org.sonar.batch.components.Period; import org.sonar.batch.components.TimeMachineConfiguration; -import org.sonar.batch.index.ResourceCache; +import org.sonar.batch.index.BatchComponentCache; import org.sonar.batch.protocol.output.BatchReport; import org.sonar.batch.protocol.output.BatchReport.Changesets.Changeset; import org.sonar.batch.protocol.output.BatchReportReader; @@ -59,16 +59,16 @@ public abstract class AbstractNewCoverageFileAnalyzer implements Decorator { private final List<PeriodStruct> structs; private final ReportPublisher publishReportJob; - private final ResourceCache resourceCache; + private final BatchComponentCache resourceCache; - public AbstractNewCoverageFileAnalyzer(TimeMachineConfiguration timeMachineConfiguration, ReportPublisher publishReportJob, ResourceCache resourceCache) { + public AbstractNewCoverageFileAnalyzer(TimeMachineConfiguration timeMachineConfiguration, ReportPublisher publishReportJob, BatchComponentCache resourceCache) { this(Lists.<PeriodStruct>newArrayList(), publishReportJob, resourceCache); for (Period period : timeMachineConfiguration.periods()) { structs.add(new PeriodStruct(period.getIndex(), period.getDate())); } } - AbstractNewCoverageFileAnalyzer(List<PeriodStruct> structs, ReportPublisher publishReportJob, ResourceCache resourceCache) { + AbstractNewCoverageFileAnalyzer(List<PeriodStruct> structs, ReportPublisher publishReportJob, BatchComponentCache resourceCache) { this.resourceCache = resourceCache; this.publishReportJob = publishReportJob; this.structs = structs; diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewCoverageFileAnalyzer.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewCoverageFileAnalyzer.java index d13df7224ef..79f028966cd 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewCoverageFileAnalyzer.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewCoverageFileAnalyzer.java @@ -22,18 +22,18 @@ package org.sonar.plugins.core.timemachine; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.measures.Metric; import org.sonar.batch.components.TimeMachineConfiguration; -import org.sonar.batch.index.ResourceCache; +import org.sonar.batch.index.BatchComponentCache; import org.sonar.batch.report.ReportPublisher; import java.util.List; public class NewCoverageFileAnalyzer extends AbstractNewCoverageFileAnalyzer { - public NewCoverageFileAnalyzer(TimeMachineConfiguration timeMachineConfiguration, ReportPublisher publishReportJob, ResourceCache resourceCache) { + public NewCoverageFileAnalyzer(TimeMachineConfiguration timeMachineConfiguration, ReportPublisher publishReportJob, BatchComponentCache resourceCache) { super(timeMachineConfiguration, publishReportJob, resourceCache); } - NewCoverageFileAnalyzer(List<PeriodStruct> structs, ReportPublisher publishReportJob, ResourceCache resourceCache) { + NewCoverageFileAnalyzer(List<PeriodStruct> structs, ReportPublisher publishReportJob, BatchComponentCache resourceCache) { super(structs, publishReportJob, resourceCache); } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewItCoverageFileAnalyzer.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewItCoverageFileAnalyzer.java index f069a633b4e..2aacf34a9bd 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewItCoverageFileAnalyzer.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewItCoverageFileAnalyzer.java @@ -22,12 +22,12 @@ package org.sonar.plugins.core.timemachine; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.measures.Metric; import org.sonar.batch.components.TimeMachineConfiguration; -import org.sonar.batch.index.ResourceCache; +import org.sonar.batch.index.BatchComponentCache; import org.sonar.batch.report.ReportPublisher; public class NewItCoverageFileAnalyzer extends AbstractNewCoverageFileAnalyzer { - public NewItCoverageFileAnalyzer(TimeMachineConfiguration timeMachineConfiguration, ReportPublisher publishReportJob, ResourceCache resourceCache) { + public NewItCoverageFileAnalyzer(TimeMachineConfiguration timeMachineConfiguration, ReportPublisher publishReportJob, BatchComponentCache resourceCache) { super(timeMachineConfiguration, publishReportJob, resourceCache); } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewOverallCoverageFileAnalyzer.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewOverallCoverageFileAnalyzer.java index fc61e4eafe3..f80da9470bb 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewOverallCoverageFileAnalyzer.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/NewOverallCoverageFileAnalyzer.java @@ -22,12 +22,12 @@ package org.sonar.plugins.core.timemachine; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.measures.Metric; import org.sonar.batch.components.TimeMachineConfiguration; -import org.sonar.batch.index.ResourceCache; +import org.sonar.batch.index.BatchComponentCache; import org.sonar.batch.report.ReportPublisher; public class NewOverallCoverageFileAnalyzer extends AbstractNewCoverageFileAnalyzer { - public NewOverallCoverageFileAnalyzer(TimeMachineConfiguration timeMachineConfiguration, ReportPublisher publishReportJob, ResourceCache resourceCache) { + public NewOverallCoverageFileAnalyzer(TimeMachineConfiguration timeMachineConfiguration, ReportPublisher publishReportJob, BatchComponentCache resourceCache) { super(timeMachineConfiguration, publishReportJob, resourceCache); } diff --git a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/TimeMachineConfigurationPersister.java b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/TimeMachineConfigurationPersister.java index 49473602e35..7427654f1bc 100644 --- a/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/TimeMachineConfigurationPersister.java +++ b/plugins/sonar-core-plugin/src/main/java/org/sonar/plugins/core/timemachine/TimeMachineConfigurationPersister.java @@ -27,7 +27,7 @@ import org.sonar.api.resources.Resource; import org.sonar.api.resources.ResourceUtils; import org.sonar.batch.components.PastSnapshot; import org.sonar.batch.components.TimeMachineConfiguration; -import org.sonar.batch.index.ResourceCache; +import org.sonar.batch.index.BatchComponentCache; import java.util.List; @@ -38,10 +38,10 @@ import static org.sonar.api.utils.DateUtils.dateToLong; public final class TimeMachineConfigurationPersister implements Decorator { private final TimeMachineConfiguration timeMachineConfiguration; - private ResourceCache resourceCache; + private BatchComponentCache resourceCache; private DatabaseSession session; - public TimeMachineConfigurationPersister(TimeMachineConfiguration timeMachineConfiguration, ResourceCache resourceCache, DatabaseSession session) { + public TimeMachineConfigurationPersister(TimeMachineConfiguration timeMachineConfiguration, BatchComponentCache resourceCache, DatabaseSession session) { this.timeMachineConfiguration = timeMachineConfiguration; this.resourceCache = resourceCache; this.session = session; diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/NewCoverageFileAnalyzerTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/NewCoverageFileAnalyzerTest.java index 75297f6578f..adc6f087b44 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/NewCoverageFileAnalyzerTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/NewCoverageFileAnalyzerTest.java @@ -31,7 +31,7 @@ import org.sonar.api.measures.Metric; import org.sonar.api.resources.File; import org.sonar.api.resources.Resource; import org.sonar.api.utils.DateUtils; -import org.sonar.batch.index.ResourceCache; +import org.sonar.batch.index.BatchComponentCache; import org.sonar.batch.protocol.output.BatchReport; import org.sonar.batch.protocol.output.BatchReport.Changesets.Changeset; import org.sonar.batch.protocol.output.BatchReportWriter; @@ -64,7 +64,7 @@ public class NewCoverageFileAnalyzerTest { context = mock(DecoratorContext.class); Resource f = File.create("src/Foo.java").setEffectiveKey("foo:src/Foo.java"); when(context.getResource()).thenReturn(f); - ResourceCache cache = new ResourceCache(); + BatchComponentCache cache = new BatchComponentCache(); cache.add(f, null); List<AbstractNewCoverageFileAnalyzer.PeriodStruct> structs = Arrays.asList( new AbstractNewCoverageFileAnalyzer.PeriodStruct(1, newDate("2009-12-25")), diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/TimeMachineConfigurationPersisterTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/TimeMachineConfigurationPersisterTest.java index ae79e7a47d3..ca8c36a51cd 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/TimeMachineConfigurationPersisterTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/TimeMachineConfigurationPersisterTest.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.sonar.api.database.model.Snapshot; import org.sonar.api.resources.Project; import org.sonar.api.utils.DateUtils; -import org.sonar.batch.index.ResourceCache; +import org.sonar.batch.index.BatchComponentCache; import org.sonar.jpa.test.AbstractDbUnitTestCase; import java.util.Arrays; @@ -48,7 +48,7 @@ public class TimeMachineConfigurationPersisterTest extends AbstractDbUnitTestCas when(timeMachineConfiguration.getProjectPastSnapshots()).thenReturn(Arrays.asList(vs1, vs3)); Snapshot projectSnapshot = getSession().getSingleResult(Snapshot.class, "id", 1000); - ResourceCache resourceCache = new ResourceCache(); + BatchComponentCache resourceCache = new BatchComponentCache(); Project project = new Project("foo"); resourceCache.add(project, null).setSnapshot(projectSnapshot); |