From 38ce80934961773a9a35ec0401994b3d726597dc Mon Sep 17 00:00:00 2001
From: Teryk Bellahsene <teryk.bellahsene@sonarsource.com>
Date: Thu, 17 Mar 2016 19:00:53 +0100
Subject: SONAR-7106 WS api/permissions/search_project_permissions rely on
 resource_index to search for component name

---
 .../java/org/sonar/db/component/ComponentDao.java  | 24 ----------------------
 .../org/sonar/db/component/ComponentDaoTest.java   | 15 --------------
 2 files changed, 39 deletions(-)

(limited to 'sonar-db')

diff --git a/sonar-db/src/main/java/org/sonar/db/component/ComponentDao.java b/sonar-db/src/main/java/org/sonar/db/component/ComponentDao.java
index 77345bdfafa..f1628ddedea 100644
--- a/sonar-db/src/main/java/org/sonar/db/component/ComponentDao.java
+++ b/sonar-db/src/main/java/org/sonar/db/component/ComponentDao.java
@@ -211,26 +211,6 @@ public class ComponentDao implements Dao {
     return mapper(session).selectProjects();
   }
 
-  /**
-   * Does not return component copies
-   */
-  public List<ComponentDto> selectComponents(DbSession session, Collection<String> qualifiers, int offset, int limit, @Nullable String query) {
-    Map<String, Object> parameters = newHashMapWithExpectedSize(3);
-    addProjectQualifier(parameters);
-    addPartialQueryParameterIfNotNull(parameters, query);
-    addQualifiers(parameters, qualifiers);
-
-    return mapper(session).selectComponents(parameters, new RowBounds(offset, limit));
-  }
-
-  public int countRootComponents(DbSession session, Collection<String> qualifiers, @Nullable String query) {
-    Map<String, Object> parameters = newHashMapWithExpectedSize(2);
-    addPartialQueryParameterIfNotNull(parameters, query);
-    addQualifiers(parameters, qualifiers);
-
-    return mapper(session).countRootComponents(parameters);
-  }
-
   public List<ComponentDto> selectProvisionedProjects(DbSession session, int offset, int limit, @Nullable String query) {
     Map<String, Object> parameters = newHashMapWithExpectedSize(2);
     addProjectQualifier(parameters);
@@ -292,10 +272,6 @@ public class ComponentDao implements Dao {
     parameters.put("qualifier", Qualifiers.PROJECT);
   }
 
-  private static void addQualifiers(Map<String, Object> parameters, Collection<String> qualifiers) {
-    parameters.put("qualifiers", qualifiers);
-  }
-
   public void insert(DbSession session, ComponentDto item) {
     mapper(session).insert(item);
   }
diff --git a/sonar-db/src/test/java/org/sonar/db/component/ComponentDaoTest.java b/sonar-db/src/test/java/org/sonar/db/component/ComponentDaoTest.java
index 1026c04ab04..8a4de8f8cde 100644
--- a/sonar-db/src/test/java/org/sonar/db/component/ComponentDaoTest.java
+++ b/sonar-db/src/test/java/org/sonar/db/component/ComponentDaoTest.java
@@ -655,21 +655,6 @@ public class ComponentDaoTest {
     assertThat(underTest.selectByKey(dbSession, "PROJECT_2")).isPresent();
   }
 
-  @Test
-  public void select_components_with_paging_query_and_qualifiers() {
-    underTest.insert(dbSession, newProjectDto().setName("aaaa-name"));
-    underTest.insert(dbSession, newView());
-    underTest.insert(dbSession, newDeveloper("project-name"));
-    for (int i = 9; i >= 1; i--) {
-      underTest.insert(dbSession, newProjectDto().setName("project-" + i));
-    }
-
-    List<ComponentDto> result = underTest.selectComponents(dbSession, singleton(Qualifiers.PROJECT), 1, 3, "project");
-
-    assertThat(result).hasSize(3);
-    assertThat(result).extracting("name").containsExactly("project-2", "project-3", "project-4");
-  }
-
   @Test
   public void select_by_query_with_paging_query_and_qualifiers() {
     componentDb.insertProjectAndSnapshot(newProjectDto().setName("aaaa-name"));
-- 
cgit v1.2.3