diff options
author | Julien Lancelot <julien.lancelot@sonarsource.com> | 2016-05-12 17:50:13 +0200 |
---|---|---|
committer | Julien Lancelot <julien.lancelot@sonarsource.com> | 2016-05-16 12:08:18 +0200 |
commit | 4e75d5f0cb8454951d2c3d7a0fe30c00cb816415 (patch) | |
tree | 1556c7722cfc02290746aeb6036d393d68efe4f7 /server/sonar-server | |
parent | e9d01329ece74fc444fdc01689e2833f691063d9 (diff) | |
download | sonarqube-4e75d5f0cb8454951d2c3d7a0fe30c00cb816415.tar.gz sonarqube-4e75d5f0cb8454951d2c3d7a0fe30c00cb816415.zip |
SONAR-7400 Do not return anymore active rule parent key in rules WS
Diffstat (limited to 'server/sonar-server')
2 files changed, 0 insertions, 10 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/ActiveRuleCompleter.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/ActiveRuleCompleter.java index aec0e902e4e..88608db09c8 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/ActiveRuleCompleter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/ActiveRuleCompleter.java @@ -165,10 +165,6 @@ public class ActiveRuleCompleter { activeRuleResponse.setQProfile(activeRule.key().qProfile()); activeRuleResponse.setInherit(activeRule.inheritance().toString()); activeRuleResponse.setSeverity(activeRule.severity()); - ActiveRuleKey parentKey = activeRule.parentKey(); - if (parentKey != null) { - activeRuleResponse.setParent(parentKey.toString()); - } Rules.Active.Param.Builder paramBuilder = Rules.Active.Param.newBuilder(); for (ActiveRuleParamDto parameter : parameters) { activeRuleResponse.addParams(paramBuilder.clear() diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/index/ActiveRuleResultSetIteratorTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/index/ActiveRuleResultSetIteratorTest.java index 354db25ad5a..cdce8f33cce 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/index/ActiveRuleResultSetIteratorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/index/ActiveRuleResultSetIteratorTest.java @@ -63,7 +63,6 @@ public class ActiveRuleResultSetIteratorTest { assertThat(activeRule.key()).isEqualTo(key); assertThat(activeRule.severity()).isEqualTo(CRITICAL); assertThat(activeRule.inheritance()).isEqualTo(ActiveRule.Inheritance.NONE); - assertThat(activeRule.parentKey()).isNull(); assertThat(activeRule.createdAt()).isEqualTo(1500000000000L); assertThat(activeRule.updatedAt()).isEqualTo(1600000000000L); } @@ -82,7 +81,6 @@ public class ActiveRuleResultSetIteratorTest { assertThat(activeRule.key()).isEqualTo(key); assertThat(activeRule.severity()).isEqualTo(CRITICAL); assertThat(activeRule.inheritance()).isEqualTo(ActiveRule.Inheritance.NONE); - assertThat(activeRule.parentKey()).isNull(); assertThat(activeRule.createdAt()).isEqualTo(2000000000000L); assertThat(activeRule.updatedAt()).isEqualTo(2100000000000L); @@ -91,7 +89,6 @@ public class ActiveRuleResultSetIteratorTest { assertThat(activeRule.key()).isEqualTo(key); assertThat(activeRule.severity()).isEqualTo(INFO); assertThat(activeRule.inheritance()).isEqualTo(ActiveRule.Inheritance.NONE); - assertThat(activeRule.parentKey()).isNull(); assertThat(activeRule.createdAt()).isEqualTo(1700000000000L); assertThat(activeRule.updatedAt()).isEqualTo(1800000000000L); @@ -100,7 +97,6 @@ public class ActiveRuleResultSetIteratorTest { assertThat(activeRule.key()).isEqualTo(key); assertThat(activeRule.severity()).isEqualTo(BLOCKER); assertThat(activeRule.inheritance()).isEqualTo(INHERITED); - assertThat(activeRule.parentKey()).isEqualTo(ActiveRuleKey.of("parent", RuleKey.of("xoo", "S001"))); assertThat(activeRule.createdAt()).isEqualTo(1500000000000L); assertThat(activeRule.updatedAt()).isEqualTo(1600000000000L); } @@ -117,7 +113,6 @@ public class ActiveRuleResultSetIteratorTest { ActiveRuleKey key = ActiveRuleKey.of("child", RuleKey.of("xoo", "S001")); ActiveRuleDoc activeRule = activeRulesByKey.get(key); assertThat(activeRule.inheritance()).isEqualTo(INHERITED); - assertThat(activeRule.parentKey()).isEqualTo(ActiveRuleKey.of("parent", RuleKey.of("xoo", "S001"))); } @Test @@ -132,7 +127,6 @@ public class ActiveRuleResultSetIteratorTest { ActiveRuleKey key = ActiveRuleKey.of("child", RuleKey.of("xoo", "S001")); ActiveRuleDoc activeRule = activeRulesByKey.get(key); assertThat(activeRule.inheritance()).isEqualTo(ActiveRule.Inheritance.OVERRIDES); - assertThat(activeRule.parentKey()).isEqualTo(ActiveRuleKey.of("parent", RuleKey.of("xoo", "S001"))); } @Test |