SONAR-2501 Replace Set by List for covers method (because Set is not supported when...

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 ef7e27e0f3f5058579c4f4f81e639a24dae91dad..73d195f8af38b4c6a29aaa04a674ee056abefd62 100644 (file)
--- 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
@@ -110,7 +110,7 @@ class GraphsonUtil {
    */
   static JSONObject jsonFromElement(Element element, @Nullable Set<String> propertyKeys, GraphsonMode mode) {
     GraphsonUtil graphson = element instanceof Edge ? new GraphsonUtil(mode, null, null, propertyKeys)
-      : new GraphsonUtil(mode, null, propertyKeys, null);
+        : new GraphsonUtil(mode, null, propertyKeys, null);
     return graphson.jsonFromElement(element);
   }
 
@@ -249,7 +249,7 @@ class GraphsonUtil {
 
   private static boolean isReservedKey(String key) {
     return key.equals(GraphsonTokens._ID) || key.equals(GraphsonTokens._TYPE) || key.equals(GraphsonTokens._LABEL)
-      || key.equals(GraphsonTokens._OUT_V) || key.equals(GraphsonTokens._IN_V);
+        || key.equals(GraphsonTokens._OUT_V) || key.equals(GraphsonTokens._IN_V);
   }
 
   private static JSONArray createJSONList(List list, Set<String> propertyKeys, boolean showTypes) {
@@ -264,6 +264,8 @@ class GraphsonUtil {
         jsonList.add(createJSONMap((Map) item, propertyKeys, showTypes));
       } else if (item != null && item.getClass().isArray()) {
         jsonList.add(createJSONList(convertArrayToList(item), propertyKeys, showTypes));
+      } else if (item instanceof Set) {
+        throw new UnsupportedOperationException("Set property is not supported");
       } else {
         addObject(jsonList, item);
       }
@@ -283,7 +285,7 @@ class GraphsonUtil {
           value = createJSONMap((Map) value, propertyKeys, showTypes);
         } else if (value instanceof Element) {
           value = jsonFromElement((Element) value, propertyKeys,
-            showTypes ? GraphsonMode.EXTENDED : GraphsonMode.NORMAL);
+              showTypes ? GraphsonMode.EXTENDED : GraphsonMode.NORMAL);
         } else if (value.getClass().isArray()) {
           value = createJSONList(convertArrayToList(value), propertyKeys, showTypes);
         }

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 53febd013dc7aaf93e3feb539ba2dcffc1b57e7e..1bb55ed23cdd983c6b94ce29dd4c5350eeacc8a9 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/test/DefaultTestCase.java
+++ b/sonar-core/src/main/java/org/sonar/core/test/DefaultTestCase.java
@@ -37,7 +37,6 @@ import javax.annotation.Nullable;
 
 import java.util.Collection;
 import java.util.List;
-import java.util.Set;
 
 public class DefaultTestCase extends BeanVertex implements MutableTestCase {
 
@@ -105,7 +104,7 @@ public class DefaultTestCase extends BeanVertex implements MutableTestCase {
     return this;
   }
 
-  public void covers(Testable testable, Set<Integer> lines) {
+  public void covers(Testable testable, List<Integer> lines) {
     LOG.info("Covers : " + testable.component().key(), " on "+ lines);
 
     Vertex componentVertex = GraphUtil.single(beanGraph().getUnderlyingGraph().getVertices("key", testable.component().key()));

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/test/MutableTestCase.java b/sonar-plugin-api/src/main/java/org/sonar/api/test/MutableTestCase.java
index a7deec1ab0835bec634dca6be9e573fe4114bd51..7a7f9dcd2de5e2afa744b36ad2573ea6a827f289 100644 (file)
--- a/sonar-plugin-api/src/main/java/org/sonar/api/test/MutableTestCase.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/test/MutableTestCase.java
@@ -21,7 +21,7 @@ package org.sonar.api.test;
 
 import javax.annotation.Nullable;
 
-import java.util.Set;
+import java.util.List;
 
 public interface MutableTestCase extends TestCase {
   MutableTestCase setStatus(String s);
@@ -34,5 +34,5 @@ public interface MutableTestCase extends TestCase {
 
   MutableTestCase setStackTrace(String s);
 
-  void covers(Testable testable, Set<Integer> lines);
+  void covers(Testable testable, List<Integer> lines);
 }