aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-db
diff options
context:
space:
mode:
authorTeryk Bellahsene <teryk.bellahsene@sonarsource.com>2016-03-17 19:00:53 +0100
committerTeryk Bellahsene <teryk.bellahsene@sonarsource.com>2016-03-18 09:03:48 +0100
commit38ce80934961773a9a35ec0401994b3d726597dc (patch)
tree72a3bd487986cdf40a9d6617e30c1f13241b2f80 /sonar-db
parent0cdd471479b9243b0e18d754c03d66aa139f6349 (diff)
downloadsonarqube-38ce80934961773a9a35ec0401994b3d726597dc.tar.gz
sonarqube-38ce80934961773a9a35ec0401994b3d726597dc.zip
SONAR-7106 WS api/permissions/search_project_permissions rely on resource_index to search for component name
Diffstat (limited to 'sonar-db')
-rw-r--r--sonar-db/src/main/java/org/sonar/db/component/ComponentDao.java24
-rw-r--r--sonar-db/src/test/java/org/sonar/db/component/ComponentDaoTest.java15
2 files changed, 0 insertions, 39 deletions
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
@@ -656,21 +656,6 @@ public class ComponentDaoTest {
}
@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"));
componentDb.insertProjectAndSnapshot(newView());