SONAR-5530 - Using *Finders for context objects in IssueResult

diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java
index d94a90de5081c85ffd2aca3491561f6e7eec8f0f..4c9172902e37b7090a40fffcbac52b75a101f632 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/IssueService.java
@@ -354,7 +354,6 @@ public class IssueService implements ServerComponent {
       (options.getOffset() * options.getLimit()) + 1,
       new Long(esResults.getHits().getTotalHits()).intValue()));
 
-
     // Insert the projects and component name;
     Set<RuleKey> ruleKeys = new HashSet<RuleKey>();
     Set<String> projectKeys = new HashSet<String>();
@@ -372,11 +371,12 @@ public class IssueService implements ServerComponent {
     }
 
     try {
+      // TODO Rule vs Rule problem
       indexClient.get(RuleIndex.class).getByKeys(ruleKeys);
       result.addProjects(dbClient.componentDao().getByKeys(session, projectKeys));
       result.addComponents(dbClient.componentDao().getByKeys(session, componentKeys));
-   dbClient.userDao().selectUsersByLogins(session, userLogins);
-      dbClient.actionPlanDao().findByKeys(actionPlanKeys);
+      result.addUsers(userFinder.findByLogins(userLogins));
+      result.addActionPlans(actionPlanService.findByKeys(actionPlanKeys));
     } finally {
       session.close();
     }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueResult.java b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueResult.java
index 052743306f377deea842025358d498c063279def..66a7efe38a86a5f341701fe1fb67ff502bd91573 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueResult.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueResult.java
@@ -148,12 +148,16 @@ public class IssueResult extends Result<IssueDoc> implements IssueQueryResult {
  }
   }
 
-  public void addUsers(User user) {
-    this.usersByLogin.put(user.login(), user);
+  public void addUsers(Collection<User> users) {
+    for (User user : users) {
+      this.usersByLogin.put(user.login(), user);
+    }
   }
 
-  public void addActionPlans(ActionPlan plan) {
-    this.actionPlans.put(plan.key(), plan);
+  public void addActionPlans(Collection<ActionPlan> plans) {
+    for (ActionPlan plan : plans) {
+      this.actionPlans.put(plan.key(), plan);
+    }
   }
 
   public void addRules(Rule rule) {