From 19898ed3e183f4a61ffa0834ab8c9c6171d77280 Mon Sep 17 00:00:00 2001
From: Stephane Gamard <stephane.gamard@sonarsource.com>
Date: Fri, 12 Sep 2014 14:39:55 +0200
Subject: [PATCH] fix quality flaws

---
 .../main/java/org/sonar/server/issue/IssueService.java   | 2 ++
 .../main/java/org/sonar/server/issue/index/IssueDoc.java | 2 +-
 .../java/org/sonar/server/issue/index/IssueIndex.java    | 9 ++++++---
 .../src/main/java/org/sonar/server/search/BaseIndex.java | 3 +--
 .../org/sonar/server/search/ws/SearchRequestHandler.java | 4 ++--
 .../src/main/java/org/sonar/core/issue/db/IssueDto.java  | 2 +-
 6 files changed, 13 insertions(+), 9 deletions(-)

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 0337ce92174..0dd4724da90 100644
--- 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
@@ -19,6 +19,7 @@
  */
 package org.sonar.server.issue;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Objects;
 import com.google.common.base.Strings;
 import com.google.common.collect.HashMultiset;
@@ -92,6 +93,7 @@ public class IssueService implements ServerComponent {
   private final PreviewCache dryRunCache;
 
   @Deprecated
+  @VisibleForTesting
   public IssueService(DefaultIssueFinder finder,
     IssueWorkflow workflow,
     IssueStorage issueStorage,
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueDoc.java b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueDoc.java
index 0a170fcc29e..c0552d9c752 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueDoc.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueDoc.java
@@ -159,7 +159,7 @@ public class IssueDoc extends BaseDoc implements Issue {
   @CheckForNull
   public Duration debt() {
     Integer debt = getNullableField(IssueNormalizer.IssueField.DEBT.field());
-    return (debt != null) ? Duration.create(new Long(debt)) : null;
+    return (debt != null) ? Duration.create(Long.valueOf(debt)) : null;
   }
 
   @Override
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java
index cd6535ea6bb..c858490b992 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java
@@ -142,17 +142,20 @@ public class IssueIndex extends BaseIndex<Issue, IssueDto, String> {
       ));
 
     // Issue is assigned Filter
-    if (query.assigned() != null && query.assigned()) {
+    boolean assigned = (query.assigned() != null) ? query.assigned() : false;
+    if (assigned) {
       esFilter.must(FilterBuilders.existsFilter(IssueNormalizer.IssueField.ASSIGNEE.field()));
     }
 
     // Issue is planned Filter
-    if (query.planned() != null && query.planned()) {
+    boolean planned = (query.planned() != null) ? query.planned() : false;
+    if (planned) {
       esFilter.must(FilterBuilders.existsFilter(IssueNormalizer.IssueField.ACTION_PLAN.field()));
     }
 
     // Issue is Resolved Filter
-    if (query.resolved() != null && query.resolved()) {
+    boolean resolved = (query.resolved() != null) ? query.resolved() : false;
+    if (resolved) {
       esFilter.must(FilterBuilders.existsFilter(IssueNormalizer.IssueField.RESOLUTION.field()));
     }
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java b/server/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java
index 64a11932dfa..daeebed7454 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/search/BaseIndex.java
@@ -421,9 +421,8 @@ public abstract class BaseIndex<DOMAIN, DTO extends Dto<KEY>, KEY extends Serial
       }
     } catch (Exception e) {
       LOG.debug("could not multi-get.", e);
-    } finally {
-      return results;
     }
+    return results;
   }
 
   public Collection<DOMAIN> getByKeys(KEY... keys) {
diff --git a/server/sonar-server/src/main/java/org/sonar/server/search/ws/SearchRequestHandler.java b/server/sonar-server/src/main/java/org/sonar/server/search/ws/SearchRequestHandler.java
index a2e2a89ded6..81511cc0470 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/search/ws/SearchRequestHandler.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/search/ws/SearchRequestHandler.java
@@ -124,8 +124,8 @@ public abstract class SearchRequestHandler<QUERY, DOMAIN> implements RequestHand
   }
 
   private final QueryContext getQueryContext(Request request) {
-    return new QueryContext()
-      .addFieldsToReturn(request.paramAsStrings(PARAM_FIELDS))
+    QueryContext context = new QueryContext();
+    return context.addFieldsToReturn(request.paramAsStrings(PARAM_FIELDS))
       .setFacet(request.paramAsBoolean(PARAM_FACETS))
       .setPage(request.mandatoryParamAsInt(PARAM_PAGE),
         request.mandatoryParamAsInt(PARAM_PAGE_SIZE));
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 47daf0b7871..58f7f2a5807 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
@@ -480,7 +480,7 @@ public final class IssueDto extends Dto<String> implements Serializable {
 
   public static IssueDto createFor(Project project, RuleDto rule) {
     return new IssueDto()
-      .setRootComponentId(new Long(project.getId()))
+      .setRootComponentId(Long.valueOf(project.getId()))
       .setRuleId(rule.getId())
       .setKee(UUID.randomUUID().toString());
   }
-- 
2.39.5