SLCORE-788 Perform hotspots tracking before raising hotspot (#964)

SonarSource · May 13, 2024 · be2f183 · be2f183
1 parent acba071
commit be2f183
Show file tree

Hide file tree

Showing 22 changed files with 1,055 additions and 405 deletions.
diff --git a/...ce/sonarlint/core/commons/KnownIssue.java → .../sonarlint/core/commons/KnownFinding.java b/...ce/sonarlint/core/commons/KnownIssue.java → .../sonarlint/core/commons/KnownFinding.java
@@ -25,7 +25,7 @@
 import javax.annotation.Nullable;
 import org.sonarsource.sonarlint.core.commons.api.TextRangeWithHash;
 
-public class KnownIssue {
+public class KnownFinding {
   private final UUID id;
   private final String serverKey;
   private final TextRangeWithHash textRangeWithHash;
@@ -34,7 +34,7 @@ public class KnownIssue {
   private final String message;
   private final Instant introductionDate;
 
-  public KnownIssue(UUID id, @Nullable String serverKey, @Nullable TextRangeWithHash textRangeWithHash, @Nullable LineWithHash lineWithHash, String ruleKey, String message,
+  public KnownFinding(UUID id, @Nullable String serverKey, @Nullable TextRangeWithHash textRangeWithHash, @Nullable LineWithHash lineWithHash, String ruleKey, String message,
     Instant introductionDate) {
     this.id = id;
     this.serverKey = serverKey;

diff --git a/backend/core/src/main/java/org/sonarsource/sonarlint/core/DtoMapper.java b/backend/core/src/main/java/org/sonarsource/sonarlint/core/DtoMapper.java
@@ -23,10 +23,12 @@
 import org.sonarsource.sonarlint.core.analysis.RuleDetailsForAnalysis;
 import org.sonarsource.sonarlint.core.rpc.protocol.backend.analysis.GetRuleDetailsResponse;
 import org.sonarsource.sonarlint.core.rpc.protocol.backend.rules.ImpactDto;
+import org.sonarsource.sonarlint.core.rpc.protocol.client.hotspot.RaisedHotspotDto;
 import org.sonarsource.sonarlint.core.rpc.protocol.client.issue.RaisedIssueDto;
 import org.sonarsource.sonarlint.core.rules.RuleDetailsAdapter;
 import org.sonarsource.sonarlint.core.tracking.TrackedIssue;
 
+import static java.util.Objects.requireNonNull;
 import static org.sonarsource.sonarlint.core.tracking.TextRangeUtils.toTextRangeDto;
 
 public class DtoMapper {
@@ -49,11 +51,24 @@ public static RaisedIssueDto toRaisedIssueDto(TrackedIssue issue) {
       RuleDetailsAdapter.adapt(issue.getSeverity()),
       RuleDetailsAdapter.adapt(issue.getType()),
       RuleDetailsAdapter.adapt(issue.getCleanCodeAttribute()), RuleDetailsAdapter.toDto(issue.getImpacts()),
-      issue.getIntroductionDate(), issue.isOnNewCode(), issue.isResolved(),
+      requireNonNull(issue.getIntroductionDate()), issue.isOnNewCode(), issue.isResolved(),
+      toTextRangeDto(issue.getTextRangeWithHash()),
+      issue.getFlows().stream().map(RuleDetailsAdapter::adapt).collect(Collectors.toList()),
+      issue.getQuickFixes().stream().map(RuleDetailsAdapter::adapt).collect(Collectors.toList()),
+      issue.getRuleDescriptionContextKey());
+  }
+
+  public static RaisedHotspotDto toRaisedHotspotDto(TrackedIssue issue) {
+    return new RaisedHotspotDto(issue.getId(), issue.getServerKey(), issue.getRuleKey(), issue.getMessage(),
+      RuleDetailsAdapter.adapt(issue.getSeverity()),
+      RuleDetailsAdapter.adapt(issue.getType()),
+      RuleDetailsAdapter.adapt(issue.getCleanCodeAttribute()), RuleDetailsAdapter.toDto(issue.getImpacts()),
+      requireNonNull(issue.getIntroductionDate()), issue.isOnNewCode(), issue.isResolved(),
       toTextRangeDto(issue.getTextRangeWithHash()),
       issue.getFlows().stream().map(RuleDetailsAdapter::adapt).collect(Collectors.toList()),
       issue.getQuickFixes().stream().map(RuleDetailsAdapter::adapt).collect(Collectors.toList()),
       issue.getRuleDescriptionContextKey(), RuleDetailsAdapter.adapt(issue.getVulnerabilityProbability()));
   }
 
+
 }
diff --git a/...end/core/src/main/java/org/sonarsource/sonarlint/core/analysis/AnalysisFinishedEvent.java b/...end/core/src/main/java/org/sonarsource/sonarlint/core/analysis/AnalysisFinishedEvent.java
@@ -27,8 +27,11 @@
 import java.util.UUID;
 import java.util.stream.Collectors;
 
+import org.sonarsource.sonarlint.core.commons.RuleType;
 import org.sonarsource.sonarlint.core.commons.api.SonarLanguage;
 
+import static java.util.stream.Collectors.toList;
+
 public class AnalysisFinishedEvent {
   private final UUID analysisId;
   private final String configurationScopeId;
@@ -84,7 +87,11 @@ public Set<SonarLanguage> getDetectedLanguages() {
   }
 
   public List<RawIssue> getIssues() {
-    return issues;
+    return issues.stream().filter(issue -> !issue.getRuleType().equals(RuleType.SECURITY_HOTSPOT)).collect(toList());
+  }
+
+  public List<RawIssue> getHotspots() {
+    return issues.stream().filter(issue -> issue.getRuleType().equals(RuleType.SECURITY_HOTSPOT)).collect(toList());
   }
 
   public boolean isTrackingEnabled() {

diff --git a/...nd/core/src/main/java/org/sonarsource/sonarlint/core/spring/SonarLintSpringAppConfig.java b/...nd/core/src/main/java/org/sonarsource/sonarlint/core/spring/SonarLintSpringAppConfig.java
@@ -95,7 +95,7 @@
 import org.sonarsource.sonarlint.core.sync.SynchronizationService;
 import org.sonarsource.sonarlint.core.sync.TaintSynchronizationService;
 import org.sonarsource.sonarlint.core.tracking.IssueMatchingService;
-import org.sonarsource.sonarlint.core.tracking.KnownIssuesStorageService;
+import org.sonarsource.sonarlint.core.tracking.KnownFindingsStorageService;
 import org.sonarsource.sonarlint.core.tracking.LocalOnlyIssueRepository;
 import org.sonarsource.sonarlint.core.tracking.SecurityHotspotMatchingService;
 import org.sonarsource.sonarlint.core.tracking.TaintVulnerabilityTrackingService;
@@ -175,7 +175,7 @@
   SharedConnectedModeSettingsProvider.class,
   AnalysisEngineCache.class,
   PromotionService.class,
-  KnownIssuesStorageService.class
+  KnownFindingsStorageService.class
 })
 public class SonarLintSpringAppConfig {