SONAR-5142 drop search of components by language

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/resources_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/resources_controller.rb
index 82c884dfa8739da3dba6c6e9bb02bf3220f0dc27..b05b65e6cff967f2b792799491d695fdd18597f1 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/resources_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/resources_controller.rb
@@ -225,12 +225,6 @@ class Api::ResourcesController < Api::ApiController
         snapshots_conditions << 'projects.qualifier in (:qualifiers)'
       end
 
-      # since version 3.4
-      if params['languages']
-        snapshots_conditions << 'projects.language in (:languages)'
-        snapshots_values[:languages]=params['languages'].split(',')
-      end
-
       snapshots_including_resource=Snapshot.all(:conditions => [snapshots_conditions.join(' AND '), snapshots_values], :include => 'project')
 
       # ---------- APPLY SECURITY - remove unauthorized resources - only if no selected resource

diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/services/ResourceQuery.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/services/ResourceQuery.java
index a6ea0cbbf33df891f3d9f0b233419577bb1ac6a6..2d06ec99efcae3f83d1273ba5abfbe9212674ea5 100644 (file)
--- a/sonar-ws-client/src/main/java/org/sonar/wsclient/services/ResourceQuery.java
+++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/services/ResourceQuery.java
@@ -34,7 +34,6 @@ public class ResourceQuery extends Query<Resource> {
   private String[] rules;
   private String[] ruleSeverities;
   private String[] characteristicKeys;
-  private String[] languages;
   private boolean excludeRules = true;
   private boolean excludeRuleSeverities = true;
   private Boolean includeTrends = null;
@@ -130,15 +129,6 @@ public class ResourceQuery extends Query<Resource> {
     return this;
   }
 
-  public String[] getLanguages() {
-    return languages;
-  }
-
-  public ResourceQuery setLanguages(String... languages) {
-    this.languages = languages;
-    return this;
-  }
-
   /**
    * @deprecated since 2.5 See http://jira.codehaus.org/browse/SONAR-2007
    */
@@ -284,7 +274,6 @@ public class ResourceQuery extends Query<Resource> {
     appendRuleField(url, "rule_priorities", excludeRuleSeverities, ruleSeverities);
     appendUrlParameter(url, "includetrends", includeTrends);
     appendUrlParameter(url, "characteristics", characteristicKeys);
-    appendUrlParameter(url, "languages", languages);
     appendUrlParameter(url, "includealerts", includeAlerts);
     appendUrlParameter(url, "verbose", verbose);
     return url.toString();

diff --git a/sonar-ws-client/src/test/java/org/sonar/wsclient/services/ResourceQueryTest.java b/sonar-ws-client/src/test/java/org/sonar/wsclient/services/ResourceQueryTest.java
index b1e3b3248dac5aebdca25093734a6bc6435817da..54cec20583b46640d2e4c4e9681d275e5d714b59 100644 (file)
--- a/sonar-ws-client/src/test/java/org/sonar/wsclient/services/ResourceQueryTest.java
+++ b/sonar-ws-client/src/test/java/org/sonar/wsclient/services/ResourceQueryTest.java
@@ -33,13 +33,6 @@ public class ResourceQueryTest extends QueryTestCase {
     assertThat(query.isVerbose()).isEqualTo((false));
   }
 
-  @Test
-  public void resourceByLanguages() {
-    ResourceQuery query = new ResourceQuery("org.foo:bar").setLanguages("java,php");
-    assertThat(query.getUrl()).isEqualTo(("/api/resources?resource=org.foo%3Abar&languages=java%2Cphp&verbose=false&"));
-    assertThat(query.getResourceKeyOrId()).isEqualTo(("org.foo:bar"));
-  }
-
   @Test
   public void measures() {
     ResourceQuery query = new ResourceQuery();