svn commit: r1183271 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/model/language/MethodCallExpression.java test/java/org/apache/camel/component/vm/VMSplitterTest.java

[ni...@apache.org]

Author: ningjiang
Date: Fri Oct 14 09:58:00 2011
New Revision: 1183271

URL: http://svn.apache.org/viewvc?rev=1183271&view=rev
Log:
CAMEL-4542 Fix the issue of using VM and splitter bean

Added:
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/vm/VMSplitterTest.java   (with props)
Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java?rev=1183271&r1=1183270&r2=1183271&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java Fri Oct 14 09:58:00 2011
@@ -170,7 +170,7 @@ public class MethodCallExpression extend
             BeanHolder holder = new RegistryBean(camelContext, ref);
             // get the bean which will check that it exists
             instance = holder.getBean();
-            answer = new BeanExpression(ref, getMethod());
+            answer = new BeanExpression(instance, getMethod());
         }
 
         validateHasMethod(camelContext, instance, beanType, getMethod());

Added: camel/trunk/camel-core/src/test/java/org/apache/camel/component/vm/VMSplitterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/vm/VMSplitterTest.java?rev=1183271&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/vm/VMSplitterTest.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/vm/VMSplitterTest.java Fri Oct 14 09:58:00 2011
@@ -0,0 +1,82 @@
+/**
+ * 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.component.vm;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.model.language.MethodCallExpression;
+import org.apache.camel.processor.SplitterMethodCallTest.SplitWordsBean;
+
+public class VMSplitterTest extends AbstractVmTestSupport {
+    
+    protected JndiRegistry createRegistry() throws Exception {
+        JndiRegistry jndi = super.createRegistry();
+        jndi.bind("splitterBean", new SplitWordsBean());
+        return jndi;
+    }
+    
+
+    public void testSplitUsingMethodCall() throws Exception {
+        MockEndpoint resultEndpoint = getMockEndpoint("mock:result");
+        resultEndpoint.expectedBodiesReceived("Claus", "James", "Willem");
+
+        template2.sendBody("direct:start", "Claus@James@Willem");
+
+        assertMockEndpointsSatisfied();
+    }
+    
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("vm:server").split().method("splitterBean", "splitWords").to("mock:result");
+            }
+        };
+    }
+    
+    @Override
+    protected RouteBuilder createRouteBuilderForSecondContext() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:start").to("vm:server");
+            }
+        };
+    }
+    
+    public static final class SplitWordsBean {
+        private SplitWordsBean() {
+            // Helper Class
+        }
+
+        public static List<String> splitWords(String body) {
+            // here we split the payload using java code
+            // we have the true power of Java to do the splitting
+            // as we like. As this is based on a unit test we just do it easy
+            return Arrays.asList(body.split("@"));
+        }
+
+    }
+
+}

Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/component/vm/VMSplitterTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/component/vm/VMSplitterTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date