Add remove(path) and clear() for object and array builder.

Author: javadev

src/main/java/com/github/underscore/lodash/U.java

@@ -1522,9 +1522,15 @@ public static List<String> stringToPath(final String string) {
         return result;
     }
 
+    private enum OperationType {
+        GET,
+        SET,
+        REMOVE
+    }
+
     @SuppressWarnings("unchecked")
-    private static <T> T baseGetAndSet(final Map<String, Object> object, final String path,
-        final Optional<Object> value) {
+    private static <T> T baseGetOrSetOrRemove(final Map<String, Object> object, final String path,
+        final Object value, OperationType operationType) {
         final List<String> paths = stringToPath(path);
         int index = 0;
         final int length = paths.size();
@@ -1552,11 +1558,17 @@ private static <T> T baseGetAndSet(final Map<String, Object> object, final Strin
             index += 1;
         }
         if (index > 0 && index == length) {
-            if (value.isPresent()) {
+            if (operationType == OperationType.SET) {
+                if (savedLocalObject instanceof Map) {
+                    ((Map) savedLocalObject).put(savedPath, value);
+                } else {
+                    ((List) savedLocalObject).set(Integer.parseInt(savedPath), value);
+                }
+            } else if (operationType == OperationType.REMOVE) {
                 if (savedLocalObject instanceof Map) {
-                    ((Map) savedLocalObject).put(savedPath, value.get());
+                    ((Map) savedLocalObject).remove(savedPath);
                 } else {
-                    ((List) savedLocalObject).set(Integer.parseInt(savedPath), value.get());
+                    ((List) savedLocalObject).remove(Integer.parseInt(savedPath));
                 }
             }
             return (T) localObject;
@@ -1569,39 +1581,15 @@ private static Map.Entry getMapEntry(Map map) {
     }
 
     public static <T> T get(final Map<String, Object> object, final String path) {
-        return baseGetAndSet(object, path, Optional.absent());
+        return baseGetOrSetOrRemove(object, path, null, OperationType.GET);
     }
 
     public static <T> T set(final Map<String, Object> object, final String path, Object value) {
-        return baseGetAndSet(object, path, Optional.of(value));
+        return baseGetOrSetOrRemove(object, path, value, OperationType.SET);
     }
 
-    @SuppressWarnings("unchecked")
-    public static Map<String, Object> remove(final Map<String, Object> map, final String key) {
-        Map<String, Object> outMap = newLinkedHashMap();
-        for (Map.Entry<String, Object> entry : map.entrySet()) {
-            if (!entry.getKey().equals(key)) {
-                outMap.put(entry.getKey(), makeObjectForRemove(entry.getValue(), key));
-            }
-        }
-        return outMap;
-    }
-
-    @SuppressWarnings("unchecked")
-    private static Object makeObjectForRemove(Object value, final String key) {
-        final Object result;
-        if (value instanceof List) {
-            List<Object> values = newArrayList();
-            for (Object item : (List) value) {
-                values.add(item instanceof Map ? remove((Map<String, Object>) item, key) : item);
-            }
-            result = values;
-        } else if (value instanceof Map) {
-            result = remove((Map<String, Object>) value, key);
-        } else {
-            result = value;
-        }
-        return result;
+    public static <T> T remove(final Map<String, Object> object, final String path) {
+        return baseGetOrSetOrRemove(object, path, null, OperationType.REMOVE);
     }
 
     @SuppressWarnings("unchecked")
@@ -2489,6 +2477,16 @@ public Builder set(final String path, final Object value) {
             return this;
         }
 
+        public Builder remove(final String key) {
+            U.remove(data, key);
+            return this;
+        }
+
+        public Builder clear() {
+            data.clear();
+            return this;
+        }
+
         public Builder add(final Builder builder) {
             data.put(String.valueOf(data.size()), builder.build());
             return this;
@@ -2555,6 +2553,16 @@ public ArrayBuilder set(final int index, final Object value) {
             return this;
         }
 
+        public ArrayBuilder remove(final int index) {
+            data.remove(index);
+            return this;
+        }
+
+        public ArrayBuilder clear() {
+            data.clear();
+            return this;
+        }
+
         public ArrayBuilder add(final ArrayBuilder builder) {
             data.addAll(builder.build());
             return this;

src/test/java/com/github/underscore/lodash/LodashTest.java

@@ -631,8 +631,9 @@ public void removeMapKey() {
         list.add(U.newLinkedHashMap());
         map2.put("list", list);
         U.remove(map2, "test");
-        map2.put("list", U.newLinkedHashMap());
+        map2.put("list2", U.newLinkedHashMap());
         U.remove(map2, "test");
+        U.remove(map2, "list.0");
     }
 
     @Test
@@ -813,6 +814,10 @@ public void objectBuilder() {
         builder.set("1", "3");
         builder.toString();
         assertEquals("{1=3}", builder.build().toString());
+        builder.remove("1");
+        assertEquals("{}", builder.build().toString());
+        builder.clear();
+        assertEquals("{}", builder.build().toString());
         Map<String, Object> value = U.objectBuilder()
             .add("firstName", "John")
             .add("lastName", "Smith")
@@ -846,6 +851,10 @@ public void arrayBuilder() {
         builder.set(1, "3");
         builder.toString();
         assertEquals("[1, 3, 1, 2]", builder.build().toString());
+        builder.remove(1);
+        assertEquals("[1, 1, 2]", builder.build().toString());
+        builder.clear();
+        assertEquals("[]", builder.build().toString());
         Map<String, Object> value = U.objectBuilder()
             .add("firstName", "John")
             .add("lastName", "Smith")