Rename ES field RuleParam.VALUE to DEFAULT_VALUE

3 files changed, 26 insertions, 6 deletions

diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/RuleDoc.java b/sonar-server/src/main/java/org/sonar/server/rule2/RuleDoc.java
index e651f87649b..df58e6ac58e 100644
--- a/sonar-server/src/main/java/org/sonar/server/rule2/RuleDoc.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule2/RuleDoc.java
@@ -119,7 +119,7 @@ class RuleDoc implements Rule {
 
           @Override
           public String defaultValue() {
-            return (String) param.get(RuleNormalizer.RuleParamField.VALUE.key());
+            return (String) param.get(RuleNormalizer.RuleParamField.DEFAULT_VALUE.key());
           }
 
           @Override
diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/RuleNormalizer.java b/sonar-server/src/main/java/org/sonar/server/rule2/RuleNormalizer.java
index f772ede77cf..25929e6d6d1 100644
--- a/sonar-server/src/main/java/org/sonar/server/rule2/RuleNormalizer.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule2/RuleNormalizer.java
@@ -81,7 +81,7 @@ public class RuleNormalizer extends BaseNormalizer<RuleDto, RuleKey> {
     NAME("name"),
     TYPE("type"),
     DESCRIPTION("description"),
-    VALUE("value");
+    DEFAULT_VALUE("defaultValue");
 
     private final String key;
 
@@ -127,6 +127,26 @@ public class RuleNormalizer extends BaseNormalizer<RuleDto, RuleKey> {
     }
   }
 
+  public static enum ActiveRuleParamField {
+    NAME("name"),
+    VALUE("value");
+
+    private final String key;
+
+    private ActiveRuleParamField(final String key) {
+      this.key = key;
+    }
+
+    public String key() {
+      return key;
+    }
+
+    @Override
+    public String toString() {
+      return key;
+    }
+  }
+
   public RuleNormalizer(RuleDao ruleDao, ActiveRuleDao activeRuleDao, RuleTagDao ruleTagDao) {
     this.ruleDao = ruleDao;
     this.activeRuleDao = activeRuleDao;
@@ -179,7 +199,7 @@ public class RuleNormalizer extends BaseNormalizer<RuleDto, RuleKey> {
           document.startObject(ActiveRuleField.PARAMS.key());
           for (ActiveRuleParamDto param : activeRuleParams) {
             document.startObject(param.getKey());
-            indexField(RuleParamField.VALUE.key(), param.getValue(), document);
+            indexField(ActiveRuleParamField.VALUE.key(), param.getValue(), document);
             document.endObject();
           }
           document.endObject();
@@ -206,7 +226,7 @@ public class RuleNormalizer extends BaseNormalizer<RuleDto, RuleKey> {
     indexField(RuleParamField.NAME.key(), param.getName(), document);
     indexField(RuleParamField.TYPE.key(), param.getType(), document);
     indexField(RuleParamField.DESCRIPTION.key(), param.getDescription(), document);
-    indexField(RuleParamField.VALUE.key(), param.getDefaultValue(), document);
+    indexField(RuleParamField.DEFAULT_VALUE.key(), param.getDefaultValue(), document);
     document.endObject();
     document.endObject();
 
diff --git a/sonar-server/src/main/java/org/sonar/server/rule2/ws/SearchAction.java b/sonar-server/src/main/java/org/sonar/server/rule2/ws/SearchAction.java
index da10ee512f2..9a51b5f41f5 100644
--- a/sonar-server/src/main/java/org/sonar/server/rule2/ws/SearchAction.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule2/ws/SearchAction.java
@@ -196,6 +196,7 @@ public class SearchAction implements RequestHandler {
 
   private void writeStatistics(Results results, JsonWriter json) {
     json.prop("total", results.getTotal());
+    // TODO replace ES time by complete time
     json.prop("time", results.getTime());
   }
 
@@ -204,8 +205,7 @@ public class SearchAction implements RequestHandler {
     for (Hit hit : results.getHits()) {
       json.beginObject();
       for (Map.Entry<String, Object> entry : hit.getFields().entrySet()) {
-        Object value = entry.getValue();
-        json.prop(entry.getKey(), value == null ? null : value.toString());
+        json.name(entry.getKey()).valueObject(entry.getValue());
       }
       json.endObject();
     }