From f1aa867803fcde98aba1f27865d70d5ff6e6b50d Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Thu, 13 Mar 2014 18:03:36 +0100
Subject: [PATCH] SONAR-926 drop the language criterion on measure filters

---
 .../java/org/sonar/core/measure/MeasureFilter.java    | 10 ----------
 .../org/sonar/core/measure/MeasureFilterFactory.java  |  1 -
 .../java/org/sonar/core/measure/MeasureFilterSql.java |  4 ----
 .../sonar/core/measure/MeasureFilterExecutorTest.java | 11 -----------
 4 files changed, 26 deletions(-)

diff --git a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilter.java b/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilter.java
index 535e07e61a9..4bed3ca31d1 100644
--- a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilter.java
+++ b/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilter.java
@@ -43,7 +43,6 @@ public class MeasureFilter {
 
   private List<String> resourceScopes = Collections.emptyList();
   private List<String> resourceQualifiers = Collections.emptyList();
-  private List<String> resourceLanguages = Collections.emptyList();
   private String resourceKey = null;
   private String resourceName = null;
   private Date fromDate = null, toDate = null;
@@ -89,11 +88,6 @@ public class MeasureFilter {
     return this;
   }
 
-  public MeasureFilter setResourceLanguages(@Nullable List<String> list) {
-    this.resourceLanguages = sanitize(list);
-    return this;
-  }
-
   public MeasureFilter setUserFavourites(boolean b) {
     this.userFavourites = b;
     return this;
@@ -173,10 +167,6 @@ public class MeasureFilter {
     return resourceQualifiers;
   }
 
-  public List<String> getResourceLanguages() {
-    return resourceLanguages;
-  }
-
   public List<MeasureFilterCondition> getMeasureConditions() {
     return measureConditions;
   }
diff --git a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterFactory.java b/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterFactory.java
index 6e0e9511ce1..3f3c9e0fa05 100644
--- a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterFactory.java
+++ b/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterFactory.java
@@ -48,7 +48,6 @@ public class MeasureFilterFactory implements ServerComponent {
     filter.setBaseResourceKey((String) properties.get("base"));
     filter.setResourceScopes(toList(properties.get("scopes")));
     filter.setResourceQualifiers(toList(properties.get("qualifiers")));
-    filter.setResourceLanguages(toList(properties.get("languages")));
     MeasureFilterCondition condition = alertToCondition(toList(properties.get("alertLevels")));
     if (condition != null) {
       filter.addCondition(condition);
diff --git a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterSql.java b/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterSql.java
index a7836ed3816..d8e8052d05e 100644
--- a/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterSql.java
+++ b/sonar-core/src/main/java/org/sonar/core/measure/MeasureFilterSql.java
@@ -120,10 +120,6 @@ class MeasureFilterSql {
       sb.append(" AND s.scope IN ");
       appendInStatement(filter.getResourceScopes(), sb);
     }
-    if (!filter.getResourceLanguages().isEmpty()) {
-      sb.append(" AND p.language IN ");
-      appendInStatement(filter.getResourceLanguages(), sb);
-    }
     appendDateConditions(sb);
     appendFavouritesCondition(sb);
     appendResourceNameCondition(sb);
diff --git a/sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterExecutorTest.java b/sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterExecutorTest.java
index 542b07f7577..b2847c18ba7 100644
--- a/sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterExecutorTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/measure/MeasureFilterExecutorTest.java
@@ -132,7 +132,6 @@ public class MeasureFilterExecutorTest {
     db.prepareDbUnit(getClass(), "shared.xml");
     MeasureFilter filter = new MeasureFilter()
       .setResourceQualifiers(Arrays.asList("'"))
-      .setResourceLanguages(Arrays.asList("'"))
       .setBaseResourceKey("'")
       .setResourceKey("'")
       .setResourceName("'")
@@ -428,16 +427,6 @@ public class MeasureFilterExecutorTest {
     verifyJavaTinyFile(rows.get(0));
   }
 
-  @Test
-  public void filter_by_language() throws SQLException {
-    db.prepareDbUnit(getClass(), "shared.xml");
-    MeasureFilter filter = new MeasureFilter().setResourceQualifiers(Arrays.asList("TRK")).setResourceLanguages(Arrays.asList("java", "cobol"));
-    List<MeasureFilterRow> rows = executor.execute(filter, new MeasureFilterContext());
-
-    assertThat(rows).hasSize(1);
-    verifyJavaProject(rows.get(0));
-  }
-
   @Test
   public void filter_by_min_date() throws SQLException {
     db.prepareDbUnit(getClass(), "shared.xml");
-- 
2.39.5