Add support for the $.sortWith() method.

Author: javadev

.travis.yml

@@ -1,7 +1,6 @@
 language: java
 
 jdk:
-  - openjdk6
   - openjdk7
   - oraclejdk7
   - oraclejdk8

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

@@ -207,6 +207,11 @@ public Chain<Comparable> sort() {
             return new Chain<Comparable>($.sort((List<Comparable>) value()));
         }
 
+        @SuppressWarnings("unchecked")
+        public <F extends Comparable<? super F>> Chain<F> sortWith(final Comparator<F> comparator) {
+            return new Chain<F>($.sortWith((List<F>) value(), comparator));
+        }
+
         public <F extends Comparable<? super F>> Chain<T> sortBy(final Function1<T, F> func) {
             return new Chain<T>($.sortBy(value(), func));
         }

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

@@ -669,6 +669,8 @@ public void chain() {
         $.chain(new Integer[] {0}).min(new Function1<Integer, Integer>() {
             public Integer apply(Integer value) { return value; } });
         $.chain(new Integer[] {0}).sort();
+        $.chain(new Integer[] {0}).sortWith(new Comparator<Integer>() {
+            public int compare(Integer value1, Integer value2) { return value1; } });
         $.chain(new Integer[] {0}).sortBy(new Function1<Integer, Integer>() {
             public Integer apply(Integer value) { return value; } });
         $.chain(new LinkedHashMap<Integer, Integer>().entrySet()).sortBy("");

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

@@ -161,6 +161,11 @@ public Chain<Comparable> sort() {
             return new Chain<Comparable>($.sort((List<Comparable>) value()));
         }
 
+        @SuppressWarnings("unchecked")
+        public <F extends Comparable<? super F>> Chain<F> sortWith(final Comparator<F> comparator) {
+            return new Chain<F>($.sortWith((List<F>) value(), comparator));
+        }
+
         public <F extends Comparable<? super F>> Chain<T> sortBy(final Function1<T, F> func) {
             return new Chain<T>($.sortBy(value(), func));
         }

math-plugin/src/test/java/com/github/underscore/math/MathTest.java

@@ -280,6 +280,8 @@ public void chain() {
         $.chain(new Integer[] {0}).min(new Function1<Integer, Integer>() {
             public Integer apply(Integer value) { return value; } });
         $.chain(new Integer[] {0}).sort();
+        $.chain(new Integer[] {0}).sortWith(new Comparator<Integer>() {
+            public int compare(Integer value1, Integer value2) { return value1; } });
         $.chain(new Integer[] {0}).sortBy(new Function1<Integer, Integer>() {
             public Integer apply(Integer value) { return value; } });
         $.chain(new LinkedHashMap<Integer, Integer>().entrySet()).sortBy("");

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

@@ -580,6 +580,18 @@ public static <E> Set<E> sample(final List<E> list, final int howMany) {
         return samples;
     }
 
+    public static <T extends Comparable<? super T>> List<T> sortWith(final Iterable<T> iterable,
+        final Comparator<T> comparator) {
+        final List<T> sortedList = newArrayList(iterable);
+        Collections.sort(sortedList, comparator);
+        return sortedList;
+    }
+
+    @SuppressWarnings("unchecked")
+    public <T extends Comparable<? super T>> List<T> sortWith(final Comparator<T> comparator) {
+        return sortWith((Iterable<T>) iterable, comparator);
+    }
+
     public static <E, T extends Comparable<? super T>> List<E> sortBy(final Iterable<E> iterable,
         final Function1<E, T> func) {
         final List<E> sortedList = newArrayList(iterable);
@@ -2002,6 +2014,11 @@ public Chain<Comparable> sort() {
             return new Chain<Comparable>($.sort((List<Comparable>) list));
         }
 
+        @SuppressWarnings("unchecked")
+        public <F extends Comparable<? super F>> Chain<F> sortWith(final Comparator<F> comparator) {
+            return new Chain<F>($.sortWith((List<F>) list, comparator));
+        }
+
         public <F extends Comparable<? super F>> Chain<T> sortBy(final Function1<T, F> func) {
             return new Chain<T>($.sortBy(list, func));
         }

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

@@ -1154,6 +1154,42 @@ public Integer apply(Person item) {
         assertEquals(40, resultPerson.age.intValue());
     }
 
+/*
+_.sortWith([1, 2, 3, 4, 5, 6], function(num1, num2){ return Math.sin(num1) - Math.sin(num2); });
+=> [5, 4, 6, 3, 1, 2]
+*/
+    @Test
+    @SuppressWarnings("unchecked")
+    public void sortWith() {
+        final List<Integer> result =
+        $.sortWith(asList(1, 2, 3, 4, 5, 6),
+            new Comparator<Integer>() {
+            public int compare(Integer item1, Integer item2) {
+                return Double.valueOf(Math.sin(item1) * 1000).intValue()
+                    - Double.valueOf(Math.sin(item2) * 1000).intValue();
+            }
+        });
+        assertEquals("[5, 4, 6, 3, 1, 2]", result.toString());
+        final List<Integer> resultObj =
+        new $(asList(1, 2, 3, 4, 5, 6)).sortWith(
+            new Comparator<Integer>() {
+            public int compare(Integer item1, Integer item2) {
+                return Double.valueOf(Math.sin(item1) * 1000).intValue()
+                    - Double.valueOf(Math.sin(item2) * 1000).intValue();
+            }
+        });
+        assertEquals("[5, 4, 6, 3, 1, 2]", resultObj.toString());
+        final List<Integer> resultChain =
+        $.chain(asList(1, 2, 3, 4, 5, 6)).sortWith(
+            new Comparator<Integer>() {
+            public int compare(Integer item1, Integer item2) {
+                return Double.valueOf(Math.sin(item1) * 1000).intValue()
+                    - Double.valueOf(Math.sin(item2) * 1000).intValue();
+            }
+        }).value();
+        assertEquals("[5, 4, 6, 3, 1, 2]", resultChain.toString());
+    }
+
 /*
 _.sortBy([1, 2, 3, 4, 5, 6], function(num){ return Math.sin(num); });
 => [5, 4, 6, 3, 1, 2]

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

@@ -198,6 +198,11 @@ public Chain<Comparable> sort() {
             return new Chain<Comparable>($.sort((List<Comparable>) value()));
         }
 
+        @SuppressWarnings("unchecked")
+        public <F extends Comparable<? super F>> Chain<F> sortWith(final Comparator<F> comparator) {
+            return new Chain<F>($.sortWith((List<F>) value(), comparator));
+        }
+
         public <F extends Comparable<? super F>> Chain<T> sortBy(final Function1<T, F> func) {
             return new Chain<T>($.sortBy(value(), func));
         }

string-plugin/src/test/java/com/github/underscore/string/StringTest.java

@@ -1985,6 +1985,8 @@ public void chain() {
         $.chain(new Integer[] {0}).min(new Function1<Integer, Integer>() {
             public Integer apply(Integer value) { return value; } });
         $.chain(new Integer[] {0}).sort();
+        $.chain(new Integer[] {0}).sortWith(new Comparator<Integer>() {
+            public int compare(Integer value1, Integer value2) { return value1; } });
         $.chain(new Integer[] {0}).sortBy(new Function1<Integer, Integer>() {
             public Integer apply(Integer value) { return value; } });
         $.chain(new LinkedHashMap<Integer, Integer>().entrySet()).sortBy("");