diff options
Diffstat (limited to 'server/sonar-server/src')
| -rw-r--r-- | server/sonar-server/src/main/java/org/sonar/server/rule/ws/RuleMapping.java | 10 |
1 files changed, 7 insertions, 3 deletions
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()); } |