Author: davsclaus
Date: Sat Dec 3 08:20:36 2011
New Revision: 1209851
URL: http://svn.apache.org/viewvc?rev=1209851&view=rev
Log:
CAMEL-4733: Fixed issue with Java DSL creating expression with expression
clause, not ensuring the model is update with the expression definition being
used. This would cause the JAXB model of the route to not contain the actual
expression in use.
Added:
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlSetBodyRouteTest.java
- copied, changed from r1209477,
camel/trunk/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlSetBodyRouteTest.java
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteTest.java
- copied, changed from r1209477,
camel/trunk/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteTest.java
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/language/BeanLanguageInvalidOGNLTest.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Dec 3 08:20:36 2011
@@ -1 +1 @@
-/camel/trunk:1202148,1202167,1202204-1202206,1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930,1208964-1208965,1209006-1209007,1209382,1209401
+/camel/trunk:1202148,1202167,1202204-1202206,1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930,1208964-1208965,1209006-1209007,1209382,1209401,1209477
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java?rev=1209851&r1=1209850&r2=1209851&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
(original)
+++
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/builder/ExpressionClause.java
Sat Dec 3 08:20:36 2011
@@ -590,22 +590,6 @@ public class ExpressionClause<T> extends
// Properties
//
-------------------------------------------------------------------------
-
- @Override
- public String getLanguage() {
- return delegate.getLanguage();
- }
-
- @Override
- public String getExpression() {
- return delegate.getExpression();
- }
-
- @Override
- public void setExpression(String expression) {
- delegate.setExpression(expression);
- }
-
@Override
public Expression getExpressionValue() {
return delegate.getExpressionValue();
Modified:
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java?rev=1209851&r1=1209850&r2=1209851&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
(original)
+++
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
Sat Dec 3 08:20:36 2011
@@ -28,6 +28,7 @@ import org.apache.camel.model.language.G
import org.apache.camel.model.language.HeaderExpression;
import org.apache.camel.model.language.JXPathExpression;
import org.apache.camel.model.language.JavaScriptExpression;
+import org.apache.camel.model.language.LanguageExpression;
import org.apache.camel.model.language.MethodCallExpression;
import org.apache.camel.model.language.MvelExpression;
import org.apache.camel.model.language.OgnlExpression;
@@ -42,8 +43,6 @@ import org.apache.camel.model.language.S
import org.apache.camel.model.language.TokenizerExpression;
import org.apache.camel.model.language.XPathExpression;
import org.apache.camel.model.language.XQueryExpression;
-import org.apache.camel.spi.Language;
-import org.apache.camel.util.ObjectHelper;
/**
* A support class for building expression clauses.
@@ -53,8 +52,6 @@ import org.apache.camel.util.ObjectHelpe
public class ExpressionClauseSupport<T> {
private T result;
- private String language;
- private String expression;
private Expression expressionValue;
private ExpressionDefinition expressionType;
@@ -651,28 +648,13 @@ public class ExpressionClauseSupport<T>
* @return the builder to continue processing the DSL
*/
public T language(String language, String expression) {
- setLanguage(language);
- setExpression(expression);
+ LanguageExpression exp = new LanguageExpression(language, expression);
+ setExpressionType(exp);
return result;
}
// Properties
//
-------------------------------------------------------------------------
- public String getLanguage() {
- return language;
- }
-
- public void setLanguage(String language) {
- this.language = language;
- }
-
- public String getExpression() {
- return expression;
- }
-
- public void setExpression(String expression) {
- this.expression = expression;
- }
public Expression getExpressionValue() {
return expressionValue;
@@ -694,11 +676,8 @@ public class ExpressionClauseSupport<T>
if (getExpressionValue() == null) {
if (getExpressionType() != null) {
setExpressionValue(getExpressionType().createExpression(camelContext));
- } else if (getExpression() != null) {
- ObjectHelper.notNull("language", getLanguage());
- Language language =
camelContext.resolveLanguage(getLanguage());
- setExpressionValue(language.createExpression(getExpression()));
- configureExpression(camelContext, getExpressionValue());
+ } else {
+ throw new IllegalStateException("No expression value
configured");
}
}
return getExpressionValue();
Modified:
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java?rev=1209851&r1=1209850&r2=1209851&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
(original)
+++
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
Sat Dec 3 08:20:36 2011
@@ -104,8 +104,19 @@ public class ExpressionNode extends Proc
@Override
protected void configureChild(ProcessorDefinition output) {
- if (expression instanceof ExpressionClause) {
- ExpressionClause clause = (ExpressionClause) expression;
+ // reuse the logic from pre create processor
+ preCreateProcessor();
+ }
+
+ @Override
+ protected void preCreateProcessor() {
+ Expression exp = expression;
+ if (expression.getExpressionValue() != null) {
+ exp = expression.getExpressionValue();
+ }
+
+ if (exp instanceof ExpressionClause) {
+ ExpressionClause clause = (ExpressionClause) exp;
if (clause.getExpressionType() != null) {
// if using the Java DSL then the expression may have been set
using the
// ExpressionClause which is a fancy builder to define
expressions and predicates
@@ -115,5 +126,4 @@ public class ExpressionNode extends Proc
}
}
}
-
}
Modified:
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java?rev=1209851&r1=1209850&r2=1209851&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
(original)
+++
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
Sat Dec 3 08:20:36 2011
@@ -428,6 +428,9 @@ public abstract class ProcessorDefinitio
// resolve constant fields (eg Exchange.FILE_NAME)
resolveKnownConstantFields(this);
+ // allow any custom logic before we create the processor
+ preCreateProcessor();
+
// at first use custom factory
if (routeContext.getCamelContext().getProcessorFactory() != null) {
processor =
routeContext.getCamelContext().getProcessorFactory().createProcessor(routeContext,
this);
@@ -569,6 +572,13 @@ public abstract class ProcessorDefinitio
}
/**
+ * Strategy to execute any custom logic before the {@link Processor} is
created.
+ */
+ protected void preCreateProcessor() {
+ // noop
+ }
+
+ /**
* Strategy for children to do any custom configuration
*
* @param output the child to be added as output to this
Modified:
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/language/BeanLanguageInvalidOGNLTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/language/BeanLanguageInvalidOGNLTest.java?rev=1209851&r1=1209850&r2=1209851&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/language/BeanLanguageInvalidOGNLTest.java
(original)
+++
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/language/BeanLanguageInvalidOGNLTest.java
Sat Dec 3 08:20:36 2011
@@ -19,9 +19,9 @@ package org.apache.camel.language;
import java.util.LinkedHashMap;
import java.util.Map;
-import org.apache.camel.CamelExecutionException;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.ExpressionIllegalSyntaxException;
+import org.apache.camel.FailedToCreateRouteException;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.bean.MethodNotFoundException;
@@ -33,10 +33,16 @@ import org.apache.camel.language.bean.Ru
public class BeanLanguageInvalidOGNLTest extends ContextTestSupport {
public void testBeanLanguageInvalidOGNL() throws Exception {
+ context.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start")
+ .transform().method(MyReallyCoolBean.class, "getOther[xx");
+ }
+ });
try {
- template.requestBody("direct:start", "World", String.class);
- fail("Should have thrown exception");
- } catch (CamelExecutionException e) {
+ context.start();
+ } catch (FailedToCreateRouteException e) {
RuntimeCamelException rce =
assertIsInstanceOf(RuntimeCamelException.class, e.getCause());
MethodNotFoundException mnfe =
assertIsInstanceOf(MethodNotFoundException.class, rce.getCause());
assertEquals("getOther[xx", mnfe.getMethodName());
@@ -47,14 +53,8 @@ public class BeanLanguageInvalidOGNLTest
}
@Override
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- from("direct:start")
- .transform().method(MyReallyCoolBean.class, "getOther[xx");
- }
- };
+ public boolean isUseRouteBuilder() {
+ return false;
}
public static class MyReallyCoolBean {
Copied:
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlSetBodyRouteTest.java
(from r1209477,
camel/trunk/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlSetBodyRouteTest.java)
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlSetBodyRouteTest.java?p2=camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlSetBodyRouteTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlSetBodyRouteTest.java&r1=1209477&r2=1209851&rev=1209851&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlSetBodyRouteTest.java
(original)
+++
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlSetBodyRouteTest.java
Sat Dec 3 08:20:36 2011
@@ -18,7 +18,6 @@ package org.apache.camel.util;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.model.ModelHelper;
/**
*
Copied:
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteTest.java
(from r1209477,
camel/trunk/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteTest.java)
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteTest.java?p2=camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteTest.java&p1=camel/trunk/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteTest.java&r1=1209477&r2=1209851&rev=1209851&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteTest.java
(original)
+++
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/util/DumpModelAsXmlTransformRouteTest.java
Sat Dec 3 08:20:36 2011
@@ -18,7 +18,6 @@ package org.apache.camel.util;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.model.ModelHelper;
/**
*
