You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/06/06 03:19:36 UTC
[1/4] git commit: CAMEL-7478 Fixed the simple language OGNL
expression issue
Repository: camel
Updated Branches:
refs/heads/camel-2.12.x 6f3975328 -> a1bc5694c
refs/heads/camel-2.13.x 0d0d56aa6 -> fc90178ff
CAMEL-7478 Fixed the simple language OGNL expression issue
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d42539c7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d42539c7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d42539c7
Branch: refs/heads/camel-2.13.x
Commit: d42539c78d8188ca50c63c828308d12b66ee689b
Parents: 0d0d56a
Author: Willem Jiang <wi...@gmail.com>
Authored: Thu Jun 5 23:33:25 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Jun 6 09:12:09 2014 +0800
----------------------------------------------------------------------
.../camel/language/bean/BeanExpression.java | 2 ++
.../camel/language/simple/SimpleTest.java | 20 ++++++++++++++++++++
2 files changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d42539c7/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java b/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
index 3cbc2fa..1092f6e 100644
--- a/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
@@ -300,6 +300,8 @@ public class BeanExpression implements Expression, Predicate {
// prepare for next bean to invoke
beanToCall = result;
+ // we need to set the result to the exchange for further processing
+ resultExchange.getIn().setBody(result);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/d42539c7/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
index 4e927b9..7713fb9 100644
--- a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
+++ b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
@@ -143,6 +143,20 @@ public class SimpleTest extends LanguageTestSupport {
assertIsInstanceOf(Integer.class, val);
assertEquals(123, val);
}
+
+ public void testBodyExpressionWithArray() throws Exception {
+ exchange.getIn().setBody(new MyClass());
+ Expression exp = SimpleLanguage.simple("body.getMyArray");
+ assertNotNull(exp);
+ Object val = exp.evaluate(exchange, Object.class);
+ assertIsInstanceOf(Object[].class, val);
+
+ exp = SimpleLanguage.simple("body.getMyArray.length");
+ assertNotNull(exp);
+ val = exp.evaluate(exchange, Object.class);
+ assertIsInstanceOf(Integer.class, val);
+ assertEquals(3, val);
+ }
public void testSimpleExpressions() throws Exception {
assertExpression("exchangeId", exchange.getExchangeId());
@@ -1424,4 +1438,10 @@ public class SimpleTest extends LanguageTestSupport {
return name;
}
}
+
+ public static class MyClass {
+ public Object[] getMyArray() {
+ return new Object[]{"Hallo", "World", "!"};
+ }
+ }
}
[2/4] git commit: Applying: CAMEL-7478 Fixed the simple language OGNL
expression issue of length
Posted by ni...@apache.org.
Applying: CAMEL-7478 Fixed the simple language OGNL expression issue of length
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fc90178f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fc90178f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fc90178f
Branch: refs/heads/camel-2.13.x
Commit: fc90178ffa9246f72aa25d33e377024b36408393
Parents: d42539c
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Jun 6 09:06:43 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Jun 6 09:12:15 2014 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/component/bean/BeanInfo.java | 2 ++
.../main/java/org/apache/camel/language/bean/BeanExpression.java | 2 --
.../test/java/org/apache/camel/language/simple/SimpleTest.java | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/fc90178f/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
index 53c1254..5b8804d 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
@@ -228,6 +228,8 @@ public class BeanInfo {
List<ParameterInfo> lpi = new ArrayList<ParameterInfo>(1);
lpi.add(pi);
methodInfo = new MethodInfo(exchange.getContext(), pojo.getClass(), method, lpi, lpi, false, false);
+ // Need to update the message body to be pojo for the invocation
+ exchange.getIn().setBody(pojo);
} catch (NoSuchMethodException e) {
throw new MethodNotFoundException(exchange, pojo, "getClass");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/fc90178f/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java b/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
index 1092f6e..3cbc2fa 100644
--- a/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
@@ -300,8 +300,6 @@ public class BeanExpression implements Expression, Predicate {
// prepare for next bean to invoke
beanToCall = result;
- // we need to set the result to the exchange for further processing
- resultExchange.getIn().setBody(result);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/fc90178f/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
index 7713fb9..e59ebbd 100644
--- a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
+++ b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
@@ -146,12 +146,12 @@ public class SimpleTest extends LanguageTestSupport {
public void testBodyExpressionWithArray() throws Exception {
exchange.getIn().setBody(new MyClass());
- Expression exp = SimpleLanguage.simple("body.getMyArray");
+ Expression exp = SimpleLanguage.simple("body.myArray");
assertNotNull(exp);
Object val = exp.evaluate(exchange, Object.class);
assertIsInstanceOf(Object[].class, val);
- exp = SimpleLanguage.simple("body.getMyArray.length");
+ exp = SimpleLanguage.simple("body.myArray.length");
assertNotNull(exp);
val = exp.evaluate(exchange, Object.class);
assertIsInstanceOf(Integer.class, val);
[4/4] git commit: Applying: CAMEL-7478 Fixed the simple language OGNL
expression issue of length
Posted by ni...@apache.org.
Applying: CAMEL-7478 Fixed the simple language OGNL expression issue of length
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a1bc5694
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a1bc5694
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a1bc5694
Branch: refs/heads/camel-2.12.x
Commit: a1bc5694ced8bf5598e97cc959661ced6a771987
Parents: fe7df7d
Author: Willem Jiang <wi...@gmail.com>
Authored: Fri Jun 6 09:06:43 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Jun 6 09:15:06 2014 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/camel/component/bean/BeanInfo.java | 2 ++
.../main/java/org/apache/camel/language/bean/BeanExpression.java | 2 --
.../test/java/org/apache/camel/language/simple/SimpleTest.java | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a1bc5694/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
index 53c1254..5b8804d 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
@@ -228,6 +228,8 @@ public class BeanInfo {
List<ParameterInfo> lpi = new ArrayList<ParameterInfo>(1);
lpi.add(pi);
methodInfo = new MethodInfo(exchange.getContext(), pojo.getClass(), method, lpi, lpi, false, false);
+ // Need to update the message body to be pojo for the invocation
+ exchange.getIn().setBody(pojo);
} catch (NoSuchMethodException e) {
throw new MethodNotFoundException(exchange, pojo, "getClass");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a1bc5694/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java b/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
index 1092f6e..3cbc2fa 100644
--- a/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
@@ -300,8 +300,6 @@ public class BeanExpression implements Expression, Predicate {
// prepare for next bean to invoke
beanToCall = result;
- // we need to set the result to the exchange for further processing
- resultExchange.getIn().setBody(result);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a1bc5694/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
index 7713fb9..e59ebbd 100644
--- a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
+++ b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
@@ -146,12 +146,12 @@ public class SimpleTest extends LanguageTestSupport {
public void testBodyExpressionWithArray() throws Exception {
exchange.getIn().setBody(new MyClass());
- Expression exp = SimpleLanguage.simple("body.getMyArray");
+ Expression exp = SimpleLanguage.simple("body.myArray");
assertNotNull(exp);
Object val = exp.evaluate(exchange, Object.class);
assertIsInstanceOf(Object[].class, val);
- exp = SimpleLanguage.simple("body.getMyArray.length");
+ exp = SimpleLanguage.simple("body.myArray.length");
assertNotNull(exp);
val = exp.evaluate(exchange, Object.class);
assertIsInstanceOf(Integer.class, val);
[3/4] git commit: CAMEL-7478 Fixed the simple language OGNL
expression issue
Posted by ni...@apache.org.
CAMEL-7478 Fixed the simple language OGNL expression issue
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fe7df7db
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fe7df7db
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fe7df7db
Branch: refs/heads/camel-2.12.x
Commit: fe7df7db7af296168b938ecea827fd0df8c7f042
Parents: 6f39753
Author: Willem Jiang <wi...@gmail.com>
Authored: Thu Jun 5 23:33:25 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Fri Jun 6 09:14:50 2014 +0800
----------------------------------------------------------------------
.../camel/language/bean/BeanExpression.java | 2 ++
.../camel/language/simple/SimpleTest.java | 20 ++++++++++++++++++++
2 files changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/fe7df7db/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java b/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
index 3cbc2fa..1092f6e 100644
--- a/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
+++ b/camel-core/src/main/java/org/apache/camel/language/bean/BeanExpression.java
@@ -300,6 +300,8 @@ public class BeanExpression implements Expression, Predicate {
// prepare for next bean to invoke
beanToCall = result;
+ // we need to set the result to the exchange for further processing
+ resultExchange.getIn().setBody(result);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/fe7df7db/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
index 4e927b9..7713fb9 100644
--- a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
+++ b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
@@ -143,6 +143,20 @@ public class SimpleTest extends LanguageTestSupport {
assertIsInstanceOf(Integer.class, val);
assertEquals(123, val);
}
+
+ public void testBodyExpressionWithArray() throws Exception {
+ exchange.getIn().setBody(new MyClass());
+ Expression exp = SimpleLanguage.simple("body.getMyArray");
+ assertNotNull(exp);
+ Object val = exp.evaluate(exchange, Object.class);
+ assertIsInstanceOf(Object[].class, val);
+
+ exp = SimpleLanguage.simple("body.getMyArray.length");
+ assertNotNull(exp);
+ val = exp.evaluate(exchange, Object.class);
+ assertIsInstanceOf(Integer.class, val);
+ assertEquals(3, val);
+ }
public void testSimpleExpressions() throws Exception {
assertExpression("exchangeId", exchange.getExchangeId());
@@ -1424,4 +1438,10 @@ public class SimpleTest extends LanguageTestSupport {
return name;
}
}
+
+ public static class MyClass {
+ public Object[] getMyArray() {
+ return new Object[]{"Hallo", "World", "!"};
+ }
+ }
}