SONAR-5007 - Fixed notes in WS and added Medium Test

diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/index/RuleIndex.java b/sonar-server/src/main/java/org/sonar/server/rule2/index/RuleIndex.java
index 05a28ea0748f59a4c3836a0674b601a28541b3b1..5f66ed3b49bb50484ebd303e71982e318ba721e4 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/rule2/index/RuleIndex.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule2/index/RuleIndex.java
@@ -331,11 +331,8 @@ public class RuleIndex extends BaseIndex<Rule, RuleDto, RuleKey> {
 
     esSearch.setQuery(QueryBuilders.filteredQuery(qb, fb));
 
-    System.out.println("esSearch = " + esSearch);
-
     SearchResponse esResult = esSearch.get();
 
-    System.out.println("esResult = " + esResult);
     return new RuleResult(esResult);
   }
 

diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/ws/SearchAction.java b/sonar-server/src/main/java/org/sonar/server/rule2/ws/SearchAction.java
index f69a612fab5dfb6d8f4fcb11a2f599d7bba4cb1a..57229830ab03ffcacf1804eda8e208c421afaef5 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/rule2/ws/SearchAction.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule2/ws/SearchAction.java
@@ -234,6 +234,8 @@ public class SearchAction implements RequestHandler {
         .prop("template", rule.template())
         .prop("internalKey", rule.internalKey())
         .prop("severity", rule.severity())
+        .prop("markdownNote", rule.markdownNote())
+        .prop("noteLogin", rule.noteLogin())
         .name("tags").beginArray().values(rule.tags()).endArray()
         .name("sysTags").beginArray().values(rule.systemTags()).endArray();
       if(rule.debtSubCharacteristicKey() != null && !rule.debtSubCharacteristicKey().isEmpty()){

diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/ws/ShowAction.java b/sonar-server/src/main/java/org/sonar/server/rule2/ws/ShowAction.java
index 1a41da1d485af7e12a9905218fcb79909d15ac5d..9c14cf541e495865509f0a0f2238030cd96d30c8 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/rule2/ws/ShowAction.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule2/ws/ShowAction.java
@@ -79,6 +79,8 @@ public class ShowAction implements RequestHandler {
       .prop("template", rule.template())
       .prop("internalKey", rule.internalKey())
       .prop("severity", rule.severity().toString())
+      .prop("markdownNote", rule.markdownNote())
+      .prop("noteLogin", rule.noteLogin())
       .name("tags").beginArray().values(rule.tags()).endArray()
       .name("sysTags").beginArray().values(rule.systemTags()).endArray();
     json.name("params").beginArray();

diff --git a/sonar-server/src/test/java/org/sonar/server/rule2/ws/RulesWebServiceTest.java b/sonar-server/src/test/java/org/sonar/server/rule2/ws/RulesWebServiceTest.java
index ebf47ae0f13d793c7562da25fe38a11ed9081973..fbbd74652f5746d0ca58e32b8eac3ded23b0a7cd 100644 (file)
--- a/sonar-server/src/test/java/org/sonar/server/rule2/ws/RulesWebServiceTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/rule2/ws/RulesWebServiceTest.java
@@ -42,7 +42,6 @@ import org.sonar.core.rule.RuleDto;
 import org.sonar.core.rule.RuleParamDto;
 import org.sonar.server.qualityprofile.persistence.ActiveRuleDao;
 import org.sonar.server.rule2.RuleService;
-import org.sonar.server.rule2.index.RuleNormalizer;
 import org.sonar.server.rule2.persistence.RuleDao;
 import org.sonar.server.tester.ServerTester;
 import org.sonar.server.user.MockUserSession;
@@ -310,22 +309,18 @@ public class RulesWebServiceTest {
       .setNoteData("Note1");
     ruleDao.insert(rule,  session);
 
-    RuleDto rule2 = newRuleDto(RuleKey.of(profile.getLanguage(), "S002"))
-      .setNoteData("Note2");
-    ruleDao.insert(rule2,  session);
-
     session.commit();
     tester.get(RuleService.class).refresh();
 
 
     MockUserSession.set();
     WsTester.TestRequest request = wsTester.newGetRequest("api/rules", "search");
-    request.setParam("f", RuleNormalizer.RuleField.NOTE.key());
     WsTester.Result result = request.execute();
 
     System.out.println("result.outputAsString() = " + result.outputAsString());
-    
-    result.assertJson(this.getClass(),"get_tags.json");
+
+
+    result.assertJson(this.getClass(),"get_notes.json");
   }
 
 

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/ws/RulesWebServiceTest/get_notes.json b/sonar-server/src/test/resources/org/sonar/server/rule2/ws/RulesWebServiceTest/get_notes.json
new file mode 100644 (file)
index 0000000..13083db
--- /dev/null
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/ws/RulesWebServiceTest/get_notes.json
@@ -0,0 +1,26 @@
+{
+    "p": 1,
+    "ps": 25,
+    "rules": [
+        {
+            "actives": [],
+            "debtRemediationFunctionCoefficient": "1h",
+            "debtRemediationFunctionOffset": "5min",
+            "debtRemediationFunctionType": "LINEAR",
+            "htmlDesc": "Description S001",
+            "internalKey": "InternalKeyS001",
+            "key": "java:S001",
+            "lang": "js",
+            "markdownNote": "Note1",
+            "name": "Rule S001",
+            "params": [],
+            "repo": "java",
+            "severity": "INFO",
+            "status": "READY",
+            "sysTags": [],
+            "tags": [],
+            "template": false
+        }
+    ],
+    "total": 1
+}