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

1 files changed, 15 insertions, 4 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 53f56ba35dc..d28438fb160 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,8 +1,7 @@
 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.*;
 import org.sonar.gwt.JsonUtils;
 import org.sonar.wsclient.services.TimeMachineData;
 
@@ -17,14 +16,26 @@ public class TimeMachineUnmarshaller implements Unmarshaller<TimeMachineData> {
       JSONArray array = map.get(dateTimeStr).isArray();
       List<String> values = new ArrayList<String>();
       for (int i = 0; i < JsonUtils.getArraySize(array); i++) {
-        String value = array.get(i).isString().stringValue();
-        values.add(value);
+        JSONValue elem = array.get(i);
+        values.add(getAsString(elem));
       }
       data.put(JsonUtils.parseDateTime(dateTimeStr), values);
     }
     return new TimeMachineData().setData(data);
   }
 
+  public String getAsString(JSONValue jsonValue) {
+    if (jsonValue == null) {
+      return null;
+    }
+    JSONString jsonString;
+    if ((jsonString = jsonValue.isString()) == null) {
+      JSONNumber jsonNumber = jsonValue.isNumber();
+      return jsonNumber != null ? jsonNumber.toString() : null;
+    }
+    return jsonString.stringValue();
+  }
+
   public List<TimeMachineData> toModels(JavaScriptObject json) {
     return Arrays.asList(toModel(json));
   }