Author: davsclaus
Date: Wed Apr 24 17:16:03 2013
New Revision: 1471544
URL: http://svn.apache.org/r1471544
Log:
CAMEL-6307: Fixed bean component OGNL calling methods with empty spaces around
simple language functions.
Added:
camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/component/bean/MyCurrency.java
- copied unchanged from r1471543,
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/MyCurrency.java
camel/branches/camel-2.11.x/camel-core/src/test/java/org/apache/camel/component/bean/MyCurrencyBean.java
- copied unchanged from r1471543,
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/MyCurrencyBean.java
camel/branches/camel-2.11.x/camel-core/src/test/java/org/apache/camel/component/bean/MyCurrencyBeanTest.java
- copied unchanged from r1471543,
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/MyCurrencyBeanTest.java
Modified:
camel/branches/camel-2.11.x/ (props changed)
camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/util/StringHelper.java
camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/util/StringQuoteHelper.java
camel/branches/camel-2.11.x/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
camel/branches/camel-2.11.x/camel-core/src/test/java/org/apache/camel/util/StingQuoteHelperTest.java
Propchange: camel/branches/camel-2.11.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1471543
Propchange: camel/branches/camel-2.11.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Apr 24 17:16:03 2013
@@ -1 +1 @@
-/camel/trunk:1-1468763,1469704,1469819,1470420,1470426-1470427,1470429,1470508,1471293,1471330,1471407-1471408
+/camel/trunk:1-1468763,1469704,1469819,1470420,1470426-1470427,1470429,1470508,1471293,1471330,1471407-1471408,1471543
Modified:
camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java?rev=1471544&r1=1471543&r2=1471544&view=diff
==============================================================================
---
camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
(original)
+++
camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/component/bean/MethodInfo.java
Wed Apr 24 17:16:03 2013
@@ -426,7 +426,7 @@ public class MethodInfo {
if (methodParameters != null) {
// split the parameters safely separated by comma, but
beware that we can have
// quoted parameters which contains comma as well, so do a
safe quote split
- String[] parameters =
StringQuoteHelper.splitSafeQuote(methodParameters, ',', false);
+ String[] parameters =
StringQuoteHelper.splitSafeQuote(methodParameters, ',', true);
it = ObjectHelper.createIterator(parameters, ",", true);
}
Modified:
camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/util/StringHelper.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/util/StringHelper.java?rev=1471544&r1=1471543&r2=1471544&view=diff
==============================================================================
---
camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/util/StringHelper.java
(original)
+++
camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/util/StringHelper.java
Wed Apr 24 17:16:03 2013
@@ -81,12 +81,15 @@ public final class StringHelper {
return s;
}
- if (s.startsWith("'") && s.endsWith("'")) {
- return s.substring(1, s.length() - 1);
+ String copy = s.trim();
+ if (copy.startsWith("'") && copy.endsWith("'")) {
+ return copy.substring(1, copy.length() - 1);
}
- if (s.startsWith("\"") && s.endsWith("\"")) {
- return s.substring(1, s.length() - 1);
+ if (copy.startsWith("\"") && copy.endsWith("\"")) {
+ return copy.substring(1, copy.length() - 1);
}
+
+ // no quotes, so return as-is
return s;
}
Modified:
camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/util/StringQuoteHelper.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/util/StringQuoteHelper.java?rev=1471544&r1=1471543&r2=1471544&view=diff
==============================================================================
---
camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/util/StringQuoteHelper.java
(original)
+++
camel/branches/camel-2.11.x/camel-core/src/main/java/org/apache/camel/util/StringQuoteHelper.java
Wed Apr 24 17:16:03 2013
@@ -82,6 +82,15 @@ public final class StringQuoteHelper {
// its an empty quote so add empty text
answer.add("");
}
+ // special logic needed if this quote is the end
+ if (i == input.length() - 1) {
+ if (singleQuoted && sb.length() > 0) {
+ String text = sb.toString();
+ // do not trim a quoted string
+ answer.add(text);
+ sb.setLength(0);
+ }
+ }
singleQuoted = !singleQuoted;
continue;
} else if (ch == '"') {
@@ -89,6 +98,15 @@ public final class StringQuoteHelper {
// its an empty quote so add empty text
answer.add("");
}
+ // special logic needed if this quote is the end
+ if (i == input.length() - 1) {
+ if (doubleQuoted && sb.length() > 0) {
+ String text = sb.toString();
+ // do not trim a quoted string
+ answer.add(text);
+ sb.setLength(0);
+ }
+ }
doubleQuoted = !doubleQuoted;
continue;
} else if (ch == ' ') {
Modified:
camel/branches/camel-2.11.x/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.11.x/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java?rev=1471544&r1=1471543&r2=1471544&view=diff
==============================================================================
---
camel/branches/camel-2.11.x/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
(original)
+++
camel/branches/camel-2.11.x/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
Wed Apr 24 17:16:03 2013
@@ -1134,6 +1134,21 @@ public class SimpleTest extends Language
assertExpression("${body.replaceFirst('http:',' ')}", "
camel.apache.org");
}
+ public void testBodyOgnlSpaces() throws Exception {
+ exchange.getIn().setBody("Hello World");
+
+ // no quotes, which is discouraged to use
+ assertExpression("${body.compareTo(Hello World)}", 0);
+
+ assertExpression("${body.compareTo('Hello World')}", 0);
+ assertExpression("${body.compareTo(${body})}", 0);
+ assertExpression("${body.compareTo('foo')}", "Hello
World".compareTo("foo"));
+
+ assertExpression("${body.compareTo( 'Hello World' )}", 0);
+ assertExpression("${body.compareTo( ${body} )}", 0);
+ assertExpression("${body.compareTo( 'foo' )}", "Hello
World".compareTo("foo"));
+ }
+
public void testClassSimpleName() throws Exception {
Animal tiger = new Animal("Tony the Tiger", 13);
exchange.getIn().setBody(tiger);
Modified:
camel/branches/camel-2.11.x/camel-core/src/test/java/org/apache/camel/util/StingQuoteHelperTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.11.x/camel-core/src/test/java/org/apache/camel/util/StingQuoteHelperTest.java?rev=1471544&r1=1471543&r2=1471544&view=diff
==============================================================================
---
camel/branches/camel-2.11.x/camel-core/src/test/java/org/apache/camel/util/StingQuoteHelperTest.java
(original)
+++
camel/branches/camel-2.11.x/camel-core/src/test/java/org/apache/camel/util/StingQuoteHelperTest.java
Wed Apr 24 17:16:03 2013
@@ -117,4 +117,18 @@ public class StingQuoteHelperTest extend
assertEquals("true", out[2]);
}
+ public void testLastIsQuote() throws Exception {
+ String[] out = StringQuoteHelper.splitSafeQuote(" ${body}, 5, 'Hello
World'", ',', true);
+ assertEquals(3, out.length);
+ assertEquals("${body}", out[0]);
+ assertEquals("5", out[1]);
+ assertEquals("Hello World", out[2]);
+
+ out = StringQuoteHelper.splitSafeQuote(" ${body}, 5, \"Hello World\"",
',', true);
+ assertEquals(3, out.length);
+ assertEquals("${body}", out[0]);
+ assertEquals("5", out[1]);
+ assertEquals("Hello World", out[2]);
+ }
+
}
