From cda263896d85cdb675eed136feea4930e7c1d576 Mon Sep 17 00:00:00 2001
From: Julien Lancelot <julien.lancelot@gmail.com>
Date: Fri, 1 Feb 2013 12:16:38 +0100
Subject: [PATCH] Fix quality flaws

---
 .../org/sonar/core/graph/graphson/GraphsonUtil.java | 13 +++++++------
 .../java/org/sonar/core/test/DefaultTestCase.java   |  8 ++++++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphsonUtil.java b/sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphsonUtil.java
index b06f953287a..d59fdc04e0f 100644
--- a/sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphsonUtil.java
+++ b/sonar-core/src/main/java/org/sonar/core/graph/graphson/GraphsonUtil.java
@@ -274,10 +274,10 @@ class GraphsonUtil {
   }
 
   //
-  private static JSONObject createJSONMap(Map map, Set<String> propertyKeys, boolean showTypes) {
+  private static JSONObject createJSONMap(Map<Object, Object> map, Set<String> propertyKeys, boolean showTypes) {
     JSONObject jsonMap = new JSONObject();
-    for (Object key : map.keySet()) {
-      Object value = map.get(key);
+    for (Map.Entry<Object, Object> entry : map.entrySet()) {
+      Object value = entry.getValue();
       if (value != null) {
         if (value instanceof List) {
           value = createJSONList((List) value, propertyKeys, showTypes);
@@ -291,7 +291,7 @@ class GraphsonUtil {
         }
       }
 
-      putObject(jsonMap, key.toString(), getValue(value, showTypes));
+      putObject(jsonMap, entry.getKey().toString(), getValue(value, showTypes));
     }
     return jsonMap;
 
@@ -471,10 +471,11 @@ class GraphsonUtil {
         JSONObject convertedMap = new JSONObject();
         JSONObject jsonObject = (JSONObject) value;
 
-        for (Object key : jsonObject.keySet()) {
+        Map<Object, Object> jsonObjectMap = (Map<Object, Object>) jsonObject;
+        for (Map.Entry<Object, Object> entry : jsonObjectMap.entrySet()) {
 
           // no need to getValue() here as this is already a ObjectNode and should have type info
-          convertedMap.put(key, jsonObject.get(key));
+          convertedMap.put(entry.getKey(), entry.getValue());
         }
 
         valueAndType.put(GraphsonTokens.VALUE, convertedMap);
diff --git a/sonar-core/src/main/java/org/sonar/core/test/DefaultTestCase.java b/sonar-core/src/main/java/org/sonar/core/test/DefaultTestCase.java
index 5bd1948f3f4..d7b200e4673 100644
--- a/sonar-core/src/main/java/org/sonar/core/test/DefaultTestCase.java
+++ b/sonar-core/src/main/java/org/sonar/core/test/DefaultTestCase.java
@@ -108,12 +108,12 @@ public class DefaultTestCase extends BeanVertex implements MutableTestCase {
   }
 
   public boolean doesCover() {
-    return element().getEdges(Direction.OUT, "covers").iterator().hasNext();
+    return edgeCovers().iterator().hasNext();
   }
 
   public int countCoveredLines() {
     int result = 0;
-    for (Edge edge : element().getEdges(Direction.OUT, "covers")) {
+    for (Edge edge : edgeCovers()) {
       List<Integer> lines = (List<Integer>) edge.getProperty("lines");
       result = result + lines.size();
     }
@@ -132,4 +132,8 @@ public class DefaultTestCase extends BeanVertex implements MutableTestCase {
     }, null);
   }
 
+  private Iterable<Edge> edgeCovers() {
+    return element().query().labels("covers").direction(Direction.OUT).edges();
+  }
+
 }
-- 
2.39.5