You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2008/11/01 01:21:40 UTC
svn commit: r709613 [1/2] - in /activemq/camel/trunk:
camel-core/src/main/java/org/apache/camel/
camel-core/src/main/java/org/apache/camel/builder/
camel-core/src/main/java/org/apache/camel/builder/xml/
camel-core/src/main/java/org/apache/camel/compone...
Author: hadrian
Date: Fri Oct 31 17:21:38 2008
New Revision: 709613
URL: http://svn.apache.org/viewvc?rev=709613&view=rev
Log:
CAMEL-507. Remove generics for Expression, Predicate and Language.
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Expression.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Predicate.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BinaryPredicateSupport.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/Builder.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateFactory.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateSupport.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/AssertionClause.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/CamelConverter.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/BinaryPredicateSupport.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ExpressionSupport.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/PredicateSupport.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/ExpressionEvaluationException.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanLanguage.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/constant/ConstantLanguage.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/header/HeaderLanguage.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/AbstractSimpleLanguage.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/FileExpressionBuilder.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/FileLanguage.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/xpath/XPathLanguage.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoopType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ChoiceProcessor.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Delayer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/FilterProcessor.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/LoopProcessor.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/Resequencer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregationCollection.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/DefaultAggregationCollection.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/aggregate/PredicateAggregationCollection.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/idempotent/IdempotentConsumer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/interceptor/Tracer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/loadbalancer/StickyLoadBalancer.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/DefaultExchangeComparator.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/resequencer/ExpressionResultComparator.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/Language.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/CamelContextHelper.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExpressionComparator.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/util/ExpressionHelper.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/LanguageTestSupport.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExpressionBuilderTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/PredicateBuilderTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/PredicateAsBeanTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/CustomDataSetTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ExpressionAdapter.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/CustomAggregationCollectionTest.java
activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/BamProcessorSupport.java
activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessor.java
activemq/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessorSupport.java
activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/CamelGroovyMethods.java
activemq/camel/trunk/components/camel-groovy/src/main/java/org/apache/camel/language/groovy/GroovyExpression.java
activemq/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/HttpMethods.java
activemq/camel/trunk/components/camel-josql/src/main/java/org/apache/camel/builder/sql/SqlBuilder.java
activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaEndpoint.java
activemq/camel/trunk/components/camel-jpa/src/main/java/org/apache/camel/component/jpa/JpaProducer.java
activemq/camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java
activemq/camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelLanguage.java
activemq/camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathExpression.java
activemq/camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathLanguage.java
activemq/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java
activemq/camel/trunk/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlLanguage.java
activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryBuilder.java
activemq/camel/trunk/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryLanguage.java
activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptBuilder.java
activemq/camel/trunk/components/camel-script/src/main/java/org/apache/camel/builder/script/ScriptLanguage.java
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Expression.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Expression.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Expression.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Expression.java Fri Oct 31 17:21:38 2008
@@ -27,7 +27,7 @@
*
* @version $Revision$
*/
-public interface Expression<E extends Exchange> {
+public interface Expression {
/**
* Returns the value of the expression on the given exchange
@@ -35,5 +35,5 @@
* @param exchange the message exchange on which to evaluate the expression
* @return the value of the expression
*/
- Object evaluate(E exchange);
+ Object evaluate(Exchange exchange);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Predicate.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Predicate.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Predicate.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/Predicate.java Fri Oct 31 17:21:38 2008
@@ -27,7 +27,7 @@
*
* @version $Revision$
*/
-public interface Predicate<E> {
+public interface Predicate {
/**
* Evaluates the predicate on the message exchange and returns true if this
@@ -36,7 +36,7 @@
* @param exchange the message exchange
* @return true if the predicate matches
*/
- boolean matches(E exchange);
+ boolean matches(Exchange exchange);
/**
* Allows this predicate to be used nicely in testing to generate a nicely
@@ -47,6 +47,6 @@
* @param exchange the exchange to evaluate the expression on
* @throws AssertionError if the predicate does not match
*/
- void assertMatches(String text, E exchange) throws AssertionError;
+ void assertMatches(String text, Exchange exchange) throws AssertionError;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BinaryPredicateSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BinaryPredicateSupport.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BinaryPredicateSupport.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BinaryPredicateSupport.java Fri Oct 31 17:21:38 2008
@@ -26,12 +26,12 @@
*
* @version $Revision$
*/
-public abstract class BinaryPredicateSupport<E extends Exchange> implements Predicate<E> {
+public abstract class BinaryPredicateSupport implements Predicate {
- private final Expression<E> left;
- private final Expression<E> right;
+ private final Expression left;
+ private final Expression right;
- protected BinaryPredicateSupport(Expression<E> left, Expression<E> right) {
+ protected BinaryPredicateSupport(Expression left, Expression right) {
notNull(left, "left");
notNull(right, "right");
@@ -44,13 +44,13 @@
return left + " " + getOperationText() + " " + right;
}
- public boolean matches(E exchange) {
+ public boolean matches(Exchange exchange) {
Object leftValue = left.evaluate(exchange);
Object rightValue = right.evaluate(exchange);
return matches(exchange, leftValue, rightValue);
}
- public void assertMatches(String text, E exchange) {
+ public void assertMatches(String text, Exchange exchange) {
Object leftValue = left.evaluate(exchange);
Object rightValue = right.evaluate(exchange);
if (!matches(exchange, leftValue, rightValue)) {
@@ -58,12 +58,12 @@
}
}
- protected abstract boolean matches(E exchange, Object leftValue, Object rightValue);
+ protected abstract boolean matches(Exchange exchange, Object leftValue, Object rightValue);
protected abstract String getOperationText();
- protected String assertionFailureMessage(E exchange, Object leftValue, Object rightValue) {
- return this + " failed on " + exchange + " with left value <" + leftValue + "> right value <"
- + rightValue + ">";
+ protected String assertionFailureMessage(Exchange exchange, Object leftValue, Object rightValue) {
+ return this + " failed on " + exchange +
+ " with left value <" + leftValue + "> right value <" + rightValue + ">";
}
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/Builder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/Builder.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/Builder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/Builder.java Fri Oct 31 17:21:38 2008
@@ -38,84 +38,83 @@
/**
* Returns a constant expression
*/
- public static <E extends Exchange> ValueBuilder<E> constant(Object value) {
- Expression<E> expression = ExpressionBuilder.constantExpression(value);
- return new ValueBuilder<E>(expression);
+ public static ValueBuilder constant(Object value) {
+ Expression expression = ExpressionBuilder.constantExpression(value);
+ return new ValueBuilder(expression);
}
/**
* Returns a predicate and value builder for headers on an exchange
*/
- public static <E extends Exchange> ValueBuilder<E> header(String name) {
- Expression<E> expression = ExpressionBuilder.headerExpression(name);
- return new ValueBuilder<E>(expression);
+ public static ValueBuilder header(String name) {
+ Expression expression = ExpressionBuilder.headerExpression(name);
+ return new ValueBuilder(expression);
}
/**
* Returns a predicate and value builder for the inbound body on an exchange
*/
- public static <E extends Exchange> ValueBuilder<E> body() {
- Expression<E> expression = ExpressionBuilder.bodyExpression();
- return new ValueBuilder<E>(expression);
+ public static ValueBuilder body() {
+ Expression expression = ExpressionBuilder.bodyExpression();
+ return new ValueBuilder(expression);
}
/**
* Returns a predicate and value builder for the inbound message body as a
* specific type
*/
- public static <E extends Exchange, T> ValueBuilder<E> bodyAs(Class<T> type) {
- Expression<E> expression = ExpressionBuilder.bodyExpression(type);
- return new ValueBuilder<E>(expression);
+ public static <E extends Exchange, T> ValueBuilder bodyAs(Class<T> type) {
+ Expression expression = ExpressionBuilder.bodyExpression(type);
+ return new ValueBuilder(expression);
}
/**
* Returns a predicate and value builder for the outbound body on an
* exchange
*/
- public static <E extends Exchange> ValueBuilder<E> outBody() {
- Expression<E> expression = ExpressionBuilder.outBodyExpression();
- return new ValueBuilder<E>(expression);
+ public static ValueBuilder outBody() {
+ Expression expression = ExpressionBuilder.outBodyExpression();
+ return new ValueBuilder(expression);
}
/**
* Returns a predicate and value builder for the outbound message body as a
* specific type
*/
- public static <E extends Exchange, T> ValueBuilder<E> outBodyAs(Class<T> type) {
- Expression<E> expression = ExpressionBuilder.outBodyExpression(type);
- return new ValueBuilder<E>(expression);
+ public static <E extends Exchange, T> ValueBuilder outBodyAs(Class<T> type) {
+ Expression expression = ExpressionBuilder.outBodyExpression(type);
+ return new ValueBuilder(expression);
}
/**
* Returns a predicate and value builder for the fault body on an
* exchange
*/
- public static <E extends Exchange> ValueBuilder<E> faultBody() {
- Expression<E> expression = ExpressionBuilder.faultBodyExpression();
- return new ValueBuilder<E>(expression);
+ public static ValueBuilder faultBody() {
+ Expression expression = ExpressionBuilder.faultBodyExpression();
+ return new ValueBuilder(expression);
}
/**
* Returns a predicate and value builder for the fault message body as a
* specific type
*/
- public static <E extends Exchange, T> ValueBuilder<E> faultBodyAs(Class<T> type) {
- Expression<E> expression = ExpressionBuilder.faultBodyExpression(type);
- return new ValueBuilder<E>(expression);
+ public static <E extends Exchange, T> ValueBuilder faultBodyAs(Class<T> type) {
+ Expression expression = ExpressionBuilder.faultBodyExpression(type);
+ return new ValueBuilder(expression);
}
/**
* Returns an expression for the given system property
*/
- public static <E extends Exchange> ValueBuilder<E> systemProperty(final String name) {
+ public static ValueBuilder systemProperty(final String name) {
return systemProperty(name, null);
}
/**
* Returns an expression for the given system property
*/
- public static <E extends Exchange> ValueBuilder<E> systemProperty(final String name,
- final String defaultValue) {
- return new ValueBuilder<E>(ExpressionBuilder.<E> systemProperty(name, defaultValue));
+ public static ValueBuilder systemProperty(final String name, final String defaultValue) {
+ return new ValueBuilder(ExpressionBuilder.systemProperty(name, defaultValue));
}
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java Fri Oct 31 17:21:38 2008
@@ -52,9 +52,9 @@
* @param headerName the name of the header the expression will return
* @return an expression object which will return the header value
*/
- public static <E extends Exchange> Expression<E> headerExpression(final String headerName) {
- return new Expression<E>() {
- public Object evaluate(E exchange) {
+ public static Expression headerExpression(final String headerName) {
+ return new Expression() {
+ public Object evaluate(Exchange exchange) {
Object header = exchange.getIn().getHeader(headerName);
if (header == null) {
// lets try the exchange header
@@ -76,9 +76,9 @@
* @see Message#getHeaders()
* @return an expression object which will return the inbound headers
*/
- public static <E extends Exchange> Expression<E> headersExpression() {
- return new Expression<E>() {
- public Object evaluate(E exchange) {
+ public static Expression headersExpression() {
+ return new Expression() {
+ public Object evaluate(Exchange exchange) {
return exchange.getIn().getHeaders();
}
@@ -95,9 +95,9 @@
* @param headerName the name of the header the expression will return
* @return an expression object which will return the header value
*/
- public static <E extends Exchange> Expression<E> outHeaderExpression(final String headerName) {
- return new Expression<E>() {
- public Object evaluate(E exchange) {
+ public static Expression outHeaderExpression(final String headerName) {
+ return new Expression() {
+ public Object evaluate(Exchange exchange) {
Message out = exchange.getOut(false);
if (out == null) {
return null;
@@ -123,9 +123,9 @@
* @see Message#getHeaders()
* @return an expression object which will return the inbound headers
*/
- public static <E extends Exchange> Expression<E> outHeadersExpression() {
- return new Expression<E>() {
- public Object evaluate(E exchange) {
+ public static Expression outHeadersExpression() {
+ return new Expression() {
+ public Object evaluate(Exchange exchange) {
return exchange.getOut().getHeaders();
}
@@ -143,9 +143,9 @@
* @param propertyName the name of the property the expression will return
* @return an expression object which will return the property value
*/
- public static <E extends Exchange> Expression<E> propertyExpression(final String propertyName) {
- return new Expression<E>() {
- public Object evaluate(E exchange) {
+ public static Expression propertyExpression(final String propertyName) {
+ return new Expression() {
+ public Object evaluate(Exchange exchange) {
return exchange.getProperty(propertyName);
}
@@ -163,9 +163,9 @@
* @see Exchange#getProperties()
* @return an expression object which will return the properties
*/
- public static <E extends Exchange> Expression<E> propertiesExpression() {
- return new Expression<E>() {
- public Object evaluate(E exchange) {
+ public static Expression propertiesExpression() {
+ return new Expression() {
+ public Object evaluate(Exchange exchange) {
return exchange.getProperties();
}
@@ -183,7 +183,7 @@
* return
* @return an expression object which will return the system property value
*/
- public static <E extends Exchange> Expression<E> systemPropertyExpression(final String propertyName) {
+ public static Expression systemPropertyExpression(final String propertyName) {
return systemPropertyExpression(propertyName, null);
}
@@ -194,10 +194,10 @@
* return
* @return an expression object which will return the system property value
*/
- public static <E extends Exchange> Expression<E> systemPropertyExpression(final String propertyName,
+ public static Expression systemPropertyExpression(final String propertyName,
final String defaultValue) {
- return new Expression<E>() {
- public Object evaluate(E exchange) {
+ return new Expression() {
+ public Object evaluate(Exchange exchange) {
return System.getProperty(propertyName, defaultValue);
}
@@ -214,9 +214,9 @@
* @param value the value the expression will return
* @return an expression object which will return the constant value
*/
- public static <E extends Exchange> Expression<E> constantExpression(final Object value) {
- return new Expression<E>() {
- public Object evaluate(E exchange) {
+ public static Expression constantExpression(final Object value) {
+ return new Expression() {
+ public Object evaluate(Exchange exchange) {
return value;
}
@@ -230,9 +230,9 @@
/**
* Returns the expression for the exchanges inbound message body
*/
- public static <E extends Exchange> Expression<E> bodyExpression() {
- return new Expression<E>() {
- public Object evaluate(E exchange) {
+ public static Expression bodyExpression() {
+ return new Expression() {
+ public Object evaluate(Exchange exchange) {
return exchange.getIn().getBody();
}
@@ -247,9 +247,9 @@
* Returns the expression for the exchanges inbound message body converted
* to the given type
*/
- public static <E extends Exchange, T> Expression<E> bodyExpression(final Class<T> type) {
- return new Expression<E>() {
- public Object evaluate(E exchange) {
+ public static <T> Expression bodyExpression(final Class<T> type) {
+ return new Expression() {
+ public Object evaluate(Exchange exchange) {
return exchange.getIn().getBody(type);
}
@@ -263,9 +263,9 @@
/**
* Returns the expression for the out messages body
*/
- public static <E extends Exchange> Expression<E> outBodyExpression() {
- return new Expression<E>() {
- public Object evaluate(E exchange) {
+ public static Expression outBodyExpression() {
+ return new Expression() {
+ public Object evaluate(Exchange exchange) {
Message out = exchange.getOut(false);
if (out == null) {
return null;
@@ -284,9 +284,9 @@
* Returns the expression for the exchanges outbound message body converted
* to the given type
*/
- public static <E extends Exchange, T> Expression<E> outBodyExpression(final Class<T> type) {
- return new Expression<E>() {
- public Object evaluate(E exchange) {
+ public static <T> Expression outBodyExpression(final Class<T> type) {
+ return new Expression() {
+ public Object evaluate(Exchange exchange) {
Message out = exchange.getOut(false);
if (out == null) {
return null;
@@ -304,9 +304,9 @@
/**
* Returns the expression for the fault messages body
*/
- public static <E extends Exchange> Expression<E> faultBodyExpression() {
- return new Expression<E>() {
- public Object evaluate(E exchange) {
+ public static Expression faultBodyExpression() {
+ return new Expression() {
+ public Object evaluate(Exchange exchange) {
return exchange.getFault().getBody();
}
@@ -321,9 +321,9 @@
* Returns the expression for the exchanges fault message body converted
* to the given type
*/
- public static <E extends Exchange, T> Expression<E> faultBodyExpression(final Class<T> type) {
- return new Expression<E>() {
- public Object evaluate(E exchange) {
+ public static <T> Expression faultBodyExpression(final Class<T> type) {
+ return new Expression() {
+ public Object evaluate(Exchange exchange) {
return exchange.getFault().getBody(type);
}
@@ -337,9 +337,9 @@
/**
* Returns the expression for the exchange
*/
- public static <E extends Exchange> Expression<E> exchangeExpression() {
- return new Expression<E>() {
- public Object evaluate(E exchange) {
+ public static Expression exchangeExpression() {
+ return new Expression() {
+ public Object evaluate(Exchange exchange) {
return exchange;
}
@@ -353,9 +353,9 @@
/**
* Returns the expression for the IN message
*/
- public static <E extends Exchange> Expression<E> inMessageExpression() {
- return new Expression<E>() {
- public Object evaluate(E exchange) {
+ public static Expression inMessageExpression() {
+ return new Expression() {
+ public Object evaluate(Exchange exchange) {
return exchange.getIn();
}
@@ -369,9 +369,9 @@
/**
* Returns the expression for the OUT message
*/
- public static <E extends Exchange> Expression<E> outMessageExpression() {
- return new Expression<E>() {
- public Object evaluate(E exchange) {
+ public static Expression outMessageExpression() {
+ return new Expression() {
+ public Object evaluate(Exchange exchange) {
return exchange.getOut();
}
@@ -386,9 +386,9 @@
* Returns an expression which converts the given expression to the given
* type
*/
- public static <E extends Exchange> Expression<E> convertTo(final Expression expression, final Class type) {
- return new Expression<E>() {
- public Object evaluate(E exchange) {
+ public static Expression convertTo(final Expression expression, final Class type) {
+ return new Expression() {
+ public Object evaluate(Exchange exchange) {
Object value = expression.evaluate(exchange);
return exchange.getContext().getTypeConverter().convertTo(type, exchange, value);
}
@@ -404,10 +404,10 @@
* Returns a tokenize expression which will tokenize the string with the
* given token
*/
- public static <E extends Exchange> Expression<E> tokenizeExpression(final Expression<E> expression,
+ public static Expression tokenizeExpression(final Expression expression,
final String token) {
- return new Expression<E>() {
- public Object evaluate(E exchange) {
+ return new Expression() {
+ public Object evaluate(Exchange exchange) {
Object value = expression.evaluate(exchange);
Scanner scanner = getScanner(exchange, value);
scanner.useDelimiter(token);
@@ -425,11 +425,11 @@
* Returns a tokenize expression which will tokenize the string with the
* given regex
*/
- public static <E extends Exchange> Expression<E> regexTokenize(final Expression<E> expression,
- final String regexTokenizer) {
+ public static Expression regexTokenize(final Expression expression,
+ final String regexTokenizer) {
final Pattern pattern = Pattern.compile(regexTokenizer);
- return new Expression<E>() {
- public Object evaluate(E exchange) {
+ return new Expression() {
+ public Object evaluate(Exchange exchange) {
Object value = expression.evaluate(exchange);
Scanner scanner = getScanner(exchange, value);
scanner.useDelimiter(regexTokenizer);
@@ -483,11 +483,11 @@
* Transforms the expression into a String then performs the regex
* replaceAll to transform the String and return the result
*/
- public static <E extends Exchange> Expression<E> regexReplaceAll(final Expression<E> expression,
+ public static Expression regexReplaceAll(final Expression expression,
final String regex, final String replacement) {
final Pattern pattern = Pattern.compile(regex);
- return new Expression<E>() {
- public Object evaluate(E exchange) {
+ return new Expression() {
+ public Object evaluate(Exchange exchange) {
String text = evaluateStringExpression(expression, exchange);
if (text == null) {
return null;
@@ -506,12 +506,12 @@
* Transforms the expression into a String then performs the regex
* replaceAll to transform the String and return the result
*/
- public static <E extends Exchange> Expression<E> regexReplaceAll(final Expression<E> expression,
- String regex,
- final Expression<E> replacementExpression) {
+ public static Expression regexReplaceAll(final Expression expression,
+ String regex, final Expression replacementExpression) {
+
final Pattern pattern = Pattern.compile(regex);
- return new Expression<E>() {
- public Object evaluate(E exchange) {
+ return new Expression() {
+ public Object evaluate(Exchange exchange) {
String text = evaluateStringExpression(expression, exchange);
String replacement = evaluateStringExpression(replacementExpression, exchange);
if (text == null || replacement == null) {
@@ -530,10 +530,9 @@
/**
* Appends the String evaluations of the two expressions together
*/
- public static <E extends Exchange> Expression<E> append(final Expression<E> left,
- final Expression<E> right) {
- return new Expression<E>() {
- public Object evaluate(E exchange) {
+ public static Expression append(final Expression left, final Expression right) {
+ return new Expression() {
+ public Object evaluate(Exchange exchange) {
return evaluateStringExpression(left, exchange) + evaluateStringExpression(right, exchange);
}
@@ -553,7 +552,7 @@
* @return the String representation of the expression or null if it could
* not be evaluated
*/
- public static <E extends Exchange> String evaluateStringExpression(Expression<E> expression, E exchange) {
+ public static String evaluateStringExpression(Expression expression, Exchange exchange) {
Object value = expression.evaluate(exchange);
return exchange.getContext().getTypeConverter().convertTo(String.class, exchange, value);
}
@@ -561,17 +560,16 @@
/**
* Returns an expression for the given system property
*/
- public static <E extends Exchange> Expression<E> systemProperty(final String name) {
+ public static Expression systemProperty(final String name) {
return systemProperty(name, null);
}
/**
* Returns an expression for the given system property
*/
- public static <E extends Exchange> Expression<E> systemProperty(final String name,
- final String defaultValue) {
- return new Expression<E>() {
- public Object evaluate(E exchange) {
+ public static Expression systemProperty(final String name, final String defaultValue) {
+ return new Expression() {
+ public Object evaluate(Exchange exchange) {
return System.getProperty(name, defaultValue);
}
};
@@ -584,7 +582,7 @@
* @param expressions the expression to be concatenated dynamically
* @return an expression which when evaluated will return the concatenated values
*/
- public static <E extends Exchange> Expression<E> concatExpression(final Collection<Expression> expressions) {
+ public static Expression concatExpression(final Collection<Expression> expressions) {
return concatExpression(expressions, null);
}
@@ -596,11 +594,11 @@
* @param expression the text description of the expression
* @return an expression which when evaluated will return the concatenated values
*/
- public static <E extends Exchange> Expression<E> concatExpression(final Collection<Expression> expressions, final String expression) {
- return new Expression<E>() {
- public Object evaluate(E exchange) {
+ public static Expression concatExpression(final Collection<Expression> expressions, final String expression) {
+ return new Expression() {
+ public Object evaluate(Exchange exchange) {
StringBuffer buffer = new StringBuffer();
- for (Expression<E> expression : expressions) {
+ for (Expression expression : expressions) {
String text = evaluateStringExpression(expression, exchange);
if (text != null) {
buffer.append(text);
@@ -623,9 +621,9 @@
/**
* Returns an Expression for the inbound message id
*/
- public static <E extends Exchange> Expression<E> messageIdExpression() {
- return new Expression<E>() {
- public Object evaluate(E exchange) {
+ public static Expression messageIdExpression() {
+ return new Expression() {
+ public Object evaluate(Exchange exchange) {
return exchange.getIn().getMessageId();
}
@@ -636,9 +634,9 @@
};
}
- public static <E extends Exchange> Expression<E> dateExpression(final String command, final String pattern) {
- return new Expression<E>() {
- public Object evaluate(E exchange) {
+ public static Expression dateExpression(final String command, final String pattern) {
+ return new Expression() {
+ public Object evaluate(Exchange exchange) {
Date date;
if ("now".equals(command)) {
date = new Date();
@@ -669,9 +667,9 @@
};
}
- public static <E extends Exchange> Expression<E> simpleExpression(final String simple) {
- return new Expression<E>() {
- public Object evaluate(E exchange) {
+ public static Expression simpleExpression(final String simple) {
+ return new Expression() {
+ public Object evaluate(Exchange exchange) {
// must call evalute to return the nested langauge evaluate when evaluating
// stacked expressions
return SimpleLanguage.simple(simple).evaluate(exchange);
@@ -684,9 +682,9 @@
};
}
- public static <E extends Exchange> Expression<E> beanExpression(final String bean) {
- return new Expression<E>() {
- public Object evaluate(E exchange) {
+ public static Expression beanExpression(final String bean) {
+ return new Expression() {
+ public Object evaluate(Exchange exchange) {
// must call evalute to return the nested langauge evaluate when evaluating
// stacked expressions
return BeanLanguage.bean(bean).evaluate(exchange);
@@ -698,5 +696,4 @@
}
};
}
-
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java Fri Oct 31 17:21:38 2008
@@ -45,9 +45,9 @@
/**
* Converts the given expression into an {@link Predicate}
*/
- public static <E extends Exchange> Predicate<E> toPredicate(final Expression<E> expression) {
- return new PredicateSupport<E>() {
- public boolean matches(E exchange) {
+ public static Predicate toPredicate(final Expression expression) {
+ return new PredicateSupport() {
+ public boolean matches(Exchange exchange) {
Object value = expression.evaluate(exchange);
return ObjectHelper.evaluateValuePredicate(value);
}
@@ -62,10 +62,10 @@
/**
* A helper method to return the logical not of the given predicate
*/
- public static <E extends Exchange> Predicate<E> not(final Predicate<E> predicate) {
+ public static Predicate not(final Predicate predicate) {
notNull(predicate, "predicate");
- return new PredicateSupport<E>() {
- public boolean matches(E exchange) {
+ return new PredicateSupport() {
+ public boolean matches(Exchange exchange) {
return !predicate.matches(exchange);
}
@@ -79,11 +79,11 @@
/**
* A helper method to combine multiple predicates by a logical AND
*/
- public static <E extends Exchange> Predicate<E> and(final Predicate<E> left, final Predicate<E> right) {
+ public static Predicate and(final Predicate left, final Predicate right) {
notNull(left, "left");
notNull(right, "right");
- return new PredicateSupport<E>() {
- public boolean matches(E exchange) {
+ return new PredicateSupport() {
+ public boolean matches(Exchange exchange) {
return left.matches(exchange) && right.matches(exchange);
}
@@ -97,11 +97,11 @@
/**
* A helper method to combine multiple predicates by a logical OR
*/
- public static <E extends Exchange> Predicate<E> or(final Predicate<E> left, final Predicate<E> right) {
+ public static Predicate or(final Predicate left, final Predicate right) {
notNull(left, "left");
notNull(right, "right");
- return new PredicateSupport<E>() {
- public boolean matches(E exchange) {
+ return new PredicateSupport() {
+ public boolean matches(Exchange exchange) {
return left.matches(exchange) || right.matches(exchange);
}
@@ -112,11 +112,10 @@
};
}
- public static <E extends Exchange> Predicate<E> isEqualTo(final Expression<E> left,
- final Expression<E> right) {
- return new BinaryPredicateSupport<E>(left, right) {
+ public static Predicate isEqualTo(final Expression left, final Expression right) {
+ return new BinaryPredicateSupport(left, right) {
- protected boolean matches(E exchange, Object leftValue, Object rightValue) {
+ protected boolean matches(Exchange exchange, Object leftValue, Object rightValue) {
return ObjectHelper.equal(leftValue, rightValue);
}
@@ -126,11 +125,10 @@
};
}
- public static <E extends Exchange> Predicate<E> isNotEqualTo(final Expression<E> left,
- final Expression<E> right) {
- return new BinaryPredicateSupport<E>(left, right) {
+ public static Predicate isNotEqualTo(final Expression left, final Expression right) {
+ return new BinaryPredicateSupport(left, right) {
- protected boolean matches(E exchange, Object leftValue, Object rightValue) {
+ protected boolean matches(Exchange exchange, Object leftValue, Object rightValue) {
return !ObjectHelper.equal(leftValue, rightValue);
}
@@ -140,11 +138,10 @@
};
}
- public static <E extends Exchange> Predicate<E> isLessThan(final Expression<E> left,
- final Expression<E> right) {
- return new BinaryPredicateSupport<E>(left, right) {
+ public static Predicate isLessThan(final Expression left, final Expression right) {
+ return new BinaryPredicateSupport(left, right) {
- protected boolean matches(E exchange, Object leftValue, Object rightValue) {
+ protected boolean matches(Exchange exchange, Object leftValue, Object rightValue) {
return compare(leftValue, rightValue) < 0;
}
@@ -154,11 +151,10 @@
};
}
- public static <E extends Exchange> Predicate<E> isLessThanOrEqualTo(final Expression<E> left,
- final Expression<E> right) {
- return new BinaryPredicateSupport<E>(left, right) {
+ public static Predicate isLessThanOrEqualTo(final Expression left, final Expression right) {
+ return new BinaryPredicateSupport(left, right) {
- protected boolean matches(E exchange, Object leftValue, Object rightValue) {
+ protected boolean matches(Exchange exchange, Object leftValue, Object rightValue) {
return compare(leftValue, rightValue) <= 0;
}
@@ -168,11 +164,10 @@
};
}
- public static <E extends Exchange> Predicate<E> isGreaterThan(final Expression<E> left,
- final Expression<E> right) {
- return new BinaryPredicateSupport<E>(left, right) {
+ public static Predicate isGreaterThan(final Expression left, final Expression right) {
+ return new BinaryPredicateSupport(left, right) {
- protected boolean matches(E exchange, Object leftValue, Object rightValue) {
+ protected boolean matches(Exchange exchange, Object leftValue, Object rightValue) {
return compare(leftValue, rightValue) > 0;
}
@@ -182,11 +177,10 @@
};
}
- public static <E extends Exchange> Predicate<E> isGreaterThanOrEqualTo(final Expression<E> left,
- final Expression<E> right) {
- return new BinaryPredicateSupport<E>(left, right) {
+ public static Predicate isGreaterThanOrEqualTo(final Expression left, final Expression right) {
+ return new BinaryPredicateSupport(left, right) {
- protected boolean matches(E exchange, Object leftValue, Object rightValue) {
+ protected boolean matches(Exchange exchange, Object leftValue, Object rightValue) {
return compare(leftValue, rightValue) >= 0;
}
@@ -196,11 +190,10 @@
};
}
- public static <E extends Exchange> Predicate<E> contains(final Expression<E> left,
- final Expression<E> right) {
- return new BinaryPredicateSupport<E>(left, right) {
+ public static Predicate contains(final Expression left, final Expression right) {
+ return new BinaryPredicateSupport(left, right) {
- protected boolean matches(E exchange, Object leftValue, Object rightValue) {
+ protected boolean matches(Exchange exchange, Object leftValue, Object rightValue) {
return ObjectHelper.contains(leftValue, rightValue);
}
@@ -210,21 +203,20 @@
};
}
- public static <E extends Exchange> Predicate<E> isNull(final Expression<E> expression) {
- return isEqualTo(expression, ExpressionBuilder.<E> constantExpression(null));
+ public static Predicate isNull(final Expression expression) {
+ return isEqualTo(expression, ExpressionBuilder.constantExpression(null));
}
- public static <E extends Exchange> Predicate<E> isNotNull(final Expression<E> expression) {
- return isNotEqualTo(expression, ExpressionBuilder.<E> constantExpression(null));
+ public static Predicate isNotNull(final Expression expression) {
+ return isNotEqualTo(expression, ExpressionBuilder.constantExpression(null));
}
- public static <E extends Exchange> Predicate<E> isInstanceOf(final Expression<E> expression,
- final Class type) {
+ public static Predicate isInstanceOf(final Expression expression, final Class<?> type) {
notNull(expression, "expression");
notNull(type, "type");
- return new PredicateSupport<E>() {
- public boolean matches(E exchange) {
+ return new PredicateSupport() {
+ public boolean matches(Exchange exchange) {
Object value = expression.evaluate(exchange);
return type.isInstance(value);
}
@@ -235,7 +227,7 @@
}
@Override
- protected String assertionFailureMessage(E exchange) {
+ protected String assertionFailureMessage(Exchange exchange) {
return super.assertionFailureMessage(exchange)
+ " for <" + expression.evaluate(exchange) + ">";
}
@@ -250,7 +242,7 @@
* @param regex the regular expression to match against
* @return a new predicate
*/
- public static <E extends Exchange> Predicate<E> regex(final Expression<E> expression, final String regex) {
+ public static Predicate regex(final Expression expression, final String regex) {
return regex(expression, Pattern.compile(regex));
}
@@ -262,13 +254,12 @@
* @param pattern the regular expression to match against
* @return a new predicate
*/
- public static <E extends Exchange> Predicate<E> regex(final Expression<E> expression,
- final Pattern pattern) {
+ public static Predicate regex(final Expression expression, final Pattern pattern) {
notNull(expression, "expression");
notNull(pattern, "pattern");
- return new PredicateSupport<E>() {
- public boolean matches(E exchange) {
+ return new PredicateSupport() {
+ public boolean matches(Exchange exchange) {
Object value = expression.evaluate(exchange);
if (value != null) {
Matcher matcher = pattern.matcher(value.toString());
@@ -283,7 +274,7 @@
}
@Override
- protected String assertionFailureMessage(E exchange) {
+ protected String assertionFailureMessage(Exchange exchange) {
return super.assertionFailureMessage(exchange) + " for <" + expression.evaluate(exchange)
+ ">";
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateFactory.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateFactory.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateFactory.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateFactory.java Fri Oct 31 17:21:38 2008
@@ -16,7 +16,6 @@
*/
package org.apache.camel.builder;
-import org.apache.camel.Exchange;
import org.apache.camel.Predicate;
/**
@@ -25,12 +24,12 @@
*
* @version $Revision$
*/
-public interface PredicateFactory<E extends Exchange> {
+public interface PredicateFactory {
/**
* Creates a predicate object
*
* @return the newly created expression object
*/
- Predicate<E> createPredicate();
+ Predicate createPredicate();
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateSupport.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateSupport.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateSupport.java Fri Oct 31 17:21:38 2008
@@ -24,15 +24,15 @@
*
* @version $Revision$
*/
-public abstract class PredicateSupport<E extends Exchange> implements Predicate<E> {
+public abstract class PredicateSupport implements Predicate {
- public void assertMatches(String text, E exchange) {
+ public void assertMatches(String text, Exchange exchange) {
if (!matches(exchange)) {
throw new AssertionError(assertionFailureMessage(exchange) + " on " + exchange);
}
}
- protected String assertionFailureMessage(E exchange) {
+ protected String assertionFailureMessage(Exchange exchange) {
return toString();
}
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ValueBuilder.java Fri Oct 31 17:21:38 2008
@@ -25,18 +25,18 @@
*
* @version $Revision$
*/
-public class ValueBuilder<E extends Exchange> implements Expression<E> {
- private Expression<E> expression;
+public class ValueBuilder implements Expression {
+ private Expression expression;
- public ValueBuilder(Expression<E> expression) {
+ public ValueBuilder(Expression expression) {
this.expression = expression;
}
- public Object evaluate(E exchange) {
+ public Object evaluate(Exchange exchange) {
return expression.evaluate(exchange);
}
- public Expression<E> getExpression() {
+ public Expression getExpression() {
return expression;
}
@@ -48,49 +48,49 @@
// Predicate builders
// -------------------------------------------------------------------------
- public Predicate<E> isNotEqualTo(Object value) {
- Expression<E> right = asExpression(value);
+ public Predicate isNotEqualTo(Object value) {
+ Expression right = asExpression(value);
return onNewPredicate(PredicateBuilder.isNotEqualTo(expression, right));
}
- public Predicate<E> isEqualTo(Object value) {
- Expression<E> right = asExpression(value);
+ public Predicate isEqualTo(Object value) {
+ Expression right = asExpression(value);
return onNewPredicate(PredicateBuilder.isEqualTo(expression, right));
}
- public Predicate<E> isLessThan(Object value) {
- Expression<E> right = asExpression(value);
+ public Predicate isLessThan(Object value) {
+ Expression right = asExpression(value);
return onNewPredicate(PredicateBuilder.isLessThan(expression, right));
}
- public Predicate<E> isLessThanOrEqualTo(Object value) {
- Expression<E> right = asExpression(value);
+ public Predicate isLessThanOrEqualTo(Object value) {
+ Expression right = asExpression(value);
return onNewPredicate(PredicateBuilder.isLessThanOrEqualTo(expression, right));
}
- public Predicate<E> isGreaterThan(Object value) {
- Expression<E> right = asExpression(value);
+ public Predicate isGreaterThan(Object value) {
+ Expression right = asExpression(value);
return onNewPredicate(PredicateBuilder.isGreaterThan(expression, right));
}
- public Predicate<E> isGreaterThanOrEqualTo(Object value) {
- Expression<E> right = asExpression(value);
+ public Predicate isGreaterThanOrEqualTo(Object value) {
+ Expression right = asExpression(value);
return onNewPredicate(PredicateBuilder.isGreaterThanOrEqualTo(expression, right));
}
- public Predicate<E> isInstanceOf(Class type) {
+ public Predicate isInstanceOf(Class type) {
return onNewPredicate(PredicateBuilder.isInstanceOf(expression, type));
}
- public Predicate<E> matchesRegex(String regex) {
+ public Predicate matchesRegex(String regex) {
return onNewPredicate(PredicateBuilder.regex(expression, regex));
}
- public Predicate<E> isNull() {
+ public Predicate isNull() {
return onNewPredicate(PredicateBuilder.isNull(expression));
}
- public Predicate<E> isNotNull() {
+ public Predicate isNotNull() {
return onNewPredicate(PredicateBuilder.isNotNull(expression));
}
@@ -103,8 +103,8 @@
* @return a predicate which evaluates to true if the given value expression
* is contained within this expression value
*/
- public Predicate<E> contains(Object value) {
- Expression<E> right = asExpression(value);
+ public Predicate contains(Object value) {
+ Expression right = asExpression(value);
return onNewPredicate(PredicateBuilder.contains(expression, right));
}
@@ -116,47 +116,47 @@
* @return a predicate which evaluates to true if the expression matches the
* regex
*/
- public Predicate<E> regex(String regex) {
+ public Predicate regex(String regex) {
return onNewPredicate(PredicateBuilder.regex(expression, regex));
}
// Expression builders
// -------------------------------------------------------------------------
- public ValueBuilder<E> tokenize() {
+ public ValueBuilder tokenize() {
return tokenize("\n");
}
- public ValueBuilder<E> tokenize(String token) {
- Expression<E> newExp = ExpressionBuilder.tokenizeExpression(expression, token);
- return new ValueBuilder<E>(newExp);
+ public ValueBuilder tokenize(String token) {
+ Expression newExp = ExpressionBuilder.tokenizeExpression(expression, token);
+ return new ValueBuilder(newExp);
}
/**
* Tokenizes the string conversion of this expression using the given
* regular expression
*/
- public ValueBuilder<E> regexTokenize(String regex) {
- Expression<E> newExp = ExpressionBuilder.regexTokenize(expression, regex);
- return new ValueBuilder<E>(newExp);
+ public ValueBuilder regexTokenize(String regex) {
+ Expression newExp = ExpressionBuilder.regexTokenize(expression, regex);
+ return new ValueBuilder(newExp);
}
/**
* Replaces all occurrencies of the regular expression with the given
* replacement
*/
- public ValueBuilder<E> regexReplaceAll(String regex, String replacement) {
- Expression<E> newExp = ExpressionBuilder.regexReplaceAll(expression, regex, replacement);
- return new ValueBuilder<E>(newExp);
+ public ValueBuilder regexReplaceAll(String regex, String replacement) {
+ Expression newExp = ExpressionBuilder.regexReplaceAll(expression, regex, replacement);
+ return new ValueBuilder(newExp);
}
/**
* Replaces all occurrencies of the regular expression with the given
* replacement
*/
- public ValueBuilder<E> regexReplaceAll(String regex, Expression<E> replacement) {
- Expression<E> newExp = ExpressionBuilder.regexReplaceAll(expression, regex, replacement);
- return new ValueBuilder<E>(newExp);
+ public ValueBuilder regexReplaceAll(String regex, Expression replacement) {
+ Expression newExp = ExpressionBuilder.regexReplaceAll(expression, regex, replacement);
+ return new ValueBuilder(newExp);
}
/**
@@ -166,9 +166,9 @@
* @param type the type to convert the value to
* @return the current builder
*/
- public ValueBuilder<E> convertTo(Class type) {
- Expression<E> newExp = ExpressionBuilder.convertTo(expression, type);
- return new ValueBuilder<E>(newExp);
+ public ValueBuilder convertTo(Class<?> type) {
+ Expression newExp = ExpressionBuilder.convertTo(expression, type);
+ return new ValueBuilder(newExp);
}
/**
@@ -176,7 +176,7 @@
*
* @return the current builder
*/
- public ValueBuilder<E> convertToString() {
+ public ValueBuilder convertToString() {
return convertTo(String.class);
}
@@ -186,8 +186,8 @@
* @param value the value or expression to append
* @return the current builder
*/
- public ValueBuilder<E> append(Object value) {
- return new ValueBuilder<E>(ExpressionBuilder.append(expression, asExpression(value)));
+ public ValueBuilder append(Object value) {
+ return new ValueBuilder(ExpressionBuilder.append(expression, asExpression(value)));
}
// Implementation methods
@@ -197,13 +197,13 @@
* A stategy method to allow derived classes to deal with the newly created
* predicate in different ways
*/
- protected Predicate<E> onNewPredicate(Predicate<E> predicate) {
+ protected Predicate onNewPredicate(Predicate predicate) {
return predicate;
}
- protected Expression<E> asExpression(Object value) {
+ protected Expression asExpression(Object value) {
if (value instanceof Expression) {
- return (Expression<E>)value;
+ return (Expression)value;
} else {
return ExpressionBuilder.constantExpression(value);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java Fri Oct 31 17:21:38 2008
@@ -60,22 +60,22 @@
*
* @version $Revision$
*/
-public class XPathBuilder<E extends Exchange> implements Expression<E>, Predicate<E>, NamespaceAware {
+public class XPathBuilder implements Expression, Predicate, NamespaceAware {
private final String text;
private XPathFactory xpathFactory;
- private Class documentType = Document.class;
+ private Class<?> documentType = Document.class;
// For some reason the default expression of "a/b" on a document such as
// <a><b>1</b><b>2</b></a>
// will evaluate as just "1" by default which is bizarre. So by default
// lets assume XPath expressions result in nodesets.
- private Class resultType;
+ private Class<?> resultType;
private QName resultQName = XPathConstants.NODESET;
private String objectModelUri;
private DefaultNamespaceContext namespaceContext;
private XPathFunctionResolver functionResolver;
private XPathExpression expression;
private MessageVariableResolver variableResolver = new MessageVariableResolver();
- private E exchange;
+ private Exchange exchange;
private XPathFunction bodyFunction;
private XPathFunction headerFunction;
private XPathFunction outBodyFunction;
@@ -94,19 +94,19 @@
return "XPath: " + text;
}
- public boolean matches(E exchange) {
+ public boolean matches(Exchange exchange) {
Object booleanResult = evaluateAs(exchange, XPathConstants.BOOLEAN);
return toBoolean(booleanResult);
}
- public void assertMatches(String text, E exchange) throws AssertionError {
+ public void assertMatches(String text, Exchange exchange) throws AssertionError {
Object booleanResult = evaluateAs(exchange, XPathConstants.BOOLEAN);
if (!toBoolean(booleanResult)) {
throw new AssertionError(this + " failed on " + exchange + " as returned <" + booleanResult + ">");
}
}
- public Object evaluate(E exchange) {
+ public Object evaluate(Exchange exchange) {
Object answer = evaluateAs(exchange, resultQName);
if (resultType != null) {
return ExchangeHelper.convertToType(exchange, resultType, answer);
@@ -122,7 +122,7 @@
*
* @return the current builder
*/
- public XPathBuilder<E> booleanResult() {
+ public XPathBuilder booleanResult() {
resultQName = XPathConstants.BOOLEAN;
return this;
}
@@ -132,7 +132,7 @@
*
* @return the current builder
*/
- public XPathBuilder<E> nodeResult() {
+ public XPathBuilder nodeResult() {
resultQName = XPathConstants.NODE;
return this;
}
@@ -142,7 +142,7 @@
*
* @return the current builder
*/
- public XPathBuilder<E> nodeSetResult() {
+ public XPathBuilder nodeSetResult() {
resultQName = XPathConstants.NODESET;
return this;
}
@@ -152,7 +152,7 @@
*
* @return the current builder
*/
- public XPathBuilder<E> numberResult() {
+ public XPathBuilder numberResult() {
resultQName = XPathConstants.NUMBER;
return this;
}
@@ -162,7 +162,7 @@
*
* @return the current builder
*/
- public XPathBuilder<E> stringResult() {
+ public XPathBuilder stringResult() {
resultQName = XPathConstants.STRING;
return this;
}
@@ -172,7 +172,7 @@
*
* @return the current builder
*/
- public XPathBuilder<E> resultType(Class resultType) {
+ public XPathBuilder resultType(Class<?> resultType) {
setResultType(resultType);
return this;
}
@@ -182,7 +182,7 @@
*
* @return the current builder
*/
- public XPathBuilder<E> objectModel(String uri) {
+ public XPathBuilder objectModel(String uri) {
this.objectModelUri = uri;
return this;
}
@@ -193,7 +193,7 @@
*
* @return the current builder
*/
- public XPathBuilder<E> functionResolver(XPathFunctionResolver functionResolver) {
+ public XPathBuilder functionResolver(XPathFunctionResolver functionResolver) {
this.functionResolver = functionResolver;
return this;
}
@@ -207,7 +207,7 @@
* @param uri is the namespace URI to which the prefix refers
* @return the current builder
*/
- public XPathBuilder<E> namespace(String prefix, String uri) {
+ public XPathBuilder namespace(String prefix, String uri) {
getNamespaceContext().add(prefix, uri);
return this;
}
@@ -220,7 +220,7 @@
* XPath expression
* @return the current builder
*/
- public XPathBuilder<E> namespaces(Namespaces namespaces) {
+ public XPathBuilder namespaces(Namespaces namespaces) {
namespaces.configure(this);
return this;
}
@@ -229,7 +229,7 @@
* Registers a variable (in the global namespace) which can be referred to
* from XPath expressions
*/
- public XPathBuilder<E> variable(String name, Object value) {
+ public XPathBuilder variable(String name, Object value) {
variableResolver.addVariable(name, value);
return this;
}
@@ -413,7 +413,7 @@
/**
* Evaluates the expression as the given result type
*/
- protected synchronized Object evaluateAs(E exchange, QName resultQName) {
+ protected synchronized Object evaluateAs(Exchange exchange, QName resultQName) {
this.exchange = exchange;
variableResolver.setExchange(exchange);
try {
@@ -520,7 +520,7 @@
/**
* Strategy method to extract the document from the exchange
*/
- protected Object getDocument(E exchange) {
+ protected Object getDocument(Exchange exchange) {
Message in = exchange.getIn();
Class type = getDocumentType();
Object answer = null;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java Fri Oct 31 17:21:38 2008
@@ -170,7 +170,7 @@
Expression parameterExpression = parameters.get(i).getExpression();
expressions[i] = parameterExpression;
}
- return new Expression<Exchange>() {
+ return new Expression() {
public Object evaluate(Exchange exchange) {
Object[] answer = new Object[size];
Object body = exchange.getIn().getBody();
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/AssertionClause.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/AssertionClause.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/AssertionClause.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/AssertionClause.java Fri Oct 31 17:21:38 2008
@@ -36,7 +36,7 @@
*/
public abstract class AssertionClause implements Runnable {
- private List<Predicate<Exchange>> predicates = new ArrayList<Predicate<Exchange>>();
+ private List<Predicate> predicates = new ArrayList<Predicate>();
// Builder methods
// -------------------------------------------------------------------------
@@ -44,7 +44,7 @@
/**
* Adds the given predicate to this assertion clause
*/
- public AssertionClause predicate(Predicate<Exchange> predicate) {
+ public AssertionClause predicate(Predicate predicate) {
addPredicate(predicate);
return this;
}
@@ -58,16 +58,16 @@
/**
* Returns a predicate and value builder for headers on an exchange
*/
- public ValueBuilder<Exchange> header(String name) {
- Expression<Exchange> expression = headerExpression(name);
+ public ValueBuilder header(String name) {
+ Expression expression = headerExpression(name);
return new PredicateValueBuilder(expression);
}
/**
* Returns a predicate and value builder for property on an exchange
*/
- public ValueBuilder<Exchange> property(String name) {
- Expression<Exchange> expression = propertyExpression(name);
+ public ValueBuilder property(String name) {
+ Expression expression = propertyExpression(name);
return new PredicateValueBuilder(expression);
}
@@ -75,7 +75,7 @@
* Returns a predicate and value builder for the inbound body on an exchange
*/
public PredicateValueBuilder body() {
- Expression<Exchange> expression = bodyExpression();
+ Expression expression = bodyExpression();
return new PredicateValueBuilder(expression);
}
@@ -84,7 +84,7 @@
* specific type
*/
public <T> PredicateValueBuilder bodyAs(Class<T> type) {
- Expression<Exchange> expression = bodyExpression(type);
+ Expression expression = bodyExpression(type);
return new PredicateValueBuilder(expression);
}
@@ -93,7 +93,7 @@
* exchange
*/
public PredicateValueBuilder outBody() {
- Expression<Exchange> expression = bodyExpression();
+ Expression expression = bodyExpression();
return new PredicateValueBuilder(expression);
}
@@ -102,7 +102,7 @@
* specific type
*/
public <T> PredicateValueBuilder outBody(Class<T> type) {
- Expression<Exchange> expression = bodyExpression(type);
+ Expression expression = bodyExpression(type);
return new PredicateValueBuilder(expression);
}
@@ -110,12 +110,12 @@
* Performs any assertions on the given exchange
*/
protected void applyAssertionOn(MockEndpoint endpoint, int index, Exchange exchange) {
- for (Predicate<Exchange> predicate : predicates) {
+ for (Predicate predicate : predicates) {
predicate.assertMatches(endpoint.getEndpointUri() + " ", exchange);
}
}
- protected void addPredicate(Predicate<Exchange> predicate) {
+ protected void addPredicate(Predicate predicate) {
predicates.add(predicate);
}
@@ -123,13 +123,13 @@
/**
* Public class needed for fluent builders
*/
- public class PredicateValueBuilder extends ValueBuilder<Exchange> {
+ public class PredicateValueBuilder extends ValueBuilder {
- public PredicateValueBuilder(Expression<Exchange> expression) {
+ public PredicateValueBuilder(Expression expression) {
super(expression);
}
- protected Predicate<Exchange> onNewPredicate(Predicate<Exchange> predicate) {
+ protected Predicate onNewPredicate(Predicate predicate) {
addPredicate(predicate);
return predicate;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java Fri Oct 31 17:21:38 2008
@@ -383,7 +383,7 @@
*
* @param expression
*/
- public void expectsAscending(final Expression<Exchange> expression) {
+ public void expectsAscending(final Expression expression) {
expects(new Runnable() {
public void run() {
assertMessagesAscending(expression);
@@ -397,7 +397,7 @@
*
* @param expression
*/
- public void expectsDescending(final Expression<Exchange> expression) {
+ public void expectsDescending(final Expression expression) {
expects(new Runnable() {
public void run() {
assertMessagesDescending(expression);
@@ -415,7 +415,7 @@
* {@link Object#equals(Object)} and
* {@link Object#hashCode()}
*/
- public void expectsNoDuplicates(final Expression<Exchange> expression) {
+ public void expectsNoDuplicates(final Expression expression) {
expects(new Runnable() {
public void run() {
assertNoDuplicates(expression);
@@ -426,18 +426,18 @@
/**
* Asserts that the messages have ascending values of the given expression
*/
- public void assertMessagesAscending(Expression<Exchange> expression) {
+ public void assertMessagesAscending(Expression expression) {
assertMessagesSorted(expression, true);
}
/**
* Asserts that the messages have descending values of the given expression
*/
- public void assertMessagesDescending(Expression<Exchange> expression) {
+ public void assertMessagesDescending(Expression expression) {
assertMessagesSorted(expression, false);
}
- protected void assertMessagesSorted(Expression<Exchange> expression, boolean ascending) {
+ protected void assertMessagesSorted(Expression expression, boolean ascending) {
String type = ascending ? "ascending" : "descending";
ExpressionComparator comparator = new ExpressionComparator(expression);
List<Exchange> list = getReceivedExchanges();
@@ -461,7 +461,7 @@
}
}
- public void assertNoDuplicates(Expression<Exchange> expression) {
+ public void assertNoDuplicates(Expression expression) {
Map<Object, Exchange> map = new HashMap<Object, Exchange>();
List<Exchange> list = getReceivedExchanges();
for (int i = 0; i < list.size(); i++) {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/CamelConverter.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/CamelConverter.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/CamelConverter.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/converter/CamelConverter.java Fri Oct 31 17:21:38 2008
@@ -27,13 +27,13 @@
* Some useful converters for Camel APIs such as to convert a {@link Predicate} or {@link Expression}
* to a {@link Processor}
*
- * @version $Revision:$
+ * @version $Revision$
*/
@Converter
public class CamelConverter {
@Converter
- public Processor toProcessor(final Predicate<Exchange> predicate) {
+ public Processor toProcessor(final Predicate predicate) {
return new Processor() {
public void process(Exchange exchange) throws Exception {
boolean answer = predicate.matches(exchange);
@@ -46,7 +46,7 @@
}
@Converter
- public Processor toProcessor(final Expression<Exchange> expresion) {
+ public Processor toProcessor(final Expression expresion) {
return new Processor() {
public void process(Exchange exchange) throws Exception {
Object answer = expresion.evaluate(exchange);
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/BinaryPredicateSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/BinaryPredicateSupport.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/BinaryPredicateSupport.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/BinaryPredicateSupport.java Fri Oct 31 17:21:38 2008
@@ -26,12 +26,12 @@
*
* @version $Revision$
*/
-public abstract class BinaryPredicateSupport<E extends Exchange> implements Predicate<E> {
+public abstract class BinaryPredicateSupport implements Predicate {
- private final Expression<E> left;
- private final Expression<E> right;
+ private final Expression left;
+ private final Expression right;
- protected BinaryPredicateSupport(Expression<E> left, Expression<E> right) {
+ protected BinaryPredicateSupport(Expression left, Expression right) {
notNull(left, "left");
notNull(right, "right");
@@ -44,13 +44,13 @@
return left + " " + getOperationText() + " " + right;
}
- public boolean matches(E exchange) {
+ public boolean matches(Exchange exchange) {
Object leftValue = left.evaluate(exchange);
Object rightValue = right.evaluate(exchange);
return matches(exchange, leftValue, rightValue);
}
- public void assertMatches(String text, E exchange) {
+ public void assertMatches(String text, Exchange exchange) {
Object leftValue = left.evaluate(exchange);
Object rightValue = right.evaluate(exchange);
if (!matches(exchange, leftValue, rightValue)) {
@@ -58,11 +58,11 @@
}
}
- protected abstract boolean matches(E exchange, Object leftValue, Object rightValue);
+ protected abstract boolean matches(Exchange exchange, Object leftValue, Object rightValue);
protected abstract String getOperationText();
- protected String assertionFailureMessage(E exchange, Object leftValue, Object rightValue) {
+ protected String assertionFailureMessage(Exchange exchange, Object leftValue, Object rightValue) {
return this + " failed on " + exchange + " with left value <" + leftValue + "> right value <"
+ rightValue + ">";
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ExpressionSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ExpressionSupport.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ExpressionSupport.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ExpressionSupport.java Fri Oct 31 17:21:38 2008
@@ -26,18 +26,18 @@
*
* @version $Revision$
*/
-public abstract class ExpressionSupport<E extends Exchange> implements Expression<E> , Predicate<E> {
+public abstract class ExpressionSupport implements Expression, Predicate {
- public boolean matches(E exchange) {
+ public boolean matches(Exchange exchange) {
Object value = evaluate(exchange);
return ObjectHelper.evaluateValuePredicate(value);
}
- public void assertMatches(String text, E exchange) {
+ public void assertMatches(String text, Exchange exchange) {
if (!matches(exchange)) {
throw new AssertionError(text + " " + assertionFailureMessage(exchange) + " for exchange: " + exchange);
}
}
- protected abstract String assertionFailureMessage(E exchange);
+ protected abstract String assertionFailureMessage(Exchange exchange);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/PredicateSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/PredicateSupport.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/PredicateSupport.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/PredicateSupport.java Fri Oct 31 17:21:38 2008
@@ -24,15 +24,15 @@
*
* @version $Revision$
*/
-public abstract class PredicateSupport<E extends Exchange> implements Predicate<E> {
+public abstract class PredicateSupport implements Predicate {
- public void assertMatches(String text, E exchange) {
+ public void assertMatches(String text, Exchange exchange) {
if (!matches(exchange)) {
throw new AssertionError(assertionFailureMessage(exchange) + " on " + exchange);
}
}
- protected String assertionFailureMessage(E exchange) {
+ protected String assertionFailureMessage(Exchange exchange) {
return toString();
}
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/ExpressionEvaluationException.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/ExpressionEvaluationException.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/ExpressionEvaluationException.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/ExpressionEvaluationException.java Fri Oct 31 17:21:38 2008
@@ -26,21 +26,23 @@
* @version $Revision$
*/
public class ExpressionEvaluationException extends RuntimeCamelException {
- private final Expression<Exchange> expression;
+
+ private static final long serialVersionUID = 2939802714638174540L;
+
+ private final Expression expression;
private final Exchange exchange;
- public ExpressionEvaluationException(Expression<Exchange> expression, Exchange exchange, Throwable cause) {
+ public ExpressionEvaluationException(Expression expression, Exchange exchange, Throwable cause) {
super(cause);
this.expression = expression;
this.exchange = exchange;
}
- public Expression<Exchange> getExpression() {
+ public Expression getExpression() {
return expression;
}
public Exchange getExchange() {
return exchange;
}
-
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java Fri Oct 31 17:21:38 2008
@@ -29,7 +29,7 @@
*
* @version $Revision$
*/
-public class BeanExpression<E extends Exchange> extends ExpressionSupport<E> {
+public class BeanExpression extends ExpressionSupport {
private String beanName;
private String method;
private Object bean;
@@ -49,11 +49,11 @@
return "BeanExpression[bean:" + (bean == null ? beanName : bean) + " method: " + method + "]";
}
- protected String assertionFailureMessage(E exchange) {
+ protected String assertionFailureMessage(Exchange exchange) {
return "bean: " + beanName + " method: " + method;
}
- public Object evaluate(E exchange) {
+ public Object evaluate(Exchange exchange) {
// either use registry lookup or a constant bean
BeanHolder holder;
if (bean == null) {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanLanguage.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanLanguage.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanLanguage.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/bean/BeanLanguage.java Fri Oct 31 17:21:38 2008
@@ -75,11 +75,11 @@
return language.createExpression(bean, method);
}
- public Predicate<Exchange> createPredicate(String expression) {
+ public Predicate createPredicate(String expression) {
return PredicateBuilder.toPredicate(createExpression(expression));
}
- public Expression<Exchange> createExpression(String expression) {
+ public Expression createExpression(String expression) {
ObjectHelper.notNull(expression, "expression");
int idx = expression.lastIndexOf('.');
@@ -92,7 +92,7 @@
return new BeanExpression(beanName, method);
}
- public Expression<Exchange> createExpression(Object bean, String method) {
+ public Expression createExpression(Object bean, String method) {
ObjectHelper.notNull(bean, "bean");
return new BeanExpression(bean, method);
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/constant/ConstantLanguage.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/constant/ConstantLanguage.java?rev=709613&r1=709612&r2=709613&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/constant/ConstantLanguage.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/constant/ConstantLanguage.java Fri Oct 31 17:21:38 2008
@@ -16,7 +16,6 @@
*/
package org.apache.camel.language.constant;
-import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.Predicate;
import org.apache.camel.builder.ExpressionBuilder;
@@ -28,15 +27,15 @@
*/
public class ConstantLanguage implements Language {
- public static Expression<Exchange> constant(Object value) {
+ public static Expression constant(Object value) {
return ExpressionBuilder.constantExpression(value);
}
- public Predicate<Exchange> createPredicate(String expression) {
+ public Predicate createPredicate(String expression) {
return PredicateBuilder.toPredicate(createExpression(expression));
}
- public Expression<Exchange> createExpression(String expression) {
+ public Expression createExpression(String expression) {
return ConstantLanguage.constant(expression);
}
}