From e0cc75aaeefda4382d820ca0e2ec9647987dc328 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>
Date: Tue, 3 Feb 2015 16:29:15 +0100
Subject: [PATCH] Apply feedback from PR #65

---
 .../java/org/sonar/server/issue/IssueQueryService.java     | 7 ++-----
 .../java/org/sonar/server/component/ComponentTesting.java  | 3 ++-
 .../java/org/sonar/server/issue/IssueQueryServiceTest.java | 3 ++-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueQueryService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueQueryService.java
index 03e15349b03..c097e0855ed 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueQueryService.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueQueryService.java
@@ -37,7 +37,6 @@ import org.sonar.api.server.ws.Request;
 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;
@@ -64,12 +63,10 @@ public class IssueQueryService implements ServerComponent {
   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) {
@@ -244,7 +241,7 @@ public class IssueQueryService implements ServerComponent {
         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);
diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentTesting.java b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentTesting.java
index 178ccb0c78e..dad3828497a 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentTesting.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentTesting.java
@@ -24,6 +24,7 @@ import org.sonar.api.resources.Qualifiers;
 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 {
@@ -90,7 +91,7 @@ public class ComponentTesting {
   }
 
   public static ComponentDto newDeveloper(String name) {
-    String uuid = "DEV:" + name;
+    String uuid = Uuids.create();
     return new ComponentDto()
       .setUuid(uuid)
       .setProjectUuid(uuid)
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueQueryServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueQueryServiceTest.java
index dfef64e3501..7c8a05e7f85 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueQueryServiceTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueQueryServiceTest.java
@@ -76,6 +76,7 @@ public class IssueQueryServiceTest {
   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
@@ -85,7 +86,7 @@ public class IssueQueryServiceTest {
       }
     });
 
-    issueQueryService = new IssueQueryService(dbClient, componentService, authorDao);
+    issueQueryService = new IssueQueryService(dbClient, componentService);
   }
 
   @Test
-- 
2.39.5