You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/04/28 07:45:18 UTC
svn commit: r769251 - in /camel/trunk/components/camel-jms/src:
main/java/org/apache/camel/component/jms/
test/java/org/apache/camel/component/jms/
test/java/org/apache/camel/component/jms/discovery/
Author: davsclaus
Date: Tue Apr 28 05:45:17 2009
New Revision: 769251
URL: http://svn.apache.org/viewvc?rev=769251&view=rev
Log:
CAMEL-1543: Fixed removeHeader to also remove the header from the JMS Message object.
Added:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java (with props)
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRemoveHeaderTest.java (with props)
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/JmsDiscoveryTest.java
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java?rev=769251&r1=769250&r2=769251&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessage.java Tue Apr 28 05:45:17 2009
@@ -18,6 +18,8 @@
import java.io.File;
import java.util.Map;
+import java.util.Enumeration;
+import java.util.LinkedHashMap;
import javax.jms.Destination;
import javax.jms.JMSException;
@@ -133,6 +135,24 @@
}
@Override
+ public Object removeHeader(String name) {
+ Object answer = super.removeHeader(name);
+
+ if (jmsMessage != null && !name.startsWith("JMS")) {
+ try {
+ // also remove header from the JMS message
+ if (jmsMessage.propertyExists(name)) {
+ answer = JmsMessageHelper.removeJmsProperty(jmsMessage, name);
+ }
+ } catch (JMSException e) {
+ throw new RuntimeCamelException(name, e);
+ }
+ }
+
+ return answer;
+ }
+
+ @Override
public JmsMessage newInstance() {
return new JmsMessage();
}
Added: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java?rev=769251&view=auto
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java (added)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java Tue Apr 28 05:45:17 2009
@@ -0,0 +1,75 @@
+/**
+ * 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.jms;
+
+import java.util.Enumeration;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import javax.jms.JMSException;
+import javax.jms.Message;
+
+/**
+ * Utility class for {@link javax.jms.Message}.
+ *
+ * @version $Revision$
+ */
+public final class JmsMessageHelper {
+
+ private JmsMessageHelper() {
+ }
+
+ /**
+ * Removes the property from the JMS message.
+ *
+ * @param jmsMessage the JMS message
+ * @param name name of the property to remove
+ * @return the old value of the property or <tt>null</tt> if not exists
+ * @throws JMSException can be thrown
+ */
+ public static Object removeJmsProperty(Message jmsMessage, String name) throws JMSException {
+ // check if the property exists
+ if (!jmsMessage.propertyExists(name)) {
+ return null;
+ }
+
+ Object answer = null;
+
+ // store the properties we want to keep in a temporary map
+ // as the JMS API is a bit strict as we are not allowed to
+ // clear a single property, but must clear them all and redo
+ // the properties
+ Map<String, Object> map = new LinkedHashMap<String, Object>();
+ Enumeration en = jmsMessage.getPropertyNames();
+ while (en.hasMoreElements()) {
+ String key = (String) en.nextElement();
+ if (name.equals(key)) {
+ answer = key;
+ } else {
+ map.put(key, jmsMessage.getObjectProperty(key));
+ }
+ }
+
+ // redo the properties to keep
+ jmsMessage.clearProperties();
+ for (String key : map.keySet()) {
+ jmsMessage.setObjectProperty(key, map.get(key));
+ }
+
+ return answer;
+ }
+
+}
Propchange: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/JmsMessageHelper.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRemoveHeaderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRemoveHeaderTest.java?rev=769251&view=auto
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRemoveHeaderTest.java (added)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRemoveHeaderTest.java Tue Apr 28 05:45:17 2009
@@ -0,0 +1,72 @@
+/**
+ * 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.jms;
+
+import java.util.HashMap;
+import java.util.Map;
+import javax.jms.ConnectionFactory;
+
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.camel.CamelContext;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import static org.apache.camel.component.jms.JmsComponent.jmsComponentClientAcknowledge;
+
+/**
+ * @version $Revision$
+ */
+public class JmsRemoveHeaderTest extends ContextTestSupport {
+
+ public void testRemoveHeader() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+ // should not receive the foo header
+ mock.expectedHeaderReceived("foo", null);
+ // but only the bar header
+ mock.expectedHeaderReceived("bar", 123);
+
+ Map headers = new HashMap();
+ headers.put("foo", "cheese");
+ headers.put("bar", 123);
+
+ template.sendBodyAndHeaders("activemq:queue:foo", "Hello World", headers);
+
+ assertMockEndpointsSatisfied();
+ }
+
+ protected CamelContext createCamelContext() throws Exception {
+ CamelContext camelContext = super.createCamelContext();
+
+ ConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://localhost?broker.persistent=false");
+ camelContext.addComponent("activemq", jmsComponentClientAcknowledge(connectionFactory));
+
+ return camelContext;
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("activemq:queue:foo").removeHeader("foo").to("activemq:queue:bar");
+
+ from("activemq:queue:bar").to("mock:result");
+ }
+ };
+ }
+}
Propchange: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRemoveHeaderTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRemoveHeaderTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/JmsDiscoveryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/JmsDiscoveryTest.java?rev=769251&r1=769250&r2=769251&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/JmsDiscoveryTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/discovery/JmsDiscoveryTest.java Tue Apr 28 05:45:17 2009
@@ -67,9 +67,9 @@
return new RouteBuilder() {
public void configure() throws Exception {
// lets setup the heartbeats
- from("bean:service1?method=status?delay=5000&exchangePattern=InOnly").to("activemq:topic:registry.heartbeats");
- from("bean:service2?method=status?delay=5000&exchangePattern=InOnly").to("activemq:topic:registry.heartbeats");
- from("bean:service3?method=status?delay=5000&exchangePattern=InOnly").to("activemq:topic:registry.heartbeats");
+ from("bean:service1?method=status?initialDelay=100&exchangePattern=InOnly").to("activemq:topic:registry.heartbeats");
+ from("bean:service2?method=status?initialDelay=125&exchangePattern=InOnly").to("activemq:topic:registry.heartbeats");
+ from("bean:service3?method=status?initialDelay=150&exchangePattern=InOnly").to("activemq:topic:registry.heartbeats");
from("activemq:topic:registry.heartbeats?cacheLevelName=CACHE_CONSUMER").to("bean:registry?method=onEvent", "mock:result");
}