Merge pull request skyscreamer#30 from billmag/master

carterpage · carterpage · commit 452e69d81445 · 2013-06-16T14:46:29.000-07:00
Changes to dependencies for cleanliness in Android.

I'm going to accept the merge then follow up with a unit test and reverting the JSON version to the current one.
diff --git a/pom.xml b/pom.xml
@@ -52,14 +52,8 @@
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20090211</version>
+            <version>20080701</version>
         </dependency>
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>3.0</version>
-        </dependency>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/src/main/java/org/skyscreamer/jsonassert/comparator/AbstractComparator.java b/src/main/java/org/skyscreamer/jsonassert/comparator/AbstractComparator.java
@@ -1,14 +1,11 @@
 package org.skyscreamer.jsonassert.comparator;
 
-import org.apache.commons.collections.CollectionUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.skyscreamer.jsonassert.JSONCompareResult;
 
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 import static org.skyscreamer.jsonassert.comparator.JSONCompareUtil.*;
 
@@ -94,10 +91,8 @@ protected void compareJSONArrayOfJsonObjects(String key, JSONArray expected, JSO
     }
 
     protected void compareJSONArrayOfSimpleValues(String key, JSONArray expected, JSONArray actual, JSONCompareResult result) throws JSONException {
-        @SuppressWarnings("unchecked")
-        Map<Object, Integer> expectedCount = CollectionUtils.getCardinalityMap(jsonArrayToList(expected));
-        @SuppressWarnings("unchecked")
-        Map<Object, Integer> actualCount = CollectionUtils.getCardinalityMap(jsonArrayToList(actual));
+        Map<Object, Integer> expectedCount = JSONCompareUtil.getCardinalityMap(jsonArrayToList(expected));
+        Map<Object, Integer> actualCount = JSONCompareUtil.getCardinalityMap(jsonArrayToList(actual));
         for (Object o : expectedCount.keySet()) {
             if (!actualCount.containsKey(o)) {
                 result.missing(key + "[]", o);
diff --git a/src/main/java/org/skyscreamer/jsonassert/comparator/JSONCompareUtil.java b/src/main/java/org/skyscreamer/jsonassert/comparator/JSONCompareUtil.java
@@ -10,6 +10,8 @@
  * Utility class that contains Json manipulation methods
  */
 public final class JSONCompareUtil {
+    private static Integer INTEGER_ONE = new Integer(1);
+
     private JSONCompareUtil() {}
 
      public static Map<Object,JSONObject> arrayOfJsonObjectToMap(JSONArray array, String uniqueKey) throws JSONException {
@@ -116,5 +118,16 @@ public static String formatUniqueKey(String key, String uniqueKey, Object value)
         return key + "[" + uniqueKey + "=" + value + "]";
     }
 
-
+    public static <T> Map<T, Integer> getCardinalityMap(final Collection<T> coll) {
+        Map count = new HashMap<T, Integer>();
+        for (T item : coll) {
+            Integer c = (Integer) (count.get(item));
+            if (c == null) {
+                count.put(item, INTEGER_ONE);
+            } else {
+                count.put(item, new Integer(c.intValue() + 1));
+            }
+        }
+        return count;
+    }
 }
