SONAR-10313 remove rule key and repo from rules.activeRule index

diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleDoc.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleDoc.java
index 464d3f13531a17c67cfd09da316afe91e369d781..0d1d03f7f151d7d90e934a9d66e037cde2a241b9 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleDoc.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleDoc.java
@@ -22,7 +22,6 @@ package org.sonar.server.qualityprofile.index;
 import com.google.common.collect.Maps;
 import java.util.Map;
 import javax.annotation.Nullable;
-import org.sonar.api.rule.RuleKey;
 import org.sonar.server.es.BaseDoc;
 import org.sonar.server.qualityprofile.ActiveRule;
 
@@ -30,9 +29,7 @@ import static org.apache.commons.lang.StringUtils.containsIgnoreCase;
 import static org.sonar.server.rule.index.RuleIndexDefinition.FIELD_ACTIVE_RULE_ID;
 import static org.sonar.server.rule.index.RuleIndexDefinition.FIELD_ACTIVE_RULE_INHERITANCE;
 import static org.sonar.server.rule.index.RuleIndexDefinition.FIELD_ACTIVE_RULE_PROFILE_UUID;
-import static org.sonar.server.rule.index.RuleIndexDefinition.FIELD_ACTIVE_RULE_REPOSITORY;
 import static org.sonar.server.rule.index.RuleIndexDefinition.FIELD_ACTIVE_RULE_RULE_ID;
-import static org.sonar.server.rule.index.RuleIndexDefinition.FIELD_ACTIVE_RULE_RULE_KEY;
 import static org.sonar.server.rule.index.RuleIndexDefinition.FIELD_ACTIVE_RULE_SEVERITY;
 
 public class ActiveRuleDoc extends BaseDoc {
@@ -61,24 +58,6 @@ public class ActiveRuleDoc extends BaseDoc {
     return getRuleIdAsString();
   }
 
-  RuleKey getRuleKey() {
-    return RuleKey.parse(getRuleKeyAsString());
-  }
-
-  private String getRuleKeyAsString() {
-    return getField(FIELD_ACTIVE_RULE_RULE_KEY);
-  }
-
-  String getRuleRepository() {
-    return getField(FIELD_ACTIVE_RULE_REPOSITORY);
-  }
-
-  ActiveRuleDoc setRuleKey(RuleKey ruleKey) {
-    setField(FIELD_ACTIVE_RULE_RULE_KEY, ruleKey.toString());
-    setField(FIELD_ACTIVE_RULE_REPOSITORY, ruleKey.repository());
-    return this;
-  }
-
   private String getRuleIdAsString() {
     return getField(FIELD_ACTIVE_RULE_RULE_ID);
   }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleIndexer.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleIndexer.java
index 09858a14e25248ff706f6b366422ea5e3f37b7f9..a24afa09b560c812eefbef7cd476449965fc8f02 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleIndexer.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/index/ActiveRuleIndexer.java
@@ -29,7 +29,6 @@ import javax.annotation.Nullable;
 import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
-import org.sonar.api.rule.RuleKey;
 import org.sonar.api.utils.log.Logger;
 import org.sonar.api.utils.log.Loggers;
 import org.sonar.db.DbClient;
@@ -210,8 +209,7 @@ public class ActiveRuleIndexer implements ResilientIndexer {
     ActiveRuleDoc doc = new ActiveRuleDoc(dto.getId())
       .setRuleId(dto.getRuleId())
       .setRuleProfileUuid(dto.getRuleProfileUuid())
-      .setSeverity(SeverityUtil.getSeverityFromOrdinal(dto.getSeverity()))
-      .setRuleKey(RuleKey.of(dto.getRepository(), dto.getKey()));
+      .setSeverity(SeverityUtil.getSeverityFromOrdinal(dto.getSeverity()));
     // all the fields must be present, even if value is null
     String inheritance = dto.getInheritance();
     doc.setInheritance(inheritance == null ? ActiveRule.Inheritance.NONE.name() : inheritance);

diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndexDefinition.java b/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndexDefinition.java
index a2d78d521cfc72596c9ff8c0258eb1857638ee3f..a25e207e35b9f0dd09a4c3c65d841e162b9c43ca 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndexDefinition.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/rule/index/RuleIndexDefinition.java
@@ -75,11 +75,9 @@ public class RuleIndexDefinition implements IndexDefinition {
   public static final IndexType INDEX_TYPE_ACTIVE_RULE = new IndexType(INDEX, "activeRule");
   public static final String FIELD_ACTIVE_RULE_ID = "id";
   public static final String FIELD_ACTIVE_RULE_RULE_ID = "ruleId";
-  public static final String FIELD_ACTIVE_RULE_REPOSITORY = "repo";
   public static final String FIELD_ACTIVE_RULE_INHERITANCE = "inheritance";
   public static final String FIELD_ACTIVE_RULE_PROFILE_UUID = "ruleProfile";
   public static final String FIELD_ACTIVE_RULE_SEVERITY = "severity";
-  public static final String FIELD_ACTIVE_RULE_RULE_KEY = "ruleKey";
 
   private final Configuration config;
   private final boolean enableSource;
@@ -121,8 +119,6 @@ public class RuleIndexDefinition implements IndexDefinition {
 
     activeRuleMapping.keywordFieldBuilder(FIELD_ACTIVE_RULE_ID).disableNorms().build();
     activeRuleMapping.keywordFieldBuilder(FIELD_ACTIVE_RULE_RULE_ID).disableNorms().build();
-    activeRuleMapping.keywordFieldBuilder(FIELD_ACTIVE_RULE_RULE_KEY).addSubFields(SORTABLE_ANALYZER).build();
-    activeRuleMapping.keywordFieldBuilder(FIELD_ACTIVE_RULE_REPOSITORY).build();
     activeRuleMapping.keywordFieldBuilder(FIELD_ACTIVE_RULE_PROFILE_UUID).disableNorms().build();
     activeRuleMapping.keywordFieldBuilder(FIELD_ACTIVE_RULE_INHERITANCE).disableNorms().build();
     activeRuleMapping.keywordFieldBuilder(FIELD_ACTIVE_RULE_SEVERITY).disableNorms().build();

diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/index/ActiveRuleIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/index/ActiveRuleIndexerTest.java
index c584990314950b7efa7f012f4679d46aaab1e4fc..fff22e50be24c1e2bfdc63c638a2ecb4c885d63d 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/index/ActiveRuleIndexerTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/index/ActiveRuleIndexerTest.java
@@ -92,7 +92,7 @@ public class ActiveRuleIndexerTest {
 
     List<ActiveRuleDoc> docs = es.getDocuments(INDEX_TYPE_ACTIVE_RULE, ActiveRuleDoc.class);
     assertThat(docs).hasSize(1);
-    verify(docs.get(0), rule1, profile1, activeRule);
+    verify(docs.get(0), profile1, activeRule);
     assertThatEsQueueTableIsEmpty();
   }
 
@@ -202,12 +202,10 @@ public class ActiveRuleIndexerTest {
     }
   }
 
-  private void verify(ActiveRuleDoc doc1, RuleDefinitionDto rule, QProfileDto profile, ActiveRuleDto activeRule) {
+  private void verify(ActiveRuleDoc doc1, QProfileDto profile, ActiveRuleDto activeRule) {
     assertThat(doc1)
-      .matches(doc -> doc.getRuleKey().equals(rule.getKey()))
       .matches(doc -> doc.getId().equals("" + activeRule.getId()))
       .matches(doc -> doc.getRuleProfileUuid().equals(profile.getRulesProfileUuid()))
-      .matches(doc -> doc.getRuleRepository().equals(rule.getRepositoryKey()))
       .matches(doc -> doc.getSeverity().equals(activeRule.getSeverityString()));
   }