SONAR-15919 Send only rule keys for deactivated rules in RuleSetChanged

2 files changed, 10 insertions, 10 deletions

diff --git a/sonar-core/src/main/java/org/sonar/core/util/RuleSetChangedEvent.java b/sonar-core/src/main/java/org/sonar/core/util/RuleSetChangedEvent.java
index 5f3c3f95982..a37b7633233 100644
--- a/sonar-core/src/main/java/org/sonar/core/util/RuleSetChangedEvent.java
+++ b/sonar-core/src/main/java/org/sonar/core/util/RuleSetChangedEvent.java
@@ -28,16 +28,16 @@ public class RuleSetChangedEvent implements Serializable {
   private final String[] projects;
   private final String language;
   private final RuleChange[] activatedRules;
-  private final RuleChange[] deactivatedRules;
+  private final String[] deactivatedRules;
 
-  public RuleSetChangedEvent(String[] projects, RuleChange[] activatedRules, RuleChange[] deactivatedRules) {
+  public RuleSetChangedEvent(String[] projects, RuleChange[] activatedRules, String[] deactivatedRules, String language) {
     this.projects = projects;
     this.activatedRules = activatedRules;
     this.deactivatedRules = deactivatedRules;
     if (activatedRules.length == 0 && deactivatedRules.length == 0) {
       throw new IllegalArgumentException("Can't create RuleSetChangedEvent without any rules that have changed");
     }
-    this.language = activatedRules.length > 0 ? activatedRules[0].getLanguage() : deactivatedRules[0].getLanguage();
+    this.language = language;
   }
 
   public String getEvent() {
@@ -56,7 +56,7 @@ public class RuleSetChangedEvent implements Serializable {
     return activatedRules;
   }
 
-  public RuleChange[] getDeactivatedRules() {
+  public String[] getDeactivatedRules() {
     return deactivatedRules;
   }
 }
diff --git a/sonar-core/src/test/java/org/sonar/core/util/RuleSetChangedEventTest.java b/sonar-core/src/test/java/org/sonar/core/util/RuleSetChangedEventTest.java
index 637d324ef5b..174788d8c4f 100644
--- a/sonar-core/src/test/java/org/sonar/core/util/RuleSetChangedEventTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/util/RuleSetChangedEventTest.java
@@ -30,8 +30,8 @@ public class RuleSetChangedEventTest {
   public void getLanguage_givenNoDeactivatedRules_languageIsCorrectlyIdentified() {
     String[] projects = {"sonarqube"};
     RuleChange[] activatedRules = {createRuleChange("java")};
-    RuleChange[] deactivatedRules = {};
-    RuleSetChangedEvent event = new RuleSetChangedEvent(projects, activatedRules, deactivatedRules);
+    String[] deactivatedRules = {};
+    RuleSetChangedEvent event = new RuleSetChangedEvent(projects, activatedRules, deactivatedRules, "java");
 
     String language = event.getLanguage();
 
@@ -42,8 +42,8 @@ public class RuleSetChangedEventTest {
   public void getLanguage_givenNoActivatedRules_languageIsCorrectlyIdentified() {
     String[] projects = {"sonarqube"};
     RuleChange[] activatedRules = {};
-    RuleChange[] deactivatedRules = {createRuleChange("java")};
-    RuleSetChangedEvent event = new RuleSetChangedEvent(projects, activatedRules, deactivatedRules);
+    String[] deactivatedRules = {"ruleKey"};
+    RuleSetChangedEvent event = new RuleSetChangedEvent(projects, activatedRules, deactivatedRules, "java");
 
     String language = event.getLanguage();
 
@@ -54,9 +54,9 @@ public class RuleSetChangedEventTest {
   public void getLanguage_givenBothArraysEmpty_throwException() {
     String[] projects = {"sonarqube"};
     RuleChange[] activatedRules = {};
-    RuleChange[] deactivatedRules = {};
+    String[] deactivatedRules = {};
 
-    assertThatThrownBy(() -> new RuleSetChangedEvent(projects, activatedRules, deactivatedRules))
+    assertThatThrownBy(() -> new RuleSetChangedEvent(projects, activatedRules, deactivatedRules, "java"))
       .isInstanceOf(IllegalArgumentException.class);
   }