aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-server
diff options
context:
space:
mode:
authorJulien Lancelot <julien.lancelot@gmail.com>2013-07-17 18:26:31 +0200
committerJulien Lancelot <julien.lancelot@gmail.com>2013-07-17 18:26:31 +0200
commitaab6ac481446f5373f662b7c75dc88897d99864d (patch)
treeba2a0a80abf68c9d4979e6592cb25ca9359a789a /sonar-server
parent20cac9a061e03e3d6fbaee936b46609c2f3f5569 (diff)
downloadsonarqube-aab6ac481446f5373f662b7c75dc88897d99864d.tar.gz
sonarqube-aab6ac481446f5373f662b7c75dc88897d99864d.zip
SONAR-4419 when searching for projects, the technical projects should not be returned
Diffstat (limited to 'sonar-server')
-rw-r--r--sonar-server/src/main/java/org/sonar/server/component/DefaultComponentFinder.java9
-rw-r--r--sonar-server/src/test/java/org/sonar/server/component/DefaultComponentFinderTest.java66
2 files changed, 35 insertions, 40 deletions
diff --git a/sonar-server/src/main/java/org/sonar/server/component/DefaultComponentFinder.java b/sonar-server/src/main/java/org/sonar/server/component/DefaultComponentFinder.java
index ff5164e31cb..6bd4e9291de 100644
--- a/sonar-server/src/main/java/org/sonar/server/component/DefaultComponentFinder.java
+++ b/sonar-server/src/main/java/org/sonar/server/component/DefaultComponentFinder.java
@@ -26,9 +26,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.sonar.api.component.Component;
import org.sonar.api.utils.Paging;
-import org.sonar.core.component.ComponentDto;
import org.sonar.core.resource.ResourceDao;
-import org.sonar.core.resource.ResourceQuery;
import java.util.Collection;
import java.util.List;
@@ -52,10 +50,9 @@ public class DefaultComponentFinder {
LOG.debug("ComponentQuery : {}", query);
long start = System.currentTimeMillis();
try {
- // 1. Search components
- ResourceQuery resourceQuery = ResourceQuery.create().setQualifiers(query.qualifiers().toArray(new String[]{}));
- List<ComponentDto> dtos = ResourceDao.toComponents(resourceDao.getResources(resourceQuery));
- Collection<Component> foundComponents = search(query, dtos);
+ // 1. Search components for selected qualifiers
+ List<Component> components = resourceDao.selectComponentsByQualifiers(query.qualifiers());
+ Collection<Component> foundComponents = search(query, components);
// 2. Sort components
Collection<? extends Component> sortedComponents = new ComponentsFinderSort(foundComponents, query).sort();
diff --git a/sonar-server/src/test/java/org/sonar/server/component/DefaultComponentFinderTest.java b/sonar-server/src/test/java/org/sonar/server/component/DefaultComponentFinderTest.java
index bba0fb77fa9..9aa014331a5 100644
--- a/sonar-server/src/test/java/org/sonar/server/component/DefaultComponentFinderTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/component/DefaultComponentFinderTest.java
@@ -22,16 +22,14 @@ package org.sonar.server.component;
import org.junit.Test;
import org.sonar.api.component.Component;
+import org.sonar.api.resources.Project;
import org.sonar.core.resource.ResourceDao;
-import org.sonar.core.resource.ResourceDto;
-import org.sonar.core.resource.ResourceQuery;
import java.util.Iterator;
-import java.util.List;
import static com.google.common.collect.Lists.newArrayList;
import static org.fest.assertions.Assertions.assertThat;
-import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyCollection;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -40,14 +38,14 @@ public class DefaultComponentFinderTest {
ResourceDao dao = mock(ResourceDao.class);
DefaultComponentFinder finder = new DefaultComponentFinder(dao);
+
@Test
public void should_return_all_components_when_no_parameter() {
- List<ResourceDto> dtoList = newArrayList(
- new ResourceDto().setKey("org.codehaus.sonar").setName("Sonar").setQualifier("TRK"),
- new ResourceDto().setKey("org.apache.tika:tika").setName("Apache Tika").setQualifier("TRK"),
- new ResourceDto().setKey("org.picocontainer:picocontainer-parent").setName("PicoContainer Parent").setQualifier("TRK")
- );
- when(dao.getResources(any(ResourceQuery.class))).thenReturn(dtoList);
+ when(dao.selectComponentsByQualifiers(anyCollection())).thenReturn(newArrayList(
+ createProject("org.codehaus.sonar", "Sonar"),
+ createProject("org.apache.tika:tika", "Apache Tika"),
+ createProject("org.picocontainer:picocontainer-parent", "PicoContainer Parent")
+ ));
ComponentQuery query = ComponentQuery.builder().build();
DefaultComponentQueryResult results = finder.find(query);
@@ -61,12 +59,11 @@ public class DefaultComponentFinderTest {
@Test
public void should_find_components_by_key_pattern() {
- List<ResourceDto> dtoList = newArrayList(
- new ResourceDto().setKey("org.codehaus.sonar").setName("Sonar").setQualifier("TRK"),
- new ResourceDto().setKey("org.apache.tika:tika").setName("Apache Tika").setQualifier("TRK"),
- new ResourceDto().setKey("org.apache.jackrabbit:jackrabbit").setName("Apache Jackrabbit").setQualifier("TRK")
- );
- when(dao.getResources(any(ResourceQuery.class))).thenReturn(dtoList);
+ when(dao.selectComponentsByQualifiers(anyCollection())).thenReturn(newArrayList(
+ createProject("org.codehaus.sonar", "Sonar"),
+ createProject("org.apache.tika:tika", "Apache Tika"),
+ createProject("org.apache.jackrabbit:jackrabbit", "Apache Jackrabbit")
+ ));
ComponentQuery query = ComponentQuery.builder().keys(newArrayList("org.apache")).build();
assertThat(finder.find(query).components()).hasSize(2);
@@ -74,12 +71,11 @@ public class DefaultComponentFinderTest {
@Test
public void should_find_components_by_name_pattern() {
- List<ResourceDto> dtoList = newArrayList(
- new ResourceDto().setKey("org.codehaus.sonar").setName("Sonar").setQualifier("TRK"),
- new ResourceDto().setKey("org.apache.tika:tika").setName("Apache Tika").setQualifier("TRK"),
- new ResourceDto().setKey("org.apache.jackrabbit:jackrabbit").setName("Apache Jackrabbit").setQualifier("TRK")
- );
- when(dao.getResources(any(ResourceQuery.class))).thenReturn(dtoList);
+ when(dao.selectComponentsByQualifiers(anyCollection())).thenReturn(newArrayList(
+ createProject("org.codehaus.sonar", "Sonar"),
+ createProject("org.apache.tika:tika", "Apache Tika"),
+ createProject("org.apache.jackrabbit:jackrabbit", "Apache Jackrabbit")
+ ));
ComponentQuery query = ComponentQuery.builder().names(newArrayList("Apache")).build();
assertThat(finder.find(query).components()).hasSize(2);
@@ -87,12 +83,11 @@ public class DefaultComponentFinderTest {
@Test
public void should_sort_result_by_name() {
- List<ResourceDto> dtoList = newArrayList(
- new ResourceDto().setKey("org.codehaus.sonar").setName("Sonar").setQualifier("TRK"),
- new ResourceDto().setKey("org.apache.tika:tika").setName("Apache Tika").setQualifier("TRK"),
- new ResourceDto().setKey("org.picocontainer:picocontainer-parent").setName("PicoContainer Parent").setQualifier("TRK")
- );
- when(dao.getResources(any(ResourceQuery.class))).thenReturn(dtoList);
+ when(dao.selectComponentsByQualifiers(anyCollection())).thenReturn(newArrayList(
+ createProject("org.codehaus.sonar", "Sonar"),
+ createProject("org.apache.tika:tika", "Apache Tika"),
+ createProject("org.picocontainer:picocontainer-parent", "PicoContainer Parent")
+ ));
ComponentQuery query = ComponentQuery.builder().build();
DefaultComponentQueryResult results = finder.find(query);
@@ -108,12 +103,11 @@ public class DefaultComponentFinderTest {
public void should_find_paginate_result() {
ComponentQuery query = ComponentQuery.builder().pageSize(1).pageIndex(1).build();
- List<ResourceDto> dtoList = newArrayList(
- new ResourceDto().setKey("org.codehaus.sonar").setName("Sonar").setQualifier("TRK"),
- new ResourceDto().setKey("org.apache.tika:tika").setName("Apache Tika").setQualifier("TRK"),
- new ResourceDto().setKey("org.picocontainer:picocontainer-parent").setName("PicoContainer Parent").setQualifier("TRK")
- );
- when(dao.getResources(any(ResourceQuery.class))).thenReturn(dtoList);
+ when(dao.selectComponentsByQualifiers(anyCollection())).thenReturn(newArrayList(
+ createProject("org.codehaus.sonar", "Sonar"),
+ createProject("org.apache.tika:tika", "Apache Tika"),
+ createProject("org.picocontainer:picocontainer-parent", "PicoContainer Parent")
+ ));
DefaultComponentQueryResult results = finder.find(query);
assertThat(results.paging().offset()).isEqualTo(0);
@@ -121,4 +115,8 @@ public class DefaultComponentFinderTest {
assertThat(results.paging().total()).isEqualTo(3);
}
+ private Component createProject(String key, String name){
+ return new Project(key, null, name);
+ }
+
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-03 20:14:34 +0000