Move push(), pop(), shift() and unshift() to the underscore library.

Author: javadev

lodash-plugin/src/main/java/com/github/underscore/lodash/$.java

@@ -1,7 +1,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright 2016 Valentyn Kolesnikov
+ * Copyright 2015-2017 Valentyn Kolesnikov
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -460,22 +460,6 @@ public Chain<T> at(final Integer ... indexes) {
             return new Chain<T>($.at(value(), indexes));
         }
 
-        public Chain<T> push(final T ... values) {
-            return new Chain<T>($.push(value(), values));
-        }
-
-        public Chain<Tuple<T, List<T>>> pop() {
-            return new Chain<Tuple<T, List<T>>>($.pop(value()));
-        }
-
-        public Chain<Tuple<T, List<T>>> shift() {
-            return new Chain<Tuple<T, List<T>>>($.shift(value()));
-        }
-
-        public Chain<T> unshift(final T ... values) {
-            return new Chain<T>($.unshift(value(), values));
-        }
-
         @SuppressWarnings("unchecked")
         public <F extends Number> Chain<F> sum() {
             return new Chain<F>($.sum((List<F>) value()));
@@ -875,48 +859,6 @@ public List<T> at(final Integer ... indexes) {
         return at((List<T>) getIterable(), indexes);
     }
 
-    public static <T> List<T> push(final List<T> list, final T ... values) {
-        final List<T> result = newArrayList(list);
-        for (T value : values) {
-            result.add(value);
-        }
-        return result;
-    }
-
-    public List<T> push(final T ... values) {
-        return push((List<T>) getIterable(), values);
-    }
-
-    public static <T> Tuple<T, List<T>> pop(final List<T> list) {
-        return Tuple.create(last(list), initial(list));
-    }
-
-    public Tuple<T, List<T>> pop() {
-        return pop((List<T>) getIterable());
-    }
-
-    public static <T> List<T> unshift(final List<T> list, final T ... values) {
-        final List<T> result = newArrayList(list);
-        int index = 0;
-        for (T value : values) {
-            result.add(index, value);
-            index += 1;
-        }
-        return result;
-    }
-
-    public List<T> unshift(final T ... values) {
-        return unshift((List<T>) getIterable(), values);
-    }
-
-    public static <T> Tuple<T, List<T>> shift(final List<T> list) {
-        return Tuple.create(first(list), rest(list));
-    }
-
-    public Tuple<T, List<T>> shift() {
-        return shift((List<T>) getIterable());
-    }
-
     public static <T extends Number> T sum(final Iterable<T> iterable) {
         T result = null;
         for (final T item : iterable) {

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

@@ -432,54 +432,6 @@ public void at() {
         assertEquals("[a, c]", $.chain(asList("a", "b", "c")).at(0, 2).value().toString());
     }
 
-/*
-_.push(['a', 'b', 'c'], 0, 2);
-// → ['a', 'b', 'c', 0, 2]
-*/
-    @SuppressWarnings("unchecked")
-    @Test
-    public void push() {
-        assertEquals("[a, b, c, 0, 2]", $.push(asList("a", "b", "c"), "0", "2").toString());
-        assertEquals("[a, b, c, 0, 2]", new $(asList("a", "b", "c")).push("0", "2").toString());
-        assertEquals("[a, b, c, 0, 2]", $.chain(asList("a", "b", "c")).push("0", "2").value().toString());
-    }
-
-/*
-_.pop(['a', 'b', 'c']);
-// → 'c'
-*/
-    @SuppressWarnings("unchecked")
-    @Test
-    public void pop() {
-        assertEquals("c", $.pop(asList("a", "b", "c")).fst().toString());
-        assertEquals("c", new $(asList("a", "b", "c")).pop().fst().toString());
-        assertEquals("c", $.chain(asList("a", "b", "c")).pop().item().fst().toString());
-    }
-
-/*
-_.shift(['a', 'b', 'c']);
-// → 'a'
-*/
-    @SuppressWarnings("unchecked")
-    @Test
-    public void shift() {
-        assertEquals("a", $.shift(asList("a", "b", "c")).fst().toString());
-        assertEquals("a", new $(asList("a", "b", "c")).shift().fst().toString());
-        assertEquals("a", $.chain(asList("a", "b", "c")).shift().item().fst().toString());
-    }
-
-/*
-_.unshift(['a', 'b', 'c'], 0, 2);
-// → [0, 2, 'a', 'b', 'c']
-*/
-    @SuppressWarnings("unchecked")
-    @Test
-    public void unshift() {
-        assertEquals("[0, 2, a, b, c]", $.unshift(asList("a", "b", "c"), "0", "2").toString());
-        assertEquals("[0, 2, a, b, c]", new $(asList("a", "b", "c")).unshift("0", "2").toString());
-        assertEquals("[0, 2, a, b, c]", $.chain(asList("a", "b", "c")).unshift("0", "2").value().toString());
-    }
-
 /*
 _.get({"a":[{"b":{"c":"d"}}]}, "a[0].b.c");
 // → "d"

src/main/java/com/github/underscore/$.java

@@ -2148,6 +2148,22 @@ public Chain<String> join(final String separator) {
             return new Chain<String>($.join(list, separator));
         }
 
+        public Chain<T> push(final T ... values) {
+            return new Chain<T>($.push(value(), values));
+        }
+
+        public Chain<Tuple<T, List<T>>> pop() {
+            return new Chain<Tuple<T, List<T>>>($.pop(value()));
+        }
+
+        public Chain<Tuple<T, List<T>>> shift() {
+            return new Chain<Tuple<T, List<T>>>($.shift(value()));
+        }
+
+        public Chain<T> unshift(final T ... values) {
+            return new Chain<T>($.unshift(value(), values));
+        }
+
         public Chain<T> skip(final int numberToSkip) {
             return new Chain<T>(list.subList(numberToSkip, list.size()));
         }
@@ -2244,6 +2260,48 @@ public String join() {
         return join(iterable);
     }
 
+    public static <T> List<T> push(final List<T> list, final T ... values) {
+        final List<T> result = newArrayList(list);
+        for (T value : values) {
+            result.add(value);
+        }
+        return result;
+    }
+
+    public List<T> push(final T ... values) {
+        return push((List<T>) getIterable(), values);
+    }
+
+    public static <T> Tuple<T, List<T>> pop(final List<T> list) {
+        return Tuple.create(last(list), initial(list));
+    }
+
+    public Tuple<T, List<T>> pop() {
+        return pop((List<T>) getIterable());
+    }
+
+    public static <T> List<T> unshift(final List<T> list, final T ... values) {
+        final List<T> result = newArrayList(list);
+        int index = 0;
+        for (T value : values) {
+            result.add(index, value);
+            index += 1;
+        }
+        return result;
+    }
+
+    public List<T> unshift(final T ... values) {
+        return unshift((List<T>) getIterable(), values);
+    }
+
+    public static <T> Tuple<T, List<T>> shift(final List<T> list) {
+        return Tuple.create(first(list), rest(list));
+    }
+
+    public Tuple<T, List<T>> shift() {
+        return shift((List<T>) getIterable());
+    }
+
     @SuppressWarnings("unchecked")
     public static <T> T[] concat(final T[] first, final T[] ... other) {
         int length = 0;

src/test/java/com/github/underscore/UnderscoreTest.java

@@ -86,6 +86,54 @@ public void join() {
         assertEquals("--", $.join(asList("", "", ""), "-"));
     }
 
+/*
+_.push(['a', 'b', 'c'], 0, 2);
+// → ['a', 'b', 'c', 0, 2]
+*/
+    @SuppressWarnings("unchecked")
+    @Test
+    public void push() {
+        assertEquals("[a, b, c, 0, 2]", $.push(asList("a", "b", "c"), "0", "2").toString());
+        assertEquals("[a, b, c, 0, 2]", new $(asList("a", "b", "c")).push("0", "2").toString());
+        assertEquals("[a, b, c, 0, 2]", $.chain(asList("a", "b", "c")).push("0", "2").value().toString());
+    }
+
+/*
+_.pop(['a', 'b', 'c']);
+// → 'c'
+*/
+    @SuppressWarnings("unchecked")
+    @Test
+    public void pop() {
+        assertEquals("c", $.pop(asList("a", "b", "c")).fst().toString());
+        assertEquals("c", new $(asList("a", "b", "c")).pop().fst().toString());
+        assertEquals("c", $.chain(asList("a", "b", "c")).pop().item().fst().toString());
+    }
+
+/*
+_.shift(['a', 'b', 'c']);
+// → 'a'
+*/
+    @SuppressWarnings("unchecked")
+    @Test
+    public void shift() {
+        assertEquals("a", $.shift(asList("a", "b", "c")).fst().toString());
+        assertEquals("a", new $(asList("a", "b", "c")).shift().fst().toString());
+        assertEquals("a", $.chain(asList("a", "b", "c")).shift().item().fst().toString());
+    }
+
+/*
+_.unshift(['a', 'b', 'c'], 0, 2);
+// → [0, 2, 'a', 'b', 'c']
+*/
+    @SuppressWarnings("unchecked")
+    @Test
+    public void unshift() {
+        assertEquals("[0, 2, a, b, c]", $.unshift(asList("a", "b", "c"), "0", "2").toString());
+        assertEquals("[0, 2, a, b, c]", new $(asList("a", "b", "c")).unshift("0", "2").toString());
+        assertEquals("[0, 2, a, b, c]", $.chain(asList("a", "b", "c")).unshift("0", "2").value().toString());
+    }
+
     @Test
     public void compareStrings() {
         assertArrayEquals($.sort("CAT".split("")), $.sort("CTA".split("")));