SONAR-23343 Add impacts to regulatory report

diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/rule/RuleMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/rule/RuleMapper.xml
index 41373d9c5a84cf2b007b152dd58b5c86ecd977db..d6350ed21077043b5a77ed1b8b216813776816b6 100644 (file)
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/rule/RuleMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/rule/RuleMapper.xml
@@ -114,6 +114,14 @@
     </collection>
   </resultMap>
 
+  <resultMap id="ruleResultMapImpactsOnly" type="org.sonar.db.rule.RuleDto" autoMapping="true">
+    <id property="uuid" column="r_uuid"/>
+    <collection property="defaultImpacts" column="rdi_softwareQuality" notNullColumn="rdi_softwareQuality" javaType="java.util.Set" ofType="Impact">
+     <result property="softwareQuality" column="rdi_softwareQuality"/>
+     <result property="severity" column="rdi_severity"/>
+    </collection>
+  </resultMap>
+
   <select id="selectEnabled" resultMap="ruleResultMap">
     select
       <include refid="selectJoinedTablesColumns"/>
@@ -256,13 +264,17 @@
     order by r.uuid
   </select>
 
-  <select id="selectByLanguage" parameterType="String" resultType="org.sonar.db.rule.RuleDto" fetchSize="${_scrollFetchSize}"
+  <select id="selectByLanguage" parameterType="String" resultMap="ruleResultMapImpactsOnly" fetchSize="${_scrollFetchSize}"
           resultSetType="FORWARD_ONLY">
     select
-      r.uuid as uuid,
+      rdi.rule_uuid as "rdi_ruleUuid",
+      rdi.software_quality as "rdi_softwareQuality",
+      rdi.severity as "rdi_severity",
+      r.uuid as r_uuid,
       <include refid="ruleColumns"/>
     from
       rules r
+    <include refid="leftOuterJoinRulesDefaultImpacts"/>
     where
       <include refid="conditionNotExternalRulesByLanguage" />
   </select>

diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileComparison.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileComparison.java
index 42464c303e27470ec2b1b51bb95349b05b720384..6f1444f770e2c3c366033f6c6a4674bee91336a9 100644 (file)
--- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileComparison.java
+++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileComparison.java
@@ -99,7 +99,7 @@ public class QProfileComparison {
     }
   }
 
-  private static Map<SoftwareQuality, Severity> computeEffectiveImpactMap(RuleDto ruleDto, Map<SoftwareQuality, Severity> activeRuleImpacts) {
+  public static Map<SoftwareQuality, Severity> computeEffectiveImpactMap(RuleDto ruleDto, Map<SoftwareQuality, Severity> activeRuleImpacts) {
     Map<SoftwareQuality, Severity> impacts = ruleDto.getDefaultImpactsMap();
     impacts.replaceAll(activeRuleImpacts::getOrDefault);
     return impacts;