SONAR-26305 Fix invalid UUID string bug

Author: cody-simms-sonarsource

gradle.properties

@@ -6,7 +6,7 @@ version=25.12
 # No change required for patch versions
 versionEOL=2026-06-08
 pdfreportVersion=2.0.0.325
-complianceReportsVersion=0.0.1.2243
+complianceReportsVersion=0.0.1.2263
 pluginApiVersion=13.4.0.3221
 description=Open source platform for continuous inspection of code quality
 projectTitle=SonarQube

server/sonar-ce-task-projectanalysis/src/main/java/org/sonar/ce/task/projectanalysis/step/IssueStatsIndexer.java

@@ -20,14 +20,16 @@
 package org.sonar.ce.task.projectanalysis.step;
 
 import com.google.common.annotations.VisibleForTesting;
+import io.sonarcloud.compliancereports.dao.AggregationType;
 import io.sonarcloud.compliancereports.ingestion.IssueFromAnalysis;
 import io.sonarcloud.compliancereports.ingestion.IssueIngestionService;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.UUID;
 import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.sonar.db.DbClient;
 import org.sonar.db.DbSession;
 import org.sonar.db.report.IssueStatsByRuleKeyDaoImpl;
@@ -41,6 +43,8 @@
 import static org.sonar.core.rule.RuleType.SECURITY_HOTSPOT;
 
 public class IssueStatsIndexer implements AnalysisIndexer {
+  private static final Logger LOGGER = LoggerFactory.getLogger(IssueStatsIndexer.class);
+
   private final IssueIteratorFactory issueIteratorFactory;
   private final DbClient dbClient;
 
@@ -61,8 +65,10 @@ public void indexOnAnalysis(String branchUuid) {
       try (var dbSession = dbClient.openSession(false)) {
         var issuesForIngestion = transformToRepositoryRuleIssuesDtos(issuesWithRuleUuids, dbSession);
         IssueIngestionService issueIngestionService = new IssueIngestionService(new IssueStatsByRuleKeyDaoImpl(dbSession));
-        issueIngestionService.ingest(UUID.fromString(branchUuid), issuesForIngestion);
+        issueIngestionService.ingest(branchUuid, AggregationType.PROJECT, issuesForIngestion);
         dbSession.commit();
+      } catch (Exception e) {
+        LOGGER.warn("Error ingesting issues for compliance reports", e);
       }
     }
   }

server/sonar-db-dao/src/it/java/org/sonar/db/report/IssueStatsByRuleKeyDaoImplIT.java

@@ -19,6 +19,7 @@
  */
 package org.sonar.db.report;
 
+import io.sonarcloud.compliancereports.dao.AggregationType;
 import io.sonarcloud.compliancereports.dao.IssueStats;
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -29,7 +30,6 @@
 import org.sonar.api.utils.System2;
 import org.sonar.db.DbTester;
 
-import static java.util.UUID.fromString;
 import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
 
 
@@ -46,7 +46,7 @@ void shouldGetIssuesByAggregationId() {
       insertSampleIssueStats(sqlSession);
       session.commit();
 
-      var results = underTest.getIssueStatsForProject(fromString("b728478a-470f-4cb2-8a19-9302632e049f"));
+      var results = underTest.getIssueStats("b728478a-470f-4cb2-8a19-9302632e049f", AggregationType.PROJECT);
       assertThat(results).hasSize(2);
       assertThat(results)
         .anySatisfy(issueStats -> {
@@ -75,7 +75,7 @@ void shouldInsertIssueStatsForProject() throws SQLException {
       new IssueStats("githubactions:S7640", 3, 3, 1, 1)
     );
 
-    underTest.insertIssueStatsForProject(fromString("b728478a-470f-4cb2-8a19-9302632e049f"), issueStatsList);
+    underTest.insertIssueStats("b728478a-470f-4cb2-8a19-9302632e049f", AggregationType.PROJECT, issueStatsList);
 
     try (var session = db.getSession().getSqlSession(); var sqlSession = session.getConnection()) {
       var resultSet = sqlSession.prepareStatement(
@@ -120,7 +120,7 @@ void shouldDeleteAllIssueStatsForProject() throws SQLException {
       insertSampleIssueStats(sqlSession);
       session.commit();
 
-      underTest.deleteAllIssueStatsForProject(fromString("b728478a-470f-4cb2-8a19-9302632e049f"));
+      underTest.deleteAllIssueStats("b728478a-470f-4cb2-8a19-9302632e049f", AggregationType.PROJECT);
 
       var resultSet = sqlSession.prepareStatement(
         "SELECT COUNT(*) AS total " +

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

@@ -19,6 +19,7 @@
  */
 package org.sonar.db.report;
 
+import io.sonarcloud.compliancereports.dao.AggregationType;
 import io.sonarcloud.compliancereports.dao.IssueStats;
 import io.sonarcloud.compliancereports.dao.IssueStatsByRuleKeyDao;
 import java.util.List;
@@ -34,17 +35,17 @@ public IssueStatsByRuleKeyDaoImpl(DbSession dbSession) {
   }
 
   @Override
-  public List<IssueStats> getIssueStatsForProject(UUID uuid) {
+  public List<IssueStats> getIssueStats(String uuid, AggregationType aggregationType) {
     return mapper(dbSession).selectByAggregationId(String.valueOf(uuid));
   }
 
   @Override
-  public void insertIssueStatsForProject(UUID aggregationId, List<IssueStats> list) {
+  public void insertIssueStats(String aggregationId, AggregationType aggregationType, List<IssueStats> list) {
     mapper(dbSession).insertIssueStatsForProject(String.valueOf(aggregationId), list);
   }
 
   @Override
-  public void deleteAllIssueStatsForProject(UUID uuid) {
+  public void deleteAllIssueStats(String uuid, AggregationType aggregationType) {
     mapper(dbSession).deleteAllIssueStatsForProject(String.valueOf(uuid));
   }