You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2010/05/27 19:33:04 UTC
svn commit: r948923 - in /tapestry/tapestry5/trunk/tapestry-ioc/src:
main/java/org/apache/tapestry5/func/
main/java/org/apache/tapestry5/ioc/internal/util/
test/java/org/apache/tapestry5/func/
test/java/org/apache/tapestry5/ioc/internal/util/
Author: hlship
Date: Thu May 27 17:33:04 2010
New Revision: 948923
URL: http://svn.apache.org/viewvc?rev=948923&view=rev
Log:
Move static method to convert a Coercion to a Mapper from F to InternalUtils (leaving just dependencies on CollectionFactory and Defense)
Modified:
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/func/F.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InternalUtils.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/func/FuncTest.java
tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InternalUtilsTest.java
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/func/F.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/func/F.java?rev=948923&r1=948922&r2=948923&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/func/F.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/func/F.java Thu May 27 17:33:04 2010
@@ -21,7 +21,6 @@ import java.util.Collections;
import java.util.List;
import org.apache.tapestry5.ioc.internal.util.Defense;
-import org.apache.tapestry5.ioc.services.Coercion;
/**
* Functional operations on collections with generics support. Tending to use the equivalent names from
@@ -62,20 +61,6 @@ public class F
return map(mapper, Arrays.asList(source));
}
- public static <S, T> Mapper<S, T> toMapper(final Coercion<S, T> coercion)
- {
- Defense.notNull(coercion, "coercion");
-
- return new Mapper<S, T>()
- {
-
- public T map(S value)
- {
- return coercion.coerce(value);
- }
- };
- }
-
/**
* Performs an operation on each element of the source collection.
*/
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InternalUtils.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InternalUtils.java?rev=948923&r1=948922&r2=948923&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InternalUtils.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/util/InternalUtils.java Thu May 27 17:33:04 2010
@@ -33,6 +33,7 @@ import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.tapestry5.func.Mapper;
import org.apache.tapestry5.func.Predicate;
import org.apache.tapestry5.ioc.*;
import org.apache.tapestry5.ioc.annotations.Inject;
@@ -48,6 +49,7 @@ import org.apache.tapestry5.ioc.def.Serv
import org.apache.tapestry5.ioc.def.ServiceDef2;
import org.apache.tapestry5.ioc.services.ClassFabUtils;
import org.apache.tapestry5.ioc.services.ClassFactory;
+import org.apache.tapestry5.ioc.services.Coercion;
/**
* Utilities used within various internal implemenations of Tapestry IOC and the rest of the tapestry-core framework.
@@ -1001,4 +1003,18 @@ public class InternalUtils
return classFileURL != null && classFileURL.getProtocol().equals("file");
}
+
+ public static <S, T> Mapper<S, T> toMapper(final Coercion<S, T> coercion)
+ {
+ Defense.notNull(coercion, "coercion");
+
+ return new Mapper<S, T>()
+ {
+
+ public T map(S value)
+ {
+ return coercion.coerce(value);
+ }
+ };
+ }
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/func/FuncTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/func/FuncTest.java?rev=948923&r1=948922&r2=948923&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/func/FuncTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/func/FuncTest.java Thu May 27 17:33:04 2010
@@ -18,12 +18,6 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import org.apache.tapestry5.func.F;
-import org.apache.tapestry5.func.Flow;
-import org.apache.tapestry5.func.Mapper;
-import org.apache.tapestry5.func.Predicate;
-import org.apache.tapestry5.func.Worker;
-import org.apache.tapestry5.ioc.services.Coercion;
import org.apache.tapestry5.ioc.test.TestBase;
import org.testng.annotations.Test;
@@ -171,21 +165,6 @@ public class FuncTest extends TestBase
}
@Test
- public void wrap_coercion_as_mapper()
- {
- Coercion<String, String> toUpper = new Coercion<String, String>()
- {
- public String coerce(String input)
- {
- return input.toUpperCase();
- }
- };
-
- assertListsEquals(F.map(F.toMapper(toUpper), "Mary", "had", "a", "little", "lamb"), "MARY", "HAD", "A",
- "LITTLE", "LAMB");
- }
-
- @Test
public void filter()
{
List<Integer> input = Arrays.asList(1, 2, 3, 4, 5, 6, 7);
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InternalUtilsTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InternalUtilsTest.java?rev=948923&r1=948922&r2=948923&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InternalUtilsTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InternalUtilsTest.java Thu May 27 17:33:04 2010
@@ -33,6 +33,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.apache.tapestry5.func.F;
import org.apache.tapestry5.func.Predicate;
import org.apache.tapestry5.ioc.AnnotationProvider;
import org.apache.tapestry5.ioc.Locatable;
@@ -47,6 +48,7 @@ import org.apache.tapestry5.ioc.def.Serv
import org.apache.tapestry5.ioc.def.ServiceDef2;
import org.apache.tapestry5.ioc.internal.QuietOperationTracker;
import org.apache.tapestry5.ioc.services.Builtin;
+import org.apache.tapestry5.ioc.services.Coercion;
import org.apache.tapestry5.ioc.services.SymbolSource;
import org.apache.tapestry5.ioc.test.IOCTestCase;
import org.easymock.EasyMock;
@@ -533,8 +535,7 @@ public class InternalUtilsTest extends I
}
};
- expect(ol.getObject(eq(SymbolSource.class), isA(AnnotationProvider.class))).andAnswer(
- answer);
+ expect(ol.getObject(eq(SymbolSource.class), isA(AnnotationProvider.class))).andAnswer(answer);
replay();
@@ -674,4 +675,19 @@ public class InternalUtilsTest extends I
assertListsEquals(output, "Barney", "Fred", "Wilma");
}
+
+ @Test
+ public void wrap_coercion_as_mapper()
+ {
+ Coercion<String, String> toUpper = new Coercion<String, String>()
+ {
+ public String coerce(String input)
+ {
+ return input.toUpperCase();
+ }
+ };
+
+ assertListsEquals(F.map(InternalUtils.toMapper(toUpper), "Mary", "had", "a", "little", "lamb"), "MARY", "HAD",
+ "A", "LITTLE", "LAMB");
+ }
}