From 07495e3b383c91a39543a802ac95378cbd8e4c7c Mon Sep 17 00:00:00 2001
From: Zipeng WU <zipeng.wu@sonarsource.com>
Date: Wed, 11 May 2022 11:31:42 +0200
Subject: [PATCH] SONAR-16364 fix rule desciption section with no mapping title

---
 .../org/sonar/server/rule/RuleDescriptionFormatter.java   | 7 ++-----
 .../sonar/server/rule/RuleDescriptionFormatterTest.java   | 8 ++++++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/rule/RuleDescriptionFormatter.java b/server/sonar-server-common/src/main/java/org/sonar/server/rule/RuleDescriptionFormatter.java
index 39107e39de4..f44a1108f2a 100644
--- a/server/sonar-server-common/src/main/java/org/sonar/server/rule/RuleDescriptionFormatter.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/rule/RuleDescriptionFormatter.java
@@ -90,11 +90,8 @@ public class RuleDescriptionFormatter {
     var builder = new StringBuilder();
     for (String sectionKey : SECTION_KEYS) {
       if (sectionKeyToHtml.containsKey(sectionKey)) {
-        builder.append("<h2>")
-          .append(titleMapping.get(sectionKey))
-          .append("</h2>")
-          .append(sectionKeyToHtml.get(sectionKey))
-          .append("<br/>");
+        Optional.ofNullable(titleMapping.get(sectionKey)).ifPresent(title -> builder.append("<h2>").append(title).append("</h2>"));
+        builder.append(sectionKeyToHtml.get(sectionKey)).append("<br/>");
       }
     }
     return builder.toString();
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/rule/RuleDescriptionFormatterTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/rule/RuleDescriptionFormatterTest.java
index b0aaeb8a38f..0a14950681e 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/rule/RuleDescriptionFormatterTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/rule/RuleDescriptionFormatterTest.java
@@ -27,6 +27,7 @@ import org.sonar.db.rule.RuleDto;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.sonar.api.server.rule.RuleDescriptionSection.RuleDescriptionSectionKeys.ASSESS_THE_PROBLEM_SECTION_KEY;
 import static org.sonar.api.server.rule.RuleDescriptionSection.RuleDescriptionSectionKeys.HOW_TO_FIX_SECTION_KEY;
+import static org.sonar.api.server.rule.RuleDescriptionSection.RuleDescriptionSectionKeys.INTRODUCTION_SECTION_KEY;
 import static org.sonar.api.server.rule.RuleDescriptionSection.RuleDescriptionSectionKeys.ROOT_CAUSE_SECTION_KEY;
 import static org.sonar.db.rule.RuleDescriptionSectionDto.createDefaultRuleDescriptionSection;
 
@@ -55,15 +56,18 @@ public class RuleDescriptionFormatterTest {
     var section1 = createRuleDescriptionSection(ROOT_CAUSE_SECTION_KEY, "<div>Root is Root</div>");
     var section2 = createRuleDescriptionSection(ASSESS_THE_PROBLEM_SECTION_KEY, "<div>This is not a problem</div>");
     var section3 = createRuleDescriptionSection(HOW_TO_FIX_SECTION_KEY, "<div>I don't want to fix</div>");
+    var section4 = createRuleDescriptionSection(INTRODUCTION_SECTION_KEY, "<div>Introduction with no title</div>");
     RuleDto rule = new RuleDto().setDescriptionFormat(RuleDto.Format.HTML)
       .setType(RuleType.SECURITY_HOTSPOT)
       .addRuleDescriptionSectionDto(section1)
       .addRuleDescriptionSectionDto(section2)
-      .addRuleDescriptionSectionDto(section3);
+      .addRuleDescriptionSectionDto(section3)
+      .addRuleDescriptionSectionDto(section4);
     String html = ruleDescriptionFormatter.getDescriptionAsHtml(rule);
     assertThat(html)
       .contains(
-        "<h2>What is the risk?</h2>"
+        "<div>Introduction with no title</div><br/>"
+          + "<h2>What is the risk?</h2>"
           + "<div>Root is Root</div><br/>"
           + "<h2>Assess the risk</h2>"
           + "<div>This is not a problem</div><br/>"
-- 
2.39.5