diff options
Diffstat (limited to 'server')
68 files changed, 258 insertions, 229 deletions
diff --git a/server/sonar-ce-common/build.gradle b/server/sonar-ce-common/build.gradle index b0bef68d6f7..a604fa40b59 100644 --- a/server/sonar-ce-common/build.gradle +++ b/server/sonar-ce-common/build.gradle @@ -38,6 +38,7 @@ dependencies { api project(':server:sonar-ce-task') api project(':server:sonar-server-common') api project(':sonar-core') + api project(':sonar-scanner-protocol') compileOnlyApi 'com.github.spotbugs:spotbugs-annotations' @@ -57,6 +58,9 @@ dependencies { testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' testRuntimeOnly 'org.junit.vintage:junit-vintage-engine' + + testFixturesApi 'junit:junit' + testFixturesApi 'org.junit.jupiter:junit-jupiter-api' } test { diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/batch/BatchReportReader.java b/server/sonar-ce-common/src/main/java/org/sonar/ce/common/scanner/ScannerReportReader.java index 79bbb9c303a..9e6b660b5d0 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/batch/BatchReportReader.java +++ b/server/sonar-ce-common/src/main/java/org/sonar/ce/common/scanner/ScannerReportReader.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.ce.task.projectanalysis.batch; +package org.sonar.ce.common.scanner; import java.io.InputStream; import java.util.Optional; @@ -25,7 +25,7 @@ import javax.annotation.CheckForNull; import org.sonar.core.util.CloseableIterator; import org.sonar.scanner.protocol.output.ScannerReport; -public interface BatchReportReader { +public interface ScannerReportReader { ScannerReport.Metadata readMetadata(); @CheckForNull diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/batch/package-info.java b/server/sonar-ce-common/src/main/java/org/sonar/ce/common/scanner/package-info.java index c12f3ed5aa8..6cf9f5af778 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/batch/package-info.java +++ b/server/sonar-ce-common/src/main/java/org/sonar/ce/common/scanner/package-info.java @@ -18,6 +18,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @ParametersAreNonnullByDefault -package org.sonar.ce.task.projectanalysis.batch; +package org.sonar.ce.common.scanner; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/batch/BatchReportReaderRule.java b/server/sonar-ce-common/src/testFixtures/java/org/sonar/ce/common/scanner/ScannerReportReaderRule.java index 5882d6872df..7eecf3c5803 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/batch/BatchReportReaderRule.java +++ b/server/sonar-ce-common/src/testFixtures/java/org/sonar/ce/common/scanner/ScannerReportReaderRule.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.ce.task.projectanalysis.batch; +package org.sonar.ce.common.scanner; import com.google.common.base.Preconditions; import java.io.ByteArrayInputStream; @@ -41,7 +41,7 @@ import org.sonar.core.util.CloseableIterator; import org.sonar.scanner.protocol.output.ScannerReport; import org.sonar.scanner.protocol.output.ScannerReport.LineSgnificantCode; -public class BatchReportReaderRule implements TestRule, BatchReportReader, AfterEachCallback { +public class ScannerReportReaderRule implements TestRule, ScannerReportReader, AfterEachCallback { private ScannerReport.Metadata metadata; private List<String> scannerLogs; private List<ScannerReport.ActiveRule> activeRules = new ArrayList<>(); @@ -99,7 +99,7 @@ public class BatchReportReaderRule implements TestRule, BatchReportReader, After return CloseableIterator.from(contextProperties.iterator()); } - public BatchReportReaderRule putContextProperties(List<ScannerReport.ContextProperty> contextProperties) { + public ScannerReportReaderRule putContextProperties(List<ScannerReport.ContextProperty> contextProperties) { this.contextProperties = Objects.requireNonNull(contextProperties); return this; } @@ -125,7 +125,7 @@ public class BatchReportReaderRule implements TestRule, BatchReportReader, After this.analysisCache = cache; } - public BatchReportReaderRule setMetadata(ScannerReport.Metadata metadata) { + public ScannerReportReaderRule setMetadata(ScannerReport.Metadata metadata) { this.metadata = metadata; return this; } @@ -138,7 +138,7 @@ public class BatchReportReaderRule implements TestRule, BatchReportReader, After return CloseableIterator.from(scannerLogs.iterator()); } - public BatchReportReaderRule setScannerLogs(@Nullable List<String> logs) { + public ScannerReportReaderRule setScannerLogs(@Nullable List<String> logs) { this.scannerLogs = logs; return this; } @@ -151,7 +151,7 @@ public class BatchReportReaderRule implements TestRule, BatchReportReader, After return CloseableIterator.from(activeRules.iterator()); } - public BatchReportReaderRule putActiveRules(List<ScannerReport.ActiveRule> activeRules) { + public ScannerReportReaderRule putActiveRules(List<ScannerReport.ActiveRule> activeRules) { this.activeRules = activeRules; return this; } @@ -161,7 +161,7 @@ public class BatchReportReaderRule implements TestRule, BatchReportReader, After return closeableIterator(this.measures.get(componentRef)); } - public BatchReportReaderRule putMeasures(int componentRef, List<ScannerReport.Measure> measures) { + public ScannerReportReaderRule putMeasures(int componentRef, List<ScannerReport.Measure> measures) { this.measures.put(componentRef, measures); return this; } @@ -172,7 +172,7 @@ public class BatchReportReaderRule implements TestRule, BatchReportReader, After return changesets.get(componentRef); } - public BatchReportReaderRule putChangesets(ScannerReport.Changesets changesets) { + public ScannerReportReaderRule putChangesets(ScannerReport.Changesets changesets) { this.changesets.put(changesets.getComponentRef(), changesets); return this; } @@ -182,7 +182,7 @@ public class BatchReportReaderRule implements TestRule, BatchReportReader, After return components.get(componentRef); } - public BatchReportReaderRule putComponent(ScannerReport.Component component) { + public ScannerReportReaderRule putComponent(ScannerReport.Component component) { this.components.put(component.getRef(), component); return this; } @@ -202,17 +202,17 @@ public class BatchReportReaderRule implements TestRule, BatchReportReader, After return closeableIterator(adHocRules); } - public BatchReportReaderRule putAdHocRules(List<ScannerReport.AdHocRule> adHocRules) { + public ScannerReportReaderRule putAdHocRules(List<ScannerReport.AdHocRule> adHocRules) { this.adHocRules = adHocRules; return this; } - public BatchReportReaderRule putIssues(int componentRef, List<ScannerReport.Issue> issues) { + public ScannerReportReaderRule putIssues(int componentRef, List<ScannerReport.Issue> issues) { this.issues.put(componentRef, issues); return this; } - public BatchReportReaderRule putExternalIssues(int componentRef, List<ScannerReport.ExternalIssue> externalIssues) { + public ScannerReportReaderRule putExternalIssues(int componentRef, List<ScannerReport.ExternalIssue> externalIssues) { this.externalIssues.put(componentRef, externalIssues); return this; } @@ -222,7 +222,7 @@ public class BatchReportReaderRule implements TestRule, BatchReportReader, After return closeableIterator(this.duplications.get(componentRef)); } - public BatchReportReaderRule putDuplications(int componentRef, ScannerReport.Duplication... duplications) { + public ScannerReportReaderRule putDuplications(int componentRef, ScannerReport.Duplication... duplications) { this.duplications.put(componentRef, Arrays.asList(duplications)); return this; } @@ -232,7 +232,7 @@ public class BatchReportReaderRule implements TestRule, BatchReportReader, After return closeableIterator(this.duplicationBlocks.get(componentRef)); } - public BatchReportReaderRule putDuplicationBlocks(int componentRef, List<ScannerReport.CpdTextBlock> duplicationBlocks) { + public ScannerReportReaderRule putDuplicationBlocks(int componentRef, List<ScannerReport.CpdTextBlock> duplicationBlocks) { this.duplicationBlocks.put(componentRef, duplicationBlocks); return this; } @@ -246,12 +246,12 @@ public class BatchReportReaderRule implements TestRule, BatchReportReader, After return list == null ? CloseableIterator.emptyCloseableIterator() : CloseableIterator.from(list.iterator()); } - public BatchReportReaderRule putSymbols(int componentRef, List<ScannerReport.Symbol> symbols) { + public ScannerReportReaderRule putSymbols(int componentRef, List<ScannerReport.Symbol> symbols) { this.symbols.put(componentRef, symbols); return this; } - public BatchReportReaderRule putSignificantCode(int fileRef, List<ScannerReport.LineSgnificantCode> significantCode) { + public ScannerReportReaderRule putSignificantCode(int fileRef, List<ScannerReport.LineSgnificantCode> significantCode) { this.significantCode.put(fileRef, significantCode); return this; } @@ -262,7 +262,7 @@ public class BatchReportReaderRule implements TestRule, BatchReportReader, After return list == null ? Optional.empty() : Optional.of(CloseableIterator.from(list.iterator())); } - public BatchReportReaderRule putChangedLines(int fileRef, ScannerReport.ChangedLines fileChangedLines) { + public ScannerReportReaderRule putChangedLines(int fileRef, ScannerReport.ChangedLines fileChangedLines) { changedLines.put(fileRef, fileChangedLines); return this; } @@ -277,7 +277,7 @@ public class BatchReportReaderRule implements TestRule, BatchReportReader, After return closeableIterator(analysisWarnings); } - public BatchReportReaderRule setAnalysisWarnings(List<ScannerReport.AnalysisWarning> analysisWarnings) { + public ScannerReportReaderRule setAnalysisWarnings(List<ScannerReport.AnalysisWarning> analysisWarnings) { this.analysisWarnings = new ArrayList<>(analysisWarnings); return this; } @@ -287,7 +287,7 @@ public class BatchReportReaderRule implements TestRule, BatchReportReader, After return closeableIterator(this.syntaxHighlightings.get(fileRef)); } - public BatchReportReaderRule putSyntaxHighlighting(int fileRef, List<ScannerReport.SyntaxHighlightingRule> syntaxHighlightings) { + public ScannerReportReaderRule putSyntaxHighlighting(int fileRef, List<ScannerReport.SyntaxHighlightingRule> syntaxHighlightings) { this.syntaxHighlightings.put(fileRef, syntaxHighlightings); return this; } @@ -297,7 +297,7 @@ public class BatchReportReaderRule implements TestRule, BatchReportReader, After return closeableIterator(this.coverages.get(fileRef)); } - public BatchReportReaderRule putCoverage(int fileRef, List<ScannerReport.LineCoverage> coverages) { + public ScannerReportReaderRule putCoverage(int fileRef, List<ScannerReport.LineCoverage> coverages) { this.coverages.put(fileRef, coverages); return this; } @@ -312,13 +312,13 @@ public class BatchReportReaderRule implements TestRule, BatchReportReader, After return Optional.of(CloseableIterator.from(lines.iterator())); } - public BatchReportReaderRule putFileSourceLines(int fileRef, @Nullable String... lines) { + public ScannerReportReaderRule putFileSourceLines(int fileRef, @Nullable String... lines) { Preconditions.checkNotNull(lines); this.fileSources.put(fileRef, Arrays.asList(lines)); return this; } - public BatchReportReaderRule putFileSourceLines(int fileRef, List<String> lines) { + public ScannerReportReaderRule putFileSourceLines(int fileRef, List<String> lines) { this.fileSources.put(fileRef, lines); return this; } @@ -333,7 +333,7 @@ public class BatchReportReaderRule implements TestRule, BatchReportReader, After return CloseableIterator.from(telemetryEntries.iterator()); } - public BatchReportReaderRule putTelemetry(List<ScannerReport.TelemetryEntry> telemetryEntries) { + public ScannerReportReaderRule putTelemetry(List<ScannerReport.TelemetryEntry> telemetryEntries) { this.telemetryEntries = telemetryEntries; return this; } diff --git a/server/sonar-ce-task-projectanalysis/build.gradle b/server/sonar-ce-task-projectanalysis/build.gradle index f5cd00d6393..0e024680b5c 100644 --- a/server/sonar-ce-task-projectanalysis/build.gradle +++ b/server/sonar-ce-task-projectanalysis/build.gradle @@ -58,6 +58,7 @@ dependencies { testImplementation 'org.sonarsource.api.plugin:sonar-plugin-api-test-fixtures' testImplementation project(':sonar-testing-harness') testImplementation testFixtures(project(':server:sonar-server-common')) + testImplementation testFixtures(project(':server:sonar-ce-common')) testFixturesApi 'junit:junit' testFixturesApi 'org.assertj:assertj-core' diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/IntegrateIssuesVisitorIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/IntegrateIssuesVisitorIT.java index 3ff4c5150f7..8834b5635db 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/IntegrateIssuesVisitorIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/issue/IntegrateIssuesVisitorIT.java @@ -39,7 +39,7 @@ import org.sonar.ce.task.projectanalysis.analysis.Analysis; import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; import org.sonar.ce.task.projectanalysis.analysis.Branch; import org.sonar.ce.task.projectanalysis.analysis.ScannerPlugin; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.common.scanner.ScannerReportReaderRule; import org.sonar.ce.task.projectanalysis.component.BranchComponentUuidsDelegate; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.ce.task.projectanalysis.component.FileStatuses; @@ -114,7 +114,7 @@ class IntegrateIssuesVisitorIT { @RegisterExtension public TreeRootHolderRule treeRootHolder = new TreeRootHolderRule(); @RegisterExtension - public BatchReportReaderRule reportReader = new BatchReportReaderRule(); + public ScannerReportReaderRule reportReader = new ScannerReportReaderRule(); @RegisterExtension public ActiveRulesHolderRule activeRulesHolderRule = new ActiveRulesHolderRule(); @RegisterExtension diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/measure/MeasureRepositoryImplIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/measure/MeasureRepositoryImplIT.java index 3994941f681..034fb6ef3f2 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/measure/MeasureRepositoryImplIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/measure/MeasureRepositoryImplIT.java @@ -33,8 +33,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.sonar.api.utils.System2; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.common.scanner.ScannerReportReader; +import org.sonar.ce.common.scanner.ScannerReportReaderRule; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.ce.task.projectanalysis.component.ReportComponent; import org.sonar.ce.task.projectanalysis.metric.Metric; @@ -69,7 +69,7 @@ public class MeasureRepositoryImplIT { @Rule public DbTester dbTester = DbTester.create(System2.INSTANCE); @Rule - public BatchReportReaderRule reportReader = new BatchReportReaderRule(); + public ScannerReportReaderRule reportReader = new ScannerReportReaderRule(); private static final String FILE_COMPONENT_KEY = "file cpt key"; private static final ReportComponent FILE_COMPONENT = ReportComponent.builder(Component.Type.FILE, 1).setKey(FILE_COMPONENT_KEY).build(); @@ -92,8 +92,8 @@ public class MeasureRepositoryImplIT { private MeasureRepositoryImpl underTest = new MeasureRepositoryImpl(dbClient, reportReader, metricRepository, reportMetricValidator); private DbClient mockedDbClient = mock(DbClient.class); - private BatchReportReader mockBatchReportReader = mock(BatchReportReader.class); - private MeasureRepositoryImpl underTestWithMock = new MeasureRepositoryImpl(mockedDbClient, mockBatchReportReader, metricRepository, reportMetricValidator); + private ScannerReportReader mockScannerReportReader = mock(ScannerReportReader.class); + private MeasureRepositoryImpl underTestWithMock = new MeasureRepositoryImpl(mockedDbClient, mockScannerReportReader, metricRepository, reportMetricValidator); private DbSession dbSession = dbTester.getSession(); @@ -292,7 +292,7 @@ public class MeasureRepositoryImplIT { underTestWithMock.getRawMeasure(null, metric1); fail("an NPE should have been raised"); } catch (NullPointerException e) { - verifyNoMoreInteractions(mockBatchReportReader); + verifyNoMoreInteractions(mockScannerReportReader); } } @@ -302,7 +302,7 @@ public class MeasureRepositoryImplIT { underTestWithMock.getRawMeasure(FILE_COMPONENT, null); fail("an NPE should have been raised"); } catch (NullPointerException e) { - verifyNoMoreInteractions(mockBatchReportReader); + verifyNoMoreInteractions(mockScannerReportReader); } } diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/BuildComponentTreeStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/BuildComponentTreeStepIT.java index 30ef02102bf..c42a01ef66c 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/BuildComponentTreeStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/BuildComponentTreeStepIT.java @@ -32,7 +32,7 @@ import org.junit.runner.RunWith; import org.sonar.api.utils.System2; import org.sonar.ce.task.projectanalysis.analysis.Branch; import org.sonar.ce.task.projectanalysis.analysis.MutableAnalysisMetadataHolderRule; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.common.scanner.ScannerReportReaderRule; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.ce.task.projectanalysis.component.DefaultBranchImpl; import org.sonar.ce.task.projectanalysis.component.MutableTreeRootHolderRule; @@ -87,7 +87,7 @@ public class BuildComponentTreeStepIT { @Rule public DbTester dbTester = DbTester.create(System2.INSTANCE); @Rule - public BatchReportReaderRule reportReader = new BatchReportReaderRule().setMetadata(createReportMetadata(NO_SCANNER_PROJECT_VERSION, NO_SCANNER_BUILD_STRING)); + public ScannerReportReaderRule reportReader = new ScannerReportReaderRule().setMetadata(createReportMetadata(NO_SCANNER_PROJECT_VERSION, NO_SCANNER_BUILD_STRING)); @Rule public MutableTreeRootHolderRule treeRootHolder = new MutableTreeRootHolderRule(); @Rule diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ExtractReportStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ExtractReportStepIT.java index b8e699f64f3..cc3b103663c 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ExtractReportStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/ExtractReportStepIT.java @@ -33,8 +33,8 @@ import org.sonar.api.utils.MessageException; import org.sonar.api.utils.System2; import org.sonar.api.utils.ZipUtils; import org.sonar.ce.task.CeTask; -import org.sonar.ce.task.projectanalysis.batch.BatchReportDirectoryHolderImpl; -import org.sonar.ce.task.projectanalysis.batch.MutableBatchReportDirectoryHolder; +import org.sonar.ce.task.projectanalysis.scanner.ScannerReportDirectoryHolderImpl; +import org.sonar.ce.task.projectanalysis.scanner.MutableScannerReportDirectoryHolder; import org.sonar.ce.task.step.TestComputationStepContext; import org.sonar.db.DbTester; import org.sonar.db.ce.CeTaskTypes; @@ -55,7 +55,7 @@ public class ExtractReportStepIT { @Rule public DbTester dbTester = DbTester.create(System2.INSTANCE); - private MutableBatchReportDirectoryHolder reportDirectoryHolder = new BatchReportDirectoryHolderImpl(); + private MutableScannerReportDirectoryHolder reportDirectoryHolder = new ScannerReportDirectoryHolderImpl(); private CeTask ceTask = new CeTask.Builder() .setType(CeTaskTypes.REPORT) .setUuid(TASK_UUID) diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/IndexAnalysisStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/IndexAnalysisStepIT.java index 5e01190a922..44ad57c1b2d 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/IndexAnalysisStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/IndexAnalysisStepIT.java @@ -24,7 +24,7 @@ import java.util.Set; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.common.scanner.ScannerReportReaderRule; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.ce.task.projectanalysis.component.ReportComponent; import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; @@ -55,7 +55,7 @@ public class IndexAnalysisStepIT extends BaseStepTest { @Rule public TreeRootHolderRule treeRootHolder = new TreeRootHolderRule(); @Rule - public BatchReportReaderRule reportReader = new BatchReportReaderRule(); + public ScannerReportReaderRule reportReader = new ScannerReportReaderRule(); private final DbClient dbClient = mock(DbClient.class); private final IndexDiffResolver indexDiffResolver = mock(IndexDiffResolver.class); diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStepIT.java index 80ba2bac848..02404aebf67 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStepIT.java @@ -30,7 +30,7 @@ import org.mockito.ArgumentCaptor; import org.sonar.api.utils.System2; import org.sonar.ce.task.projectanalysis.analysis.Analysis; import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.common.scanner.ScannerReportReaderRule; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.ce.task.projectanalysis.component.FileAttributes; import org.sonar.ce.task.projectanalysis.component.ReportComponent; @@ -81,7 +81,7 @@ public class LoadCrossProjectDuplicationsRepositoryStepIT { .addChildren(CURRENT_FILE).build()); @Rule - public BatchReportReaderRule batchReportReader = new BatchReportReaderRule(); + public ScannerReportReaderRule batchReportReader = new ScannerReportReaderRule(); @Rule public AnalysisMetadataHolderRule analysisMetadataHolder = new AnalysisMetadataHolderRule(); diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStepIT.java index b78e2919070..aa6b59d7663 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStepIT.java @@ -35,7 +35,7 @@ import org.sonar.api.utils.System2; import org.sonar.ce.task.CeTask; import org.sonar.ce.task.projectanalysis.analysis.MutableAnalysisMetadataHolderRule; import org.sonar.ce.task.projectanalysis.analysis.ScannerPlugin; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.common.scanner.ScannerReportReaderRule; import org.sonar.ce.task.projectanalysis.component.BranchLoader; import org.sonar.ce.task.step.ComputationStep; import org.sonar.ce.task.step.TestComputationStepContext; @@ -65,7 +65,7 @@ public class LoadReportAnalysisMetadataHolderStepIT { @Rule public DbTester db = DbTester.create(System2.INSTANCE); @Rule - public BatchReportReaderRule reportReader = new BatchReportReaderRule(); + public ScannerReportReaderRule reportReader = new ScannerReportReaderRule(); @Rule public MutableAnalysisMetadataHolderRule analysisMetadataHolder = new MutableAnalysisMetadataHolderRule(); diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistAnalysisPropertiesStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistAnalysisPropertiesStepIT.java index 8f55a0b53c0..3503e58a11a 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistAnalysisPropertiesStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistAnalysisPropertiesStepIT.java @@ -27,7 +27,7 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.common.scanner.ScannerReportReader; import org.sonar.ce.task.step.TestComputationStepContext; import org.sonar.core.util.CloseableIterator; import org.sonar.core.util.UuidFactoryFast; @@ -66,14 +66,14 @@ public class PersistAnalysisPropertiesStepIT { @Rule public DbTester dbTester = DbTester.create(System2.INSTANCE); - private BatchReportReader batchReportReader = mock(BatchReportReader.class); + private ScannerReportReader scannerReportReader = mock(ScannerReportReader.class); private AnalysisMetadataHolder analysisMetadataHolder = mock(AnalysisMetadataHolder.class); - private PersistAnalysisPropertiesStep underTest = new PersistAnalysisPropertiesStep(dbTester.getDbClient(), analysisMetadataHolder, batchReportReader, + private PersistAnalysisPropertiesStep underTest = new PersistAnalysisPropertiesStep(dbTester.getDbClient(), analysisMetadataHolder, scannerReportReader, UuidFactoryFast.getInstance()); @Test public void persist_should_stores_sonarDotAnalysisDot_and_sonarDotPullRequestDot_properties() { - when(batchReportReader.readContextProperties()).thenReturn(CloseableIterator.from(PROPERTIES.iterator())); + when(scannerReportReader.readContextProperties()).thenReturn(CloseableIterator.from(PROPERTIES.iterator())); when(analysisMetadataHolder.getUuid()).thenReturn(SNAPSHOT_UUID); when(analysisMetadataHolder.getScmRevision()).thenReturn(Optional.of(SCM_REV_ID)); @@ -99,7 +99,7 @@ public class PersistAnalysisPropertiesStepIT { @Test public void persist_filtering_of_properties_is_case_sensitive() { when(analysisMetadataHolder.getScmRevision()).thenReturn(Optional.of(SCM_REV_ID)); - when(batchReportReader.readContextProperties()).thenReturn(CloseableIterator.from(ImmutableList.of( + when(scannerReportReader.readContextProperties()).thenReturn(CloseableIterator.from(ImmutableList.of( newContextProperty("sonar.ANALYSIS.foo", "foo"), newContextProperty("sonar.anaLysis.bar", "bar"), newContextProperty("sonar.anaLYSIS.doo", "doh"), @@ -116,7 +116,7 @@ public class PersistAnalysisPropertiesStepIT { @Test public void persist_should_store_nothing_if_there_are_no_context_properties() { when(analysisMetadataHolder.getScmRevision()).thenReturn(Optional.of(SCM_REV_ID)); - when(batchReportReader.readContextProperties()).thenReturn(CloseableIterator.emptyCloseableIterator()); + when(scannerReportReader.readContextProperties()).thenReturn(CloseableIterator.emptyCloseableIterator()); when(analysisMetadataHolder.getUuid()).thenReturn(SNAPSHOT_UUID); underTest.execute(new TestComputationStepContext()); diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStepIT.java index 95c995192e3..de28fde90bc 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStepIT.java @@ -29,7 +29,7 @@ import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.ce.task.projectanalysis.analysis.Analysis; import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.common.scanner.ScannerReportReaderRule; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.ce.task.projectanalysis.component.ReportComponent; import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; @@ -71,7 +71,7 @@ public class PersistCrossProjectDuplicationIndexStepIT { @Rule public DbTester dbTester = DbTester.create(System2.INSTANCE); @Rule - public BatchReportReaderRule reportReader = new BatchReportReaderRule(); + public ScannerReportReaderRule reportReader = new ScannerReportReaderRule(); @Rule public TreeRootHolderRule treeRootHolder = new TreeRootHolderRule().setRoot(PROJECT); @Rule diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistIssuesStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistIssuesStepIT.java index 31174d90641..9a30c9b4a14 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistIssuesStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistIssuesStepIT.java @@ -35,7 +35,7 @@ import org.sonar.api.issue.impact.SoftwareQuality; import org.sonar.api.rule.RuleKey; import org.sonar.api.rules.RuleType; import org.sonar.api.utils.System2; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.common.scanner.ScannerReportReaderRule; import org.sonar.ce.task.projectanalysis.issue.AdHocRuleCreator; import org.sonar.ce.task.projectanalysis.issue.ProtoIssueCache; import org.sonar.ce.task.projectanalysis.issue.RuleRepositoryImpl; @@ -88,7 +88,7 @@ public class PersistIssuesStepIT extends BaseStepTest { @Rule public DbTester db = DbTester.create(System2.INSTANCE); @Rule - public BatchReportReaderRule reportReader = new BatchReportReaderRule(); + public ScannerReportReaderRule reportReader = new ScannerReportReaderRule(); @Rule public PeriodHolderRule periodHolder = new PeriodHolderRule(); diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistProjectLinksStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistProjectLinksStepIT.java index 624c62c10dd..9816c82ee3e 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistProjectLinksStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistProjectLinksStepIT.java @@ -26,8 +26,8 @@ import org.mockito.Mockito; import org.sonar.api.utils.System2; import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; import org.sonar.ce.task.projectanalysis.analysis.Branch; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.common.scanner.ScannerReportReader; +import org.sonar.ce.common.scanner.ScannerReportReaderRule; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.ce.task.projectanalysis.component.ReportComponent; import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; @@ -64,7 +64,7 @@ public class PersistProjectLinksStepIT extends BaseStepTest { @Rule public TreeRootHolderRule treeRootHolder = new TreeRootHolderRule(); @Rule - public BatchReportReaderRule reportReader = new BatchReportReaderRule(); + public ScannerReportReaderRule reportReader = new ScannerReportReaderRule(); private ProjectData project; @@ -85,7 +85,7 @@ public class PersistProjectLinksStepIT extends BaseStepTest { public void no_effect_if_branch_is_not_main() { DbClient dbClient = mock(DbClient.class); TreeRootHolder treeRootHolder = mock(TreeRootHolder.class); - BatchReportReader reportReader = mock(BatchReportReader.class); + ScannerReportReader reportReader = mock(ScannerReportReader.class); UuidFactory uuidFactory = mock(UuidFactory.class); mockBranch(false); PersistProjectLinksStep underTest = new PersistProjectLinksStep(analysisMetadataHolder, dbClient, treeRootHolder, reportReader, uuidFactory); diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistScannerAnalysisCacheStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistScannerAnalysisCacheStepIT.java index 9ab77887e82..c95337c98f8 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistScannerAnalysisCacheStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistScannerAnalysisCacheStepIT.java @@ -24,7 +24,7 @@ import java.io.IOException; import org.apache.commons.io.IOUtils; import org.junit.Rule; import org.junit.Test; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.common.scanner.ScannerReportReaderRule; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; import org.sonar.ce.task.step.ComputationStep; @@ -39,7 +39,7 @@ import static org.mockito.Mockito.when; public class PersistScannerAnalysisCacheStepIT { @Rule - public BatchReportReaderRule reader = new BatchReportReaderRule(); + public ScannerReportReaderRule reader = new ScannerReportReaderRule(); @Rule public DbTester dbTester = DbTester.create(); private final DbClient client = dbTester.getDbClient(); diff --git a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistScannerContextStepIT.java b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistScannerContextStepIT.java index 33f251672af..5a1d17e4730 100644 --- a/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistScannerContextStepIT.java +++ b/server/sonar-ce-task-projectanalysis/src/it/java/org/sonar/ce/task/projectanalysis/step/PersistScannerContextStepIT.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.sonar.api.utils.System2; import org.sonar.ce.task.CeTask; import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.common.scanner.ScannerReportReaderRule; import org.sonar.ce.task.step.TestComputationStepContext; import org.sonar.core.util.CloseableIterator; import org.sonar.db.DbClient; @@ -45,7 +45,7 @@ public class PersistScannerContextStepIT { public static final DbTester dbTester = DbTester.create(System2.INSTANCE); @Rule - public BatchReportReaderRule reportReader = new BatchReportReaderRule(); + public ScannerReportReaderRule reportReader = new ScannerReportReaderRule(); @Rule public AnalysisMetadataHolderRule analysisMetadataHolder = new AnalysisMetadataHolderRule() .setUuid(ANALYSIS_UUID); diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutor.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutor.java index fadb444e926..69d7683e971 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutor.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutor.java @@ -37,7 +37,7 @@ import org.sonar.api.ce.posttask.Project; import org.sonar.api.ce.posttask.QualityGate; import org.sonar.api.ce.posttask.ScannerContext; import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.common.scanner.ScannerReportReader; import org.sonar.ce.task.projectanalysis.qualitygate.Condition; import org.sonar.ce.task.projectanalysis.qualitygate.ConditionStatus; import org.sonar.ce.task.projectanalysis.qualitygate.QualityGateHolder; @@ -69,10 +69,10 @@ public class PostProjectAnalysisTasksExecutor implements ComputationStepExecutor private final QualityGateHolder qualityGateHolder; private final QualityGateStatusHolder qualityGateStatusHolder; private final PostProjectAnalysisTask[] postProjectAnalysisTasks; - private final BatchReportReader reportReader; + private final ScannerReportReader reportReader; public PostProjectAnalysisTasksExecutor(org.sonar.ce.task.CeTask ceTask, AnalysisMetadataHolder analysisMetadataHolder, QualityGateHolder qualityGateHolder, - QualityGateStatusHolder qualityGateStatusHolder, BatchReportReader reportReader, @Nullable PostProjectAnalysisTask[] postProjectAnalysisTasks) { + QualityGateStatusHolder qualityGateStatusHolder, ScannerReportReader reportReader, @Nullable PostProjectAnalysisTask[] postProjectAnalysisTasks) { this.analysisMetadataHolder = analysisMetadataHolder; this.qualityGateHolder = qualityGateHolder; this.qualityGateStatusHolder = qualityGateStatusHolder; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulator.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulator.java index f5c8eb844ef..2bc4f4f81bd 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulator.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/container/ProjectAnalysisTaskContainerPopulator.java @@ -28,8 +28,8 @@ import org.sonar.ce.task.log.CeTaskMessagesImpl; import org.sonar.ce.task.projectanalysis.analysis.AnalysisFromSonarQube94Visitor; import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderImpl; import org.sonar.ce.task.projectanalysis.api.posttask.PostProjectAnalysisTasksExecutor; -import org.sonar.ce.task.projectanalysis.batch.BatchReportDirectoryHolderImpl; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderImpl; +import org.sonar.ce.task.projectanalysis.scanner.ScannerReportDirectoryHolderImpl; +import org.sonar.ce.task.projectanalysis.scanner.ScannerReportReaderImpl; import org.sonar.ce.task.projectanalysis.component.BranchComponentUuidsDelegate; import org.sonar.ce.task.projectanalysis.component.BranchLoader; import org.sonar.ce.task.projectanalysis.component.BranchPersisterImpl; @@ -208,7 +208,7 @@ public final class ProjectAnalysisTaskContainerPopulator implements ContainerPop // holders AnalysisMetadataHolderImpl.class, CrossProjectDuplicationStatusHolderImpl.class, - BatchReportDirectoryHolderImpl.class, + ScannerReportDirectoryHolderImpl.class, TreeRootHolderImpl.class, PeriodHolderImpl.class, PrioritizedRulesHolderImpl.class, @@ -218,7 +218,7 @@ public final class ProjectAnalysisTaskContainerPopulator implements ContainerPop ActiveRulesHolderImpl.class, MeasureComputersHolderImpl.class, MutableTaskResultHolderImpl.class, - BatchReportReaderImpl.class, + ScannerReportReaderImpl.class, ReferenceBranchComponentUuids.class, NewCodeReferenceBranchComponentUuids.class, BranchComponentUuidsDelegate.class, diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/TrackerRawInputFactory.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/TrackerRawInputFactory.java index 50ab2a7d9f6..a3f10efba3f 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/TrackerRawInputFactory.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/issue/TrackerRawInputFactory.java @@ -36,7 +36,7 @@ import org.sonar.api.rule.RuleKey; import org.sonar.api.rules.RuleType; import org.sonar.api.server.rule.internal.ImpactMapper; import org.sonar.api.utils.Duration; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.common.scanner.ScannerReportReader; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; import org.sonar.ce.task.projectanalysis.issue.filter.IssueFilter; @@ -63,13 +63,13 @@ import static org.sonar.api.issue.Issue.STATUS_TO_REVIEW; public class TrackerRawInputFactory { private static final long DEFAULT_EXTERNAL_ISSUE_EFFORT = 0L; private final TreeRootHolder treeRootHolder; - private final BatchReportReader reportReader; + private final ScannerReportReader reportReader; private final IssueFilter issueFilter; private final SourceLinesHashRepository sourceLinesHash; private final RuleRepository ruleRepository; private final ActiveRulesHolder activeRulesHolder; - public TrackerRawInputFactory(TreeRootHolder treeRootHolder, BatchReportReader reportReader, SourceLinesHashRepository sourceLinesHash, + public TrackerRawInputFactory(TreeRootHolder treeRootHolder, ScannerReportReader reportReader, SourceLinesHashRepository sourceLinesHash, IssueFilter issueFilter, RuleRepository ruleRepository, ActiveRulesHolder activeRulesHolder) { this.treeRootHolder = treeRootHolder; this.reportReader = reportReader; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/language/HandleUnanalyzedLanguagesStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/language/HandleUnanalyzedLanguagesStep.java index c9a3ca56365..a5498722c55 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/language/HandleUnanalyzedLanguagesStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/language/HandleUnanalyzedLanguagesStep.java @@ -26,7 +26,7 @@ import java.util.TreeMap; import java.util.stream.Collectors; import org.sonar.api.utils.System2; import org.sonar.ce.task.log.CeTaskMessages; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.common.scanner.ScannerReportReader; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; import org.sonar.ce.task.projectanalysis.measure.Measure; @@ -55,7 +55,7 @@ public class HandleUnanalyzedLanguagesStep implements ComputationStep { " current SonarQube edition. Please consider <a target=\"_blank\" href=\"https://www.sonarsource.com/plans-and-pricing/developer/?referrer=sonarqube-cpp\">upgrading to" + " Developer Edition</a> to find Bugs, Code Smells, Vulnerabilities and Security Hotspots in %s."; - private final BatchReportReader reportReader; + private final ScannerReportReader reportReader; private final CeTaskMessages ceTaskMessages; private final PlatformEditionProvider editionProvider; private final System2 system; @@ -64,7 +64,7 @@ public class HandleUnanalyzedLanguagesStep implements ComputationStep { private final Metric unanalyzedCMetric; private final Metric unanalyzedCppMetric; - public HandleUnanalyzedLanguagesStep(BatchReportReader reportReader, CeTaskMessages ceTaskMessages, PlatformEditionProvider editionProvider, + public HandleUnanalyzedLanguagesStep(ScannerReportReader reportReader, CeTaskMessages ceTaskMessages, PlatformEditionProvider editionProvider, System2 system, TreeRootHolder treeRootHolder, MetricRepository metricRepository, MeasureRepository measureRepository) { this.reportReader = reportReader; this.ceTaskMessages = ceTaskMessages; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/MeasureRepositoryImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/MeasureRepositoryImpl.java index e3e2a0ad382..19d5f38da76 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/MeasureRepositoryImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/measure/MeasureRepositoryImpl.java @@ -23,7 +23,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Optional; import java.util.Set; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.common.scanner.ScannerReportReader; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.ce.task.projectanalysis.measure.MapBasedRawMeasureRepository.OverridePolicy; import org.sonar.ce.task.projectanalysis.metric.Metric; @@ -41,13 +41,13 @@ import static org.sonar.ce.task.projectanalysis.component.ComponentFunctions.toC public class MeasureRepositoryImpl implements MeasureRepository { private final MapBasedRawMeasureRepository<String> delegate = new MapBasedRawMeasureRepository<>(toComponentUuid()); private final DbClient dbClient; - private final BatchReportReader reportReader; + private final ScannerReportReader reportReader; private final MetricRepository metricRepository; private final ReportMetricValidator reportMetricValidator; private final Set<Integer> loadedComponents = new HashSet<>(); - public MeasureRepositoryImpl(DbClient dbClient, BatchReportReader reportReader, MetricRepository metricRepository, + public MeasureRepositoryImpl(DbClient dbClient, ScannerReportReader reportReader, MetricRepository metricRepository, ReportMetricValidator reportMetricValidator) { this.dbClient = dbClient; this.reportReader = reportReader; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/batch/MutableBatchReportDirectoryHolder.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scanner/MutableScannerReportDirectoryHolder.java index 9ad2229afc1..241048f66f5 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/batch/MutableBatchReportDirectoryHolder.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scanner/MutableScannerReportDirectoryHolder.java @@ -17,13 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.ce.task.projectanalysis.batch; +package org.sonar.ce.task.projectanalysis.scanner; import java.io.File; -public interface MutableBatchReportDirectoryHolder extends BatchReportDirectoryHolder { +public interface MutableScannerReportDirectoryHolder extends ScannerReportDirectoryHolder { /** - * Sets the File of the directory in the BatchReportDirectoryHolder. Settings a File more than once is allowed but it + * Sets the File of the directory in the {@link ScannerReportDirectoryHolder}. Settings a File more than once is allowed but it * can never be set to {@code null}. * * @param newDirectory a {@link File}, can not be {@code null} diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/batch/BatchReportDirectoryHolder.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scanner/ScannerReportDirectoryHolder.java index 123645a03b5..036695bb4ed 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/batch/BatchReportDirectoryHolder.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scanner/ScannerReportDirectoryHolder.java @@ -17,12 +17,12 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.ce.task.projectanalysis.batch; +package org.sonar.ce.task.projectanalysis.scanner; import java.io.File; import org.sonar.ce.task.CeTask; -public interface BatchReportDirectoryHolder { +public interface ScannerReportDirectoryHolder { /** * The File of the directory where the Batch report files for the current {@link CeTask} are stored. * diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/batch/BatchReportDirectoryHolderImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scanner/ScannerReportDirectoryHolderImpl.java index 7742c6fa974..92cc2c0d6d0 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/batch/BatchReportDirectoryHolderImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scanner/ScannerReportDirectoryHolderImpl.java @@ -17,12 +17,12 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.ce.task.projectanalysis.batch; +package org.sonar.ce.task.projectanalysis.scanner; import java.io.File; import java.util.Objects; -public class BatchReportDirectoryHolderImpl implements MutableBatchReportDirectoryHolder { +public class ScannerReportDirectoryHolderImpl implements MutableScannerReportDirectoryHolder { private File directory = null; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/batch/BatchReportReaderImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scanner/ScannerReportReaderImpl.java index d666e34d44a..69861be786e 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/batch/BatchReportReaderImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scanner/ScannerReportReaderImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.ce.task.projectanalysis.batch; +package org.sonar.ce.task.projectanalysis.scanner; import java.io.File; import java.io.IOException; @@ -29,30 +29,30 @@ import javax.annotation.CheckForNull; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.io.LineIterator; +import org.sonar.ce.common.scanner.ScannerReportReader; import org.sonar.core.util.CloseableIterator; import org.sonar.core.util.LineReaderIterator; import org.sonar.scanner.protocol.output.FileStructure; import org.sonar.scanner.protocol.output.ScannerReport; import org.sonar.scanner.protocol.output.ScannerReport.LineSgnificantCode; -import org.sonar.scanner.protocol.output.ScannerReportReader; import static java.nio.charset.StandardCharsets.UTF_8; -public class BatchReportReaderImpl implements BatchReportReader { +public class ScannerReportReaderImpl implements ScannerReportReader { - private final BatchReportDirectoryHolder batchReportDirectoryHolder; - private ScannerReportReader delegate; + private final ScannerReportDirectoryHolder scannerReportDirectoryHolder; + private org.sonar.scanner.protocol.output.ScannerReportReader delegate; // caching of metadata which are read often private ScannerReport.Metadata metadata; - public BatchReportReaderImpl(BatchReportDirectoryHolder batchReportDirectoryHolder) { - this.batchReportDirectoryHolder = batchReportDirectoryHolder; + public ScannerReportReaderImpl(ScannerReportDirectoryHolder scannerReportDirectoryHolder) { + this.scannerReportDirectoryHolder = scannerReportDirectoryHolder; } private void ensureInitialized() { if (this.delegate == null) { - FileStructure fileStructure = new FileStructure(batchReportDirectoryHolder.getDirectory()); - this.delegate = new ScannerReportReader(fileStructure); + FileStructure fileStructure = new FileStructure(scannerReportDirectoryHolder.getDirectory()); + this.delegate = new org.sonar.scanner.protocol.output.ScannerReportReader(fileStructure); } } diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scanner/package-info.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scanner/package-info.java new file mode 100644 index 00000000000..106f8f5d1cc --- /dev/null +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scanner/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2025 SonarSource SA + * mailto:info AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.ce.task.projectanalysis.scanner; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scm/ScmInfoRepositoryImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scm/ScmInfoRepositoryImpl.java index c72cfbb4c10..b5b2a820996 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scm/ScmInfoRepositoryImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/scm/ScmInfoRepositoryImpl.java @@ -28,7 +28,7 @@ import javax.annotation.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.common.scanner.ScannerReportReader; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.ce.task.projectanalysis.component.FileStatuses; import org.sonar.ce.task.projectanalysis.source.SourceLinesDiff; @@ -40,14 +40,14 @@ public class ScmInfoRepositoryImpl implements ScmInfoRepository { private static final Logger LOGGER = LoggerFactory.getLogger(ScmInfoRepositoryImpl.class); - private final BatchReportReader scannerReportReader; + private final ScannerReportReader scannerReportReader; private final Map<Component, Optional<ScmInfo>> scmInfoCache = new HashMap<>(); private final ScmInfoDbLoader scmInfoDbLoader; private final AnalysisMetadataHolder analysisMetadata; private final SourceLinesDiff sourceLinesDiff; private final FileStatuses fileStatuses; - public ScmInfoRepositoryImpl(BatchReportReader scannerReportReader, AnalysisMetadataHolder analysisMetadata, ScmInfoDbLoader scmInfoDbLoader, + public ScmInfoRepositoryImpl(ScannerReportReader scannerReportReader, AnalysisMetadataHolder analysisMetadata, ScmInfoDbLoader scmInfoDbLoader, SourceLinesDiff sourceLinesDiff, FileStatuses fileStatuses) { this.scannerReportReader = scannerReportReader; this.analysisMetadata = analysisMetadata; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/NewLinesRepository.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/NewLinesRepository.java index f297021d157..70b985b3aba 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/NewLinesRepository.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/NewLinesRepository.java @@ -26,7 +26,7 @@ import java.util.Map; import java.util.Optional; import java.util.Set; import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.common.scanner.ScannerReportReader; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.ce.task.projectanalysis.period.PeriodHolder; import org.sonar.ce.task.projectanalysis.scm.Changeset; @@ -35,13 +35,13 @@ import org.sonar.ce.task.projectanalysis.scm.ScmInfoRepository; import org.sonar.db.newcodeperiod.NewCodePeriodType; public class NewLinesRepository { - private final BatchReportReader reportReader; + private final ScannerReportReader reportReader; private final AnalysisMetadataHolder analysisMetadataHolder; private final ScmInfoRepository scmInfoRepository; private final PeriodHolder periodHolder; private final Map<Component, Optional<Set<Integer>>> reportChangedLinesCache = new HashMap<>(); - public NewLinesRepository(BatchReportReader reportReader, AnalysisMetadataHolder analysisMetadataHolder, PeriodHolder periodHolder, ScmInfoRepository scmInfoRepository) { + public NewLinesRepository(ScannerReportReader reportReader, AnalysisMetadataHolder analysisMetadataHolder, PeriodHolder periodHolder, ScmInfoRepository scmInfoRepository) { this.reportReader = reportReader; this.analysisMetadataHolder = analysisMetadataHolder; this.scmInfoRepository = scmInfoRepository; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SignificantCodeRepository.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SignificantCodeRepository.java index 9f26d17bdda..b161a366efc 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SignificantCodeRepository.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SignificantCodeRepository.java @@ -24,12 +24,12 @@ import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.hash.LineRange; import org.sonar.core.util.CloseableIterator; import org.sonar.scanner.protocol.output.ScannerReport.LineSgnificantCode; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.common.scanner.ScannerReportReader; public class SignificantCodeRepository { - private final BatchReportReader reportReader; + private final ScannerReportReader reportReader; - public SignificantCodeRepository(BatchReportReader reportReader) { + public SignificantCodeRepository(ScannerReportReader reportReader) { this.reportReader = reportReader; } diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLineReadersFactory.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLineReadersFactory.java index 3848e705736..c7b52e2511e 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLineReadersFactory.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLineReadersFactory.java @@ -26,7 +26,7 @@ import java.util.Optional; import java.util.function.Consumer; import javax.annotation.CheckForNull; import javax.annotation.Nullable; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.common.scanner.ScannerReportReader; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.ce.task.projectanalysis.duplication.DuplicationRepository; import org.sonar.ce.task.projectanalysis.scm.Changeset; @@ -45,12 +45,12 @@ import org.sonar.db.protobuf.DbFileSources; import org.sonar.scanner.protocol.output.ScannerReport; public class SourceLineReadersFactory { - private final BatchReportReader reportReader; + private final ScannerReportReader reportReader; private final ScmInfoRepository scmInfoRepository; private final DuplicationRepository duplicationRepository; private final NewLinesRepository newLinesRepository; - public SourceLineReadersFactory(BatchReportReader reportReader, ScmInfoRepository scmInfoRepository, DuplicationRepository duplicationRepository, + public SourceLineReadersFactory(ScannerReportReader reportReader, ScmInfoRepository scmInfoRepository, DuplicationRepository duplicationRepository, NewLinesRepository newLinesRepository) { this.reportReader = reportReader; this.scmInfoRepository = scmInfoRepository; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLinesRepository.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLinesRepository.java index 3eb32fbc2ce..d5af812dc65 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLinesRepository.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLinesRepository.java @@ -19,6 +19,7 @@ */ package org.sonar.ce.task.projectanalysis.source; +import org.sonar.ce.common.scanner.ScannerReportReader; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.util.CloseableIterator; @@ -28,7 +29,7 @@ public interface SourceLinesRepository { * Creates a iterator over the source lines of a given component from the report. * <p> * The returned {@link CloseableIterator} will wrap the {@link CloseableIterator} returned by - * {@link org.sonar.ce.task.projectanalysis.batch.BatchReportReader#readFileSource(int)} but enforces that the number + * {@link ScannerReportReader#readFileSource(int)} but enforces that the number * of lines specified by {@link org.sonar.scanner.protocol.output.ScannerReport.Component#getLines()} is respected, adding * an extra empty last line if required. * </p> diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLinesRepositoryImpl.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLinesRepositoryImpl.java index e3332af8956..dd274d0c70c 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLinesRepositoryImpl.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/source/SourceLinesRepositoryImpl.java @@ -20,7 +20,7 @@ package org.sonar.ce.task.projectanalysis.source; import java.util.Optional; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.common.scanner.ScannerReportReader; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.core.util.CloseableIterator; @@ -31,9 +31,9 @@ import static org.sonar.ce.task.projectanalysis.component.Component.Type.FILE; public class SourceLinesRepositoryImpl implements SourceLinesRepository { - private final BatchReportReader reportReader; + private final ScannerReportReader reportReader; - public SourceLinesRepositoryImpl(BatchReportReader reportReader) { + public SourceLinesRepositoryImpl(ScannerReportReader reportReader) { this.reportReader = reportReader; } diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/BuildComponentTreeStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/BuildComponentTreeStep.java index 29935f00f53..600e0b20751 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/BuildComponentTreeStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/BuildComponentTreeStep.java @@ -23,7 +23,7 @@ import java.util.Optional; import javax.annotation.Nullable; import org.sonar.ce.task.projectanalysis.analysis.Analysis; import org.sonar.ce.task.projectanalysis.analysis.MutableAnalysisMetadataHolder; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.common.scanner.ScannerReportReader; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.ce.task.projectanalysis.component.ComponentKeyGenerator; import org.sonar.ce.task.projectanalysis.component.ComponentTreeBuilder; @@ -41,18 +41,18 @@ import static com.google.common.base.MoreObjects.firstNonNull; import static org.apache.commons.lang3.StringUtils.trimToNull; /** - * Populates the {@link MutableTreeRootHolder} and {@link MutableAnalysisMetadataHolder} from the {@link BatchReportReader} + * Populates the {@link MutableTreeRootHolder} and {@link MutableAnalysisMetadataHolder} from the {@link ScannerReportReader} */ public class BuildComponentTreeStep implements ComputationStep { private static final String DEFAULT_PROJECT_VERSION = "not provided"; private final DbClient dbClient; - private final BatchReportReader reportReader; + private final ScannerReportReader reportReader; private final MutableTreeRootHolder treeRootHolder; private final MutableAnalysisMetadataHolder analysisMetadataHolder; - public BuildComponentTreeStep(DbClient dbClient, BatchReportReader reportReader, MutableTreeRootHolder treeRootHolder, + public BuildComponentTreeStep(DbClient dbClient, ScannerReportReader reportReader, MutableTreeRootHolder treeRootHolder, MutableAnalysisMetadataHolder analysisMetadataHolder) { this.dbClient = dbClient; this.reportReader = reportReader; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/CoverageMeasuresStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/CoverageMeasuresStep.java index da6b621e669..8264a2b7166 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/CoverageMeasuresStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/CoverageMeasuresStep.java @@ -22,7 +22,7 @@ package org.sonar.ce.task.projectanalysis.step; import java.util.List; import javax.annotation.Nullable; import jakarta.inject.Inject; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.common.scanner.ScannerReportReader; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; import org.sonar.ce.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; @@ -70,17 +70,17 @@ public class CoverageMeasuresStep implements ComputationStep { private final TreeRootHolder treeRootHolder; private final MetricRepository metricRepository; private final MeasureRepository measureRepository; - private final BatchReportReader reportReader; + private final ScannerReportReader reportReader; private final Metric linesToCoverMetric; private final Metric uncoveredLinesMetric; private final Metric conditionsToCoverMetric; private final Metric uncoveredConditionsMetric; /** - * Constructor used when processing a Report (ie. a {@link BatchReportReader} instance is available in the container) + * Constructor used when processing a Report (ie. a {@link ScannerReportReader} instance is available in the container) */ @Inject - public CoverageMeasuresStep(TreeRootHolder treeRootHolder, MetricRepository metricRepository, MeasureRepository measureRepository, @Nullable BatchReportReader reportReader) { + public CoverageMeasuresStep(TreeRootHolder treeRootHolder, MetricRepository metricRepository, MeasureRepository measureRepository, @Nullable ScannerReportReader reportReader) { this.treeRootHolder = treeRootHolder; this.metricRepository = metricRepository; this.measureRepository = measureRepository; @@ -103,9 +103,9 @@ public class CoverageMeasuresStep implements ComputationStep { private class FileCoverageVisitor extends TypeAwareVisitorAdapter { - private final BatchReportReader reportReader; + private final ScannerReportReader reportReader; - private FileCoverageVisitor(BatchReportReader reportReader) { + private FileCoverageVisitor(ScannerReportReader reportReader) { super(CrawlerDepthLimit.FILE, Order.POST_ORDER); this.reportReader = reportReader; } diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ExtractReportStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ExtractReportStep.java index 8e215632105..abd7c01dbf1 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ExtractReportStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/ExtractReportStep.java @@ -30,7 +30,7 @@ import org.sonar.api.utils.ZipUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.sonar.ce.task.CeTask; -import org.sonar.ce.task.projectanalysis.batch.MutableBatchReportDirectoryHolder; +import org.sonar.ce.task.projectanalysis.scanner.MutableScannerReportDirectoryHolder; import org.sonar.ce.task.step.ComputationStep; import org.sonar.db.DbInputStream; import org.sonar.db.DbClient; @@ -41,7 +41,7 @@ import static org.sonar.core.util.FileUtils.humanReadableByteCountSI; /** * Extracts the content zip file of the {@link CeTask} to a temp directory and adds a {@link File} - * representing that temp directory to the {@link MutableBatchReportDirectoryHolder}. + * representing that temp directory to the {@link MutableScannerReportDirectoryHolder}. */ public class ExtractReportStep implements ComputationStep { @@ -51,10 +51,10 @@ public class ExtractReportStep implements ComputationStep { private final DbClient dbClient; private final CeTask task; private final TempFolder tempFolder; - private final MutableBatchReportDirectoryHolder reportDirectoryHolder; + private final MutableScannerReportDirectoryHolder reportDirectoryHolder; public ExtractReportStep(DbClient dbClient, CeTask task, TempFolder tempFolder, - MutableBatchReportDirectoryHolder reportDirectoryHolder) { + MutableScannerReportDirectoryHolder reportDirectoryHolder) { this.dbClient = dbClient; this.task = task; this.tempFolder = tempFolder; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStep.java index 78bbb1e7319..cf6d1c92fb6 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStep.java @@ -28,7 +28,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.sonar.ce.task.projectanalysis.analysis.Analysis; import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.common.scanner.ScannerReportReader; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; import org.sonar.ce.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; @@ -56,13 +56,13 @@ public class LoadCrossProjectDuplicationsRepositoryStep implements ComputationSt private static final Logger LOGGER = LoggerFactory.getLogger(LoadCrossProjectDuplicationsRepositoryStep.class); private final TreeRootHolder treeRootHolder; - private final BatchReportReader reportReader; + private final ScannerReportReader reportReader; private final AnalysisMetadataHolder analysisMetadataHolder; private final IntegrateCrossProjectDuplications integrateCrossProjectDuplications; private final CrossProjectDuplicationStatusHolder crossProjectDuplicationStatusHolder; private final DbClient dbClient; - public LoadCrossProjectDuplicationsRepositoryStep(TreeRootHolder treeRootHolder, BatchReportReader reportReader, + public LoadCrossProjectDuplicationsRepositoryStep(TreeRootHolder treeRootHolder, ScannerReportReader reportReader, AnalysisMetadataHolder analysisMetadataHolder, CrossProjectDuplicationStatusHolder crossProjectDuplicationStatusHolder, IntegrateCrossProjectDuplications integrateCrossProjectDuplications, DbClient dbClient) { this.treeRootHolder = treeRootHolder; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadDuplicationsFromReportStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadDuplicationsFromReportStep.java index 9073b95953d..82a4879481b 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadDuplicationsFromReportStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadDuplicationsFromReportStep.java @@ -22,7 +22,7 @@ package org.sonar.ce.task.projectanalysis.step; import java.util.function.Function; import javax.annotation.Nonnull; import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.common.scanner.ScannerReportReader; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; import org.sonar.ce.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; @@ -48,14 +48,14 @@ import static com.google.common.base.Preconditions.checkArgument; public class LoadDuplicationsFromReportStep implements ComputationStep { private final TreeRootHolder treeRootHolder; private final AnalysisMetadataHolder analysisMetadataHolder; - private final BatchReportReader batchReportReader; + private final ScannerReportReader scannerReportReader; private final DuplicationRepository duplicationRepository; - public LoadDuplicationsFromReportStep(TreeRootHolder treeRootHolder, AnalysisMetadataHolder analysisMetadataHolder, BatchReportReader batchReportReader, + public LoadDuplicationsFromReportStep(TreeRootHolder treeRootHolder, AnalysisMetadataHolder analysisMetadataHolder, ScannerReportReader scannerReportReader, DuplicationRepository duplicationRepository) { this.treeRootHolder = treeRootHolder; this.analysisMetadataHolder = analysisMetadataHolder; - this.batchReportReader = batchReportReader; + this.scannerReportReader = scannerReportReader; this.duplicationRepository = duplicationRepository; } @@ -107,7 +107,7 @@ public class LoadDuplicationsFromReportStep implements ComputationStep { @Override public void visitFile(Component file) { - try (CloseableIterator<ScannerReport.Duplication> duplications = batchReportReader.readComponentDuplications(file.getReportAttributes().getRef())) { + try (CloseableIterator<ScannerReport.Duplication> duplications = scannerReportReader.readComponentDuplications(file.getReportAttributes().getRef())) { int idGenerator = 1; while (duplications.hasNext()) { loadDuplications(file, duplications.next(), idGenerator); diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadQualityProfilesStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadQualityProfilesStep.java index 2eee71f81aa..552a4679954 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadQualityProfilesStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadQualityProfilesStep.java @@ -29,7 +29,7 @@ import org.sonar.api.issue.impact.Severity; import org.sonar.api.issue.impact.SoftwareQuality; import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.RuleStatus; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.common.scanner.ScannerReportReader; import org.sonar.ce.task.projectanalysis.issue.ImpactMapper; import org.sonar.ce.task.projectanalysis.issue.Rule; import org.sonar.ce.task.projectanalysis.issue.RuleRepository; @@ -41,12 +41,12 @@ import org.sonar.scanner.protocol.output.ScannerReport; public class LoadQualityProfilesStep implements ComputationStep { - private final BatchReportReader batchReportReader; + private final ScannerReportReader scannerReportReader; private final ActiveRulesHolderImpl activeRulesHolder; private final RuleRepository ruleRepository; - public LoadQualityProfilesStep(BatchReportReader batchReportReader, ActiveRulesHolderImpl activeRulesHolder, RuleRepository ruleRepository) { - this.batchReportReader = batchReportReader; + public LoadQualityProfilesStep(ScannerReportReader scannerReportReader, ActiveRulesHolderImpl activeRulesHolder, RuleRepository ruleRepository) { + this.scannerReportReader = scannerReportReader; this.activeRulesHolder = activeRulesHolder; this.ruleRepository = ruleRepository; } @@ -54,7 +54,7 @@ public class LoadQualityProfilesStep implements ComputationStep { @Override public void execute(ComputationStep.Context context) { List<ActiveRule> activeRules = new ArrayList<>(); - try (CloseableIterator<ScannerReport.ActiveRule> batchActiveRules = batchReportReader.readActiveRules()) { + try (CloseableIterator<ScannerReport.ActiveRule> batchActiveRules = scannerReportReader.readActiveRules()) { while (batchActiveRules.hasNext()) { ScannerReport.ActiveRule scannerReportActiveRule = batchActiveRules.next(); Optional<Rule> rule = ruleRepository.findByKey(RuleKey.of(scannerReportActiveRule.getRuleRepository(), scannerReportActiveRule.getRuleKey())); diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStep.java index 2fefb7a22e1..e4685290003 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/LoadReportAnalysisMetadataHolderStep.java @@ -26,7 +26,7 @@ import org.sonar.api.utils.MessageException; import org.sonar.ce.task.CeTask; import org.sonar.ce.task.projectanalysis.analysis.MutableAnalysisMetadataHolder; import org.sonar.ce.task.projectanalysis.analysis.ScannerPlugin; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.common.scanner.ScannerReportReader; import org.sonar.ce.task.projectanalysis.component.BranchLoader; import org.sonar.ce.task.step.ComputationStep; import org.sonar.core.platform.PluginRepository; @@ -48,13 +48,13 @@ import static java.util.stream.Collectors.toMap; */ public class LoadReportAnalysisMetadataHolderStep implements ComputationStep { private final CeTask ceTask; - private final BatchReportReader reportReader; + private final ScannerReportReader reportReader; private final MutableAnalysisMetadataHolder analysisMetadata; private final DbClient dbClient; private final BranchLoader branchLoader; private final PluginRepository pluginRepository; - public LoadReportAnalysisMetadataHolderStep(CeTask ceTask, BatchReportReader reportReader, MutableAnalysisMetadataHolder analysisMetadata, + public LoadReportAnalysisMetadataHolderStep(CeTask ceTask, ScannerReportReader reportReader, MutableAnalysisMetadataHolder analysisMetadata, DbClient dbClient, BranchLoader branchLoader, PluginRepository pluginRepository) { this.ceTask = ceTask; this.reportReader = reportReader; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/NewCoverageMeasuresStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/NewCoverageMeasuresStep.java index 54da911fec4..6bb0df00ebc 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/NewCoverageMeasuresStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/NewCoverageMeasuresStep.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.Optional; import java.util.Set; import org.sonar.api.measures.CoreMetrics; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.common.scanner.ScannerReportReader; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.ce.task.projectanalysis.component.PathAwareCrawler; import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; @@ -70,10 +70,10 @@ public class NewCoverageMeasuresStep implements ComputationStep { private final MetricRepository metricRepository; private final MeasureRepository measureRepository; private final NewLinesRepository newLinesRepository; - private final BatchReportReader reportReader; + private final ScannerReportReader reportReader; public NewCoverageMeasuresStep(TreeRootHolder treeRootHolder, - MeasureRepository measureRepository, MetricRepository metricRepository, NewLinesRepository newLinesRepository, BatchReportReader reportReader) { + MeasureRepository measureRepository, MetricRepository metricRepository, NewLinesRepository newLinesRepository, ScannerReportReader reportReader) { this.treeRootHolder = treeRootHolder; this.metricRepository = metricRepository; this.measureRepository = measureRepository; @@ -123,14 +123,14 @@ public class NewCoverageMeasuresStep implements ComputationStep { public static class NewLinesAndConditionsCoverageFormula implements Formula<NewCoverageCounter> { private final NewLinesRepository newLinesRepository; - private final BatchReportReader reportReader; + private final ScannerReportReader reportReader; - private NewLinesAndConditionsCoverageFormula(NewLinesRepository newLinesRepository, BatchReportReader reportReader) { + private NewLinesAndConditionsCoverageFormula(NewLinesRepository newLinesRepository, ScannerReportReader reportReader) { this.newLinesRepository = newLinesRepository; this.reportReader = reportReader; } - public static Iterable<Formula<NewCoverageCounter>> from(NewLinesRepository newLinesRepository, BatchReportReader reportReader) { + public static Iterable<Formula<NewCoverageCounter>> from(NewLinesRepository newLinesRepository, ScannerReportReader reportReader) { return Collections.singleton(new NewLinesAndConditionsCoverageFormula(newLinesRepository, reportReader)); } @@ -181,9 +181,9 @@ public class NewCoverageMeasuresStep implements ComputationStep { private final IntValue newConditions = new IntValue(); private final IntValue newCoveredConditions = new IntValue(); private final NewLinesRepository newLinesRepository; - private final BatchReportReader reportReader; + private final ScannerReportReader reportReader; - NewCoverageCounter(NewLinesRepository newLinesRepository, BatchReportReader reportReader) { + NewCoverageCounter(NewLinesRepository newLinesRepository, ScannerReportReader reportReader) { this.newLinesRepository = newLinesRepository; this.reportReader = reportReader; } diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistAnalysisPropertiesStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistAnalysisPropertiesStep.java index 56319bab156..34aadaf363d 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistAnalysisPropertiesStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistAnalysisPropertiesStep.java @@ -23,7 +23,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.common.scanner.ScannerReportReader; import org.sonar.ce.task.step.ComputationStep; import org.sonar.core.util.CloseableIterator; import org.sonar.core.util.UuidFactory; @@ -46,11 +46,11 @@ public class PersistAnalysisPropertiesStep implements ComputationStep { private final DbClient dbClient; private final AnalysisMetadataHolder analysisMetadataHolder; - private final BatchReportReader reportReader; + private final ScannerReportReader reportReader; private final UuidFactory uuidFactory; public PersistAnalysisPropertiesStep(DbClient dbClient, AnalysisMetadataHolder analysisMetadataHolder, - BatchReportReader reportReader, UuidFactory uuidFactory) { + ScannerReportReader reportReader, UuidFactory uuidFactory) { this.dbClient = dbClient; this.analysisMetadataHolder = analysisMetadataHolder; this.reportReader = reportReader; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistAnalysisWarningsStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistAnalysisWarningsStep.java index bb5eb901011..f9818f8cfdb 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistAnalysisWarningsStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistAnalysisWarningsStep.java @@ -22,7 +22,7 @@ package org.sonar.ce.task.projectanalysis.step; import java.util.ArrayList; import java.util.Collection; import org.sonar.ce.task.log.CeTaskMessages; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.common.scanner.ScannerReportReader; import org.sonar.ce.task.step.ComputationStep; import org.sonar.core.util.CloseableIterator; import org.sonar.scanner.protocol.output.ScannerReport; @@ -34,10 +34,10 @@ public class PersistAnalysisWarningsStep implements ComputationStep { static final String DESCRIPTION = "Propagate analysis warnings from scanner report"; - private final BatchReportReader reportReader; + private final ScannerReportReader reportReader; private final CeTaskMessages ceTaskMessages; - public PersistAnalysisWarningsStep(BatchReportReader reportReader, CeTaskMessages ceTaskMessages) { + public PersistAnalysisWarningsStep(ScannerReportReader reportReader, CeTaskMessages ceTaskMessages) { this.reportReader = reportReader; this.ceTaskMessages = ceTaskMessages; } diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStep.java index 5fc0b2c4e00..4eb73118d69 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStep.java @@ -20,7 +20,7 @@ package org.sonar.ce.task.projectanalysis.step; import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.common.scanner.ScannerReportReader; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.ce.task.projectanalysis.component.CrawlerDepthLimit; import org.sonar.ce.task.projectanalysis.component.DepthTraversalTypeAwareCrawler; @@ -44,12 +44,12 @@ public class PersistCrossProjectDuplicationIndexStep implements ComputationStep private final DbClient dbClient; private final TreeRootHolder treeRootHolder; private final AnalysisMetadataHolder analysisMetadataHolder; - private final BatchReportReader reportReader; + private final ScannerReportReader reportReader; private final CrossProjectDuplicationStatusHolder crossProjectDuplicationStatusHolder; public PersistCrossProjectDuplicationIndexStep(CrossProjectDuplicationStatusHolder crossProjectDuplicationStatusHolder, DbClient dbClient, TreeRootHolder treeRootHolder, AnalysisMetadataHolder analysisMetadataHolder, - BatchReportReader reportReader) { + ScannerReportReader reportReader) { this.dbClient = dbClient; this.treeRootHolder = treeRootHolder; this.analysisMetadataHolder = analysisMetadataHolder; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistProjectLinksStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistProjectLinksStep.java index f6ca7ffd85b..9f284e4ac15 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistProjectLinksStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistProjectLinksStep.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.Optional; import java.util.Set; import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.common.scanner.ScannerReportReader; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; import org.sonar.ce.task.step.ComputationStep; @@ -48,11 +48,11 @@ public class PersistProjectLinksStep implements ComputationStep { private final AnalysisMetadataHolder analysisMetadataHolder; private final DbClient dbClient; private final TreeRootHolder treeRootHolder; - private final BatchReportReader reportReader; + private final ScannerReportReader reportReader; private final UuidFactory uuidFactory; public PersistProjectLinksStep(AnalysisMetadataHolder analysisMetadataHolder, DbClient dbClient, TreeRootHolder treeRootHolder, - BatchReportReader reportReader, UuidFactory uuidFactory) { + ScannerReportReader reportReader, UuidFactory uuidFactory) { this.analysisMetadataHolder = analysisMetadataHolder; this.dbClient = dbClient; this.treeRootHolder = treeRootHolder; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistScannerAnalysisCacheStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistScannerAnalysisCacheStep.java index bc9ea7847fe..b655b15c3e4 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistScannerAnalysisCacheStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistScannerAnalysisCacheStep.java @@ -23,18 +23,18 @@ import java.io.IOException; import java.io.InputStream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.common.scanner.ScannerReportReader; import org.sonar.ce.task.projectanalysis.component.TreeRootHolder; import org.sonar.ce.task.step.ComputationStep; import org.sonar.db.DbClient; public class PersistScannerAnalysisCacheStep implements ComputationStep { private static final Logger LOGGER = LoggerFactory.getLogger(PersistScannerAnalysisCacheStep.class); - private final BatchReportReader reportReader; + private final ScannerReportReader reportReader; private final DbClient dbClient; private final TreeRootHolder treeRootHolder; - public PersistScannerAnalysisCacheStep(BatchReportReader reportReader, DbClient dbClient, TreeRootHolder treeRootHolder) { + public PersistScannerAnalysisCacheStep(ScannerReportReader reportReader, DbClient dbClient, TreeRootHolder treeRootHolder) { this.reportReader = reportReader; this.dbClient = dbClient; this.treeRootHolder = treeRootHolder; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistScannerContextStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistScannerContextStep.java index edc74241b9b..1c0bc673af5 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistScannerContextStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/PersistScannerContextStep.java @@ -20,7 +20,7 @@ package org.sonar.ce.task.projectanalysis.step; import org.sonar.ce.task.CeTask; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.common.scanner.ScannerReportReader; import org.sonar.ce.task.step.ComputationStep; import org.sonar.core.util.CloseableIterator; import org.sonar.db.DbClient; @@ -29,11 +29,11 @@ import org.sonar.db.DbSession; import static java.util.Collections.singleton; public class PersistScannerContextStep implements ComputationStep { - private final BatchReportReader reportReader; + private final ScannerReportReader reportReader; private final DbClient dbClient; private final CeTask ceTask; - public PersistScannerContextStep(BatchReportReader reportReader, DbClient dbClient, CeTask ceTask) { + public PersistScannerContextStep(ScannerReportReader reportReader, DbClient dbClient, CeTask ceTask) { this.reportReader = reportReader; this.dbClient = dbClient; this.ceTask = ceTask; diff --git a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/SendAnalysisTelemetryStep.java b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/SendAnalysisTelemetryStep.java index 9892d037ed5..c80f5bf94bc 100644 --- a/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/SendAnalysisTelemetryStep.java +++ b/server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/SendAnalysisTelemetryStep.java @@ -24,7 +24,7 @@ import java.util.Set; import org.sonar.api.config.Configuration; import org.sonar.api.platform.Server; import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.common.scanner.ScannerReportReader; import org.sonar.ce.task.step.ComputationStep; import org.sonar.core.util.CloseableIterator; import org.sonar.core.util.UuidFactory; @@ -41,16 +41,16 @@ import static org.sonar.process.ProcessProperties.Property.SONAR_TELEMETRY_ENABL public class SendAnalysisTelemetryStep implements ComputationStep { private final TelemetryClient telemetryClient; - private final BatchReportReader batchReportReader; + private final ScannerReportReader scannerReportReader; private final Server server; private final UuidFactory uuidFactory; private final Configuration config; private final AnalysisMetadataHolder analysisMetadataHolder; - public SendAnalysisTelemetryStep(TelemetryClient telemetryClient, BatchReportReader batchReportReader, + public SendAnalysisTelemetryStep(TelemetryClient telemetryClient, ScannerReportReader scannerReportReader, UuidFactory uuidFactory, Server server, Configuration configuration, AnalysisMetadataHolder analysisMetadataHolder) { this.telemetryClient = telemetryClient; - this.batchReportReader = batchReportReader; + this.scannerReportReader = scannerReportReader; this.server = server; this.uuidFactory = uuidFactory; this.config = configuration; @@ -62,7 +62,7 @@ public class SendAnalysisTelemetryStep implements ComputationStep { if (!config.getBoolean(SONAR_TELEMETRY_ENABLE.getKey()).orElse(false)) { return; } - try (CloseableIterator<ScannerReport.TelemetryEntry> it = batchReportReader.readTelemetryEntries()) { + try (CloseableIterator<ScannerReport.TelemetryEntry> it = scannerReportReader.readTelemetryEntries()) { Set<Metric> metrics = new HashSet<>(); String projectUuid = analysisMetadataHolder.getProject().getUuid(); String analysisType = analysisMetadataHolder.isPullRequest() ? "pull_request" : "branch"; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutorTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutorTest.java index 56078755a36..e3d8de71d8e 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutorTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/api/posttask/PostProjectAnalysisTasksExecutorTest.java @@ -43,7 +43,7 @@ import org.sonar.api.testfixtures.log.LogTester; import org.sonar.ce.task.CeTask; import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; import org.sonar.ce.task.projectanalysis.analysis.Branch; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.common.scanner.ScannerReportReaderRule; import org.sonar.ce.task.projectanalysis.metric.Metric; import org.sonar.ce.task.projectanalysis.qualitygate.Condition; import org.sonar.ce.task.projectanalysis.qualitygate.ConditionStatus; @@ -82,7 +82,7 @@ public class PostProjectAnalysisTasksExecutorTest { @Rule public MutableQualityGateStatusHolderRule qualityGateStatusHolder = new MutableQualityGateStatusHolderRule(); @Rule - public BatchReportReaderRule reportReader = new BatchReportReaderRule(); + public ScannerReportReaderRule reportReader = new ScannerReportReaderRule(); @Rule public LogTester logTester = new LogTester(); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/IssueCounterTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/IssueCounterTest.java index 214e32bb4a5..ab0975defd9 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/IssueCounterTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/IssueCounterTest.java @@ -32,7 +32,7 @@ import org.junit.jupiter.api.extension.RegisterExtension; import org.sonar.api.issue.impact.Severity; import org.sonar.api.issue.impact.SoftwareQuality; import org.sonar.api.rules.RuleType; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.common.scanner.ScannerReportReaderRule; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; import org.sonar.ce.task.projectanalysis.measure.Measure; @@ -173,7 +173,7 @@ class IssueCounterTest { private static final Component PROJECT = builder(Component.Type.PROJECT, 4).addChildren(FILE1, FILE2, FILE3).build(); @RegisterExtension - private final BatchReportReaderRule reportReader = new BatchReportReaderRule(); + private final ScannerReportReaderRule reportReader = new ScannerReportReaderRule(); @RegisterExtension private final TreeRootHolderRule treeRootHolder = new TreeRootHolderRule(); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/TrackerRawInputFactoryTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/TrackerRawInputFactoryTest.java index ce8056d4906..bd2f05eb6f9 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/TrackerRawInputFactoryTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/issue/TrackerRawInputFactoryTest.java @@ -38,7 +38,7 @@ import org.sonar.api.rule.RuleKey; import org.sonar.api.rule.Severity; import org.sonar.api.rules.RuleType; import org.sonar.api.utils.Duration; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.common.scanner.ScannerReportReaderRule; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.ce.task.projectanalysis.component.ReportComponent; import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; @@ -84,7 +84,7 @@ class TrackerRawInputFactoryTest { @RegisterExtension private final TreeRootHolderRule treeRootHolder = new TreeRootHolderRule().setRoot(PROJECT); @RegisterExtension - private final BatchReportReaderRule reportReader = new BatchReportReaderRule(); + private final ScannerReportReaderRule reportReader = new ScannerReportReaderRule(); @RegisterExtension private final ActiveRulesHolderRule activeRulesHolder = new ActiveRulesHolderRule(); @RegisterExtension diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/language/HandleUnanalyzedLanguagesStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/language/HandleUnanalyzedLanguagesStepTest.java index 08b1da698e4..d47c1d6b657 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/language/HandleUnanalyzedLanguagesStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/language/HandleUnanalyzedLanguagesStepTest.java @@ -31,7 +31,7 @@ import org.mockito.junit.MockitoJUnitRunner; import org.sonar.api.utils.System2; import org.sonar.ce.task.log.CeTaskMessages; import org.sonar.ce.task.log.CeTaskMessages.Message; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.common.scanner.ScannerReportReaderRule; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.ce.task.projectanalysis.component.ReportComponent; import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; @@ -65,7 +65,7 @@ public class HandleUnanalyzedLanguagesStepTest { private static final Component ROOT_PROJECT = ReportComponent.builder(PROJECT, PROJECT_REF).build(); @Rule - public BatchReportReaderRule reportReader = new BatchReportReaderRule(); + public ScannerReportReaderRule reportReader = new ScannerReportReaderRule(); @Rule public TreeRootHolderRule treeRootHolder = new TreeRootHolderRule().setRoot(ROOT_PROJECT); @Rule diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/MapBasedRawMeasureRepositoryTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/MapBasedRawMeasureRepositoryTest.java index 441fee7759d..6ce84a9de57 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/MapBasedRawMeasureRepositoryTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/measure/MapBasedRawMeasureRepositoryTest.java @@ -30,7 +30,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.sonar.api.utils.System2; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.common.scanner.ScannerReportReader; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.ce.task.projectanalysis.component.ReportComponent; import org.sonar.ce.task.projectanalysis.metric.Metric; @@ -75,8 +75,8 @@ public class MapBasedRawMeasureRepositoryTest { private MetricRepository metricRepository = mock(MetricRepository.class); private MapBasedRawMeasureRepository<Integer> underTest = new MapBasedRawMeasureRepository<>(component -> component.getReportAttributes().getRef()); private DbClient mockedDbClient = mock(DbClient.class); - private BatchReportReader mockBatchReportReader = mock(BatchReportReader.class); - private MeasureRepositoryImpl underTestWithMock = new MeasureRepositoryImpl(mockedDbClient, mockBatchReportReader, metricRepository, reportMetricValidator); + private ScannerReportReader mockScannerReportReader = mock(ScannerReportReader.class); + private MeasureRepositoryImpl underTestWithMock = new MeasureRepositoryImpl(mockedDbClient, mockScannerReportReader, metricRepository, reportMetricValidator); @Before public void setUp() { @@ -221,7 +221,7 @@ public class MapBasedRawMeasureRepositoryTest { underTestWithMock.getRawMeasure(null, metric1); fail("an NPE should have been raised"); } catch (NullPointerException e) { - verifyNoMoreInteractions(mockBatchReportReader); + verifyNoMoreInteractions(mockScannerReportReader); } } @@ -231,7 +231,7 @@ public class MapBasedRawMeasureRepositoryTest { underTestWithMock.getRawMeasure(FILE_COMPONENT, null); fail("an NPE should have been raised"); } catch (NullPointerException e) { - verifyNoMoreInteractions(mockBatchReportReader); + verifyNoMoreInteractions(mockScannerReportReader); } } diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/batch/ImmutableBatchReportDirectoryHolder.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/scanner/ImmutableScannerReportDirectoryHolder.java index 7f8d18987eb..f170419c382 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/batch/ImmutableBatchReportDirectoryHolder.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/scanner/ImmutableScannerReportDirectoryHolder.java @@ -17,15 +17,15 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.ce.task.projectanalysis.batch; +package org.sonar.ce.task.projectanalysis.scanner; import java.io.File; import java.util.Objects; -public class ImmutableBatchReportDirectoryHolder implements BatchReportDirectoryHolder { +public class ImmutableScannerReportDirectoryHolder implements ScannerReportDirectoryHolder { private final File directory; - public ImmutableBatchReportDirectoryHolder(File directory) { + public ImmutableScannerReportDirectoryHolder(File directory) { this.directory = Objects.requireNonNull(directory); } diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/batch/BatchReportDirectoryHolderImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/scanner/ScannerReportDirectoryHolderImplTest.java index 6411ee01858..fb5eb31d852 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/batch/BatchReportDirectoryHolderImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/scanner/ScannerReportDirectoryHolderImplTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.ce.task.projectanalysis.batch; +package org.sonar.ce.task.projectanalysis.scanner; import java.io.File; import org.junit.Test; @@ -25,18 +25,18 @@ import org.junit.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -public class BatchReportDirectoryHolderImplTest { +public class ScannerReportDirectoryHolderImplTest { @Test public void getDirectory_throws_ISE_if_holder_is_empty() { - assertThatThrownBy(() -> new BatchReportDirectoryHolderImpl().getDirectory()) + assertThatThrownBy(() -> new ScannerReportDirectoryHolderImpl().getDirectory()) .isInstanceOf(IllegalStateException.class); } @Test public void getDirectory_returns_File_set_with_setDirectory() { File file = new File(""); - BatchReportDirectoryHolderImpl holder = new BatchReportDirectoryHolderImpl(); + ScannerReportDirectoryHolderImpl holder = new ScannerReportDirectoryHolderImpl(); holder.setDirectory(file); assertThat(holder.getDirectory()).isSameAs(file); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/batch/BatchReportReaderImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/scanner/ScannerReportReaderImplTest.java index c60292f9e17..09d89b3b2d9 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/batch/BatchReportReaderImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/scanner/ScannerReportReaderImplTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.ce.task.projectanalysis.batch; +package org.sonar.ce.task.projectanalysis.scanner; import com.google.common.collect.ImmutableList; import java.io.File; @@ -36,7 +36,7 @@ import static com.google.common.collect.ImmutableList.of; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -public class BatchReportReaderImplTest { +public class ScannerReportReaderImplTest { private static final int COMPONENT_REF = 1; private static final ScannerReport.Changesets CHANGESETS = ScannerReport.Changesets.newBuilder().setComponentRef(COMPONENT_REF).build(); private static final ScannerReport.Measure MEASURE = ScannerReport.Measure.newBuilder().build(); @@ -54,12 +54,12 @@ public class BatchReportReaderImplTest { public JUnitTempFolder tempFolder = new JUnitTempFolder(); private ScannerReportWriter writer; - private BatchReportReaderImpl underTest; + private ScannerReportReaderImpl underTest; @Before public void setUp() { - BatchReportDirectoryHolder holder = new ImmutableBatchReportDirectoryHolder(tempFolder.newDir()); - underTest = new BatchReportReaderImpl(holder); + ScannerReportDirectoryHolder holder = new ImmutableScannerReportDirectoryHolder(tempFolder.newDir()); + underTest = new ScannerReportReaderImpl(holder); FileStructure fileStructure = new FileStructure(holder.getDirectory()); writer = new ScannerReportWriter(fileStructure); } diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/scm/ScmInfoRepositoryImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/scm/ScmInfoRepositoryImplTest.java index aef926bc752..3a421a76293 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/scm/ScmInfoRepositoryImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/scm/ScmInfoRepositoryImplTest.java @@ -34,8 +34,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.sonar.api.testfixtures.log.LogTester; import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.common.scanner.ScannerReportReader; +import org.sonar.ce.common.scanner.ScannerReportReaderRule; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.ce.task.projectanalysis.component.Component.Status; import org.sonar.ce.task.projectanalysis.component.Component.Type; @@ -70,7 +70,7 @@ public class ScmInfoRepositoryImplTest { @Rule public LogTester logTester = new LogTester(); @Rule - public BatchReportReaderRule reportReader = new BatchReportReaderRule(); + public ScannerReportReaderRule reportReader = new ScannerReportReaderRule(); @Rule public AnalysisMetadataHolderRule analysisMetadata = new AnalysisMetadataHolderRule(); @@ -261,12 +261,12 @@ public class ScmInfoRepositoryImplTest { @Test @UseDataProvider("allTypeComponentButFile") public void do_not_query_db_nor_report_if_component_type_is_not_FILE(Component component) { - BatchReportReader batchReportReader = mock(BatchReportReader.class); - ScmInfoRepositoryImpl underTest = new ScmInfoRepositoryImpl(batchReportReader, analysisMetadata, dbLoader, diff, fileStatuses); + ScannerReportReader scannerReportReader = mock(ScannerReportReader.class); + ScmInfoRepositoryImpl underTest = new ScmInfoRepositoryImpl(scannerReportReader, analysisMetadata, dbLoader, diff, fileStatuses); assertThat(underTest.getScmInfo(component)).isEmpty(); - verifyNoInteractions(batchReportReader, dbLoader); + verifyNoInteractions(scannerReportReader, dbLoader); } @DataProvider diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/NewLinesRepositoryTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/NewLinesRepositoryTest.java index 66491a2f80d..80fe4262b75 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/NewLinesRepositoryTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/NewLinesRepositoryTest.java @@ -26,7 +26,7 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; import org.sonar.ce.task.projectanalysis.analysis.Branch; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.common.scanner.ScannerReportReaderRule; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.ce.task.projectanalysis.component.ReportComponent; import org.sonar.ce.task.projectanalysis.period.Period; @@ -45,7 +45,7 @@ public class NewLinesRepositoryTest { private final static ReportComponent FILE = ReportComponent.builder(Component.Type.FILE, 1).build(); @Rule - public BatchReportReaderRule reader = new BatchReportReaderRule(); + public ScannerReportReaderRule reader = new ScannerReportReaderRule(); @Rule public AnalysisMetadataHolderRule analysisMetadataHolder = new AnalysisMetadataHolderRule(); @Rule diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SignificantCodeRepositoryTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SignificantCodeRepositoryTest.java index f5a8a40378e..4d7fc509230 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SignificantCodeRepositoryTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SignificantCodeRepositoryTest.java @@ -23,7 +23,7 @@ import java.util.ArrayList; import java.util.List; import org.junit.Rule; import org.junit.Test; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.common.scanner.ScannerReportReaderRule; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.ce.task.projectanalysis.component.FileAttributes; import org.sonar.core.hash.LineRange; @@ -40,7 +40,7 @@ public class SignificantCodeRepositoryTest { @Rule - public BatchReportReaderRule reportReader = new BatchReportReaderRule(); + public ScannerReportReaderRule reportReader = new ScannerReportReaderRule(); private SignificantCodeRepository underTest = new SignificantCodeRepository(reportReader); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SourceLineReadersFactoryTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SourceLineReadersFactoryTest.java index 75583e113fa..dde4970a245 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SourceLineReadersFactoryTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SourceLineReadersFactoryTest.java @@ -21,7 +21,7 @@ package org.sonar.ce.task.projectanalysis.source; import org.junit.Rule; import org.junit.Test; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.common.scanner.ScannerReportReaderRule; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.ce.task.projectanalysis.component.FileAttributes; import org.sonar.ce.task.projectanalysis.component.ReportComponent; @@ -43,7 +43,7 @@ public class SourceLineReadersFactoryTest { @Rule public TreeRootHolderRule treeRootHolder = new TreeRootHolderRule(); @Rule - public BatchReportReaderRule reportReader = new BatchReportReaderRule(); + public ScannerReportReaderRule reportReader = new ScannerReportReaderRule(); @Rule public ScmInfoRepositoryRule scmInfoRepository = new ScmInfoRepositoryRule(); @Rule diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SourceLinesRepositoryImplTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SourceLinesRepositoryImplTest.java index 0c45bf963ae..75b846b97a4 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SourceLinesRepositoryImplTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/source/SourceLinesRepositoryImplTest.java @@ -21,7 +21,7 @@ package org.sonar.ce.task.projectanalysis.source; import org.junit.Rule; import org.junit.Test; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.common.scanner.ScannerReportReaderRule; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.ce.task.projectanalysis.component.FileAttributes; import org.sonar.core.util.CloseableIterator; @@ -38,7 +38,7 @@ public class SourceLinesRepositoryImplTest { @Rule - public BatchReportReaderRule reportReader = new BatchReportReaderRule(); + public ScannerReportReaderRule reportReader = new ScannerReportReaderRule(); private SourceLinesRepositoryImpl underTest = new SourceLinesRepositoryImpl(reportReader); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/LoadDuplicationsFromReportStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/LoadDuplicationsFromReportStepTest.java index bf5de720604..7f547385bd9 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/LoadDuplicationsFromReportStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/LoadDuplicationsFromReportStepTest.java @@ -24,7 +24,7 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolderRule; import org.sonar.ce.task.projectanalysis.analysis.Branch; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.common.scanner.ScannerReportReaderRule; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; import org.sonar.ce.task.projectanalysis.component.VisitException; @@ -64,7 +64,7 @@ public class LoadDuplicationsFromReportStepTest { builder(FILE, FILE_2_REF).setStatus(Component.Status.SAME).build()) .build()); @Rule - public BatchReportReaderRule reportReader = new BatchReportReaderRule(); + public ScannerReportReaderRule reportReader = new ScannerReportReaderRule(); @Rule public DuplicationRepositoryRule duplicationRepository = DuplicationRepositoryRule.create(treeRootHolder); @Rule diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/LoadQualityProfilesStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/LoadQualityProfilesStepTest.java index 7bc500c7bf1..deeacae8e9e 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/LoadQualityProfilesStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/LoadQualityProfilesStepTest.java @@ -24,7 +24,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.sonar.api.rule.RuleStatus; import org.sonar.api.rule.Severity; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.common.scanner.ScannerReportReaderRule; import org.sonar.ce.task.projectanalysis.issue.DumbRule; import org.sonar.ce.task.projectanalysis.issue.RuleRepositoryRule; import org.sonar.ce.task.projectanalysis.qualityprofile.ActiveRule; @@ -41,7 +41,7 @@ import static org.sonar.db.rule.RuleTesting.XOO_X2; class LoadQualityProfilesStepTest { @RegisterExtension - private final BatchReportReaderRule batchReportReader = new BatchReportReaderRule(); + private final ScannerReportReaderRule batchReportReader = new ScannerReportReaderRule(); @RegisterExtension private final RuleRepositoryRule ruleRepository = new RuleRepositoryRule(); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/NewCoverageMeasuresStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/NewCoverageMeasuresStepTest.java index 8d74e5b093d..02aaf4fb05f 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/NewCoverageMeasuresStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/NewCoverageMeasuresStepTest.java @@ -26,7 +26,7 @@ import java.util.Set; import org.junit.Rule; import org.junit.Test; import org.sonar.api.measures.CoreMetrics; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.common.scanner.ScannerReportReaderRule; import org.sonar.ce.task.projectanalysis.component.Component; import org.sonar.ce.task.projectanalysis.component.FileAttributes; import org.sonar.ce.task.projectanalysis.component.ReportComponent; @@ -94,7 +94,7 @@ public class NewCoverageMeasuresStepTest { public MeasureRepositoryRule measureRepository = MeasureRepositoryRule.create(treeRootHolder, metricRepository); @Rule - public BatchReportReaderRule reportReader = new BatchReportReaderRule(); + public ScannerReportReaderRule reportReader = new ScannerReportReaderRule(); private NewLinesRepository newLinesRepository = mock(NewLinesRepository.class); private NewCoverageMeasuresStep underTest = new NewCoverageMeasuresStep(treeRootHolder, measureRepository, metricRepository, newLinesRepository, reportReader); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistAnalysisWarningsStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistAnalysisWarningsStepTest.java index 409e75f9662..78ec9f6ed7e 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistAnalysisWarningsStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/PersistAnalysisWarningsStepTest.java @@ -28,7 +28,7 @@ import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.junit.MockitoJUnitRunner; import org.sonar.ce.task.log.CeTaskMessages; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.common.scanner.ScannerReportReaderRule; import org.sonar.ce.task.step.TestComputationStepContext; import org.sonar.db.dismissmessage.MessageType; import org.sonar.scanner.protocol.output.ScannerReport; @@ -46,7 +46,7 @@ import static org.mockito.Mockito.verifyNoInteractions; public class PersistAnalysisWarningsStepTest { @Rule - public BatchReportReaderRule reportReader = new BatchReportReaderRule(); + public ScannerReportReaderRule reportReader = new ScannerReportReaderRule(); @Captor private ArgumentCaptor<List<CeTaskMessages.Message>> argumentCaptor; diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportCoverageMeasuresStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportCoverageMeasuresStepTest.java index 885c44d9477..38bb18968a1 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportCoverageMeasuresStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/ReportCoverageMeasuresStepTest.java @@ -23,7 +23,7 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.sonar.api.measures.CoreMetrics; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReaderRule; +import org.sonar.ce.common.scanner.ScannerReportReaderRule; import org.sonar.ce.task.projectanalysis.component.FileAttributes; import org.sonar.ce.task.projectanalysis.component.TreeRootHolderRule; import org.sonar.ce.task.projectanalysis.formula.coverage.LinesAndConditionsWithUncoveredMetricKeys; @@ -70,7 +70,7 @@ public class ReportCoverageMeasuresStepTest { public MeasureRepositoryRule measureRepository = MeasureRepositoryRule.create(treeRootHolder, metricRepository); @Rule - public BatchReportReaderRule reportReader = new BatchReportReaderRule(); + public ScannerReportReaderRule reportReader = new ScannerReportReaderRule(); CoverageMeasuresStep underTest = new CoverageMeasuresStep(treeRootHolder, metricRepository, measureRepository, reportReader); diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/SendAnalysisTelemetryStepTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/SendAnalysisTelemetryStepTest.java index 7fda992ce62..bef8826dd4a 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/SendAnalysisTelemetryStepTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/step/SendAnalysisTelemetryStepTest.java @@ -28,7 +28,7 @@ import org.mockito.ArgumentCaptor; import org.sonar.api.config.Configuration; import org.sonar.api.platform.Server; import org.sonar.ce.task.projectanalysis.analysis.AnalysisMetadataHolder; -import org.sonar.ce.task.projectanalysis.batch.BatchReportReader; +import org.sonar.ce.common.scanner.ScannerReportReader; import org.sonar.ce.task.step.ComputationStep; import org.sonar.core.util.CloseableIterator; import org.sonar.core.util.UuidFactory; @@ -47,13 +47,13 @@ import static org.mockito.Mockito.when; class SendAnalysisTelemetryStepTest { private final TelemetryClient telemetryClient = mock(); - private final BatchReportReader batchReportReader = mock(); + private final ScannerReportReader scannerReportReader = mock(); private final UuidFactory uuidFactory = mock(); private final Server server = mock(); private final ComputationStep.Context context = mock(); private final Configuration configuration = mock(); private final AnalysisMetadataHolder analysisMetadataHolder = mock(); - private final SendAnalysisTelemetryStep underTest = new SendAnalysisTelemetryStep(telemetryClient, batchReportReader, uuidFactory, + private final SendAnalysisTelemetryStep underTest = new SendAnalysisTelemetryStep(telemetryClient, scannerReportReader, uuidFactory, server, configuration, analysisMetadataHolder); { @@ -65,7 +65,7 @@ class SendAnalysisTelemetryStepTest { @Test void execute_whenNoMetrics_dontSendAnything() { - when(batchReportReader.readTelemetryEntries()).thenReturn(CloseableIterator.emptyCloseableIterator()); + when(scannerReportReader.readTelemetryEntries()).thenReturn(CloseableIterator.emptyCloseableIterator()); underTest.execute(context); @@ -77,7 +77,7 @@ class SendAnalysisTelemetryStepTest { Set<ScannerReport.TelemetryEntry> telemetryEntries = Set.of( ScannerReport.TelemetryEntry.newBuilder().setKey("key1").setValue("value1").build(), ScannerReport.TelemetryEntry.newBuilder().setKey("key2").setValue("value2").build()); - when(batchReportReader.readTelemetryEntries()).thenReturn(CloseableIterator.from(telemetryEntries.iterator())); + when(scannerReportReader.readTelemetryEntries()).thenReturn(CloseableIterator.from(telemetryEntries.iterator())); underTest.execute(context); @@ -90,7 +90,7 @@ class SendAnalysisTelemetryStepTest { Set<ScannerReport.TelemetryEntry> telemetryEntries = Set.of( ScannerReport.TelemetryEntry.newBuilder().setKey("key1").setValue("value1").build(), ScannerReport.TelemetryEntry.newBuilder().setKey("key2").setValue("value2").build()); - when(batchReportReader.readTelemetryEntries()).thenReturn(CloseableIterator.from(telemetryEntries.iterator())); + when(scannerReportReader.readTelemetryEntries()).thenReturn(CloseableIterator.from(telemetryEntries.iterator())); underTest.execute(context); @@ -103,7 +103,7 @@ class SendAnalysisTelemetryStepTest { for (int i = 0; i < 2000; i++) { telemetryEntries.add(ScannerReport.TelemetryEntry.newBuilder().setKey(String.valueOf(i)).setValue("value" + i).build()); } - when(batchReportReader.readTelemetryEntries()).thenReturn(CloseableIterator.from(telemetryEntries.iterator())); + when(scannerReportReader.readTelemetryEntries()).thenReturn(CloseableIterator.from(telemetryEntries.iterator())); underTest.execute(context); |