From 97da706a3ed800e3a747ef37bd60216fcb941988 Mon Sep 17 00:00:00 2001
From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Tue, 23 Sep 2014 17:29:28 +0200
Subject: [PATCH] Fix quality flaws

---
 .../java/org/sonar/server/issue/ws/SearchAction.java     | 9 ++++++---
 .../main/java/org/sonar/server/search/QueryContext.java  | 4 ++--
 .../issue/ws/SearchActionMediumTest/single_result.json   | 4 ++++
 .../src/main/java/org/sonar/core/issue/db/IssueDto.java  | 1 -
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java
index 023d6a96aff..973038d9f4a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java
@@ -223,7 +223,7 @@ public class SearchAction extends SearchRequestHandler<IssueQuery, Issue> {
   @Override
   @CheckForNull
   protected Collection<String> possibleFields() {
-    return null;
+    return Collections.emptyList();
   }
 
   @Override
@@ -249,8 +249,11 @@ public class SearchAction extends SearchRequestHandler<IssueQuery, Issue> {
 
     DbSession session = dbClient.openSession(false);
     try {
-      writeProjects(json, dbClient.componentDao().getByKeys(session, projectKeys));
-      writeComponents(json, dbClient.componentDao().getByKeys(session, componentKeys));
+      List<ComponentDto> componentDtos = dbClient.componentDao().getByKeys(session, componentKeys);
+      List<ComponentDto> projectDtos = dbClient.componentDao().getByKeys(session, projectKeys);
+      componentDtos.addAll(projectDtos);
+      writeProjects(json, projectDtos);
+      writeComponents(json, componentDtos);
     } finally {
       session.close();
     }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/search/QueryContext.java b/server/sonar-server/src/main/java/org/sonar/server/search/QueryContext.java
index fab6be99b2c..90799df25c4 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/search/QueryContext.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/search/QueryContext.java
@@ -113,8 +113,8 @@ public class QueryContext {
   }
 
   public int getPage() {
-    int limit = getLimit();
-    return limit > 0 ? (int) Math.ceil((double) (getOffset() + 1) / (double) getLimit()) : 0;
+    int currentLimit = getLimit();
+    return currentLimit > 0 ? (int) Math.ceil((double) (getOffset() + 1) / (double) currentLimit) : 0;
   }
 
   /**
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/single_result.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/single_result.json
index 5831a4a6da7..46e78743fd9 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/single_result.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/SearchActionMediumTest/single_result.json
@@ -29,6 +29,10 @@
     {
       "key": "MyComponent",
       "id": 2
+    },
+    {
+      "key": "MyProject",
+      "id": 1
     }
   ],
   "projects": [
diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDto.java b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDto.java
index d884f5f9fb3..15092940d68 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDto.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueDto.java
@@ -424,7 +424,6 @@ public final class IssueDto extends Dto<String> implements Serializable {
   }
 
   public static IssueDto toDtoForInsert(DefaultIssue issue, Long componentId, Long rootComponentId, Integer ruleId, Date now) {
-    String projectKey = issue.projectKey();
     return new IssueDto()
       .setKee(issue.key())
       .setLine(issue.line())
-- 
2.39.5