camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r675938 - in /activemq/camel/trunk/camel-core/src: main/java/org/apache/camel/component/bean/BeanInfo.java test/java/org/apache/camel/component/bean/BeanExchangeAsReturnTypeNotAllowedTest.java
Date Fri, 11 Jul 2008 12:38:12 GMT
Author: davsclaus
Date: Fri Jul 11 05:38:11 2008
New Revision: 675938

URL: http://svn.apache.org/viewvc?rev=675938&view=rev
Log:
CAMEL-701: Methods that return Exchange is not a valid metohd

Added:
    activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanExchangeAsReturnTypeNotAllowedTest.java
  (with props)
Modified:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java?rev=675938&r1=675937&r2=675938&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
(original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
Fri Jul 11 05:38:11 2008
@@ -363,7 +363,17 @@
     }
 
     protected boolean isValidMethod(Class clazz, Method method) {
-        return Modifier.isPublic(method.getModifiers());
+        // must be a public method
+        if (!Modifier.isPublic(method.getModifiers())) {
+            return false;
+        }
+
+        // return type must not be an Exchange
+        if (method.getReturnType() != null && Exchange.class.isAssignableFrom(method.getReturnType()))
{
+            return false;
+        }
+
+        return true;
     }
 
     public static ParameterMappingStrategy createParameterMappingStrategy(CamelContext camelContext)
{

Added: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanExchangeAsReturnTypeNotAllowedTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanExchangeAsReturnTypeNotAllowedTest.java?rev=675938&view=auto
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanExchangeAsReturnTypeNotAllowedTest.java
(added)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanExchangeAsReturnTypeNotAllowedTest.java
Fri Jul 11 05:38:11 2008
@@ -0,0 +1,70 @@
+/**
+ * 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 javax.naming.Context;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.util.jndi.JndiContext;
+
+/**
+ * Unit test to demonstrate that bean invocation must no return Exchange.
+ */
+public class BeanExchangeAsReturnTypeNotAllowedTest extends ContextTestSupport {
+
+    public void testExchangeAsReturnTypeNotAllowed() throws Exception {
+        MockEndpoint dead = getMockEndpoint("mock:dead");
+        dead.expectedMessageCount(1);
+
+        MockEndpoint result = getMockEndpoint("mock:result");
+        result.expectedMessageCount(0);
+
+        template.sendBody("direct:in", "Hello World");
+
+        dead.assertIsSatisfied();
+        result.assertIsSatisfied();
+    }
+
+    protected Context createJndiContext() throws Exception {
+        JndiContext answer = new JndiContext();
+        answer.bind("myBean", new MyBean());
+        return answer;
+    }
+
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            public void configure() throws Exception {
+                errorHandler(deadLetterChannel("mock:dead"));
+
+                from("direct:in")
+                    .to("bean:myBean")
+                    .to("mock:result");
+            }
+        };
+    }
+
+    public static class MyBean {
+        public Exchange doSomething(Exchange exchange) {
+            // this method should not be called
+            return exchange;
+        }
+    }
+
+}

Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanExchangeAsReturnTypeNotAllowedTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/BeanExchangeAsReturnTypeNotAllowedTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date



Mime
View raw message