You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2009/05/13 16:07:25 UTC
svn commit: r774374 - in
/servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src:
main/java/org/apache/servicemix/camel/ test/java/org/apache/servicemix/camel/
Author: gertv
Date: Wed May 13 14:07:24 2009
New Revision: 774374
URL: http://svn.apache.org/viewvc?rev=774374&view=rev
Log:
SMCOMP-495: servicemix-camel doesn't forward CamelCaughtException property
Added:
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiBindingTest.java (with props)
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiExchangeTest.java (with props)
Modified:
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/CamelProviderEndpoint.java
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiBinding.java
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiExchange.java
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOnlyWithErrorHandledTrueSpringDSLTest.java
servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOnlyWithFaultHandledTrueSpringDSLTest.java
Modified: servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/CamelProviderEndpoint.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/CamelProviderEndpoint.java?rev=774374&r1=774373&r2=774374&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/CamelProviderEndpoint.java (original)
+++ servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/CamelProviderEndpoint.java Wed May 13 14:07:24 2009
@@ -113,6 +113,7 @@
}
JbiExchange camelExchange = new JbiExchange(camelEndpoint.getCamelContext(), binding, exchange);
camelProcessor.process(camelExchange);
+
if (camelExchange.isFailed()
&& (camelExchange.getFault(false) == null || camelExchange.getFault(false).getBody() == null)) {
Throwable t = camelExchange.getException();
Modified: servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiBinding.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiBinding.java?rev=774374&r1=774373&r2=774374&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiBinding.java (original)
+++ servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiBinding.java Wed May 13 14:07:24 2009
@@ -168,8 +168,20 @@
}
protected void addJbiHeaders(MessageExchange jbiExchange, NormalizedMessage normalizedMessage, Exchange camelExchange) {
- Set<Map.Entry<String, Object>> entries = camelExchange.getIn().getHeaders().entrySet();
- for (Map.Entry<String, Object> entry : entries) {
+ copySerializableHeaders(camelExchange.getProperties(), normalizedMessage);
+
+ Message camelMessage = camelExchange.getIn();
+ copySerializableHeaders(camelMessage.getHeaders(), normalizedMessage);
+
+ // if there's a NormalizedMessage inside the Camel Message, copy those headers over as well
+ NormalizedMessage camelNormalizedMessage = getNormalizedMessage(camelMessage);
+ if (camelNormalizedMessage != null) {
+ copyNormalizedMessageHeaders(normalizedMessage, camelNormalizedMessage);
+ }
+ }
+
+ private void copySerializableHeaders(Map<String, Object> headers, NormalizedMessage normalizedMessage) {
+ for (Map.Entry<String, Object> entry : headers.entrySet()) {
//check if value is Serializable, and if value is Map or collection,
//just exclude it since the entry of it may not be Serializable as well
if (entry.getValue() instanceof Serializable
@@ -180,6 +192,23 @@
}
}
+ @SuppressWarnings("unchecked")
+ private void copyNormalizedMessageHeaders(NormalizedMessage from, NormalizedMessage to) {
+ Set<String> propertyNames = to.getPropertyNames();
+ for (String propertyName : propertyNames) {
+ if (from.getProperty(propertyName) == null) {
+ Object propertyValue = to.getProperty(propertyName);
+ //check if value is Serializable, and if value is Map or collection,
+ //just exclude it since the entry of it may not be Serializable as well
+ if (propertyValue instanceof Serializable
+ && !(propertyValue instanceof Map)
+ && !(propertyValue instanceof Collection)) {
+ from.setProperty(propertyName, propertyValue);
+ }
+ }
+ }
+ }
+
protected void addJbiAttachments(MessageExchange jbiExchange, NormalizedMessage normalizedMessage,
Exchange camelExchange)
throws MessagingException {
@@ -190,4 +219,11 @@
}
}
+ protected NormalizedMessage getNormalizedMessage(Message message) {
+ if (message instanceof JbiMessage) {
+ return ((JbiMessage) message).getNormalizedMessage();
+ }
+ return null;
+ }
+
}
Modified: servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiExchange.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiExchange.java?rev=774374&r1=774373&r2=774374&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiExchange.java (original)
+++ servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/main/java/org/apache/servicemix/camel/JbiExchange.java Wed May 13 14:07:24 2009
@@ -85,6 +85,14 @@
public org.apache.camel.Exchange newInstance() {
return new JbiExchange(this.getContext(), this.getBinding(), this.getMessageExchange());
}
+
+ @Override
+ public final void setProperty(String key, Object value) {
+ if (messageExchange != null && messageExchange.getProperty(key) == null) {
+ messageExchange.setProperty(key, value);
+ }
+ super.setProperty(key, value);
+ }
/**
* @return the Camel <-> JBI binding
@@ -155,6 +163,7 @@
protected JbiMessage createFaultMessage() {
return createMessage("fault");
}
+
private JbiMessage createMessage(String name) {
if (messageExchange != null) {
Added: servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiBindingTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiBindingTest.java?rev=774374&view=auto
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiBindingTest.java (added)
+++ servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiBindingTest.java Wed May 13 14:07:24 2009
@@ -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.servicemix.camel;
+
+import javax.jbi.messaging.NormalizedMessage;
+
+import junit.framework.TestCase;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.impl.DefaultExchange;
+import org.apache.camel.impl.DefaultMessage;
+import org.apache.servicemix.tck.mock.MockNormalizedMessage;
+
+public class JbiBindingTest extends TestCase {
+
+ private JbiBinding binding;
+
+ @Override
+ protected void setUp() throws Exception {
+ binding = new JbiBinding();
+ }
+
+ public void testGetJbiInContentForString() {
+ CamelContext context = new DefaultCamelContext();
+ Exchange exchange = new DefaultExchange(context);
+ exchange.getIn().setBody("<hello>world!</hello>");
+ assertNotNull(binding.getJbiInContent(exchange));
+ }
+
+ public void testGetNormalizedMessageForDefaultCamelMessage() {
+ Message message = new DefaultMessage();
+ assertNull(binding.getNormalizedMessage(message));
+ }
+
+ public void testGetNormalizedMessageForJbiCamelMessage() {
+ JbiMessage camelMessage = new JbiMessage();
+ assertNull(binding.getNormalizedMessage(camelMessage));
+
+ NormalizedMessage jbiMessage = new MockNormalizedMessage();
+ camelMessage.setNormalizedMessage(jbiMessage);
+ assertSame(jbiMessage, binding.getNormalizedMessage(camelMessage));
+ }
+
+}
Propchange: servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiBindingTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiExchangeTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiExchangeTest.java?rev=774374&view=auto
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiExchangeTest.java (added)
+++ servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiExchangeTest.java Wed May 13 14:07:24 2009
@@ -0,0 +1,79 @@
+/*
+ * 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.servicemix.camel;
+
+import java.net.URI;
+
+import javax.jbi.messaging.MessageExchange;
+
+import junit.framework.TestCase;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.servicemix.jbi.messaging.MessageExchangeSupport;
+import org.apache.servicemix.tck.mock.MockMessageExchange;
+
+/**
+ * Test case for {@link JbiExchange}
+ */
+public class JbiExchangeTest extends TestCase {
+
+ private static final String KEY = "org.apache.servicemix.camel.TEST_KEY";
+ private static final String VALUE = "TEST_VALUE";
+
+ /*
+ * Test setting the property on both the Camel Exchange and the underlying JBI MessageExchange
+ */
+ public void testSetPropertyOnMessageExchange() throws Exception {
+ MessageExchange jbiExchange = createMockExchange();
+ Exchange camelExchange = new JbiExchange(new DefaultCamelContext(), new JbiBinding(), jbiExchange);
+ camelExchange.setProperty(KEY, VALUE);
+ assertEquals(VALUE, camelExchange.getProperty(KEY));
+ assertEquals(VALUE, jbiExchange.getProperty(KEY));
+ }
+
+ /*
+ * Test setting the property without overriding the existing JBI MessageExchange one
+ */
+ public void testSetPropertyNoOverrideMessageExchange() throws Exception {
+ MessageExchange jbiExchange = createMockExchange();
+ jbiExchange.setProperty(KEY, VALUE);
+ Exchange camelExchange = new JbiExchange(new DefaultCamelContext(), new JbiBinding(), jbiExchange);
+ camelExchange.setProperty(KEY, "OVERRIDE_TEST_VALUE");
+ assertEquals(VALUE, jbiExchange.getProperty(KEY));
+ }
+
+ /*
+ * Test setting a property without having a MessageExchange in there
+ */
+ public void testSetPropertyWithoutMessageExchange() throws Exception {
+ Exchange camelExchange = new JbiExchange(new DefaultCamelContext(), new JbiBinding());
+ camelExchange.setProperty(KEY, VALUE);
+ assertEquals(VALUE, camelExchange.getProperty(KEY));
+ }
+
+ private MessageExchange createMockExchange() {
+ return new MockMessageExchange() {
+ @Override
+ public URI getPattern() {
+ return MessageExchangeSupport.IN_OUT;
+ }
+ };
+ }
+
+
+}
Propchange: servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiExchangeTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOnlyWithErrorHandledTrueSpringDSLTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOnlyWithErrorHandledTrueSpringDSLTest.java?rev=774374&r1=774373&r2=774374&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOnlyWithErrorHandledTrueSpringDSLTest.java (original)
+++ servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOnlyWithErrorHandledTrueSpringDSLTest.java Wed May 13 14:07:24 2009
@@ -28,6 +28,7 @@
import org.apache.servicemix.components.util.ComponentSupport;
import org.apache.servicemix.jbi.container.ActivationSpec;
import org.apache.servicemix.tck.ReceiverComponent;
+import org.springframework.util.Assert;
/**
* Tests on handling fault messages with the Camel Exception handler
@@ -35,12 +36,20 @@
public class JbiInOnlyWithErrorHandledTrueSpringDSLTest extends SpringJbiTestSupport {
private static final QName TEST_SERVICE = new QName("urn:test", "error-handled-true");
+ private static final String FAILURE_HANDLED_PROPERTY = "org.apache.camel.processor.DeadLetterChannel.FAILURE_HANDLED";
private ReceiverComponent receiver;
private ReceiverComponent deadLetter;
+ @Override
protected void setUp() throws Exception {
- receiver = new ReceiverComponent();
+ receiver = new ReceiverComponent() {
+ public void onMessageExchange(MessageExchange exchange) throws MessagingException {
+ Object value = getInMessage(exchange).getProperty(FAILURE_HANDLED_PROPERTY);
+ Assert.notNull(value, FAILURE_HANDLED_PROPERTY + " property not set");
+ super.onMessageExchange(exchange);
+ }
+ };
deadLetter = new ReceiverComponent();
super.setUp();
@@ -48,19 +57,19 @@
public void testErrorHandledByExceptionClause() throws Exception {
ServiceMixClient smxClient = getServicemixClient();
-
MessageExchange[] exchanges = new MessageExchange[] {smxClient.createInOnlyExchange(), smxClient.createRobustInOnlyExchange()};
for (MessageExchange exchange : exchanges) {
exchange.setService(TEST_SERVICE);
-
+
smxClient.send(exchange);
-
+
exchange = smxClient.receive();
assertEquals(ExchangeStatus.DONE, exchange.getStatus());
+ assertNotNull(exchange.getProperty(FAILURE_HANDLED_PROPERTY));
}
-
+
receiver.getMessageList().assertMessagesReceived(2);
- deadLetter.getMessageList().assertMessagesReceived(0);
+ deadLetter.getMessageList().assertMessagesReceived(0);
}
@Override
@@ -70,8 +79,8 @@
@Override
protected void appendJbiActivationSpecs(List<ActivationSpec> activationSpecList) {
- activationSpecList.add(createActivationSpec(new ReturnNullPointerExceptionErrorComponent(),
- new QName("urn:test", "npe-error-service")));
+ activationSpecList.add(createActivationSpec(new ReturnNullPointerExceptionErrorComponent(), new QName("urn:test",
+ "npe-error-service")));
activationSpecList.add(createActivationSpec(receiver, new QName("urn:test", "receiver-service")));
activationSpecList.add(createActivationSpec(deadLetter, new QName("urn:test", "deadLetter-service")));
Modified: servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOnlyWithFaultHandledTrueSpringDSLTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOnlyWithFaultHandledTrueSpringDSLTest.java?rev=774374&r1=774373&r2=774374&view=diff
==============================================================================
--- servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOnlyWithFaultHandledTrueSpringDSLTest.java (original)
+++ servicemix/smx3/branches/servicemix-3.2/deployables/serviceengines/servicemix-camel/src/test/java/org/apache/servicemix/camel/JbiInOnlyWithFaultHandledTrueSpringDSLTest.java Wed May 13 14:07:24 2009
@@ -32,6 +32,7 @@
import org.apache.servicemix.components.util.ComponentSupport;
import org.apache.servicemix.jbi.container.ActivationSpec;
import org.apache.servicemix.tck.ReceiverComponent;
+import org.springframework.util.Assert;
/**
* Tests on handling fault messages with the Camel Exception handler
@@ -39,13 +40,20 @@
public class JbiInOnlyWithFaultHandledTrueSpringDSLTest extends SpringJbiTestSupport {
private static final QName TEST_SERVICE = new QName("urn:test", "fault-handled-true");
+ private static final String FAILURE_HANDLED_PROPERTY = "org.apache.camel.processor.DeadLetterChannel.FAILURE_HANDLED";
private ReceiverComponent receiver;
private ReceiverComponent deadLetter;
@Override
protected void setUp() throws Exception {
- receiver = new ReceiverComponent();
+ receiver = new ReceiverComponent() {
+ public void onMessageExchange(MessageExchange exchange) throws MessagingException {
+ Object value = getInMessage(exchange).getProperty(FAILURE_HANDLED_PROPERTY);
+ Assert.notNull(value, FAILURE_HANDLED_PROPERTY + " property not set");
+ super.onMessageExchange(exchange);
+ }
+ };
deadLetter = new ReceiverComponent();
super.setUp();
@@ -58,8 +66,9 @@
smxClient.send(exchange);
- exchange = (InOnly) smxClient.receive();
+ exchange = (InOnly)smxClient.receive();
assertEquals(ExchangeStatus.DONE, exchange.getStatus());
+ assertNotNull(exchange.getProperty(FAILURE_HANDLED_PROPERTY));
receiver.getMessageList().assertMessagesReceived(1);
deadLetter.getMessageList().assertMessagesReceived(0);
@@ -72,13 +81,14 @@
smxClient.send(exchange);
- exchange = (RobustInOnly) smxClient.receive();
+ exchange = (RobustInOnly)smxClient.receive();
assertEquals(ExchangeStatus.DONE, exchange.getStatus());
+ assertNotNull(exchange.getProperty(FAILURE_HANDLED_PROPERTY));
receiver.getMessageList().assertMessagesReceived(1);
deadLetter.getMessageList().assertMessagesReceived(0);
}
-
+
@Override
protected String getServiceUnitName() {
return "su9";
@@ -86,8 +96,7 @@
@Override
protected void appendJbiActivationSpecs(List<ActivationSpec> activationSpecList) {
- activationSpecList.add(createActivationSpec(new ReturnFaultComponent(),
- new QName("urn:test", "faulty-service")));
+ activationSpecList.add(createActivationSpec(new ReturnFaultComponent(), new QName("urn:test", "faulty-service")));
activationSpecList.add(createActivationSpec(receiver, new QName("urn:test", "receiver-service")));
activationSpecList.add(createActivationSpec(deadLetter, new QName("urn:test", "deadLetter-service")));