You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/08/07 15:31:10 UTC
svn commit: r801993 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/component/bean/
components/camel-spring/src/test/java/org/apache/camel/spring/remoting/
components/camel-spring/src/test/resources/org/apache/camel/spring/remoting/
Author: ningjiang
Date: Fri Aug 7 13:31:10 2009
New Revision: 801993
URL: http://svn.apache.org/viewvc?rev=801993&view=rev
Log:
CAMEL-1888 applied patch with thanks to Andreas
Added:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoPojoDirect.java (with props)
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoSpringRemotingPojoDirectTest.java (with props)
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/remoting/echo-pojo-direct.xml (with props)
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/CamelInvocationHandler.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/CamelInvocationHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/CamelInvocationHandler.java?rev=801993&r1=801992&r2=801993&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/CamelInvocationHandler.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/bean/CamelInvocationHandler.java Fri Aug 7 13:31:10 2009
@@ -24,6 +24,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.Producer;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.impl.DefaultExchange;
/**
@@ -56,6 +57,13 @@
producer.process(exchange);
Throwable fault = exchange.getException();
if (fault != null) {
+ if (fault instanceof RuntimeCamelException) {
+ // if the inner cause is a runtime exception we can throw it directly
+ if (((RuntimeCamelException) fault).getCause() instanceof RuntimeException) {
+ throw (RuntimeException) ((RuntimeCamelException) fault).getCause();
+ }
+ throw (RuntimeCamelException) fault;
+ }
throw new InvocationTargetException(fault);
}
if (pattern.isOutCapable()) {
Added: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoPojoDirect.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoPojoDirect.java?rev=801993&view=auto
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoPojoDirect.java (added)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoPojoDirect.java Fri Aug 7 13:31:10 2009
@@ -0,0 +1,35 @@
+/**
+ * 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.spring.remoting;
+
+import org.apache.camel.Consume;
+import org.apache.camel.Produce;
+
+/**
+ * @version $Revision$
+ */
+public class EchoPojoDirect {
+
+ @Produce(uri = "direct:echo")
+ private Echo service;
+
+ @Consume(uri = "direct:start")
+ public String onEcho(String name) {
+ return (String) service.echo(name);
+ }
+
+}
Propchange: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoPojoDirect.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoPojoDirect.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoSpringRemotingPojoDirectTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoSpringRemotingPojoDirectTest.java?rev=801993&view=auto
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoSpringRemotingPojoDirectTest.java (added)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoSpringRemotingPojoDirectTest.java Fri Aug 7 13:31:10 2009
@@ -0,0 +1,67 @@
+/**
+ * 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.spring.remoting;
+
+import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.spring.SpringTestSupport;
+import org.springframework.context.support.AbstractXmlApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+/**
+ * @version $Revision$
+ */
+public class EchoSpringRemotingPojoDirectTest extends SpringTestSupport {
+
+ @Override
+ protected int getExpectedRouteCount() {
+ return 0;
+ }
+
+ protected AbstractXmlApplicationContext createApplicationContext() {
+ return new ClassPathXmlApplicationContext("org/apache/camel/spring/remoting/echo-pojo-direct.xml");
+ }
+
+ public void testPojoOk() throws Exception {
+ String out = template.requestBody("direct:start", "Claus", String.class);
+ assertEquals("Claus Claus", out);
+ }
+
+ public void testPojoKabom() throws Exception {
+ try {
+ template.requestBody("direct:start", "Kabom", String.class);
+ fail("Should have thrown exception");
+ } catch (RuntimeCamelException e) {
+ assertIsInstanceOf(MyEchoRuntimeException.class, e.getCause());
+ assertEquals("Damn something went wrong", e.getCause().getMessage());
+ }
+ }
+
+ public void testPojoBeanKabom() throws Exception {
+ try {
+ // use the pojo directly to call the injected endpoint and have the
+ // original runtime exception thrown
+ EchoPojoDirect echoPojoDirect = (EchoPojoDirect)applicationContext.getBean("myPojoDirect");
+ String out = echoPojoDirect.onEcho("Kabom");
+ assertNotNull(out);
+ fail("Should have thrown exception");
+ } catch (RuntimeException e) {
+ assertIsInstanceOf(MyEchoRuntimeException.class, e);
+ assertEquals("Damn something went wrong", e.getMessage());
+ }
+ }
+
+}
Propchange: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoSpringRemotingPojoDirectTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/remoting/EchoSpringRemotingPojoDirectTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/remoting/echo-pojo-direct.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/remoting/echo-pojo-direct.xml?rev=801993&view=auto
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/remoting/echo-pojo-direct.xml (added)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/remoting/echo-pojo-direct.xml Fri Aug 7 13:31:10 2009
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
+ ">
+
+ <bean id="echoService" class="org.apache.camel.spring.remoting.EchoService"/>
+
+ <bean id="myPojoDirect" class="org.apache.camel.spring.remoting.EchoPojoDirect"/>
+
+ <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
+ <export id="echo" serviceInterface="org.apache.camel.spring.remoting.Echo" serviceRef="echoService" uri="direct:echo"/>
+
+ </camelContext>
+
+</beans>
Propchange: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/remoting/echo-pojo-direct.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/remoting/echo-pojo-direct.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/remoting/echo-pojo-direct.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml