SONAR-833: New Web Service to get history of measures (time machine)

1 files changed, 14 insertions, 20 deletions

diff --git a/sonar-gwt-api/src/main/java/org/sonar/wsclient/gwt/unmarshallers/TimeMachineUnmarshaller.java b/sonar-gwt-api/src/main/java/org/sonar/wsclient/gwt/unmarshallers/TimeMachineUnmarshaller.java
index 68ffda4ed06..f4c1cea3f3e 100644
--- a/sonar-gwt-api/src/main/java/org/sonar/wsclient/gwt/unmarshallers/TimeMachineUnmarshaller.java
+++ b/sonar-gwt-api/src/main/java/org/sonar/wsclient/gwt/unmarshallers/TimeMachineUnmarshaller.java
@@ -1,34 +1,28 @@
 package org.sonar.wsclient.gwt.unmarshallers;
 
-import com.google.gwt.core.client.JavaScriptObject;
 import com.google.gwt.json.client.JSONArray;
 import com.google.gwt.json.client.JSONObject;
 import com.google.gwt.json.client.JSONValue;
 import org.sonar.gwt.JsonUtils;
 import org.sonar.wsclient.services.TimeMachineData;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
-public class TimeMachineUnmarshaller implements Unmarshaller<TimeMachineData> {
+public class TimeMachineUnmarshaller extends AbstractUnmarshaller<TimeMachineData> {
 
-  public TimeMachineData toModel(JavaScriptObject json) {
-    JSONObject map = new JSONObject(json);
-    Map<Date, List<String>> data = new HashMap<Date, List<String>>();
-    for (String dateTimeStr : map.keySet()) {
-      JSONArray array = map.get(dateTimeStr).isArray();
-      List<String> measures = new ArrayList<String>();
-      for (int i = 0; i < JsonUtils.getArraySize(array); i++) {
-        // We can't use JsonUtils.getArray here, because it returns JSONObject instead of JSONValue
-        JSONValue elem = array.get(i);
-        measures.add(JsonUtils.getAsString(elem));
-      }
-      data.put(JsonUtils.parseDateTime(dateTimeStr), measures);
+  protected TimeMachineData parse(JSONObject json) {
+    String dateTimeStr = (String) json.keySet().iterator().next();
+    JSONArray array = json.get(dateTimeStr).isArray();
+    List<String> measures = new ArrayList<String>();
+    for (int i = 0; i < JsonUtils.getArraySize(array); i++) {
+      // We can't use JsonUtils.getArray here, because it returns JSONObject instead of JSONValue
+      JSONValue elem = array.get(i);
+      measures.add(JsonUtils.getAsString(elem));
     }
-    return new TimeMachineData().setData(data);
-  }
-
-  public List<TimeMachineData> toModels(JavaScriptObject json) {
-    return Arrays.asList(toModel(json));
+    return new TimeMachineData()
+        .setDate(JsonUtils.parseDateTime(dateTimeStr))
+        .setValues(measures);
   }
 
 }