Fix quality flaws

3 files changed, 19 insertions, 18 deletions

diff --git a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/metric/ws/SearchAction.java
index b5ef6a28e7a..810169750ab 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/SearchAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/metric/ws/SearchAction.java
@@ -28,13 +28,23 @@ import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
 import org.sonar.api.server.ws.WebService.Param;
 import org.sonar.api.utils.text.JsonWriter;
-import org.sonar.db.metric.MetricDto;
 import org.sonar.db.DbSession;
 import org.sonar.db.MyBatis;
+import org.sonar.db.metric.MetricDto;
 import org.sonar.server.db.DbClient;
 import org.sonar.server.es.SearchOptions;
 
 import static com.google.common.collect.Sets.newHashSet;
+import static org.sonar.server.metric.ws.MetricJsonWriter.FIELD_CUSTOM;
+import static org.sonar.server.metric.ws.MetricJsonWriter.FIELD_DESCRIPTION;
+import static org.sonar.server.metric.ws.MetricJsonWriter.FIELD_DIRECTION;
+import static org.sonar.server.metric.ws.MetricJsonWriter.FIELD_DOMAIN;
+import static org.sonar.server.metric.ws.MetricJsonWriter.FIELD_HIDDEN;
+import static org.sonar.server.metric.ws.MetricJsonWriter.FIELD_ID;
+import static org.sonar.server.metric.ws.MetricJsonWriter.FIELD_KEY;
+import static org.sonar.server.metric.ws.MetricJsonWriter.FIELD_NAME;
+import static org.sonar.server.metric.ws.MetricJsonWriter.FIELD_QUALITATIVE;
+import static org.sonar.server.metric.ws.MetricJsonWriter.FIELD_TYPE;
 
 public class SearchAction implements MetricsWsAction {
 
@@ -42,16 +52,6 @@ public class SearchAction implements MetricsWsAction {
 
   public static final String PARAM_IS_CUSTOM = "isCustom";
 
-  public static final String FIELD_ID = "id";
-  public static final String FIELD_KEY = "key";
-  public static final String FIELD_NAME = "name";
-  public static final String FIELD_DESCRIPTION = "description";
-  public static final String FIELD_DOMAIN = "domain";
-  public static final String FIELD_TYPE = "type";
-  public static final String FIELD_DIRECTION = "direction";
-  public static final String FIELD_QUALITATIVE = "qualitative";
-  public static final String FIELD_HIDDEN = "hidden";
-  public static final String FIELD_CUSTOM = "custom";
   private static final Set<String> OPTIONAL_FIELDS = newHashSet(FIELD_NAME, FIELD_DESCRIPTION, FIELD_DOMAIN, FIELD_TYPE, FIELD_DIRECTION, FIELD_QUALITATIVE, FIELD_HIDDEN,
     FIELD_CUSTOM);
   private final Set<String> allPossibleFields;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWs.java b/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWs.java
index 9a8e7556f26..e0bd4ccf6c8 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWs.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWs.java
@@ -26,6 +26,8 @@ import org.sonar.api.server.ws.WebService;
 
 public class ProjectsWs implements WebService {
   public static final String ENDPOINT = "api/projects";
+  private static final String FALSE = "false";
+  private static final String TRUE = "true";
 
   private final ProjectsWsAction[] actions;
 
@@ -66,28 +68,28 @@ public class ProjectsWs implements WebService {
 
     action.createParam("desc")
       .setDescription("Load project description")
-      .setDefaultValue("true")
+      .setDefaultValue(TRUE)
       .setBooleanPossibleValues();
 
     action.createParam("subprojects")
       .setDescription("Load sub-projects. Ignored if the parameter key is set")
-      .setDefaultValue("false")
+      .setDefaultValue(FALSE)
       .setBooleanPossibleValues();
 
     action.createParam("views")
       .setDescription("Load views and sub-views. Ignored if the parameter key is set")
-      .setDefaultValue("false")
+      .setDefaultValue(FALSE)
       .setBooleanPossibleValues();
 
     action.createParam("libs")
       .setDescription("Load libraries. Ignored if the parameter key is set")
-      .setDefaultValue("false")
+      .setDefaultValue(FALSE)
       .setBooleanPossibleValues();
 
     action.createParam("versions")
       .setDescription("Load version")
-      .setDefaultValue("false")
-      .setPossibleValues("true", "false", "last");
+      .setDefaultValue(FALSE)
+      .setPossibleValues(TRUE, FALSE, "last");
 
     RailsHandler.addFormatParam(action);
   }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/test/index/TestIndexer.java b/server/sonar-server/src/main/java/org/sonar/server/test/index/TestIndexer.java
index 69476a22fed..6d80a102847 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/test/index/TestIndexer.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/test/index/TestIndexer.java
@@ -103,7 +103,6 @@ public class TestIndexer extends BaseIndexer {
   }
 
   public void deleteByFile(String fileUuid) {
-    // TODO would be great to have the projectUuid for routing
     SearchRequestBuilder searchRequest = esClient.prepareSearch(INDEX)
       .setTypes(TYPE)
       .setQuery(QueryBuilders.filteredQuery(