SONAR-13291 deprecate 'language' param and remove 'language' field from component ES index

4 files changed, 1 insertions, 18 deletions

diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/component/index/ComponentDoc.java b/server/sonar-server-common/src/main/java/org/sonar/server/component/index/ComponentDoc.java
index 2d34902a550..e0469835334 100644
--- a/server/sonar-server-common/src/main/java/org/sonar/server/component/index/ComponentDoc.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/component/index/ComponentDoc.java
@@ -21,13 +21,10 @@ package org.sonar.server.component.index;
 
 import java.util.HashMap;
 import java.util.Map;
-import javax.annotation.CheckForNull;
-import javax.annotation.Nullable;
 import org.sonar.server.es.BaseDoc;
 import org.sonar.server.permission.index.AuthorizationDoc;
 
 import static org.sonar.server.component.index.ComponentIndexDefinition.FIELD_KEY;
-import static org.sonar.server.component.index.ComponentIndexDefinition.FIELD_LANGUAGE;
 import static org.sonar.server.component.index.ComponentIndexDefinition.FIELD_NAME;
 import static org.sonar.server.component.index.ComponentIndexDefinition.FIELD_ORGANIZATION_UUID;
 import static org.sonar.server.component.index.ComponentIndexDefinition.FIELD_PROJECT_UUID;
@@ -92,16 +89,6 @@ public class ComponentDoc extends BaseDoc {
     return this;
   }
 
-  @CheckForNull
-  public String getLanguage() {
-    return getField(FIELD_LANGUAGE);
-  }
-
-  public ComponentDoc setLanguage(@Nullable String s) {
-    setField(FIELD_LANGUAGE, s);
-    return this;
-  }
-
   public String getOrganization() {
     return getField(FIELD_ORGANIZATION_UUID);
   }
diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/component/index/ComponentIndexDefinition.java b/server/sonar-server-common/src/main/java/org/sonar/server/component/index/ComponentIndexDefinition.java
index 12ef3118426..635d0dc3a8a 100644
--- a/server/sonar-server-common/src/main/java/org/sonar/server/component/index/ComponentIndexDefinition.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/component/index/ComponentIndexDefinition.java
@@ -46,7 +46,6 @@ public class ComponentIndexDefinition implements IndexDefinition {
   public static final String FIELD_KEY = "key";
   public static final String FIELD_NAME = "name";
   public static final String FIELD_QUALIFIER = "qualifier";
-  public static final String FIELD_LANGUAGE = "language";
 
   private static final int DEFAULT_NUMBER_OF_SHARDS = 5;
 
@@ -95,7 +94,6 @@ public class ComponentIndexDefinition implements IndexDefinition {
       .build();
 
     mapping.keywordFieldBuilder(FIELD_QUALIFIER).build();
-    mapping.keywordFieldBuilder(FIELD_LANGUAGE).disableNorms().build();
     mapping.keywordFieldBuilder(FIELD_ORGANIZATION_UUID).disableNorms().build();
   }
 }
diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/component/index/ComponentIndexer.java b/server/sonar-server-common/src/main/java/org/sonar/server/component/index/ComponentIndexer.java
index 1b377567681..8e01790e79e 100644
--- a/server/sonar-server-common/src/main/java/org/sonar/server/component/index/ComponentIndexer.java
+++ b/server/sonar-server-common/src/main/java/org/sonar/server/component/index/ComponentIndexer.java
@@ -183,7 +183,6 @@ public class ComponentIndexer implements ProjectIndexer, NeedAuthorizationIndexe
       .setKey(component.getDbKey())
       .setProjectUuid(component.projectUuid())
       .setOrganization(component.getOrganizationUuid())
-      .setLanguage(component.language())
       .setQualifier(component.qualifier());
   }
 }
diff --git a/server/sonar-server-common/src/test/java/org/sonar/server/component/index/ComponentIndexerTest.java b/server/sonar-server-common/src/test/java/org/sonar/server/component/index/ComponentIndexerTest.java
index 896979d097e..1589043bd0b 100644
--- a/server/sonar-server-common/src/test/java/org/sonar/server/component/index/ComponentIndexerTest.java
+++ b/server/sonar-server-common/src/test/java/org/sonar/server/component/index/ComponentIndexerTest.java
@@ -84,7 +84,7 @@ public class ComponentIndexerTest {
   @Test
   public void map_fields() {
     OrganizationDto organization = db.organizations().insert();
-    ComponentDto project = db.components().insertPrivateProject(organization, p -> p.setLanguage("java"));
+    ComponentDto project = db.components().insertPrivateProject(organization);
 
     underTest.indexOnStartup(emptySet());
 
@@ -94,7 +94,6 @@ public class ComponentIndexerTest {
     assertThat(doc.getKey()).isEqualTo(project.getDbKey());
     assertThat(doc.getProjectUuid()).isEqualTo(project.projectUuid());
     assertThat(doc.getName()).isEqualTo(project.name());
-    assertThat(doc.getLanguage()).isEqualTo(project.language());
     assertThat(doc.getOrganization()).isEqualTo(project.getOrganizationUuid());
   }