Issue #4: Renamed static constructor TreeMap.map to treeMap

mperry · mperry · commit 2abd6bb4bce0 · 2015-01-11T21:53:12.000+10:00
diff --git a/core/src/main/java/fj/data/TreeMap.java b/core/src/main/java/fj/data/TreeMap.java
@@ -47,8 +47,8 @@ public static <K, V> TreeMap<K, V> empty(final Ord<K> keyOrd) {
    * @param p2s The elements to construct the tree map with.
    * @return a TreeMap with the given elements.
    */
-  public static <K, V> TreeMap<K, V> map(final Ord<K> keyOrd, final P2<K, V> ... p2s) {
-    return map(keyOrd, List.list(p2s));
+  public static <K, V> TreeMap<K, V> treeMap(final Ord<K> keyOrd, final P2<K, V>... p2s) {
+    return treeMap(keyOrd, List.list(p2s));
   }
 
   /**
@@ -58,7 +58,7 @@ public static <K, V> TreeMap<K, V> map(final Ord<K> keyOrd, final P2<K, V> ... p
    * @param list The elements to construct the tree map with.
    * @return a TreeMap with the given elements.
    */
-  public static <K, V> TreeMap<K, V> map(final Ord<K> keyOrd, final List<P2<K, V>> list) {
+  public static <K, V> TreeMap<K, V> treeMap(final Ord<K> keyOrd, final List<P2<K, V>> list) {
     TreeMap<K, V> tm = empty(keyOrd);
     for (final P2<K, V> p2 : list) {
       tm = tm.set(p2._1(), p2._2());
@@ -249,7 +249,7 @@ public P3<Set<V>, Option<V>, Set<V>> split(Ord<V> ord, final K k) {
    * @param s The elements to construct the tree map with.
    * @return a TreeMap with the given elements.
    */
-  private static <K, V> TreeMap<K, V> map(Ord<K> ord, Set<P2<K, Option<V>>> s) {
+  private static <K, V> TreeMap<K, V> treeMap(Ord<K> ord, Set<P2<K, Option<V>>> s) {
     TreeMap<K, V> empty = TreeMap.<K, V>empty(ord);
     TreeMap<K, V> tree = s.toList().foldLeft((tm, p2) -> {
       Option<V> opt = p2._2();
@@ -278,7 +278,7 @@ private static <K, V> TreeMap<K, V> map(Ord<K> ord, Set<P2<K, Option<V>>> s) {
   public P3<TreeMap<K, V>, Option<V>, TreeMap<K, V>> splitLookup(final K k) {
     P3<Set<P2<K, Option<V>>>, Option<P2<K, Option<V>>>, Set<P2<K, Option<V>>>> p3 = tree.split(P.p(k, get(k)));
     Ord<K> o = tree.ord().<K>comap(k2 -> P.p(k2, Option.<V>none()));
-    return P.p(map(o, p3._1()), get(k), map(o, p3._3()));
+    return P.p(treeMap(o, p3._1()), get(k), treeMap(o, p3._3()));
   }
 
   /**
diff --git a/core/src/test/java/fj/data/TreeMapTest.java b/core/src/test/java/fj/data/TreeMapTest.java
@@ -5,7 +5,6 @@
 import fj.P3;
 import fj.Show;
 import fj.P;
-import org.junit.Assert;
 import org.junit.Test;
 
 import static fj.data.Option.some;
@@ -22,7 +21,7 @@ public void split() {
         int pivot = 4;
         int max = 5;
         List<Integer> l = List.range(1, max + 1);
-        TreeMap<Integer, String> m2 = TreeMap.map(Ord.intOrd, l.zip(l.map(i -> i.toString())));
+        TreeMap<Integer, String> m2 = TreeMap.treeMap(Ord.intOrd, l.zip(l.map(i -> i.toString())));
         P3<Set<String>, Option<String>, Set<String>> p = m2.split(Ord.stringOrd, pivot);
 
         // print debug info
@@ -53,14 +52,14 @@ public void splitLookup() {
         int pivot = 4;
         int max = 5;
         List<Integer> l = List.range(1, max + 1);
-        TreeMap<Integer, String> m2 = TreeMap.map(Ord.intOrd, l.zip(l.map(i -> i.toString())));
+        TreeMap<Integer, String> m2 = TreeMap.treeMap(Ord.intOrd, l.zip(l.map(i -> i.toString())));
         P3<TreeMap<Integer, String>, Option<String>, TreeMap<Integer, String>> p3 = m2.splitLookup(pivot);
 
         // create expected output
         List<Integer> leftList = List.range(1, pivot);
-        TreeMap<Integer, String> leftMap = TreeMap.map(Ord.intOrd, leftList.zip(leftList.map(i -> i.toString())));
+        TreeMap<Integer, String> leftMap = TreeMap.treeMap(Ord.intOrd, leftList.zip(leftList.map(i -> i.toString())));
         List<Integer> rightList = List.range(pivot + 1, max + 1);
-        TreeMap<Integer, String> rightMap = TreeMap.map(Ord.intOrd, rightList.zip(rightList.map(i -> i.toString())));
+        TreeMap<Integer, String> rightMap = TreeMap.treeMap(Ord.intOrd, rightList.zip(rightList.map(i -> i.toString())));
 
         // debug info
         if (true) {
