aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-scanner-engine
diff options
context:
space:
mode:
Diffstat (limited to 'sonar-scanner-engine')
-rw-r--r--sonar-scanner-engine/src/main/java/org/sonar/scanner/sensor/DefaultSensorStorage.java46
-rw-r--r--sonar-scanner-engine/src/test/java/org/sonar/scanner/sensor/DefaultSensorStorageTest.java85
2 files changed, 121 insertions, 10 deletions
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/sensor/DefaultSensorStorage.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/sensor/DefaultSensorStorage.java
index 9404d772204..318f4f42a2c 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/sensor/DefaultSensorStorage.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/sensor/DefaultSensorStorage.java
@@ -62,6 +62,7 @@ import org.sonar.scanner.protocol.output.ScannerReportWriter;
import org.sonar.scanner.report.ReportPublisher;
import org.sonar.scanner.report.ScannerReportUtils;
import org.sonar.scanner.repository.ContextPropertiesCache;
+import org.sonar.scanner.scan.branch.BranchConfiguration;
import org.sonar.scanner.scan.measure.MeasureCache;
import static java.util.stream.Collectors.toList;
@@ -146,6 +147,7 @@ public class DefaultSensorStorage implements SensorStorage {
private final ContextPropertiesCache contextPropertiesCache;
private final Configuration settings;
private final ScannerMetrics scannerMetrics;
+ private final BranchConfiguration branchConfiguration;
private final Map<Metric<?>, Metric<?>> deprecatedCoverageMetricMapping = new HashMap<>();
private final Set<Metric<?>> coverageMetrics = new HashSet<>();
private final Set<Metric<?>> byLineMetrics = new HashSet<>();
@@ -153,7 +155,7 @@ public class DefaultSensorStorage implements SensorStorage {
public DefaultSensorStorage(MetricFinder metricFinder, ModuleIssues moduleIssues, Configuration settings,
ReportPublisher reportPublisher, MeasureCache measureCache, SonarCpdBlockIndex index,
- ContextPropertiesCache contextPropertiesCache, ScannerMetrics scannerMetrics) {
+ ContextPropertiesCache contextPropertiesCache, ScannerMetrics scannerMetrics, BranchConfiguration branchConfiguration) {
this.metricFinder = metricFinder;
this.moduleIssues = moduleIssues;
this.settings = settings;
@@ -162,6 +164,7 @@ public class DefaultSensorStorage implements SensorStorage {
this.index = index;
this.contextPropertiesCache = contextPropertiesCache;
this.scannerMetrics = scannerMetrics;
+ this.branchConfiguration = branchConfiguration;
coverageMetrics.add(UNCOVERED_LINES);
coverageMetrics.add(LINES_TO_COVER);
@@ -200,7 +203,11 @@ public class DefaultSensorStorage implements SensorStorage {
@Override
public void store(Measure newMeasure) {
if (newMeasure.inputComponent() instanceof DefaultInputFile) {
- ((DefaultInputFile) newMeasure.inputComponent()).setPublished(true);
+ DefaultInputFile defaultInputFile = (DefaultInputFile) newMeasure.inputComponent();
+ if (shouldSkipStorage(defaultInputFile)) {
+ return;
+ }
+ defaultInputFile.setPublished(true);
}
saveMeasure(newMeasure.inputComponent(), (DefaultMeasure<?>) newMeasure);
}
@@ -213,7 +220,11 @@ public class DefaultSensorStorage implements SensorStorage {
public void saveMeasure(InputComponent component, DefaultMeasure<?> measure) {
if (component.isFile()) {
- ((DefaultInputFile) component).setPublished(true);
+ DefaultInputFile defaultInputFile = (DefaultInputFile) component;
+ if (shouldSkipStorage(defaultInputFile)) {
+ return;
+ }
+ defaultInputFile.setPublished(true);
}
if (isDeprecatedMetric(measure.metric().key())) {
@@ -343,13 +354,21 @@ public class DefaultSensorStorage implements SensorStorage {
}
}
+ private boolean shouldSkipStorage(DefaultInputFile defaultInputFile) {
+ return branchConfiguration.isShortLivingBranch() && defaultInputFile.status() == InputFile.Status.SAME;
+ }
+
/**
* Thread safe assuming that each issues for each file are only written once.
*/
@Override
public void store(Issue issue) {
if (issue.primaryLocation().inputComponent() instanceof DefaultInputFile) {
- ((DefaultInputFile) issue.primaryLocation().inputComponent()).setPublished(true);
+ DefaultInputFile defaultInputFile = (DefaultInputFile) issue.primaryLocation().inputComponent();
+ if (shouldSkipStorage(defaultInputFile)) {
+ return;
+ }
+ defaultInputFile.setPublished(true);
}
moduleIssues.initAndAddIssue(issue);
}
@@ -358,6 +377,9 @@ public class DefaultSensorStorage implements SensorStorage {
public void store(DefaultHighlighting highlighting) {
ScannerReportWriter writer = reportPublisher.getWriter();
DefaultInputFile inputFile = (DefaultInputFile) highlighting.inputFile();
+ if (shouldSkipStorage(inputFile)) {
+ return;
+ }
inputFile.setPublished(true);
int componentRef = inputFile.batchId();
if (writer.hasComponentData(FileStructure.Domain.SYNTAX_HIGHLIGHTINGS, componentRef)) {
@@ -383,6 +405,9 @@ public class DefaultSensorStorage implements SensorStorage {
public void store(DefaultSymbolTable symbolTable) {
ScannerReportWriter writer = reportPublisher.getWriter();
DefaultInputFile inputFile = (DefaultInputFile) symbolTable.inputFile();
+ if (shouldSkipStorage(inputFile)) {
+ return;
+ }
inputFile.setPublished(true);
int componentRef = inputFile.batchId();
if (writer.hasComponentData(FileStructure.Domain.SYMBOLS, componentRef)) {
@@ -415,6 +440,9 @@ public class DefaultSensorStorage implements SensorStorage {
@Override
public void store(DefaultCoverage defaultCoverage) {
DefaultInputFile inputFile = (DefaultInputFile) defaultCoverage.inputFile();
+ if (shouldSkipStorage(inputFile)) {
+ return;
+ }
inputFile.setPublished(true);
if (defaultCoverage.linesToCover() > 0) {
saveCoverageMetricInternal(inputFile, LINES_TO_COVER, new DefaultMeasure<Integer>().forMetric(LINES_TO_COVER).withValue(defaultCoverage.linesToCover()));
@@ -438,6 +466,9 @@ public class DefaultSensorStorage implements SensorStorage {
@Override
public void store(DefaultCpdTokens defaultCpdTokens) {
DefaultInputFile inputFile = (DefaultInputFile) defaultCpdTokens.inputFile();
+ if (shouldSkipStorage(inputFile)) {
+ return;
+ }
inputFile.setPublished(true);
PmdBlockChunker blockChunker = new PmdBlockChunker(getBlockSize(inputFile.language()));
List<Block> blocks = blockChunker.chunk(inputFile.key(), defaultCpdTokens.getTokenLines());
@@ -451,8 +482,11 @@ public class DefaultSensorStorage implements SensorStorage {
@Override
public void store(AnalysisError analysisError) {
- ((DefaultInputFile) analysisError.inputFile()).setPublished(true);
- // no op
+ DefaultInputFile defaultInputFile = (DefaultInputFile) analysisError.inputFile();
+ if (shouldSkipStorage(defaultInputFile)) {
+ return;
+ }
+ defaultInputFile.setPublished(true);
}
@Override
diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/sensor/DefaultSensorStorageTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/sensor/DefaultSensorStorageTest.java
index c97f20042b0..0797f767d84 100644
--- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/sensor/DefaultSensorStorageTest.java
+++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/sensor/DefaultSensorStorageTest.java
@@ -30,10 +30,15 @@ import org.junit.rules.TemporaryFolder;
import org.mockito.ArgumentCaptor;
import org.sonar.api.batch.bootstrap.ProjectDefinition;
import org.sonar.api.batch.fs.InputFile;
+import org.sonar.api.batch.fs.internal.DefaultInputFile;
import org.sonar.api.batch.fs.internal.DefaultInputModule;
import org.sonar.api.batch.fs.internal.TestInputFileBuilder;
import org.sonar.api.batch.measure.MetricFinder;
+import org.sonar.api.batch.sensor.highlighting.TypeOfText;
import org.sonar.api.batch.sensor.highlighting.internal.DefaultHighlighting;
+import org.sonar.api.batch.sensor.issue.Issue;
+import org.sonar.api.batch.sensor.issue.internal.DefaultIssue;
+import org.sonar.api.batch.sensor.issue.internal.DefaultIssueLocation;
import org.sonar.api.batch.sensor.measure.internal.DefaultMeasure;
import org.sonar.api.batch.sensor.symbol.internal.DefaultSymbolTable;
import org.sonar.api.config.internal.MapSettings;
@@ -42,15 +47,19 @@ import org.sonar.api.utils.KeyValueFormat;
import org.sonar.core.metric.ScannerMetrics;
import org.sonar.scanner.cpd.index.SonarCpdBlockIndex;
import org.sonar.scanner.issue.ModuleIssues;
+import org.sonar.scanner.protocol.output.FileStructure;
import org.sonar.scanner.protocol.output.ScannerReportWriter;
import org.sonar.scanner.report.ReportPublisher;
import org.sonar.scanner.repository.ContextPropertiesCache;
+import org.sonar.scanner.scan.branch.BranchConfiguration;
import org.sonar.scanner.scan.measure.MeasureCache;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.data.MapEntry.entry;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
public class DefaultSensorStorageTest {
@@ -65,21 +74,29 @@ public class DefaultSensorStorageTest {
private MapSettings settings;
private ModuleIssues moduleIssues;
private MeasureCache measureCache;
+ private ScannerReportWriter reportWriter;
private ContextPropertiesCache contextPropertiesCache = new ContextPropertiesCache();
+ private BranchConfiguration branchConfiguration;
@Before
public void prepare() throws Exception {
MetricFinder metricFinder = mock(MetricFinder.class);
when(metricFinder.<Integer>findByKey(CoreMetrics.NCLOC_KEY)).thenReturn(CoreMetrics.NCLOC);
when(metricFinder.<String>findByKey(CoreMetrics.FUNCTION_COMPLEXITY_DISTRIBUTION_KEY)).thenReturn(CoreMetrics.FUNCTION_COMPLEXITY_DISTRIBUTION);
+
settings = new MapSettings();
moduleIssues = mock(ModuleIssues.class);
measureCache = mock(MeasureCache.class);
+
ReportPublisher reportPublisher = mock(ReportPublisher.class);
- when(reportPublisher.getWriter()).thenReturn(new ScannerReportWriter(temp.newFolder()));
+ reportWriter = new ScannerReportWriter(temp.newFolder());
+ when(reportPublisher.getWriter()).thenReturn(reportWriter);
+
+ branchConfiguration = mock(BranchConfiguration.class);
+
underTest = new DefaultSensorStorage(metricFinder,
moduleIssues, settings.asConfig(), reportPublisher, measureCache,
- mock(SonarCpdBlockIndex.class), contextPropertiesCache, new ScannerMetrics());
+ mock(SonarCpdBlockIndex.class), contextPropertiesCache, new ScannerMetrics(), branchConfiguration);
}
@Test
@@ -96,7 +113,54 @@ public class DefaultSensorStorageTest {
}
@Test
- public void shouldSaveFileMeasureToSensorContext() {
+ public void should_save_issue() {
+ InputFile file = new TestInputFileBuilder("foo", "src/Foo.php").build();
+
+ DefaultIssue issue = new DefaultIssue().at(new DefaultIssueLocation().on(file));
+ underTest.store(issue);
+
+ ArgumentCaptor<Issue> argumentCaptor = ArgumentCaptor.forClass(Issue.class);
+ verify(moduleIssues).initAndAddIssue(argumentCaptor.capture());
+ assertThat(argumentCaptor.getValue()).isEqualTo(issue);
+ }
+
+ @Test
+ public void should_skip_issue_on_short_branch_when_file_status_is_SAME() {
+ InputFile file = new TestInputFileBuilder("foo", "src/Foo.php").setStatus(InputFile.Status.SAME).build();
+ when(branchConfiguration.isShortLivingBranch()).thenReturn(true);
+
+ DefaultIssue issue = new DefaultIssue().at(new DefaultIssueLocation().on(file));
+ underTest.store(issue);
+
+ verifyZeroInteractions(moduleIssues);
+ }
+
+ @Test
+ public void should_save_highlighting() {
+ DefaultInputFile file = new TestInputFileBuilder("foo", "src/Foo.php")
+ .setContents("// comment").build();
+
+ DefaultHighlighting highlighting = new DefaultHighlighting(underTest).onFile(file).highlight(0, 1, TypeOfText.KEYWORD);
+ underTest.store(highlighting);
+
+ assertThat(reportWriter.hasComponentData(FileStructure.Domain.SYNTAX_HIGHLIGHTINGS, file.batchId())).isTrue();
+ }
+
+ @Test
+ public void should_skip_highlighting_on_short_branch_when_file_status_is_SAME() {
+ DefaultInputFile file = new TestInputFileBuilder("foo", "src/Foo.php")
+ .setContents("// comment")
+ .setStatus(InputFile.Status.SAME).build();
+ when(branchConfiguration.isShortLivingBranch()).thenReturn(true);
+
+ DefaultHighlighting highlighting = new DefaultHighlighting(underTest).onFile(file).highlight(0, 1, TypeOfText.KEYWORD);
+ underTest.store(highlighting);
+
+ assertThat(reportWriter.hasComponentData(FileStructure.Domain.SYNTAX_HIGHLIGHTINGS, file.batchId())).isFalse();
+ }
+
+ @Test
+ public void should_save_file_measure() {
InputFile file = new TestInputFileBuilder("foo", "src/Foo.php").build();
ArgumentCaptor<DefaultMeasure> argumentCaptor = ArgumentCaptor.forClass(DefaultMeasure.class);
@@ -112,7 +176,20 @@ public class DefaultSensorStorageTest {
}
@Test
- public void shouldSaveProjectMeasureToSensorContext() throws IOException {
+ public void should_skip_file_measure_on_short_branch_when_file_status_is_SAME() {
+ InputFile file = new TestInputFileBuilder("foo", "src/Foo.php").setStatus(InputFile.Status.SAME).build();
+ when(branchConfiguration.isShortLivingBranch()).thenReturn(true);
+
+ underTest.store(new DefaultMeasure()
+ .on(file)
+ .forMetric(CoreMetrics.NCLOC)
+ .withValue(10));
+
+ verifyZeroInteractions(measureCache);
+ }
+
+ @Test
+ public void should_save_project_measure() throws IOException {
String projectKey = "myProject";
DefaultInputModule module = new DefaultInputModule(ProjectDefinition.create().setKey(projectKey).setBaseDir(temp.newFolder()).setWorkDir(temp.newFolder()));
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 21:31:06 +0000