From c5fa663836dce3902fe66cdc650b5260f36131c3 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Mon, 5 Oct 2015 16:51:14 +0200 Subject: [PATCH] Rename ReportAnalysisMetadataHolder to AnalysisMetadataHolderImpl --- ...lder.java => AnalysisMetadataHolderImpl.java} | 2 +- .../ReportComputeEngineContainerPopulator.java | 4 ++-- ....java => AnalysisMetadataHolderImplTest.java} | 16 ++++++++-------- .../MutableAnalysisMetadataHolderRule.java | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) rename server/sonar-server/src/main/java/org/sonar/server/computation/analysis/{ReportAnalysisMetadataHolder.java => AnalysisMetadataHolderImpl.java} (95%) rename server/sonar-server/src/test/java/org/sonar/server/computation/analysis/{ReportAnalysisMetadataHolderTest.java => AnalysisMetadataHolderImplTest.java} (84%) diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/analysis/ReportAnalysisMetadataHolder.java b/server/sonar-server/src/main/java/org/sonar/server/computation/analysis/AnalysisMetadataHolderImpl.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/computation/analysis/ReportAnalysisMetadataHolder.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/analysis/AnalysisMetadataHolderImpl.java index 64e4c923d0a..185732637e2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/analysis/ReportAnalysisMetadataHolder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/analysis/AnalysisMetadataHolderImpl.java @@ -24,7 +24,7 @@ import javax.annotation.CheckForNull; import static com.google.common.base.Preconditions.checkState; -public class ReportAnalysisMetadataHolder implements MutableAnalysisMetadataHolder { +public class AnalysisMetadataHolderImpl implements MutableAnalysisMetadataHolder { @CheckForNull private Long analysisDate; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/container/ReportComputeEngineContainerPopulator.java b/server/sonar-server/src/main/java/org/sonar/server/computation/container/ReportComputeEngineContainerPopulator.java index b48d8113d58..a7f561a5552 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/container/ReportComputeEngineContainerPopulator.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/container/ReportComputeEngineContainerPopulator.java @@ -23,7 +23,7 @@ import java.util.Arrays; import java.util.List; import org.sonar.core.issue.tracking.Tracker; import org.sonar.core.platform.ContainerPopulator; -import org.sonar.server.computation.analysis.ReportAnalysisMetadataHolder; +import org.sonar.server.computation.analysis.AnalysisMetadataHolderImpl; import org.sonar.server.computation.batch.BatchReportDirectoryHolderImpl; import org.sonar.server.computation.batch.BatchReportReaderImpl; import org.sonar.server.computation.component.DbIdsRepositoryImpl; @@ -114,7 +114,7 @@ public final class ReportComputeEngineContainerPopulator implements ContainerPop MetricModule.class, // holders - ReportAnalysisMetadataHolder.class, + AnalysisMetadataHolderImpl.class, BatchReportDirectoryHolderImpl.class, ReportTreeRootHolderImpl.class, PeriodsHolderImpl.class, diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/analysis/ReportAnalysisMetadataHolderTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/analysis/AnalysisMetadataHolderImplTest.java similarity index 84% rename from server/sonar-server/src/test/java/org/sonar/server/computation/analysis/ReportAnalysisMetadataHolderTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/analysis/AnalysisMetadataHolderImplTest.java index c5b362d9eee..4d114f2fb23 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/analysis/ReportAnalysisMetadataHolderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/analysis/AnalysisMetadataHolderImplTest.java @@ -26,7 +26,7 @@ import org.junit.rules.ExpectedException; import static org.assertj.core.api.Assertions.assertThat; -public class ReportAnalysisMetadataHolderTest { +public class AnalysisMetadataHolderImplTest { @Rule public ExpectedException expectedException = ExpectedException.none(); @@ -34,7 +34,7 @@ public class ReportAnalysisMetadataHolderTest { @Test public void getAnalysisDate_returns_date_with_same_time_as_the_one_set_with_setAnalysisDate() throws InterruptedException { - ReportAnalysisMetadataHolder underTest = new ReportAnalysisMetadataHolder(); + AnalysisMetadataHolderImpl underTest = new AnalysisMetadataHolderImpl(); underTest.setAnalysisDate(someDate); @@ -50,7 +50,7 @@ public class ReportAnalysisMetadataHolderTest { expectedException.expect(IllegalStateException.class); expectedException.expectMessage("Analysis date has not been set"); - new ReportAnalysisMetadataHolder().getAnalysisDate(); + new AnalysisMetadataHolderImpl().getAnalysisDate(); } @Test @@ -58,7 +58,7 @@ public class ReportAnalysisMetadataHolderTest { expectedException.expect(IllegalStateException.class); expectedException.expectMessage("Analysis date has already been set"); - ReportAnalysisMetadataHolder underTest = new ReportAnalysisMetadataHolder(); + AnalysisMetadataHolderImpl underTest = new AnalysisMetadataHolderImpl(); underTest.setAnalysisDate(someDate); underTest.setAnalysisDate(someDate); @@ -66,7 +66,7 @@ public class ReportAnalysisMetadataHolderTest { @Test public void isFirstAnalysis_return_true() throws Exception { - ReportAnalysisMetadataHolder underTest = new ReportAnalysisMetadataHolder(); + AnalysisMetadataHolderImpl underTest = new AnalysisMetadataHolderImpl(); underTest.setIsFirstAnalysis(true); assertThat(underTest.isFirstAnalysis()).isTrue(); @@ -74,7 +74,7 @@ public class ReportAnalysisMetadataHolderTest { @Test public void isFirstAnalysis_return_false() throws Exception { - ReportAnalysisMetadataHolder underTest = new ReportAnalysisMetadataHolder(); + AnalysisMetadataHolderImpl underTest = new AnalysisMetadataHolderImpl(); underTest.setIsFirstAnalysis(false); assertThat(underTest.isFirstAnalysis()).isFalse(); @@ -85,7 +85,7 @@ public class ReportAnalysisMetadataHolderTest { expectedException.expect(IllegalStateException.class); expectedException.expectMessage("firstAnalysis flag has not been set"); - new ReportAnalysisMetadataHolder().isFirstAnalysis(); + new AnalysisMetadataHolderImpl().isFirstAnalysis(); } @Test @@ -93,7 +93,7 @@ public class ReportAnalysisMetadataHolderTest { expectedException.expect(IllegalStateException.class); expectedException.expectMessage("firstAnalysis flag has already been set"); - ReportAnalysisMetadataHolder underTest = new ReportAnalysisMetadataHolder(); + AnalysisMetadataHolderImpl underTest = new AnalysisMetadataHolderImpl(); underTest.setIsFirstAnalysis(true); underTest.setIsFirstAnalysis(true); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/analysis/MutableAnalysisMetadataHolderRule.java b/server/sonar-server/src/test/java/org/sonar/server/computation/analysis/MutableAnalysisMetadataHolderRule.java index ba6984f58cc..fac659f2a12 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/analysis/MutableAnalysisMetadataHolderRule.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/analysis/MutableAnalysisMetadataHolderRule.java @@ -23,11 +23,11 @@ import java.util.Date; import org.junit.rules.ExternalResource; public class MutableAnalysisMetadataHolderRule extends ExternalResource implements MutableAnalysisMetadataHolder { - private ReportAnalysisMetadataHolder delegate = new ReportAnalysisMetadataHolder(); + private AnalysisMetadataHolderImpl delegate = new AnalysisMetadataHolderImpl(); @Override protected void before() throws Throwable { - delegate = new ReportAnalysisMetadataHolder(); + delegate = new AnalysisMetadataHolderImpl(); } @Override -- 2.39.5