Author: davsclaus Date: Wed Feb 25 13:39:08 2009 New Revision: 747774 URL: http://svn.apache.org/viewvc?rev=747774&view=rev Log: CAMEL-1373: Using CamelCase for keys in headers/properties.
Added: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/Constants.java (with props) camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestReplyTest.java - copied, changed from r747714, camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteToFileTest.java Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java Added: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/Constants.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/Constants.java?rev=747774&view=auto ============================================================================== --- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/Constants.java (added) +++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/Constants.java Wed Feb 25 13:39:08 2009 @@ -0,0 +1,30 @@ +/** + * 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; + +/** + * Constants + */ +public final class Constants { + + public static final String JMS_REPLY_DESTINATION = "CamelJmsReplyDestination"; + + private Constants() { + // utility class + } + +} Propchange: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/Constants.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/Constants.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java?rev=747774&r1=747773&r2=747774&view=diff ============================================================================== --- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java (original) +++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/EndpointMessageListener.java Wed Feb 25 13:39:08 2009 @@ -95,8 +95,7 @@ rce = wrapRuntimeCamelException(e); } if (rce != null) { - LOG.warn(endpoint + " consumer caught an exception while processing " - + "JMS message: " + message, rce); + LOG.warn(endpoint + " consumer caught an exception while processing JMS message: " + message, rce); throw rce; } } @@ -105,7 +104,7 @@ JmsExchange exchange = new JmsExchange(endpoint, endpoint.getExchangePattern(), getBinding(), message); // lets set to an InOut if we have some kind of reply-to destination if (replyDestination != null && !disableReplyTo) { - exchange.setProperty("org.apache.camel.jms.replyDestination", replyDestination); + exchange.setProperty(Constants.JMS_REPLY_DESTINATION, replyDestination); exchange.setPattern(ExchangePattern.InOut); } return exchange; Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java?rev=747774&r1=747773&r2=747774&view=diff ============================================================================== --- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java (original) +++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteRequestReplyTest.java Wed Feb 25 13:39:08 2009 @@ -351,10 +351,9 @@ runRequestReplyThreaded(endpoingUriA); } - // TODO: Fix this test for upgrading from active-5.0.0 to 5.1.0 (CAMEL-559) - /*public void testUseMessageIDAsCorrelationIDPersistReplyToMultiNode() throws Exception { + public void testUseMessageIDAsCorrelationIDPersistReplyToMultiNode() throws Exception { runRequestReplyThreaded(endpoingtReplyToUriA); - }*/ + } public void testUseCorrelationIDPersistReplyToMultiNode() throws Exception { runRequestReplyThreaded(endpoingUriA); Copied: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestReplyTest.java (from r747714, camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteToFileTest.java) URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestReplyTest.java?p2=camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestReplyTest.java&p1=camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteToFileTest.java&r1=747714&r2=747774&rev=747774&view=diff ============================================================================== --- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteToFileTest.java (original) +++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSimpleRequestReplyTest.java Wed Feb 25 13:39:08 2009 @@ -16,44 +16,42 @@ */ package org.apache.camel.component.jms; -import java.io.File; - import javax.jms.ConnectionFactory; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.camel.CamelContext; import org.apache.camel.ContextTestSupport; +import org.apache.camel.Exchange; +import org.apache.camel.ExchangePattern; +import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.converter.IOConverter; - import static org.apache.camel.component.jms.JmsComponent.jmsComponentClientAcknowledge; /** - * Unit test that we can consume JMS message and store it as file (to avoid regression bug) + * A simple requesr / reply test */ -public class JmsRouteToFileTest extends ContextTestSupport { +public class JmsSimpleRequestReplyTest extends ContextTestSupport { protected String componentName = "activemq"; - public void testRouteToFile() throws Exception { + public void testRequetReply() throws Exception { MockEndpoint result = getMockEndpoint("mock:result"); result.expectedMessageCount(1); - - deleteDirectory("target/routetofile"); - template.sendBody("activemq:queue:hello", "Hello World"); + Exchange out = template.send("activemq:queue:hello", ExchangePattern.InOut, new Processor() { + public void process(Exchange exchange) throws Exception { + exchange.getIn().setBody("Hello World"); + exchange.getIn().setHeader("foo", 123); + } + }); - // pause to let file producer save the file result.assertIsSatisfied(); - - // do file assertions - File dir = new File("./target/routetofile"); - assertTrue("Should be directory", dir.isDirectory()); - File file = dir.listFiles()[0]; - assertTrue("File should exists", file.exists()); - String body = IOConverter.toString(file); - assertEquals("Hello World", body); + + assertNotNull(out); + + assertEquals("Bye World", out.getOut().getBody(String.class)); + assertEquals(123, out.getOut().getHeader("foo")); } protected CamelContext createCamelContext() throws Exception { @@ -68,10 +66,14 @@ protected RouteBuilder createRouteBuilder() throws Exception { return new RouteBuilder() { public void configure() throws Exception { - // using mock endpoint here purely for testing. You would normally write this route as - // from("activemq:queue:hello").to("file://target/routetofile"); - from("activemq:queue:hello").to("file://target/routetofile").to("mock:result"); + from("activemq:queue:hello").process(new Processor() { + public void process(Exchange exchange) throws Exception { + exchange.getIn().setBody("Bye World"); + // the reply destination is set as a property on the exchange while we process it + assertNotNull(exchange.getProperty(Constants.JMS_REPLY_DESTINATION)); + } + }).to("mock:result"); } }; } -} +} \ No newline at end of file