Fixed inheritance when parent_id is null in DTO

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 4125a220432d08e4474908cd944b569aad66c8aa..5974374eab3d9a7cca2dcc7d15e27d984e2af4c4 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
@@ -243,8 +243,12 @@ public class SearchAction implements RequestHandler {
           .beginObject()
           .prop("key",activeRule.key().toString())
           .prop("inherit", activeRule.inheritance().name())
-          .prop("severity", activeRule.severity())
-          .prop("parent", activeRule.parentKey().toString())
+          .prop("severity", activeRule.severity());
+        if(activeRule.parentKey() != null){
+          json.prop("parent",activeRule.parentKey().toString());
+        }
+
+        json
           .name("params").beginArray();
         for (Map.Entry<String, String> param : activeRule.params().entrySet()) {
           json.beginObject()

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 c5ac8dd3f561054e40c7aa878e9b22998601e5e4..08ecaf0a911564d0dd906d695f06571ee2132ec3 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
@@ -231,7 +231,7 @@ public class RulesWebServiceTest {
 
   private ActiveRuleDto  newActiveRule(QualityProfileDto profile, RuleDto rule) {
     return ActiveRuleDto.createFor(profile, rule)
-      .setInheritance("none")
+      .setInheritance("NONE")
       .setSeverity("BLOCKER");
   }
 }
\ No newline at end of file

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/ws/RulesWebServiceTest/search_active_rules.json b/sonar-server/src/test/resources/org/sonar/server/rule2/ws/RulesWebServiceTest/search_active_rules.json
index 84648237109ab0273507a8f9dbfe33ec534fab55..fc63e918b39c7a1847459984416456c084730d6b 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/ws/RulesWebServiceTest/search_active_rules.json
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/ws/RulesWebServiceTest/search_active_rules.json
@@ -1,4 +1,4 @@
-{"total": 1,"p":1,"ps":25, "rules": [
+{"total": 1, "p": 1, "ps": 25, "rules": [
     {
         "key": "java:S001",
         "repo": "java",
@@ -15,8 +15,7 @@
         "actives": [
             {
                 "key": "My Profile:java:java:S001",
-                "inherit": "none",
-                "override": false,
+                "inherit": "NONE",
                 "severity": "BLOCKER",
                 "params": []
             }

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule2/ws/RulesWebServiceTest/search_active_rules_params.json b/sonar-server/src/test/resources/org/sonar/server/rule2/ws/RulesWebServiceTest/search_active_rules_params.json
index 54584e7cdf4e50f40fde823b413d4b545d26df62..853aac8c4d2f5c640ed144213dd6c24b5cd61636 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule2/ws/RulesWebServiceTest/search_active_rules_params.json
+++ b/sonar-server/src/test/resources/org/sonar/server/rule2/ws/RulesWebServiceTest/search_active_rules_params.json
@@ -21,8 +21,7 @@
         "actives": [
             {
                 "key": "My Profile:java:java:S001",
-                "inherit": "none",
-                "override": false,
+                "inherit": "NONE",
                 "severity": "BLOCKER",
                 "params": [
                     {