SONAR-26927 Replace SecurityReportHelper with compliance module

Author: cody-simms-sonarsource

gradle.properties

@@ -6,7 +6,7 @@ version=26.2
 # No change required for patch versions
 versionEOL=2026-06-08
 pdfreportVersion=3.0.0.114
-complianceReportsVersion=1.0.1.296
+complianceReportsVersion=1.0.1.383
 pluginApiVersion=13.4.3.4290
 description=Open source platform for continuous inspection of code quality
 projectTitle=SonarQube

server/sonar-db-dao/src/main/java/org/sonar/db/report/IssueStatsByRuleKeyDaoImpl.java

@@ -61,13 +61,15 @@ public void deleteAndInsertIssueStats(String aggregationId, AggregationType aggr
     }
   }
 
+  @Override
   public void deleteByAggregationAndRuleKey(String aggregationId, AggregationType aggregationType, String ruleKey) {
     try (DbSession dbSession = dbClient.openSession(false)) {
       mapper(dbSession).deleteIssueStatsForAggregationAndRuleKey(aggregationId, aggregationType.toString(), ruleKey);
       dbSession.commit();
     }
   }
 
+  @Override
   public void upsert(String aggregationId, AggregationType aggregationType, IssueStats issueStats) {
     try (DbSession dbSession = dbClient.openSession(false)) {
       mapper(dbSession).deleteIssueStatsForAggregationAndRuleKey(aggregationId, aggregationType.toString(), issueStats.ruleKey());
@@ -76,6 +78,13 @@ public void upsert(String aggregationId, AggregationType aggregationType, IssueS
     }
   }
 
+  @Override
+  public IssueStats aggregateIssueStatsForBranchUuidAndRuleKey(String aggregationId, String ruleKey) {
+    try (DbSession dbSession = dbClient.openSession(false)) {
+      return mapper(dbSession).getIssueStatsByAggregationIdAndRuleKey(aggregationId, ruleKey);
+    }
+  }
+
   private static IssueStatsByRuleKeyMapper mapper(DbSession dbSession) {
     return dbSession.getMapper(IssueStatsByRuleKeyMapper.class);
   }

server/sonar-db-dao/src/main/java/org/sonar/db/report/IssueStatsByRuleKeyMapper.java

@@ -38,4 +38,6 @@ void insertIssueStats(@Param("aggregationId") String aggregationId,
   void deleteIssueStatsForAggregationAndRuleKey(@Param("aggregationId") String aggregationId,
     @Param("aggregationType") String aggregationType,
     @Param("ruleKey") String ruleKey);
+
+  IssueStats getIssueStatsByAggregationIdAndRuleKey(@Param("aggregationId") String aggregationId, @Param("ruleKey") String ruleKey);
 }

server/sonar-db-dao/src/main/resources/org/sonar/db/report/IssueStatsByRuleKeyMapper.xml

@@ -31,6 +31,14 @@
       and aggregation_type = #{aggregationType}
   </select>
 
+  <select id="getIssueStatsByAggregationIdAndRuleKey" parameterType="map" resultType="org.sonarsource.compliancereports.dao.IssueStats">
+    select
+    <include refid="IssueStatsColumns"/>
+    from issue_stats_by_rule_key
+    where aggregation_id = #{aggregationId}
+    and rule_key = #{ruleKey}
+  </select>
+
   <insert id="insertIssueStats">
     insert into issue_stats_by_rule_key (
       aggregation_id,

server/sonar-server-common/src/testFixtures/resources/metadata/TestMetadata2.yml

@@ -1,5 +1,5 @@
 report:
-  key: test
+  key: test2
   versions:
     - name: 2
       key: V2

server/sonar-webserver-webapi/src/it/java/org/sonar/server/hotspot/ws/ChangeStatusActionIT.java

@@ -66,6 +66,7 @@
 import org.sonar.server.ws.WsActionTester;
 import org.sonarsource.compliancereports.dao.AggregationType;
 import org.sonarsource.compliancereports.dao.IssueStats;
+import org.sonarsource.compliancereports.ingestion.IssueIngestionService;
 
 import static org.apache.commons.lang3.RandomStringUtils.secure;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -105,8 +106,10 @@ class ChangeStatusActionIT {
   private System2 system2 = mock(System2.class);
   private IssueFieldsSetter issueFieldsSetter = mock(IssueFieldsSetter.class);
   private HotspotWsSupport hotspotWsSupport = new HotspotWsSupport(dbClient, userSessionRule, system2);
+  private IssueStatsByRuleKeyDaoImpl issueStatsbyRuleKeyDaoImpl = new IssueStatsByRuleKeyDaoImpl(dbClient);
+  private IssueIngestionService issueIngestionService = new IssueIngestionService(issueStatsbyRuleKeyDaoImpl);
   private ChangeStatusAction underTest = new ChangeStatusAction(dbClient, hotspotWsSupport, transitionService, issueFieldsSetter,
-    issueUpdater, hotspotChangeEventService, new IssueStatsByRuleKeyDaoImpl(dbClient));
+    issueUpdater, hotspotChangeEventService, issueIngestionService);
   private WsActionTester actionTester = new WsActionTester(underTest);
   private BranchDto branchDto = mock(BranchDto.class);
 

server/sonar-webserver-webapi/src/it/java/org/sonar/server/issue/ws/DoTransitionActionIT.java

@@ -75,6 +75,7 @@
 import org.sonar.server.ws.WsActionTester;
 import org.sonarsource.compliancereports.dao.AggregationType;
 import org.sonarsource.compliancereports.dao.IssueStats;
+import org.sonarsource.compliancereports.ingestion.IssueIngestionService;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -125,9 +126,10 @@ class DoTransitionActionIT {
     new WebIssueStorage(system2, dbClient, new DefaultRuleFinder(dbClient, mock(RuleDescriptionFormatter.class)), issueIndexer, new SequenceUuidFactory()),
     mock(NotificationManager.class), issueChangePostProcessor, issuesChangesSerializer);
   private ArgumentCaptor<SearchResponseData> preloadedSearchResponseDataCaptor = ArgumentCaptor.forClass(SearchResponseData.class);
+  private IssueStatsByRuleKeyDaoImpl issueStatsByRuleKeyDaoImpl = new IssueStatsByRuleKeyDaoImpl(dbClient);
 
   private WsAction underTest = new DoTransitionAction(dbClient, userSession, issueChangeEventService,
-    new IssueFinder(dbClient, userSession), issueUpdater, transitionService, responseWriter, system2, new IssueStatsByRuleKeyDaoImpl(dbClient));
+    new IssueFinder(dbClient, userSession), issueUpdater, transitionService, responseWriter, system2, new IssueIngestionService(issueStatsByRuleKeyDaoImpl));
   private WsActionTester tester = new WsActionTester(underTest);
 
   @Test

server/sonar-webserver-webapi/src/it/java/org/sonar/server/rule/ws/SearchActionIT.java

@@ -1133,7 +1133,7 @@ void return_compliance_facets_with_filters() {
 
     SearchResponse result = ws.newRequest()
       .setParam(FACETS, FACET_COMPLIANCE_STANDARDS)
-      .setParam(PARAM_COMPLIANCE_STANDARDS, "test:V2=cat1&test:V1=category1")
+      .setParam(PARAM_COMPLIANCE_STANDARDS, "test2:V2=cat1&test:V1=category1")
       .setParam(PARAM_SEVERITIES, "MINOR")
       .executeProtobuf(SearchResponse.class);
 

server/sonar-webserver-webapi/src/main/java/org/sonar/server/hotspot/ws/ChangeStatusAction.java

@@ -44,6 +44,7 @@
 import org.sonar.server.pushapi.hotspots.HotspotChangedEvent;
 import org.sonarsource.compliancereports.dao.AggregationType;
 import org.sonarsource.compliancereports.dao.IssueStats;
+import org.sonarsource.compliancereports.ingestion.IssueIngestionService;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static org.apache.commons.lang3.StringUtils.trimToNull;
@@ -70,18 +71,18 @@ public class ChangeStatusAction implements HotspotsWsAction {
   private final IssueFieldsSetter issueFieldsSetter;
   private final IssueUpdater issueUpdater;
   private final HotspotChangeEventService hotspotChangeEventService;
-  private final IssueStatsByRuleKeyDaoImpl issueStatsByRuleKeyDao;
+  private final IssueIngestionService issueIngestionService;
 
   public ChangeStatusAction(DbClient dbClient, HotspotWsSupport hotspotWsSupport, TransitionService transitionService,
     IssueFieldsSetter issueFieldsSetter, IssueUpdater issueUpdater, HotspotChangeEventService hotspotChangeEventService,
-    IssueStatsByRuleKeyDaoImpl issueStatsByRuleKeyDao) {
+    IssueIngestionService issueIngestionService) {
     this.dbClient = dbClient;
     this.hotspotWsSupport = hotspotWsSupport;
     this.transitionService = transitionService;
     this.issueFieldsSetter = issueFieldsSetter;
     this.issueUpdater = issueUpdater;
     this.hotspotChangeEventService = hotspotChangeEventService;
-    this.issueStatsByRuleKeyDao = issueStatsByRuleKeyDao;
+    this.issueIngestionService = issueIngestionService;
   }
 
   @Override
@@ -203,23 +204,8 @@ private static HotspotChangedEvent buildEventData(DefaultIssue defaultIssue, Iss
   }
 
   private void updateIssueStatsByRuleKey(BranchDto branchDto, RuleKey ruleKey, String transitionKey) {
-    var issueStats = issueStatsByRuleKeyDao.getIssueStats(branchDto.getUuid(), AggregationType.PROJECT).stream()
-      .filter(i -> i.ruleKey().equals(ruleKey.toString()))
-      .findFirst()
-      .orElse(new IssueStats(ruleKey.toString(), 0, 1, 1, 0, 0));
-
-    var updatedIssueStats = updateIssueStatsWithTransition(issueStats, transitionKey);
-    if (updatedIssueStats.issueCount() != 0 || updatedIssueStats.hotspotCount() != 0 || updatedIssueStats.hotspotsReviewed() != 0) {
-      issueStatsByRuleKeyDao.upsert(branchDto.getUuid(), PROJECT, updatedIssueStats);
-    } else {
-      issueStatsByRuleKeyDao.deleteByAggregationAndRuleKey(branchDto.getUuid(), PROJECT, ruleKey.toString());
-    }
-  }
-
-  private static IssueStats updateIssueStatsWithTransition(IssueStats oldStats, String transitionKey) {
     int adjustment = transitionKey.equals(RESET_AS_TO_REVIEW.getKey()) ? 1 : -1;
-    return new IssueStats(oldStats.ruleKey(), 0, oldStats.rating(), oldStats.mqrRating(), oldStats.hotspotCount() + adjustment,
-      oldStats.hotspotsReviewed() - adjustment);
+    issueIngestionService.adjustHotspotStats(branchDto.getUuid(), PROJECT, ruleKey.toString(), adjustment);
   }
 
 }

server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/DoTransitionAction.java

@@ -48,6 +48,7 @@
 import org.sonar.server.pushapi.issues.IssueChangeEventService;
 import org.sonar.server.user.UserSession;
 import org.sonarsource.compliancereports.dao.IssueStats;
+import org.sonarsource.compliancereports.ingestion.IssueIngestionService;
 
 import static java.lang.String.format;
 import static org.sonar.core.issue.IssueChangeContext.issueChangeContextByUserBuilder;
@@ -80,11 +81,11 @@ public class DoTransitionAction implements IssuesWsAction {
   private final TransitionService transitionService;
   private final OperationResponseWriter responseWriter;
   private final System2 system2;
-  private final IssueStatsByRuleKeyDaoImpl issueStatsByRuleKeyDao;
+  private final IssueIngestionService issueIngestionService;
 
   public DoTransitionAction(DbClient dbClient, UserSession userSession, IssueChangeEventService issueChangeEventService,
     IssueFinder issueFinder, IssueUpdater issueUpdater, TransitionService transitionService,
-    OperationResponseWriter responseWriter, System2 system2, IssueStatsByRuleKeyDaoImpl issueStatsByRuleKeyDao) {
+    OperationResponseWriter responseWriter, System2 system2,IssueIngestionService issueIngestionService) {
     this.dbClient = dbClient;
     this.userSession = userSession;
     this.issueChangeEventService = issueChangeEventService;
@@ -93,7 +94,7 @@ public DoTransitionAction(DbClient dbClient, UserSession userSession, IssueChang
     this.transitionService = transitionService;
     this.responseWriter = responseWriter;
     this.system2 = system2;
-    this.issueStatsByRuleKeyDao = issueStatsByRuleKeyDao;
+    this.issueIngestionService = issueIngestionService;
   }
 
   @Override
@@ -169,7 +170,7 @@ private SearchResponseData doTransition(DbSession session, IssueDto issueDto, St
       SearchResponseData response = issueUpdater.saveIssueAndPreloadSearchResponseData(session, issueDto, defaultIssue, context, branch);
 
       if (!branch.getBranchType().equals(BranchType.PULL_REQUEST)) {
-        updateIssueStatsByRuleKey(session, branch, issueDto.getRuleKey(), defaultIssue, transitionKey);
+        updateIssueStatsByRuleKey(branch, issueDto.getRuleKey(), defaultIssue, transitionKey);
       }
 
       if (branch.getBranchType().equals(BRANCH) && response.getComponentByUuid(defaultIssue.projectUuid()) != null) {
@@ -181,18 +182,9 @@ private SearchResponseData doTransition(DbSession session, IssueDto issueDto, St
     return new SearchResponseData(issueDto);
   }
 
-  private void updateIssueStatsByRuleKey(DbSession session, BranchDto branchDto, RuleKey ruleKey, DefaultIssue issue, String transitionKey) {
-    var issueStats = issueStatsByRuleKeyDao.getIssueStats(branchDto.getUuid(), PROJECT).stream()
-      .filter(i -> i.ruleKey().equals(ruleKey.toString()))
-      .findFirst()
-      .orElse(new IssueStats(ruleKey.toString(), 0, getRating(issue), getMqrRating(issue), 0, 0));
-
-    var updatedIssueStats = updateIssueStatsWithTransition(session, branchDto, issueStats, issue, transitionKey);
-    if (updatedIssueStats.issueCount() != 0 || updatedIssueStats.hotspotCount() != 0 || updatedIssueStats.hotspotsReviewed() != 0) {
-      issueStatsByRuleKeyDao.upsert(branchDto.getUuid(), PROJECT, updatedIssueStats);
-    } else {
-      issueStatsByRuleKeyDao.deleteByAggregationAndRuleKey(branchDto.getUuid(), PROJECT, ruleKey.toString());
-    }
+  private void updateIssueStatsByRuleKey(BranchDto branchDto, RuleKey ruleKey, DefaultIssue issue, String transitionKey) {
+    int adjustment = REOPEN_TRANSITIONS.contains(transitionKey) ? 1 : -1;
+    issueIngestionService.adjustIssueStats(branchDto.getUuid(), PROJECT, ruleKey.toString(), getRating(issue), getMqrRating(issue), adjustment);
   }
 
   private static int getRating(DefaultIssue issue) {
@@ -205,20 +197,4 @@ private static int getMqrRating(DefaultIssue issue) {
       .map(impact -> impact.severity().ordinal() + 1)
       .orElse(1);
   }
-
-  private IssueStats updateIssueStatsWithTransition(DbSession session, BranchDto branch, IssueStats oldStats, DefaultIssue issue,
-    String transitionKey) {
-    int adjustment = REOPEN_TRANSITIONS.contains(transitionKey) ? 1 : -1;
-    int newIssueCount = oldStats.issueCount() + adjustment;
-    if (newIssueCount == 0) {
-      return new IssueStats(oldStats.ruleKey(), newIssueCount, 1, 1, 0, 0);
-    }
-
-    var newIssueStats = dbClient.issueDao().aggregateIssueStatsForBranchUuidAndRuleKey(session, branch.getUuid(),
-      issue.ruleKey());
-    int newRating = newIssueStats == null ? oldStats.rating() : newIssueStats.getRating();
-    int newMqrRating = newIssueStats == null ? oldStats.mqrRating() : newIssueStats.getMqrRating();
-
-    return new IssueStats(oldStats.ruleKey(), newIssueCount, newRating, newMqrRating, 0, 0);
-  }
 }