pass filtered map entryset + values

Author: fractalwrench

src/main/java/com/bugsnag/util/FilteredMap.java

@@ -74,12 +74,23 @@ public Set<String> keySet() {
 
     @Override
     public Collection<Object> values() {
-        return map.values();
+        Collection<Object> objects = new ArrayList<Object>();
+
+        for (Entry<String, Object> entry : entrySet()) {
+            objects.add(entry.getValue());
+        }
+        return objects;
     }
 
     @Override
     public Set<Entry<String, Object>> entrySet() {
-        return map.entrySet();
+        Set<Entry<String, Object>> entries = map.entrySet();
+
+        for (Entry<String, Object> entry : entries) {
+            String key = entry.getKey();
+            entry.setValue(transformEntry(key, entry.getValue()));
+        }
+        return entries;
     }
 
     private Object transformEntry(Object key, Object value) {

src/test/java/com/bugsnag/util/FilteredMapTest.java

@@ -111,9 +111,8 @@ public void testValues() throws Exception {
         assertEquals(3, values.size());
         assertTrue(values.contains(VAL_UNFILTERED));
         assertTrue(values.contains(PLACEHOLDER_FILTERED));
-        assertTrue(values.contains(KEY_NESTED));
 
-        values.remove(VAL_FILTERED);
+        values.remove(PLACEHOLDER_FILTERED);
         values.remove(VAL_UNFILTERED);
 
         Object nestedObj = values.toArray(new Object[1])[0];