fix quality flaws

4 files changed, 5 insertions, 14 deletions

diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/measure/ProjectMeasuresIndexerIterator.java b/server/sonar-db-dao/src/main/java/org/sonar/db/measure/ProjectMeasuresIndexerIterator.java
index 490899e82a3..279dddd9276 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/measure/ProjectMeasuresIndexerIterator.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/measure/ProjectMeasuresIndexerIterator.java
@@ -20,12 +20,12 @@
 package org.sonar.db.measure;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSortedSet;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -44,7 +44,6 @@ import org.sonar.core.util.CloseableIterator;
 import org.sonar.db.DatabaseUtils;
 import org.sonar.db.DbSession;
 
-import static java.util.Arrays.asList;
 import static org.sonar.api.measures.CoreMetrics.ALERT_STATUS_KEY;
 import static org.sonar.api.measures.CoreMetrics.NCLOC_LANGUAGE_DISTRIBUTION_KEY;
 import static org.sonar.api.utils.KeyValueFormat.parseStringInt;
@@ -52,7 +51,7 @@ import static org.sonar.db.component.DbTagsReader.readDbTags;
 
 public class ProjectMeasuresIndexerIterator extends CloseableIterator<ProjectMeasuresIndexerIterator.ProjectMeasures> {
 
-  public static final Set<String> METRIC_KEYS = new HashSet<>(asList(
+  public static final Set<String> METRIC_KEYS = ImmutableSortedSet.of(
     CoreMetrics.NCLOC_KEY,
     CoreMetrics.DUPLICATED_LINES_DENSITY_KEY,
     CoreMetrics.COVERAGE_KEY,
@@ -66,7 +65,7 @@ public class ProjectMeasuresIndexerIterator extends CloseableIterator<ProjectMea
     CoreMetrics.NEW_COVERAGE_KEY,
     CoreMetrics.NEW_DUPLICATED_LINES_DENSITY_KEY,
     CoreMetrics.NEW_LINES_KEY,
-    CoreMetrics.NEW_RELIABILITY_RATING_KEY));
+    CoreMetrics.NEW_RELIABILITY_RATING_KEY);
 
   private static final String SQL_PROJECTS = "SELECT p.organization_uuid, p.uuid, p.kee, p.name, s.uuid, s.created_at, p.tags " +
     "FROM projects p " +
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseData.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseData.java
index d38dc4962c9..68830821b39 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseData.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseData.java
@@ -71,7 +71,6 @@ public class SearchResponseData {
     return issues;
   }
 
-  @CheckForNull
   public Collection<ComponentDto> getComponents() {
     return componentsByUuid.values();
   }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseFormat.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseFormat.java
index 8c0f4ff97bf..8dc3d5458dd 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseFormat.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseFormat.java
@@ -295,9 +295,6 @@ public class SearchResponseFormat {
 
   private static List<Issues.Component> formatComponents(SearchResponseData data) {
     Collection<ComponentDto> components = data.getComponents();
-    if (components == null) {
-      return Collections.emptyList();
-    }
     List<Issues.Component> result = new ArrayList<>();
     for (ComponentDto dto : components) {
       String uuid = dto.uuid();
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseLoader.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseLoader.java
index 38926c176b0..d9a8e537a3a 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseLoader.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchResponseLoader.java
@@ -23,7 +23,6 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.MultimapBuilder;
 import com.google.common.collect.SetMultimap;
 import java.util.Collection;
-import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -234,9 +233,6 @@ public class SearchResponseLoader {
 
   private void loadOrganizations(DbSession dbSession, SearchResponseData result) {
     Collection<ComponentDto> components = result.getComponents();
-    if (components == null) {
-      return;
-    }
     dbClient.organizationDao().selectByUuids(
       dbSession,
       components.stream().map(ComponentDto::getOrganizationUuid).collect(MoreCollectors.toSet()))
@@ -272,13 +268,13 @@ public class SearchResponseLoader {
    * Collects the keys of all the data to be loaded (users, rules, ...)
    */
   public static class Collector {
-    private final EnumSet<SearchAdditionalField> fields;
+    private final Set<SearchAdditionalField> fields;
     private final SetMultimap<SearchAdditionalField, Object> fieldValues = MultimapBuilder.enumKeys(SearchAdditionalField.class).hashSetValues().build();
     private final Set<String> componentUuids = new HashSet<>();
     private final Set<String> projectUuids = new HashSet<>();
     private final List<String> issueKeys;
 
-    public Collector(EnumSet<SearchAdditionalField> fields, List<String> issueKeys) {
+    public Collector(Set<SearchAdditionalField> fields, List<String> issueKeys) {
       this.fields = fields;
       this.issueKeys = issueKeys;
     }