You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cs...@apache.org on 2011/09/14 17:52:24 UTC
svn commit: r1170695 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/builder/
camel-core/src/main/java/org/apache/camel/component/bean/
camel-core/src/main/java/org/apache/camel/impl/
camel-core/src/main/java/org/apache/camel/language/ref/...
Author: cschneider
Date: Wed Sep 14 15:52:23 2011
New Revision: 1170695
URL: http://svn.apache.org/viewvc?rev=1170695&view=rev
Log:
CAMEL-4417 Move ExpressionAdapter and ExpressionSupport to support
Added:
camel/trunk/camel-core/src/main/java/org/apache/camel/support/ExpressionAdapter.java (contents, props changed)
- copied, changed from r1170636, camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ExpressionAdapter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/support/ExpressionSupport.java (contents, props changed)
- copied, changed from r1170636, camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ExpressionSupport.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ExpressionAdapter.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ExpressionSupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/language/ref/RefLanguage.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptFromDefinition.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/CustomParameterMappingStrategyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ExpressionAdapterTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ExpressionSupportTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/issues/NeilSplitterTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/language/RefTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetHeaderUsingDslExpressionsTest.java
camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java?rev=1170695&r1=1170694&r2=1170695&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java Wed Sep 14 15:52:23 2011
@@ -37,10 +37,10 @@ import org.apache.camel.NoSuchEndpointEx
import org.apache.camel.Producer;
import org.apache.camel.component.bean.BeanInvocation;
import org.apache.camel.component.properties.PropertiesComponent;
-import org.apache.camel.impl.ExpressionAdapter;
import org.apache.camel.language.bean.BeanLanguage;
import org.apache.camel.model.language.MethodCallExpression;
import org.apache.camel.spi.Language;
+import org.apache.camel.support.ExpressionAdapter;
import org.apache.camel.util.ExchangeHelper;
import org.apache.camel.util.FileUtil;
import org.apache.camel.util.IOHelper;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java?rev=1170695&r1=1170694&r2=1170695&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java Wed Sep 14 15:52:23 2011
@@ -39,11 +39,11 @@ import org.apache.camel.NoTypeConversion
import org.apache.camel.Pattern;
import org.apache.camel.Processor;
import org.apache.camel.RuntimeExchangeException;
-import org.apache.camel.impl.ExpressionAdapter;
import org.apache.camel.processor.DynamicRouter;
import org.apache.camel.processor.RecipientList;
import org.apache.camel.processor.RoutingSlip;
import org.apache.camel.processor.aggregate.AggregationStrategy;
+import org.apache.camel.support.ExpressionAdapter;
import org.apache.camel.util.CamelContextHelper;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ServiceHelper;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ExpressionAdapter.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ExpressionAdapter.java?rev=1170695&r1=1170694&r2=1170695&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ExpressionAdapter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ExpressionAdapter.java Wed Sep 14 15:52:23 2011
@@ -16,25 +16,12 @@
*/
package org.apache.camel.impl;
-import org.apache.camel.Exchange;
-
/**
- * A helper class for developers wishing to implement an {@link org.apache.camel.Expression}
- * using Java code with a minimum amount of code to write so that the developer only needs
- * to implement one of the {@link #evaluate(org.apache.camel.Exchange, Class)} or
- * {@link #evaluate(org.apache.camel.Exchange)} methods.
- *
- * @version
+ *
+ * @deprecated
+ * @see org.apache.camel.support.ExpressionAdapter
*/
-public abstract class ExpressionAdapter extends ExpressionSupport {
-
- protected String assertionFailureMessage(Exchange exchange) {
- return toString();
- }
-
- public <T> T evaluate(Exchange exchange, Class<T> type) {
- Object value = evaluate(exchange);
- return exchange.getContext().getTypeConverter().convertTo(type, value);
- }
+@Deprecated
+public class ExpressionAdapter extends org.apache.camel.support.ExpressionAdapter {
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ExpressionSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ExpressionSupport.java?rev=1170695&r1=1170694&r2=1170695&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ExpressionSupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ExpressionSupport.java Wed Sep 14 15:52:23 2011
@@ -16,32 +16,12 @@
*/
package org.apache.camel.impl;
-import org.apache.camel.Exchange;
-import org.apache.camel.Expression;
-import org.apache.camel.Predicate;
-import org.apache.camel.util.ObjectHelper;
-
/**
- * A useful base class for {@link Predicate} and {@link Expression} implementations
- *
- * @version
+ *
+ * @deprecated
+ * @see org.apache.camel.support.ExpressionSupport
*/
-public abstract class ExpressionSupport implements Expression, Predicate {
-
- public boolean matches(Exchange exchange) {
- Object value = evaluate(exchange, Object.class);
- return ObjectHelper.evaluateValuePredicate(value);
- }
-
- public Object evaluate(Exchange exchange) {
- return evaluate(exchange, Object.class);
- }
-
- public void assertMatches(String text, Exchange exchange) {
- if (!matches(exchange)) {
- throw new AssertionError(text + " " + assertionFailureMessage(exchange) + " for exchange: " + exchange);
- }
- }
+@Deprecated
+public abstract class ExpressionSupport extends org.apache.camel.support.ExpressionSupport {
- protected abstract String assertionFailureMessage(Exchange exchange);
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/language/ref/RefLanguage.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/language/ref/RefLanguage.java?rev=1170695&r1=1170694&r2=1170695&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/language/ref/RefLanguage.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/language/ref/RefLanguage.java Wed Sep 14 15:52:23 2011
@@ -22,8 +22,8 @@ import org.apache.camel.IsSingleton;
import org.apache.camel.Predicate;
import org.apache.camel.builder.ExpressionBuilder;
import org.apache.camel.builder.PredicateBuilder;
-import org.apache.camel.impl.ExpressionAdapter;
import org.apache.camel.spi.Language;
+import org.apache.camel.support.ExpressionAdapter;
/**
* A language for referred expressions.
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptFromDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptFromDefinition.java?rev=1170695&r1=1170694&r2=1170695&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptFromDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptFromDefinition.java Wed Sep 14 15:52:23 2011
@@ -23,8 +23,8 @@ import javax.xml.bind.annotation.XmlRoot
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.impl.ExpressionAdapter;
import org.apache.camel.spi.RouteContext;
+import org.apache.camel.support.ExpressionAdapter;
/**
* Represents an XML <interceptFrom/> element
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/support/ExpressionAdapter.java (from r1170636, camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ExpressionAdapter.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/support/ExpressionAdapter.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/support/ExpressionAdapter.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ExpressionAdapter.java&r1=1170636&r2=1170695&rev=1170695&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ExpressionAdapter.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/support/ExpressionAdapter.java Wed Sep 14 15:52:23 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl;
+package org.apache.camel.support;
import org.apache.camel.Exchange;
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/support/ExpressionAdapter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/support/ExpressionAdapter.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/support/ExpressionSupport.java (from r1170636, camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ExpressionSupport.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/support/ExpressionSupport.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/support/ExpressionSupport.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ExpressionSupport.java&r1=1170636&r2=1170695&rev=1170695&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ExpressionSupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/support/ExpressionSupport.java Wed Sep 14 15:52:23 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.impl;
+package org.apache.camel.support;
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/support/ExpressionSupport.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/support/ExpressionSupport.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/CustomParameterMappingStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/CustomParameterMappingStrategyTest.java?rev=1170695&r1=1170694&r2=1170695&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/CustomParameterMappingStrategyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/CustomParameterMappingStrategyTest.java Wed Sep 14 15:52:23 2011
@@ -20,8 +20,8 @@ import org.apache.camel.ContextTestSuppo
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.ExpressionAdapter;
import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.support.ExpressionAdapter;
/**
* @version
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ExpressionAdapterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ExpressionAdapterTest.java?rev=1170695&r1=1170694&r2=1170695&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ExpressionAdapterTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ExpressionAdapterTest.java Wed Sep 14 15:52:23 2011
@@ -18,6 +18,7 @@ package org.apache.camel.impl;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
+import org.apache.camel.support.ExpressionAdapter;
/**
* @version
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ExpressionSupportTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ExpressionSupportTest.java?rev=1170695&r1=1170694&r2=1170695&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ExpressionSupportTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ExpressionSupportTest.java Wed Sep 14 15:52:23 2011
@@ -18,6 +18,7 @@ package org.apache.camel.impl;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
+import org.apache.camel.support.ExpressionSupport;
/**
* @version
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/issues/NeilSplitterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/NeilSplitterTest.java?rev=1170695&r1=1170694&r2=1170695&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/issues/NeilSplitterTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/issues/NeilSplitterTest.java Wed Sep 14 15:52:23 2011
@@ -25,7 +25,7 @@ import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.impl.ExpressionAdapter;
+import org.apache.camel.support.ExpressionAdapter;
/**
* @version
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/language/RefTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/language/RefTest.java?rev=1170695&r1=1170694&r2=1170695&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/language/RefTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/language/RefTest.java Wed Sep 14 15:52:23 2011
@@ -18,8 +18,8 @@ package org.apache.camel.language;
import org.apache.camel.Exchange;
import org.apache.camel.LanguageTestSupport;
-import org.apache.camel.impl.ExpressionAdapter;
import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.support.ExpressionAdapter;
public class RefTest extends LanguageTestSupport {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetHeaderUsingDslExpressionsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetHeaderUsingDslExpressionsTest.java?rev=1170695&r1=1170694&r2=1170695&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetHeaderUsingDslExpressionsTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetHeaderUsingDslExpressionsTest.java Wed Sep 14 15:52:23 2011
@@ -20,7 +20,7 @@ import org.apache.camel.ContextTestSuppo
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.impl.ExpressionAdapter;
+import org.apache.camel.support.ExpressionAdapter;
/**
* @version
Modified: camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java?rev=1170695&r1=1170694&r2=1170695&view=diff
==============================================================================
--- camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java (original)
+++ camel/trunk/components/camel-juel/src/main/java/org/apache/camel/language/juel/JuelExpression.java Wed Sep 14 15:52:23 2011
@@ -33,8 +33,8 @@ import de.odysseus.el.util.SimpleContext
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
-import org.apache.camel.impl.ExpressionSupport;
import org.apache.camel.spi.FactoryFinder;
+import org.apache.camel.support.ExpressionSupport;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;