Author: davsclaus
Date: Fri Apr 29 15:58:37 2011
New Revision: 1097853

URL: http://svn.apache.org/viewvc?rev=1097853&view=rev
Log:
CAMEL-3916: Optimized bean component to not attempt unnessary type convertions.

Added:
    
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanPerformanceTest.java
Modified:
    
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
    
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ConstantBeanHolder.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java?rev=1097853&r1=1097852&r2=1097853&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanProcessor.java
 Fri Apr 29 15:58:37 2011
@@ -105,13 +105,20 @@ public class BeanProcessor extends Servi
 
         Message in = exchange.getIn();
 
-        // Now it gets a bit complicated as ProxyHelper can proxy beans which 
we later
-        // intend to invoke (for example to proxy and invoke using spring 
remoting).
-        // and therefore the message body contains a BeanInvocation object.
-        // However this can causes problem if we in a Camel route invokes 
another bean,
-        // so we must test whether BeanHolder and BeanInvocation is the same 
bean or not
-        BeanInvocation beanInvoke = in.getBody(BeanInvocation.class);
+        // is the message proxied using a BeanInvocation?
+        BeanInvocation beanInvoke = null;
+        if (in.getBody() != null && in.getBody() instanceof BeanInvocation) {
+            // BeanInvocation would be stored directly as the message body
+            // do not force any type conversion attempts as it would just be 
unnecessary and cost a bit performance
+            // so a regular instanceof check is sufficient
+            beanInvoke = (BeanInvocation) in.getBody();
+        }
         if (beanInvoke != null) {
+            // Now it gets a bit complicated as ProxyHelper can proxy beans 
which we later
+            // intend to invoke (for example to proxy and invoke using spring 
remoting).
+            // and therefore the message body contains a BeanInvocation object.
+            // However this can causes problem if we in a Camel route invokes 
another bean,
+            // so we must test whether BeanHolder and BeanInvocation is the 
same bean or not
             LOG.trace("Exchange IN body is a BeanInvocation instance: {}", 
beanInvoke);
             Class<?> clazz = beanInvoke.getMethod().getDeclaringClass();
             boolean sameBean = clazz.isInstance(bean);

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ConstantBeanHolder.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ConstantBeanHolder.java?rev=1097853&r1=1097852&r2=1097853&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ConstantBeanHolder.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/ConstantBeanHolder.java
 Fri Apr 29 15:58:37 2011
@@ -39,6 +39,7 @@ public class ConstantBeanHolder implemen
     public ConstantBeanHolder(Object bean, CamelContext context) {
         this(bean, new BeanInfo(context, bean.getClass()));
     }
+
     public ConstantBeanHolder(Object bean, CamelContext context, 
ParameterMappingStrategy parameterMappingStrategy) {
         this(bean, new BeanInfo(context, bean.getClass(), 
parameterMappingStrategy));
     }

Added: 
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanPerformanceTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanPerformanceTest.java?rev=1097853&view=auto
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanPerformanceTest.java
 (added)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanPerformanceTest.java
 Fri Apr 29 15:58:37 2011
@@ -0,0 +1,61 @@
+/**
+ * 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.bean;
+
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.util.StopWatch;
+import org.apache.camel.util.TimeUtils;
+
+/**
+ *
+ */
+public class BeanPerformanceTest extends ContextTestSupport {
+
+    private static final AtomicLong INVOKED = new AtomicLong();
+    private final int times = 100000;
+
+    public static void doSomething(String payload) {
+        assertEquals("Hello World", payload);
+        INVOKED.incrementAndGet();
+    }
+
+    public void testBeanPerformance() throws Exception {
+        StopWatch watch = new StopWatch();
+
+        log.info("Invoking a bean in a route {} times", times);
+        for (int i = 0; i < times; i++) {
+            template.sendBody("direct:start", "Hello World");
+        }
+        log.info("Took {} to invoke the bean {} times", 
TimeUtils.printDuration(watch.stop()), times);
+
+        assertEquals(times, INVOKED.get());
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:start")
+                    .bean(BeanPerformanceTest.class, "doSomething");
+            }
+        };
+    }
+}


Reply via email to