Merge pull request #215 from milosimpson/removeRecursive

Be more performant in the removeRecursive methods.
bazaarvoice · Jun 9, 2016 · dcf544e · dcf544e
2 parents 0704ef5 + ef2b2de
commit dcf544e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/jolt-core/src/main/java/com/bazaarvoice/jolt/utils/JoltUtils.java b/jolt-core/src/main/java/com/bazaarvoice/jolt/utils/JoltUtils.java
@@ -22,9 +22,8 @@
 import java.util.List;
 import java.util.Map;
 
-
 /**
- * Handy utilities that do NOT depend on JsonUtil lives here!
+ * Handy utilities that do NOT depend on JsonUtil / Jackson live here
  */
 public class JoltUtils {
 
@@ -44,13 +43,14 @@ public static void removeRecursive( Object json, String keyToRemove ) {
             Map<String, Object> jsonMap = cast(json);
 
             // If this level of the tree has the key we are looking for, remove it
+            // Do the lookup instead of just the remove to avoid un-necessarily
+            //  dying on ImmutableMaps.
             if ( jsonMap.containsKey( keyToRemove ) ) {
                 jsonMap.remove( keyToRemove );
             }
 
             // regardless, recurse down the tree
-            for ( String subKey : jsonMap.keySet() ) {
-                Object value = jsonMap.get( subKey );
+            for ( Object value : jsonMap.values() ) {
                 removeRecursive( value, keyToRemove );
             }
         }

diff --git a/json-utils/src/main/java/com/bazaarvoice/jolt/JsonUtils.java b/json-utils/src/main/java/com/bazaarvoice/jolt/JsonUtils.java
@@ -63,13 +63,14 @@ public static void removeRecursive( Object json, String keyToRemove ) {
             Map<String, Object> jsonMap = (Map<String, Object>) json;
 
             // If this level of the tree has the key we are looking for, remove it
+            // Do the lookup instead of just the remove to avoid un-necessarily
+            //  dying on ImmutableMaps.
             if ( jsonMap.containsKey( keyToRemove ) ) {
                 jsonMap.remove( keyToRemove );
             }
 
             // regardless, recurse down the tree
-            for ( String subKey : jsonMap.keySet() ) {
-                Object value = jsonMap.get( subKey );
+            for ( Object value : jsonMap.values() ) {
                 removeRecursive( value, keyToRemove );
             }
         }