From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Tue, 20 Oct 2015 08:41:46 +0000 (+0200)
Subject: Fix some quality flaw
X-Git-Tag: 5.2-RC3~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F588%2Fhead;p=sonarqube.git

Fix some quality flaw
---

diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RuleMapping.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RuleMapping.java
index b4933b6871e..449c52b7758 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RuleMapping.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RuleMapping.java
@@ -140,6 +140,7 @@ public class RuleMapping extends BaseMapping<RuleDoc, RuleMappingContext> {
     setParams(ruleResponse, ruleDoc, fieldsToReturn);
     setCreatedAt(ruleResponse, ruleDoc, fieldsToReturn);
     setDescriptionFields(ruleResponse, ruleDoc, fieldsToReturn);
+    setNotesFields(ruleResponse, ruleDoc, fieldsToReturn);
     setSeverity(ruleResponse, ruleDoc, fieldsToReturn);
     setInternalKey(ruleResponse, ruleDoc, fieldsToReturn);
     setLanguage(ruleResponse, ruleDoc, fieldsToReturn);
@@ -291,15 +292,18 @@ public class RuleMapping extends BaseMapping<RuleDoc, RuleMappingContext> {
         ruleResponse.setHtmlDesc(macroInterpreter.interpret(ruleDoc.htmlDescription()));
       }
     }
+    if (shouldReturnField(fieldsToReturn, RuleNormalizer.RuleField.MARKDOWN_DESCRIPTION) && ruleDoc.markdownDescription() != null) {
+      ruleResponse.setMdDesc(ruleDoc.markdownDescription());
+    }
+  }
+
+  private void setNotesFields(Rules.Rule.Builder ruleResponse, Rule ruleDoc, Set<String> fieldsToReturn) {
     if (shouldReturnField(fieldsToReturn, "htmlNote") && ruleDoc.markdownNote() != null) {
       ruleResponse.setHtmlNote(macroInterpreter.interpret(Markdown.convertToHtml(ruleDoc.markdownNote())));
     }
     if (shouldReturnField(fieldsToReturn, "mdNote") && ruleDoc.markdownNote() != null) {
       ruleResponse.setMdNote(ruleDoc.markdownNote());
     }
-    if (shouldReturnField(fieldsToReturn, RuleNormalizer.RuleField.MARKDOWN_DESCRIPTION) && ruleDoc.markdownDescription() != null) {
-      ruleResponse.setMdDesc(ruleDoc.markdownDescription());
-    }
     if (shouldReturnField(fieldsToReturn, RuleNormalizer.RuleField.NOTE_LOGIN) && ruleDoc.noteLogin() != null) {
       ruleResponse.setNoteLogin(ruleDoc.noteLogin());
     }