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/06/01 16:24:30 UTC
svn commit: r950087 - in
/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/func:
AbstractFlow.java ArrayFlow.java F.java Mapper.java Predicate.java
Worker.java
Author: hlship
Date: Tue Jun 1 14:24:29 2010
New Revision: 950087
URL: http://svn.apache.org/viewvc?rev=950087&view=rev
Log:
Replace calls to Defense with simple asserts
Modified:
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/func/AbstractFlow.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/func/ArrayFlow.java
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/func/Mapper.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/func/Predicate.java
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/func/Worker.java
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/func/AbstractFlow.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/func/AbstractFlow.java?rev=950087&r1=950086&r2=950087&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/func/AbstractFlow.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/func/AbstractFlow.java Tue Jun 1 14:24:29 2010
@@ -20,8 +20,6 @@ import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
-import org.apache.tapestry5.ioc.internal.util.Defense;
-
/**
* Abstract base class for implementations of {@link Flow}. Subclasses typically override some methods
* for either efficiency, or for the concern they embrace.
@@ -99,7 +97,7 @@ abstract class AbstractFlow<T> implement
/** Subclasses may override this for efficiency. */
public Flow<T> each(Worker<? super T> worker)
{
- Defense.notNull(worker, "worker");
+ assert worker != null;
for (T value : this)
{
@@ -111,21 +109,21 @@ abstract class AbstractFlow<T> implement
public Flow<T> filter(Predicate<? super T> predicate)
{
- Defense.notNull(predicate, "predicate");
+ assert predicate != null;
return new FilteredFlow<T>(predicate, this);
}
public <X> Flow<X> map(Mapper<T, X> mapper)
{
- Defense.notNull(mapper, "mapper");
+ assert mapper != null;
return new MappedFlow<T, X>(mapper, this);
}
public <A> A reduce(Reducer<A, T> reducer, A initial)
{
- Defense.notNull(reducer, "reducer");
+ assert reducer != null;
A accumulator = initial;
@@ -158,7 +156,7 @@ abstract class AbstractFlow<T> implement
public Flow<T> remove(Predicate<? super T> predicate)
{
- Defense.notNull(predicate, "predicate");
+ assert predicate != null;
return filter(predicate.invert());
}
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/func/ArrayFlow.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/func/ArrayFlow.java?rev=950087&r1=950086&r2=950087&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/func/ArrayFlow.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/func/ArrayFlow.java Tue Jun 1 14:24:29 2010
@@ -23,7 +23,6 @@ import java.util.Iterator;
import java.util.List;
import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry5.ioc.internal.util.Defense;
/**
* Implementation of {@link Flow} based on an internal array of objects.
@@ -73,7 +72,7 @@ class ArrayFlow<T> extends AbstractFlow<
public <A> A reduce(Reducer<A, T> reducer, A initial)
{
- Defense.notNull(reducer, "reducer");
+ assert reducer != null;
A accumulator = initial;
@@ -136,7 +135,7 @@ class ArrayFlow<T> extends AbstractFlow<
public Flow<T> sort(Comparator<? super T> comparator)
{
- Defense.notNull(comparator, "comparator");
+ assert comparator != null;
if (values.length < 2)
return this;
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=950087&r1=950086&r2=950087&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 Tue Jun 1 14:24:29 2010
@@ -126,6 +126,10 @@ public class F
public static <S, T> Mapper<S, T> select(final Predicate<? super S> predicate, final Mapper<S, T> ifAccepted,
final Mapper<S, T> ifRejected)
{
+ assert predicate != null;
+ assert ifAccepted != null;
+ assert ifRejected != null;
+
return new Mapper<S, T>()
{
public T map(S input)
@@ -170,6 +174,8 @@ public class F
/** Allows a Mapper that maps to boolean to be used as a Predicate. */
public static <S> Predicate<S> toPredicate(final Mapper<S, Boolean> mapper)
{
+ assert mapper != null;
+
return new Predicate<S>()
{
public boolean accept(S object)
@@ -193,6 +199,8 @@ public class F
*/
public static <T> Flow<T> flow(Collection<T> values)
{
+ assert values != null;
+
if (values.isEmpty())
return emptyFlow();
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/func/Mapper.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/func/Mapper.java?rev=950087&r1=950086&r2=950087&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/func/Mapper.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/func/Mapper.java Tue Jun 1 14:24:29 2010
@@ -32,6 +32,8 @@ public abstract class Mapper<S, T>
*/
public final <X> Mapper<S, X> combine(final Mapper<T, X> other)
{
+ assert other != null;
+
final Mapper<S, T> stMapper = this;
return new Mapper<S, X>()
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/func/Predicate.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/func/Predicate.java?rev=950087&r1=950086&r2=950087&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/func/Predicate.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/func/Predicate.java Tue Jun 1 14:24:29 2010
@@ -14,7 +14,6 @@
package org.apache.tapestry5.func;
-import org.apache.tapestry5.ioc.internal.util.Defense;
/**
* Used when filtering a collection of objects of a given type; the predicate is passed
@@ -40,7 +39,7 @@ public abstract class Predicate<T>
*/
public final Predicate<T> and(final Predicate<? super T> other)
{
- Defense.notNull(other, "other");
+ assert other != null;
final Predicate<T> left = this;
@@ -59,7 +58,7 @@ public abstract class Predicate<T>
*/
public final Predicate<T> or(final Predicate<? super T> other)
{
- Defense.notNull(other, "other");
+ assert other != null;
final Predicate<T> left = this;
Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/func/Worker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/func/Worker.java?rev=950087&r1=950086&r2=950087&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/func/Worker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/func/Worker.java Tue Jun 1 14:24:29 2010
@@ -33,6 +33,8 @@ public abstract class Worker<T>
*/
public Worker<T> combine(final Worker<? super T> other)
{
+ assert other != null;
+
final Worker<T> first = this;
return new Worker<T>()