import org.sonar.api.web.UserRole;
import org.sonar.core.component.ComponentDto;
import org.sonar.core.persistence.DbSession;
-import org.sonar.core.user.AuthorDao;
import org.sonar.server.component.ComponentService;
import org.sonar.server.db.DbClient;
import org.sonar.server.issue.IssueQuery.Builder;
private static final String UNKNOWN = "<UNKNOWN>";
private final DbClient dbClient;
private final ComponentService componentService;
- private final AuthorDao authorDao;
- public IssueQueryService(DbClient dbClient, ComponentService componentService, AuthorDao authorDao) {
+ public IssueQueryService(DbClient dbClient, ComponentService componentService) {
this.dbClient = dbClient;
this.componentService = componentService;
- this.authorDao = authorDao;
}
public IssueQuery createFromMap(Map<String, Object> params) {
addComponentsBelowView(builder, session, authors, projects, projectUuids, moduleUuids, directories, fileUuids);
} else if ("DEV".equals(uniqueQualifier)) {
// XXX No constant for developer !!!
- Collection<String> actualAuthors = authors == null ? authorDao.selectScmAccountsByDeveloperUuids(allComponentUuids) : authors;
+ Collection<String> actualAuthors = authors == null ? dbClient.authorDao().selectScmAccountsByDeveloperUuids(allComponentUuids) : authors;
addComponentsBelowView(builder, session, actualAuthors, projects, projectUuids, moduleUuids, directories, fileUuids);
} else if (Qualifiers.PROJECT.equals(uniqueQualifier)) {
builder.projectUuids(allComponentUuids);
import org.sonar.api.resources.Scopes;
import org.sonar.api.utils.internal.Uuids;
import org.sonar.core.component.ComponentDto;
+
import static org.sonar.core.component.ComponentDto.MODULE_UUID_PATH_SEP;
public class ComponentTesting {
}
public static ComponentDto newDeveloper(String name) {
- String uuid = "DEV:" + name;
+ String uuid = Uuids.create();
return new ComponentDto()
.setUuid(uuid)
.setProjectUuid(uuid)
public void setUp() throws Exception {
when(dbClient.openSession(false)).thenReturn(session);
when(dbClient.componentDao()).thenReturn(componentDao);
+ when(dbClient.authorDao()).thenReturn(authorDao);
when(componentService.componentUuids(any(DbSession.class), any(Collection.class), eq(true))).thenAnswer(new Answer<Collection<String>>() {
@Override
}
});
- issueQueryService = new IssueQueryService(dbClient, componentService, authorDao);
+ issueQueryService = new IssueQueryService(dbClient, componentService);
}
@Test