svn commit: r947151 - in /tapestry/tapestry5/trunk/tapestry-ioc/src: main/java/org/apache/tapestry5/ioc/internal/util/Func.java test/java/org/apache/tapestry5/ioc/internal/util/FuncTest.java

[hl...@apache.org]

Author: hlship
Date: Fri May 21 20:05:43 2010
New Revision: 947151

URL: http://svn.apache.org/viewvc?rev=947151&view=rev
Log:
Add an override of map that accepts an array of values, rather than a Collection

Modified:
    tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/Func.java
    tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FuncTest.java

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/Func.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/Func.java?rev=947151&r1=947150&r2=947151&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/Func.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/Func.java Fri May 21 20:05:43 2010
@@ -15,6 +15,7 @@
 package org.apache.tapestry5.ioc.internal.util;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -55,6 +56,13 @@ public class Func
         return result;
     }
 
+    public static <S, T> List<T> map(Coercion<S, T> coercion, S... source)
+    {
+        Defense.notNull(source, "source");
+
+        return map(coercion, Arrays.asList(source));
+    }
+
     public static <S, T1, T2> Coercion<S, T2> combine(final Coercion<S, T1> first, final Coercion<T1, T2> second)
     {
         Defense.notNull(first, "first");

Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FuncTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FuncTest.java?rev=947151&r1=947150&r2=947151&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FuncTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/FuncTest.java Fri May 21 20:05:43 2010
@@ -62,9 +62,7 @@ public class FuncTest extends TestBase
     @Test
     public void combine_coercions()
     {
-        List<String> source = Arrays.asList("Mary", "had", "a", "little", "lamb");
-
-        List<Boolean> even = Func.map(Func.combine(stringToLength, toEven), source);
+        List<Boolean> even = Func.map(Func.combine(stringToLength, toEven), "Mary", "had", "a", "little", "lamb");
 
         assertListsEquals(even, true, false, false, true, true);
     }
@@ -159,13 +157,13 @@ public class FuncTest extends TestBase
     {
         List<String> source = Arrays.asList("Mary", "had", "a", "little", "lamb");
 
-        Predicate<String> combinedp = Func.toPredicate(Func.combine(stringToLength, toEven));        
+        Predicate<String> combinedp = Func.toPredicate(Func.combine(stringToLength, toEven));
         Coercion<String, String> identity = Func.identity();
         Predicate<String> isNull = Func.isNull();
 
         // Converting to null and then filtering out nulls is the hard way to do filter or remove,
         // but exercises the code we want to test.
-        
+
         List<String> filtered = Func.remove(isNull, Func.map(Func.select(combinedp, identity), source));
 
         assertListsEquals(filtered, "Mary", "little", "lamb");