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 2008/01/12 08:22:41 UTC
svn commit: r611382 - in /activemq/camel/trunk/components/camel-cxf/src:
main/java/org/apache/camel/component/cxf/
test/java/org/apache/camel/component/cxf/
Author: ningjiang
Date: Fri Jan 11 23:22:41 2008
New Revision: 611382
URL: http://svn.apache.org/viewvc?rev=611382&view=rev
Log:
camel-286 Fixed the NPE of the cxf router
Modified:
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfExchange.java
activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfMessage.java
activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterTest.java
activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRawMessageRouterTest.java
activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRouterTest.java
Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfExchange.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfExchange.java?rev=611382&r1=611381&r2=611382&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfExchange.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfExchange.java Fri Jan 11 23:22:41 2008
@@ -28,26 +28,26 @@
/**
* An {@link Exchange} for working with Apache CXF which expoes the underlying
* CXF messages via {@link #getInMessage()} and {@link #getOutMessage()} along with the
- * {@link #getExchange()}
+ * {@link #getExchange()}
*
* @version $Revision$
*/
-public class CxfExchange extends DefaultExchange {
+public class CxfExchange extends DefaultExchange {
private Exchange exchange;
public CxfExchange(CamelContext context, Exchange exchange) {
- super(context);
+ super(context);
this.exchange = exchange;
setIn(new CxfMessage(exchange.getInMessage()));
setOut(new CxfMessage(exchange.getOutMessage()));
if (exchange.getInFaultMessage() != null) {
setFault(new CxfMessage(exchange.getInFaultMessage()));
- }
+ }
}
public CxfExchange(CamelContext context, ExchangePattern pattern) {
- super(context, pattern);
+ super(context, pattern);
}
public CxfExchange(CamelContext context, ExchangePattern pattern, Message inMessage) {
@@ -56,14 +56,21 @@
setIn(new CxfMessage(inMessage));
if (exchange != null) {
- setOut(new CxfMessage(exchange.getOutMessage()));
+ if (exchange.getOutMessage()!= null) {
+ setOut(new CxfMessage(exchange.getOutMessage()));
+ }
if (exchange.getInFaultMessage() != null) {
setFault(new CxfMessage(exchange.getInFaultMessage()));
- }
+ }
}
}
@Override
+ public org.apache.camel.Exchange newInstance() {
+ return new CxfExchange(this.getContext(), this.getExchange());
+ }
+
+ @Override
public CxfMessage getIn() {
return (CxfMessage) super.getIn();
}
@@ -82,7 +89,7 @@
public CxfMessage getFault() {
return (CxfMessage) super.getFault();
}
-
+
@Override
protected org.apache.camel.Message createFaultMessage() {
return new CxfMessage();
Modified: activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfMessage.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfMessage.java?rev=611382&r1=611381&r2=611382&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfMessage.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/CxfMessage.java Fri Jan 11 23:22:41 2008
@@ -25,7 +25,7 @@
/**
* An Apache CXF {@link Message} which provides access to the underlying CXF
* features
- *
+ *
* @version $Revision$
*/
public class CxfMessage extends DefaultMessage {
@@ -44,6 +44,17 @@
}
@Override
+ public void copyFrom(org.apache.camel.Message that) {
+ setMessageId(that.getMessageId());
+ setBody(that.getBody());
+ getHeaders().putAll(that.getHeaders());
+ if (that instanceof CxfMessage) {
+ CxfMessage orig = (CxfMessage) that;
+ setMessage(orig.getMessage());
+ }
+ }
+
+ @Override
public String toString() {
if (cxfMessage != null) {
return "CxfMessage: " + cxfMessage;
@@ -59,7 +70,7 @@
/**
* Returns the underlying CXF message
- *
+ *
* @return the CXF message
*/
public Message getMessage() {
Modified: activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterTest.java?rev=611382&r1=611381&r2=611382&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterTest.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterTest.java Fri Jan 11 23:22:41 2008
@@ -24,7 +24,7 @@
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from(routerEndpointURI).to(serviceEndpointURI);
+ from(routerEndpointURI).to("log:org.apache.camel?level=DEBUG").to(serviceEndpointURI);
}
};
}
Modified: activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRawMessageRouterTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRawMessageRouterTest.java?rev=611382&r1=611381&r2=611382&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRawMessageRouterTest.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRawMessageRouterTest.java Fri Jan 11 23:22:41 2008
@@ -24,7 +24,7 @@
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from(routerEndpointURI).to(serviceEndpointURI);
+ from(routerEndpointURI).to("log:org.apache.camel?level=DEBUG").to(serviceEndpointURI);
}
};
}
Modified: activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRouterTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRouterTest.java?rev=611382&r1=611381&r2=611382&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRouterTest.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfRouterTest.java Fri Jan 11 23:22:41 2008
@@ -32,21 +32,21 @@
protected static final String ROUTER_ADDRESS = "http://localhost:9000/router";
protected static final String SERVICE_ADDRESS = "http://localhost:9002/helloworld";
protected static final String SERVICE_CLASS = "serviceClass=org.apache.camel.component.cxf.HelloService";
-
+
private String routerEndpointURI = "cxf://" + ROUTER_ADDRESS + "?" + SERVICE_CLASS + "&dataFormat=POJO";
private String serviceEndpointURI = "cxf://" + SERVICE_ADDRESS + "?" + SERVICE_CLASS + "&dataFormat=POJO";
-
+
private ServerImpl server;
private Bus bus;
-
-
+
+
@Override
protected void setUp() throws Exception {
- super.setUp();
- bus = BusFactory.getDefaultBus();
+ super.setUp();
+ bus = BusFactory.getDefaultBus();
startService();
}
-
+
protected void startService() {
//start a service
ServerFactoryBean svrBean = new ServerFactoryBean();
@@ -59,47 +59,47 @@
server = (ServerImpl)svrBean.create();
server.start();
}
-
+
@Override
protected void tearDown() throws Exception {
//bus.shutdown(true);
- BusFactory.setDefaultBus(null);
+ BusFactory.setDefaultBus(null);
}
-
+
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from(routerEndpointURI).to(serviceEndpointURI);
+ from(routerEndpointURI).to("log:org.apache.camel?level=DEBUG").to(serviceEndpointURI);
}
};
}
-
+
protected CamelContext createCamelContext() throws Exception {
return new DefaultCamelContext();
}
-
- public void testInvokingServiceFromCXFClient() throws Exception {
-
+
+ public void testInvokingServiceFromCXFClient() throws Exception {
+
ClientProxyFactoryBean proxyFactory = new ClientProxyFactoryBean();
ClientFactoryBean clientBean = proxyFactory.getClientFactoryBean();
- clientBean.setAddress(ROUTER_ADDRESS);
+ clientBean.setAddress(ROUTER_ADDRESS);
clientBean.setServiceClass(HelloService.class);
- clientBean.setBus(bus);
-
+ clientBean.setBus(bus);
+
HelloService client = (HelloService) proxyFactory.create();
+
String result = client.echo("hello world");
- assertEquals("we should get the right answer from router", "echo hello world", result);
-
-
+ assertEquals("we should get the right answer from router", result, "echo hello world");
+
}
-
+
public void testOnwayInvocation() throws Exception {
ClientProxyFactoryBean proxyFactory = new ClientProxyFactoryBean();
ClientFactoryBean clientBean = proxyFactory.getClientFactoryBean();
- clientBean.setAddress(ROUTER_ADDRESS);
+ clientBean.setAddress(ROUTER_ADDRESS);
clientBean.setServiceClass(HelloService.class);
- clientBean.setBus(bus);
+ clientBean.setBus(bus);
HelloService client = (HelloService) proxyFactory.create();
int invocationCount = client.getInvocationCount();
client.ping();