[2/3] git commit: CAMEL-6800: Bean language - Having dots in parameters cause bean id lookup problem

[da...@apache.org]

CAMEL-6800: Bean language - Having dots in parameters cause bean id lookup problem


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c82a8d03
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c82a8d03
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c82a8d03

Branch: refs/heads/camel-2.12.x
Commit: c82a8d03726f8d890b3e135cece1b765b1a1b987
Parents: 21b407b
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Sep 30 10:45:14 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Sep 30 10:45:28 2013 +0200

----------------------------------------------------------------------
 .../camel/language/bean/BeanLanguage.java       |  2 +-
 ...thDotInParameterPropertyPlaceholderTest.java | 84 ++++++++++++++++++++
 2 files changed, 85 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/c82a8d03/camel-core/src/main/java/org/apache/camel/language/bean/BeanLanguage.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/language/bean/BeanLanguage.java b/camel-core/src/main/java/org/apache/camel/language/bean/BeanLanguage.java
index bad9808..a7ac33a 100644
--- a/camel-core/src/main/java/org/apache/camel/language/bean/BeanLanguage.java
+++ b/camel-core/src/main/java/org/apache/camel/language/bean/BeanLanguage.java
@@ -91,7 +91,7 @@ public class BeanLanguage implements Language, IsSingleton {
             beanName = ObjectHelper.before(expression, "?");
             method = ObjectHelper.after(expression, "?method=");
         } else {
-            int idx = expression.lastIndexOf('.');
+            int idx = expression.indexOf('.');
             if (idx > 0) {
                 beanName = expression.substring(0, idx);
                 method = expression.substring(idx + 1);

http://git-wip-us.apache.org/repos/asf/camel/blob/c82a8d03/camel-core/src/test/java/org/apache/camel/language/BeanLanguageOGNLWithDotInParameterPropertyPlaceholderTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/language/BeanLanguageOGNLWithDotInParameterPropertyPlaceholderTest.java b/camel-core/src/test/java/org/apache/camel/language/BeanLanguageOGNLWithDotInParameterPropertyPlaceholderTest.java
new file mode 100644
index 0000000..61c2ed2
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/language/BeanLanguageOGNLWithDotInParameterPropertyPlaceholderTest.java
@@ -0,0 +1,84 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.language;
+
+import java.util.Properties;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.properties.PropertiesComponent;
+import org.apache.camel.impl.JndiRegistry;
+
+/**
+ * @version 
+ */
+public class BeanLanguageOGNLWithDotInParameterPropertyPlaceholderTest extends ContextTestSupport {
+
+    private Properties myProp;
+
+    public void testDot() throws Exception {
+        getMockEndpoint("mock:result").expectedMessageCount(1);
+        getMockEndpoint("mock:result").expectedHeaderReceived("goto", "mock:MyAppV1.2.3/blah");
+
+        template.sendBodyAndHeader("direct:start", "Hello World", "id", "blah");
+
+        assertMockEndpointsSatisfied();
+    }
+
+    @Override
+    protected JndiRegistry createRegistry() throws Exception {
+        JndiRegistry jndi = super.createRegistry();
+        jndi.bind("myBean", new MyDestinationBean());
+
+        myProp = new Properties();
+        myProp.put("myApp", "MyAppV1.2.3");
+        jndi.bind("myprop", myProp);
+
+        return jndi;
+    }
+
+    @Override
+    protected CamelContext createCamelContext() throws Exception {
+        CamelContext context = super.createCamelContext();
+
+        PropertiesComponent pc = context.getComponent("properties", PropertiesComponent.class);
+        pc.setLocation("ref:myprop");
+
+        return context;
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:start")
+                    .setHeader("goto").simple("${bean:myBean.whereToMate({{myApp}}, ${header.id})}")
+                    .to("mock:result");
+            }
+        };
+    }
+
+    public static class MyDestinationBean {
+
+        public String whereToMate(String version, String id) {
+            return "mock:" + version + "/" + id;
+        }
+
+    }
+}