SONAR-4381 ClassCastException when unmarshalling response from manual measure WS

diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/unmarshallers/JsonUtils.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/unmarshallers/JsonUtils.java
index 0f9381fffaca1bf09b66675a10c47307daa139d9..c767b5602f4dbe3ed4b27dd7f06e057183fe2a6c 100644 (file)
--- a/sonar-ws-client/src/main/java/org/sonar/wsclient/unmarshallers/JsonUtils.java
+++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/unmarshallers/JsonUtils.java
@@ -69,6 +69,9 @@ public final class JsonUtils {
   public static Double getDouble(Map obj, String field) {
     Object value = obj.get(field);
     if (value != null) {
+      if (value instanceof Long) {
+        return ((Long) value).doubleValue();
+      }
       return (Double) value;
     }
     return null;

diff --git a/sonar-ws-client/src/test/resources/manual_measures/all_measures.json b/sonar-ws-client/src/test/resources/manual_measures/all_measures.json
index 05bce196c2dff102879651392ec785c013134205..2adfa7252234d89e7591c2d75fee95799df03e88 100644 (file)
--- a/sonar-ws-client/src/test/resources/manual_measures/all_measures.json
+++ b/sonar-ws-client/src/test/resources/manual_measures/all_measures.json
@@ -3,7 +3,7 @@
     "id":1,
     "metric":"burned_budget",
     "resource":"org.apache.struts:struts-parent",
-    "val":302.0,
+    "val":302.1,
     "created_at":"2011-07-27T10:22:34+0200",
     "updated_at":"2011-07-27T10:22:34+0200",
     "login":"admin",
@@ -13,10 +13,10 @@
     "id":2,
     "metric":"team_size",
     "resource":"org.apache.struts:struts-parent",
-    "val":555.0,
+    "val":555,
     "created_at":"2011-07-27T10:53:33+0200",
     "updated_at":"2011-07-27T10:53:33+0200",
     "login":"admin",
     "username":"Administrator"
   }
-]
\ No newline at end of file
+]